diff --git a/gui/graph.py b/gui/builtinGraphs/base.py similarity index 100% rename from gui/graph.py rename to gui/builtinGraphs/base.py diff --git a/gui/builtinGraphs/fitCapAmountVsTime.py b/gui/builtinGraphs/fitCapAmountVsTime.py index e2aa9bbf6..f29573175 100644 --- a/gui/builtinGraphs/fitCapAmountVsTime.py +++ b/gui/builtinGraphs/fitCapAmountVsTime.py @@ -21,7 +21,7 @@ from collections import OrderedDict from eos.graph.fitCapAmountVsTime import FitCapAmountVsTimeGraph as EosGraph -from gui.graph import Graph, XDef, YDef +from .base import Graph, XDef, YDef class FitCapAmountVsTimeGraph(Graph): diff --git a/gui/builtinGraphs/fitCapRegenVsCapPerc.py b/gui/builtinGraphs/fitCapRegenVsCapPerc.py index bf6731b8a..ad4ae639e 100644 --- a/gui/builtinGraphs/fitCapRegenVsCapPerc.py +++ b/gui/builtinGraphs/fitCapRegenVsCapPerc.py @@ -21,7 +21,7 @@ from collections import OrderedDict from eos.graph.fitCapRegenVsCapPerc import FitCapRegenVsCapPercGraph as EosGraph -from gui.graph import Graph, XDef, YDef +from .base import Graph, XDef, YDef class FitCapRegenVsCapPercGraph(Graph): diff --git a/gui/builtinGraphs/fitDmgVsTime.py b/gui/builtinGraphs/fitDmgVsTime.py index 4dc22dc22..e9b1b14a6 100644 --- a/gui/builtinGraphs/fitDmgVsTime.py +++ b/gui/builtinGraphs/fitDmgVsTime.py @@ -22,7 +22,7 @@ from collections import OrderedDict from eos.graph.fitDmgVsTime import FitDmgVsTimeGraph as EosGraphDmg from eos.graph.fitDpsVsTime import FitDpsVsTimeGraph as EosGraphDps -from gui.graph import Graph, XDef, YDef +from .base import Graph, XDef, YDef class FitDmgVsTimeGraph(Graph): diff --git a/gui/builtinGraphs/fitDpsVsRange.py b/gui/builtinGraphs/fitDpsVsRange.py index a17cf067a..3a2e7326c 100644 --- a/gui/builtinGraphs/fitDpsVsRange.py +++ b/gui/builtinGraphs/fitDpsVsRange.py @@ -21,7 +21,7 @@ from collections import OrderedDict from eos.graph.fitDpsVsRange import FitDpsVsRangeGraph as EosGraph -from gui.graph import Graph, XDef, YDef, ExtraInput +from .base import Graph, XDef, YDef, ExtraInput class FitDpsVsRangeGraph(Graph): diff --git a/gui/builtinGraphs/fitMobilityVsTime.py b/gui/builtinGraphs/fitMobilityVsTime.py index 1d55f6061..6f002bce9 100644 --- a/gui/builtinGraphs/fitMobilityVsTime.py +++ b/gui/builtinGraphs/fitMobilityVsTime.py @@ -22,7 +22,7 @@ from collections import OrderedDict from eos.graph.fitDistanceVsTime import FitDistanceVsTimeGraph as EosGraphDistance from eos.graph.fitSpeedVsTime import FitSpeedVsTimeGraph as EosGraphSpeed -from gui.graph import Graph, XDef, YDef +from .base import Graph, XDef, YDef class FitMobilityVsTimeGraph(Graph): diff --git a/gui/builtinGraphs/fitShieldAmountVsTime.py b/gui/builtinGraphs/fitShieldAmountVsTime.py index d3c58dddd..ae44178f6 100644 --- a/gui/builtinGraphs/fitShieldAmountVsTime.py +++ b/gui/builtinGraphs/fitShieldAmountVsTime.py @@ -22,7 +22,7 @@ from collections import OrderedDict import gui.mainFrame from eos.graph.fitShieldAmountVsTime import FitShieldAmountVsTimeGraph as EosGraph -from gui.graph import Graph, XDef, YDef +from .base import Graph, XDef, YDef class FitShieldAmountVsTimeGraph(Graph): diff --git a/gui/builtinGraphs/fitShieldRegenVsShieldPerc.py b/gui/builtinGraphs/fitShieldRegenVsShieldPerc.py index e684688ba..e86ce5aef 100644 --- a/gui/builtinGraphs/fitShieldRegenVsShieldPerc.py +++ b/gui/builtinGraphs/fitShieldRegenVsShieldPerc.py @@ -22,7 +22,7 @@ from collections import OrderedDict import gui.mainFrame from eos.graph.fitShieldRegenVsShieldPerc import FitShieldRegenVsShieldPercGraph as EosGraph -from gui.graph import Graph, XDef, YDef +from .base import Graph, XDef, YDef class FitShieldRegenVsShieldPercGraph(Graph): diff --git a/gui/builtinGraphs/fitWarpTimeVsDistance.py b/gui/builtinGraphs/fitWarpTimeVsDistance.py index b3f479a2c..c7bce5c1d 100644 --- a/gui/builtinGraphs/fitWarpTimeVsDistance.py +++ b/gui/builtinGraphs/fitWarpTimeVsDistance.py @@ -21,7 +21,7 @@ from collections import OrderedDict from eos.graph.fitWarpTimeVsDistance import FitWarpTimeVsDistanceGraph as EosGraph -from gui.graph import Graph, XDef, YDef +from .base import Graph, XDef, YDef class FitWarpTimeVsDistanceGraph(Graph): diff --git a/gui/graphFrame.py b/gui/graphFrame.py index 0c25c1a23..8df2272f8 100644 --- a/gui/graphFrame.py +++ b/gui/graphFrame.py @@ -29,7 +29,7 @@ import gui.display import gui.globalEvents as GE import gui.mainFrame from gui.bitmap_loader import BitmapLoader -from gui.graph import Graph +from gui.builtinGraphs.base import Graph from service.fit import Fit