Merge branch 'master' of evefit.org:pyfa

aboutData.py

@@ -20,6 +20,6 @@
 versionString = "0.0.1"
 license = "GNU GPL"
 licenseLocation = "gpl.txt"
-developers = ("cncfanatics" , "DarkPhoenix")
+developers = ("cncfanatics" , "DarkPhoenix", "Darriele")
 credits = (("Entity: capacitor calculations"), ("Darriele: gui"), ("Aurora: maths"))
 description = "pyfa is the Python Fitting Assistant, a standalone application to create fittings for the EVE-Online SciFi MMORPG.\nThe application is available for many platforms, see the download page for further details. The layout of pyfa is heavily based on EFT, the EVE fitting tool. Although it is a complete rewrite and replacement for EFT, the fittings are still compatible with EFT."

gui/fittingView.py

@@ -122,7 +122,7 @@ class FittingView(wx.ListCtrl):
         row, _ = self.HitTest(event.Position)
         if row != -1:
             cFit = controller.Fit.getInstance()
-            cFit.removeItem(self.activeFitID, self.GetItemData(row))
+            cFit.removeItem(self.activeFitID, self.mods[self.GetItemData(row)].position)
 
         wx.PostEvent(self.mainFrame, FitChanged(fitID=self.activeFitID))
 
@@ -138,16 +138,19 @@ class FittingView(wx.ListCtrl):
 
         self.DeleteAllItems()
         self.clearItemImages()
-        modSlotMap = {}
+
         slotOrder = [Slot.SUBSYSTEM, Slot.HIGH, Slot.MED, Slot.LOW, Slot.RIG]
 
+        self.mods = fit.modules[:]
+        self.mods.sort(key=lambda mod: (slotOrder.index(mod.slot), mod.position))
+
         if fit is not None:
-            for modid, mod in enumerate(fit.modules):
+            for modid, mod in enumerate(self.mods):
                 index = self.InsertStringItem(sys.maxint, "")
                 for i, col in enumerate(self.activeColumns):
                     self.SetStringItem(index, i, col.getText(mod), col.getImageId(mod))
                     self.SetItemData(index, modid)
-                    modSlotMap[modid] = mod.slot
+
 
         for i, col in enumerate(self.activeColumns):
             if not col.resized:
@@ -155,8 +158,6 @@ class FittingView(wx.ListCtrl):
                 if self.GetColumnWidth(i) < 40:
                     self.SetColumnWidth(i, 40)
 
-        self.SortItems(lambda id1, id2: cmp(slotOrder.index(modSlotMap[id1]), slotOrder.index(modSlotMap[id2])))
-
         for sel in selection:
             self.Select(sel)