Hide experimental bumping graphs

graphs/data/base/defs.py

@@ -26,11 +26,12 @@ VectorDef = namedtuple('VectorDef', ('lengthHandle', 'lengthUnit', 'angleHandle'
 
 class YDef:
 
-    def __init__(self, handle, unit, label, selectorLabel=None):
+    def __init__(self, handle, unit, label, selectorLabel=None, hidden=False):
         self.handle = handle
         self.unit = unit
         self.label = label
         self._selectorLabel = selectorLabel
+        self.hidden = hidden
 
     @property
     def selectorLabel(self):
@@ -53,12 +54,13 @@ class YDef:
 
 class XDef:
 
-    def __init__(self, handle, unit, label, mainInput, selectorLabel=None):
+    def __init__(self, handle, unit, label, mainInput, selectorLabel=None, hidden=False):
         self.handle = handle
         self.unit = unit
         self.label = label
         self.mainInput = mainInput
         self._selectorLabel = selectorLabel
+        self.hidden = hidden
 
     @property
     def selectorLabel(self):

graphs/data/fitDamageStats/graph.py

@@ -31,8 +31,8 @@ from .getter import (
 
 class FitDamageStatsGraph(FitGraph):
 
-    def __init__(self):
-        super().__init__()
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
         self._timeCache = TimeCache()
         self._projectedCache = ProjectedDataCache()
 

graphs/data/fitMobility/graph.py

@@ -32,8 +32,8 @@ class FitMobilityGraph(FitGraph):
         YDef(handle='speed', unit='m/s', label='Speed'),
         YDef(handle='distance', unit='km', label='Distance'),
         YDef(handle='momentum', unit='Mt⋅m/s', label='Momentum'),
-        YDef(handle='bumpSpeed', unit='m/s', label='Bump speed'),
-        YDef(handle='bumpDistance', unit='km', label='Bump distance')]
+        YDef(handle='bumpSpeed', unit='m/s', label='Bump speed', hidden=True),
+        YDef(handle='bumpDistance', unit='km', label='Bump distance', hidden=True)]
     inputs = [
         Input(handle='time', unit='s', label='Time', iconID=1392, defaultValue=10, defaultRange=(0, 30)),
         # Default values in target fields correspond to a random carrier/fax

graphs/data/fitRemoteReps/graph.py

@@ -26,8 +26,8 @@ from .getter import Distance2RpsGetter, Distance2RepAmountGetter, Time2RpsGetter
 
 class FitRemoteRepsGraph(FitGraph):
 
-    def __init__(self):
-        super().__init__()
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
         self._timeCache = TimeCache()
 
     def _clearInternalCache(self, reason, extraData):

graphs/data/fitShieldRegen/graph.py

@@ -27,6 +27,10 @@ from .getter import (
 
 class FitShieldRegenGraph(FitGraph):
 
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.isEffective = gui.mainFrame.MainFrame.getInstance().statsPane.nameViewMap['resistancesViewFull'].showEffective
+
     # UI stuff
     internalName = 'shieldRegenGraph'
     name = 'Shield Regeneration'
@@ -73,7 +77,3 @@ class FitShieldRegenGraph(FitGraph):
         ('shieldAmount', '%'): lambda v, src, tgt: v * 100 / src.item.ship.getModifiedItemAttr('shieldCapacity'),
         ('shieldAmount', 'EHP'): lambda v, src, tgt: src.item.damagePattern.effectivify(src.item, v, 'shield'),
         ('shieldRegen', 'EHP/s'): lambda v, src, tgt: src.item.damagePattern.effectivify(src.item, v, 'shield')}
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.isEffective = gui.mainFrame.MainFrame.getInstance().statsPane.nameViewMap['resistancesViewFull'].showEffective

graphs/data/fitWarpTime/graph.py

@@ -26,8 +26,8 @@ from .getter import AU_METERS, Distance2TimeGetter
 
 class FitWarpTimeGraph(FitGraph):
 
-    def __init__(self):
-        super().__init__()
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
         self._subspeedCache = SubwarpSpeedCache()
 
     def _clearInternalCache(self, reason, extraData):

graphs/gui/ctrlPanel.py

@@ -295,12 +295,16 @@ class GraphControlPanel(wx.Panel):
 
         self.ySubSelection.Clear()
         for yDef in view.yDefs:
+            if yDef.hidden and not self.graphFrame.includeHidden:
+                continue
             self.ySubSelection.Append(self.formatLabel(yDef, selector=True), yDef)
         self.ySubSelection.Enable(len(view.yDefs) > 1)
         self.ySubSelection.SetSelection(selectedY)
 
         self.xSubSelection.Clear()
         for xDef in view.xDefs:
+            if xDef.hidden and not self.graphFrame.includeHidden:
+                continue
             self.xSubSelection.Append(self.formatLabel(xDef, selector=True), xDef)
         self.xSubSelection.Enable(len(view.xDefs) > 1)
         self.xSubSelection.SetSelection(selectedX)

graphs/gui/frame.py

@@ -50,6 +50,7 @@ class GraphFrame(AuxiliaryFrame):
 
         super().__init__(parent, title='Graphs', size=(520, 390), resizeable=True)
         self.mainFrame = gui.mainFrame.MainFrame.getInstance()
+        self.includeHidden = includeHidden
 
         self.SetIcon(wx.Icon(BitmapLoader.getBitmap('graphs_small', 'gui')))
 
@@ -74,7 +75,7 @@ class GraphFrame(AuxiliaryFrame):
 
         # Setup - graph selector
         for view in FitGraph.views:
-            if view.hidden and not includeHidden:
+            if view.hidden and not self.includeHidden:
                 continue
             self.graphSelection.Append(view.name, view())
         self.graphSelection.SetSelection(0)