From 5f58307bf38c01e4256f713a5103c5542316ffc4 Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Mon, 30 Sep 2019 02:04:24 +0300 Subject: [PATCH] Add projection range commands to projected fighters --- .../itemProjectionRange.py | 3 +- gui/fitCommands/__init__.py | 1 + .../fighter/projectedChangeProjectionRange.py | 37 ++++++++++++++++ .../projectedFighter/changeProjectionRange.py | 42 +++++++++++++++++++ 4 files changed, 82 insertions(+), 1 deletion(-) create mode 100644 gui/fitCommands/calc/fighter/projectedChangeProjectionRange.py create mode 100644 gui/fitCommands/gui/projectedFighter/changeProjectionRange.py diff --git a/gui/builtinContextMenus/itemProjectionRange.py b/gui/builtinContextMenus/itemProjectionRange.py index b71a1721d..55217eadd 100644 --- a/gui/builtinContextMenus/itemProjectionRange.py +++ b/gui/builtinContextMenus/itemProjectionRange.py @@ -68,7 +68,8 @@ class ChangeItemProjectionRange(ContextMenuSingle): elif isinstance(mainItem, Fighter): if mainItem in fit.projectedFighters: position = fit.projectedFighters.index(mainItem) - pass + self.mainFrame.command.Submit(cmd.GuiChangeProjectedFighterProjectionRangeCommand( + fitID=fitID, position=position, projectionRange=newRange)) ChangeItemProjectionRange.register() diff --git a/gui/fitCommands/__init__.py b/gui/fitCommands/__init__.py index 5b0a13afa..d09612d5d 100644 --- a/gui/fitCommands/__init__.py +++ b/gui/fitCommands/__init__.py @@ -65,6 +65,7 @@ from .gui.projectedFighter.abilityToggleState import GuiToggleProjectedFighterAb from .gui.projectedFighter.add import GuiAddProjectedFighterCommand from .gui.projectedFighter.changeAmount import GuiChangeProjectedFighterAmountCommand from .gui.projectedFighter.changeMetas import GuiChangeProjectedFighterMetasCommand +from .gui.projectedFighter.changeProjectionRange import GuiChangeProjectedFighterProjectionRangeCommand from .gui.projectedFit.add import GuiAddProjectedFitsCommand from .gui.projectedFit.changeAmount import GuiChangeProjectedFitAmountCommand from .gui.projectedFit.changeProjectionRange import GuiChangeProjectedFitProjectionRangeCommand diff --git a/gui/fitCommands/calc/fighter/projectedChangeProjectionRange.py b/gui/fitCommands/calc/fighter/projectedChangeProjectionRange.py new file mode 100644 index 000000000..74e7ef068 --- /dev/null +++ b/gui/fitCommands/calc/fighter/projectedChangeProjectionRange.py @@ -0,0 +1,37 @@ +import wx +from logbook import Logger + +from service.fit import Fit + + +pyfalog = Logger(__name__) + + +class CalcChangeProjectedFighterProjectionRangeCommand(wx.Command): + + def __init__(self, fitID, position, projectionRange): + wx.Command.__init__(self, True, 'Change Projected Fighter Projection Range') + self.fitID = fitID + self.position = position + self.projectionRange = projectionRange + self.savedProjectionRange = None + + def Do(self): + pyfalog.debug('Doing changing of projected fighter projection range to {} at position {} for fit {}'.format( + self.projectionRange, self.position, self.fitID)) + fit = Fit.getInstance().getFit(self.fitID) + fighter = fit.projectedFighters[self.position] + if fighter.projectionRange == self.projectionRange: + return False + self.savedProjectionRange = fighter.projectionRange + fighter.projectionRange = self.projectionRange + return True + + def Undo(self): + pyfalog.debug('Undoing changing of projected fighter projection range to {} at position {} for fit {}'.format( + self.projectionRange, self.position, self.fitID)) + cmd = CalcChangeProjectedFighterProjectionRangeCommand( + fitID=self.fitID, + position=self.position, + projectionRange=self.savedProjectionRange) + return cmd.Do() diff --git a/gui/fitCommands/gui/projectedFighter/changeProjectionRange.py b/gui/fitCommands/gui/projectedFighter/changeProjectionRange.py new file mode 100644 index 000000000..c122947ba --- /dev/null +++ b/gui/fitCommands/gui/projectedFighter/changeProjectionRange.py @@ -0,0 +1,42 @@ +import wx + +import eos.db +import gui.mainFrame +from gui import globalEvents as GE +from gui.fitCommands.calc.fighter.projectedChangeProjectionRange import CalcChangeProjectedFighterProjectionRangeCommand +from gui.fitCommands.helpers import InternalCommandHistory +from service.fit import Fit + + +class GuiChangeProjectedFighterProjectionRangeCommand(wx.Command): + + def __init__(self, fitID, position, projectionRange): + wx.Command.__init__(self, True, 'Change Projected Fighter Projection Range') + self.internalHistory = InternalCommandHistory() + self.fitID = fitID + self.position = position + self.projectionRange = projectionRange + + def Do(self): + cmd = CalcChangeProjectedFighterProjectionRangeCommand( + fitID=self.fitID, + position=self.position, + projectionRange=self.projectionRange) + success = self.internalHistory.submit(cmd) + eos.db.flush() + sFit = Fit.getInstance() + sFit.recalc(self.fitID) + sFit.fill(self.fitID) + eos.db.commit() + wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,))) + return success + + def Undo(self): + success = self.internalHistory.undoAll() + eos.db.flush() + sFit = Fit.getInstance() + sFit.recalc(self.fitID) + sFit.fill(self.fitID) + eos.db.commit() + wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,))) + return success