dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity

Do not show sig % except for the cases when it's used as main value range

Browse Source
This commit is contained in:
DarkPhoenix
2019-06-25 08:23:21 +03:00
parent 5ffd644ad9
commit 022f0c06ee
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gui/builtinGraphs/base.py
View File

@@ -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

8
gui/builtinGraphs/fitDamageStats.py
View File

@@ -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):

9
gui/graphFrame/panel.py
View File

@@ -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)