Bringing branch up to date with dev

Merge branch 'development' into ErrorDialog_and_miscfixes

Conflicts:
	eos/saveddata/fit.py
	pyfa.py

gui/builtinContextMenus/__init__.py

@@ -1,27 +0,0 @@
-__all__ = [
-    "openFit",
-    # "moduleGlobalAmmoPicker",
-    "moduleAmmoPicker",
-    "itemStats",
-    "damagePattern",
-    "marketJump",
-    "droneSplit",
-    "itemRemove",
-    "droneRemoveStack",
-    "ammoPattern",
-    "project",
-    "factorReload",
-    "whProjector",
-    "cargo",
-    "shipJump",
-    "changeAffectingSkills",
-    "tacticalMode",
-    "targetResists",
-    "priceClear",
-    "amount",
-    "metaSwap",
-    "implantSets",
-    "fighterAbilities",
-    "cargoAmmo",
-    "droneStack"
-]

gui/builtinContextMenus/cargoAmmo.py

@@ -1,15 +1,20 @@
 from gui.contextMenu import ContextMenu
 import gui.mainFrame
-import service
 import gui.globalEvents as GE
 import wx
+from service.settings import ContextMenuSettings
+from service.fit import Fit
 
 
 class CargoAmmo(ContextMenu):
     def __init__(self):
         self.mainFrame = gui.mainFrame.MainFrame.getInstance()
+        self.settings = ContextMenuSettings.getInstance()
 
     def display(self, srcContext, selection):
+        if not self.settings.get('cargoAmmo'):
+            return False
+
         if srcContext not in ("marketItemGroup", "marketItemMisc") or self.mainFrame.getActiveFit() is None:
             return False
 
@@ -23,7 +28,7 @@ class CargoAmmo(ContextMenu):
         return "Add {0} to Cargo (x1000)".format(itmContext)
 
     def activate(self, fullContext, selection, i):
-        sFit = service.Fit.getInstance()
+        sFit = Fit.getInstance()
         fitID = self.mainFrame.getActiveFit()
 
         typeID = int(selection[0].ID)

gui/builtinContextMenus/droneStack.py

@@ -1,15 +1,20 @@
 from gui.contextMenu import ContextMenu
 import gui.mainFrame
-import service
 import gui.globalEvents as GE
 import wx
+from service.settings import ContextMenuSettings
+from service.fit import Fit
 
 
-class CargoAmmo(ContextMenu):
+class DroneStack(ContextMenu):
     def __init__(self):
         self.mainFrame = gui.mainFrame.MainFrame.getInstance()
+        self.settings = ContextMenuSettings.getInstance()
 
     def display(self, srcContext, selection):
+        if not self.settings.get('droneStack'):
+            return False
+
         if srcContext not in ("marketItemGroup", "marketItemMisc") or self.mainFrame.getActiveFit() is None:
             return False
 
@@ -25,7 +30,7 @@ class CargoAmmo(ContextMenu):
         return "Add {0} to Drone Bay (x5)".format(itmContext)
 
     def activate(self, fullContext, selection, i):
-        sFit = service.Fit.getInstance()
+        sFit = Fit.getInstance()
         fitID = self.mainFrame.getActiveFit()
 
         typeID = int(selection[0].ID)
@@ -34,4 +39,4 @@ class CargoAmmo(ContextMenu):
         wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))
 
 
-CargoAmmo.register()
+DroneStack.register()

gui/builtinViews/fittingView.py

@@ -268,9 +268,7 @@ class FittingView(d.Display):
         We also refresh the fit of the new current page in case
         delete fit caused change in stats (projected)
         """
-        fitID = event.fitID
-
-        if fitID == self.getActiveFit():
+        if event.fitID == self.getActiveFit():
             self.parent.DeletePage(self.parent.GetPageIndex(self))
 
         try:
@@ -279,7 +277,7 @@ class FittingView(d.Display):
             sFit.refreshFit(self.getActiveFit())
             wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=self.activeFitID))
         except wx._core.PyDeadObjectError:
-            pyfalog.warning("Caught dead object")
+            pyfalog.error("Caught dead object")
             pass
 
         event.Skip()
@@ -485,7 +483,7 @@ class FittingView(d.Display):
 
             self.Show(self.activeFitID is not None and self.activeFitID == event.fitID)
         except wx._core.PyDeadObjectError:
-            pyfalog.warning("Caught dead object")
+            pyfalog.error("Caught dead object")
         finally:
             event.Skip()
 

gui/contextMenu.py

@@ -181,7 +181,7 @@ class ContextMenu(object):
 # noinspection PyUnresolvedReferences
 from gui.builtinContextMenus import (  # noqa: E402,F401
     openFit,
-    # moduleGlobalAmmoPicker,
+    moduleGlobalAmmoPicker,
     moduleAmmoPicker,
     itemStats,
     damagePattern,
@@ -200,6 +200,8 @@ from gui.builtinContextMenus import (  # noqa: E402,F401
     targetResists,
     priceClear,
     amount,
+    cargoAmmo,
+    droneStack,
     metaSwap,
     implantSets,
     fighterAbilities,

gui/graphFrame.py

@@ -29,13 +29,14 @@ import gui.mainFrame
 import gui.globalEvents as GE
 from gui.graph import Graph
 from gui.bitmapLoader import BitmapLoader
+import traceback
 
 pyfalog = Logger(__name__)
 
 try:
     import matplotlib as mpl
 
-    mpl_version = int(mpl.__version__[0])
+    mpl_version = int(mpl.__version__[0]) or -1
     if mpl_version >= 2:
         mpl.use('wxagg')
         mplImported = True
@@ -48,43 +49,33 @@ try:
 
     graphFrame_enabled = True
     mplImported = True
-except ImportError:
+except ImportError as e:
+    pyfalog.warning("Matplotlib failed to import.  Likely missing or incompatible version.")
+    mpl_version = -1
+    Patch = mpl = Canvas = Figure = None
+    graphFrame_enabled = False
+    mplImported = False
+except Exception:
+    # We can get exceptions deep within matplotlib. Catch those.  See GH #1046
+    tb = traceback.format_exc()
+    pyfalog.critical("Exception when importing Matplotlib. Continuing without importing.")
+    pyfalog.critical(tb)
+    mpl_version = -1
     Patch = mpl = Canvas = Figure = None
     graphFrame_enabled = False
     mplImported = False
 
-pyfalog = Logger(__name__)
-
 
 class GraphFrame(wx.Frame):
     def __init__(self, parent, style=wx.DEFAULT_FRAME_STYLE | wx.NO_FULL_REPAINT_ON_RESIZE | wx.FRAME_FLOAT_ON_PARENT):
-
         global graphFrame_enabled
         global mplImported
-
-        self.Patch = None
-        self.mpl_version = -1
-
-        try:
-            import matplotlib as mpl
-            self.mpl_version = int(mpl.__version__[0])
-            if self.mpl_version >= 2:
-                mpl.use('wxagg')
-                mplImported = True
-            else:
-                mplImported = False
-            from matplotlib.patches import Patch
-            self.Patch = Patch
-            from matplotlib.backends.backend_wxagg import FigureCanvasWxAgg as Canvas
-            from matplotlib.figure import Figure
-            graphFrame_enabled = True
-        except ImportError:
-            Patch = mpl = Canvas = Figure = None
-            graphFrame_enabled = False
+        global mpl_version
 
         self.legendFix = False
+
         if not graphFrame_enabled:
-            pyfalog.info("Problems importing matplotlib; continuing without graphs")
+            pyfalog.warning("Matplotlib is not enabled. Skipping initialization.")
             return
 
         try:
@@ -236,6 +227,8 @@ class GraphFrame(wx.Frame):
         self.draw()
 
     def draw(self, event=None):
+        global mpl_version
+
         values = self.getValues()
         view = self.getView()
         self.subplot.clear()
@@ -260,7 +253,7 @@ class GraphFrame(wx.Frame):
                 self.canvas.draw()
                 return
 
-        if self.mpl_version < 2:
+        if mpl_version < 2:
             if self.legendFix and len(legend) > 0:
                 leg = self.subplot.legend(tuple(legend), "upper right", shadow=False)
                 for t in leg.get_texts():
@@ -276,7 +269,7 @@ class GraphFrame(wx.Frame):
 
                 for l in leg.get_lines():
                     l.set_linewidth(1)
-        elif self.mpl_version >= 2:
+        elif mpl_version >= 2:
             legend2 = []
             legend_colors = {
                 0: "blue",

gui/shipBrowser.py

@@ -1746,6 +1746,7 @@ class FitItem(SFItem.SFBrowserItem):
                 self.deleteFit()
 
     def deleteFit(self, event=None):
+        pyfalog.debug("Deleting ship fit.")
         if self.deleted:
             return
         else: