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

Show-hide vectors and target list as needed

Browse Source
This commit is contained in:
DarkPhoenix
2019-06-25 16:37:33 +03:00
parent 509a45dcee
commit 0420f399ad
2 changed files with 37 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gui/graphFrame/frame.py
View File

@@ -113,7 +113,7 @@ class GraphFrame(wx.Frame):
for view in Graph.views:
self.graphSelection.Append(view.name, view())
self.graphSelection.SetSelection(0)
self.ctrlPanel.updateControlsForView(self.getView())
self.ctrlPanel.updateControls(self.getView())
# Event bindings - local events
self.Bind(wx.EVT_CLOSE, self.closeEvent)
@@ -153,7 +153,7 @@ class GraphFrame(wx.Frame):
def OnGraphSwitched(self, event):
self.clearCache()
self.ctrlPanel.updateControlsForView(self.getView())
self.ctrlPanel.updateControls(self.getView())
self.draw()
event.Skip()

48
gui/graphFrame/panel.py
View File

@@ -61,19 +61,19 @@ class GraphControlPanel(wx.Panel):
self.inputsSizer = wx.BoxSizer(wx.VERTICAL)
graphOptsSizer.Add(self.inputsSizer, 0, wx.EXPAND | wx.ALL, 0)
srcVectorSizer = wx.BoxSizer(wx.VERTICAL)
self.srcVectorLabel = wx.StaticText(self, wx.ID_ANY, 'Attacker')
srcVectorSizer.Add(self.srcVectorLabel, 0, wx.ALIGN_CENTER_HORIZONTAL| wx.BOTTOM, 5)
self.srcVectorSizer = wx.BoxSizer(wx.VERTICAL)
self.srcVectorLabel = wx.StaticText(self, wx.ID_ANY, '')
self.srcVectorSizer.Add(self.srcVectorLabel, 0, wx.ALIGN_CENTER_HORIZONTAL| wx.BOTTOM, 5)
self.srcVector = VectorPicker(self, style=wx.NO_BORDER, size=75, offset=90)
srcVectorSizer.Add(self.srcVector, 0, wx.SHAPED | wx.ALIGN_CENTER_HORIZONTAL | wx.ALIGN_CENTER_VERTICAL | wx.ALL, 0)
graphOptsSizer.Add(srcVectorSizer, 0, wx.EXPAND | wx.LEFT, 30)
self.srcVectorSizer.Add(self.srcVector, 0, wx.SHAPED | wx.ALIGN_CENTER_HORIZONTAL | wx.ALIGN_CENTER_VERTICAL | wx.ALL, 0)
graphOptsSizer.Add(self.srcVectorSizer, 0, wx.EXPAND | wx.LEFT, 30)
tgtVectorSizer = wx.BoxSizer(wx.VERTICAL)
self.tgtVectorLabel = wx.StaticText(self, wx.ID_ANY, 'Target')
tgtVectorSizer.Add(self.tgtVectorLabel, 0, wx.ALIGN_CENTER_HORIZONTAL | wx.BOTTOM, 5)
self.tgtVectorSizer = wx.BoxSizer(wx.VERTICAL)
self.tgtVectorLabel = wx.StaticText(self, wx.ID_ANY, '')
self.tgtVectorSizer.Add(self.tgtVectorLabel, 0, wx.ALIGN_CENTER_HORIZONTAL | wx.BOTTOM, 5)
self.tgtVector = DirectionPicker(self, style=wx.NO_BORDER, size=75, offset=-90)
tgtVectorSizer.Add(self.tgtVector, 0, wx.SHAPED | wx.ALIGN_CENTER_HORIZONTAL | wx.ALIGN_CENTER_VERTICAL | wx.ALL, 0)
graphOptsSizer.Add(tgtVectorSizer, 0, wx.EXPAND | wx.LEFT, 10)
self.tgtVectorSizer.Add(self.tgtVector, 0, wx.SHAPED | wx.ALIGN_CENTER_HORIZONTAL | wx.ALIGN_CENTER_VERTICAL | wx.ALL, 0)
graphOptsSizer.Add(self.tgtVectorSizer, 0, wx.EXPAND | wx.LEFT, 10)
optsSizer.Add(graphOptsSizer, 0, wx.EXPAND | wx.ALL, 0)
mainSizer.Add(optsSizer, 0, wx.EXPAND | wx.ALL, 10)
@@ -107,7 +107,7 @@ class GraphControlPanel(wx.Panel):
def showY0(self):
return self.showY0Cb.GetValue()
def updateControlsForView(self, view):
def updateControls(self, view):
self.inputsSizer.Clear()
for child in self.Children:
if child not in self.indestructible:
@@ -115,7 +115,6 @@ class GraphControlPanel(wx.Panel):
self.ySubSelection.Clear()
self.xSubSelection.Clear()
def formatLabel(axisDef):
if axisDef.unit is None:
return axisDef.label
@@ -128,7 +127,7 @@ class GraphControlPanel(wx.Panel):
self.xSubSelection.Append(formatLabel(xDef), xDef.handle)
self.xSubSelection.SetSelection(0)
# Setup inputs
# Inputs
shownHandles = set()
srcVectorDef = view.srcVectorDef
if srcVectorDef is not None:
@@ -165,8 +164,31 @@ class GraphControlPanel(wx.Panel):
fieldLabel = wx.StaticText(self, wx.ID_ANY, formatLabel(inputDef))
fieldSizer.Add(fieldLabel, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 0)
self.inputsSizer.Add(fieldSizer, 0, wx.EXPAND | wx.BOTTOM, 5)
# Vectors
if view.srcVectorDef is not None:
self.srcVectorLabel.SetLabel(view.srcVectorDef.label)
self.srcVector.Show(True)
self.srcVectorLabel.Show(True)
else:
self.srcVector.Show(False)
self.srcVectorLabel.Show(False)
if view.tgtVectorDef is not None:
self.tgtVectorLabel.SetLabel(view.tgtVectorDef.label)
self.tgtVector.Show(True)
self.tgtVectorLabel.Show(True)
else:
self.tgtVector.Show(False)
self.tgtVectorLabel.Show(False)
# Target list
self.targetList.Show(view.hasTargets)
self.Layout()
def updateInputs(self, view):
pass
def OnShowY0Change(self, event):
event.Skip()
self.graphFrame.draw()