plcopeneditor_history: comparison PLCOpenEditor.py

equal deleted inserted replaced

-:b9898f557e9b
+:7b58a3b5b6ec
 __version__ = "$Revision$"
 CWD = os.path.split(os.path.realpath(__file__))[0]
-[ID_PLCOPENEDITOR, ID_PLCOPENEDITORPROJECTTREE,
+[ID_PLCOPENEDITOR, ID_PLCOPENEDITORTREENOTEBOOK,
+ID_PLCOPENEDITORTYPESTREE, ID_PLCOPENEDITORINSTANCESTREE,
 ID_PLCOPENEDITORMAINSPLITTER, ID_PLCOPENEDITORSECONDSPLITTER,
 ID_PLCOPENEDITOREDITORPANEL, ID_PLCOPENEDITORTABSOPENED,
 ID_PLCOPENEDITORTOOLBAR, ID_PLCOPENEDITORDEFAULTTOOLBAR,
 ID_PLCOPENEDITORSFCTOOLBAR, ID_PLCOPENEDITORFBDTOOLBAR,
 ID_PLCOPENEDITORLDTOOLBAR,
-] = [wx.NewId() for _init_ctrls in range(11)]
+] = [wx.NewId() for _init_ctrls in range(13)]
 [ID_PLCOPENEDITORFILEMENUGENERATE,
 ] = [wx.NewId() for _init_coll_FileMenu_Items in range(1)]
 [ID_PLCOPENEDITOREDITMENUADDDATATYPE, ID_PLCOPENEDITOREDITMENUADDFUNCTION,
 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)
-if wx.VERSION >= (2, 8, 0):
+class PLCOpenEditor(wx.Frame):
-base_class = wx.aui.AuiMDIParentFrame
-else:
-base_class = wx.Frame
-class PLCOpenEditor(base_class):
 CopyBuffer = None
 if wx.VERSION < (2, 6, 0):
 def Bind(self, event, function, id = None):
 self._init_coll_FileMenu_Items(self.FileMenu)
 self._init_coll_EditMenu_Items(self.EditMenu)
 self._init_coll_HelpMenu_Items(self.HelpMenu)
 def _init_ctrls(self, prnt):
-if wx.VERSION >= (2, 8, 0):
+wx.Frame.__init__(self, id=ID_PLCOPENEDITOR, name=u'PLCOpenEditor',
-wx.aui.AuiMDIParentFrame.__init__(self, winid=ID_PLCOPENEDITOR, name=u'PLCOpenEditor',
+parent=prnt, pos=wx.DefaultPosition, size=wx.Size(1000, 600),
-parent=prnt, pos=wx.DefaultPosition, size=wx.Size(1000, 600),
+style=wx.DEFAULT_FRAME_STYLE, title=u'PLCOpenEditor')
-style=wx.DEFAULT_FRAME_STYLE|wx.SUNKEN_BORDER|wx.CLIP_CHILDREN, title=u'PLCOpenEditor')
-else:
-wx.Frame.__init__(self, id=ID_PLCOPENEDITOR, name=u'PLCOpenEditor',
-parent=prnt, pos=wx.DefaultPosition, size=wx.Size(1000, 600),
-style=wx.DEFAULT_FRAME_STYLE, title=u'PLCOpenEditor')
 self._init_utils()
 self.SetClientSize(wx.Size(1000, 600))
 self.SetMenuBar(self.MenuBar)
 self.Bind(wx.EVT_CLOSE, self.OnCloseFrame)
 name='MainSplitter', parent=self, point=wx.Point(0, 0),
 size=wx.Size(0, 0), style=wx.SP_3D)
 self.MainSplitter.SetNeedUpdating(True)
 self.MainSplitter.SetMinimumPaneSize(1)
-self.ProjectTree = wx.TreeCtrl(id=ID_PLCOPENEDITORPROJECTTREE,
+self.TreeNoteBook = wx.Notebook(id=ID_PLCOPENEDITORTREENOTEBOOK,
-name='treeCtrl1', parent=self.MainSplitter, pos=wx.Point(0, 0),
+name='TreeNoteBook', parent=self.MainSplitter, pos=wx.Point(0,
-size=wx.Size(-1, -1),
+0), size=wx.Size(0, 0), style=0)
+else:
+self.TreeNoteBook = wx.aui.AuiNotebook(self)
+self.AUIManager.AddPane(self.TreeNoteBook, wx.aui.AuiPaneInfo().Caption("Project").Left().Layer(1).BestSize(wx.Size(200, 500)).CloseButton(False))
+self.TypesTree = wx.TreeCtrl(id=ID_PLCOPENEDITORTYPESTREE,
+name='TypesTree', parent=self.TreeNoteBook,
+pos=wx.Point(0, 0), size=wx.Size(0, 0),
 style=wx.TR_HAS_BUTTONS|wx.TR_EDIT_LABELS|wx.TR_SINGLE|wx.SUNKEN_BORDER)
-else:
+self.TreeNoteBook.AddPage(self.TypesTree, "Types")
-self.ProjectTree = wx.TreeCtrl(id=ID_PLCOPENEDITORPROJECTTREE,
-name='treeCtrl1', parent=self, pos=wx.Point(0, 0),
+if wx.Platform == '__WXMSW__':
-size=wx.Size(200, -1),
+self.Bind(wx.EVT_TREE_ITEM_RIGHT_CLICK, self.OnTypesTreeRightUp,
+id=ID_PLCOPENEDITORTYPESTREE)
+self.Bind(wx.EVT_TREE_SEL_CHANGED, self.OnTypesTreeItemSelected,
+id=ID_PLCOPENEDITORTYPESTREE)
+else:
+if wx.VERSION >= (2, 6, 0):
+self.TypesTree.Bind(wx.EVT_RIGHT_UP, self.OnTypesTreeRightUp)
+self.TypesTree.Bind(wx.EVT_LEFT_UP, self.OnTypesTreeLeftUp)
+else:
+wx.EVT_RIGHT_UP(self.TypesTree, self.OnTypesTreeRightUp)
+wx.EVT_LEFT_UP(self.TypesTree, self.OnTypesTreeLeftUp)
+self.Bind(wx.EVT_TREE_SEL_CHANGING, self.OnTypesTreeItemChanging,
+id=ID_PLCOPENEDITORTYPESTREE)
+self.Bind(wx.EVT_TREE_BEGIN_DRAG, self.OnTypesTreeBeginDrag,
+id=ID_PLCOPENEDITORTYPESTREE)
+self.Bind(wx.EVT_TREE_BEGIN_LABEL_EDIT, self.OnTypesTreeItemBeginEdit,
+id=ID_PLCOPENEDITORTYPESTREE)
+self.Bind(wx.EVT_TREE_END_LABEL_EDIT, self.OnTypesTreeItemEndEdit,
+id=ID_PLCOPENEDITORTYPESTREE)
+self.Bind(wx.EVT_TREE_ITEM_ACTIVATED, self.OnTypesTreeItemActivated,
+id=ID_PLCOPENEDITORTYPESTREE)
+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_EDIT_LABELS|wx.TR_SINGLE|wx.SUNKEN_BORDER)
-self.AUIManager.AddPane(self.ProjectTree, wx.aui.AuiPaneInfo().Caption("Project Tree").Left().Layer(1).BestSize(wx.Size(200, 500)).CloseButton(False))
+self.TreeNoteBook.AddPage(self.InstancesTree, "Instances")
-if wx.Platform == '__WXMSW__':
-self.Bind(wx.EVT_TREE_ITEM_RIGHT_CLICK, self.OnProjectTreeRightUp,
-id=ID_PLCOPENEDITORPROJECTTREE)
-self.Bind(wx.EVT_TREE_SEL_CHANGED, self.OnProjectTreeItemSelected,
-id=ID_PLCOPENEDITORPROJECTTREE)
-else:
-if wx.VERSION >= (2, 6, 0):
-self.ProjectTree.Bind(wx.EVT_RIGHT_UP, self.OnProjectTreeRightUp)
-self.ProjectTree.Bind(wx.EVT_LEFT_UP, self.OnProjectTreeLeftUp)
-else:
-wx.EVT_RIGHT_UP(self.ProjectTree, self.OnProjectTreeRightUp)
-wx.EVT_LEFT_UP(self.ProjectTree, self.OnProjectTreeLeftUp)
-self.Bind(wx.EVT_TREE_SEL_CHANGING, self.OnProjectTreeItemChanging,
-id=ID_PLCOPENEDITORPROJECTTREE)
-self.Bind(wx.EVT_TREE_BEGIN_DRAG, self.OnProjectTreeBeginDrag,
-id=ID_PLCOPENEDITORPROJECTTREE)
-self.Bind(wx.EVT_TREE_BEGIN_LABEL_EDIT, self.OnProjectTreeItemBeginEdit,
-id=ID_PLCOPENEDITORPROJECTTREE)
-self.Bind(wx.EVT_TREE_END_LABEL_EDIT, self.OnProjectTreeItemEndEdit,
-id=ID_PLCOPENEDITORPROJECTTREE)
-self.Bind(wx.EVT_TREE_ITEM_ACTIVATED, self.OnProjectTreeItemActivated,
-id=ID_PLCOPENEDITORPROJECTTREE)
 if wx.VERSION < (2, 8, 0):
 self.ToolBar = self.CreateToolBar(wx.TB_HORIZONTAL|wx.TB_FLAT|wx.NO_BORDER,
 ID_PLCOPENEDITORTOOLBAR, 'ToolBar')
 self.ToolBar.SetToolBitmapSize(wx.Size(25, 25))
 self.SecondSplitter = wx.SplitterWindow(id=ID_PLCOPENEDITORSECONDSPLITTER,
 name='SecondSplitter', parent=self.MainSplitter, point=wx.Point(0, 0),
 size=wx.Size(0, 0), style=wx.SP_3D)
 self.SecondSplitter.SetMinimumPaneSize(1)
-self.MainSplitter.SplitVertically(self.ProjectTree, self.SecondSplitter, 200)
+self.MainSplitter.SplitVertically(self.TreeNoteBook, self.SecondSplitter, 200)
 self.TabsOpened = wx.Notebook(id=ID_PLCOPENEDITORTABSOPENED,
 name='TabsOpened', parent=self.SecondSplitter, pos=wx.Point(0,
 0), size=wx.Size(0, 0), style=0)
 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.OnPouSelectedChanged)
+else:
+self.TabsOpened = wx.aui.AuiNotebook(self)
+self.TabsOpened.Bind(wx.aui.EVT_AUINOTEBOOK_PAGE_CHANGED,
+self.OnPouSelectedChanged)
+self.AUIManager.AddPane(self.TabsOpened, wx.aui.AuiPaneInfo().CentrePane())
 if wx.VERSION < (2, 8, 0):
 self.VariablePanelIndexer = VariablePanelIndexer(self.SecondSplitter, self, self.Controler)
 self.SecondSplitter.SplitHorizontally(self.TabsOpened, self.VariablePanelIndexer, -200)
 else:
 self.VariablePanelIndexer = VariablePanelIndexer(self, self, self.Controler)
-self.AUIManager.AddPane(self.VariablePanelIndexer, wx.aui.AuiPaneInfo().Caption("Variable Panel").Bottom().Layer(0).BestSize(wx.Size(800, 200)).CloseButton(False))
+self.AUIManager.AddPane(self.VariablePanelIndexer, wx.aui.AuiPaneInfo().Caption("Variables").Bottom().Layer(0).BestSize(wx.Size(800, 200)).CloseButton(False))
 self.AUIManager.Update()
 def __init__(self, parent, controler = None, fileOpen = None):
 self.ModeSolo = controler == None
 self._init_ctrls(parent)
 self.SetIcon(wx.Icon(os.path.join(CWD,"Images","poe.ico"),wx.BITMAP_TYPE_ICO))
-self.TreeImageList = wx.ImageList(16, 16)
+self.TypesTreeImageList = wx.ImageList(16, 16)
-self.TreeImageDict = {}
+self.InstancesTreeImageList = wx.ImageList(16, 16)
+self.TypesTreeImageDict = {}
+self.InstancesTreeImageDict = {}
 for language in LANGUAGES:
-self.TreeImageDict[language]=self.TreeImageList.Add(wx.Bitmap(os.path.join(CWD, 'Images', '%s.png'%language)))
+self.TypesTreeImageDict[language]=self.TypesTreeImageList.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)))
 for imgname, itemtype in [
 #editables
 ("PROJECT",        ITEM_PROJECT),
 #("POU",            ITEM_POU),
 # uneditables
 ("DATATYPES",      ITEM_DATATYPES),
 ("FUNCTION",       ITEM_FUNCTION),
 ("FUNCTIONBLOCK",  ITEM_FUNCTIONBLOCK),
 ("PROGRAM",        ITEM_PROGRAM),
+("VAR_LOCAL",      ITEM_VAR_LOCAL),
+("VAR_LOCAL",      ITEM_VAR_GLOBAL),
+("VAR_LOCAL",      ITEM_VAR_EXTERNAL),
+("VAR_LOCAL",      ITEM_VAR_TEMP),
+("VAR_INPUT",      ITEM_VAR_INPUT),
+("VAR_OUTPUT",     ITEM_VAR_OUTPUT),
+("VAR_INOUT",      ITEM_VAR_INOUT),
 ("TRANSITIONS",    ITEM_TRANSITIONS),
 ("ACTIONS",        ITEM_ACTIONS),
 ("CONFIGURATIONS", ITEM_CONFIGURATIONS),
 ("RESOURCES",      ITEM_RESOURCES),
 ("PROPERTIES",     ITEM_PROPERTIES)]:
-self.TreeImageDict[itemtype]=self.TreeImageList.Add(wx.Bitmap(os.path.join(CWD, 'Images', '%s.png'%imgname)))
+self.TypesTreeImageDict[itemtype]=self.TypesTreeImageList.Add(wx.Bitmap(os.path.join(CWD, 'Images', '%s.png'%imgname)))
-self.ProjectTree.AssignImageList(self.TreeImageList)
+self.InstancesTreeImageDict[itemtype]=self.InstancesTreeImageList.Add(wx.Bitmap(os.path.join(CWD, 'Images', '%s.png'%imgname)))
+self.TypesTree.AssignImageList(self.TypesTreeImageList)
+self.InstancesTree.AssignImageList(self.InstancesTreeImageList)
 self.CurrentToolBar = []
 self.CurrentLanguage = ""
 self.SelectedItem = None
 self.Errors = []
 self.PageSetupData = wx.PageSetupDialogData(self.PrintData)
 self.PageSetupData.SetMarginTopLeft(wx.Point(10, 15))
 self.PageSetupData.SetMarginBottomRight(wx.Point(10, 20))
 if not self.ModeSolo or fileOpen is not None:
-self.RefreshProjectTree()
+self.RefreshTypesTree()
+self.RefreshInstancesTree()
 self.RefreshFileMenu()
 self.RefreshEditMenu()
 self.RefreshTitle()
 self.RefreshToolBar()
 def ResetSelectedItem(self):
 self.SelectedItem = None
 def OnPageClose(self, event):
-selected = self.GetPageSelection()
+selected = self.TabsOpened.GetSelection()
 if selected >= 0:
 tagname = self.GetPage(selected).GetTagName()
 self.VariablePanelIndexer.RemoveVariablePanel(tagname)
-if self.GetPageCount() > 0:
+if self.TabsOpened.GetPageCount() > 0:
-new_index = min(selected, self.GetPageCount() - 1)
+new_index = min(selected, self.TabsOpened.GetPageCount() - 1)
 tagname = self.GetPage(new_index).GetTagName()
-self.SetPageSelection(new_index)
+self.TabsOpened.SetSelection(new_index)
 self.VariablePanelIndexer.ChangeVariablePanel(tagname)
 self.RefreshTitle()
 self.RefreshFileMenu()
 self.RefreshEditMenu()
 self.RefreshToolBar()
 if new_values != old_values:
 self.Controler.SetProjectProperties(None, new_values)
 self.RefreshTitle()
 self.RefreshFileMenu()
 self.RefreshEditMenu()
-self.RefreshProjectTree()
+self.RefreshTypesTree()
-for i in xrange(self.GetPageCount()):
+for i in xrange(self.TabsOpened.GetPageCount()):
 editor = self.GetPage(i)
 editor.RefreshScaling()
 dialog.Destroy()
 def OnCloseFrame(self, event):
 #-------------------------------------------------------------------------------
 #                            Notebook Unified Functions
 #-------------------------------------------------------------------------------
-def GetPageCount(self):
-if wx.VERSION >= (2, 8, 0):
-notebook = self.GetNotebook()
-if notebook is not None:
-return notebook.GetPageCount()
-else:
-return 0
-else:
-return self.TabsOpened.GetPageCount()
-def GetPage(self, idx):
-if wx.VERSION >= (2, 8, 0):
-notebook = self.GetNotebook()
-if notebook is not None:
-return notebook.GetPage(idx).GetViewer()
-else:
-return None
-else:
-return self.TabsOpened.GetPage(idx)
-def GetPageSelection(self):
-if wx.VERSION >= (2, 8, 0):
-notebook = self.GetNotebook()
-if notebook is not None:
-return notebook.GetSelection()
-else:
-return -1
-else:
-return self.TabsOpened.GetSelection()
-def SetPageSelection(self, idx):
-if wx.VERSION >= (2, 8, 0):
-notebook = self.GetNotebook()
-if notebook is not None:
-notebook.SetSelection(idx)
-else:
-self.TabsOpened.SetSelection(idx)
-def DeletePage(self, idx):
-if wx.VERSION >= (2, 8, 0):
-notebook = self.GetNotebook()
-if notebook is not None:
-notebook.DeletePage(idx)
-else:
-self.TabsOpened.DeletePage(idx)
 def DeleteAllPages(self):
 if wx.VERSION >= (2, 8, 0):
-notebook = self.GetNotebook()
+for idx in xrange(self.TabsOpened.GetPageCount()):
-if notebook is not None:
+self.TabsOpened.DeletePage(0)
-for idx in xrange(notebook.GetPageCount()):
-notebook.DeletePage(0)
 else:
 self.TabsOpened.DeleteAllPages()
-def SetPageText(self, idx, text):
-if wx.VERSION >= (2, 8, 0):
-notebook = self.GetNotebook()
-if notebook is not None:
-return notebook.SetPageText(idx, text)
-else:
-return self.TabsOpened.SetPageText(idx, text)
 def SetPageBitmap(self, idx, bitmap):
 if wx.VERSION >= (2, 8, 0):
-notebook = self.GetNotebook()
+return self.TabsOpened.SetPageBitmap(idx, bitmap)
-if notebook is not None:
-return notebook.SetPageBitmap(idx, bitmap)
 else:
 return self.TabsOpened.SetPageImage(idx, bitmap)
-def GetPageText(self, idx):
-if wx.VERSION >= (2, 8, 0):
-notebook = self.GetNotebook()
-if notebook is not None:
-return notebook.GetPageText(idx)
-else:
-return ""
-else:
-return self.TabsOpened.GetPageText(idx)
 #-------------------------------------------------------------------------------
 #                            File Menu Functions
 #-------------------------------------------------------------------------------
 def RefreshFileMenu(self):
 if self.Controler.HasOpenedProject():
-selected = self.GetPageSelection()
+selected = self.TabsOpened.GetSelection()
 if selected >= 0:
-graphic_viewer = isinstance(self.GetPage(selected), Viewer)
+graphic_viewer = isinstance(self.TabsOpened.GetPage(selected), Viewer)
 else:
 graphic_viewer = False
-if self.GetPageCount() > 0:
+if self.TabsOpened.GetPageCount() > 0:
 self.FileMenu.Enable(wx.ID_CLOSE, True)
 if graphic_viewer:
 self.FileMenu.Enable(wx.ID_PREVIEW, True)
 self.FileMenu.Enable(wx.ID_PRINT, True)
 else:
 properties = dialog.GetValues()
 self.Controler.CreateNewProject(properties)
 self.RefreshTitle()
 self.RefreshFileMenu()
 self.RefreshEditMenu()
-self.RefreshProjectTree()
+self.RefreshTypesTree()
+self.RefreshInstancesTree()
 event.Skip()
 def OnOpenProjectMenu(self, event):
 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)
 filepath = dialog.GetPath()
 if os.path.isfile(filepath):
 self.DeleteAllPages()
 self.VariablePanelIndexer.RemoveAllPanels()
 self.Controler.OpenXMLFile(filepath)
-self.RefreshProjectTree()
+self.RefreshTypesTree()
+self.RefreshInstancesTree()
 self.RefreshTitle()
 self.RefreshFileMenu()
 self.RefreshEditMenu()
 self.RefreshToolBar()
 dialog.Destroy()
 event.Skip()
 def OnCloseTabMenu(self, event):
-selected = self.GetPageSelection()
+selected = self.TabsOpened.GetSelection()
 if selected >= 0:
-tagname = self.GetPage(selected).GetTagName()
+tagname = self.TabsOpened.GetPage(selected).GetTagName()
-self.DeletePage(selected)
+self.TabsOpened.DeletePage(selected)
 self.VariablePanelIndexer.RemoveVariablePanel(tagname)
-if self.GetPageCount() > 0:
+if self.TabsOpened.GetPageCount() > 0:
-new_index = min(selected, self.GetPageCount() - 1)
+new_index = min(selected, self.TabsOpened.GetPageCount() - 1)
-tagname = self.GetPage(new_index).GetTagName()
+tagname = self.TabsOpened.GetPage(new_index).GetTagName()
-self.SetPageSelection(new_index)
+self.TabsOpened.SetSelection(new_index)
 self.VariablePanelIndexer.ChangeVariablePanel(tagname)
 self.RefreshTitle()
 self.RefreshFileMenu()
 self.RefreshEditMenu()
 self.RefreshToolBar()
 self.SaveProject()
 elif answer == wx.ID_CANCEL:
 return
 self.DeleteAllPages()
 self.VariablePanelIndexer.RemoveAllPanels()
-self.ProjectTree.DeleteAllItems()
+self.TypesTree.DeleteAllItems()
+self.InstancesTree.DeleteAllItems()
 self.Controler.Reset()
 self.RefreshTitle()
 self.RefreshFileMenu()
 self.RefreshEditMenu()
 self.RefreshToolBar()
 self.PrintData = wx.PrintData(self.PageSetupData.GetPrintData())
 dialog.Destroy()
 event.Skip()
 def OnPreviewMenu(self, event):
-selected = self.GetPageSelection()
+selected = self.TabsOpened.GetSelection()
 if selected != -1:
 data = wx.PrintDialogData(self.PrintData)
 properties = self.Controler.GetProjectProperties()
 page_size = map(int, properties["pageSize"])
 margins = (self.PageSetupData.GetMarginTopLeft(), self.PageSetupData.GetMarginBottomRight())
-printout = GraphicPrintout(self.GetPage(selected), page_size, margins, True)
+printout = GraphicPrintout(self.TabsOpened.GetPage(selected), page_size, margins, True)
-printout2 = GraphicPrintout(self.GetPage(selected), page_size, margins, True)
+printout2 = GraphicPrintout(self.TabsOpened.GetPage(selected), page_size, margins, True)
 preview = wx.PrintPreview(printout, printout2, data)
 if preview.Ok():
 preview_frame = wx.PreviewFrame(preview, self, "Print preview")
 preview_frame.Show(True)
 event.Skip()
 def OnPrintMenu(self, event):
-selected = self.GetPageSelection()
+selected = self.TabsOpened.GetSelection()
 if selected != -1:
 dialog_data = wx.PrintDialogData(self.PrintData)
 dialog_data.SetToPage(1)
 properties = self.Controler.GetProjectProperties()
 page_size = map(int, properties["pageSize"])
 margins = (self.PageSetupData.GetMarginTopLeft(), self.PageSetupData.GetMarginBottomRight())
 printer = wx.Printer(dialog_data)
-printout = GraphicPrintout(self.GetPage(selected), page_size, margins)
+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)
 printout.Destroy()
 event.Skip()
 self.EditMenu.Enable(wx.ID_REDO, redo)
 else:
 self.EditMenu.Enable(wx.ID_UNDO, False)
 self.EditMenu.Enable(wx.ID_REDO, False)
 if self.Controler.HasOpenedProject():
-if self.GetPageCount() > 0:
+if self.TabsOpened.GetPageCount() > 0:
 self.EditMenu.Enable(wx.ID_REFRESH, True)
 else:
 self.EditMenu.Enable(wx.ID_REFRESH, False)
 self.EditMenu.Enable(wx.ID_ADD, True)
 self.EditMenu.Enable(wx.ID_DELETE, True)
 self.EditMenu.Enable(wx.ID_PASTE, True)
 else:
 self.EditMenu.Enable(wx.ID_PASTE, False)
 def OnRefreshMenu(self, event):
-selected = self.GetPageSelection()
+selected = self.TabsOpened.GetSelection()
 if selected != -1:
-window = self.GetPage(selected)
+window = self.TabsOpened.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())
+idxs = range(self.TabsOpened.GetPageCount())
 idxs.reverse()
 for idx in idxs:
-tagname = self.GetPage(idx).GetTagName()
+tagname = self.TabsOpened.GetPage(idx).GetTagName()
 if self.Controler.GetEditedElement(tagname) is None:
 self.VariablePanelIndexer.RemoveVariablePanel(tagname)
-self.DeletePage(idx)
+self.TabsOpened.DeletePage(idx)
-selected = self.GetPageSelection()
+selected = self.TabsOpened.GetSelection()
 if selected != -1:
-window = self.GetPage(selected)
+window = self.TabsOpened.GetPage(selected)
 window.RefreshView()
 self.VariablePanelIndexer.RefreshVariablePanel(window.GetTagName())
 self.RefreshTitle()
 self.RefreshEditMenu()
-self.RefreshProjectTree()
+self.RefreshTypesTree()
 event.Skip()
 def OnRedoMenu(self, event):
 self.Controler.LoadNext()
-idxs = range(self.GetPageCount())
+idxs = range(self.TabsOpened.GetPageCount())
 idxs.reverse()
 for idx in idxs:
-tagname = self.GetPage(idx).GetTagName()
+tagname = self.TabsOpened.GetPage(idx).GetTagName()
 if self.Controler.GetEditedElement(tagname) is None:
 self.VariablePanelIndexer.RemoveVariablePanel(tagname)
-self.DeletePage(idx)
+self.TabsOpened.DeletePage(idx)
-selected = self.GetPageSelection()
+selected = self.TabsOpened.GetSelection()
 if selected != -1:
-window = self.GetPage(selected)
+window = self.TabsOpened.GetPage(selected)
 window.RefreshView()
 self.VariablePanelIndexer.RefreshVariablePanel(window.GetTagName())
 self.RefreshTitle()
 self.RefreshEditMenu()
-self.RefreshProjectTree()
+self.RefreshTypesTree()
 event.Skip()
 def OnCutMenu(self, event):
 control = self.FindFocus()
 if isinstance(control, Viewer):
 control.ProcessEvent(event)
 event.Skip()
 def OnDeleteMenu(self, event):
 window = self.FindFocus()
-if window == self.ProjectTree:
+if window == self.TypesTree:
-selected = self.ProjectTree.GetSelection()
+selected = self.TypesTree.GetSelection()
 if selected.IsOk():
-type = self.ProjectTree.GetPyData(selected)
+type = self.TypesTree.GetPyData(selected)
 tagname = ""
 if type == ITEM_DATATYPE:
-name = self.ProjectTree.GetItemText(selected)
+name = self.TypesTree.GetItemText(selected)
 if not self.Controler.DataTypeIsUsed(name):
 self.Controler.ProjectRemoveDataType(name)
 tagname = self.Controler.ComputeDataTypeName(name)
 else:
 message = wx.MessageDialog(self, "%s is used by one or more POUs. It can't be removed!"%selected, "Error", wx.OK|wx.ICON_ERROR)
 message.ShowModal()
 message.Destroy()
 elif type == ITEM_POU:
-name = self.ProjectTree.GetItemText(selected)
+name = self.TypesTree.GetItemText(selected)
 if not self.Controler.DataTypeIsUsed(name):
 self.Controler.ProjectRemoveDataType(name)
 tagname = self.Controler.ComputeDataTypeName(name)
 else:
 message = wx.MessageDialog(self, "%s is used by one or more POUs. It can't be removed!"%selected, "Error", wx.OK|wx.ICON_ERROR)
 message.ShowModal()
 message.Destroy()
 elif type in [ITEM_TRANSITION, ITEM_ACTION]:
-item = self.ProjectTree.GetItemParent(selected)
+item = self.TypesTree.GetItemParent(selected)
-item_type = self.ProjectTree.GetPyData(item)
+item_type = self.TypesTree.GetPyData(item)
 while item_type != ITEM_POU:
-item = self.ProjectTree.GetItemParent(item)
+item = self.TypesTree.GetItemParent(item)
-item_type = self.ProjectTree.GetPyData(item)
+item_type = self.TypesTree.GetPyData(item)
-pou_name = self.ProjectTree.GetItemText(item)
+pou_name = self.TypesTree.GetItemText(item)
 if type == ITEM_TRANSITION:
-transition = self.ProjectTree.GetItemText(selected)
+transition = self.TypesTree.GetItemText(selected)
 self.Controler.ProjectRemovePouTransition(pou_name, transition)
 tagname = self.Controler.ComputePouTransitionName(pou_name, transition)
 elif type == ITEM_ACTION:
-action = self.ProjectTree.GetItemText(selected)
+action = self.TypesTree.GetItemText(selected)
 self.Controler.ProjectRemovePouAction(pou_name, action)
 tagname = self.Controler.ComputePouActionName(pou_name, action)
 elif type == ITEM_CONFIGURATION:
-name = self.ProjectTree.GetItemText(selected)
+name = self.TypesTree.GetItemText(selected)
 self.Controler.ProjectRemoveConfiguration(name)
 tagname = self.Controler.ComputeConfigurationName(name)
 elif type == ITEM_RESOURCE:
-resource = self.ProjectTree.GetItemText(selected)
+resource = self.TypesTree.GetItemText(selected)
-item = self.ProjectTree.GetItemParent(selected)
+item = self.TypesTree.GetItemParent(selected)
-item_type = self.ProjectTree.GetPyData(item)
+item_type = self.TypesTree.GetPyData(item)
 while item_type != ITEM_CONFIGURATION:
-item = self.ProjectTree.GetItemParent(item)
+item = self.TypesTree.GetItemParent(item)
-item_type = self.ProjectTree.GetPyData(item)
+item_type = self.TypesTree.GetPyData(item)
-config_name = self.ProjectTree.GetItemText(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.DeletePage(idx)
+self.TabsOpened.DeletePage(idx)
 self.RefreshTitle()
 self.RefreshEditMenu()
-self.RefreshProjectTree()
+self.RefreshTypesTree()
 self.RefreshToolBar()
 elif isinstance(window, (Viewer, TextViewer)):
 event = wx.KeyEvent(wx.EVT_CHAR._getEvtType())
 event.m_keyCode = wx.WXK_DELETE
 window.ProcessEvent(event)
 #-------------------------------------------------------------------------------
 #                      Project Editor Panels Management Functions
 #-------------------------------------------------------------------------------
 def OnPouSelectedChanged(self, event):
-if wx.VERSION < (2, 8, 0) or event.GetActive():
+old_selected = self.TabsOpened.GetSelection()
-old_selected = self.GetPageSelection()
+if old_selected >= 0:
-if old_selected >= 0:
+self.TabsOpened.GetPage(old_selected).ResetBuffer()
-self.GetPage(old_selected).ResetBuffer()
+selected = event.GetSelection()
-if wx.VERSION >= (2, 8, 0):
+if selected >= 0:
-window = event.GetEventObject().GetViewer()
+window = self.TabsOpened.GetPage(selected)
-else:
+self.SelectTypesTreeItem(window.GetTagName())
-selected = event.GetSelection()
+window.RefreshView()
-if selected >= 0:
+self.VariablePanelIndexer.ChangeVariablePanel(window.GetTagName())
-window = self.GetPage(selected)
+self.RefreshFileMenu()
-else:
+self.RefreshEditMenu()
-window = None
+self.RefreshToolBar()
-if window:
-self.SelectProjectTreeItem(window.GetTagName())
-window.RefreshView()
-self.VariablePanelIndexer.ChangeVariablePanel(window.GetTagName())
-self.RefreshFileMenu()
-self.RefreshEditMenu()
-self.RefreshToolBar()
 event.Skip()
 def RefreshEditor(self, variablepanel = True):
-selected = self.GetPageSelection()
+selected = self.TabsOpened.GetSelection()
 if selected != -1:
-window = self.GetPage(selected)
+window = self.TabsOpened.GetPage(selected)
 window.RefreshView()
 if variablepanel:
 self.RefreshVariablePanel(window.GetTagName())
 def RefreshVariablePanel(self, tagname):
 self.VariablePanelIndexer.RefreshVariablePanel(tagname)
 def RefreshEditorNames(self, old_tagname, new_tagname):
-for i in xrange(self.GetPageCount()):
+for i in xrange(self.TabsOpened.GetPageCount()):
-editor = self.GetPage(i)
+editor = self.TabsOpened.GetPage(i)
 if editor.GetTagName() == old_tagname:
 editor.SetTagName(new_tagname)
 self.VariablePanelIndexer.UpdateVariablePanelTagName(old_tagname, new_tagname)
 def IsOpened(self, tagname):
-for idx in xrange(self.GetPageCount()):
+for idx in xrange(self.TabsOpened.GetPageCount()):
-if self.GetPage(idx).IsViewing(tagname):
+if self.TabsOpened.GetPage(idx).IsViewing(tagname):
 return idx
 return None
 def RefreshPageTitles(self):
-for idx in xrange(self.GetPageCount()):
+for idx in xrange(self.TabsOpened.GetPageCount()):
-window = self.GetPage(idx)
+window = self.TabsOpened.GetPage(idx)
 words = window.GetTagName().split("::")
 if words[0] == "P":
 pou_type = self.Controler.GetEditedElementType(window.GetTagName())[1].upper()
 pou_body_type = self.Controler.GetEditedElementBodyType(window.GetTagName())
 self.SetPageBitmap(idx, GenerateBitmap(pou_type, pou_body_type))
 self.SetPageBitmap(idx, GenerateBitmap("CONFIGURATION"))
 elif words[0] == "R":
 self.SetPageBitmap(idx, GenerateBitmap("RESOURCE"))
 elif words[0] == "D":
 self.SetPageBitmap(idx, GenerateBitmap("DATATYPE"))
-self.SetPageText(idx, "-".join(words[1:]))
+self.TabsOpened.SetPageText(idx, "-".join(words[1:]))
 #-------------------------------------------------------------------------------
 #                         Project Tree Management Functions
 #-------------------------------------------------------------------------------
-def RefreshProjectTree(self):
+def RefreshTypesTree(self):
 infos = self.Controler.GetProjectInfos()
-root = self.ProjectTree.GetRootItem()
+root = self.TypesTree.GetRootItem()
 if not root.IsOk():
-root = self.ProjectTree.AddRoot(infos["name"])
+root = self.TypesTree.AddRoot(infos["name"])
-self.GenerateTreeBranch(root, infos)
+self.GenerateTypesTreeBranch(root, infos)
-self.ProjectTree.Expand(self.ProjectTree.GetRootItem())
+self.TypesTree.Expand(self.TypesTree.GetRootItem())
-def GenerateTreeBranch(self, root, infos):
+def GenerateTypesTreeBranch(self, root, infos, topology=False):
 to_delete = []
-self.ProjectTree.SetItemText(root, infos["name"])
+self.TypesTree.SetItemText(root, infos["name"])
-self.ProjectTree.SetPyData(root, infos["type"])
+self.TypesTree.SetPyData(root, infos["type"])
-if infos["tagname"] in self.Errors:
+if infos.get("tagname", None) in self.Errors:
-self.ProjectTree.SetItemBackgroundColour(root, wx.Colour(255, 255, 0))
+self.TypesTree.SetItemBackgroundColour(root, wx.Colour(255, 255, 0))
-self.ProjectTree.SetItemTextColour(root, wx.RED)
+self.TypesTree.SetItemTextColour(root, wx.RED)
 else:
-self.ProjectTree.SetItemBackgroundColour(root, wx.WHITE)
+self.TypesTree.SetItemBackgroundColour(root, wx.WHITE)
-self.ProjectTree.SetItemTextColour(root, wx.BLACK)
+self.TypesTree.SetItemTextColour(root, wx.BLACK)
-if infos["type"] == ITEM_POU :
+if infos["type"] == ITEM_POU:
-self.ProjectTree.SetItemImage(root,self.TreeImageDict[self.Controler.GetPouBodyType(infos["name"])])
+self.TypesTree.SetItemImage(root, self.TypesTreeImageDict[self.Controler.GetPouBodyType(infos["name"])])
 else:
-self.ProjectTree.SetItemImage(root,self.TreeImageDict[infos["type"]])
+self.TypesTree.SetItemImage(root, self.TypesTreeImageDict[infos["type"]])
 if wx.VERSION >= (2, 6, 0):
-item, root_cookie = self.ProjectTree.GetFirstChild(root)
+item, root_cookie = self.TypesTree.GetFirstChild(root)
 else:
-item, root_cookie = self.ProjectTree.GetFirstChild(root, 0)
+item, root_cookie = self.TypesTree.GetFirstChild(root, 0)
 for values in infos["values"]:
 if not item.IsOk():
-item = self.ProjectTree.AppendItem(root, "")
+item = self.TypesTree.AppendItem(root, "")
 if wx.Platform != '__WXMSW__':
-item, root_cookie = self.ProjectTree.GetNextChild(root, root_cookie)
+item, root_cookie = self.TypesTree.GetNextChild(root, root_cookie)
-self.GenerateTreeBranch(item, values)
+self.GenerateTypesTreeBranch(item, values)
-item, root_cookie = self.ProjectTree.GetNextChild(root, root_cookie)
+item, root_cookie = self.TypesTree.GetNextChild(root, root_cookie)
 while item.IsOk():
 to_delete.append(item)
-item, root_cookie = self.ProjectTree.GetNextChild(root, root_cookie)
+item, root_cookie = self.TypesTree.GetNextChild(root, root_cookie)
 for item in to_delete:
-self.ProjectTree.Delete(item)
+self.TypesTree.Delete(item)
-def SelectProjectTreeItem(self, tagname):
+def SelectTypesTreeItem(self, tagname):
-if self.ProjectTree:
+if self.TypesTree:
-root = self.ProjectTree.GetRootItem()
+root = self.TypesTree.GetRootItem()
 words = tagname.split("::")
 if words[0] == "D":
-return self.RecursiveProjectTreeItemSelection(root, [(words[1], ITEM_DATATYPE)])
+return self.RecursiveTypesTreeItemSelection(root, [(words[1], ITEM_DATATYPE)])
 elif words[0] == "P":
-return self.RecursiveProjectTreeItemSelection(root, [(words[1], ITEM_POU)])
+return self.RecursiveTypesTreeItemSelection(root, [(words[1], ITEM_POU)])
 elif words[0] == "T":
-return self.RecursiveProjectTreeItemSelection(root, [(words[1], ITEM_POU), (words[2], ITEM_TRANSITION)])
+return self.RecursiveTypesTreeItemSelection(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)])
+return self.RecursiveTypesTreeItemSelection(root, [(words[1], ITEM_POU), (words[2], ITEM_ACTION)])
 elif words[0] == "C":
-return self.RecursiveProjectTreeItemSelection(root, [(words[1], ITEM_CONFIGURATION)])
+return self.RecursiveTypesTreeItemSelection(root, [(words[1], ITEM_CONFIGURATION)])
 elif words[0] == "R":
-return self.RecursiveProjectTreeItemSelection(root, [(words[1], ITEM_CONFIGURATION), (words[2], ITEM_RESOURCE)])
+return self.RecursiveTypesTreeItemSelection(root, [(words[1], ITEM_CONFIGURATION), (words[2], ITEM_RESOURCE)])
 return False
-def RecursiveProjectTreeItemSelection(self, root, items):
+def RecursiveTypesTreeItemSelection(self, root, items):
 found = False
-if self.ProjectTree:
+if self.TypesTree:
 if wx.VERSION >= (2, 6, 0):
-item, root_cookie = self.ProjectTree.GetFirstChild(root)
+item, root_cookie = self.TypesTree.GetFirstChild(root)
 else:
-item, root_cookie = self.ProjectTree.GetFirstChild(root, 0)
+item, root_cookie = self.TypesTree.GetFirstChild(root, 0)
 while item.IsOk() and not found:
-if (self.ProjectTree.GetItemText(item), self.ProjectTree.GetPyData(item)) == items[0]:
+if (self.TypesTree.GetItemText(item), self.TypesTree.GetPyData(item)) == items[0]:
 if len(items) == 1:
 self.SelectedItem = item
-self.ProjectTree.SelectItem(item)
+self.TypesTree.SelectItem(item)
 wx.CallAfter(self.ResetSelectedItem)
 return True
 else:
-found = self.RecursiveProjectTreeItemSelection(item, items[1:])
+found = self.RecursiveTypesTreeItemSelection(item, items[1:])
 else:
-found = self.RecursiveProjectTreeItemSelection(item, items)
+found = self.RecursiveTypesTreeItemSelection(item, items)
-item, root_cookie = self.ProjectTree.GetNextChild(root, root_cookie)
+item, root_cookie = self.TypesTree.GetNextChild(root, root_cookie)
 return found
-def OnProjectTreeBeginDrag(self, event):
+def OnTypesTreeBeginDrag(self, event):
 if wx.Platform == '__WXMSW__':
 self.SelectedItem = event.GetItem()
-if self.SelectedItem is not None and self.ProjectTree.GetPyData(self.SelectedItem) == ITEM_POU:
+if self.SelectedItem is not None and self.TypesTree.GetPyData(self.SelectedItem) == ITEM_POU:
-block_name = self.ProjectTree.GetItemText(self.SelectedItem)
+block_name = self.TypesTree.GetItemText(self.SelectedItem)
 block_type = self.Controler.GetPouType(block_name)
 if block_type != "program":
 data = wx.TextDataObject(str((block_name, block_type, "")))
-dragSource = wx.DropSource(self.ProjectTree)
+dragSource = wx.DropSource(self.TypesTree)
 dragSource.SetData(data)
 dragSource.DoDragDrop()
 self.ResetSelectedItem()
-def OnProjectTreeItemBeginEdit(self, event):
+def OnTypesTreeItemBeginEdit(self, event):
 selected = event.GetItem()
-if self.ProjectTree.GetPyData(selected) in ITEMS_UNEDITABLE:
+if self.TypesTree.GetPyData(selected) in ITEMS_UNEDITABLE:
 event.Veto()
 else:
 event.Skip()
-def OnProjectTreeItemEndEdit(self, event):
+def OnTypesTreeItemEndEdit(self, event):
 message = None
 abort = False
 new_name = event.GetLabel()
 if new_name != "":
 if not TestIdentifier(new_name):
 message = "\"%s\" is not a valid identifier!"%new_name
 elif new_name.upper() in IEC_KEYWORDS:
 message = "\"%s\" is a keyword. It can't be used!"%new_name
 else:
 item = event.GetItem()
-old_name = self.ProjectTree.GetItemText(item)
+old_name = self.TypesTree.GetItemText(item)
-itemtype = self.ProjectTree.GetPyData(item)
+itemtype = self.TypesTree.GetPyData(item)
 if itemtype == ITEM_PROJECT:
 self.Controler.SetProjectProperties(name = new_name)
 elif itemtype == ITEM_DATATYPE:
 if new_name.upper() in [name.upper() for name in self.Controler.GetProjectDataTypeNames() if name != old_name]:
 message = "\"%s\" data type already exists!"%new_name
 self.Controler.ChangePouName(old_name, new_name)
 self.RefreshEditorNames(self.Controler.ComputePouName(old_name),
 self.Controler.ComputePouName(new_name))
 self.RefreshPageTitles()
 elif itemtype == ITEM_TRANSITION:
-parent = self.ProjectTree.GetItemParent(item)
+parent = self.TypesTree.GetItemParent(item)
-parent_type = self.ProjectTree.GetPyData(parent)
+parent_type = self.TypesTree.GetPyData(parent)
 while parent_type != ITEM_POU:
-parent = self.ProjectTree.GetItemParent(parent)
+parent = self.TypesTree.GetItemParent(parent)
-parent_type = self.ProjectTree.GetPyData(parent)
+parent_type = self.TypesTree.GetPyData(parent)
-pou_name = self.ProjectTree.GetItemText(parent)
+pou_name = self.TypesTree.GetItemText(parent)
 if new_name.upper() in [name.upper() for name in self.Controler.GetProjectPouNames()]:
 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) 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.ProjectTree.GetItemParent(item)
+parent = self.TypesTree.GetItemParent(item)
-parent_type = self.ProjectTree.GetPyData(parent)
+parent_type = self.TypesTree.GetPyData(parent)
 while parent_type != ITEM_POU:
-parent = self.ProjectTree.GetItemParent(parent)
+parent = self.TypesTree.GetItemParent(parent)
-parent_type = self.ProjectTree.GetPyData(parent)
+parent_type = self.TypesTree.GetPyData(parent)
-pou_name = self.ProjectTree.GetItemText(parent)
+pou_name = self.TypesTree.GetItemText(parent)
 if new_name.upper() in [name.upper() for name in self.Controler.GetProjectPouNames()]:
 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) 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.ProjectTree.GetItemParent(item)
+parent = self.TypesTree.GetItemParent(item)
-parent_type = self.ProjectTree.GetPyData(parent)
+parent_type = self.TypesTree.GetPyData(parent)
 while parent_type != ITEM_CONFIGURATION:
-parent = self.ProjectTree.GetItemParent(parent)
+parent = self.TypesTree.GetItemParent(parent)
-parent_type = self.ProjectTree.GetPyData(parent)
+parent_type = self.TypesTree.GetPyData(parent)
-config_name = self.ProjectTree.GetItemText(parent)
+config_name = self.TypesTree.GetItemText(parent)
 if new_name.upper() in [name.upper() for name in self.Controler.GetProjectConfigNames()]:
 message = "\"%s\" config already exists!"%new_name
 abort = True
 elif new_name.upper() in [name.upper() for name in self.Controler.GetProjectPouNames()]:
 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)
 if message:
 messageDialog = wx.MessageDialog(self, message, "Error", wx.OK|wx.ICON_ERROR)
 messageDialog.ShowModal()
 messageDialog.Destroy()
 item = event.GetItem()
-wx.CallAfter(self.ProjectTree.EditLabel, item)
+wx.CallAfter(self.TypesTree.EditLabel, item)
 event.Veto()
 else:
-wx.CallAfter(self.RefreshProjectTree)
+wx.CallAfter(self.RefreshTypesTree)
-selected = self.GetPageSelection()
+selected = self.TabsOpened.GetSelection()
 if selected != -1:
-self.GetPage(selected).RefreshView()
+self.TabsOpened.GetPage(selected).RefreshView()
 event.Skip()
-def OnProjectTreeItemActivated(self, event):
+def OnTypesTreeItemActivated(self, event):
 selected = event.GetItem()
-if self.ProjectTree.IsExpanded(selected):
+if self.TypesTree.IsExpanded(selected):
-self.ProjectTree.Collapse(selected)
+self.TypesTree.Collapse(selected)
 else:
-self.ProjectTree.Expand(selected)
+self.TypesTree.Expand(selected)
-name = self.ProjectTree.GetItemText(selected)
+name = self.TypesTree.GetItemText(selected)
-data = self.ProjectTree.GetPyData(selected)
+data = self.TypesTree.GetPyData(selected)
 if name == "Properties":
 self.ShowProperties()
 if data == ITEM_DATATYPE:
 self.EditProjectElement(data, self.Controler.ComputeDataTypeName(name))
 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.ProjectTree.GetItemParent(selected)
+item = self.TypesTree.GetItemParent(selected)
-item_type = self.ProjectTree.GetPyData(item)
+item_type = self.TypesTree.GetPyData(item)
 while item_type != ITEM_CONFIGURATION:
-item = self.ProjectTree.GetItemParent(item)
+item = self.TypesTree.GetItemParent(item)
-item_type = self.ProjectTree.GetPyData(item)
+item_type = self.TypesTree.GetPyData(item)
-config_name = self.ProjectTree.GetItemText(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.ProjectTree.GetItemParent(selected)
+item = self.TypesTree.GetItemParent(selected)
-item_type = self.ProjectTree.GetPyData(item)
+item_type = self.TypesTree.GetPyData(item)
 while item_type != ITEM_POU:
-item = self.ProjectTree.GetItemParent(item)
+item = self.TypesTree.GetItemParent(item)
-item_type = self.ProjectTree.GetPyData(item)
+item_type = self.TypesTree.GetPyData(item)
-pou_name = self.ProjectTree.GetItemText(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)
 event.Skip()
-def ProjectTreeItemSelect(self, select_item):
+def TypesTreeItemSelect(self, select_item):
-name = self.ProjectTree.GetItemText(select_item)
+name = self.TypesTree.GetItemText(select_item)
-data = self.ProjectTree.GetPyData(select_item)
+data = self.TypesTree.GetPyData(select_item)
 if data == ITEM_DATATYPE:
 self.EditProjectElement(data, self.Controler.ComputeDataTypeName(name), True)
 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.ProjectTree.GetItemParent(select_item)
+item = self.TypesTree.GetItemParent(select_item)
-item_type = self.ProjectTree.GetPyData(item)
+item_type = self.TypesTree.GetPyData(item)
 while item_type != ITEM_CONFIGURATION:
-item = self.ProjectTree.GetItemParent(item)
+item = self.TypesTree.GetItemParent(item)
-item_type = self.ProjectTree.GetPyData(item)
+item_type = self.TypesTree.GetPyData(item)
-config_name = self.ProjectTree.GetItemText(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.ProjectTree.GetItemParent(select_item)
+item = self.TypesTree.GetItemParent(select_item)
-item_type = self.ProjectTree.GetPyData(item)
+item_type = self.TypesTree.GetPyData(item)
 while item_type != ITEM_POU:
-item = self.ProjectTree.GetItemParent(item)
+item = self.TypesTree.GetItemParent(item)
-item_type = self.ProjectTree.GetPyData(item)
+item_type = self.TypesTree.GetPyData(item)
-pou_name = self.ProjectTree.GetItemText(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)
-def OnProjectTreeLeftUp(self, event):
+def OnTypesTreeLeftUp(self, event):
 if self.SelectedItem is not None:
-self.ProjectTree.SelectItem(self.SelectedItem)
+self.TypesTree.SelectItem(self.SelectedItem)
-self.ProjectTreeItemSelect(self.SelectedItem)
+self.TypesTreeItemSelect(self.SelectedItem)
 wx.CallAfter(self.ResetSelectedItem)
 event.Skip()
-def OnProjectTreeItemSelected(self, event):
+def OnTypesTreeItemSelected(self, event):
-self.ProjectTreeItemSelect(event.GetItem())
+self.TypesTreeItemSelect(event.GetItem())
 event.Skip()
-def OnProjectTreeItemChanging(self, event):
+def OnTypesTreeItemChanging(self, event):
-if self.ProjectTree.GetPyData(event.GetItem()) not in ITEMS_UNEDITABLE and self.SelectedItem is None:
+if self.TypesTree.GetPyData(event.GetItem()) not in ITEMS_UNEDITABLE and self.SelectedItem is None:
 self.SelectedItem = event.GetItem()
 event.Veto()
 else:
 event.Skip()
 def EditProjectElement(self, elementtype, tagname, onlyopened = False):
 openedidx = self.IsOpened(tagname)
 if openedidx is not None:
-old_selected = self.GetPageSelection()
+old_selected = self.TabsOpened.GetSelection()
 if old_selected != openedidx:
 if old_selected >= 0:
-self.GetPage(old_selected).ResetBuffer()
+self.TabsOpened.GetPage(old_selected).ResetBuffer()
-self.SetPageSelection(openedidx)
+self.TabsOpened.SetSelection(openedidx)
-self.GetPage(openedidx).RefreshView()
+self.TabsOpened.GetPage(openedidx).RefreshView()
 self.VariablePanelIndexer.ChangeVariablePanel(tagname)
 self.RefreshPageTitles()
 self.RefreshFileMenu()
 self.RefreshEditMenu()
 self.RefreshToolBar()
 elif not onlyopened:
-if wx.VERSION >= (2, 8, 0):
-if elementtype == ITEM_CONFIGURATION:
-new_window = MDIConfigurationEditor(self, tagname, self, self.Controler)
-elif elementtype == ITEM_RESOURCE:
-new_window = MDIResourceEditor(self, tagname, self, self.Controler)
-elif elementtype in [ITEM_POU, ITEM_TRANSITION, ITEM_ACTION]:
-bodytype = self.Controler.GetEditedElementBodyType(tagname)
-if bodytype == "FBD":
-new_window = MDIViewer(self, tagname, self, self.Controler)
-new_window.GetViewer().RefreshScaling(False)
-elif bodytype == "LD":
-new_window = LD_MDIViewer(self, tagname, self, self.Controler)
-new_window.GetViewer().RefreshScaling(False)
-elif bodytype == "SFC":
-new_window = SFC_MDIViewer(self, tagname, self, self.Controler)
-new_window.GetViewer().RefreshScaling(False)
-else:
-new_window = TextMDIViewer(self, tagname, self, self.Controler)
-viewer = new_window.GetViewer()
-viewer.SetTextSyntax(elementtype)
-if bodytype == "IL":
-viewer.SetKeywords(IL_KEYWORDS)
-else:
-viewer.SetKeywords(ST_KEYWORDS)
-elif elementtype == ITEM_DATATYPE:
-new_window = MDIDataTypeEditor(self, tagname, self, self.Controler)
-new_window.Bind(wx.EVT_ACTIVATE, self.OnPouSelectedChanged)
-new_window.Bind(wx.EVT_CLOSE, self.OnPageClose)
-new_window.Layout()
-else:
-if elementtype == ITEM_CONFIGURATION:
-new_window = ConfigurationEditor(self.TabsOpened, tagname, self, self.Controler)
-self.TabsOpened.AddPage(new_window, "")
-elif elementtype == ITEM_RESOURCE:
-new_window = ResourceEditor(self.TabsOpened, tagname, self, self.Controler)
-self.TabsOpened.AddPage(new_window, "")
-elif elementtype in [ITEM_POU, ITEM_TRANSITION, ITEM_ACTION]:
-bodytype = self.Controler.GetEditedElementBodyType(tagname)
-if bodytype == "FBD":
-new_window = Viewer(self.TabsOpened, tagname, self, self.Controler)
-new_window.RefreshScaling(False)
-elif bodytype == "LD":
-new_window = LD_Viewer(self.TabsOpened, tagname, self, self.Controler)
-new_window.RefreshScaling(False)
-elif bodytype == "SFC":
-new_window = SFC_Viewer(self.TabsOpened, tagname, self, self.Controler)
-new_window.RefreshScaling(False)
-else:
-new_window = TextViewer(self.TabsOpened, tagname, self, self.Controler)
-new_window.SetTextSyntax(elementtype)
-if bodytype == "IL":
-new_window.SetKeywords(IL_KEYWORDS)
-else:
-new_window.SetKeywords(ST_KEYWORDS)
-self.TabsOpened.AddPage(new_window, "")
-elif elementtype == ITEM_DATATYPE:
-new_window = DataTypeEditor(self.TabsOpened, tagname, self, self.Controler)
-self.TabsOpened.AddPage(new_window, "")
 if elementtype == ITEM_CONFIGURATION:
+new_window = ConfigurationEditor(self.TabsOpened, tagname, self, self.Controler)
+self.TabsOpened.AddPage(new_window, "")
 self.VariablePanelIndexer.AddVariablePanel(tagname, "config")
 elif elementtype == ITEM_RESOURCE:
+new_window = ResourceEditor(self.TabsOpened, tagname, self, self.Controler)
+self.TabsOpened.AddPage(new_window, "")
 self.VariablePanelIndexer.AddVariablePanel(tagname, "resource")
 elif elementtype in [ITEM_POU, ITEM_TRANSITION, ITEM_ACTION]:
+bodytype = self.Controler.GetEditedElementBodyType(tagname)
+if bodytype == "FBD":
+new_window = Viewer(self.TabsOpened, tagname, self, self.Controler)
+new_window.RefreshScaling(False)
+elif bodytype == "LD":
+new_window = LD_Viewer(self.TabsOpened, tagname, self, self.Controler)
+new_window.RefreshScaling(False)
+elif bodytype == "SFC":
+new_window = SFC_Viewer(self.TabsOpened, tagname, self, self.Controler)
+new_window.RefreshScaling(False)
+else:
+new_window = TextViewer(self.TabsOpened, tagname, self, self.Controler)
+new_window.SetTextSyntax(elementtype)
+if bodytype == "IL":
+new_window.SetKeywords(IL_KEYWORDS)
+else:
+new_window.SetKeywords(ST_KEYWORDS)
+self.TabsOpened.AddPage(new_window, "")
 words = tagname.split("::")
 self.VariablePanelIndexer.AddVariablePanel(tagname, self.Controler.GetPouType(words[1]))
+elif elementtype == ITEM_DATATYPE:
+new_window = DataTypeEditor(self.TabsOpened, tagname, self, self.Controler)
+self.TabsOpened.AddPage(new_window, "")
 self.VariablePanelIndexer.ChangeVariablePanel(tagname)
 openedidx = self.IsOpened(tagname)
-old_selected = self.GetPageSelection()
+old_selected = self.TabsOpened.GetSelection()
 if old_selected != openedidx:
 if old_selected >= 0:
-self.GetPage(old_selected).ResetBuffer()
+self.TabsOpened.GetPage(old_selected).ResetBuffer()
-for i in xrange(self.GetPageCount()):
+for i in xrange(self.TabsOpened.GetPageCount()):
-window = self.GetPage(i)
+window = self.TabsOpened.GetPage(i)
 if window.GetTagName() == tagname:
-self.SetPageSelection(i)
+self.TabsOpened.SetSelection(i)
 window.RefreshView()
 window.SetFocus()
 self.RefreshPageTitles()
 self.RefreshFileMenu()
 self.RefreshEditMenu()
 self.RefreshToolBar()
-def OnProjectTreeRightUp(self, event):
+def OnTypesTreeRightUp(self, event):
 if wx.Platform == '__WXMSW__':
 item = event.GetItem()
 else:
-item = self.ProjectTree.GetSelection()
+item = self.TypesTree.GetSelection()
-name = self.ProjectTree.GetItemText(item)
+name = self.TypesTree.GetItemText(item)
-type = self.ProjectTree.GetPyData(item)
+type = self.TypesTree.GetPyData(item)
 if type == ITEM_POU:
 menu = wx.Menu(title='')
 if self.Controler.GetPouBodyType(name) == "SFC":
 new_id = wx.NewId()
 AppendMenu(menu, help='', id=new_id, kind=wx.ITEM_NORMAL, text="Add Transition")
 self.PopupMenu(menu)
 elif name == "Transitions":
 menu = wx.Menu(title='')
 new_id = wx.NewId()
 AppendMenu(menu, help='', id=new_id, kind=wx.ITEM_NORMAL, text="Add Transition")
-parent = self.ProjectTree.GetItemParent(item)
+parent = self.TypesTree.GetItemParent(item)
-parent_type = self.ProjectTree.GetPyData(parent)
+parent_type = self.TypesTree.GetPyData(parent)
 while parent_type != ITEM_POU:
-parent = self.ProjectTree.GetItemParent(parent)
+parent = self.TypesTree.GetItemParent(parent)
-parent_type = self.ProjectTree.GetPyData(parent)
+parent_type = self.TypesTree.GetPyData(parent)
-self.Bind(wx.EVT_MENU, self.GenerateAddTransitionFunction(self.ProjectTree.GetItemText(parent)), id=new_id)
+self.Bind(wx.EVT_MENU, self.GenerateAddTransitionFunction(self.TypesTree.GetItemText(parent)), id=new_id)
 self.PopupMenu(menu)
 elif name == "Actions":
 menu = wx.Menu(title='')
 new_id = wx.NewId()
 AppendMenu(menu, help='', id=new_id, kind=wx.ITEM_NORMAL, text="Add Action")
-parent = self.ProjectTree.GetItemParent(item)
+parent = self.TypesTree.GetItemParent(item)
-parent_type = self.ProjectTree.GetPyData(parent)
+parent_type = self.TypesTree.GetPyData(parent)
 while parent_type != ITEM_POU:
-parent = self.ProjectTree.GetItemParent(parent)
+parent = self.TypesTree.GetItemParent(parent)
-parent_type = self.ProjectTree.GetPyData(parent)
+parent_type = self.TypesTree.GetPyData(parent)
-self.Bind(wx.EVT_MENU, self.GenerateAddActionFunction(self.ProjectTree.GetItemText(parent)), id=new_id)
+self.Bind(wx.EVT_MENU, self.GenerateAddActionFunction(self.TypesTree.GetItemText(parent)), id=new_id)
 self.PopupMenu(menu)
 elif name == "Resources":
 menu = wx.Menu(title='')
 new_id = wx.NewId()
 AppendMenu(menu, help='', id=new_id, kind=wx.ITEM_NORMAL, text="Add Resource")
-parent = self.ProjectTree.GetItemParent(item)
+parent = self.TypesTree.GetItemParent(item)
-parent_type = self.ProjectTree.GetPyData(parent)
+parent_type = self.TypesTree.GetPyData(parent)
 while parent_type != ITEM_CONFIGURATION:
-parent = self.ProjectTree.GetItemParent(parent)
+parent = self.TypesTree.GetItemParent(parent)
-parent_type = self.ProjectTree.GetPyData(parent)
+parent_type = self.TypesTree.GetPyData(parent)
-self.Bind(wx.EVT_MENU, self.GenerateAddResourceFunction(self.ProjectTree.GetItemText(parent)), id=new_id)
+self.Bind(wx.EVT_MENU, self.GenerateAddResourceFunction(self.TypesTree.GetItemText(parent)), id=new_id)
 self.PopupMenu(menu)
 event.Skip()
+#-------------------------------------------------------------------------------
+#                         Topology Tree Management Functions
+#-------------------------------------------------------------------------------
+def RefreshInstancesTree(self):
+infos = self.Controler.GetProjectTopology()
+root = self.InstancesTree.GetRootItem()
+if not root.IsOk():
+root = self.InstancesTree.AddRoot(infos["name"])
+self.GenerateInstancesTreeBranch(root, infos)
+self.InstancesTree.Expand(self.InstancesTree.GetRootItem())
+def GenerateInstancesTreeBranch(self, root, infos):
+to_delete = []
+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"])
+self.InstancesTree.SetItemImage(root, self.InstancesTreeImageDict[infos["type"]])
+if wx.VERSION >= (2, 6, 0):
+item, root_cookie = self.InstancesTree.GetFirstChild(root)
+else:
+item, root_cookie = self.InstancesTree.GetFirstChild(root, 0)
+for values in infos["values"]:
+if not item.IsOk():
+item = self.InstancesTree.AppendItem(root, "")
+if wx.Platform != '__WXMSW__':
+item, root_cookie = self.InstancesTree.GetNextChild(root, root_cookie)
+self.GenerateInstancesTreeBranch(item, values)
+item, root_cookie = self.InstancesTree.GetNextChild(root, root_cookie)
+while item.IsOk():
+to_delete.append(item)
+item, root_cookie = self.InstancesTree.GetNextChild(root, root_cookie)
+for item in to_delete:
+self.InstancesTree.Delete(item)
 #-------------------------------------------------------------------------------
 #                          ToolBar Management Functions
 #-------------------------------------------------------------------------------
 if wx.VERSION >= (2, 8, 0):
 self.AUIManager.GetPane("ToolBar").BestSize(ToolBar.GetBestSize())
 self.AUIManager.Update()
 def RefreshToolBar(self):
-selected = self.GetPageSelection()
+selected = self.TabsOpened.GetSelection()
 if selected != -1:
-language = self.Controler.GetEditedElementBodyType(self.GetPage(selected).GetTagName())
+language = self.Controler.GetEditedElementBodyType(self.TabsOpened.GetPage(selected).GetTagName())
 else:
 language = None
 if language is not None and language != self.CurrentLanguage:
 self.ResetToolBar()
 self.CurrentLanguage = language
 #-------------------------------------------------------------------------------
 #                           ToolBar Items Functions
 #-------------------------------------------------------------------------------
 def ResetCurrentMode(self):
-selected = self.GetPageSelection()
+selected = self.TabsOpened.GetSelection()
 if selected != -1:
-window = self.GetPage(selected)
+window = self.TabsOpened.GetPage(selected)
 window.SetMode(MODE_SELECTION)
 if wx.VERSION < (2, 8, 0):
 ToolBar = self.ToolBar
 else:
 ToolBar = self.Panes["ToolBar"]
 else:
 tool = self.Panes["ToolBar"].FindById(id)
 tool.SetToggle(False)
 def OnSelectionTool(self, event):
-selected = self.GetPageSelection()
+selected = self.TabsOpened.GetSelection()
 if selected != -1:
-self.GetPage(selected).SetMode(MODE_SELECTION)
+self.TabsOpened.GetPage(selected).SetMode(MODE_SELECTION)
 event.Skip()
 def OnCommentTool(self, event):
 self.ResetToolToggle(ID_PLCOPENEDITORTOOLBARCOMMENT)
-selected = self.GetPageSelection()
+selected = self.TabsOpened.GetSelection()
 if selected != -1:
-self.GetPage(selected).SetMode(MODE_COMMENT)
+self.TabsOpened.GetPage(selected).SetMode(MODE_COMMENT)
 event.Skip()
 def OnVariableTool(self, event):
 self.ResetToolToggle(ID_PLCOPENEDITORTOOLBARVARIABLE)
-selected = self.GetPageSelection()
+selected = self.TabsOpened.GetSelection()
 if selected != -1:
-self.GetPage(selected).SetMode(MODE_VARIABLE)
+self.TabsOpened.GetPage(selected).SetMode(MODE_VARIABLE)
 event.Skip()
 def OnBlockTool(self, event):
 self.ResetToolToggle(ID_PLCOPENEDITORTOOLBARBLOCK)
-selected = self.GetPageSelection()
+selected = self.TabsOpened.GetSelection()
 if selected != -1:
-self.GetPage(selected).SetMode(MODE_BLOCK)
+self.TabsOpened.GetPage(selected).SetMode(MODE_BLOCK)
 event.Skip()
 def OnConnectionTool(self, event):
 self.ResetToolToggle(ID_PLCOPENEDITORTOOLBARCONNECTION)
-selected = self.GetPageSelection()
+selected = self.TabsOpened.GetSelection()
 if selected != -1:
-self.GetPage(selected).SetMode(MODE_CONNECTION)
+self.TabsOpened.GetPage(selected).SetMode(MODE_CONNECTION)
 event.Skip()
 def OnPowerRailTool(self, event):
 self.ResetToolToggle(ID_PLCOPENEDITORTOOLBARPOWERRAIL)
-selected = self.GetPageSelection()
+selected = self.TabsOpened.GetSelection()
 if selected != -1:
-self.GetPage(selected).SetMode(MODE_POWERRAIL)
+self.TabsOpened.GetPage(selected).SetMode(MODE_POWERRAIL)
 event.Skip()
 def OnRungTool(self, event):
-selected = self.GetPageSelection()
+selected = self.TabsOpened.GetSelection()
 if selected != -1:
-self.GetPage(selected).AddLadderRung()
+self.TabsOpened.GetPage(selected).AddLadderRung()
 event.Skip()
 def OnCoilTool(self, event):
 self.ResetToolToggle(ID_PLCOPENEDITORTOOLBARCOIL)
-selected = self.GetPageSelection()
+selected = self.TabsOpened.GetSelection()
 if selected != -1:
-self.GetPage(selected).SetMode(MODE_COIL)
+self.TabsOpened.GetPage(selected).SetMode(MODE_COIL)
 event.Skip()
 def OnContactTool(self, event):
 if self.DrawingMode == FREEDRAWING_MODE:
 self.ResetToolToggle(ID_PLCOPENEDITORTOOLBARCONTACT)
-selected = self.GetPageSelection()
+selected = self.TabsOpened.GetSelection()
 if selected != -1:
 if self.DrawingMode == FREEDRAWING_MODE:
-self.GetPage(selected).SetMode(MODE_CONTACT)
+self.TabsOpened.GetPage(selected).SetMode(MODE_CONTACT)
 else:
-self.GetPage(selected).AddLadderContact()
+self.TabsOpened.GetPage(selected).AddLadderContact()
 event.Skip()
 def OnBranchTool(self, event):
-selected = self.GetPageSelection()
+selected = self.TabsOpened.GetSelection()
 if selected != -1:
-self.GetPage(selected).AddLadderBranch()
+self.TabsOpened.GetPage(selected).AddLadderBranch()
 event.Skip()
 def OnInitialStepTool(self, event):
 self.ResetToolToggle(ID_PLCOPENEDITORTOOLBARINITIALSTEP)
-selected = self.GetPageSelection()
+selected = self.TabsOpened.GetSelection()
 if selected != -1:
-self.GetPage(selected).SetMode(MODE_INITIALSTEP)
+self.TabsOpened.GetPage(selected).SetMode(MODE_INITIALSTEP)
 event.Skip()
 def OnStepTool(self, event):
 if self.GetDrawingMode() == FREEDRAWING_MODE:
 self.ResetToolToggle(ID_PLCOPENEDITORTOOLBARSTEP)
-selected = self.GetPageSelection()
+selected = self.TabsOpened.GetSelection()
 if selected != -1:
 if self.GetDrawingMode() == FREEDRAWING_MODE:
-self.GetPage(selected).SetMode(MODE_STEP)
+self.TabsOpened.GetPage(selected).SetMode(MODE_STEP)
 else:
-self.GetPage(selected).AddStep()
+self.TabsOpened.GetPage(selected).AddStep()
 event.Skip()
 def OnActionBlockTool(self, event):
 if self.GetDrawingMode() == FREEDRAWING_MODE:
 self.ResetToolToggle(ID_PLCOPENEDITORTOOLBARACTIONBLOCK)
-selected = self.GetPageSelection()
+selected = self.TabsOpened.GetSelection()
 if selected != -1:
 if self.GetDrawingMode() == FREEDRAWING_MODE:
-self.GetPage(selected).SetMode(MODE_ACTION)
+self.TabsOpened.GetPage(selected).SetMode(MODE_ACTION)
 else:
-self.GetPage(selected).AddStepAction()
+self.TabsOpened.GetPage(selected).AddStepAction()
 event.Skip()
 def OnTransitionTool(self, event):
 self.ResetToolToggle(ID_PLCOPENEDITORTOOLBARTRANSITION)
-selected = self.GetPageSelection()
+selected = self.TabsOpened.GetSelection()
 if selected != -1:
-self.GetPage(selected).SetMode(MODE_TRANSITION)
+self.TabsOpened.GetPage(selected).SetMode(MODE_TRANSITION)
 event.Skip()
 def OnDivergenceTool(self, event):
 if self.GetDrawingMode() == FREEDRAWING_MODE:
 self.ResetToolToggle(ID_PLCOPENEDITORTOOLBARDIVERGENCE)
-selected = self.GetPageSelection()
+selected = self.TabsOpened.GetSelection()
 if selected != -1:
 if self.GetDrawingMode() == FREEDRAWING_MODE:
-self.GetPage(selected).SetMode(MODE_DIVERGENCE)
+self.TabsOpened.GetPage(selected).SetMode(MODE_DIVERGENCE)
 else:
-self.GetPage(selected).AddDivergence()
+self.TabsOpened.GetPage(selected).AddDivergence()
 event.Skip()
 def OnJumpTool(self, event):
 if self.GetDrawingMode() == FREEDRAWING_MODE:
 self.ResetToolToggle(ID_PLCOPENEDITORTOOLBARJUMP)
-selected = self.GetPageSelection()
+selected = self.TabsOpened.GetSelection()
 if selected != -1:
 if self.GetDrawingMode() == FREEDRAWING_MODE:
-self.GetPage(selected).SetMode(MODE_JUMP)
+self.TabsOpened.GetPage(selected).SetMode(MODE_JUMP)
 else:
-self.GetPage(selected).AddJump()
+self.TabsOpened.GetPage(selected).AddJump()
 event.Skip()
 #-------------------------------------------------------------------------------
 #                         Add Project Elements Functions
 dialog.SetDataTypeNames(self.Controler.GetProjectDataTypeNames())
 if dialog.ShowModal() == wx.ID_OK:
 self.Controler.ProjectAddDataType(dialog.GetValue())
 self.RefreshTitle()
 self.RefreshEditMenu()
-self.RefreshProjectTree()
+self.RefreshTypesTree()
 dialog.Destroy()
 event.Skip()
 def GenerateAddPouFunction(self, pou_type):
 def OnAddPouMenu(event):
 if dialog.ShowModal() == wx.ID_OK:
 values = dialog.GetValues()
 self.Controler.ProjectAddPou(values["pouName"], values["pouType"], values["language"])
 self.RefreshTitle()
 self.RefreshEditMenu()
-self.RefreshProjectTree()
+self.RefreshTypesTree()
 dialog.Destroy()
 event.Skip()
 return OnAddPouMenu
 def GenerateAddTransitionFunction(self, pou_name):
 if dialog.ShowModal() == wx.ID_OK:
 values = dialog.GetValues()
 self.Controler.ProjectAddPouTransition(pou_name, values["transitionName"], values["language"])
 self.RefreshTitle()
 self.RefreshEditMenu()
-self.RefreshProjectTree()
+self.RefreshTypesTree()
 dialog.Destroy()
 event.Skip()
 return OnAddTransitionMenu
 def GenerateAddActionFunction(self, pou_name):
 if dialog.ShowModal() == wx.ID_OK:
 values = dialog.GetValues()
 self.Controler.ProjectAddPouAction(pou_name, values["actionName"], values["language"])
 self.RefreshTitle()
 self.RefreshEditMenu()
-self.RefreshProjectTree()
+self.RefreshTypesTree()
 dialog.Destroy()
 event.Skip()
 return OnAddActionMenu
 def OnAddConfigurationMenu(self, event):
 if dialog.ShowModal() == wx.ID_OK:
 value = dialog.GetValue()
 self.Controler.ProjectAddConfiguration(value)
 self.RefreshTitle()
 self.RefreshEditMenu()
-self.RefreshProjectTree()
+self.RefreshTypesTree()
 dialog.Destroy()
 event.Skip()
 def GenerateAddResourceFunction(self, config_name):
 def OnAddResourceMenu(event):
 if dialog.ShowModal() == wx.ID_OK:
 value = dialog.GetValue()
 self.Controler.ProjectAddConfigurationResource(config_name, value)
 self.RefreshTitle()
 self.RefreshEditMenu()
-self.RefreshProjectTree()
+self.RefreshTypesTree()
 dialog.Destroy()
 event.Skip()
 return OnAddResourceMenu
 #-------------------------------------------------------------------------------
 #                        Remove Project Elements Functions
 #-------------------------------------------------------------------------------
 def OnRemoveDataTypeMenu(self, event):
-selected = self.ProjectTree.GetSelection()
+selected = self.TypesTree.GetSelection()
-if self.ProjectTree.GetPyData(selected) == ITEM_DATATYPE:
+if self.TypesTree.GetPyData(selected) == ITEM_DATATYPE:
-name = self.ProjectTree.GetItemText(selected)
+name = self.TypesTree.GetItemText(selected)
 if not self.Controler.DataTypeIsUsed(name):
 self.Controler.ProjectRemoveDataType(name)
 tagname = self.Controler.ComputeDataTypeName(name)
 idx = self.IsOpened(tagname)
 if idx is not None:
-self.DeletePage(idx)
+self.TabsOpened.DeletePage(idx)
 self.RefreshTitle()
 self.RefreshEditMenu()
-self.RefreshProjectTree()
+self.RefreshTypesTree()
 self.RefreshToolBar()
 else:
 message = wx.MessageDialog(self, "%s is used by one or more POUs. It can't be removed!"%selected, "Error", wx.OK|wx.ICON_ERROR)
 message.ShowModal()
 message.Destroy()
 event.Skip()
 def OnRemovePouMenu(self, event):
-selected = self.ProjectTree.GetSelection()
+selected = self.TypesTree.GetSelection()
-if self.ProjectTree.GetPyData(selected) == ITEM_POU:
+if self.TypesTree.GetPyData(selected) == ITEM_POU:
-name = self.ProjectTree.GetItemText(selected)
+name = self.TypesTree.GetItemText(selected)
 if not self.Controler.PouIsUsed(name):
 self.Controler.ProjectRemovePou(name)
 tagname = self.Controler.ComputePouName(name)
 idx = self.IsOpened(tagname)
 if idx is not None:
 self.VariablePanelIndexer.RemoveVariablePanel(tagname)
-self.DeletePage(idx)
+self.TabsOpened.DeletePage(idx)
 self.RefreshTitle()
 self.RefreshEditMenu()
-self.RefreshProjectTree()
+self.RefreshTypesTree()
 self.RefreshToolBar()
 else:
 message = wx.MessageDialog(self, "%s is used by one or more POUs. It can't be removed!"%selected, "Error", wx.OK|wx.ICON_ERROR)
 message.ShowModal()
 message.Destroy()
 event.Skip()
 def OnRemoveConfigurationMenu(self, event):
-selected = self.ProjectTree.GetSelection()
+selected = self.TypesTree.GetSelection()
-if self.ProjectTree.GetPyData(selected) == ITEM_CONFIGURATION:
+if self.TypesTree.GetPyData(selected) == ITEM_CONFIGURATION:
-name = self.ProjectTree.GetItemText(selected)
+name = self.TypesTree.GetItemText(selected)
 self.Controler.ProjectRemoveConfiguration(name)
 tagname = self.Controler.ComputeConfigurationName(name)
 idx = self.IsOpened(tagname)
 if idx is not None:
 self.VariablePanelIndexer.RemoveVariablePanel(tagname)
-self.DeletePage(idx)
+self.TabsOpened.DeletePage(idx)
 self.RefreshTitle()
 self.RefreshEditMenu()
-self.RefreshProjectTree()
+self.RefreshTypesTree()
 event.Skip()
 def OnRemoveTransitionMenu(self, event):
-selected = self.ProjectTree.GetSelection()
+selected = self.TypesTree.GetSelection()
-if self.ProjectTree.GetPyData(selected) == ITEM_TRANSITION:
+if self.TypesTree.GetPyData(selected) == ITEM_TRANSITION:
-transition = self.ProjectTree.GetItemText(selected)
+transition = self.TypesTree.GetItemText(selected)
-item = self.ProjectTree.GetItemParent(selected)
+item = self.TypesTree.GetItemParent(selected)
-item_type = self.ProjectTree.GetPyData(item)
+item_type = self.TypesTree.GetPyData(item)
 while item_type != ITEM_POU:
-item = self.ProjectTree.GetItemParent(item)
+item = self.TypesTree.GetItemParent(item)
-item_type = self.ProjectTree.GetPyData(item)
+item_type = self.TypesTree.GetPyData(item)
-pou_name = self.ProjectTree.GetItemText(item)
+pou_name = self.TypesTree.GetItemText(item)
 self.Controler.ProjectRemovePouTransition(pou_name, transition)
 tagname = self.Controler.ComputePouTransitionName(pou_name, transition)
 idx = self.IsOpened(tagname)
 if idx is not None:
 self.VariablePanelIndexer.RemoveVariablePanel(tagname)
-self.DeletePage(idx)
+self.TabsOpened.DeletePage(idx)
 self.RefreshTitle()
 self.RefreshEditMenu()
-self.RefreshProjectTree()
+self.RefreshTypesTree()
 event.Skip()
 def OnRemoveActionMenu(self, event):
-selected = self.ProjectTree.GetSelection()
+selected = self.TypesTree.GetSelection()
-if self.ProjectTree.GetPyData(selected) == ITEM_ACTION:
+if self.TypesTree.GetPyData(selected) == ITEM_ACTION:
-action = self.ProjectTree.GetItemText(selected)
+action = self.TypesTree.GetItemText(selected)
-item = self.ProjectTree.GetItemParent(selected)
+item = self.TypesTree.GetItemParent(selected)
-item_type = self.ProjectTree.GetPyData(item)
+item_type = self.TypesTree.GetPyData(item)
 while item_type != ITEM_POU:
-item = self.ProjectTree.GetItemParent(item)
+item = self.TypesTree.GetItemParent(item)
-item_type = self.ProjectTree.GetPyData(item)
+item_type = self.TypesTree.GetPyData(item)
-pou_name = self.ProjectTree.GetItemText(item)
+pou_name = self.TypesTree.GetItemText(item)
 self.Controler.ProjectRemovePouAction(pou_name, action)
 tagname = self.Controler.ComputePouActionName(pou_name, action)
 idx = self.IsOpened(tagname)
 if idx is not None:
 self.VariablePanelIndexer.RemoveVariablePanel(tagname)
-self.DeletePage(idx)
+self.TabsOpened.DeletePage(idx)
 self.RefreshTitle()
 self.RefreshEditMenu()
-self.RefreshProjectTree()
+self.RefreshTypesTree()
 event.Skip()
 def OnRemoveResourceMenu(self, event):
-selected = self.ProjectTree.GetSelection()
+selected = self.TypesTree.GetSelection()
-if self.ProjectTree.GetPyData(selected) == ITEM_RESOURCE:
+if self.TypesTree.GetPyData(selected) == ITEM_RESOURCE:
-resource = self.ProjectTree.GetItemText(selected)
+resource = self.TypesTree.GetItemText(selected)
-item = self.ProjectTree.GetItemParent(selected)
+item = self.TypesTree.GetItemParent(selected)
-item_type = self.ProjectTree.GetPyData(item)
+item_type = self.TypesTree.GetPyData(item)
 while item_type != ITEM_CONFIGURATION:
-item = self.ProjectTree.GetItemParent(item)
+item = self.TypesTree.GetItemParent(item)
-item_type = self.ProjectTree.GetPyData(item)
+item_type = self.TypesTree.GetPyData(item)
-config_name = self.ProjectTree.GetItemText(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.DeletePage(idx)
+self.TabsOpened.DeletePage(idx)
 self.RefreshTitle()
 self.RefreshEditMenu()
-self.RefreshProjectTree()
+self.RefreshTypesTree()
 event.Skip()
 def OnPLCOpenEditorMenu(self, event):
 wx.MessageBox("No documentation available.\nComing soon.")
 #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])
+self.SelectTypesTreeItem(infos[0])
 if infos[1] == "name":
 self.Errors.append(infos[0])
-self.RefreshProjectTree()
+self.RefreshTypesTree()
-self.ProjectTree.Unselect()
+self.TypesTree.Unselect()
 elif infos[1] == "variable":
 self.VariablePanelIndexer.AddVariableError(infos)
 else:
-selected = self.GetPageSelection()
+selected = self.TabsOpened.GetSelection()
 if selected != -1:
-viewer = self.GetPage(selected)
+viewer = self.TabsOpened.GetPage(selected)
 viewer.AddShownError(infos[1:], start, end)
 viewer.RefreshView()
 def ClearErrors(self):
 self.Errors = []
-self.RefreshProjectTree()
+self.RefreshTypesTree()
 self.VariablePanelIndexer.ClearErrors()
-for i in xrange(self.GetPageCount()):
+for i in xrange(self.TabsOpened.GetPageCount()):
-viewer = self.GetPage(i)
+viewer = self.TabsOpened.GetPage(i)
 viewer.ClearErrors()
 current_num = 0
 def GetNewNum():
 global current_num

changeset 235	7b58a3b5b6ec
parent 231	fc2d6cbb8b39
child 239	d12779e971bd