plcopeneditor_history: comparison PLCOpenEditor.py

equal deleted inserted replaced

-:45d70748e45a
+:fc2d6cbb8b39
 self.Bind(wx.EVT_MENU, self.OnQuitMenu, id=wx.ID_CLOSE_ALL)
 def _init_coll_EditMenu_Items(self, parent):
 AppendMenu(parent, help='', id=wx.ID_REFRESH,
 kind=wx.ITEM_NORMAL, text=u'Refresh\tCTRL+R')
+if not self.ModeSolo:
+AppendMenu(parent, help='', id=wx.ID_CLEAR,
+kind=wx.ITEM_NORMAL, text=u'Clear Errors\tCTRL+K')
 AppendMenu(parent, help='', id=wx.ID_UNDO,
 kind=wx.ITEM_NORMAL, text=u'Undo\tCTRL+Z')
 AppendMenu(parent, help='', id=wx.ID_REDO,
 kind=wx.ITEM_NORMAL, text=u'Redo\tCTRL+Y')
 parent.AppendSeparator()
 AppendMenu(addmenu, help='', id=ID_PLCOPENEDITOREDITMENUADDCONFIGURATION,
 kind=wx.ITEM_NORMAL, text=u'Configuration')
 AppendMenu(parent, help='', id=wx.ID_DELETE,
 kind=wx.ITEM_NORMAL, text=u'Delete')
 self.Bind(wx.EVT_MENU, self.OnRefreshMenu, id=wx.ID_REFRESH)
+if not self.ModeSolo:
+self.Bind(wx.EVT_MENU, self.OnClearErrorsMenu, id=wx.ID_CLEAR)
 self.Bind(wx.EVT_MENU, self.OnUndoMenu, id=wx.ID_UNDO)
 self.Bind(wx.EVT_MENU, self.OnRedoMenu, id=wx.ID_REDO)
 self.Bind(wx.EVT_MENU, self.OnCutMenu, id=wx.ID_CUT)
 self.Bind(wx.EVT_MENU, self.OnCopyMenu, id=wx.ID_COPY)
 self.Bind(wx.EVT_MENU, self.OnPasteMenu, id=wx.ID_PASTE)
 self.ProjectTree.AssignImageList(self.TreeImageList)
 self.CurrentToolBar = []
 self.CurrentLanguage = ""
 self.SelectedItem = None
+self.Errors = []
 self.DrawingMode = FREEDRAWING_MODE
 #self.DrawingMode = DRIVENDRAWING_MODE
 self.PrintData = wx.PrintData()
 self.PrintData.SetPaperId(wx.PAPER_A4)
 selected = self.GetPageSelection()
 if selected != -1:
 window = self.GetPage(selected)
 window.RefreshView()
 self.VariablePanelIndexer.RefreshVariablePanel(window.GetTagName())
+event.Skip()
+def OnClearErrorsMenu(self, event):
+self.ClearErrors()
 event.Skip()
 def OnUndoMenu(self, event):
 self.Controler.LoadPrevious()
 idxs = range(self.GetPageCount())
 if selected >= 0:
 window = self.GetPage(selected)
 else:
 window = None
 if window:
-if self.ProjectTree:
+self.SelectProjectTreeItem(window.GetTagName())
-root = self.ProjectTree.GetRootItem()
-words = window.GetTagName().split("::")
-if words[0] == "P":
-self.SelectProjectTreeItem(root, [(words[1], ITEM_POU)])
-elif words[0] == "T":
-self.SelectProjectTreeItem(root, [(words[1], ITEM_POU), (words[2], ITEM_TRANSITION)])
-elif words[0] == "A":
-self.SelectProjectTreeItem(root, [(words[1], ITEM_POU), (words[2], ITEM_ACTION)])
-elif words[0] == "C":
-self.SelectProjectTreeItem(root, [(words[1], ITEM_CONFIGURATION)])
-elif words[0] == "R":
-self.SelectProjectTreeItem(root, [(words[1], ITEM_CONFIGURATION), (words[2], ITEM_RESOURCE)])
 window.RefreshView()
 self.VariablePanelIndexer.ChangeVariablePanel(window.GetTagName())
 self.RefreshFileMenu()
 self.RefreshEditMenu()
 self.RefreshToolBar()
 def GenerateTreeBranch(self, root, infos):
 to_delete = []
 self.ProjectTree.SetItemText(root, infos["name"])
 self.ProjectTree.SetPyData(root, infos["type"])
+if infos["tagname"] in self.Errors:
+self.ProjectTree.SetItemBackgroundColour(root, wx.Colour(255, 255, 0))
+self.ProjectTree.SetItemTextColour(root, wx.RED)
+else:
+self.ProjectTree.SetItemBackgroundColour(root, wx.WHITE)
+self.ProjectTree.SetItemTextColour(root, wx.BLACK)
 if infos["type"] == ITEM_POU :
 self.ProjectTree.SetItemImage(root,self.TreeImageDict[self.Controler.GetPouBodyType(infos["name"])])
 else:
 self.ProjectTree.SetItemImage(root,self.TreeImageDict[infos["type"]])
 to_delete.append(item)
 item, root_cookie = self.ProjectTree.GetNextChild(root, root_cookie)
 for item in to_delete:
 self.ProjectTree.Delete(item)
-def SelectProjectTreeItem(self, root, items):
+def SelectProjectTreeItem(self, tagname):
+if self.ProjectTree:
+root = self.ProjectTree.GetRootItem()
+words = tagname.split("::")
+if words[0] == "D":
+return self.RecursiveProjectTreeItemSelection(root, [(words[1], ITEM_DATATYPE)])
+elif words[0] == "P":
+return self.RecursiveProjectTreeItemSelection(root, [(words[1], ITEM_POU)])
+elif words[0] == "T":
+return self.RecursiveProjectTreeItemSelection(root, [(words[1], ITEM_POU), (words[2], ITEM_TRANSITION)])
+elif words[0] == "A":
+return self.RecursiveProjectTreeItemSelection(root, [(words[1], ITEM_POU), (words[2], ITEM_ACTION)])
+elif words[0] == "C":
+return self.RecursiveProjectTreeItemSelection(root, [(words[1], ITEM_CONFIGURATION)])
+elif words[0] == "R":
+return self.RecursiveProjectTreeItemSelection(root, [(words[1], ITEM_CONFIGURATION), (words[2], ITEM_RESOURCE)])
+return False
+def RecursiveProjectTreeItemSelection(self, root, items):
 found = False
 if self.ProjectTree:
 if wx.VERSION >= (2, 6, 0):
 item, root_cookie = self.ProjectTree.GetFirstChild(root)
 else:
 self.SelectedItem = item
 self.ProjectTree.SelectItem(item)
 wx.CallAfter(self.ResetSelectedItem)
 return True
 else:
-found = self.SelectProjectTreeItem(item, items[1:])
+found = self.RecursiveProjectTreeItemSelection(item, items[1:])
 else:
-found = self.SelectProjectTreeItem(item, items)
+found = self.RecursiveProjectTreeItemSelection(item, items)
 item, root_cookie = self.ProjectTree.GetNextChild(root, root_cookie)
 return found
 def OnProjectTreeBeginDrag(self, event):
 if wx.Platform == '__WXMSW__':
 self.CurrentLanguage = language
 self.ResetCurrentMode()
 #-------------------------------------------------------------------------------
-#                           Tool Bar Items Functions
+#                           ToolBar Items Functions
 #-------------------------------------------------------------------------------
 def ResetCurrentMode(self):
 selected = self.GetPageSelection()
 if selected != -1:
 event.Skip()
 def OnAboutMenu(self, event):
 OpenHtmlFrame(self,"About PLCOpenEditor", os.path.join(CWD, "doc","about.html"), wx.Size(350, 350))
 event.Skip()
+#-------------------------------------------------------------------------------
+#                        Errors showing functions
+#-------------------------------------------------------------------------------
+def ShowError(self, infos, start, end):
+print infos
+self.EditProjectElement(self.Controler.GetElementType(infos[0]), infos[0])
+self.SelectProjectTreeItem(infos[0])
+if infos[1] == "name":
+self.Errors.append(infos[0])
+self.RefreshProjectTree()
+self.ProjectTree.Unselect()
+elif infos[1] == "variable":
+self.VariablePanelIndexer.AddVariableError(infos)
+else:
+selected = self.GetPageSelection()
+if selected != -1:
+viewer = self.GetPage(selected)
+viewer.AddShownError(infos[1:], start, end)
+viewer.RefreshView()
+def ClearErrors(self):
+self.Errors = []
+self.RefreshProjectTree()
+self.VariablePanelIndexer.ClearErrors()
+for i in xrange(self.GetPageCount()):
+viewer = self.GetPage(i)
+viewer.ClearErrors()
 current_num = 0
 def GetNewNum():
 global current_num
 current_num += 1
 def RefreshVariablePanel(self, tagname):
 if tagname in self.VariablePanelList:
 self.VariablePanelList[self.CurrentPanel].RefreshView()
+def AddVariableError(self, infos):
+self.ChangeVariablePanel(infos[0])
+if self.CurrentPanel is not None:
+self.VariablePanelList[self.CurrentPanel].AddVariableError(infos[2:])
+def ClearErrors(self):
+for panel in self.VariablePanelList.values():
+panel.ClearErrors()
 #-------------------------------------------------------------------------------
 #                            Variables Editor Panel
 #-------------------------------------------------------------------------------
 class VariableTable(wx.grid.PyGridTableBase):
 # The base class must be initialized *first*
 wx.grid.PyGridTableBase.__init__(self)
 self.data = data
 self.old_value = None
 self.colnames = colnames
+self.Errors = {}
 self.Parent = parent
 # XXX
 # we need to store the row length and collength to
 # see if the table has changed size
 self._rows = self.GetNumberRows()
 grid.SetReadOnly(row, col, True)
 grid.SetCellEditor(row, col, editor)
 grid.SetCellRenderer(row, col, renderer)
-grid.SetCellBackgroundColour(row, col, wx.WHITE)
+if row in self.Errors and self.Errors[row][0] == colname.lower():
+grid.SetCellBackgroundColour(row, col, wx.Colour(255, 255, 0))
+grid.SetCellTextColour(row, col, wx.RED)
+grid.MakeCellVisible(row, col)
+else:
+grid.SetCellTextColour(row, col, wx.BLACK)
+grid.SetCellBackgroundColour(row, col, wx.WHITE)
 def SetData(self, data):
 self.data = data
 def GetData(self):
 return self.data[row_index]
 def Empty(self):
 self.data = []
 self.editors = []
+def AddError(self, infos):
+self.Errors[infos[0]] = infos[1:]
+def ClearErrors(self):
+self.Errors = {}
 class VariableDropTarget(wx.TextDropTarget):
 def __init__(self, parent):
 wx.TextDropTarget.__init__(self)
 if buffer:
 self.Controler.BufferProject()
 self.ParentWindow.RefreshTitle()
 self.ParentWindow.RefreshEditMenu()
+def AddVariableError(self, infos):
+if isinstance(infos[0], TupleType):
+for i in xrange(*infos[0]):
+self.Table.AddError((i,) + infos[1:])
+else:
+self.Table.AddError(infos)
+self.Table.ResetView(self.VariablesGrid)
+def ClearErrors(self):
+self.Table.ClearErrors()
+self.Table.ResetView(self.VariablesGrid)
 UPPER_DIV = lambda x, y: (x / y) + {True : 0, False : 1}[(x % y) == 0]
 class GraphicPrintout(wx.Printout):
 def __init__(self, viewer, page_size, margins, preview = False):
 wx.Printout.__init__(self)

changeset 231	fc2d6cbb8b39
parent 223	ea857c3a0427
child 235	7b58a3b5b6ec