plcopeneditor_history: comparison PLCOpenEditor.py

equal deleted inserted replaced

-:6a72016d721a
+:020420ad8914
 ID_PLCOPENEDITORTOOLBAR, ID_PLCOPENEDITORDEFAULTTOOLBAR,
 ID_PLCOPENEDITORSFCTOOLBAR, ID_PLCOPENEDITORFBDTOOLBAR,
 ID_PLCOPENEDITORLDTOOLBAR,
 ] = [wx.NewId() for _init_ctrls in range(17)]
+# Define PLCOpenEditor FileMenu extra items id
 [ID_PLCOPENEDITORFILEMENUGENERATE,
 ] = [wx.NewId() for _init_coll_FileMenu_Items in range(1)]
+# Define PLCOpenEditor EditMenu extra items id
 [ID_PLCOPENEDITOREDITMENUENABLEUNDOREDO, ID_PLCOPENEDITOREDITMENUADDDATATYPE,
 ID_PLCOPENEDITOREDITMENUADDFUNCTION, ID_PLCOPENEDITOREDITMENUADDFUNCTIONBLOCK,
 ID_PLCOPENEDITOREDITMENUADDPROGRAM, ID_PLCOPENEDITOREDITMENUADDCONFIGURATION,
 ] = [wx.NewId() for _init_coll_EditMenu_Items in range(6)]
 #-------------------------------------------------------------------------------
 #                            ToolBars definitions
 #-------------------------------------------------------------------------------
+# Define PLCOpenEditor Toolbar items id
 [ID_PLCOPENEDITORTOOLBARSELECTION, ID_PLCOPENEDITORTOOLBARCOMMENT,
 ID_PLCOPENEDITORTOOLBARVARIABLE, ID_PLCOPENEDITORTOOLBARBLOCK,
 ID_PLCOPENEDITORTOOLBARCONNECTION, ID_PLCOPENEDITORTOOLBARWIRE,
 ID_PLCOPENEDITORTOOLBARPOWERRAIL, ID_PLCOPENEDITORTOOLBARRUNG,
 ID_PLCOPENEDITORTOOLBARCOIL, ID_PLCOPENEDITORTOOLBARCONTACT,
 ID_PLCOPENEDITORTOOLBARSTEP, ID_PLCOPENEDITORTOOLBARTRANSITION,
 ID_PLCOPENEDITORTOOLBARACTIONBLOCK, ID_PLCOPENEDITORTOOLBARDIVERGENCE,
 ID_PLCOPENEDITORTOOLBARJUMP,
 ] = [wx.NewId() for _init_coll_DefaultToolBar_Items in range(17)]
+# Define behaviour of each Toolbar item according to current POU body type
+# Informations meaning are in this order:
+#  - Item is toggled
+#  - PLCOpenEditor mode where item is displayed (could be more then one)
+#  - Item id
+#  - Item callback function name
+#  - Item icon filename
+#  - Item tooltip text
 ToolBarItems = {
 "FBD" : [(True, FREEDRAWING_MODE|DRIVENDRAWING_MODE,
 ID_PLCOPENEDITORTOOLBARCOMMENT, "OnCommentTool",
 "add_comment.png", "Create a new comment"),
 (True, FREEDRAWING_MODE|DRIVENDRAWING_MODE,
 "add_contact.png", "Create a new contact")],
 "ST"  : [],
 "IL"  : []
 }
+#-------------------------------------------------------------------------------
+#                               Helper Functions
+#-------------------------------------------------------------------------------
+# Compatibility function for wx versions < 2.6
 def AppendMenu(parent, help, id, kind, text):
 if wx.VERSION >= (2, 6, 0):
 parent.Append(help=help, id=id, kind=kind, text=text)
 else:
 parent.Append(helpString=help, id=id, kind=kind, item=text)
+[TITLE, TOOLBAR, FILEMENU, EDITMENU, DISPLAYMENU, TYPESTREE,
+INSTANCESTREE, LIBRARYTREE, SCALING
+] = [wx.NewId() for _refresh_elements in range(9)]
+def GetShortcutKeyCallbackFunction(viewer_function):
+def ShortcutKeyFunction(self, event):
+control = self.FindFocus()
+if isinstance(control, (Viewer, TextViewer)):
+getattr(control, viewer_function)()
+elif isinstance(control, wx.TextCtrl):
+control.ProcessEvent(event)
+event.Skip()
+return ShortcutKeyFunction
+def GetParentName(tree, item, parent_type):
+parent_item = tree.GetItemParent(item)
+parent_item_type = tree.GetPyData(parent_item)
+while parent_item_type != parent_type:
+parent_item = tree.GetItemParent(parent_item)
+parent_item_type = tree.GetPyData(parent_item)
+return tree.GetItemText(parent_item)
+def GetDeleteElementFunction(remove_function, parent_type=None, check_function=None):
+def DeleteElementFunction(self, selected):
+name = self.TypesTree.GetItemText(selected)
+if check_function is None or not check_function(self.Controler, name, self.Debug):
+if parent_type is not None:
+parent_name = GetParentName(self.TypesTree, selected, parent_type)
+remove_function(self.Controler, parent_name, name)
+else:
+remove_function(self.Controler, name)
+else:
+self.ShowErrorMessage("\"%s\" is used by one or more POUs. It can't be removed!"%name)
+return DeleteElementFunction
+#-------------------------------------------------------------------------------
+#                            PLCOpenEditor Main Class
+#-------------------------------------------------------------------------------
 class PLCOpenEditor(wx.Frame):
 # Compatibility function for wx versions < 2.6
 if wx.VERSION < (2, 6, 0):
 self.InstancesTree = wx.TreeCtrl(id=ID_PLCOPENEDITORINSTANCESTREE,
 name='InstancesTree', parent=self.TreeNoteBook,
 pos=wx.Point(0, 0), size=wx.Size(0, 0),
 style=wx.TR_HAS_BUTTONS|wx.TR_SINGLE|wx.SUNKEN_BORDER)
+self.TabsImageList = wx.ImageList(16, 31)
+self.TabsImageListIndexes = {}
 if self.Debug:
 if wx.VERSION >= (2, 6, 0):
 self.InstancesTree.Bind(wx.EVT_RIGHT_UP, self.OnInstancesTreeRightUp)
 else:
 wx.EVT_RIGHT_UP(self.InstancesTree, self.OnInstancesTreeRightUp)
 self.SecondSplitter.SplitHorizontally(self.ThirdSplitter, self.VariablePanelIndexer, -200)
 self.TabsOpened = wx.Notebook(id=ID_PLCOPENEDITORTABSOPENED,
 name='TabsOpened', parent=self.ThirdSplitter, pos=wx.Point(0,
 0), size=wx.Size(0, 0), style=0)
-self.TabsImageList = wx.ImageList(16, 31)
 self.TabsOpened.SetImageList(self.TabsImageList)
-self.TabsImageListIndexes = {}
 if wx.VERSION >= (2, 6, 0):
 self.TabsOpened.Bind(wx.EVT_NOTEBOOK_PAGE_CHANGED,
 self.OnPouSelectedChanged, id=ID_PLCOPENEDITORTABSOPENED)
 else:
 wx.EVT_NOTEBOOK_PAGE_CHANGED(self.TabsOpened, ID_PLCOPENEDITORTABSOPENED,
 self._init_sizers()
 if USE_AUI:
 self.AUIManager.Update()
+## Constructor of the PLCOpenEditor class.
+#  @param parent The parent window.
+#  @param controler The controler been used by PLCOpenEditor (default: None).
+#  @param fileOpen The filepath to open if no controler defined (default: None).
+#  @param debug The filepath to open if no controler defined (default: False).
 def __init__(self, parent, controler = None, fileOpen = None, debug = False):
+# Variable indicating that PLCOpenEditor was opened with a defined controler
 self.ModeSolo = controler == None
 self.Debug = debug
 if self.ModeSolo:
+# If no controler defined, create a new one
 self.Controler = PLCControler()
+# Open the filepath if defined
 if fileOpen is not None:
 self.Controler.OpenXMLFile(fileOpen)
 else:
 self.Controler = controler
 self._init_ctrls(parent)
-self.SetIcon(wx.Icon(os.path.join(CWD,"Images","poe.ico"),wx.BITMAP_TYPE_ICO))
+# Define PLCOpenEditor icon
+self.SetIcon(wx.Icon(os.path.join(CWD,"Images", "poe.ico"),wx.BITMAP_TYPE_ICO))
-self.TypesTreeImageList = wx.ImageList(16, 16)
-self.InstancesTreeImageList = wx.ImageList(16, 16)
+# Define Tree item icon list
-self.TypesTreeImageDict = {}
+self.TreeImageList = wx.ImageList(16, 16)
-self.InstancesTreeImageDict = {}
+self.TreeImageDict = {}
+# Icons for languages
 for language in LANGUAGES:
-self.TypesTreeImageDict[language]=self.TypesTreeImageList.Add(wx.Bitmap(os.path.join(CWD, 'Images', '%s.png'%language)))
+self.TreeImageDict[language]=self.TreeImageList.Add(wx.Bitmap(os.path.join(CWD, 'Images', '%s.png'%language)))
-self.InstancesTreeImageDict[language]=self.InstancesTreeImageList.Add(wx.Bitmap(os.path.join(CWD, 'Images', '%s.png'%language)))
+# Icons for other items
 for imgname, itemtype in [
 #editables
 ("PROJECT",        ITEM_PROJECT),
 #("POU",            ITEM_POU),
 #("VARIABLE",       ITEM_VARIABLE),
 ("TRANSITIONS",    ITEM_TRANSITIONS),
 ("ACTIONS",        ITEM_ACTIONS),
 ("CONFIGURATIONS", ITEM_CONFIGURATIONS),
 ("RESOURCES",      ITEM_RESOURCES),
 ("PROPERTIES",     ITEM_PROPERTIES)]:
-self.TypesTreeImageDict[itemtype]=self.TypesTreeImageList.Add(wx.Bitmap(os.path.join(CWD, 'Images', '%s.png'%imgname)))
+self.TreeImageDict[itemtype]=self.TreeImageList.Add(wx.Bitmap(os.path.join(CWD, 'Images', '%s.png'%imgname)))
-self.InstancesTreeImageDict[itemtype]=self.InstancesTreeImageList.Add(wx.Bitmap(os.path.join(CWD, 'Images', '%s.png'%imgname)))
-self.TypesTree.AssignImageList(self.TypesTreeImageList)
+# Assign icon list to TreeCtrls
-self.InstancesTree.AssignImageList(self.InstancesTreeImageList)
+self.TypesTree.SetImageList(self.TreeImageList)
+self.InstancesTree.SetImageList(self.TreeImageList)
 self.CurrentToolBar = []
 self.CurrentLanguage = ""
 self.SelectedItem = None
 self.Errors = []
 self.DrawingMode = FREEDRAWING_MODE
 #self.DrawingMode = DRIVENDRAWING_MODE
 if USE_AUI:
 self.AuiTabCtrl = []
+# Initialize Printing configuring elements
 self.PrintData = wx.PrintData()
 self.PrintData.SetPaperId(wx.PAPER_A4)
 self.PrintData.SetPrintMode(wx.PRINT_MODE_PRINTER)
 self.PageSetupData = wx.PageSetupDialogData(self.PrintData)
 self.PageSetupData.SetMarginTopLeft(wx.Point(10, 15))
 self.PageSetupData.SetMarginBottomRight(wx.Point(10, 20))
+# Refresh elements that need to
 if not self.ModeSolo or fileOpen is not None:
-self.RefreshTypesTree()
+self._Refresh(TYPESTREE, INSTANCESTREE, LIBRARYTREE)
-self.RefreshInstancesTree()
+self._Refresh(TITLE, TOOLBAR, FILEMENU, EDITMENU, DISPLAYMENU)
-self.RefreshLibraryTree()
-self.RefreshFileMenu()
+#-------------------------------------------------------------------------------
-self.RefreshEditMenu()
+#                               General Functions
-self.RefreshDisplayMenu()
+#-------------------------------------------------------------------------------
-self.RefreshTitle()
-self.RefreshToolBar()
+## Call PLCOpenEditor refresh functions.
+#  @param elements List of elements to refresh.
-def ResetSelectedItem(self):
+def _Refresh(self, *elements):
-self.SelectedItem = None
+for element in elements:
+self.RefreshFunctions[element](self)
+## Callback function when AUINotebook Page closed with CloseButton
+#  @param event AUINotebook Event.
 def OnPageClose(self, event):
+# Get Selected Tab
 selected = event.GetSelection()
 if selected >= 0:
+# Remove corresponding VariablePanel
 if not self.Debug:
 tagname = self.TabsOpened.GetPage(selected).GetTagName()
 self.VariablePanelIndexer.RemoveVariablePanel(tagname)
+# Refresh Tab selection
 if self.TabsOpened.GetPageCount() > 0:
 new_index = min(selected, self.TabsOpened.GetPageCount() - 1)
 self.TabsOpened.SetSelection(new_index)
 if not self.Debug:
 tagname = self.TabsOpened.GetPage(new_index).GetTagName()
 self.VariablePanelIndexer.ChangeVariablePanel(tagname)
-self.RefreshTitle()
+# Refresh all window elements that have changed
-self.RefreshFileMenu()
+self._Refresh(TITLE, TOOLBAR, FILEMENU, EDITMENU, DISPLAYMENU)
-self.RefreshEditMenu()
-self.RefreshDisplayMenu()
-self.RefreshToolBar()
-wx.CallAfter(self.RefreshTabCtrlEvent)
-event.Skip()
-def OnPageDragged(self, event):
 wx.CallAfter(self.RefreshTabCtrlEvent)
 event.Skip()
 def GetCopyBuffer(self):
 data = None
 if dialog.ShowModal() == wx.ID_OK:
 new_values = dialog.GetValues()
 new_values["creationDateTime"] = old_values["creationDateTime"]
 if new_values != old_values:
 self.Controler.SetProjectProperties(None, new_values)
-self.RefreshTitle()
+self._Refresh(TITLE, TOOLBAR, FILEMENU, EDITMENU, DISPLAYMENU,
-self.RefreshFileMenu()
+TYPESTREE, INSTANCESTREE, SCALING)
-self.RefreshEditMenu()
-self.RefreshDisplayMenu()
-self.RefreshTypesTree()
-self.RefreshScaling()
 dialog.Destroy()
 def OnCloseFrame(self, event):
 if not self.ModeSolo and getattr(self, "_onclose", None) is not None:
 self.AUIManager.UnInit()
 self._onclose()
 event.Skip()
-elif not self.Controler.ProjectIsSaved():
+elif self.CheckSaveBeforeClosing():
-dialog = wx.MessageDialog(self, "There are changes, do you want to save?", "Close Application", wx.YES_NO|wx.CANCEL|wx.ICON_QUESTION)
+event.Skip()
-answer = dialog.ShowModal()
+else:
-dialog.Destroy()
+event.Veto()
-if answer == wx.ID_YES:
-self.SaveProject()
+#-------------------------------------------------------------------------------
-event.Skip()
+#                            Notebook Unified Functions
-elif answer == wx.ID_NO:
+#-------------------------------------------------------------------------------
-self.Controler.Reset()
-self.AUIManager.UnInit()
+## Function that generate bitmap for
-event.Skip()
+# for wx.aui.AUINotebook.
+#  @param window Panel to display in tab.
+#  @param text title for the tab ctrl.
+def GenerateBitmap(self, icon1_name, icon2_name = None):
+# Find index of bitmap if already created
+index = self.TabsImageListIndexes.get((icon1_name, icon2_name), None)
+# Return index or bitmap if found
+if index is not None:
+if USE_AUI:
+return self.TabsImageList.GetBitmap(index)
 else:
-event.Veto()
-else:
-event.Skip()
-#-------------------------------------------------------------------------------
-#                            Notebook Unified Functions
-#-------------------------------------------------------------------------------
-def GenerateBitmap(self, icon1_name, icon2_name = None):
-if not USE_AUI:
-index = self.TabsImageListIndexes.get((icon1_name, icon2_name), None)
-if index is not None:
 return index
 if icon2_name is None:
+# Bitmap with only one icon
 tmp_bitmap = wx.Bitmap(os.path.join(CWD, 'Images', '%s.png'%icon1_name))
 else:
+# Bitmap with two icon
 icon1 = wx.Bitmap(os.path.join(CWD, 'Images', '%s.png'%icon1_name))
 icon2 = wx.Bitmap(os.path.join(CWD, 'Images', '%s.png'%icon2_name))
+# Calculate bitmap size
 width = icon1.GetWidth() + icon2.GetWidth() - 1
 height = max(icon1.GetHeight(), icon2.GetHeight())
+# Create bitmap with both icons
 tmp_bitmap = wx.EmptyBitmap(width, height)
 dc = wx.MemoryDC()
 dc.SelectObject(tmp_bitmap)
 dc.Clear()
 dc.DrawBitmap(icon1, 0, 0)
 dc.DrawBitmap(icon2, icon1.GetWidth() - 1, 0)
+# Store bitmap in ImageList
+index = self.TabsImageList.Add(tmp_bitmap)
+# Save bitmap index in ImageList in dictionary
+self.TabsImageListIndexes[(icon1_name, icon2_name)] = index
 if USE_AUI:
 return tmp_bitmap
 else:
-index = self.TabsImageList.Add(tmp_bitmap)
-self.TabsImageListIndexes[(icon1_name, icon2_name)] = index
 return index
+## Function that add a tab in Notebook, calling refresh for tab DClick event
+# for wx.aui.AUINotebook.
+#  @param window Panel to display in tab.
+#  @param text title for the tab ctrl.
 def AddPage(self, window, text):
 self.TabsOpened.AddPage(window, text)
 self.RefreshTabCtrlEvent()
-def RefreshTabCtrlEvent(self):
+## Function that fix difference in deleting all tabs between
-if USE_AUI:
+# wx.Notebook and wx.aui.AUINotebook.
-auitabctrl = []
-for child in self.TabsOpened.GetChildren():
-if isinstance(child, wx.aui.AuiTabCtrl):
-auitabctrl.append(child)
-if child not in self.AuiTabCtrl:
-child.Bind(wx.EVT_LEFT_DCLICK, self.GetTabsOpenedDClickFunction(child))
-self.AuiTabCtrl = auitabctrl
-if self.TabsOpened.GetPageCount() == 0:
-pane = self.AUIManager.GetPane(self.TabsOpened)
-if pane.IsMaximized():
-self.AUIManager.RestorePane(pane)
-self.AUIManager.Update()
 def DeleteAllPages(self):
 if USE_AUI:
 for idx in xrange(self.TabsOpened.GetPageCount()):
 self.TabsOpened.DeletePage(0)
 else:
 self.TabsOpened.DeleteAllPages()
+self.RefreshTabCtrlEvent()
+## Function that fix difference in setting picture on tab between
+# wx.Notebook and wx.aui.AUINotebook.
+#  @param idx Tab index.
+#  @param bitmap wx.Bitmap to define on tab.
+#  @return True if operation succeeded
 def SetPageBitmap(self, idx, bitmap):
 if USE_AUI:
 return self.TabsOpened.SetPageBitmap(idx, bitmap)
 else:
 return self.TabsOpened.SetPageImage(idx, bitmap)
+#-------------------------------------------------------------------------------
+#                         Dialog Message Functions
+#-------------------------------------------------------------------------------
+## Function displaying an Error dialog in PLCOpenEditor.
+#  @param message The message to display.
+def ShowErrorMessage(self, message):
+dialog = wx.MessageDialog(self, message, "Error", wx.OK|wx.ICON_ERROR)
+dialog.ShowModal()
+dialog.Destroy()
+## Function displaying an Error dialog in PLCOpenEditor.
+#  @return False if closing cancelled.
+def CheckSaveBeforeClosing(self):
+if not self.Controler.ProjectIsSaved():
+dialog = wx.MessageDialog(self, "There are changes, do you want to save?", "Close Application", wx.YES_NO|wx.CANCEL|wx.ICON_QUESTION)
+answer = dialog.ShowModal()
+dialog.Destroy()
+if answer == wx.ID_YES:
+self.SaveProject()
+elif answer == wx.ID_CANCEL:
+return False
+return True
 #-------------------------------------------------------------------------------
 #                            File Menu Functions
 #-------------------------------------------------------------------------------
 def OnNewProjectMenu(self, event):
 dialog = ProjectDialog(self)
 if dialog.ShowModal() == wx.ID_OK:
 properties = dialog.GetValues()
 self.Controler.CreateNewProject(properties)
-self.RefreshTitle()
+self._Refresh(TITLE, FILEMENU, EDITMENU, TYPESTREE, INSTANCESTREE,
-self.RefreshFileMenu()
+LIBRARYTREE)
-self.RefreshEditMenu()
-self.RefreshTypesTree()
-self.RefreshInstancesTree()
-self.RefreshLibraryTree()
 event.Skip()
 def OnOpenProjectMenu(self, event):
-if not self.Controler.ProjectIsSaved():
+if not self.CheckSaveBeforeClosing():
-dialog = wx.MessageDialog(self, "There are changes, do you want to save?", "Close Application", wx.YES_NO|wx.CANCEL|wx.ICON_QUESTION)
+return
-answer = dialog.ShowModal()
-dialog.Destroy()
-if answer == wx.ID_YES:
-self.SaveProject()
-elif answer == wx.ID_CANCEL:
-return
 filepath = self.Controler.GetFilePath()
 if filepath != "":
 directory = os.path.dirname(filepath)
 else:
 directory = os.getcwd()
 filepath = dialog.GetPath()
 if os.path.isfile(filepath):
 self.DeleteAllPages()
 self.VariablePanelIndexer.RemoveAllPanels()
 self.Controler.OpenXMLFile(filepath)
-self.RefreshTypesTree()
+self._Refresh(TYPESTREE, INSTANCESTREE, LIBRARYTREE)
-self.RefreshInstancesTree()
+self._Refresh(TITLE, TOOLBAR, FILEMENU, EDITMENU)
-self.RefreshLibraryTree()
-self.RefreshTitle()
-self.RefreshFileMenu()
-self.RefreshEditMenu()
-self.RefreshToolBar()
 dialog.Destroy()
 event.Skip()
 def OnCloseTabMenu(self, event):
 selected = self.TabsOpened.GetSelection()
 new_index = min(selected, self.TabsOpened.GetPageCount() - 1)
 self.TabsOpened.SetSelection(new_index)
 if not self.Debug:
 tagname = self.TabsOpened.GetPage(new_index).GetTagName()
 self.VariablePanelIndexer.ChangeVariablePanel(tagname)
-self.RefreshFileMenu()
+self._Refresh(TOOLBAR, FILEMENU, EDITMENU)
-self.RefreshEditMenu()
-self.RefreshToolBar()
 event.Skip()
 def OnCloseProjectMenu(self, event):
-if not self.Controler.ProjectIsSaved():
+if not self.CheckSaveBeforeClosing():
-dialog = wx.MessageDialog(self, "There are changes, do you want to save?", "Close Application", wx.YES_NO|wx.CANCEL|wx.ICON_QUESTION)
+return
-answer = dialog.ShowModal()
-dialog.Destroy()
-if answer == wx.ID_YES:
-self.SaveProject()
-elif answer == wx.ID_CANCEL:
-return
 self.DeleteAllPages()
 self.VariablePanelIndexer.RemoveAllPanels()
 self.TypesTree.DeleteAllItems()
 self.InstancesTree.DeleteAllItems()
 self.Controler.Reset()
-self.RefreshTitle()
+self._Refresh(TITLE, TOOLBAR, FILEMENU, EDITMENU)
-self.RefreshFileMenu()
-self.RefreshEditMenu()
-self.RefreshToolBar()
 event.Skip()
 def OnSaveProjectMenu(self, event):
 if not self.ModeSolo and getattr(self, "_onsave", None) != None:
 self._onsave()
 if dialog.ShowModal() == wx.ID_OK:
 filepath = dialog.GetPath()
 if os.path.isdir(os.path.dirname(filepath)):
 result = self.Controler.SaveXMLFile(filepath)
 if not result:
-message = wx.MessageDialog(self, "Can't save project to file %s!"%filepath, "Error", wx.OK|wx.ICON_ERROR)
+self.ShowErrorMessage("Can't save project to file %s!"%filepath)
-message.ShowModal()
-message.Destroy()
 else:
-message = wx.MessageDialog(self, "%s is not a valid folder!"%os.path.dirname(filepath), "Error", wx.OK|wx.ICON_ERROR)
+self.ShowErrorMessage("\"%s\" is not a valid folder!"%os.path.dirname(filepath))
-message.ShowModal()
-message.Destroy()
 self.RefreshTitle()
 dialog.Destroy()
 def OnPageSetupMenu(self, event):
 dialog = wx.PageSetupDialog(self, self.PageSetupData)
 margins = (self.PageSetupData.GetMarginTopLeft(), self.PageSetupData.GetMarginBottomRight())
 printer = wx.Printer(dialog_data)
 printout = GraphicPrintout(self.TabsOpened.GetPage(selected), page_size, margins)
 if not printer.Print(self, printout, True):
-wx.MessageBox("There was a problem printing.\nPerhaps your current printer is not set correctly?", "Printing", wx.OK)
+self.ShowErrorMessage("There was a problem printing.\nPerhaps your current printer is not set correctly?")
 printout.Destroy()
 event.Skip()
 def OnPropertiesMenu(self, event):
 self.ShowProperties()
 self.EditMenu.Enable(wx.ID_PASTE, False)
 self.EditMenu.Enable(wx.ID_SELECTALL, False)
 self.EditMenu.Enable(wx.ID_ADD, False)
 self.EditMenu.Enable(wx.ID_DELETE, False)
-def OnUndoMenu(self, event):
+def CloseTabsWithoutModel(self):
-self.Controler.LoadPrevious()
 idxs = range(self.TabsOpened.GetPageCount())
 idxs.reverse()
 for idx in idxs:
 tagname = self.TabsOpened.GetPage(idx).GetTagName()
 if self.Controler.GetEditedElement(tagname, self.Debug) is None:
 self.VariablePanelIndexer.RemoveVariablePanel(tagname)
 self.TabsOpened.DeletePage(idx)
-selected = self.TabsOpened.GetSelection()
-if selected != -1:
+def OnUndoMenu(self, event):
-window = self.TabsOpened.GetPage(selected)
+self.Controler.LoadPrevious()
-window.RefreshView()
+self.CloseTabsWithoutModel()
-self.VariablePanelIndexer.RefreshVariablePanel(window.GetTagName())
+self.RefreshEditor()
-self.RefreshTitle()
+self._Refresh(TITLE, EDITMENU, TYPESTREE, INSTANCESTREE, LIBRARYTREE,
-self.RefreshEditMenu()
+SCALING)
-self.RefreshTypesTree()
-self.RefreshInstancesTree()
-self.RefreshLibraryTree()
-self.RefreshScaling()
 event.Skip()
 def OnRedoMenu(self, event):
 self.Controler.LoadNext()
-idxs = range(self.TabsOpened.GetPageCount())
+self.CloseTabsWithoutModel()
-idxs.reverse()
+self.RefreshEditor()
-for idx in idxs:
+self._Refresh(TITLE, EDITMENU, TYPESTREE, INSTANCESTREE, LIBRARYTREE,
-tagname = self.TabsOpened.GetPage(idx).GetTagName()
+SCALING)
-if self.Controler.GetEditedElement(tagname, self.Debug) is None:
+event.Skip()
-self.VariablePanelIndexer.RemoveVariablePanel(tagname)
-self.TabsOpened.DeletePage(idx)
-selected = self.TabsOpened.GetSelection()
-if selected != -1:
-window = self.TabsOpened.GetPage(selected)
-window.RefreshView()
-self.VariablePanelIndexer.RefreshVariablePanel(window.GetTagName())
-self.RefreshTitle()
-self.RefreshEditMenu()
-self.RefreshTypesTree()
-self.RefreshInstancesTree()
-self.RefreshLibraryTree()
-self.RefreshScaling()
-event.Skip()
 def OnEnableUndoRedoMenu(self, event):
 self.Controler.EnableProjectBuffer(event.IsChecked())
 self.RefreshEditMenu()
 event.Skip()
-def OnCutMenu(self, event):
+OnCutMenu = GetShortcutKeyCallbackFunction("Cut")
-control = self.FindFocus()
+OnCopyMenu = GetShortcutKeyCallbackFunction("Copy")
-if isinstance(control, (Viewer, TextViewer)):
+OnPasteMenu = GetShortcutKeyCallbackFunction("Paste")
-control.Cut()
-elif isinstance(control, wx.TextCtrl):
-control.ProcessEvent(event)
-event.Skip()
-def OnCopyMenu(self, event):
-control = self.FindFocus()
-if isinstance(control, (Viewer, TextViewer)):
-control.Copy()
-elif isinstance(control, wx.TextCtrl):
-control.ProcessEvent(event)
-event.Skip()
-def OnPasteMenu(self, event):
-control = self.FindFocus()
-if isinstance(control, (Viewer, TextViewer)):
-control.Paste()
-elif isinstance(control, wx.TextCtrl):
-control.ProcessEvent(event)
-event.Skip()
 def OnSelectAllMenu(self, event):
 control = self.FindFocus()
 if isinstance(control, (Viewer, TextViewer)):
 control.SelectAll()
 elif isinstance(control, wx.TextCtrl):
 control.SetSelection(0, control.GetLastPosition())
 elif isinstance(control, wx.ComboBox):
 control.SetMark(0, control.GetLastPosition() + 1)
 event.Skip()
+DeleteFunctions = {
+ITEM_DATATYPE: GetDeleteElementFunction(PLCControler.ProjectRemoveDataType, check_function=PLCControler.DataTypeIsUsed),
+ITEM_POU: GetDeleteElementFunction(PLCControler.ProjectRemovePou, check_function=PLCControler.PouIsUsed),
+ITEM_TRANSITION: GetDeleteElementFunction(PLCControler.ProjectRemovePouTransition, ITEM_POU),
+ITEM_ACTION: GetDeleteElementFunction(PLCControler.ProjectRemovePouAction, ITEM_POU),
+ITEM_CONFIGURATION: GetDeleteElementFunction(PLCControler.ProjectRemoveConfiguration),
+ITEM_RESOURCE: GetDeleteElementFunction(PLCControler.ProjectRemoveConfigurationResource, ITEM_CONFIGURATION)
+}
 def OnDeleteMenu(self, event):
 window = self.FindFocus()
-if window == self.TypesTree:
+if window == self.TypesTree or window is None:
 selected = self.TypesTree.GetSelection()
 if selected.IsOk():
 type = self.TypesTree.GetPyData(selected)
-tagname = ""
+function = self.DeleteFunctions.get(type, None)
-if type == ITEM_DATATYPE:
+if function is not None:
-name = self.TypesTree.GetItemText(selected)
+function(self, selected)
-if not self.Controler.DataTypeIsUsed(name, self.Debug):
+self.CloseTabsWithoutModel()
-self.Controler.ProjectRemoveDataType(name)
+self._Refresh(TITLE, TOOLBAR, EDITMENU, TYPESTREE,
-tagname = self.Controler.ComputeDataTypeName(name)
+INSTANCESTREE, LIBRARYTREE)
-else:
-message = wx.MessageDialog(self, "\"%s\" is used by one or more POUs. It can't be removed!"%name, "Error", wx.OK|wx.ICON_ERROR)
-message.ShowModal()
-message.Destroy()
-elif type == ITEM_POU:
-name = self.TypesTree.GetItemText(selected)
-if not self.Controler.PouIsUsed(name, self.Debug):
-self.Controler.ProjectRemovePou(name)
-tagname = self.Controler.ComputePouName(name)
-else:
-message = wx.MessageDialog(self, "\"%s\" is used by one or more POUs. It can't be removed!"%name, "Error", wx.OK|wx.ICON_ERROR)
-message.ShowModal()
-message.Destroy()
-elif type in [ITEM_TRANSITION, ITEM_ACTION]:
-item = self.TypesTree.GetItemParent(selected)
-item_type = self.TypesTree.GetPyData(item)
-while item_type != ITEM_POU:
-item = self.TypesTree.GetItemParent(item)
-item_type = self.TypesTree.GetPyData(item)
-pou_name = self.TypesTree.GetItemText(item)
-if type == ITEM_TRANSITION:
-transition = self.TypesTree.GetItemText(selected)
-self.Controler.ProjectRemovePouTransition(pou_name, transition)
-tagname = self.Controler.ComputePouTransitionName(pou_name, transition)
-elif type == ITEM_ACTION:
-action = self.TypesTree.GetItemText(selected)
-self.Controler.ProjectRemovePouAction(pou_name, action)
-tagname = self.Controler.ComputePouActionName(pou_name, action)
-elif type == ITEM_CONFIGURATION:
-name = self.TypesTree.GetItemText(selected)
-self.Controler.ProjectRemoveConfiguration(name)
-tagname = self.Controler.ComputeConfigurationName(name)
-elif type == ITEM_RESOURCE:
-resource = self.TypesTree.GetItemText(selected)
-item = self.TypesTree.GetItemParent(selected)
-item_type = self.TypesTree.GetPyData(item)
-while item_type != ITEM_CONFIGURATION:
-item = self.TypesTree.GetItemParent(item)
-item_type = self.TypesTree.GetPyData(item)
-config_name = self.TypesTree.GetItemText(item)
-self.Controler.ProjectRemoveConfigurationResource(config_name, resource)
-tagname = self.Controler.ComputeConfigurationResourceName(config_name, selected)
-idx = self.IsOpened(tagname)
-if idx is not None:
-self.VariablePanelIndexer.RemoveVariablePanel(tagname)
-self.TabsOpened.DeletePage(idx)
-self.RefreshTitle()
-self.RefreshEditMenu()
-self.RefreshTypesTree()
-self.RefreshInstancesTree()
-self.RefreshLibraryTree()
-self.RefreshToolBar()
 elif isinstance(window, (Viewer, TextViewer)):
 event = wx.KeyEvent(wx.EVT_CHAR._getEvtType())
 event.m_keyCode = wx.WXK_DELETE
 window.ProcessEvent(event)
 event.Skip()
 if not self.Debug and not self.ModeSolo:
 self.DisplayMenu.Enable(wx.ID_CLEAR, False)
 self.DisplayMenu.Enable(wx.ID_ZOOM_FIT, False)
 def OnRefreshMenu(self, event):
-selected = self.TabsOpened.GetSelection()
+self.RefreshEditor(not self.Debug)
-if selected != -1:
-window = self.TabsOpened.GetPage(selected)
-window.RefreshView()
-if not self.Debug:
-self.VariablePanelIndexer.RefreshVariablePanel(window.GetTagName())
 event.Skip()
 def OnClearErrorsMenu(self, event):
 self.ClearErrors()
 event.Skip()
 #-------------------------------------------------------------------------------
 #                      Project Editor Panels Management Functions
 #-------------------------------------------------------------------------------
+def OnPageDragged(self, event):
+wx.CallAfter(self.RefreshTabCtrlEvent)
+event.Skip()
+def RefreshTabCtrlEvent(self):
+if USE_AUI:
+auitabctrl = []
+for child in self.TabsOpened.GetChildren():
+if isinstance(child, wx.aui.AuiTabCtrl):
+auitabctrl.append(child)
+if child not in self.AuiTabCtrl:
+child.Bind(wx.EVT_LEFT_DCLICK, self.GetTabsOpenedDClickFunction(child))
+self.AuiTabCtrl = auitabctrl
+if self.TabsOpened.GetPageCount() == 0:
+pane = self.AUIManager.GetPane(self.TabsOpened)
+if pane.IsMaximized():
+self.AUIManager.RestorePane(pane)
+self.AUIManager.Update()
 def OnPouSelectedChanged(self, event):
 old_selected = self.TabsOpened.GetSelection()
 if old_selected >= 0:
 if self.Debug:
 else:
 self.SelectInstancesTreeItem(self.InstancesTree.GetRootItem(), window.GetInstancePath())
 window.RefreshView()
 if not self.Debug:
 self.VariablePanelIndexer.ChangeVariablePanel(window.GetTagName())
-self.RefreshFileMenu()
+self._Refresh(FILEMENU, EDITMENU, DISPLAYMENU, TOOLBAR)
-self.RefreshEditMenu()
-self.RefreshDisplayMenu()
-self.RefreshToolBar()
 event.Skip()
 def RefreshEditor(self, variablepanel = True):
 selected = self.TabsOpened.GetSelection()
 if selected != -1:
 if not root.IsOk():
 root = self.TypesTree.AddRoot(infos["name"])
 self.GenerateTypesTreeBranch(root, infos)
 self.TypesTree.Expand(root)
+def ResetSelectedItem(self):
+self.SelectedItem = None
 def GenerateTypesTreeBranch(self, root, infos, topology=False):
 to_delete = []
 self.TypesTree.SetItemText(root, infos["name"])
 self.TypesTree.SetPyData(root, infos["type"])
 if infos.get("tagname", None) in self.Errors:
 self.TypesTree.SetItemTextColour(root, wx.RED)
 else:
 self.TypesTree.SetItemBackgroundColour(root, wx.WHITE)
 self.TypesTree.SetItemTextColour(root, wx.BLACK)
 if infos["type"] == ITEM_POU:
-self.TypesTree.SetItemImage(root, self.TypesTreeImageDict[self.Controler.GetPouBodyType(infos["name"], self.Debug)])
+self.TypesTree.SetItemImage(root, self.TreeImageDict[self.Controler.GetPouBodyType(infos["name"], self.Debug)])
 else:
-self.TypesTree.SetItemImage(root, self.TypesTreeImageDict[infos["type"]])
+self.TypesTree.SetItemImage(root, self.TreeImageDict[infos["type"]])
 if wx.VERSION >= (2, 6, 0):
 item, root_cookie = self.TypesTree.GetFirstChild(root)
 else:
 item, root_cookie = self.TypesTree.GetFirstChild(root, 0)
 self.RefreshEditorNames(self.Controler.ComputePouName(old_name),
 self.Controler.ComputePouName(new_name))
 self.RefreshLibraryTree()
 self.RefreshPageTitles()
 elif itemtype == ITEM_TRANSITION:
-parent = self.TypesTree.GetItemParent(item)
+pou_name = GetParentName(self.TypesTree, item, ITEM_POU)
-parent_type = self.TypesTree.GetPyData(parent)
-while parent_type != ITEM_POU:
-parent = self.TypesTree.GetItemParent(parent)
-parent_type = self.TypesTree.GetPyData(parent)
-pou_name = self.TypesTree.GetItemText(parent)
 if new_name.upper() in [name.upper() for name in self.Controler.GetProjectPouNames(self.Debug)]:
 message = "A pou with \"%s\" as name exists!"%new_name
 elif new_name.upper() in [name.upper() for name in self.Controler.GetProjectPouVariables(pou_name, self.Debug) if name != old_name]:
 message = "A variable with \"%s\" as name already exists in this pou!"%new_name
 else:
 self.Controler.ChangePouTransitionName(pou_name, old_name, new_name)
 self.RefreshEditorNames(self.Controler.ComputePouTransitionName(pou_name, old_name),
 self.Controler.ComputePouTransitionName(pou_name, new_name))
 self.RefreshPageTitles()
 elif itemtype == ITEM_ACTION:
-parent = self.TypesTree.GetItemParent(item)
+pou_name = GetParentName(self.TypesTree, item, ITEM_POU)
-parent_type = self.TypesTree.GetPyData(parent)
-while parent_type != ITEM_POU:
-parent = self.TypesTree.GetItemParent(parent)
-parent_type = self.TypesTree.GetPyData(parent)
-pou_name = self.TypesTree.GetItemText(parent)
 if new_name.upper() in [name.upper() for name in self.Controler.GetProjectPouNames(self.Debug)]:
 message = "A pou with \"%s\" as name exists!"%new_name
 elif new_name.upper() in [name.upper() for name in self.Controler.GetProjectPouVariables(pou_name, self.Debug) if name != old_name]:
 message = "A variable with \"%s\" as name already exists in this pou!"%new_name
 else:
 self.Controler.ChangeConfigurationName(old_name, new_name)
 self.RefreshEditorNames(self.Controler.ComputeConfigurationName(old_name),
 self.Controler.ComputeConfigurationName(new_name))
 self.RefreshPageTitles()
 elif itemtype == ITEM_RESOURCE:
-parent = self.TypesTree.GetItemParent(item)
+config_name = GetParentName(self.TypesTree, item, ITEM_CONFIGURATION)
-parent_type = self.TypesTree.GetPyData(parent)
-while parent_type != ITEM_CONFIGURATION:
-parent = self.TypesTree.GetItemParent(parent)
-parent_type = self.TypesTree.GetPyData(parent)
-config_name = self.TypesTree.GetItemText(parent)
 if new_name.upper() in [name.upper() for name in self.Controler.GetProjectConfigNames(self.Debug)]:
 message = "\"%s\" config already exists!"%new_name
 abort = True
 elif new_name.upper() in [name.upper() for name in self.Controler.GetProjectPouNames(self.Debug)]:
 messageDialog = wx.MessageDialog(self, "A pou is defined with \"%s\" as name. It can generate a conflict. Do you wish to continue?"%new_name, "Error", wx.YES_NO|wx.ICON_QUESTION)
 self.RefreshEditorNames(self.Controler.ComputeConfigurationResourceName(config_name, old_name),
 self.Controler.ComputeConfigurationResourceName(config_name, new_name))
 self.RefreshPageTitles()
 if message or abort:
 if message:
-messageDialog = wx.MessageDialog(self, message, "Error", wx.OK|wx.ICON_ERROR)
+self.ShowErrorMessage(message)
-messageDialog.ShowModal()
-messageDialog.Destroy()
 item = event.GetItem()
 wx.CallAfter(self.TypesTree.EditLabel, item)
 event.Veto()
 else:
 wx.CallAfter(self.RefreshTypesTree)
 self.RefreshEditor()
-self.RefreshFileMenu()
+self._Refresh(TITLE, FILEMENU, EDITMENU)
-self.RefreshEditMenu()
-self.RefreshTitle()
 event.Skip()
 def OnTypesTreeItemActivated(self, event):
 selected = event.GetItem()
 name = self.TypesTree.GetItemText(selected)
 elif data == ITEM_POU:
 self.EditProjectElement(data, self.Controler.ComputePouName(name))
 elif data == ITEM_CONFIGURATION:
 self.EditProjectElement(data, self.Controler.ComputeConfigurationName(name))
 elif data == ITEM_RESOURCE:
-item = self.TypesTree.GetItemParent(selected)
+config_name = GetParentName(self.TypesTree, selected, ITEM_CONFIGURATION)
-item_type = self.TypesTree.GetPyData(item)
-while item_type != ITEM_CONFIGURATION:
-item = self.TypesTree.GetItemParent(item)
-item_type = self.TypesTree.GetPyData(item)
-config_name = self.TypesTree.GetItemText(item)
 self.EditProjectElement(data, self.Controler.ComputeConfigurationResourceName(config_name, name))
 elif data in [ITEM_TRANSITION, ITEM_ACTION]:
-item = self.TypesTree.GetItemParent(selected)
+pou_name = GetParentName(self.TypesTree, selected, ITEM_POU)
-item_type = self.TypesTree.GetPyData(item)
-while item_type != ITEM_POU:
-item = self.TypesTree.GetItemParent(item)
-item_type = self.TypesTree.GetPyData(item)
-pou_name = self.TypesTree.GetItemText(item)
 if data == ITEM_TRANSITION:
 tagname = self.Controler.ComputePouTransitionName(pou_name, name)
 elif data == ITEM_ACTION:
 tagname = self.Controler.ComputePouActionName(pou_name, name)
 self.EditProjectElement(data, tagname)
 elif data == ITEM_POU:
 self.EditProjectElement(data, self.Controler.ComputePouName(name), True)
 elif data == ITEM_CONFIGURATION:
 self.EditProjectElement(data, self.Controler.ComputeConfigurationName(name), True)
 elif data == ITEM_RESOURCE:
-item = self.TypesTree.GetItemParent(select_item)
+config_name = GetParentName(self.TypesTree, select_item, ITEM_CONFIGURATION)
-item_type = self.TypesTree.GetPyData(item)
-while item_type != ITEM_CONFIGURATION:
-item = self.TypesTree.GetItemParent(item)
-item_type = self.TypesTree.GetPyData(item)
-config_name = self.TypesTree.GetItemText(item)
 self.EditProjectElement(data, self.Controler.ComputeConfigurationResourceName(config_name, name), True)
 elif data in [ITEM_TRANSITION, ITEM_ACTION]:
-item = self.TypesTree.GetItemParent(select_item)
+pou_name = GetParentName(self.TypesTree, select_item, ITEM_POU)
-item_type = self.TypesTree.GetPyData(item)
-while item_type != ITEM_POU:
-item = self.TypesTree.GetItemParent(item)
-item_type = self.TypesTree.GetPyData(item)
-pou_name = self.TypesTree.GetItemText(item)
 if data == ITEM_TRANSITION:
 tagname = self.Controler.ComputePouTransitionName(pou_name, name)
 elif data == ITEM_ACTION:
 tagname = self.Controler.ComputePouActionName(pou_name, name)
 self.EditProjectElement(data, tagname, True)
 old_selected = self.TabsOpened.GetSelection()
 if old_selected != openedidx:
 if old_selected >= 0:
 self.TabsOpened.GetPage(old_selected).ResetBuffer()
 self.TabsOpened.SetSelection(openedidx)
-self.TabsOpened.GetPage(openedidx).RefreshView()
 self.VariablePanelIndexer.ChangeVariablePanel(tagname)
 self.RefreshPageTitles()
-self.RefreshFileMenu()
+self._Refresh(FILEMENU, EDITMENU, TOOLBAR)
-self.RefreshEditMenu()
-self.RefreshToolBar()
 elif not onlyopened:
 if elementtype == ITEM_CONFIGURATION:
 new_window = ConfigurationEditor(self.TabsOpened, tagname, self, self.Controler)
 self.AddPage(new_window, "")
 self.VariablePanelIndexer.AddVariablePanel(tagname, "config")
 window = self.TabsOpened.GetPage(i)
 if window.GetTagName() == tagname:
 self.TabsOpened.SetSelection(i)
 window.SetFocus()
 self.RefreshPageTitles()
-self.RefreshFileMenu()
+self._Refresh(FILEMENU, EDITMENU, TOOLBAR)
-self.RefreshEditMenu()
-self.RefreshToolBar()
 def OnTypesTreeRightUp(self, event):
 if wx.Platform == '__WXMSW__':
 item = event.GetItem()
 else:
 new_id = wx.NewId()
 AppendMenu(menu, help='', id=new_id, kind=wx.ITEM_NORMAL, text="Rename")
 self.Bind(wx.EVT_MENU, self.OnRenamePouMenu, id=new_id)
 new_id = wx.NewId()
 AppendMenu(menu, help='', id=new_id, kind=wx.ITEM_NORMAL, text="Delete")
-self.Bind(wx.EVT_MENU, self.OnRemovePouMenu, id=new_id)
+self.Bind(wx.EVT_MENU, self.OnDeleteMenu, id=new_id)
 self.PopupMenu(menu)
 elif type == ITEM_CONFIGURATION:
 menu = wx.Menu(title='')
 new_id = wx.NewId()
 AppendMenu(menu, help='', id=new_id, kind=wx.ITEM_NORMAL, text="Add Resource")
 self.Bind(wx.EVT_MENU, self.GenerateAddResourceFunction(name), id=new_id)
 new_id = wx.NewId()
 AppendMenu(menu, help='', id=new_id, kind=wx.ITEM_NORMAL, text="Delete")
-self.Bind(wx.EVT_MENU, self.OnRemoveConfigurationMenu, id=new_id)
+self.Bind(wx.EVT_MENU, self.OnDeleteMenu, id=new_id)
 self.PopupMenu(menu)
 elif type in [ITEM_DATATYPE, ITEM_TRANSITION, ITEM_ACTION, ITEM_RESOURCE]:
 menu = wx.Menu(title='')
 new_id = wx.NewId()
 AppendMenu(menu, help='', id=new_id, kind=wx.ITEM_NORMAL, text="Delete")
-if type == ITEM_DATATYPE:
+self.Bind(wx.EVT_MENU, self.OnDeleteMenu, id=new_id)
-self.Bind(wx.EVT_MENU, self.OnRemoveDataTypeMenu, id=new_id)
-elif type == ITEM_TRANSITION:
-self.Bind(wx.EVT_MENU, self.OnRemoveTransitionMenu, id=new_id)
-elif type == ITEM_ACTION:
-self.Bind(wx.EVT_MENU, self.OnRemoveActionMenu, id=new_id)
-elif type == ITEM_RESOURCE:
-self.Bind(wx.EVT_MENU, self.OnRemoveResourceMenu, id=new_id)
 self.PopupMenu(menu)
 elif type in ITEMS_UNEDITABLE:
 if name == "Data Types":
 menu = wx.Menu(title='')
 new_id = wx.NewId()
 if infos.get("elmt_type", None) is not None:
 self.InstancesTree.SetItemText(root, "%s (%s)"%(infos["name"], infos["elmt_type"]))
 else:
 self.InstancesTree.SetItemText(root, infos["name"])
 self.InstancesTree.SetPyData(root, (infos["type"], infos.get("tagname", None)))
-self.InstancesTree.SetItemImage(root, self.InstancesTreeImageDict[infos["type"]])
+self.InstancesTree.SetItemImage(root, self.TreeImageDict[infos["type"]])
 if wx.VERSION >= (2, 6, 0):
 item, root_cookie = self.InstancesTree.GetFirstChild(root)
 else:
 item, root_cookie = self.InstancesTree.GetFirstChild(root, 0)
 self.RefreshTypesTree()
 self.VariablePanelIndexer.ClearErrors()
 for i in xrange(self.TabsOpened.GetPageCount()):
 viewer = self.TabsOpened.GetPage(i)
 viewer.ClearErrors()
+RefreshFunctions = {
+TITLE : RefreshTitle,
+TOOLBAR : RefreshToolBar,
+FILEMENU : RefreshFileMenu,
+EDITMENU : RefreshEditMenu,
+DISPLAYMENU : RefreshDisplayMenu,
+TYPESTREE : RefreshTypesTree,
+INSTANCESTREE : RefreshInstancesTree,
+LIBRARYTREE : RefreshLibraryTree,
+SCALING : RefreshScaling}
 current_num = 0
 def GetNewNum():
 global current_num
 current_num += 1
 return current_num
 def ClearErrors(self):
 self.Table.ClearErrors()
 self.Table.ResetView(self.VariablesGrid)
 #-------------------------------------------------------------------------------
-#                            Variables Editor Panel
+#                            Debug Variables Panel
 #-------------------------------------------------------------------------------
 class VariableTableItem(DebugDataConsumer):
 def __init__(self, parent, variable, value):

changeset 390	020420ad8914
parent 384	ed27a676d5c9
child 391	07447ee3538e