From 25712ef778cbc514807c781fcee2113d1d18a93b Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Fri, 2 Aug 2019 15:02:42 +0300 Subject: [PATCH] Move data preparation for x time mixin to separate function --- gui/builtinGraphs/fitDamageStats/getter.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/gui/builtinGraphs/fitDamageStats/getter.py b/gui/builtinGraphs/fitDamageStats/getter.py index 2e4a3d3eb..ce49f81f5 100644 --- a/gui/builtinGraphs/fitDamageStats/getter.py +++ b/gui/builtinGraphs/fitDamageStats/getter.py @@ -166,10 +166,7 @@ class XDistanceMixin(SmoothPointGetter): class XTimeMixin(PointGetter): - def getRange(self, mainParamRange, miscParams, fit, tgt): - xs = [] - ys = [] - minTime, maxTime = mainParamRange[1] + def _prepareData(self, time, miscParams, fit, tgt): # Process params into more convenient form miscParamMap = dict(miscParams) tgtSpeed = miscParamMap['tgtSpeed'] @@ -204,8 +201,16 @@ class XTimeMixin(PointGetter): tgtSpeed=tgtSpeed, tgtAngle=miscParamMap['tgtAngle'], tgtSigRadius=tgtSigRadius) - self._prepareTimeCache(fit=fit, maxTime=maxTime) + self._prepareTimeCache(fit=fit, maxTime=time) timeCache = self._getTimeCacheData(fit) + return tgtSpeed, tgtSigRadius, applicationMap, timeCache + + def getRange(self, mainParamRange, miscParams, fit, tgt): + xs = [] + ys = [] + minTime, maxTime = mainParamRange[1] + tgtSpeed, tgtSigRadius, applicationMap, timeCache = self._prepareData( + time=maxTime, miscParams=miscParams, fit=fit, tgt=tgt) # Custom iteration for time graph to show all data points currentDmg = None currentTime = None