beremiz

fix twice shown error message box, when wrong non-valid IEC identifier entered

2017-03-09, Andrey Skvortsov
ba6a6d6e989c
Parents 3a98027ff372
Children aec0ed4b6f39
fix twice shown error message box, when wrong non-valid IEC identifier entered

It happens when non-valid name for variable name or name of field in
structure entered. This issue is described in details here:
http://trac.wxwidgets.org/ticket/16333
3 files changed, 27 insertions(+), 23 deletions(-)
  • +7 -4
    controls/VariablePanel.py
  • +6 -3
    editors/CodeFileEditor.py
  • +14 -16
    editors/DataTypeEditor.py
    • --- a/controls/VariablePanel.py Thu Mar 09 15:35:19 2017 +0300
    +++ b/controls/VariablePanel.py Thu Mar 09 17:29:17 2017 +0300
    @@ -750,6 +750,11 @@
    else:
    self.ClassList = [self.Filter]
    + def ShowErrorMessage(self, message):
    + dialog = wx.MessageDialog(self, message, _("Error"), wx.OK|wx.ICON_ERROR)
    + dialog.ShowModal()
    + dialog.Destroy()
    +
    def OnVariablesGridCellChange(self, event):
    row, col = event.GetRow(), event.GetCol()
    colname = self.Table.GetColLabelValue(col, False)
    @@ -781,10 +786,8 @@
    wx.CallAfter(self.ParentWindow.RefreshView)
    if message is not None:
    - dialog = wx.MessageDialog(self, message, _("Error"), wx.OK|wx.ICON_ERROR)
    - dialog.ShowModal()
    - dialog.Destroy()
    - event.Veto()
    + wx.CallAfter(self.ShowErrorMessage, message)
    + event.Veto()
    else:
    event.Skip()
    --- a/editors/CodeFileEditor.py Thu Mar 09 15:35:19 2017 +0300
    +++ b/editors/CodeFileEditor.py Thu Mar 09 17:29:17 2017 +0300
    @@ -757,6 +757,11 @@
    def DoGetBestSize(self):
    return self.ParentWindow.GetPanelBestSize()
    + def ShowErrorMessage(self, message):
    + dialog = wx.MessageDialog(self, message, _("Error"), wx.OK|wx.ICON_ERROR)
    + dialog.ShowModal()
    + dialog.Destroy()
    +
    def OnVariablesGridCellChange(self, event):
    row, col = event.GetRow(), event.GetCol()
    colname = self.Table.GetColLabelValue(col, False)
    @@ -780,10 +785,8 @@
    wx.CallAfter(self.RefreshView)
    if message is not None:
    - dialog = wx.MessageDialog(self, message, _("Error"), wx.OK|wx.ICON_ERROR)
    - dialog.ShowModal()
    - dialog.Destroy()
    event.Veto()
    + wx.CallAfter(self.ShowErrorMessage, message)
    else:
    event.Skip()
    --- a/editors/DataTypeEditor.py Thu Mar 09 15:35:19 2017 +0300
    +++ b/editors/DataTypeEditor.py Thu Mar 09 17:29:17 2017 +0300
    @@ -570,31 +570,25 @@
    wx.CallAfter(self.RefreshTypeInfos)
    event.Skip()
    + def ShowErrorMessage(self, message):
    + dialog = wx.MessageDialog(self, message, _("Error"), wx.OK|wx.ICON_ERROR)
    + dialog.ShowModal()
    + dialog.Destroy()
    +
    def OnStructureElementsGridCellChange(self, event):
    row, col = event.GetRow(), event.GetCol()
    colname = self.StructureElementsTable.GetColLabelValue(col, False)
    value = self.StructureElementsTable.GetValue(row, col)
    if colname == "Name":
    + message = None
    if not TestIdentifier(value):
    - message = wx.MessageDialog(self, _("\"%s\" is not a valid identifier!")%value, _("Error"), wx.OK|wx.ICON_ERROR)
    - message.ShowModal()
    - message.Destroy()
    - event.Veto()
    + message = _("\"%s\" is not a valid identifier!")%value
    elif value.upper() in IEC_KEYWORDS:
    - message = wx.MessageDialog(self, _("\"%s\" is a keyword. It can't be used!")%value, _("Error"), wx.OK|wx.ICON_ERROR)
    - message.ShowModal()
    - message.Destroy()
    - event.Veto()
    + message = _("\"%s\" is a keyword. It can't be used!")%value
    ## elif value.upper() in self.PouNames:
    -## message = wx.MessageDialog(self, "A pou with \"%s\" as name exists!"%value, "Error", wx.OK|wx.ICON_ERROR)
    -## message.ShowModal()
    -## message.Destroy()
    -## event.Veto()
    +## message = _("A pou with \"%s\" as name exists!")%value
    elif value.upper() in [var["Name"].upper() for idx, var in enumerate(self.StructureElementsTable.GetData()) if idx != row]:
    - message = wx.MessageDialog(self, _("An element named \"%s\" already exists in this structure!")%value, _("Error"), wx.OK|wx.ICON_ERROR)
    - message.ShowModal()
    - message.Destroy()
    - event.Veto()
    + message = _("An element named \"%s\" already exists in this structure!")%value
    else:
    self.RefreshTypeInfos()
    wx.CallAfter(self.StructureElementsTable.ResetView, self.StructureElementsGrid)
    @@ -603,6 +597,10 @@
    ## self.Controler.UpdateEditedElementUsedVariable(self.TagName, old_value, value)
    ## self.Controler.BufferProject()
    event.Skip()
    +
    + if message is not None:
    + event.Veto()
    + wx.CallAfter(self.ShowErrorMessage, message)
    else:
    self.RefreshTypeInfos()
    wx.CallAfter(self.StructureElementsTable.ResetView, self.StructureElementsGrid)