lpcmanager

Fix python3/wxPython4 details about Wamp options (dialog and parsing)

2024-04-23, Edouard Tisserant
a70356db4612
Parents 7b123fc70d19
Children 0892985090bd
Fix python3/wxPython4 details about Wamp options (dialog and parsing)
1 files changed, 35 insertions(+), 39 deletions(-)
  • +35 -39
    WampOptionsEditor.py
    • --- a/WampOptionsEditor.py Tue Apr 09 16:39:47 2024 +0200
    +++ b/WampOptionsEditor.py Tue Apr 23 16:55:20 2024 +0200
    @@ -9,63 +9,59 @@
    [ID_OPTIONSWIZARDDIALOG,ID_ONCHANGE,ID_OPTIONSTYPECHOICE,ID_SUBGROUPTEXT,ID_UNITTEXT,ID_VALUECHECKBOX,ID_MINSPIN,ID_MAXSPIN,ID_PRECISIONSPIN, ID_INITIALSPIN,ID_SCADACHECKBOX,ID_DISABLECHECKBOX,ID_OTHERTEXT,ID_DESCRIPTION,ID_STATIC] = [wx.NewId() for _init_ctrls in range(15)]
    -
    -excluded_chars = [ord(i) for i in '\n"']
    -sanitizer = "".join([chr(i if i not in excluded_chars else ord(' ')) for i in range(256)])
    -eraser = '\r'
    +newline_to_space = str.maketrans("\n", " ", "\r")
    class WampOptionsEditor(wx.Dialog):
    def _init_sizers(self):
    self.MainSizer = wx.BoxSizer(wx.VERTICAL)
    self.PropertySizer = wx.FlexGridSizer(cols=2, hgap=10, rows=13, vgap=10)
    - self.PropertySizer.AddWindow(wx.StaticText(self,wx.ID_ANY,_("Type:")), flag=wx.ALIGN_CENTER_VERTICAL | wx.GROW | wx.LEFT, border=15)
    - self.PropertySizer.AddWindow(self.OptionsTypeChoice, 1, flag= wx.EXPAND)
    + self.PropertySizer.Add(wx.StaticText(self,wx.ID_ANY,_("Type:")), flag=wx.ALIGN_CENTER_VERTICAL | wx.GROW | wx.LEFT, border=15)
    + self.PropertySizer.Add(self.OptionsTypeChoice, 1, flag= wx.EXPAND)
    - self.PropertySizer.AddWindow(self.OnChangeCheckbox, flag=wx.ALIGN_CENTER_VERTICAL | wx.LEFT, border=15)
    - self.PropertySizer.AddWindow(wx.StaticText(self, wx.ID_ANY, _("On Change")), 1, flag=wx.GROW | wx.EXPAND)
    + self.PropertySizer.Add(self.OnChangeCheckbox, flag=wx.ALIGN_CENTER_VERTICAL | wx.LEFT, border=15)
    + self.PropertySizer.Add(wx.StaticText(self, wx.ID_ANY, _("On Change")), 1, flag=wx.GROW | wx.EXPAND)
    - self.PropertySizer.AddWindow(self.ScadaCheckbox, flag=wx.ALIGN_CENTER_VERTICAL | wx.LEFT, border=15)
    - self.PropertySizer.AddWindow(wx.StaticText(self, wx.ID_ANY, _("Scada")), 1, flag=wx.GROW | wx.EXPAND)
    + self.PropertySizer.Add(self.ScadaCheckbox, flag=wx.ALIGN_CENTER_VERTICAL | wx.LEFT, border=15)
    + self.PropertySizer.Add(wx.StaticText(self, wx.ID_ANY, _("Scada")), 1, flag=wx.GROW | wx.EXPAND)
    - self.PropertySizer.AddWindow(self.StaticCheckbox, flag=wx.ALIGN_CENTER_VERTICAL | wx.LEFT, border=15)
    - self.PropertySizer.AddWindow(wx.StaticText(self, wx.ID_ANY, _("Static")), 1, flag=wx.GROW | wx.EXPAND)
    + self.PropertySizer.Add(self.StaticCheckbox, flag=wx.ALIGN_CENTER_VERTICAL | wx.LEFT, border=15)
    + self.PropertySizer.Add(wx.StaticText(self, wx.ID_ANY, _("Static")), 1, flag=wx.GROW | wx.EXPAND)
    - self.PropertySizer.AddWindow(wx.StaticText(self,wx.ID_ANY, _("Subgroup:")), flag=wx.ALIGN_CENTER_VERTICAL | wx.LEFT, border=15)
    - self.PropertySizer.AddWindow(self.SubgroupText, 1, flag=wx.GROW | wx.EXPAND)
    + self.PropertySizer.Add(wx.StaticText(self,wx.ID_ANY, _("Subgroup:")), flag=wx.ALIGN_CENTER_VERTICAL | wx.LEFT, border=15)
    + self.PropertySizer.Add(self.SubgroupText, 1, flag=wx.GROW | wx.EXPAND)
    - self.PropertySizer.AddWindow(wx.StaticText(self,wx.ID_ANY, _("Unit:")), flag=wx.ALIGN_CENTER_VERTICAL | wx.LEFT, border=15)
    - self.PropertySizer.AddWindow(self.UnitText, 1, flag=wx.GROW | wx.EXPAND)
    + self.PropertySizer.Add(wx.StaticText(self,wx.ID_ANY, _("Unit:")), flag=wx.ALIGN_CENTER_VERTICAL | wx.LEFT, border=15)
    + self.PropertySizer.Add(self.UnitText, 1, flag=wx.GROW | wx.EXPAND)
    - self.PropertySizer.AddWindow(self.ValueCheckbox, flag=wx.GROW | wx.LEFT, border=15)
    - self.PropertySizer.AddWindow(wx.StaticText(self,wx.ID_ANY, _("Enable min/max value")), flag=wx.ALIGN_CENTER_VERTICAL)
    + self.PropertySizer.Add(self.ValueCheckbox, flag=wx.GROW | wx.LEFT, border=15)
    + self.PropertySizer.Add(wx.StaticText(self,wx.ID_ANY, _("Enable min/max value")), flag=wx.ALIGN_CENTER_VERTICAL)
    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.PropertySizer.AddWindow(self.minValue, flag=wx.ALIGN_CENTER_VERTICAL | wx.LEFT, border=15)
    - self.PropertySizer.AddWindow(self.MinSpin, flag=wx.GROW)
    + self.PropertySizer.Add(self.minValue, flag=wx.ALIGN_CENTER_VERTICAL | wx.LEFT, border=15)
    + self.PropertySizer.Add(self.MinSpin, flag=wx.GROW)
    - self.PropertySizer.AddWindow(self.maxValue, flag=wx.ALIGN_CENTER_VERTICAL | wx.LEFT, border=15)
    - self.PropertySizer.AddWindow(self.MaxSpin, flag=wx.GROW)
    + self.PropertySizer.Add(self.maxValue, flag=wx.ALIGN_CENTER_VERTICAL | wx.LEFT, border=15)
    + self.PropertySizer.Add(self.MaxSpin, flag=wx.GROW)
    - self.PropertySizer.AddWindow(self.PrecisionValue, flag=wx.ALIGN_CENTER_VERTICAL | wx.LEFT, border=15)
    - self.PropertySizer.AddWindow(self.PrecisionSpin, flag=wx.GROW)
    + self.PropertySizer.Add(self.PrecisionValue, flag=wx.ALIGN_CENTER_VERTICAL | wx.LEFT, border=15)
    + self.PropertySizer.Add(self.PrecisionSpin, flag=wx.GROW)
    - self.PropertySizer.AddWindow(wx.StaticText(self, wx.ID_ANY, _("Other:")), flag=wx.ALIGN_CENTER_VERTICAL | wx.LEFT, border=15)
    - self.PropertySizer.AddWindow(self.OtherText, flag=wx.GROW)
    + self.PropertySizer.Add(wx.StaticText(self, wx.ID_ANY, _("Other:")), flag=wx.ALIGN_CENTER_VERTICAL | wx.LEFT, border=15)
    + self.PropertySizer.Add(self.OtherText, flag=wx.GROW)
    - self.PropertySizer.AddWindow(wx.StaticText(self, wx.ID_ANY, _("Tags:")), flag=wx.ALIGN_CENTER_VERTICAL | wx.LEFT, border=15)
    - self.PropertySizer.AddWindow(self.Tags, flag=wx.GROW)
    + self.PropertySizer.Add(wx.StaticText(self, wx.ID_ANY, _("Tags:")), flag=wx.ALIGN_CENTER_VERTICAL | wx.LEFT, border=15)
    + self.PropertySizer.Add(self.Tags, flag=wx.GROW)
    - self.PropertySizer.AddWindow(self.DisableCheckbox, flag=wx.ALIGN_CENTER_VERTICAL | wx.LEFT, border=15)
    - self.PropertySizer.AddWindow(wx.StaticText(self, wx.ID_ANY, _("Disable display in xEye")), 1, flag=wx.GROW | wx.EXPAND)
    + self.PropertySizer.Add(self.DisableCheckbox, flag=wx.ALIGN_CENTER_VERTICAL | wx.LEFT, border=15)
    + self.PropertySizer.Add(wx.StaticText(self, wx.ID_ANY, _("Disable display in xEye")), 1, flag=wx.GROW | wx.EXPAND)
    self.PropertySizer.AddGrowableCol(1, 1)
    - self.MainSizer.AddSizer(self.PropertySizer, flag=wx.GROW | wx.UP | wx.RIGHT, border=15)
    - self.ButtonSizer.AddWindow(self.ClearButton)
    - self.MainSizer.AddSizer(self.ButtonSizer,
    - flag=wx.ALIGN_CENTER_VERTICAL | wx.ALL, border = 10)
    + self.MainSizer.Add(self.PropertySizer, flag=wx.GROW | wx.UP | wx.RIGHT, border=15)
    + self.ButtonSizer.Add(self.ClearButton)
    + self.MainSizer.Add(self.ButtonSizer, flag= wx.ALL, border = 10)
    self.SetSizer(self.MainSizer)
    self.Fit()
    @@ -250,7 +246,7 @@
    ('unit', self.UnitText),
    ('other', self.OtherText),
    ('tags', self.Tags)]:
    - content = ctrl.GetValue().encode('ascii','ignore').translate(sanitizer,eraser)
    + content = ctrl.GetValue().translate(newline_to_space)
    if content:
    opts[name] = content
    @@ -277,12 +273,12 @@
    self.Options = wx.TextCtrl(self, size=wx.Size(0, -1),
    style=wx.TE_PROCESS_ENTER)
    self.Options.Bind(wx.EVT_KEY_DOWN, self.OnChar)
    - main_sizer.AddWindow(self.Options, flag=wx.GROW)
    + main_sizer.Add(self.Options, flag=wx.GROW)
    # create browse button
    self.EditButton = wx.Button(self, label='...', size=wx.Size(30, -1))
    self.Bind(wx.EVT_BUTTON, self.OnEditButtonClick, self.EditButton)
    - main_sizer.AddWindow(self.EditButton, flag=wx.GROW)
    + main_sizer.Add(self.EditButton, flag=wx.GROW)
    self.Bind(wx.EVT_SIZE, self.OnSize)
    @@ -332,13 +328,13 @@
    self.Options.SetFocus()
    -class WampOptionsCellEditor(wx.grid.PyGridCellEditor):
    +class WampOptionsCellEditor(wx.grid.GridCellEditor):
    '''
    Grid cell editor that uses WampOptionsCellControl to display an edit button.
    '''
    def __init__(self, table, row, col):
    - wx.grid.PyGridCellEditor.__init__(self)
    + wx.grid.GridCellEditor.__init__(self)
    self.table = table
    self.colname = self.table.GetColLabelValue(col, False)