diff --git a/graphs/data/fitDamageStats/graph.py b/graphs/data/fitDamageStats/graph.py index df5d83648..57495daf6 100644 --- a/graphs/data/fitDamageStats/graph.py +++ b/graphs/data/fitDamageStats/graph.py @@ -20,6 +20,7 @@ from graphs.data.base import FitGraph, XDef, YDef, Input, VectorDef from service.const import GraphCacheCleanupReason +from service.settings import GraphSettings from .cache import ProjectedDataCache, TimeCache from .getter import ( Distance2DpsGetter, Distance2VolleyGetter, Distance2InflictedDamageGetter, @@ -58,10 +59,6 @@ class FitDamageStatsGraph(FitGraph): XDef(handle='tgtSpeed', unit='%', label='Target speed', mainInput=('tgtSpeed', '%')), XDef(handle='tgtSigRad', unit='m', label='Target signature radius', mainInput=('tgtSigRad', '%')), XDef(handle='tgtSigRad', unit='%', label='Target signature radius', mainInput=('tgtSigRad', '%'))] - yDefs = [ - YDef(handle='dps', unit=None, label='DPS'), - YDef(handle='volley', unit=None, label='Volley'), - YDef(handle='damage', unit=None, label='Damage inflicted')] inputs = [ Input(handle='time', unit='s', label='Time', iconID=1392, defaultValue=None, defaultRange=(0, 80), secondaryTooltip='When set, uses exact attacker\'s damage stats of at a given time\nWhen not set, uses attacker\'s damage stats as shown in stats panel of main window'), Input(handle='distance', unit='km', label='Distance', iconID=1391, defaultValue=None, defaultRange=(0, 100), mainTooltip='Distance between the attacker and the target, as seen in overview (surface-to-surface)', secondaryTooltip='Distance between the attacker and the target, as seen in overview (surface-to-surface)\nWhen set, places the target that far away from the attacker\nWhen not set, attacker\'s weapons always hit the target'), @@ -73,6 +70,14 @@ class FitDamageStatsGraph(FitGraph): srcExtraCols = ('Dps', 'Volley', 'Speed', 'Radius') tgtExtraCols = ('Target Resists', 'Speed', 'SigRadius', 'Radius') + @property + def yDefs(self): + ignoreResists = GraphSettings.getInstance().get('ignoreResists') + return [ + YDef(handle='dps', unit=None, label='DPS' if ignoreResists else 'Effective DPS'), + YDef(handle='volley', unit=None, label='Volley' if ignoreResists else 'Effective volley'), + YDef(handle='damage', unit=None, label='Damage inflicted' if ignoreResists else 'Effective damage inflicted')] + # Calculation stuff _normalizers = { ('distance', 'km'): lambda v, src, tgt: None if v is None else v * 1000, diff --git a/graphs/gui/frame.py b/graphs/gui/frame.py index 5d70dc50d..8f1c63b44 100644 --- a/graphs/gui/frame.py +++ b/graphs/gui/frame.py @@ -205,6 +205,8 @@ class GraphFrame(wx.Frame): def OnGraphOptionChanged(self, event): event.Skip() + if getattr(event, 'refreshAxeLabels', False): + self.ctrlPanel.refreshAxeLabels() self.clearCache(reason=GraphCacheCleanupReason.optionChanged) self.draw() diff --git a/graphs/gui/panel.py b/graphs/gui/panel.py index 6d887df99..df6c32029 100644 --- a/graphs/gui/panel.py +++ b/graphs/gui/panel.py @@ -256,6 +256,17 @@ class GraphControlPanel(wx.Panel): continue addInputField(inputDef, handledHandles) + def refreshAxeLabels(self): + # Currently we need to refresh only Y for dps graph + selectedY = self.ySubSelection.GetSelection() + view = self.graphFrame.getView() + self.Freeze() + self.ySubSelection.Clear() + for yDef in view.yDefs: + self.ySubSelection.Append(self.formatLabel(yDef), yDef) + self.ySubSelection.SetSelection(selectedY) + self.Thaw() + def OnShowLegendChange(self, event): event.Skip() self.graphFrame.draw() diff --git a/gui/builtinContextMenus/graphDmgIgnoreResists.py b/gui/builtinContextMenus/graphDmgIgnoreResists.py index d649a82ef..cecfafbdd 100644 --- a/gui/builtinContextMenus/graphDmgIgnoreResists.py +++ b/gui/builtinContextMenus/graphDmgIgnoreResists.py @@ -21,7 +21,7 @@ class GraphDmgIgnoreResistsMenu(ContextMenuUnconditional): def activate(self, callingWindow, fullContext, i): self.settings.set('ignoreResists', not self.settings.get('ignoreResists')) - wx.PostEvent(self.mainFrame, GE.GraphOptionChanged()) + wx.PostEvent(self.mainFrame, GE.GraphOptionChanged(refreshAxeLabels=True)) def isChecked(self, i): return self.settings.get('ignoreResists')