Merge remote-tracking branch 'bitbucket/commandRefactor' into commandRefactor

# Conflicts:
#	gui/fitCommands/__init__.py

gui/fitCommands/guiAddModule.py

@@ -1,36 +1,57 @@
 import wx
-
+import eos.db
 import gui.mainFrame
 from service.fit import Fit
 from gui import globalEvents as GE
 from .calc.fitAddModule import FitAddModuleCommand
 from .calc.fitReplaceModule import FitReplaceModuleCommand
+from .calc.fitSetCharge import FitSetChargeCommand
+from service.fit import Fit
+from logbook import Logger
+pyfalog = Logger(__name__)
+
 
 class GuiModuleAddCommand(wx.Command):
     def __init__(self, fitID, itemID, position=None):
-        wx.Command.__init__(self, True, "Module Add")
-        # todo: evaluate mutaplasmid modules
+        """
+        Handles adding an item, usually a module, to the Fitting Window.
+
+        :param fitID: The fit ID that we are modifying
+        :param itemID: The item that is to be added to the Fitting View. If this turns out to be a charge, we attempt to
+                       set the charge on the underlying module (requires position)
+        :param position: Optional. The position in fit.modules that we are attempting to set the item to
+        """
+        wx.Command.__init__(self, True, "Module Add: {}".format(itemID))
         self.mainFrame = gui.mainFrame.MainFrame.getInstance()
         self.sFit = Fit.getInstance()
         self.fitID = fitID
         self.itemID = itemID
         self.internal_history = wx.CommandProcessor()
-        self.new_position = position
+        self.position = position
         self.old_mod = None
 
     def Do(self):
+        pyfalog.debug("{} Do()".format(self))
         success = False
-        # if we have a position set, try to apply the module to that position
-
-        # todo: check to see if item is a charge. if it is, dont try to add module, but instead set ammo
-        if self.new_position:
-            success = self.internal_history.Submit(FitReplaceModuleCommand(self.fitID, self.new_position, self.itemID))
+        item = eos.db.getItem(self.itemID)
+        if item.isCharge and self.position is not None:
+            pyfalog.debug("Trying to add a charge")
+            success = self.internal_history.Submit(FitSetChargeCommand(self.fitID, [self.position], self.itemID))
             if not success:
-                # something went wrong with trying to fit the module into specific location, attemp to append it
-                self.new_position = None
+                pyfalog.debug("    Failed")
+                return False  # if it's a charge item and this failed, nothing more we can try.
+        # if we have a position set, try to apply the module to that position
+        elif self.position is not None:
+            pyfalog.debug("Trying to add a module to a specific position")
+            success = self.internal_history.Submit(FitReplaceModuleCommand(self.fitID, self.position, self.itemID))
+            if not success:
+                pyfalog.debug("    Failed")
+                # something went wrong with trying to fit the module into specific location, attempt to append it
+                self.position = None
 
         # if we're not trying to set module to a position, simply append
-        if not self.new_position:
+        if self.position is None:
+            pyfalog.debug("Trying to append a module")
             success = self.internal_history.Submit(FitAddModuleCommand(self.fitID, self.itemID))
 
         if success:
@@ -39,14 +60,9 @@ class GuiModuleAddCommand(wx.Command):
             return True
         return False
 
-        #
-        # if change is not None:
-        #     print('new position: ',self.new_position )
-        #     # self.slotsChanged() # unsure how to handle this right now? Perhaps move this to the event itself?
-        #     return True
-        # return False
 
     def Undo(self):
+        pyfalog.debug("{} Undo()".format(self))
         for _ in self.internal_history.Commands:
             self.internal_history.Undo()
         self.sFit.recalc(self.fitID)