beremiz: comparison editors/DataTypeEditor.py

equal deleted inserted replaced

-:69dfdb26f600
+:f9d32913bad4
 self.MainSizer.AddGrowableCol(0)
 self.MainSizer.AddGrowableRow(1)
 top_sizer = wx.BoxSizer(wx.HORIZONTAL)
 self.MainSizer.AddSizer(top_sizer, border=5,
-flag=wx.GROW|wx.TOP|wx.LEFT|wx.RIGHT)
+flag=wx.GROW | wx.TOP | wx.LEFT | wx.RIGHT)
 derivation_type_label = wx.StaticText(self.Editor, label=_('Derivation Type:'))
 top_sizer.AddWindow(derivation_type_label, border=5,
-flag=wx.ALIGN_CENTER_VERTICAL|wx.LEFT|wx.RIGHT)
+flag=wx.ALIGN_CENTER_VERTICAL | wx.LEFT | wx.RIGHT)
 self.DerivationType = wx.ComboBox(self.Editor,
 size=wx.Size(200, -1), style=wx.CB_READONLY)
 self.Bind(wx.EVT_COMBOBOX, self.OnDerivationTypeChanged, self.DerivationType)
-top_sizer.AddWindow(self.DerivationType, border=5, flag=wx.GROW|wx.RIGHT)
+top_sizer.AddWindow(self.DerivationType, border=5, flag=wx.GROW | wx.RIGHT)
 typeinfos_staticbox = wx.StaticBox(self.Editor, label=_('Type infos:'))
 typeinfos_sizer = wx.StaticBoxSizer(typeinfos_staticbox, wx.HORIZONTAL)
 self.MainSizer.AddSizer(typeinfos_sizer, border=5,
-flag=wx.GROW|wx.BOTTOM|wx.LEFT|wx.RIGHT)
+flag=wx.GROW | wx.BOTTOM | wx.LEFT | wx.RIGHT)
 # Panel for Directly derived data types
 self.DirectlyPanel = wx.Panel(self.Editor, style=wx.TAB_TRAVERSAL)
 typeinfos_sizer.AddWindow(self.DirectlyPanel, 1)
 directly_panel_sizer = wx.BoxSizer(wx.HORIZONTAL)
 directly_basetype_label = wx.StaticText(self.DirectlyPanel,
 label=_('Base Type:'))
 directly_panel_sizer.AddWindow(directly_basetype_label, 1, border=5,
-flag=wx.ALIGN_CENTER_VERTICAL|wx.ALL)
+flag=wx.ALIGN_CENTER_VERTICAL | wx.ALL)
 self.DirectlyBaseType = wx.ComboBox(self.DirectlyPanel, style=wx.CB_READONLY)
 self.Bind(wx.EVT_COMBOBOX, self.OnInfosChanged, self.DirectlyBaseType)
 directly_panel_sizer.AddWindow(self.DirectlyBaseType, 1, border=5,
-flag=wx.GROW|wx.ALL)
+flag=wx.GROW | wx.ALL)
 directly_initialvalue_label = wx.StaticText(self.DirectlyPanel,
 label=_('Initial Value:'))
 directly_panel_sizer.AddWindow(directly_initialvalue_label, 1, border=5,
-flag=wx.ALIGN_CENTER_VERTICAL|wx.ALL)
+flag=wx.ALIGN_CENTER_VERTICAL | wx.ALL)
 self.DirectlyInitialValue = wx.TextCtrl(self.DirectlyPanel,
-style=wx.TE_PROCESS_ENTER|wx.TE_RICH)
+style=wx.TE_PROCESS_ENTER | wx.TE_RICH)
 self.Bind(wx.EVT_TEXT_ENTER, self.OnReturnKeyPressed, self.DirectlyInitialValue)
 directly_panel_sizer.AddWindow(self.DirectlyInitialValue, 1, border=5,
 flag=wx.ALL)
 self.DirectlyPanel.SetSizer(directly_panel_sizer)
 subrange_panel_sizer = wx.GridSizer(cols=4, hgap=5, rows=3, vgap=0)
 subrange_basetype_label = wx.StaticText(self.SubrangePanel,
 label=_('Base Type:'))
 subrange_panel_sizer.AddWindow(subrange_basetype_label, 1, border=5,
-flag=wx.ALIGN_CENTER_VERTICAL|wx.ALL)
+flag=wx.ALIGN_CENTER_VERTICAL | wx.ALL)
 self.SubrangeBaseType = wx.ComboBox(self.SubrangePanel, style=wx.CB_READONLY)
 self.Bind(wx.EVT_COMBOBOX, self.OnSubrangeBaseTypeChanged,
 self.SubrangeBaseType)
 subrange_panel_sizer.AddWindow(self.SubrangeBaseType, 1, border=5,
-flag=wx.GROW|wx.ALL)
+flag=wx.GROW | wx.ALL)
 subrange_initialvalue_label = wx.StaticText(self.SubrangePanel,
 label=_('Initial Value:'))
 subrange_panel_sizer.AddWindow(subrange_initialvalue_label, 1, border=5,
-flag=wx.ALIGN_CENTER_VERTICAL|wx.ALL)
+flag=wx.ALIGN_CENTER_VERTICAL | wx.ALL)
 self.SubrangeInitialValue = wx.SpinCtrl(self.SubrangePanel,
 style=wx.TAB_TRAVERSAL)
 self.Bind(wx.EVT_SPINCTRL, self.OnInfosChanged, self.SubrangeInitialValue)
 subrange_panel_sizer.AddWindow(self.SubrangeInitialValue, 1, border=5,
-flag=wx.GROW|wx.ALL)
+flag=wx.GROW | wx.ALL)
 subrange_minimum_label = wx.StaticText(self.SubrangePanel, label=_('Minimum:'))
 subrange_panel_sizer.AddWindow(subrange_minimum_label, 1, border=5,
-flag=wx.ALIGN_CENTER_VERTICAL|wx.ALL)
+flag=wx.ALIGN_CENTER_VERTICAL | wx.ALL)
 self.SubrangeMinimum = wx.SpinCtrl(self.SubrangePanel, style=wx.TAB_TRAVERSAL)
 self.Bind(wx.EVT_SPINCTRL, self.OnSubrangeMinimumChanged, self.SubrangeMinimum)
 subrange_panel_sizer.AddWindow(self.SubrangeMinimum, 1, border=5,
-flag=wx.GROW|wx.ALL)
+flag=wx.GROW | wx.ALL)
 for i in xrange(2):
 subrange_panel_sizer.AddWindow(wx.Size(0, 0), 1)
 subrange_maximum_label = wx.StaticText(self.SubrangePanel,
 label=_('Maximum:'))
 subrange_panel_sizer.AddWindow(subrange_maximum_label, 1, border=5,
-flag=wx.ALIGN_CENTER_VERTICAL|wx.ALL)
+flag=wx.ALIGN_CENTER_VERTICAL | wx.ALL)
 self.SubrangeMaximum = wx.SpinCtrl(self.SubrangePanel, style=wx.TAB_TRAVERSAL)
 self.Bind(wx.EVT_SPINCTRL, self.OnSubrangeMaximumChanged, self.SubrangeMaximum)
 subrange_panel_sizer.AddWindow(self.SubrangeMaximum, 1, border=5,
-flag=wx.GROW|wx.ALL)
+flag=wx.GROW | wx.ALL)
 self.SubrangePanel.SetSizer(subrange_panel_sizer)
 # Panel for Enumerated data types
 wx.gizmos.EL_ALLOW_DELETE)
 setattr(self.EnumeratedValues, "_OnLabelEndEdit", self.OnEnumeratedValueEndEdit)
 for func in ["_OnAddButton", "_OnDelButton", "_OnUpButton", "_OnDownButton"]:
 setattr(self.EnumeratedValues, func, self.OnEnumeratedValuesChanged)
 enumerated_panel_sizer.AddWindow(self.EnumeratedValues, 1, border=5,
-flag=wx.GROW|wx.ALL)
+flag=wx.GROW | wx.ALL)
 enumerated_panel_rightsizer = wx.BoxSizer(wx.HORIZONTAL)
 enumerated_panel_sizer.AddSizer(enumerated_panel_rightsizer, 1)
 enumerated_initialvalue_label = wx.StaticText(self.EnumeratedPanel,
 label=_('Initial Value:'))
 enumerated_panel_rightsizer.AddWindow(enumerated_initialvalue_label, 1,
-border=5, flag=wx.ALIGN_CENTER_VERTICAL|wx.ALL)
+border=5, flag=wx.ALIGN_CENTER_VERTICAL | wx.ALL)
 self.EnumeratedInitialValue = wx.ComboBox(self.EnumeratedPanel,
 style=wx.CB_READONLY)
 self.Bind(wx.EVT_COMBOBOX, self.OnInfosChanged, self.EnumeratedInitialValue)
 enumerated_panel_rightsizer.AddWindow(self.EnumeratedInitialValue, 1,
 array_panel_leftSizer = wx.BoxSizer(wx.HORIZONTAL)
 array_panel_sizer.AddSizer(array_panel_leftSizer, flag=wx.GROW)
 array_basetype_label = wx.StaticText(self.ArrayPanel, label=_('Base Type:'))
 array_panel_leftSizer.AddWindow(array_basetype_label, 1, border=5,
-flag=wx.ALIGN_CENTER_VERTICAL|wx.ALL)
+flag=wx.ALIGN_CENTER_VERTICAL | wx.ALL)
 self.ArrayBaseType = wx.ComboBox(self.ArrayPanel, style=wx.CB_READONLY)
 self.Bind(wx.EVT_COMBOBOX, self.OnInfosChanged, self.ArrayBaseType)
 array_panel_leftSizer.AddWindow(self.ArrayBaseType, 1, border=5,
-flag=wx.GROW|wx.ALL)
+flag=wx.GROW | wx.ALL)
 array_panel_rightsizer = wx.BoxSizer(wx.HORIZONTAL)
 array_panel_sizer.AddSizer(array_panel_rightsizer, flag=wx.GROW)
 array_initialvalue_label = wx.StaticText(self.ArrayPanel,
 label=_('Initial Value:'))
 array_panel_rightsizer.AddWindow(array_initialvalue_label, 1, border=5,
-flag=wx.ALIGN_CENTER_VERTICAL|wx.ALL)
+flag=wx.ALIGN_CENTER_VERTICAL | wx.ALL)
 self.ArrayInitialValue = wx.TextCtrl(self.ArrayPanel,
-style=wx.TE_PROCESS_ENTER|wx.TE_RICH)
+style=wx.TE_PROCESS_ENTER | wx.TE_RICH)
 self.Bind(wx.EVT_TEXT_ENTER, self.OnReturnKeyPressed, self.ArrayInitialValue)
 array_panel_rightsizer.AddWindow(self.ArrayInitialValue, 1, border=5,
 flag=wx.ALL)
 self.ArrayDimensions = CustomEditableListBox(self.ArrayPanel,
 wx.gizmos.EL_ALLOW_DELETE)
 for func in ["_OnLabelEndEdit", "_OnAddButton", "_OnDelButton",
 "_OnUpButton", "_OnDownButton"]:
 setattr(self.ArrayDimensions, func, self.OnDimensionsChanged)
 array_panel_sizer.AddWindow(self.ArrayDimensions, 0, border=5,
-flag=wx.GROW|wx.ALL)
+flag=wx.GROW | wx.ALL)
 self.ArrayPanel.SetSizer(array_panel_sizer)
 # Panel for Structure data types
 structure_button_sizer = wx.FlexGridSizer(cols=5, hgap=5, rows=1, vgap=0)
 structure_button_sizer.AddGrowableCol(0)
 structure_button_sizer.AddGrowableRow(0)
 structure_panel_sizer.AddSizer(structure_button_sizer, 0, border=5,
-flag=wx.ALL|wx.GROW)
+flag=wx.ALL | wx.GROW)
 structure_elements_label = wx.StaticText(self.StructurePanel,
 label=_('Elements :'))
 structure_button_sizer.AddWindow(structure_elements_label, flag=wx.ALIGN_BOTTOM)
 text = event.GetText()
 values = self.EnumeratedValues.GetStrings()
 index = event.GetIndex()
 if index >= len(values) or values[index].upper() != text.upper():
 if text.upper() in [value.upper() for value in values]:
-message = wx.MessageDialog(self, _("\"%s\" value already defined!") % text, _("Error"), wx.OK|wx.ICON_ERROR)
+message = wx.MessageDialog(self, _("\"%s\" value already defined!") % text, _("Error"), wx.OK | wx.ICON_ERROR)
 message.ShowModal()
 message.Destroy()
 event.Veto()
 elif text.upper() in IEC_KEYWORDS:
-message = wx.MessageDialog(self, _("\"%s\" is a keyword. It can't be used!") % text, _("Error"), wx.OK|wx.ICON_ERROR)
+message = wx.MessageDialog(self, _("\"%s\" is a keyword. It can't be used!") % text, _("Error"), wx.OK | wx.ICON_ERROR)
 message.ShowModal()
 message.Destroy()
 else:
 initial_selected = None
 if index < len(values) and self.EnumeratedInitialValue.GetStringSelection() == values[index]:
 wx.CallAfter(self.RefreshEnumeratedValues)
 wx.CallAfter(self.RefreshTypeInfos)
 event.Skip()
 def ShowErrorMessage(self, message):
-dialog = wx.MessageDialog(self, message, _("Error"), wx.OK|wx.ICON_ERROR)
+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()
 infos["base_type"] = self.ArrayBaseType.GetStringSelection()
 infos["dimensions"] = []
 for dimensions in self.ArrayDimensions.GetStrings():
 result = DIMENSION_MODEL.match(dimensions)
 if result is None:
-message = wx.MessageDialog(self, _("\"%s\" value isn't a valid array dimension!") % dimensions, _("Error"), wx.OK|wx.ICON_ERROR)
+message = wx.MessageDialog(self, _("\"%s\" value isn't a valid array dimension!") % dimensions, _("Error"), wx.OK | wx.ICON_ERROR)
 message.ShowModal()
 message.Destroy()
 self.RefreshView()
 return
 bounds = result.groups()
 if int(bounds[0]) >= int(bounds[1]):
-message = wx.MessageDialog(self, _("\"%s\" value isn't a valid array dimension!\nRight value must be greater than left value.") % dimensions, _("Error"), wx.OK|wx.ICON_ERROR)
+message = wx.MessageDialog(self, _("\"%s\" value isn't a valid array dimension!\nRight value must be greater than left value.") % dimensions, _("Error"), wx.OK | wx.ICON_ERROR)
 message.ShowModal()
 message.Destroy()
 self.RefreshView()
 return
 infos["dimensions"].append(bounds)

changeset 1745	f9d32913bad4
parent 1742	92932cd370a4
child 1749	d73b64672238