From becf7c3ff2cced0e42ff57e5a21260da6f137327 Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Wed, 6 Mar 2019 23:59:11 +0300 Subject: [PATCH] Commit stub of price optimization command --- gui/fitCommands/guiAddDrone.py | 2 +- gui/fitCommands/guiAddFighter.py | 2 +- gui/fitCommands/guiCargoToModule.py | 2 +- gui/fitCommands/guiFillWithModule.py | 2 +- gui/fitCommands/guiModuleToCargo.py | 2 +- gui/fitCommands/guiOptimizePrice.py | 12 ++++++++++++ gui/fitCommands/guiRemoveCargo.py | 2 +- gui/fitCommands/guiRemoveDrone.py | 2 +- gui/fitCommands/guiRemoveFighter.py | 2 +- gui/fitCommands/guiRemoveProjected.py | 2 +- gui/fitCommands/guiSetMode.py | 2 +- service/port/multibuy.py | 4 ++-- 12 files changed, 24 insertions(+), 12 deletions(-) create mode 100644 gui/fitCommands/guiOptimizePrice.py diff --git a/gui/fitCommands/guiAddDrone.py b/gui/fitCommands/guiAddDrone.py index 6549d1e21..3c1bec21e 100644 --- a/gui/fitCommands/guiAddDrone.py +++ b/gui/fitCommands/guiAddDrone.py @@ -8,7 +8,7 @@ from .calc.fitAddDrone import FitAddDroneCommand class GuiAddDroneCommand(wx.Command): def __init__(self, fitID, itemID): - wx.Command.__init__(self, True, "Cargo Add") + wx.Command.__init__(self, True, "Drone Add") self.mainFrame = gui.mainFrame.MainFrame.getInstance() self.sFit = Fit.getInstance() self.internal_history = wx.CommandProcessor() diff --git a/gui/fitCommands/guiAddFighter.py b/gui/fitCommands/guiAddFighter.py index 01024e706..7a69ebc28 100644 --- a/gui/fitCommands/guiAddFighter.py +++ b/gui/fitCommands/guiAddFighter.py @@ -8,7 +8,7 @@ from .calc.fitAddFighter import FitAddFighterCommand class GuiAddFighterCommand(wx.Command): def __init__(self, fitID, itemID): - wx.Command.__init__(self, True, "Cargo Add") + wx.Command.__init__(self, True, "Fighter Add") self.mainFrame = gui.mainFrame.MainFrame.getInstance() self.sFit = Fit.getInstance() self.internal_history = wx.CommandProcessor() diff --git a/gui/fitCommands/guiCargoToModule.py b/gui/fitCommands/guiCargoToModule.py index a2583e47c..d77abbc3b 100644 --- a/gui/fitCommands/guiCargoToModule.py +++ b/gui/fitCommands/guiCargoToModule.py @@ -21,7 +21,7 @@ class GuiCargoToModuleCommand(wx.Command): """ def __init__(self, fitID, moduleIdx, cargoIdx, copy=False): - wx.Command.__init__(self, True, "Module State Change") + wx.Command.__init__(self, True, "Cargo to Module") self.mainFrame = gui.mainFrame.MainFrame.getInstance() self.sFit = Fit.getInstance() self.fitID = fitID diff --git a/gui/fitCommands/guiFillWithModule.py b/gui/fitCommands/guiFillWithModule.py index 0fa962bef..5b7bf95e3 100644 --- a/gui/fitCommands/guiFillWithModule.py +++ b/gui/fitCommands/guiFillWithModule.py @@ -17,7 +17,7 @@ class GuiFillWithModuleCommand(wx.Command): 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)) + wx.Command.__init__(self, True, "Module Fill: {}".format(itemID)) self.mainFrame = gui.mainFrame.MainFrame.getInstance() self.sFit = Fit.getInstance() self.fitID = fitID diff --git a/gui/fitCommands/guiModuleToCargo.py b/gui/fitCommands/guiModuleToCargo.py index 66a9f9833..4f5b6bcf8 100644 --- a/gui/fitCommands/guiModuleToCargo.py +++ b/gui/fitCommands/guiModuleToCargo.py @@ -14,7 +14,7 @@ pyfalog = Logger(__name__) class GuiModuleToCargoCommand(wx.Command): def __init__(self, fitID, moduleIdx, cargoIdx, copy=False): - wx.Command.__init__(self, True, "Module State Change") + wx.Command.__init__(self, True, "Module to Cargo") self.mainFrame = gui.mainFrame.MainFrame.getInstance() self.sFit = Fit.getInstance() self.fitID = fitID diff --git a/gui/fitCommands/guiOptimizePrice.py b/gui/fitCommands/guiOptimizePrice.py new file mode 100644 index 000000000..e41edab81 --- /dev/null +++ b/gui/fitCommands/guiOptimizePrice.py @@ -0,0 +1,12 @@ +import wx + + +class GuiOptimizePriceCommand(wx.Command): + def __init__(self): + wx.Command.__init__(self, True, "Optimize Price") + + def Do(self): + pass + + def Undo(self): + pass diff --git a/gui/fitCommands/guiRemoveCargo.py b/gui/fitCommands/guiRemoveCargo.py index f9aa5872a..54323a30e 100644 --- a/gui/fitCommands/guiRemoveCargo.py +++ b/gui/fitCommands/guiRemoveCargo.py @@ -8,7 +8,7 @@ from .calc.fitRemoveCargo import FitRemoveCargoCommand class GuiRemoveCargoCommand(wx.Command): def __init__(self, fitID, itemID): - wx.Command.__init__(self, True, "Module Charge Add") + wx.Command.__init__(self, True, "Cargo Remove") self.mainFrame = gui.mainFrame.MainFrame.getInstance() self.sFit = Fit.getInstance() self.internal_history = wx.CommandProcessor() diff --git a/gui/fitCommands/guiRemoveDrone.py b/gui/fitCommands/guiRemoveDrone.py index 42e651e3d..0d3f9770d 100644 --- a/gui/fitCommands/guiRemoveDrone.py +++ b/gui/fitCommands/guiRemoveDrone.py @@ -8,7 +8,7 @@ from .calc.fitRemoveDrone import FitRemoveDroneCommand class GuiRemoveDroneCommand(wx.Command): def __init__(self, fitID, position, amount=1): - wx.Command.__init__(self, True, "Cargo Add") + wx.Command.__init__(self, True, "Drone Remove") self.mainFrame = gui.mainFrame.MainFrame.getInstance() self.sFit = Fit.getInstance() self.internal_history = wx.CommandProcessor() diff --git a/gui/fitCommands/guiRemoveFighter.py b/gui/fitCommands/guiRemoveFighter.py index f1b983ec5..c1f283700 100644 --- a/gui/fitCommands/guiRemoveFighter.py +++ b/gui/fitCommands/guiRemoveFighter.py @@ -8,7 +8,7 @@ from .calc.fitRemoveFighter import FitRemoveFighterCommand class GuiRemoveFighterCommand(wx.Command): def __init__(self, fitID, position): - wx.Command.__init__(self, True, "Module Remove") + wx.Command.__init__(self, True, "Fighter Remove") self.mainFrame = gui.mainFrame.MainFrame.getInstance() self.sFit = Fit.getInstance() self.fitID = fitID diff --git a/gui/fitCommands/guiRemoveProjected.py b/gui/fitCommands/guiRemoveProjected.py index 74d1ab308..7fb54e5fc 100644 --- a/gui/fitCommands/guiRemoveProjected.py +++ b/gui/fitCommands/guiRemoveProjected.py @@ -27,7 +27,7 @@ class GuiRemoveProjectedCommand(wx.Command): } def __init__(self, fitID, thing): - wx.Command.__init__(self, True, "Projected Add") + wx.Command.__init__(self, True, "Projected Remove") self.mainFrame = gui.mainFrame.MainFrame.getInstance() self.sFit = Fit.getInstance() self.internal_history = wx.CommandProcessor() diff --git a/gui/fitCommands/guiSetMode.py b/gui/fitCommands/guiSetMode.py index 9639028f9..f7e5e09be 100644 --- a/gui/fitCommands/guiSetMode.py +++ b/gui/fitCommands/guiSetMode.py @@ -8,7 +8,7 @@ from .calc.fitSetMode import FitSetModeCommand class GuiSetModeCommand(wx.Command): def __init__(self, fitID, mode): - wx.Command.__init__(self, True, "Cargo Add") + wx.Command.__init__(self, True, "Mode Set") self.mainFrame = gui.mainFrame.MainFrame.getInstance() self.sFit = Fit.getInstance() self.internal_history = wx.CommandProcessor() diff --git a/service/port/multibuy.py b/service/port/multibuy.py index 6c4074e82..69f82e4e7 100644 --- a/service/port/multibuy.py +++ b/service/port/multibuy.py @@ -70,7 +70,7 @@ def exportMultiBuy(fit, options, callback): if options[Options.OPTIMIZE_PRICES.value]: - def processCheaperMapCb(replacementsCheaper): + def formatCheaperExportCb(replacementsCheaper): updatedAmounts = {} for item, itemAmount in itemAmounts.items(): _addItem(updatedAmounts, replacementsCheaper.get(item, item), itemAmount) @@ -78,7 +78,7 @@ def exportMultiBuy(fit, options, callback): callback(string) priceSvc = sPrc.getInstance() - priceSvc.findCheaperReplacements(itemAmounts, processCheaperMapCb) + priceSvc.findCheaperReplacements(itemAmounts, formatCheaperExportCb) else: string = _prepareString(fit.ship.item, itemAmounts) if callback: