Fix warp graph

This commit is contained in:
DarkPhoenix
2019-05-19 04:07:40 +03:00
parent ec1a2c66ee
commit 16fdd5a5e6
5 changed files with 65 additions and 109 deletions

View File

@@ -18,6 +18,7 @@
# ===============================================================================
import math
from abc import ABCMeta, abstractmethod
@@ -33,20 +34,26 @@ class Graph(metaclass=ABCMeta):
def getYForX(self, fit, extraData, x):
raise NotImplementedError
def _xIter(self, xRange, xAmount):
rangeStart, rangeEnd = sorted(xRange)
def _xIter(self, fit, extraData, xRange, xAmount):
rangeLow, rangeHigh = sorted(xRange)
limitLow, limitHigh = self._getXLimits(fit, extraData)
rangeLow = max(limitLow, rangeLow)
rangeHigh = min(limitHigh, rangeHigh)
# Amount is amount of ranges between points here, not amount of points
step = (rangeEnd - rangeStart) / xAmount
step = (rangeHigh - rangeLow) / xAmount
if step == 0:
yield xRange[0]
else:
current = rangeStart
current = rangeLow
# Take extra half step to make sure end of range is always included
# despite any possible float errors
while current <= (rangeEnd + step / 2):
while current <= (rangeHigh + step / 2):
yield current
current += step
def _getXLimits(self, fit, extraData):
return -math.inf, math.inf
def clearCache(self, key=None):
if key is None:
self.cache.clear()
@@ -59,7 +66,7 @@ class SmoothGraph(Graph, metaclass=ABCMeta):
def getPlotPoints(self, fit, extraData, xRange, xAmount):
xs = []
ys = []
for x in self._xIter(xRange, xAmount):
for x in self._xIter(fit, extraData, xRange, xAmount):
xs.append(x)
ys.append(self.getYForX(fit, extraData, x))
return xs, ys