beremiz: comparison editors/DataTypeEditor.py

equal deleted inserted replaced

-:31e63e25b4cc
+:64beb9e9c749
 from graphics.GraphicCommons import REFRESH_HIGHLIGHT_PERIOD
 from controls import CustomEditableListBox, CustomGrid, CustomTable
 from dialogs import ArrayTypeDialog
 from EditorPanel import EditorPanel
 from util.BitmapLibrary import GetBitmap
+from util.TranslationCatalogs import NoTranslate
-#-------------------------------------------------------------------------------
+# -------------------------------------------------------------------------------
 #                                    Helpers
-#-------------------------------------------------------------------------------
+# -------------------------------------------------------------------------------
 DIMENSION_MODEL = re.compile("([0-9]+)\.\.([0-9]+)$")
 def AppendMenu(parent, help, id, kind, text):
 parent.Append(help=help, id=id, kind=kind, text=text)
 def GetElementsTableColnames():
-_ = lambda x : x
+_ = NoTranslate
 return ["#", _("Name"), _("Type"), _("Initial Value")]
 def GetDatatypeTypes():
-_ = lambda x : x
+_ = NoTranslate
 return [_("Directly"), _("Subrange"), _("Enumerated"), _("Array"), _("Structure")]
 DATATYPE_TYPES_DICT = dict([(_(datatype), datatype) for datatype in GetDatatypeTypes()])
-#-------------------------------------------------------------------------------
+# -------------------------------------------------------------------------------
 #                            Structure Elements Table
-#-------------------------------------------------------------------------------
+# -------------------------------------------------------------------------------
 class ElementsTable(CustomTable):
 """
 A custom wx.grid.Grid Table using user supplied data
 if row < self.GetNumberRows():
 if col == 0:
 return row + 1
 colname = self.GetColLabelValue(col, False)
 value = self.data[row].get(colname, "")
 if colname == "Type" and isinstance(value, TupleType):
 if value[0] == "array":
-return "ARRAY [%s] OF %s" % (",".join(map(lambda x : "..".join(x), value[2])), value[1])
+return "ARRAY [%s] OF %s" % (",".join(map(lambda x: "..".join(x), value[2])), value[1])
 return value
 def SetValue(self, row, col, value):
 if col < len(self.colnames):
 colname = self.GetColLabelValue(col, False)
 col_highlights = row_highlights.setdefault("initial value", [])
 else:
 col_highlights = row_highlights.setdefault(infos[1], [])
 col_highlights.append(highlight_type)
-#-------------------------------------------------------------------------------
+# -------------------------------------------------------------------------------
 #                          Datatype Editor class
-#-------------------------------------------------------------------------------
+# -------------------------------------------------------------------------------
 class DataTypeEditor(EditorPanel):
 def _init_Editor(self, parent):
 self.Editor = wx.Panel(parent, style=wx.SUNKEN_BORDER)
 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)
 # Panel for Subrange data types
 typeinfos_sizer.AddWindow(self.SubrangePanel, 1)
 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
 self.EnumeratedPanel = wx.Panel(self.Editor, style=wx.TAB_TRAVERSAL)
 typeinfos_sizer.AddWindow(self.EnumeratedPanel, 1)
 enumerated_panel_sizer = wx.BoxSizer(wx.HORIZONTAL)
-self.EnumeratedValues = CustomEditableListBox(self.EnumeratedPanel,
+self.EnumeratedValues = CustomEditableListBox(
-label=_("Values:"), style=wx.gizmos.EL_ALLOW_NEW|
+self.EnumeratedPanel,
-wx.gizmos.EL_ALLOW_EDIT|
+label=_("Values:"),
-wx.gizmos.EL_ALLOW_DELETE)
+style=(wx.gizmos.EL_ALLOW_NEW |
+wx.gizmos.EL_ALLOW_EDIT |
+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,
 border=5, flag=wx.ALL)
 self.EnumeratedPanel.SetSizer(enumerated_panel_sizer)
 # Panel for Array data types
 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,
+self.ArrayDimensions = CustomEditableListBox(
-label=_("Dimensions:"), style=wx.gizmos.EL_ALLOW_NEW|
+self.ArrayPanel,
-wx.gizmos.EL_ALLOW_EDIT|
+label=_("Dimensions:"),
-wx.gizmos.EL_ALLOW_DELETE)
+style=(wx.gizmos.EL_ALLOW_NEW |
+wx.gizmos.EL_ALLOW_EDIT |
+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)
 for name, bitmap, help in [
 ("StructureAddButton", "add_element", _("Add element")),
 ("StructureDeleteButton", "remove_element", _("Remove element")),
 ("StructureUpButton", "up", _("Move element up")),
 ("StructureDownButton", "down", _("Move element down"))]:
 button = wx.lib.buttons.GenBitmapButton(self.StructurePanel,
-bitmap=GetBitmap(bitmap), size=wx.Size(28, 28), style=wx.NO_BORDER)
+bitmap=GetBitmap(bitmap),
+size=wx.Size(28, 28),
+style=wx.NO_BORDER)
 button.SetToolTipString(help)
 setattr(self, name, button)
 structure_button_sizer.AddWindow(button)
 self.StructureElementsGrid = CustomGrid(self.StructurePanel,
 size=wx.Size(0, 150), style=wx.VSCROLL)
 self.StructureElementsGrid.Bind(wx.grid.EVT_GRID_CELL_CHANGE,
 self.OnStructureElementsGridCellChange)
 self.StructureElementsGrid.Bind(wx.grid.EVT_GRID_EDITOR_SHOWN,
 self.OnStructureElementsGridEditorShown)
 structure_panel_sizer.AddWindow(self.StructureElementsGrid, flag=wx.GROW)
 self.StructurePanel.SetSizer(structure_panel_sizer)
 self.Editor.SetSizer(self.MainSizer)
 def __init__(self, parent, tagname, window, controler):
 EditorPanel.__init__(self, parent, tagname, window, controler)
-self.StructureElementDefaultValue = {"Name" : "", "Type" : DefaultType, "Initial Value" : ""}
+self.StructureElementDefaultValue = {"Name": "", "Type": DefaultType, "Initial Value": ""}
 self.StructureElementsTable = ElementsTable(self, [], GetElementsTableColnames())
 self.StructureColSizes = [40, 150, 100, 250]
 self.StructureColAlignements = [wx.ALIGN_CENTER, wx.ALIGN_LEFT, wx.ALIGN_LEFT, wx.ALIGN_LEFT]
 self.StructureElementsGrid.SetTable(self.StructureElementsTable)
 self.EnumeratedValues.SetStrings(type_infos["values"])
 self.RefreshEnumeratedValues()
 self.EnumeratedInitialValue.SetStringSelection(type_infos["initial"])
 elif type_infos["type"] == "Array":
 self.ArrayBaseType.SetStringSelection(type_infos["base_type"])
-self.ArrayDimensions.SetStrings(map(lambda x : "..".join(x), type_infos["dimensions"]))
+self.ArrayDimensions.SetStrings(map(lambda x: "..".join(x), type_infos["dimensions"]))
 self.ArrayInitialValue.SetValue(type_infos["initial"])
 elif type_infos["type"] == "Structure":
 self.StructureElementsTable.SetData(type_infos["elements"])
 self.RefreshDisplayedInfos()
 self.ShowHighlights()
 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()
 colname = self.StructureElementsTable.GetColLabelValue(col, False)
 value = self.StructureElementsTable.GetValue(row, col)
 if colname == "Name":
 message = None
 if not TestIdentifier(value):
-message = _("\"%s\" is not a valid identifier!")%value
+message = _("\"%s\" is not a valid identifier!") % value
 elif value.upper() in IEC_KEYWORDS:
-message = _("\"%s\" is a keyword. It can't be used!")%value
+message = _("\"%s\" is a keyword. It can't be used!") % value
-##            elif value.upper() in self.PouNames:
+#            elif value.upper() in self.PouNames:
-##                message = _("A pou with \"%s\" as name exists!")%value
+#                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 = _("An element named \"%s\" already exists in this structure!")%value
+message = _("An element named \"%s\" already exists in this structure!") % value
 else:
 self.RefreshTypeInfos()
 wx.CallAfter(self.StructureElementsTable.ResetView, self.StructureElementsGrid)
-##                old_value = self.Table.GetOldValue()
+#                old_value = self.Table.GetOldValue()
-##                if old_value != "":
+#                if old_value != "":
-##                    self.Controler.UpdateEditedElementUsedVariable(self.TagName, old_value, value)
+#                    self.Controler.UpdateEditedElementUsedVariable(self.TagName, old_value, value)
-##                self.Controler.BufferProject()
+#                self.Controler.BufferProject()
 event.Skip()
 if message is not None:
 event.Veto()
 wx.CallAfter(self.ShowErrorMessage, message)
 new_id = wx.NewId()
 AppendMenu(type_menu, help='', id=new_id, kind=wx.ITEM_NORMAL, text=_("Array"))
 self.Bind(wx.EVT_MENU, self.ElementArrayTypeFunction, id=new_id)
-##            functionblock_menu = wx.Menu(title='')
+#            functionblock_menu = wx.Menu(title='')
-##            bodytype = self.Controler.GetEditedElementBodyType(self.TagName)
+#            bodytype = self.Controler.GetEditedElementBodyType(self.TagName)
-##            pouname, poutype = self.Controler.GetEditedElementType(self.TagName)
+#            pouname, poutype = self.Controler.GetEditedElementType(self.TagName)
-##            if classtype in ["Input","Output","InOut","External","Global"] or poutype != "function" and bodytype in ["ST", "IL"]:
+#            if classtype in ["Input","Output","InOut","External","Global"] or poutype != "function" and bodytype in ["ST", "IL"]:
-##                for functionblock_type in self.Controler.GetFunctionBlockTypes(self.TagName):
+#                for functionblock_type in self.Controler.GetFunctionBlockTypes(self.TagName):
-##                    new_id = wx.NewId()
+#                    new_id = wx.NewId()
-##                    AppendMenu(functionblock_menu, help='', id=new_id, kind=wx.ITEM_NORMAL, text=functionblock_type)
+#                    AppendMenu(functionblock_menu, help='', id=new_id, kind=wx.ITEM_NORMAL, text=functionblock_type)
-##                    self.Bind(wx.EVT_MENU, self.GetVariableTypeFunction(functionblock_type), id=new_id)
+#                    self.Bind(wx.EVT_MENU, self.GetVariableTypeFunction(functionblock_type), id=new_id)
-##                type_menu.AppendMenu(wx.NewId(), _("Function Block Types"), functionblock_menu)
+#                type_menu.AppendMenu(wx.NewId(), _("Function Block Types"), functionblock_menu)
 rect = self.StructureElementsGrid.BlockToDeviceRect((row, col), (row, col))
 self.StructureElementsGrid.PopupMenuXY(type_menu, rect.x + rect.width, rect.y + self.StructureElementsGrid.GetColLabelSize())
 type_menu.Destroy()
 event.Veto()
 def RefreshSubrangeInitialValueRange(self):
 self.SubrangeInitialValue.SetRange(self.SubrangeMinimum.GetValue(), self.SubrangeMaximum.GetValue())
 def RefreshTypeInfos(self):
 selected = DATATYPE_TYPES_DICT[self.DerivationType.GetStringSelection()]
-infos = {"type" : selected}
+infos = {"type": selected}
 if selected == "Directly":
 infos["base_type"] = self.DirectlyBaseType.GetStringSelection()
 infos["initial"] = self.DirectlyInitialValue.GetValue()
 elif selected == "Subrange":
 infos["base_type"] = self.SubrangeBaseType.GetStringSelection()
 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)
 self.Controler.SetDataTypeInfos(self.TagName, infos)
 self.ParentWindow.RefreshTitle()
 self.ParentWindow.RefreshFileMenu()
 self.ParentWindow.RefreshEditMenu()
-#-------------------------------------------------------------------------------
+# -------------------------------------------------------------------------------
 #                        Highlights showing functions
-#-------------------------------------------------------------------------------
+# -------------------------------------------------------------------------------
 def OnRefreshHighlightsTimer(self, event):
 self.RefreshView()
 event.Skip()
 listctrl.SetItemBackgroundColour(i, wx.NullColour)
 listctrl.SetItemTextColour(i, wx.NullColour)
 self.StructureElementsTable.ClearHighlights(highlight_type)
 self.RefreshView()
-def AddHighlight(self, infos, start, end ,highlight_type):
+def AddHighlight(self, infos, start, end, highlight_type):
 self.Highlights.append((infos, start, end, highlight_type))
 self.RefreshHighlightsTimer.Start(int(REFRESH_HIGHLIGHT_PERIOD * 1000), oneShot=True)
 def ShowHighlights(self):
 type_infos = self.Controler.GetDataTypeInfos(self.TagName)
 elif isinstance(control, wx.gizmos.EditableListBox):
 listctrl = control.GetListCtrl()
 listctrl.SetItemBackgroundColour(infos[1], highlight_type[0])
 listctrl.SetItemTextColour(infos[1], highlight_type[1])
 listctrl.Select(listctrl.FocusedItem, False)

changeset 1784	64beb9e9c749
parent 1782	5b6ad7a7fd9d
child 1812	8626a4948d5e