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

Specify cache getter in getters

Browse Source
This commit is contained in:
DarkPhoenix
2019-08-02 00:10:38 +03:00
parent 542b79fa00
commit 4ddbdebae4
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gui/builtinGraphs/base.py
View File

@@ -232,13 +232,13 @@ class FitGraph(metaclass=ABCMeta):
def _getPoints(self, mainParam, miscParams, xSpec, ySpec, fit, tgt):
try:
fullGetter, singleGetter = self._getters[(xSpec.handle, ySpec.handle)]
fullGetter, singleGetter, cacheGetter = self._getters[(xSpec.handle, ySpec.handle)]
except KeyError:
return [], []
else:
return fullGetter(
self, singleGetter=singleGetter, mainParam=mainParam,
miscParams=miscParams, fit=fit, tgt=tgt)
self, cacheGetter=cacheGetter, singleGetter=singleGetter,
mainParam=mainParam, miscParams=miscParams, fit=fit, tgt=tgt)
_denormalizers = {}

14
gui/builtinGraphs/fitWarpTime.py
View File

@@ -68,19 +68,21 @@ class FitWarpTimeGraph(FitGraph):
'subwarpSpeed': self._subspeedCache.getSubwarpSpeed(fit),
'warpSpeed': fit.warpSpeed}
def _distance2timeFull(self, singleGetter, mainParam, miscParams, fit, tgt):
def _distance2timeFull(self, cacheGetter, singleGetter, mainParam, miscParams, fit, tgt):
xs = []
ys = []
cache = self._distance2timeCache(miscParams=miscParams, fit=fit, tgt=tgt)
cache = cacheGetter(self, miscParams=miscParams, fit=fit, tgt=tgt)
for distance in self._iterLinear(mainParam[1]):
time = singleGetter(self, mainParam=distance, miscParams=miscParams, fit=fit, tgt=tgt, cache=cache)
time = singleGetter(
self, cacheGetter=cacheGetter, mainParam=distance, miscParams=miscParams,
fit=fit, tgt=tgt, cache=cache)
xs.append(distance)
ys.append(time)
return xs, ys
def _distance2timeSingle(self, mainParam, miscParams, fit, tgt, cache=None):
def _distance2timeSingle(self, cacheGetter, mainParam, miscParams, fit, tgt, cache=None):
if cache is None:
cache = self._distance2timeCache(miscParams=miscParams, fit=fit, tgt=tgt)
cache = cacheGetter(self, miscParams=miscParams, fit=fit, tgt=tgt)
time = calculate_time_in_warp(
max_subwarp_speed=cache['subwarpSpeed'],
max_warp_speed=cache['warpSpeed'],
@@ -88,7 +90,7 @@ class FitWarpTimeGraph(FitGraph):
return time
_getters = {
('distance', 'time'): (_distance2timeFull, _distance2timeSingle)}
('distance', 'time'): (_distance2timeFull, _distance2timeSingle, _distance2timeCache)}
class SubwarpSpeedCache(FitDataCache):