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

Return input data in InputData objects for easier access

Browse Source
This commit is contained in:
DarkPhoenix
2019-06-27 18:52:23 +03:00
parent 1e760b2111
commit ef81f9c830
3 changed files with 55 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
gui/builtinGraphs/base.py
View File

@@ -82,11 +82,10 @@ class Graph(metaclass=ABCMeta):
def redrawOnEffectiveChange(self):
return False
def getPlotPoints(self, fit, extraData, xRange, xAmount, yType):
def getPlotPoints(self, mainInput, miscInputs, xSpec, ySpec, fit, tgt=None):
try:
plotData = self._cache[fit.ID][yType]
plotData = self._cache[fit.ID][ySpec]
except KeyError:
xRange = self.parseRange(xRange)
extraData = {k: float(v) if v else None for k, v in extraData.items()}
graph = getattr(self, self.yDefs[yType].eosGraph, None)
plotData = graph.getPlotPoints(fit, extraData, xRange, xAmount)
@@ -94,23 +93,12 @@ class Graph(metaclass=ABCMeta):
fitCache[yType] = plotData
return plotData
def parseRange(self, string):
m = re.match('\s*(?P<first>\d+(\.\d+)?)\s*(-\s*(?P<second>\d+(\.\d+)?))?', string)
if m is None:
return (0, 0)
first = float(m.group('first'))
second = m.group('second')
second = float(second) if second is not None else 0
low = min(first, second)
high = max(first, second)
return (low, high)
def clearCache(self, key=None):
if key is None:
self._cache.clear()
elif key in self._cache:
del self._cache[key]
for yDef in self.yDefs.values():
for yDef in self.yDefs:
getattr(self, yDef.eosGraph).clearCache(key=key)

10
gui/graphFrame/frame.py
View File

@@ -178,8 +178,7 @@ class GraphFrame(wx.Frame):
return self.graphSelection.GetClientData(self.graphSelection.GetSelection())
def clearCache(self, key=None):
pass
#self.getView().clearCache(key=key)
self.getView().clearCache(key=key)
def draw(self):
global mpl_version
@@ -189,8 +188,7 @@ class GraphFrame(wx.Frame):
if not self:
pyfalog.warning('GraphFrame handled event, however GraphFrame no longer exists. Ignoring event')
return
self.ctrlPanel.getValues()
# values = self.ctrlPanel.getValues()
values = self.ctrlPanel.getValues()
# view = self.getView()
# self.subplot.clear()
# self.subplot.grid(True)
@@ -274,6 +272,6 @@ class GraphFrame(wx.Frame):
#
# for l in leg.get_lines():
# l.set_linewidth(1)
self.canvas.draw()
#
# self.canvas.draw()
self.Refresh()

74
gui/graphFrame/panel.py
View File

@@ -18,6 +18,8 @@
# =============================================================================
from collections import namedtuple
# noinspection PyPackageRequirements
import wx
@@ -28,12 +30,17 @@ from .lists import FitList, TargetList
from .vector import VectorPicker
InputData = namedtuple('InputData', ('handle', 'unit', 'value'))
InputBox = namedtuple('InputBox', ('handle', 'unit', 'textBox', 'icon', 'label'))
class GraphControlPanel(wx.Panel):
def __init__(self, graphFrame, parent):
super().__init__(parent)
self.graphFrame = graphFrame
self._inputs = {}
self._mainInputBox = None
self._miscInputBoxes = []
self._storedRanges = {}
self._storedConsts = {}
@@ -148,12 +155,15 @@ class GraphControlPanel(wx.Panel):
if storeInputs:
self._storeCurrentValues()
# Clean up old inputs
for children in self._inputs.values():
for child in children:
for inputBox in (self._mainInputBox, *self._miscInputBoxes):
if inputBox is None:
continue
for child in (inputBox.textBox, inputBox.icon, inputBox.label):
if child is not None:
child.Destroy()
self.inputsSizer.Clear()
self._inputs.clear()
self._mainInputBox = None
self._miscInputBoxes.clear()
# Update vectors
def handleVector(vectorDef, vector, handledHandles, mainInputHandle):
@@ -200,8 +210,14 @@ class GraphControlPanel(wx.Panel):
fieldSizer.Add(fieldIcon, 0, wx.ALIGN_CENTER_VERTICAL | wx.RIGHT, 3)
fieldLabel = wx.StaticText(self, wx.ID_ANY, self._formatLabel(inputDef))
fieldSizer.Add(fieldLabel, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 0)
self._inputs[(inputDef.handle, inputDef.unit)] = (fieldTextBox, fieldIcon, fieldLabel)
self.inputsSizer.Add(fieldSizer, 0, wx.EXPAND | wx.BOTTOM, 5)
# Store info about added input box
inputBox = InputBox(handle=inputDef.handle, unit=inputDef.unit, textBox=fieldTextBox, icon=fieldIcon, label=fieldLabel)
if mainInput:
self._mainInputBox = inputBox
else:
self._miscInputBoxes.append(inputBox)
addInputField(view.inputMap[selectedX.mainInput], handledHandles, mainInput=True)
for inputDef in view.inputs:
@@ -238,27 +254,35 @@ class GraphControlPanel(wx.Panel):
def getValues(self):
view = self.graphFrame.getView()
values = {}
main = None
misc = []
processedHandles = set()
def addMiscData(handle, unit, value):
if handle in processedHandles:
return
inputData = InputData(handle=handle, unit=unit, value=value)
misc.append(inputData)
# Main input box
main = InputData(handle=self._mainInputBox.handle, unit=self._mainInputBox.unit, value=self._mainInputBox.textBox.GetValueRange())
processedHandles.add(self._mainInputBox.handle)
# Vectors
srcVectorDef = view.srcVectorDef
if srcVectorDef is not None:
if not self.srcVector.IsDirectionOnly:
values[srcVectorDef.lengthHandle] = (self.srcVector.GetLength() * 100, srcVectorDef.lengthUnit)
values[srcVectorDef.angleHandle] = (self.srcVector.GetAngle(), srcVectorDef.angleUnit)
addMiscData(handle=srcVectorDef.lengthHandle, unit=srcVectorDef.lengthUnit, value=self.srcVector.GetLength() * 100)
addMiscData(handle=srcVectorDef.angleHandle, unit=srcVectorDef.angleUnit, value=self.srcVector.GetAngle())
tgtVectorDef = view.tgtVectorDef
if tgtVectorDef is not None:
if not self.tgtVector.IsDirectionOnly:
values[tgtVectorDef.lengthHandle] = (self.tgtVector.GetLength() * 100, tgtVectorDef.lengthUnit)
values[tgtVectorDef.angleHandle] = (self.tgtVector.GetAngle(), tgtVectorDef.angleUnit)
# Input boxes
for k, v in self._inputs.items():
inputHandle, inputUnit = k
inputBox = v[0]
if isinstance(inputBox, RangeBox):
values[inputHandle] = (inputBox.GetValueRange(), inputUnit)
elif isinstance(inputBox, ConstantBox):
values[inputHandle] = (inputBox.GetValueFloat(), inputUnit)
return values
addMiscData(handle=tgtVectorDef.lengthHandle, unit=tgtVectorDef.lengthUnit, value=self.tgtVector.GetLength() * 100)
addMiscData(handle=tgtVectorDef.angleHandle, unit=tgtVectorDef.angleUnit, value=self.tgtVector.GetAngle())
# Other input boxes
for inputBox in self._miscInputBoxes:
addMiscData(handle=inputBox.handle, unit=inputBox.unit, value=inputBox.textBox.GetValueFloat())
return main, misc
@property
def showY0(self):
@@ -281,13 +305,11 @@ class GraphControlPanel(wx.Panel):
return '{}, {}'.format(axisDef.label, axisDef.unit)
def _storeCurrentValues(self):
for k, v in self.getValues().items():
handle = k
value, unit = v
if isinstance(value, (tuple, list)):
self._storedRanges[(handle, unit)] = value
else:
self._storedConsts[(handle, unit)] = value
main, misc = self.getValues()
if main is not None:
self._storedRanges[(main.handle, main.unit)] = main.value
for input in misc:
self._storedConsts[(input.handle, input.unit)] = input.value
def _clearStoredValues(self):
self._storedConsts.clear()