diff --git a/gui/builtinGraphs/base.py b/gui/builtinGraphs/base.py index 1e41bc4cf..f729b21bb 100644 --- a/gui/builtinGraphs/base.py +++ b/gui/builtinGraphs/base.py @@ -33,13 +33,11 @@ class FitGraph(metaclass=ABCMeta): # UI stuff views = [] viewMap = {} - viewIndexMap = {} @classmethod def register(cls): FitGraph.views.append(cls) FitGraph.viewMap[cls.internalName] = cls - FitGraph.viewIndexMap[cls.internalName] = FitGraph.views.index(cls) def __init__(self): # Format: {(fit ID, target type, target ID): data} diff --git a/gui/graphFrame/frame.py b/gui/graphFrame/frame.py index a696e9e51..7f18dd27f 100644 --- a/gui/graphFrame/frame.py +++ b/gui/graphFrame/frame.py @@ -114,9 +114,7 @@ class GraphFrame(wx.Frame): # Setup - graph selector for view in FitGraph.views: self.graphSelection.Append(view.name, view()) - viewToSelect = GraphSettings.getInstance().get('selectedGraph') - viewToSelect = FitGraph.viewIndexMap.get(viewToSelect, 0) - self.graphSelection.SetSelection(viewToSelect) + self.graphSelection.SetSelection(0) self.ctrlPanel.updateControls(layout=False) # Event bindings - local events diff --git a/gui/graphFrame/panel.py b/gui/graphFrame/panel.py index 6742453a1..b27313abc 100644 --- a/gui/graphFrame/panel.py +++ b/gui/graphFrame/panel.py @@ -25,6 +25,7 @@ import wx from gui.bitmap_loader import BitmapLoader from service.fit import Fit +from service.settings import GraphSettings from .input import ConstantBox, RangeBox from .lists import FitList, TargetList from .vector import VectorPicker diff --git a/service/settings.py b/service/settings.py index 2cae8a167..bedd9e7fd 100644 --- a/service/settings.py +++ b/service/settings.py @@ -514,7 +514,6 @@ class GraphSettings: def __init__(self): defaults = { - 'selectedGraph': None, 'mobileDroneMode': 0, 'ignoreResists': True} self.settings = SettingsProvider.getInstance().getSettings('graphSettings', defaults)