diff --git a/graphs/data/fitRemoteReps/graph.py b/graphs/data/fitRemoteReps/graph.py index 3f26a0d40..e299e44ac 100644 --- a/graphs/data/fitRemoteReps/graph.py +++ b/graphs/data/fitRemoteReps/graph.py @@ -35,7 +35,7 @@ class FitRemoteRepsGraph(FitGraph): inputs = [ Input(handle='time', unit='s', label='Time', iconID=1392, defaultValue=None, defaultRange=(0, 80), secondaryTooltip='When set, uses repairing ship\'s exact RR stats at a given time\nWhen not set, uses attacker\'s RR 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 repairing ship and the target, as seen in overview (surface-to-surface)', secondaryTooltip='Distance between the repairing ship and the target, as seen in overview (surface-to-surface)')] - srcExtraCols = () + srcExtraCols = ('ShieldRR', 'ArmorRR', 'HullRR') # Calculation stuff _normalizers = {('distance', 'km'): lambda v, src, tgt: None if v is None else v * 1000} diff --git a/gui/builtinViewColumns/attributeDisplayGraph.py b/gui/builtinViewColumns/attributeDisplayGraph.py index 62126bd84..a28bbed55 100644 --- a/gui/builtinViewColumns/attributeDisplayGraph.py +++ b/gui/builtinViewColumns/attributeDisplayGraph.py @@ -317,3 +317,60 @@ class ScanResolutionColumn(GraphColumn): ScanResolutionColumn.register() + + +class ShieldRRColumn(GraphColumn): + + name = 'ShieldRR' + stickPrefixToValue = True + + def __init__(self, fittingView, params): + super().__init__(fittingView, 1384, (3, 0, 3)) + + def _getValue(self, fit): + defaultSpoolValue = eos.config.settings['globalDefaultSpoolupPercentage'] + return fit.getRemoteReps(spoolOptions=SpoolOptions(SpoolType.SCALE, defaultSpoolValue, False)).shield, 'HP/s' + + def _getFitTooltip(self): + return 'Declared shield repair speed' + + +ShieldRRColumn.register() + + +class ArmorRRColumn(GraphColumn): + + name = 'ArmorRR' + stickPrefixToValue = True + + def __init__(self, fittingView, params): + super().__init__(fittingView, 80, (3, 0, 3)) + + def _getValue(self, fit): + defaultSpoolValue = eos.config.settings['globalDefaultSpoolupPercentage'] + return fit.getRemoteReps(spoolOptions=SpoolOptions(SpoolType.SCALE, defaultSpoolValue, False)).armor, 'HP/s' + + def _getFitTooltip(self): + return 'Declared armor repair speed' + + +ArmorRRColumn.register() + + +class HullRRColumn(GraphColumn): + + name = 'HullRR' + stickPrefixToValue = True + + def __init__(self, fittingView, params): + super().__init__(fittingView, 67, (3, 0, 3)) + + def _getValue(self, fit): + defaultSpoolValue = eos.config.settings['globalDefaultSpoolupPercentage'] + return fit.getRemoteReps(spoolOptions=SpoolOptions(SpoolType.SCALE, defaultSpoolValue, False)).hull, 'HP/s' + + def _getFitTooltip(self): + return 'Declared hull repair speed' + + +HullRRColumn.register()