Rework setting mode and fix command which changes fit name

It was just broken before

gui/fitCommands/calc/fitChangeProjectedDroneAmount.py

@@ -28,6 +28,8 @@ class FitChangeProjectedDroneAmountCommand(wx.Command):
             pyfalog.warning('Cannot find projected drone')
             return False
         self.savedDroneInfo = DroneInfo.fromDrone(drone)
+        if self.amount == self.savedDroneInfo.amount:
+            return False
         drone.amount = self.amount
         if drone.amountActive > 0:
             difference = self.amount - self.savedDroneInfo.amount

gui/fitCommands/calc/fitChangeProjectedFitAmount.py

@@ -30,7 +30,10 @@ class FitChangeProjectedFitAmountCommand(wx.Command):
             return False
         self.savedAmount = projectionInfo.amount
         # Limit to [1, 20]
-        projectionInfo.amount = min(20, max(1, self.amount))
+        confinedAmount = min(20, max(1, self.amount))
+        if confinedAmount == self.savedAmount:
+            return False
+        projectionInfo.amount = confinedAmount
         eos.db.commit()
         return True
 

gui/fitCommands/calc/fitRename.py

@@ -18,7 +18,7 @@ class FitRenameCommand(wx.Command):
 
     def Do(self):
         pyfalog.debug('Doing renaming of fit {} to {}'.format(self.fitID, self.name))
-        fit = eos.db.getFit(self.fitID)
+        fit = Fit.getInstance().getFit(self.fitID)
         self.savedName = fit.name
         fit.name = self.name
         eos.db.commit()

gui/fitCommands/calc/fitReplaceModule.py

@@ -26,6 +26,8 @@ class FitReplaceModuleCommand(wx.Command):
         oldMod = fit.modules[self.position]
         if not oldMod.isEmpty:
             self.oldModInfo = ModuleInfo.fromModule(oldMod)
+        if self.newModInfo == self.oldModInfo:
+            return False
         newMod = self.newModInfo.toModule(fallbackState=stateLimit(self.newModInfo.itemID))
         if newMod is None:
             return False

gui/fitCommands/calc/fitSetMode.py

@@ -1,28 +1,33 @@
 import wx
-import eos.db
 from logbook import Logger
+
+import eos.db
+from eos.saveddata.mode import Mode
+from service.fit import Fit
+from service.market import Market
+
+
 pyfalog = Logger(__name__)
 
 
 class FitSetModeCommand(wx.Command):
-    """"
-    from sFit.setMode
-    """
-    def __init__(self, fitID, mode):
-        wx.Command.__init__(self, True, "Cargo add")
+
+    def __init__(self, fitID, itemID):
+        wx.Command.__init__(self, True, 'Set Mode')
         self.fitID = fitID
-        self.mode = mode
-        self.old_mode = None
+        self.itemID = itemID
+        self.savedItemID = None
 
     def Do(self):
-        pyfalog.debug("Set mode for fit ID: {0}", self.fitID)
-        fit = eos.db.getFit(self.fitID)
-        self.old_mode = fit.mode
-        fit.mode = self.mode
+        pyfalog.debug('Doing setting mode {} for fit {}'.format(self.itemID, self.fitID))
+        fit = Fit.getInstance().getFit(self.fitID)
+        self.savedItemID = fit.modeID
+        item = Market.getInstance().getItem(self.itemID)
+        mode = Mode(item)
+        fit.mode = mode
         eos.db.commit()
         return True
 
     def Undo(self):
-        cmd = FitSetModeCommand(self.fitID, self.old_mode)
-        cmd.Do()
-        return True
+        cmd = FitSetModeCommand(self.fitID, self.savedItemID)
+        return cmd.Do()

gui/fitCommands/guiSetMode.py

@@ -7,16 +7,16 @@ from .calc.fitSetMode import FitSetModeCommand
 
 
 class GuiSetModeCommand(wx.Command):
-    def __init__(self, fitID, mode):
+    def __init__(self, fitID, itemID):
         wx.Command.__init__(self, True, "Mode Set")
         self.mainFrame = gui.mainFrame.MainFrame.getInstance()
         self.sFit = Fit.getInstance()
         self.internal_history = wx.CommandProcessor()
         self.fitID = fitID
-        self.mode = mode
+        self.itemID = itemID
 
     def Do(self):
-        if self.internal_history.Submit(FitSetModeCommand(self.fitID, self.mode)):
+        if self.internal_history.Submit(FitSetModeCommand(self.fitID, self.itemID)):
             self.sFit.recalc(self.fitID)
             wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=self.fitID))
             return True

gui/fitCommands/helpers.py

@@ -85,6 +85,19 @@ class ModuleInfo:
 
         return mod
 
+    def __eq__(self, other):
+        if not isinstance(other, ModuleInfo):
+            return False
+        return all((
+            self.itemID == other.itemID,
+            self.baseItemID == other.baseItemID,
+            self.mutaplasmidID == other.mutaplasmidID,
+            self.mutations == other.mutations,
+            self.chargeID == other.chargeID,
+            self.state == other.state,
+            self.spoolType == other.spoolType,
+            self.spoolAmount == other.spoolAmount))
+
     def __repr__(self):
         return makeReprStr(self, [
             'itemID', 'baseItemID', 'mutaplasmidID', 'mutations',