diff --git a/gui/builtinGraphs/base.py b/gui/builtinGraphs/base.py index 604d3d7fb..6de45d164 100644 --- a/gui/builtinGraphs/base.py +++ b/gui/builtinGraphs/base.py @@ -30,10 +30,23 @@ from service.const import GraphCacheCleanupReason YDef = namedtuple('YDef', ('handle', 'unit', 'label')) XDef = namedtuple('XDef', ('handle', 'unit', 'label', 'mainInput')) -Input = namedtuple('Input', ('handle', 'unit', 'label', 'iconID', 'defaultValue', 'defaultRange', 'mainOnly')) VectorDef = namedtuple('VectorDef', ('lengthHandle', 'lengthUnit', 'angleHandle', 'angleUnit', 'label')) +class Input: + + def __init__(self, handle, unit, label, iconID, defaultValue, defaultRange, mainOnly=False, valueTt=None, rangeTt=None): + self.handle = handle + self.unit = unit + self.label = label + self.iconID = iconID + self.defaultValue = defaultValue + self.defaultRange = defaultRange + self.mainOnly = mainOnly + self.valueTt = valueTt + self.rangeTt = rangeTt + + class FitGraph(metaclass=ABCMeta): # UI stuff diff --git a/gui/builtinGraphs/fitDamageStats/graph.py b/gui/builtinGraphs/fitDamageStats/graph.py index 2f4cf2604..31ec25430 100644 --- a/gui/builtinGraphs/fitDamageStats/graph.py +++ b/gui/builtinGraphs/fitDamageStats/graph.py @@ -69,9 +69,9 @@ class FitDamageStatsGraph(FitGraph): YDef(handle='volley', unit=None, label='Volley'), YDef(handle='damage', unit=None, label='Damage inflicted')] inputs = [ - Input(handle='time', unit='s', label='Time', iconID=1392, defaultValue=None, defaultRange=(0, 80), mainOnly=False), - Input(handle='distance', unit='km', label='Distance', iconID=1391, defaultValue=50, defaultRange=(0, 100), mainOnly=False), - Input(handle='tgtSpeed', unit='%', label='Target speed', iconID=1389, defaultValue=100, defaultRange=(0, 100), mainOnly=False), + Input(handle='time', unit='s', label='Time', iconID=1392, defaultValue=None, defaultRange=(0, 80)), + Input(handle='distance', unit='km', label='Distance', iconID=1391, defaultValue=50, defaultRange=(0, 100)), + Input(handle='tgtSpeed', unit='%', label='Target speed', iconID=1389, defaultValue=100, defaultRange=(0, 100)), Input(handle='tgtSigRad', unit='%', label='Target signature', iconID=1390, defaultValue=100, defaultRange=(100, 200), mainOnly=True)] srcVectorDef = VectorDef(lengthHandle='atkSpeed', lengthUnit='%', angleHandle='atkAngle', angleUnit='degrees', label='Attacker') tgtVectorDef = VectorDef(lengthHandle='tgtSpeed', lengthUnit='%', angleHandle='tgtAngle', angleUnit='degrees', label='Target') diff --git a/gui/builtinGraphs/fitMobility.py b/gui/builtinGraphs/fitMobility.py index 4d0dca01f..ec9df413d 100644 --- a/gui/builtinGraphs/fitMobility.py +++ b/gui/builtinGraphs/fitMobility.py @@ -34,7 +34,7 @@ class FitMobilityVsTimeGraph(FitGraph): YDef(handle='speed', unit='m/s', label='Speed'), YDef(handle='distance', unit='km', label='Distance')] inputs = [ - Input(handle='time', unit='s', label='Time', iconID=1392, defaultValue=10, defaultRange=(0, 30), mainOnly=False)] + Input(handle='time', unit='s', label='Time', iconID=1392, defaultValue=10, defaultRange=(0, 30))] srcExtraCols = ('Speed', 'Agility') # Calculation stuff diff --git a/gui/builtinGraphs/fitWarpTime.py b/gui/builtinGraphs/fitWarpTime.py index 7b3153aab..e0bfa8b6c 100644 --- a/gui/builtinGraphs/fitWarpTime.py +++ b/gui/builtinGraphs/fitWarpTime.py @@ -49,8 +49,8 @@ class FitWarpTimeGraph(FitGraph): yDefs = [ YDef(handle='time', unit='s', label='Warp time')] inputs = [ - Input(handle='distance', unit='AU', label='Distance', iconID=1391, defaultValue=20, defaultRange=(0, 50), mainOnly=False), - Input(handle='distance', unit='km', label='Distance', iconID=1391, defaultValue=1000, defaultRange=(150, 5000), mainOnly=False)] + Input(handle='distance', unit='AU', label='Distance', iconID=1391, defaultValue=20, defaultRange=(0, 50)), + Input(handle='distance', unit='km', label='Distance', iconID=1391, defaultValue=1000, defaultRange=(150, 5000))] srcExtraCols = ('WarpSpeed', 'WarpDistance') # Calculation stuff diff --git a/gui/fitBrowserLite.py b/gui/fitBrowserLite.py index 3413c1181..3375a8d29 100644 --- a/gui/fitBrowserLite.py +++ b/gui/fitBrowserLite.py @@ -16,7 +16,7 @@ class FitBrowserLiteDialog(wx.Dialog): def __init__(self, parent, title='Add Fits', excludedFitIDs=()): wx.Dialog.__init__(self, parent, title=title, style=wx.DEFAULT_DIALOG_STYLE) - listWidth = 250 if 'wxGTK' in wx.PlatformInfo else 150 + listWidth = 250 if 'wxGTK' in wx.PlatformInfo else 200 self.sFit = Fit.getInstance() self.allFits = sorted( diff --git a/gui/graphFrame/panel.py b/gui/graphFrame/panel.py index 3d0be0d65..3a4130dc0 100644 --- a/gui/graphFrame/panel.py +++ b/gui/graphFrame/panel.py @@ -80,10 +80,11 @@ class GraphControlPanel(wx.Panel): self.inputsSizer = wx.BoxSizer(wx.VERTICAL) graphOptsSizer.Add(self.inputsSizer, 1, wx.EXPAND | wx.ALL, 0) + vectorSize = 90 if 'wxGTK' in wx.PlatformInfo else 75 self.srcVectorSizer = wx.BoxSizer(wx.VERTICAL) self.srcVectorLabel = wx.StaticText(self, wx.ID_ANY, '') self.srcVectorSizer.Add(self.srcVectorLabel, 0, wx.ALIGN_CENTER_HORIZONTAL| wx.BOTTOM, 5) - self.srcVector = VectorPicker(self, style=wx.NO_BORDER, size=90, offset=0) + self.srcVector = VectorPicker(self, style=wx.NO_BORDER, size=vectorSize, offset=0) self.srcVector.Bind(VectorPicker.EVT_VECTOR_CHANGED, self.OnFieldChanged) self.srcVectorSizer.Add(self.srcVector, 0, wx.SHAPED | wx.ALIGN_CENTER_HORIZONTAL | wx.ALIGN_CENTER_VERTICAL | wx.ALL, 0) graphOptsSizer.Add(self.srcVectorSizer, 0, wx.EXPAND | wx.LEFT, 15) @@ -91,7 +92,7 @@ class GraphControlPanel(wx.Panel): self.tgtVectorSizer = wx.BoxSizer(wx.VERTICAL) self.tgtVectorLabel = wx.StaticText(self, wx.ID_ANY, '') self.tgtVectorSizer.Add(self.tgtVectorLabel, 0, wx.ALIGN_CENTER_HORIZONTAL | wx.BOTTOM, 5) - self.tgtVector = VectorPicker(self, style=wx.NO_BORDER, size=90, offset=0) + self.tgtVector = VectorPicker(self, style=wx.NO_BORDER, size=vectorSize, offset=0) self.tgtVector.Bind(VectorPicker.EVT_VECTOR_CHANGED, self.OnFieldChanged) self.tgtVectorSizer.Add(self.tgtVector, 0, wx.SHAPED | wx.ALIGN_CENTER_HORIZONTAL | wx.ALIGN_CENTER_VERTICAL | wx.ALL, 0) graphOptsSizer.Add(self.tgtVectorSizer, 0, wx.EXPAND | wx.LEFT, 10)