Make sure that drone variation is applicable to multiple modules, if multiple drones of the same type are selected

gui/builtinContextMenus/itemVariationChange.py

@@ -150,25 +150,38 @@ class ChangeItemToVariation(ContextMenuCombined):
         if wx.GetMouseState().altDown:
             positions = getSimilarModPositions(fit.modules, self.mainItem)
         else:
+            sMkt = Market.getInstance()
             positions = []
-            for position, mod in enumerate(fit.modules):
-                if mod in self.selection:
-                    if mod.isEmpty:
-                        continue
-                    modVariations = Market.getInstance().getVariationsByItems((mod.item,))
-                    if modVariations == self.mainVariations:
-                        positions.append(position)
+            for mod in self.selection:
+                if mod.isEmpty:
+                    continue
+                if mod is self.mainItem:
+                    positions.append(fit.modules.index(mod))
+                    continue
+                if mod not in fit.modules:
+                    continue
+                modVariations = sMkt.getVariationsByItems((mod.item,))
+                if modVariations == self.mainVariations:
+                    positions.append(fit.modules.index(mod))
         self.mainFrame.command.Submit(cmd.GuiChangeLocalModuleMetasCommand(
             fitID=fitID, positions=positions, newItemID=varItem.ID))
 
     def __handleDrone(self, varItem):
         fitID = self.mainFrame.getActiveFit()
         fit = Fit.getInstance().getFit(fitID)
-        drone = self.mainItem
-        if drone in fit.drones:
-            position = fit.drones.index(drone)
-            self.mainFrame.command.Submit(cmd.GuiChangeLocalDroneMetaCommand(
-                fitID=fitID, position=position, newItemID=varItem.ID))
+        sMkt = Market.getInstance()
+        positions = []
+        for drone in self.selection:
+            if drone not in fit.drones:
+                continue
+            if drone is self.mainItem:
+                positions.append(fit.drones.index(drone))
+                continue
+            droneVariations = sMkt.getVariationsByItems((drone.item,))
+            if droneVariations == self.mainVariations:
+                positions.append(fit.drones.index(drone))
+        self.mainFrame.command.Submit(cmd.GuiChangeLocalDroneMetasCommand(
+            fitID=fitID, positions=positions, newItemID=varItem.ID))
 
     def __handleFighter(self, varItem):
         fitID = self.mainFrame.getActiveFit()

gui/fitCommands/__init__.py

@@ -20,7 +20,7 @@ from .gui.implant.toggleState import GuiToggleImplantStateCommand
 from .gui.itemsRebase import GuiRebaseItemsCommand
 from .gui.localDrone.add import GuiAddLocalDroneCommand
 from .gui.localDrone.changeAmount import GuiChangeLocalDroneAmountCommand
-from .gui.localDrone.changeMeta import GuiChangeLocalDroneMetaCommand
+from .gui.localDrone.changeMetas import GuiChangeLocalDroneMetasCommand
 from .gui.localDrone.remove import GuiRemoveLocalDronesCommand
 from .gui.localDrone.stackSplit import GuiSplitLocalDroneStackCommand
 from .gui.localDrone.stacksMerge import GuiMergeLocalDroneStacksCommand

gui/fitCommands/gui/localDrone/changeMetas.py

@@ -2,6 +2,7 @@ import math
 
 import wx
 
+import eos.db
 import gui.mainFrame
 from gui import globalEvents as GE
 from gui.fitCommands.calc.drone.localAdd import CalcAddLocalDroneCommand
@@ -10,32 +11,37 @@ from gui.fitCommands.helpers import DroneInfo, InternalCommandHistory
 from service.fit import Fit
 
 
-class GuiChangeLocalDroneMetaCommand(wx.Command):
+class GuiChangeLocalDroneMetasCommand(wx.Command):
 
-    def __init__(self, fitID, position, newItemID):
+    def __init__(self, fitID, positions, newItemID):
         wx.Command.__init__(self, True, 'Change Local Drone Meta')
         self.internalHistory = InternalCommandHistory()
         self.fitID = fitID
-        self.position = position
+        self.positions = positions
         self.newItemID = newItemID
 
     def Do(self):
         sFit = Fit.getInstance()
         fit = sFit.getFit(self.fitID)
-        drone = fit.drones[self.position]
-        if drone.itemID == self.newItemID:
-            return False
-        info = DroneInfo.fromDrone(drone)
-        info.itemID = self.newItemID
-        cmdRemove = CalcRemoveLocalDroneCommand(fitID=self.fitID, position=self.position, amount=math.inf)
-        cmdAdd = CalcAddLocalDroneCommand(fitID=self.fitID, droneInfo=info, forceNewStack=True)
-        success = self.internalHistory.submitBatch(cmdRemove, cmdAdd)
+        result = []
+        for position in sorted(self.positions, reverse=True):
+            drone = fit.drones[position]
+            if drone.itemID == self.newItemID:
+                return False
+            info = DroneInfo.fromDrone(drone)
+            info.itemID = self.newItemID
+            cmdRemove = CalcRemoveLocalDroneCommand(fitID=self.fitID, position=position, amount=math.inf, commit=False)
+            cmdAdd = CalcAddLocalDroneCommand(fitID=self.fitID, droneInfo=info, forceNewStack=True, commit=False)
+            result.append(self.internalHistory.submitBatch(cmdRemove, cmdAdd))
+        success = any(result)
+        eos.db.commit()
         sFit.recalc(fit)
         wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
         return success
 
     def Undo(self):
         success = self.internalHistory.undoAll()
+        eos.db.commit()
         Fit.getInstance().recalc(self.fitID)
         wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
         return success