beremiz: comparison editors/ResourceEditor.py

equal deleted inserted replaced

-:31e63e25b4cc
+:64beb9e9c749
 from controls import CustomGrid, CustomTable, DurationCellEditor
 from dialogs.DurationEditorDialog import IEC_TIME_MODEL
 from EditorPanel import EditorPanel
 from util.BitmapLibrary import GetBitmap
 from plcopen.structures import LOCATIONDATATYPES, TestIdentifier, IEC_KEYWORDS, DefaultType
-#-------------------------------------------------------------------------------
+from util.TranslationCatalogs import NoTranslate
+# -------------------------------------------------------------------------------
 #                          Configuration Editor class
-#-------------------------------------------------------------------------------
+# -------------------------------------------------------------------------------
-[ID_CONFIGURATIONEDITOR,
+[
+ID_CONFIGURATIONEDITOR,
 ] = [wx.NewId() for _init_ctrls in range(1)]
 class ConfigurationEditor(EditorPanel):
 ID = ID_CONFIGURATIONEDITOR
 VARIABLE_PANEL_TYPE = "config"
 def HasNoModel(self):
 return self.Controler.GetEditedElement(self.TagName) is None
-#-------------------------------------------------------------------------------
+# -------------------------------------------------------------------------------
 #                            Resource Editor class
-#-------------------------------------------------------------------------------
+# -------------------------------------------------------------------------------
 def GetTasksTableColnames():
-_ = lambda x : x
+_ = NoTranslate
 return [_("Name"), _("Triggering"), _("Single"), _("Interval"), _("Priority")]
 def GetTaskTriggeringOptions():
-_ = lambda x : x
+_ = NoTranslate
 return [_("Interrupt"), _("Cyclic")]
 TASKTRIGGERINGOPTIONS_DICT = dict([(_(option), option) for option in GetTaskTriggeringOptions()])
-SingleCellEditor = lambda *x : wx.grid.GridCellChoiceEditor()
+def SingleCellEditor(*x):
+return wx.grid.GridCellChoiceEditor()
 def CheckSingle(single, varlist):
 return single in varlist
 def GetInstancesTableColnames():
-_ = lambda x : x
+_ = NoTranslate
 return [_("Name"), _("Type"), _("Task")]
 class ResourceTable(CustomTable):
 """
 A custom wx.grid.Grid Table using user supplied data
 grid.SetReadOnly(row, col, True)
 interval = self.GetValueByName(row, colname)
 if interval != "" and IEC_TIME_MODEL.match(interval.upper()) is None:
 error = True
 elif colname == "Single":
-editor = SingleCellEditor(self,colname)
+editor = SingleCellEditor(self, colname)
 editor.SetParameters(self.Parent.VariableList)
 if self.GetValueByName(row, "Triggering") != "Interrupt":
 grid.SetReadOnly(row, col, True)
 single = self.GetValueByName(row, colname)
-if single != "" and not CheckSingle(single,self.Parent.VariableList):
+if single != "" and not CheckSingle(single, self.Parent.VariableList):
 error = True
 elif colname == "Triggering":
 editor = wx.grid.GridCellChoiceEditor()
 editor.SetParameters(",".join(map(_, GetTaskTriggeringOptions())))
 elif colname == "Type":
 highlight_colours = row_highlights.get(colname.lower(), [(wx.WHITE, wx.BLACK)])[-1]
 grid.SetCellBackgroundColour(row, col, highlight_colours[0])
 grid.SetCellTextColour(row, col, highlight_colours[1])
 self.ResizeRow(grid, row)
+# -------------------------------------------------------------------------------
-#-------------------------------------------------------------------------------
+#                        Highlights showing functions
-#                        Highlights showing functions
+# -------------------------------------------------------------------------------
-#-------------------------------------------------------------------------------
 def AddHighlight(self, infos, highlight_type):
 row_highlights = self.Highlights.setdefault(infos[0], {})
 col_highlights = row_highlights.setdefault(infos[1], [])
 col_highlights.append(highlight_type)
 col_highlights.remove(highlight_type)
 if len(col_highlights) == 0:
 row_highlights.pop(col)
 class ResourceEditor(EditorPanel):
 VARIABLE_PANEL_TYPE = "resource"
 def _init_Editor(self, parent):
-self.Editor = wx.Panel(parent, style=wx.SUNKEN_BORDER|wx.TAB_TRAVERSAL)
+self.Editor = wx.Panel(parent, style=wx.SUNKEN_BORDER | wx.TAB_TRAVERSAL)
 main_sizer = wx.FlexGridSizer(cols=1, hgap=0, rows=2, vgap=5)
 main_sizer.AddGrowableCol(0)
 main_sizer.AddGrowableRow(0)
 main_sizer.AddGrowableRow(1)
 tasks_sizer = wx.FlexGridSizer(cols=1, hgap=0, rows=2, vgap=5)
 tasks_sizer.AddGrowableCol(0)
 tasks_sizer.AddGrowableRow(1)
 main_sizer.AddSizer(tasks_sizer, border=5,
-flag=wx.GROW|wx.TOP|wx.LEFT|wx.RIGHT)
+flag=wx.GROW | wx.TOP | wx.LEFT | wx.RIGHT)
 tasks_buttons_sizer = wx.FlexGridSizer(cols=5, hgap=5, rows=1, vgap=0)
 tasks_buttons_sizer.AddGrowableCol(0)
 tasks_buttons_sizer.AddGrowableRow(0)
 tasks_sizer.AddSizer(tasks_buttons_sizer, flag=wx.GROW)
 ("AddTaskButton", "add_element", _("Add task")),
 ("DeleteTaskButton", "remove_element", _("Remove task")),
 ("UpTaskButton", "up", _("Move task up")),
 ("DownTaskButton", "down", _("Move task down"))]:
 button = wx.lib.buttons.GenBitmapButton(self.Editor,
-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)
 tasks_buttons_sizer.AddWindow(button)
 self.TasksGrid = CustomGrid(self.Editor, style=wx.VSCROLL)
 instances_sizer = wx.FlexGridSizer(cols=1, hgap=0, rows=2, vgap=5)
 instances_sizer.AddGrowableCol(0)
 instances_sizer.AddGrowableRow(1)
 main_sizer.AddSizer(instances_sizer, border=5,
-flag=wx.GROW|wx.BOTTOM|wx.LEFT|wx.RIGHT)
+flag=wx.GROW | wx.BOTTOM | wx.LEFT | wx.RIGHT)
 instances_buttons_sizer = wx.FlexGridSizer(cols=5, hgap=5, rows=1, vgap=0)
 instances_buttons_sizer.AddGrowableCol(0)
 instances_buttons_sizer.AddGrowableRow(0)
 instances_sizer.AddSizer(instances_buttons_sizer, flag=wx.GROW)
 for name, bitmap, help in [
 ("AddInstanceButton", "add_element", _("Add instance")),
 ("DeleteInstanceButton", "remove_element", _("Remove instance")),
 ("UpInstanceButton", "up", _("Move instance up")),
 ("DownInstanceButton", "down", _("Move instance down"))]:
-button = wx.lib.buttons.GenBitmapButton(self.Editor,
+button = wx.lib.buttons.GenBitmapButton(
-bitmap=GetBitmap(bitmap), size=wx.Size(28, 28), style=wx.NO_BORDER)
+self.Editor, bitmap=GetBitmap(bitmap),
+size=wx.Size(28, 28), style=wx.NO_BORDER)
 button.SetToolTipString(help)
 setattr(self, name, button)
 instances_buttons_sizer.AddWindow(button)
 self.InstancesGrid = CustomGrid(self.Editor, style=wx.VSCROLL)
-self.InstancesGrid.Bind(wx.grid.EVT_GRID_CELL_CHANGE,
+self.InstancesGrid.Bind(wx.grid.EVT_GRID_CELL_CHANGE, self.OnInstancesGridCellChange)
-self.OnInstancesGridCellChange)
 instances_sizer.AddWindow(self.InstancesGrid, flag=wx.GROW)
 self.Editor.SetSizer(main_sizer)
 def __init__(self, parent, tagname, window, controler):
 EditorPanel.__init__(self, parent, tagname, window, controler)
 self.RefreshHighlightsTimer = wx.Timer(self, -1)
 self.Bind(wx.EVT_TIMER, self.OnRefreshHighlightsTimer, self.RefreshHighlightsTimer)
-self.TasksDefaultValue = {"Name" : "", "Triggering" : "", "Single" : "", "Interval" : "", "Priority" : 0}
+self.TasksDefaultValue = {"Name": "", "Triggering": "", "Single": "", "Interval": "", "Priority": 0}
 self.TasksTable = ResourceTable(self, [], GetTasksTableColnames())
 self.TasksTable.SetColAlignements([wx.ALIGN_LEFT, wx.ALIGN_LEFT, wx.ALIGN_LEFT, wx.ALIGN_RIGHT, wx.ALIGN_RIGHT])
 self.TasksTable.SetColSizes([200, 100, 100, 150, 100])
 self.TasksGrid.SetTable(self.TasksTable)
 self.TasksGrid.SetButtons({"Add": self.AddTaskButton,
 self.TasksGrid.SetRowLabelSize(0)
 self.TasksTable.ResetView(self.TasksGrid)
 self.TasksGrid.RefreshButtons()
-self.InstancesDefaultValue = {"Name" : "", "Type" : "", "Task" : ""}
+self.InstancesDefaultValue = {"Name": "", "Type": "", "Task": ""}
 self.InstancesTable = ResourceTable(self, [], GetInstancesTableColnames())
 self.InstancesTable.SetColAlignements([wx.ALIGN_LEFT, wx.ALIGN_LEFT, wx.ALIGN_LEFT])
 self.InstancesTable.SetColSizes([200, 150, 150])
 self.InstancesGrid.SetTable(self.InstancesTable)
 self.InstancesGrid.SetButtons({"Add": self.AddInstanceButton,
 def _RefreshInstanceButtons():
 if self:
 rows = self.InstancesTable.GetNumberRows()
 row = self.InstancesGrid.GetGridCursorRow()
 self.DeleteInstanceButton.Enable(rows > 0)
-self.UpInstanceButton.Enable(row > 0 and
+self.UpInstanceButton.Enable(
+row > 0 and
 self.InstancesTable.GetValueByName(row, "Task") == self.InstancesTable.GetValueByName(row - 1, "Task"))
-self.DownInstanceButton.Enable(0 <= row < rows - 1 and
+self.DownInstanceButton.Enable(
+0 <= row < rows - 1 and
 self.InstancesTable.GetValueByName(row, "Task") == self.InstancesTable.GetValueByName(row + 1, "Task"))
 setattr(self.InstancesGrid, "RefreshButtons", _RefreshInstanceButtons)
 self.InstancesGrid.SetRowLabelSize(0)
 self.InstancesTable.ResetView(self.InstancesGrid)
 def RefreshTypeList(self):
 self.TypeList = ""
 blocktypes = self.Controler.GetBlockResource()
 for blocktype in blocktypes:
-self.TypeList += ",%s"%blocktype
+self.TypeList += ",%s" % blocktype
 def RefreshTaskList(self):
 self.TaskList = ""
 for row in xrange(self.TasksTable.GetNumberRows()):
-self.TaskList += ",%s"%self.TasksTable.GetValueByName(row, "Name")
+self.TaskList += ",%s" % self.TasksTable.GetValueByName(row, "Name")
 def RefreshVariableList(self):
 self.VariableList = ""
 for variable in self.Controler.GetEditedResourceVariables(self.TagName):
-self.VariableList += ",%s"%variable
+self.VariableList += ",%s" % variable
 def RefreshModel(self):
 self.Controler.SetEditedResourceInfos(self.TagName, self.TasksTable.GetData(), self.InstancesTable.GetData())
 self.RefreshBuffer()
 self.InstancesTable.ResetView(self.InstancesGrid)
 self.TasksGrid.RefreshButtons()
 self.InstancesGrid.RefreshButtons()
 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 OnTasksGridCellChange(self, event):
 row, col = event.GetRow(), event.GetCol()
 if not TestIdentifier(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
-elif value.upper() in [var["Name"].upper() for i, var in enumerate(self.TasksTable.data) if i!=row]:
+elif value.upper() in [var["Name"].upper() for i, var in enumerate(self.TasksTable.data) if i != row]:
 message = _("A task with the same name already exists!")
 if message is not None:
 event.Veto()
 wx.CallAfter(self.ShowErrorMessage, message)
 return
 if not TestIdentifier(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
-elif value.upper() in [var["Name"].upper() for i ,var in enumerate(self.InstancesTable.data) if i!=row]:
+elif value.upper() in [var["Name"].upper() for i, var in enumerate(self.InstancesTable.data) if i != row]:
 message = _("An instance with the same name already exists!")
 if message is not None:
 event.Veto()
 wx.CallAfter(self.ShowErrorMessage, message)
 return
 self.RefreshModel()
 self.ParentWindow.RefreshPouInstanceVariablesPanel()
 self.InstancesGrid.RefreshButtons()
 event.Skip()
-#-------------------------------------------------------------------------------
+# -------------------------------------------------------------------------------
 #                        Highlights showing functions
-#-------------------------------------------------------------------------------
+# -------------------------------------------------------------------------------
 def OnRefreshHighlightsTimer(self, event):
 self.RefreshView()
 event.Skip()

changeset 1784	64beb9e9c749
parent 1782	5b6ad7a7fd9d
child 1834	cd42b426028b