diff --git a/graphs/gui/panel.py b/graphs/gui/panel.py index f72f9ecbb..d824a7062 100644 --- a/graphs/gui/panel.py +++ b/graphs/gui/panel.py @@ -270,8 +270,15 @@ class GraphControlPanel(wx.Panel): self.targetList.refreshExtraColumns(view.tgtExtraCols) self.srcTgtSizer.Detach(self.sourceList) self.srcTgtSizer.Detach(self.targetList) - self.srcTgtSizer.Add(self.sourceList, self.sourceList.ColumnCount, wx.EXPAND | wx.ALL, 0) - self.srcTgtSizer.Add(self.targetList, self.targetList.ColumnCount, wx.EXPAND | wx.LEFT, 10) + + def getProportion(wrapperList): + propWidth = 0 + for column in wrapperList.activeColumns: + propWidth += column.proportionWidth + return propWidth + + self.srcTgtSizer.Add(self.sourceList, getProportion(self.sourceList), wx.EXPAND | wx.ALL, 0) + self.srcTgtSizer.Add(self.targetList, getProportion(self.targetList), wx.EXPAND | wx.LEFT, 10) self.Layout() def OnShowLegendChange(self, event): diff --git a/gui/builtinViewColumns/attributeDisplayGraph.py b/gui/builtinViewColumns/attributeDisplayGraph.py index 3f2e1991b..b3d9c0e5e 100644 --- a/gui/builtinViewColumns/attributeDisplayGraph.py +++ b/gui/builtinViewColumns/attributeDisplayGraph.py @@ -34,6 +34,7 @@ from gui.viewColumn import ViewColumn class GraphColumn(ViewColumn, metaclass=ABCMeta): + proportionWidth = 2 stickPrefixToValue = False def __init__(self, fittingView, iconID, formatSpec=(3, 0, 3)): diff --git a/gui/builtinViewColumns/baseName.py b/gui/builtinViewColumns/baseName.py index 57c3ba99f..052660338 100644 --- a/gui/builtinViewColumns/baseName.py +++ b/gui/builtinViewColumns/baseName.py @@ -42,7 +42,9 @@ pyfalog = Logger(__name__) class BaseName(ViewColumn): + name = "Base Name" + proportionWidth = 7 def __init__(self, fittingView, params): ViewColumn.__init__(self, fittingView) diff --git a/gui/builtinViewColumns/targetResists.py b/gui/builtinViewColumns/targetResists.py index e622a6970..59a5e0861 100644 --- a/gui/builtinViewColumns/targetResists.py +++ b/gui/builtinViewColumns/targetResists.py @@ -30,6 +30,7 @@ from service.const import TargetResistMode class TargetResists(ViewColumn): name = 'Target Resists' + proportionWidth = 5 def __init__(self, fittingView, params): super().__init__(fittingView) diff --git a/gui/viewColumn.py b/gui/viewColumn.py index ec58ef4d8..5fba90c35 100644 --- a/gui/viewColumn.py +++ b/gui/viewColumn.py @@ -28,6 +28,7 @@ class ViewColumn: they can be used as columns in a view. """ columns = {} + proportionWidth = 1 def __init__(self, fittingView): self.fittingView = fittingView