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

Rework warp time graph to have single getter (and break all other graphs for now)

Browse Source
This commit is contained in:
DarkPhoenix
2019-08-01 20:25:57 +03:00
parent 0788ff050d
commit 57426f783e
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gui/builtinGraphs/base.py
View File

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

8
gui/builtinGraphs/fitWarpTime.py
View File

@@ -63,13 +63,11 @@ class FitWarpTimeGraph(FitGraph):
('distance', 'AU'): lambda v, fit, tgt: v / AU_METERS,
('distance', 'km'): lambda v, fit, tgt: v / 1000}
def _distance2timeFull(self, mainParam, miscParams, fit, tgt):
def _distance2timeFull(self, singleGetter, mainParam, miscParams, fit, tgt):
xs = []
ys = []
subwarpSpeed = self._subspeedCache.getSubwarpSpeed(fit)
warpSpeed = fit.warpSpeed
for distance in self._iterLinear(mainParam[1]):
time = calculate_time_in_warp(max_subwarp_speed=subwarpSpeed, max_warp_speed=warpSpeed, warp_dist=distance)
time = singleGetter(self, mainParam=distance, miscParams=miscParams, fit=fit, tgt=tgt)
xs.append(distance)
ys.append(time)
return xs, ys
@@ -81,7 +79,7 @@ class FitWarpTimeGraph(FitGraph):
return time
_getters = {
('distance', 'time'): _distance2timeFull}
('distance', 'time'): (_distance2timeFull, _distance2timeSingle)}
class SubwarpSpeedCache(FitDataCache):