More work on interfaces between gui and eos graphs

eos/graph/__init__.py

@@ -16,61 +16,3 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
 # ===============================================================================
-
-
-import math
-from abc import ABCMeta, abstractmethod
-
-
-class Graph(metaclass=ABCMeta):
-
-    def __init__(self):
-        self._cache = {}
-
-    @abstractmethod
-    def getPlotPoints(self, fit, extraData, xRange, xAmount):
-        raise NotImplementedError
-
-    def getYForX(self, fit, extraData, x):
-        raise NotImplementedError
-
-    def _xIter(self, fit, extraData, xRange, xAmount):
-        rangeLow, rangeHigh = self._limitXRange(xRange, fit, extraData)
-        # Amount is amount of ranges between points here, not amount of points
-        step = (rangeHigh - rangeLow) / xAmount
-        if step == 0:
-            yield xRange[0]
-        else:
-            current = rangeLow
-            # Take extra half step to make sure end of range is always included
-            # despite any possible float errors
-            while current <= (rangeHigh + step / 2):
-                yield current
-                current += step
-
-    def _limitXRange(self, xRange, fit, extraData):
-        rangeLow, rangeHigh = sorted(xRange)
-        limitLow, limitHigh = self._getXLimits(fit, extraData)
-        rangeLow = max(limitLow, rangeLow)
-        rangeHigh = min(limitHigh, rangeHigh)
-        return rangeLow, rangeHigh
-
-    def _getXLimits(self, fit, extraData):
-        return -math.inf, math.inf
-
-    def clearCache(self, key=None):
-        if key is None:
-            self._cache.clear()
-        elif key in self._cache:
-            del self._cache[key]
-
-
-class SmoothGraph(Graph, metaclass=ABCMeta):
-
-    def getPlotPoints(self, fit, extraData, xRange, xAmount):
-        xs = []
-        ys = []
-        for x in self._xIter(fit, extraData, xRange, xAmount):
-            xs.append(x)
-            ys.append(self.getYForX(fit, extraData, x))
-        return xs, ys

eos/graph/base.py

@@ -0,0 +1,76 @@
+# ===============================================================================
+# Copyright (C) 2010 Diego Duclos
+#
+# This file is part of eos.
+#
+# eos is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# eos is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with eos.  If not, see <http://www.gnu.org/licenses/>.
+# ===============================================================================
+
+
+import math
+from abc import ABCMeta, abstractmethod
+
+
+class Graph(metaclass=ABCMeta):
+
+    def __init__(self):
+        self._cache = {}
+
+    @abstractmethod
+    def getPlotPoints(self, mainInput, miscInputs, xSpec, ySpec, fit, tgt):
+        raise NotImplementedError
+
+    def getYForX(self, x, miscInputs, xSpec, ySpec, fit, tgt):
+        raise NotImplementedError
+
+    def _xIter(self, fit, extraData, xRange, xAmount):
+        rangeLow, rangeHigh = self._limitXRange(xRange, fit, extraData)
+        # Amount is amount of ranges between points here, not amount of points
+        step = (rangeHigh - rangeLow) / xAmount
+        if step == 0:
+            yield xRange[0]
+        else:
+            current = rangeLow
+            # Take extra half step to make sure end of range is always included
+            # despite any possible float errors
+            while current <= (rangeHigh + step / 2):
+                yield current
+                current += step
+
+    def _limitXRange(self, xRange, fit, extraData):
+        rangeLow, rangeHigh = sorted(xRange)
+        limitLow, limitHigh = self._getXLimits(fit, extraData)
+        rangeLow = max(limitLow, rangeLow)
+        rangeHigh = min(limitHigh, rangeHigh)
+        return rangeLow, rangeHigh
+
+    def _getInputLimits(self, inputHandle, inputUnit, fit):
+        return -math.inf, math.inf
+
+    def clearCache(self, key=None):
+        if key is None:
+            self._cache.clear()
+        elif key in self._cache:
+            del self._cache[key]
+
+
+class SmoothGraph(Graph, metaclass=ABCMeta):
+
+    def getPlotPoints(self, mainInput, miscInputs, xSpec, ySpec, fit, tgt):
+        xs = []
+        ys = []
+        for x in self._xIter(fit, extraData, xRange, xAmount):
+            xs.append(x)
+            ys.append(self.getYForX(fit, extraData, x))
+        return xs, ys

eos/graph/fitCapAmountVsTime.py

@@ -1,6 +1,6 @@
 import math
 
-from eos.graph import SmoothGraph
+from .base import SmoothGraph
 
 
 class FitCapAmountVsTimeGraph(SmoothGraph):

eos/graph/fitCapRegenVsCapPerc.py

@@ -1,6 +1,6 @@
 import math
 
-from eos.graph import SmoothGraph
+from .base import SmoothGraph
 
 
 class FitCapRegenVsCapPercGraph(SmoothGraph):

eos/graph/fitDistanceVsTime.py

@@ -1,6 +1,6 @@
 import math
 
-from eos.graph import SmoothGraph
+from .base import SmoothGraph
 
 
 class FitDistanceVsTimeGraph(SmoothGraph):

eos/graph/fitDmgVsTime.py

@@ -18,9 +18,9 @@
 # ===============================================================================
 
 
-from eos.graph import Graph
 from eos.utils.spoolSupport import SpoolType, SpoolOptions
 from gui.utils.numberFormatter import roundToPrec
+from .base import Graph
 
 
 class FitDmgVsTimeGraph(Graph):

eos/graph/fitDpsVsRange.py

@@ -24,8 +24,8 @@ from logbook import Logger
 
 import eos.config
 from eos.const import FittingHardpoint, FittingModuleState
-from eos.graph import SmoothGraph
 from eos.utils.spoolSupport import SpoolType, SpoolOptions
+from .base import SmoothGraph
 
 
 pyfalog = Logger(__name__)

eos/graph/fitDpsVsTime.py

@@ -20,9 +20,9 @@
 
 from itertools import chain
 
-from eos.graph import Graph
 from eos.utils.spoolSupport import SpoolType, SpoolOptions
 from gui.utils.numberFormatter import roundToPrec
+from .base import Graph
 
 
 class FitDpsVsTimeGraph(Graph):

eos/graph/fitShieldAmountVsTime.py

@@ -1,7 +1,7 @@
 import math
 from logbook import Logger
 
-from eos.graph import SmoothGraph
+from .base import SmoothGraph
 
 
 pyfalog = Logger(__name__)

eos/graph/fitShieldRegenVsShieldPerc.py

@@ -1,6 +1,6 @@
 import math
 
-from eos.graph import SmoothGraph
+from .base import SmoothGraph
 
 
 class FitShieldRegenVsShieldPercGraph(SmoothGraph):

eos/graph/fitSpeedVsTime.py

@@ -1,6 +1,6 @@
 import math
 
-from eos.graph import SmoothGraph
+from .base import SmoothGraph
 
 
 class FitSpeedVsTimeGraph(SmoothGraph):

eos/graph/fitWarpTime.py

@@ -1,13 +1,13 @@
 import math
 
 from eos.const import FittingModuleState
-from eos.graph import SmoothGraph
+from .base import SmoothGraph
 
 
 AU_METERS = 149597870700
 
 
-class FitWarpTimeVsDistanceGraph(SmoothGraph):
+class FitWarpTimeGraph(SmoothGraph):
 
     def __init__(self):
         super().__init__()