diff --git a/gui/builtinContextMenus/__init__.py b/gui/builtinContextMenus/__init__.py index 6905d8010..af0e5e4ca 100644 --- a/gui/builtinContextMenus/__init__.py +++ b/gui/builtinContextMenus/__init__.py @@ -42,5 +42,6 @@ from gui.builtinContextMenus import ( # noqa: E402,F401 targetResists, # Graph extra options graphDmgIgnoreResists, - graphDmgDroneMode + graphDmgApplyProjected, + graphDmgDroneMode, ) diff --git a/gui/builtinContextMenus/graphDmgApplyProjected.py b/gui/builtinContextMenus/graphDmgApplyProjected.py new file mode 100644 index 000000000..23603ee4b --- /dev/null +++ b/gui/builtinContextMenus/graphDmgApplyProjected.py @@ -0,0 +1,31 @@ +# noinspection PyPackageRequirements +import wx + +import gui.globalEvents as GE +import gui.mainFrame +from gui.contextMenu import ContextMenuUnconditional +from service.settings import GraphSettings + + +class GraphDmgApplyProjectedMenu(ContextMenuUnconditional): + + def __init__(self): + self.mainFrame = gui.mainFrame.MainFrame.getInstance() + self.settings = GraphSettings.getInstance() + + def display(self, srcContext): + return srcContext == 'dmgStatsGraph' + + def getText(self, itmContext): + return 'Apply Attacker Webs and TPs' + + def activate(self, fullContext, i): + self.settings.set('applyProjected', not self.settings.get('applyProjected')) + wx.PostEvent(self.mainFrame, GE.GraphOptionChanged()) + + @property + def checked(self): + return self.settings.get('applyProjected') + + +GraphDmgApplyProjectedMenu.register() diff --git a/gui/builtinContextMenus/graphDmgDroneMode.py b/gui/builtinContextMenus/graphDmgDroneMode.py index 7e17de9ed..93bf687db 100644 --- a/gui/builtinContextMenus/graphDmgDroneMode.py +++ b/gui/builtinContextMenus/graphDmgDroneMode.py @@ -10,7 +10,7 @@ from service.const import GraphDpsDroneMode from service.settings import GraphSettings -class TargetResists(ContextMenuUnconditional): +class GraphDmgDroneModeMenu(ContextMenuUnconditional): def __init__(self): self.mainFrame = gui.mainFrame.MainFrame.getInstance() @@ -38,8 +38,8 @@ class TargetResists(ContextMenuUnconditional): self.idOptionMap = {} optionMap = OrderedDict([ (GraphDpsDroneMode.auto, 'Auto'), - (GraphDpsDroneMode.followAttacker, 'Stick to attacker'), - (GraphDpsDroneMode.followTarget, 'Stick to target')]) + (GraphDpsDroneMode.followAttacker, 'Stick to Attacker'), + (GraphDpsDroneMode.followTarget, 'Stick to Target')]) for option, label in optionMap.items(): menuId = ContextMenuUnconditional.nextID() item = wx.MenuItem(m, menuId, label, kind=wx.ITEM_CHECK) @@ -50,4 +50,4 @@ class TargetResists(ContextMenuUnconditional): return m -TargetResists.register() +GraphDmgDroneModeMenu.register() diff --git a/gui/builtinContextMenus/graphDmgIgnoreResists.py b/gui/builtinContextMenus/graphDmgIgnoreResists.py index dc3b43267..765c3b384 100644 --- a/gui/builtinContextMenus/graphDmgIgnoreResists.py +++ b/gui/builtinContextMenus/graphDmgIgnoreResists.py @@ -7,7 +7,7 @@ from gui.contextMenu import ContextMenuUnconditional from service.settings import GraphSettings -class GraphDmgIgnoreResists(ContextMenuUnconditional): +class GraphDmgIgnoreResistsMenu(ContextMenuUnconditional): def __init__(self): self.mainFrame = gui.mainFrame.MainFrame.getInstance() @@ -17,7 +17,7 @@ class GraphDmgIgnoreResists(ContextMenuUnconditional): return srcContext == 'dmgStatsGraph' def getText(self, itmContext): - return "Ignore Target Resists" + return 'Ignore Target Resists' def activate(self, fullContext, i): self.settings.set('ignoreResists', not self.settings.get('ignoreResists')) @@ -28,4 +28,4 @@ class GraphDmgIgnoreResists(ContextMenuUnconditional): return self.settings.get('ignoreResists') -GraphDmgIgnoreResists.register() +GraphDmgIgnoreResistsMenu.register() diff --git a/service/settings.py b/service/settings.py index edc18c858..7e870f911 100644 --- a/service/settings.py +++ b/service/settings.py @@ -518,7 +518,8 @@ class GraphSettings: def __init__(self): defaults = { 'mobileDroneMode': GraphDpsDroneMode.auto, - 'ignoreResists': True} + 'ignoreResists': True, + 'applyProjected': True} self.settings = SettingsProvider.getInstance().getSettings('graphSettings', defaults) def get(self, type):