From 022f0c06ee307648c87eb5a2c7da8f3b198f462e Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Tue, 25 Jun 2019 08:23:21 +0300 Subject: [PATCH] Do not show sig % except for the cases when it's used as main value range --- gui/builtinGraphs/base.py | 2 +- gui/builtinGraphs/fitDamageStats.py | 8 ++++---- gui/graphFrame/panel.py | 9 +++++---- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/gui/builtinGraphs/base.py b/gui/builtinGraphs/base.py index f3f31a70c..77cc1414c 100644 --- a/gui/builtinGraphs/base.py +++ b/gui/builtinGraphs/base.py @@ -132,7 +132,7 @@ class Graph(metaclass=ABCMeta): XDef = namedtuple('XDef', ('handle', 'label', 'unit', 'mainInputHandle')) YDef = namedtuple('YDef', ('handle', 'label', 'unit', 'eosGraph')) -Input = namedtuple('Input', ('handle', 'label', 'unit', 'iconID', 'defaultValue', 'defaultRange')) +Input = namedtuple('Input', ('handle', 'label', 'unit', 'iconID', 'defaultValue', 'defaultRange', 'mainOnly')) # noinspection PyUnresolvedReferences diff --git a/gui/builtinGraphs/fitDamageStats.py b/gui/builtinGraphs/fitDamageStats.py index f0a80717d..5f57fc32c 100644 --- a/gui/builtinGraphs/fitDamageStats.py +++ b/gui/builtinGraphs/fitDamageStats.py @@ -50,10 +50,10 @@ class FitDamageStatsGraph(Graph): @property def inputs(self): return [ - Input(handle='time', label='Time', unit='s', iconID=1392, defaultValue=None, defaultRange=(0, 80)), - Input(handle='distance', label='Distance', unit='km', iconID=1391, defaultValue=50, defaultRange=(0, 100)), - Input(handle='tgtSpeed', label='Target speed', unit='%', iconID=1389, defaultValue=100, defaultRange=(0, 100)), - Input(handle='tgtSigRad', label='Target signature radius', unit='%', iconID=1390, defaultValue=100, defaultRange=(100, 200))] + Input(handle='time', label='Time', unit='s', iconID=1392, defaultValue=None, defaultRange=(0, 80), mainOnly=False), + Input(handle='distance', label='Distance', unit='km', iconID=1391, defaultValue=50, defaultRange=(0, 100), mainOnly=False), + Input(handle='tgtSpeed', label='Target speed', unit='%', iconID=1389, defaultValue=100, defaultRange=(0, 100), mainOnly=False), + Input(handle='tgtSigRad', label='Target signature radius', unit='%', iconID=1390, defaultValue=100, defaultRange=(100, 200), mainOnly=True)] @property def hasTargets(self): diff --git a/gui/graphFrame/panel.py b/gui/graphFrame/panel.py index 1cb185930..7ea4de3b5 100644 --- a/gui/graphFrame/panel.py +++ b/gui/graphFrame/panel.py @@ -130,11 +130,12 @@ class GraphControlPanel(wx.Panel): if view.hasTgtVector: shownHandles.add(view.tgtVectorLengthHandle) shownHandles.add(view.tgtVectorAngleHandle) - for inputHandle in (view.xDefs[0].mainInputHandle, *(i.handle for i in view.inputs)): - if inputHandle in shownHandles: + for inputDef in (view.inputMap[view.xDefs[0].mainInputHandle], *(i for i in view.inputs)): + if inputDef.handle != view.xDefs[0].mainInputHandle and inputDef.mainOnly: continue - shownHandles.add(inputHandle) - inputDef = view.inputMap[inputHandle] + if inputDef.handle in shownHandles: + continue + shownHandles.add(inputDef.handle) textBox = wx.TextCtrl(self, wx.ID_ANY, style=0) textBox.Bind(wx.EVT_TEXT, self.OnFieldChanged) self.inputsSizer.Add(textBox, 1, wx.EXPAND | wx.ALIGN_CENTER_VERTICAL | wx.ALL, 3)