Merge branch 'master' into wx3

gui/builtinContextMenus/__init__.py

@@ -19,4 +19,5 @@ __all__ = [
     "targetResists",
     "priceClear",
     "amount",
+    "metaSwap",
 ]

gui/builtinContextMenus/metaSwap.py

@@ -0,0 +1,97 @@
+# -*- coding: utf-8 -*-
+from gui.contextMenu import ContextMenu
+from gui.itemStats import ItemStatsDialog
+import gui.mainFrame
+import service
+import wx
+import gui.globalEvents as GE
+
+class MetaSwap(ContextMenu):
+    def __init__(self):
+        self.mainFrame = gui.mainFrame.MainFrame.getInstance()
+
+    def display(self, srcContext, selection):
+
+        if self.mainFrame.getActiveFit() is None or srcContext not in ("fittingModule",):
+            return False
+
+        # Check if list of variations is same for all of selection
+        # If not - don't show the menu
+        mkt = service.Market.getInstance()
+        self.variations = None
+        for i in selection:
+            variations = mkt.getVariationsByItems([i.item])
+            if self.variations is None:
+                self.variations = variations
+            else:
+                if variations != self.variations:
+                    return False
+
+        self.selection = selection
+
+        return True
+
+    def getText(self, itmContext, selection):
+        return "Variations"
+
+    def getSubMenu(self, context, selection, rootMenu, i, pitem):
+        self.moduleLookup = {}
+
+        def get_metalevel(x):
+            return x.attributes["metaLevel"].value
+
+        def get_metagroup(x):
+            return x.metaGroup.ID if x.metaGroup is not None else 0
+
+        m = wx.Menu()
+
+        # If on Windows we need to bind out events into the root menu, on other
+        # platforms they need to go to our sub menu
+        if "wxMSW" in wx.PlatformInfo:
+            bindmenu = rootMenu
+        else:
+            bindmenu = m
+
+        # Sort items by metalevel, and group within that metalevel
+        items = list(self.variations)
+        items.sort(key=get_metalevel)
+        items.sort(key=get_metagroup)
+
+        group = None
+        for item in items:
+            # Apparently no metaGroup for the Tech I variant:
+            if item.metaGroup is None:
+                thisgroup = "Tech I"
+            else:
+                thisgroup = item.metaGroup.name
+
+            if thisgroup != group:
+                group = thisgroup
+                id = wx.NewId()
+                m.Append(id, u'─ %s ─' % group)
+                m.Enable(id, False)
+
+            id = wx.NewId()
+            mitem = wx.MenuItem(rootMenu, id, item.name)
+            bindmenu.Bind(wx.EVT_MENU, self.handleModule, mitem)
+            self.moduleLookup[id] = item
+            m.AppendItem(mitem)
+        return m
+
+    def handleModule(self, event):
+        item = self.moduleLookup.get(event.Id, None)
+        if item is None:
+            event.Skip()
+            return
+
+        sFit = service.Fit.getInstance()
+        fitID = self.mainFrame.getActiveFit()
+        fit = sFit.getFit(fitID)
+        
+        for mod in self.selection:
+            pos = fit.modules.index(mod)
+            sFit.changeModule(fitID, pos, item.ID)
+
+        wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))
+
+MetaSwap.register()

gui/builtinStatsViews/targetingMiscViewFull.py

@@ -149,7 +149,7 @@ class TargetingMiscViewFull(StatsView):
                  ("labelScanRes", {"main": lambda: fit.ship.getModifiedItemAttr("scanResolution")}, 3, 0, 0, "mm"),
                  ("labelSensorStr", {"main": lambda: fit.scanStrength}, 3, 0, 0, ""),
                  ("labelCtrlRange", {"main": lambda: fit.extraAttributes["droneControlRange"] / 1000}, 3, 0, 0, "km"),
-                 ("labelFullSpeed", {"main": lambda: fit.ship.getModifiedItemAttr("maxVelocity")}, 3, 0, 0, "m/s"),
+                 ("labelFullSpeed", {"main": lambda: fit.maxSpeed}, 3, 0, 0, "m/s"),
                  ("labelFullAlignTime", {"main": lambda: fit.alignTime}, 3, 0, 0, "s"),
                  ("labelFullSigRadius", {"main": lambda: fit.ship.getModifiedItemAttr("signatureRadius")}, 3, 0, 9, ""),
                  ("labelFullWarpSpeed", {"main": lambda: fit.warpSpeed}, 3, 0, 0, "AU/s"),

gui/graphFrame.py

@@ -42,7 +42,12 @@ class GraphFrame(wx.Frame):
 
         try:
             import matplotlib as mpl
-            cache_dir = mpl._get_cachedir()
+
+            try:
+                cache_dir = mpl._get_cachedir()
+            except:
+                cache_dir = unicode(os.path.expanduser(os.path.join("~", ".matplotlib")))
+
             cache_file = os.path.join(cache_dir, 'fontList.cache')
             if os.access(cache_dir, os.W_OK | os.X_OK) and os.path.isfile(cache_file):
                 # remove matplotlib font cache, see #234