beremiz: comparison etherlab/ConfigEditor.py

equal deleted inserted replaced

-:d635680e4c2c
+:0fb54172a18b
 main_sizer.AddGrowableCol(0)
 main_sizer.AddGrowableRow(1)
 variables_label = wx.StaticText(self.EthercatNodeEditor,
 label=_('Variable entries:'))
-main_sizer.AddWindow(variables_label, border=10, flag=wx.TOP|wx.LEFT|wx.RIGHT)
+main_sizer.AddWindow(variables_label, border=10, flag=wx.TOP | wx.LEFT | wx.RIGHT)
 self.NodeVariables = NodeVariablesSizer(self.EthercatNodeEditor, self.Controler)
 main_sizer.AddSizer(self.NodeVariables, border=10,
-flag=wx.GROW|wx.BOTTOM|wx.LEFT|wx.RIGHT)
+flag=wx.GROW | wx.BOTTOM | wx.LEFT | wx.RIGHT)
 self.EthercatNodeEditor.SetSizer(main_sizer)
 return self.EthercatNodeEditor
 self.NodeVariables.RefreshView()
 # -------------------For EtherCAT Management ----------------------------------------------
 def _create_EtherCATManagementEditor(self, prnt):
 self.EtherCATManagementEditor = wx.ScrolledWindow(prnt,
-style=wx.TAB_TRAVERSAL|wx.HSCROLL|wx.VSCROLL)
+style=wx.TAB_TRAVERSAL | wx.HSCROLL | wx.VSCROLL)
 self.EtherCATManagementEditor.Bind(wx.EVT_SIZE, self.OnResize)
 self.EtherCATManagermentEditor_Main_Sizer = wx.FlexGridSizer(cols=1, hgap=0, rows=2, vgap=5)
 self.EtherCATManagermentEditor_Main_Sizer.AddGrowableCol(0)
 self.EtherCATManagermentEditor_Main_Sizer.AddGrowableRow(0)
 if message is not None:
 wx.CallAfter(self.ShowMessage, message)
 def ShowMessage(self, message):
-message = wx.MessageDialog(self.ParentWindow, message, _("Error"), wx.OK|wx.ICON_ERROR)
+message = wx.MessageDialog(self.ParentWindow, message, _("Error"), wx.OK | wx.ICON_ERROR)
 message.ShowModal()
 message.Destroy()
 def GetStartupCommandsTableColnames():
 if message is not None:
 wx.CallAfter(self.ShowMessage, message)
 def ShowMessage(self, message):
-message = wx.MessageDialog(self.ParentWindow, message, _("Error"), wx.OK|wx.ICON_ERROR)
+message = wx.MessageDialog(self.ParentWindow, message, _("Error"), wx.OK | wx.ICON_ERROR)
 message.ShowModal()
 message.Destroy()
 class StartupCommandsTable(CustomTable):
 (_("Network"), "_create_EthercatMasterEditor"),
 (_("Master State"), "_create_MasterStateEditor")
 ]
 def _create_MasterStateEditor(self, prnt):
-self.MasterStateEditor = wx.ScrolledWindow(prnt, style=wx.TAB_TRAVERSAL|wx.HSCROLL|wx.VSCROLL)
+self.MasterStateEditor = wx.ScrolledWindow(prnt, style=wx.TAB_TRAVERSAL | wx.HSCROLL | wx.VSCROLL)
 self.MasterStateEditor.Bind(wx.EVT_SIZE, self.OnResize)
 self.MasterStateEditor_Panel_Main_Sizer = wx.FlexGridSizer(cols=1, hgap=0, rows=2, vgap=5)
 self.MasterStateEditor_Panel_Main_Sizer.AddGrowableCol(0)
 self.MasterStateEditor_Panel_Main_Sizer.AddGrowableRow(0)
 maxx / SCROLLBAR_UNIT, maxy / SCROLLBAR_UNIT, posx, posy)
 event.Skip()
 def _create_EthercatMasterEditor(self, prnt):
 self.EthercatMasterEditor = wx.ScrolledWindow(prnt,
-style=wx.TAB_TRAVERSAL|wx.HSCROLL|wx.VSCROLL)
+style=wx.TAB_TRAVERSAL | wx.HSCROLL | wx.VSCROLL)
 self.EthercatMasterEditor.Bind(wx.EVT_SIZE, self.OnResize)
 self.EthercatMasterEditorSizer = wx.BoxSizer(wx.VERTICAL)
 self.NodesFilter = wx.ComboBox(self.EthercatMasterEditor,
 self.NodesVariables = MasterNodesVariablesSizer(self.EthercatMasterEditor, self.Controler)
 main_staticbox = wx.StaticBox(self.EthercatMasterEditor, label=_("Node filter:"))
 staticbox_sizer = wx.StaticBoxSizer(main_staticbox, wx.VERTICAL)
-self.EthercatMasterEditorSizer.AddSizer(staticbox_sizer, 0, border=10, flag=wx.GROW|wx.ALL)
+self.EthercatMasterEditorSizer.AddSizer(staticbox_sizer, 0, border=10, flag=wx.GROW | wx.ALL)
 main_staticbox_sizer = wx.FlexGridSizer(cols=1, hgap=0, rows=6, vgap=0)
 main_staticbox_sizer.AddGrowableCol(0)
 main_staticbox_sizer.AddGrowableRow(2)
 main_staticbox_sizer.AddGrowableRow(4)
 main_staticbox_sizer.AddGrowableRow(5)
 staticbox_sizer.AddSizer(main_staticbox_sizer, 1, flag=wx.GROW)
-main_staticbox_sizer.AddWindow(self.NodesFilter, border=5, flag=wx.GROW|wx.ALL)
+main_staticbox_sizer.AddWindow(self.NodesFilter, border=5, flag=wx.GROW | wx.ALL)
 main_staticbox_sizer.AddSizer(process_variables_header, border=5,
-flag=wx.GROW|wx.LEFT|wx.RIGHT|wx.BOTTOM)
+flag=wx.GROW | wx.LEFT | wx.RIGHT | wx.BOTTOM)
 main_staticbox_sizer.AddWindow(self.ProcessVariablesGrid, 1,
-border=5, flag=wx.GROW|wx.LEFT|wx.RIGHT|wx.BOTTOM)
+border=5, flag=wx.GROW | wx.LEFT | wx.RIGHT | wx.BOTTOM)
 main_staticbox_sizer.AddSizer(startup_commands_header,
-border=5, flag=wx.GROW|wx.LEFT|wx.RIGHT|wx.BOTTOM)
+border=5, flag=wx.GROW | wx.LEFT | wx.RIGHT | wx.BOTTOM)
 main_staticbox_sizer.AddWindow(self.StartupCommandsGrid, 1,
-border=5, flag=wx.GROW|wx.LEFT|wx.RIGHT|wx.BOTTOM)
+border=5, flag=wx.GROW | wx.LEFT | wx.RIGHT | wx.BOTTOM)
 second_staticbox = wx.StaticBox(self.EthercatMasterEditor, label=_("Nodes variables filter:"))
 second_staticbox_sizer = wx.StaticBoxSizer(second_staticbox, wx.VERTICAL)
-second_staticbox_sizer.AddSizer(self.NodesVariables, 1, border=5, flag=wx.GROW|wx.ALL)
+second_staticbox_sizer.AddSizer(self.NodesVariables, 1, border=5, flag=wx.GROW | wx.ALL)
 main_staticbox_sizer.AddSizer(second_staticbox_sizer, 1,
-border=5, flag=wx.GROW|wx.LEFT|wx.RIGHT|wx.BOTTOM)
+border=5, flag=wx.GROW | wx.LEFT | wx.RIGHT | wx.BOTTOM)
 self.EthercatMasterEditor.SetSizer(self.EthercatMasterEditorSizer)
 return self.EthercatMasterEditor
 if message is None:
 self.SaveProcessVariables()
 wx.CallAfter(self.ProcessVariablesTable.ResetView, self.ProcessVariablesGrid)
 event.Skip()
 else:
-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()
 event.Veto()
 def OnProcessVariablesGridCellLeftClick(self, event):
 wx.CallAfter(self.RefreshStartupCommands, command["Position"], command["command_idx"])
 if message is None:
 self.RefreshBuffer()
 event.Skip()
 else:
-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()
 event.Veto()
 else:
 event.Veto()
 self.AddGrowableRow(3)
 ESI_files_label = wx.StaticText(parent,
 label=_("ESI Files:"))
 self.AddWindow(ESI_files_label, border=10,
-flag=wx.TOP|wx.LEFT|wx.RIGHT)
+flag=wx.TOP | wx.LEFT | wx.RIGHT)
 folder_tree_sizer = wx.FlexGridSizer(cols=2, hgap=5, rows=1, vgap=0)
 folder_tree_sizer.AddGrowableCol(0)
 folder_tree_sizer.AddGrowableRow(0)
 self.AddSizer(folder_tree_sizer, border=10,
-flag=wx.GROW|wx.LEFT|wx.RIGHT)
+flag=wx.GROW | wx.LEFT | wx.RIGHT)
 self.ESIFiles = FolderTree(parent, self.GetPath(), editable=False)
 self.ESIFiles.SetFilter(".xml")
 folder_tree_sizer.AddWindow(self.ESIFiles, flag=wx.GROW)
 buttons_sizer.AddWindow(button, border=10, flag=flag)
 modules_label = wx.StaticText(parent,
 label=_("Modules library:"))
 self.AddSizer(modules_label, border=10,
-flag=wx.LEFT|wx.RIGHT)
+flag=wx.LEFT | wx.RIGHT)
 self.ModulesGrid = wx.gizmos.TreeListCtrl(parent,
 style=wx.TR_DEFAULT_STYLE |
 wx.TR_ROW_LINES |
 wx.TR_COLUMN_LINES |
 self.ModulesGrid.Bind(wx.EVT_TREE_END_LABEL_EDIT,
 self.OnModulesGridEndLabelEdit)
 self.ModulesGrid.GetHeaderWindow().Bind(wx.EVT_MOTION,
 self.OnModulesGridHeaderMotion)
 self.AddWindow(self.ModulesGrid, border=10,
-flag=wx.GROW|wx.BOTTOM|wx.LEFT|wx.RIGHT)
+flag=wx.GROW | wx.BOTTOM | wx.LEFT | wx.RIGHT)
 for colname, colsize, colalign in zip(
 [_("Name")] + [param_infos["column_label"]
 for param, param_infos in
 self.ModuleLibrary.MODULES_EXTRA_PARAMS],
 if self.ModuleLibrary.ImportModuleLibrary(filepath):
 wx.CallAfter(self.RefreshView)
 else:
 message = wx.MessageDialog(self,
 _("No such XML file: %s\n") % filepath,
-_("Error"), wx.OK|wx.ICON_ERROR)
+_("Error"), wx.OK | wx.ICON_ERROR)
 message.ShowModal()
 message.Destroy()
 dialog.Destroy()
 event.Skip()
 if os.path.isfile(filepath):
 folder, filename = os.path.split(filepath)
 dialog = wx.MessageDialog(self.ParentWindow,
 _("Do you really want to delete the file '%s'?") % filename,
-_("Delete File"), wx.YES_NO|wx.ICON_QUESTION)
+_("Delete File"), wx.YES_NO | wx.ICON_QUESTION)
 remove = dialog.ShowModal() == wx.ID_YES
 dialog.Destroy()
 if remove:
 os.remove(filepath)
 wx.CallAfter(self.RefreshModulesGrid)
 event.Skip()
 except ValueError:
 message = wx.MessageDialog(self,
 _("Module %s must be an integer!") % stripped_column_label,
-_("Error"), wx.OK|wx.ICON_ERROR)
+_("Error"), wx.OK | wx.ICON_ERROR)
 message.ShowModal()
 message.Destroy()
 event.Veto()
 else:
 event.Veto()
 class DatabaseManagementDialog(wx.Dialog):
 def __init__(self, parent, database):
 wx.Dialog.__init__(self, parent,
 size=wx.Size(700, 500), title=_('ESI Files Database management'),
-style=wx.DEFAULT_DIALOG_STYLE|wx.RESIZE_BORDER)
+style=wx.DEFAULT_DIALOG_STYLE | wx.RESIZE_BORDER)
 main_sizer = wx.FlexGridSizer(cols=1, hgap=0, rows=2, vgap=10)
 main_sizer.AddGrowableCol(0)
 main_sizer.AddGrowableRow(0)
 self.DatabaseSizer = LibraryEditorSizer(self, database,
 [("ImportButton", "ImportESI", _("Import file to ESI files database"), None),
 ("DeleteButton", "remove_element", _("Remove file from database"), None)])
 self.DatabaseSizer.SetControlMinSize(wx.Size(0, 0))
 main_sizer.AddSizer(self.DatabaseSizer, border=10,
-flag=wx.GROW|wx.TOP|wx.LEFT|wx.RIGHT)
+flag=wx.GROW | wx.TOP | wx.LEFT | wx.RIGHT)
-button_sizer = self.CreateButtonSizer(wx.OK|wx.CANCEL|wx.CENTRE)
+button_sizer = self.CreateButtonSizer(wx.OK | wx.CANCEL | wx.CENTRE)
 button_sizer.GetAffirmativeButton().SetLabel(_("Add file to project"))
 button_sizer.GetCancelButton().SetLabel(_("Close"))
 main_sizer.AddSizer(button_sizer, border=10,
-flag=wx.ALIGN_RIGHT|wx.BOTTOM|wx.LEFT|wx.RIGHT)
+flag=wx.ALIGN_RIGHT | wx.BOTTOM | wx.LEFT | wx.RIGHT)
 self.SetSizer(main_sizer)
 self.DatabaseSizer.RefreshView()
 CONFNODEEDITOR_TABS = [
 (_("Modules Library"), "_create_ModuleLibraryEditor")]
 def _create_ModuleLibraryEditor(self, prnt):
 self.ModuleLibraryEditor = wx.ScrolledWindow(prnt,
-style=wx.TAB_TRAVERSAL|wx.HSCROLL|wx.VSCROLL)
+style=wx.TAB_TRAVERSAL | wx.HSCROLL | wx.VSCROLL)
 self.ModuleLibraryEditor.Bind(wx.EVT_SIZE, self.OnResize)
 self.ModuleLibrarySizer = LibraryEditorSizer(self.ModuleLibraryEditor,
 self.Controler.GetModulesLibraryInstance(),
 [("ImportButton", "ImportESI", _("Import ESI file"), None),

changeset 2367	0fb54172a18b
parent 2363	9c7da6ff6a34
child 2370	e40f3914e55f