--- a/WampOptionsEditor.py Fri Mar 24 14:01:51 2017 +0100
+++ b/WampOptionsEditor.py Thu Mar 30 08:19:00 2017 +0200
@@ -6,46 +6,83 @@
class WampOptionsEditor(wx.Dialog):
- self.MainSizer = wx.FlexGridSizer(cols=1, hgap=0, rows=2, vgap=10)
- self.OptionsSizer = wx.FlexGridSizer(cols=2, hgap=10, rows=12, vgap=10)
- self.OptionsSizer.AddWindow(wx.StaticText(self,wx.ID_ANY,"Type of variable"))
- self.OptionsSizer.AddWindow(self.OptionsTypeChoice)
- self.OptionsSizer.AddWindow(self.OnChangeCheckbox)
- self.OptionsSizer.AddWindow(wx.StaticText(self, wx.ID_ANY, "On Change"))
- self.OptionsSizer.AddWindow(self.ScadaCheckbox)
- self.OptionsSizer.AddWindow(wx.StaticText(self, wx.ID_ANY, "Scada"))
- self.OptionsSizer.AddWindow(self.StaticCheckbox)
- self.OptionsSizer.AddWindow(wx.StaticText(self, wx.ID_ANY, "Static"))
- self.OptionsSizer.AddWindow(wx.StaticText(self,wx.ID_ANY,"Subgroup:"))
- self.OptionsSizer.AddWindow(self.SubgroupText)
- self.OptionsSizer.AddWindow(wx.StaticText(self,wx.ID_ANY,"Unit:"))
- self.OptionsSizer.AddWindow(self.UnitText)
- self.OptionsSizer.AddWindow(self.ValueCheckbox)
- self.OptionsSizer.AddWindow(wx.StaticText(self,wx.ID_ANY,"Enable min/max value"))
+ #self.MainSizer = wx.FlexGridSizer(cols=1, hgap=0, rows=2, vgap=10) + self.MainSizer = wx.BoxSizer(wx.VERTICAL) + #self.OptionsSizer = wx.FlexGridSizer(cols=2, hgap=10, rows=12, vgap=10) + self.TypeSizer = wx.BoxSizer(wx.HORIZONTAL) + self.TypeSizer.Add(wx.StaticText(self,wx.ID_ANY,"Type:"), flag=wx.LEFT, border=10, proportion=1) + self.TypeSizer.Add(self.OptionsTypeChoice, proportion=2) + self.MainSizer.Add(self.TypeSizer, flag=wx.EXPAND|wx.RIGHT|wx.TOP, border=10) + self.OnChangeSizer = wx.BoxSizer(wx.HORIZONTAL) + self.OnChangeSizer.Add(self.OnChangeCheckbox, flag=wx.LEFT, border=10) + self.OnChangeSizer.Add(wx.StaticText(self, wx.ID_ANY, "On Change"), flag=wx.LEFT | wx.ALIGN_RIGHT, border=10) + self.MainSizer.Add(self.OnChangeSizer, flag=wx.EXPAND | wx.RIGHT | wx.TOP, border=10) + self.ScadaSizer = wx.BoxSizer(wx.HORIZONTAL) + self.ScadaSizer.Add(self.ScadaCheckbox, flag=wx.LEFT, border=10) + self.ScadaSizer.Add(wx.StaticText(self, wx.ID_ANY, "Scada"), flag=wx.LEFT, proportion=1, border=10) + self.MainSizer.Add(self.ScadaSizer, flag=wx.EXPAND | wx.RIGHT | wx.TOP, border=10) + self.StaticSizer = wx.BoxSizer(wx.HORIZONTAL) + self.StaticSizer.Add(self.StaticCheckbox, flag=wx.LEFT, border=10) + self.StaticSizer.Add(wx.StaticText(self, wx.ID_ANY, "Static"), flag=wx.LEFT, proportion=1, border=10) + self.MainSizer.Add(self.StaticSizer, flag=wx.EXPAND | wx.RIGHT | wx.TOP, border=10) + self.SubgroupSizer = wx.BoxSizer(wx.HORIZONTAL) + self.SubgroupSizer.Add(wx.StaticText(self,wx.ID_ANY,"Subgroup:"), flag=wx.LEFT, proportion=1, border=10) + self.SubgroupSizer.Add(self.SubgroupText, flag=wx.LEFT, border=10, proportion=2) + self.MainSizer.Add(self.SubgroupSizer, flag=wx.EXPAND | wx.RIGHT | wx.TOP, border=10) + self.UnitSizer = wx.BoxSizer(wx.HORIZONTAL) + self.UnitSizer.Add(wx.StaticText(self,wx.ID_ANY,"Unit:"), flag=wx.LEFT, proportion=1, border=10) + self.UnitSizer.Add(self.UnitText, flag=wx.LEFT, proportion=2, border=10) + self.MainSizer.Add(self.UnitSizer, flag=wx.EXPAND | wx.RIGHT | wx.TOP, border=10) + self.ValueSizer = wx.BoxSizer(wx.HORIZONTAL) + self.ValueSizer.Add(self.ValueCheckbox, flag=wx.LEFT, border=10) + self.ValueSizer.Add(wx.StaticText(self,wx.ID_ANY,"Enable min/max value"), flag=wx.LEFT, proportion=1, border=10) + self.MainSizer.Add(self.ValueSizer, flag=wx.EXPAND | wx.RIGHT | wx.TOP, proportion=2, border=10) self.minValue=wx.StaticText(self, wx.ID_ANY, "Min value:")
self.maxValue=wx.StaticText(self, wx.ID_ANY, "Max value:")
self.PrecisionValue = wx.StaticText(self, wx.ID_ANY, "Precision:")
- self.OptionsSizer.AddWindow(self.minValue)
- self.OptionsSizer.AddWindow(self.MinSpin)
- self.OptionsSizer.AddWindow(self.maxValue)
- self.OptionsSizer.AddWindow(self.MaxSpin)
- self.OptionsSizer.AddWindow(self.PrecisionValue)
- self.OptionsSizer.AddWindow(self.PrecisionSpin)
- self.OptionsSizer.AddWindow(wx.StaticText(self, wx.ID_ANY, "Other:"))
- self.OptionsSizer.AddWindow(self.OtherText)
- self.OptionsSizer.AddWindow(wx.StaticText(self, wx.ID_ANY, "Description:"))
- self.OptionsSizer.AddWindow(self.DescriptionText)
- self.ButtonSizer.AddWindow(self.ClearButton)
- self.MainSizer.AddSizer(self.OptionsSizer, 0, border=20, flag=wx.ALL)
- self.MainSizer.AddSizer(self.ButtonSizer, 0, border=20, flag=wx.ALIGN_CENTER_HORIZONTAL)
+ self.MinSizer = wx.BoxSizer(wx.HORIZONTAL) + self.MinSizer.Add(self.minValue, flag=wx.LEFT, border=10, proportion=1) + self.MinSizer.Add(self.MinSpin, flag=wx.LEFT, proportion=2, border=10) + self.MainSizer.Add(self.MinSizer, flag=wx.EXPAND | wx.RIGHT | wx.TOP, border=10) + self.MaxSizer = wx.BoxSizer(wx.HORIZONTAL) + self.MaxSizer.Add(self.maxValue, flag=wx.LEFT, border=10, proportion=1) + self.MaxSizer.Add(self.MaxSpin, flag=wx.LEFT, proportion=2, border=10) + self.MainSizer.Add(self.MaxSizer, flag=wx.EXPAND | wx.RIGHT | wx.TOP, border=10) + self.PrecisionSizer = wx.BoxSizer(wx.HORIZONTAL) + self.PrecisionSizer.Add(self.PrecisionValue, flag=wx.LEFT, border=10, proportion=1) + self.PrecisionSizer.Add(self.PrecisionSpin, flag=wx.LEFT, proportion=2, border=10) + self.MainSizer.Add(self.PrecisionSizer, flag=wx.EXPAND | wx.RIGHT | wx.TOP, border=10) + self.OtherSizer = wx.BoxSizer(wx.HORIZONTAL) + self.OtherSizer.Add(wx.StaticText(self, wx.ID_ANY, "Other:"), flag=wx.LEFT, border=10, proportion=1) + self.OtherSizer.Add(self.OtherText, flag=wx.LEFT, proportion=2, border=10) + self.MainSizer.Add(self.OtherSizer, flag=wx.EXPAND | wx.RIGHT | wx.TOP, border=10) + self.DescriptionSizer = wx.BoxSizer(wx.VERTICAL) + self.DescriptionSizer.Add(wx.StaticText(self, wx.ID_ANY, "Description:"), border=10) + self.DescriptionSizer.Add(self.DescriptionText, flag=wx.EXPAND | wx.UP | wx.DOWN, proportion=1, border=10) + self.MainSizer.Add(self.DescriptionSizer, flag=wx.EXPAND | wx.LEFT | wx.RIGHT | wx.TOP, border=10) + self.ButtonSizer.AddWindow(self.ClearButton, flag=wx.ALIGN_CENTER_HORIZONTAL) + #self.MainSizer.AddSizer(self.OptionsSizer, 0, border=20, flag=wx.ALL) + self.MainSizer.AddSizer(self.ButtonSizer, 0, border=10, flag=wx.ALIGN_CENTER_HORIZONTAL | wx.BOTTOM) self.SetSizer(self.MainSizer)
def _init_ctrls(self, prnt):
wx.Dialog.__init__(self, id=ID_OPTIONSWIZARDDIALOG,
name='OptionsWizard', parent=prnt,
- size=wx.Size(255, 515), style=wx.DEFAULT_DIALOG_STYLE,
+ size=wx.Size(258, 520), style=wx.DEFAULT_DIALOG_STYLE, self.OptionsTypeChoice = wx.Choice(parent=self, id=ID_OPTIONSWIZARDDIALOG,
@@ -139,7 +176,10 @@
options.append(el.split("="))
+ self.clearOptions(None) + # self.ScadaCheckbox.SetValue(False) + # self.StaticCheckbox.Enable(False) + # self.StaticCheckbox.SetValue(False) @@ -155,7 +195,6 @@
self.StaticCheckbox.Enable(True)
self.StaticCheckbox.SetValue(True)
self.SubgroupText.SetLabel(el[1])