plcopeneditor_history: comparison PLCOpenEditor.py

equal deleted inserted replaced

-:389f2046e495
+:d12779e971bd
 CWD = os.path.split(os.path.realpath(__file__))[0]
 [ID_PLCOPENEDITOR, ID_PLCOPENEDITORTREENOTEBOOK,
 ID_PLCOPENEDITORTYPESTREE, ID_PLCOPENEDITORINSTANCESTREE,
 ID_PLCOPENEDITORMAINSPLITTER, ID_PLCOPENEDITORSECONDSPLITTER,
-ID_PLCOPENEDITOREDITORPANEL, ID_PLCOPENEDITORTABSOPENED,
+ID_PLCOPENEDITORTHIRDSPLITTER, ID_PLCOPENEDITORLIBRARYPANEL,
+ID_PLCOPENEDITORLIBRARYTREE, ID_PLCOPENEDITORLIBRARYCOMMENT,
+ID_PLCOPENEDITORTABSOPENED, ID_PLCOPENEDITORTABSOPENED,
 ID_PLCOPENEDITORTOOLBAR, ID_PLCOPENEDITORDEFAULTTOOLBAR,
 ID_PLCOPENEDITORSFCTOOLBAR, ID_PLCOPENEDITORFBDTOOLBAR,
 ID_PLCOPENEDITORLDTOOLBAR,
-] = [wx.NewId() for _init_ctrls in range(13)]
+] = [wx.NewId() for _init_ctrls in range(17)]
 [ID_PLCOPENEDITORFILEMENUGENERATE,
 ] = [wx.NewId() for _init_coll_FileMenu_Items in range(1)]
 [ID_PLCOPENEDITOREDITMENUADDDATATYPE, ID_PLCOPENEDITOREDITMENUADDFUNCTION,
 self._init_coll_MenuBar_Menus(self.MenuBar)
 self._init_coll_FileMenu_Items(self.FileMenu)
 self._init_coll_EditMenu_Items(self.EditMenu)
 self._init_coll_HelpMenu_Items(self.HelpMenu)
+def _init_coll_MainLibrarySizer_Items(self, parent):
+parent.AddWindow(self.LibraryTree, 0, border=0, flag=wx.GROW)
+parent.AddSizer(self.LibraryComment, 0, border=0, flag=wx.GROW)
+def _init_coll_MainLibrarySizer_Growables(self, parent):
+parent.AddGrowableCol(0)
+parent.AddGrowableRow(0)
+def _init_sizers(self):
+self.MainLibrarySizer = wx.FlexGridSizer(cols=1, hgap=0, rows=2, vgap=0)
+self._init_coll_MainLibrarySizer_Growables(self.MainLibrarySizer)
+self._init_coll_MainLibrarySizer_Items(self.MainLibrarySizer)
+self.LibraryPanel.SetSizer(self.MainLibrarySizer)
 def _init_ctrls(self, prnt):
 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')
 size=wx.Size(0, 0), style=wx.SP_3D)
 self.SecondSplitter.SetMinimumPaneSize(1)
 self.MainSplitter.SplitVertically(self.TreeNoteBook, self.SecondSplitter, 200)
+self.VariablePanelIndexer = VariablePanelIndexer(self.SecondSplitter, self, self.Controler)
+self.ThirdSplitter = wx.SplitterWindow(id=ID_PLCOPENEDITORTHIRDSPLITTER,
+name='ThirdSplitter', parent=self.SecondSplitter, point=wx.Point(0, 0),
+size=wx.Size(0, 0), style=wx.SP_3D)
+self.ThirdSplitter.SetMinimumPaneSize(1)
+self.SecondSplitter.SplitHorizontally(self.ThirdSplitter, self.VariablePanelIndexer, -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.LibraryPanel = wx.Panel(id=ID_PLCOPENEDITORLIBRARYPANEL,
+name='LibraryPanel', parent=self.ThirdSplitter, pos=wx.Point(0,
+0), size=wx.Size(0, 0), style=wx.SUNKEN_BORDER)
+self.ThirdSplitter.SplitVertically(self.TabsOpened, self.LibraryPanel, -250)
+else:
+self.VariablePanelIndexer = VariablePanelIndexer(self, self, self.Controler)
+self.AUIManager.AddPane(self.VariablePanelIndexer, wx.aui.AuiPaneInfo().Caption("Variables").Bottom().Layer(0).BestSize(wx.Size(800, 200)).CloseButton(False))
 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.LibraryPanel = wx.Panel(id=ID_PLCOPENEDITORLIBRARYPANEL,
-self.VariablePanelIndexer = VariablePanelIndexer(self.SecondSplitter, self, self.Controler)
+name='LibraryPanel', parent=self, pos=wx.Point(0,
+0), size=wx.Size(0, 0), style=0)
-self.SecondSplitter.SplitHorizontally(self.TabsOpened, self.VariablePanelIndexer, -200)
+self.AUIManager.AddPane(self.LibraryPanel, wx.aui.AuiPaneInfo().Caption("Library").Right().Layer(0).BestSize(wx.Size(250, 400)).CloseButton(False))
-else:
-self.VariablePanelIndexer = VariablePanelIndexer(self, self, self.Controler)
-self.AUIManager.AddPane(self.VariablePanelIndexer, wx.aui.AuiPaneInfo().Caption("Variables").Bottom().Layer(0).BestSize(wx.Size(800, 200)).CloseButton(False))
 self.AUIManager.Update()
+if wx.Platform == '__WXMSW__':
+treestyle = wx.TR_HAS_BUTTONS|wx.TR_SINGLE|wx.SUNKEN_BORDER
+else:
+treestyle = wx.TR_HAS_BUTTONS|wx.TR_HIDE_ROOT|wx.TR_SINGLE|wx.SUNKEN_BORDER
+self.LibraryTree = wx.TreeCtrl(id=ID_PLCOPENEDITORLIBRARYTREE,
+name='LibraryTree', parent=self.LibraryPanel,
+pos=wx.Point(0, 0), size=wx.Size(0, 0),
+style=treestyle)
+self.Bind(wx.EVT_TREE_SEL_CHANGED, self.OnLibraryTreeItemSelected,
+id=ID_PLCOPENEDITORLIBRARYTREE)
+self.Bind(wx.EVT_TREE_BEGIN_DRAG, self.OnLibraryTreeBeginDrag,
+id=ID_PLCOPENEDITORLIBRARYTREE)
+self.LibraryComment = wx.TextCtrl(id=ID_PLCOPENEDITORLIBRARYCOMMENT,
+name='LibraryComment', parent=self.LibraryPanel,
+pos=wx.Point(0, 0), size=wx.Size(0, 60),
+style=wx.TE_READONLY|wx.TE_MULTILINE)
+self._init_sizers()
 def __init__(self, parent, controler = None, fileOpen = None):
 self.ModeSolo = controler == None
 if self.ModeSolo:
 self.Controler = PLCControler()
 self.PageSetupData.SetMarginBottomRight(wx.Point(10, 20))
 if not self.ModeSolo or fileOpen is not None:
 self.RefreshTypesTree()
 self.RefreshInstancesTree()
+self.RefreshLibraryTree()
 self.RefreshFileMenu()
 self.RefreshEditMenu()
 self.RefreshTitle()
 self.RefreshToolBar()
 self.RefreshTitle()
 self.RefreshFileMenu()
 self.RefreshEditMenu()
 self.RefreshTypesTree()
 self.RefreshInstancesTree()
+self.RefreshLibraryTree()
 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)
 self.DeleteAllPages()
 self.VariablePanelIndexer.RemoveAllPanels()
 self.Controler.OpenXMLFile(filepath)
 self.RefreshTypesTree()
 self.RefreshInstancesTree()
+self.RefreshLibraryTree()
 self.RefreshTitle()
 self.RefreshFileMenu()
 self.RefreshEditMenu()
 self.RefreshToolBar()
 dialog.Destroy()
 window.RefreshView()
 self.VariablePanelIndexer.RefreshVariablePanel(window.GetTagName())
 self.RefreshTitle()
 self.RefreshEditMenu()
 self.RefreshTypesTree()
+self.RefreshInstancesTree()
+self.RefreshLibraryTree()
 event.Skip()
 def OnRedoMenu(self, event):
 self.Controler.LoadNext()
 idxs = range(self.TabsOpened.GetPageCount())
 window.RefreshView()
 self.VariablePanelIndexer.RefreshVariablePanel(window.GetTagName())
 self.RefreshTitle()
 self.RefreshEditMenu()
 self.RefreshTypesTree()
+self.RefreshInstancesTree()
+self.RefreshLibraryTree()
 event.Skip()
 def OnCutMenu(self, event):
 control = self.FindFocus()
 if isinstance(control, Viewer):
 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)
 self.SetPageBitmap(idx, GenerateBitmap("DATATYPE"))
 self.TabsOpened.SetPageText(idx, "-".join(words[1:]))
 #-------------------------------------------------------------------------------
-#                         Project Tree Management Functions
+#                         Types Tree Management Functions
 #-------------------------------------------------------------------------------
 def RefreshTypesTree(self):
 infos = self.Controler.GetProjectInfos()
 root = self.TypesTree.GetRootItem()
 if not root.IsOk():
 root = self.TypesTree.AddRoot(infos["name"])
 self.GenerateTypesTreeBranch(root, infos)
-self.TypesTree.Expand(self.TypesTree.GetRootItem())
+self.TypesTree.Expand(root)
 def GenerateTypesTreeBranch(self, root, infos, topology=False):
 to_delete = []
 self.TypesTree.SetItemText(root, infos["name"])
 self.TypesTree.SetPyData(root, infos["type"])
 self.PopupMenu(menu)
 event.Skip()
 #-------------------------------------------------------------------------------
-#                         Topology Tree Management Functions
+#                         Instances 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())
+self.InstancesTree.Expand(root)
 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"]))
 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)
+#-------------------------------------------------------------------------------
+#                         Library Tree Management Functions
+#-------------------------------------------------------------------------------
+def RefreshLibraryTree(self):
+to_delete = []
+blocktypes = self.Controler.GetBlockTypes()
+if wx.Platform == '__WXMSW__':
+root = self.LibraryTree.AddRoot("Block Types")
+self.TypeTree.SetPyData(root, {"type" : CATEGORY})
+else:
+root = self.LibraryTree.AddRoot("")
+if wx.VERSION >= (2, 6, 0):
+category_item, root_cookie = self.LibraryTree.GetFirstChild(root)
+else:
+category_item, root_cookie = self.LibraryTree.GetFirstChild(root, 0)
+for category in blocktypes:
+print category["name"]
+if not category_item.IsOk():
+category_item = self.LibraryTree.AppendItem(root, category["name"])
+if wx.Platform != '__WXMSW__':
+category_item, root_cookie = self.LibraryTree.GetNextChild(root, root_cookie)
+else:
+self.LibraryTree.SetItemText(category_item, category["name"])
+self.LibraryTree.SetPyData(category_item, {"type" : CATEGORY})
+if wx.VERSION >= (2, 6, 0):
+blocktype_item, category_cookie = self.LibraryTree.GetFirstChild(category_item)
+else:
+blocktype_item, category_cookie = self.LibraryTree.GetFirstChild(category_item, 0)
+for blocktype in category["list"]:
+if not blocktype_item.IsOk():
+blocktype_item = self.LibraryTree.AppendItem(category_item, blocktype["name"])
+if wx.Platform != '__WXMSW__':
+blocktype_item, category_cookie = self.LibraryTree.GetNextChild(category_item, category_cookie)
+else:
+self.LibraryTree.SetItemText(blocktype_item, blocktype["name"])
+self.LibraryTree.SetPyData(blocktype_item, {"type" : BLOCK, "block_type" : blocktype["type"], "inputs" : tuple([type for name, type, modifier in blocktype["inputs"]])})
+blocktype_item, category_cookie = self.LibraryTree.GetNextChild(category_item, category_cookie)
+while blocktype_item.IsOk():
+to_delete.append(blocktype_item)
+blocktype_item, category_cookie = self.LibraryTree.GetNextChild(category_item, category_cookie)
+category_item, root_cookie = self.LibraryTree.GetNextChild(root, root_cookie)
+while category_item.IsOk():
+to_delete.append(category_item)
+category_item, root_cookie = self.LibraryTree.GetNextChild(root, root_cookie)
+for item in to_delete:
+self.LibraryTree.Delete(item)
+if wx.Platform == '__WXMSW__':
+self.LibraryTree.Expand(root)
+def OnLibraryTreeItemSelected(self, event):
+selected = event.GetItem()
+pydata = self.LibraryTree.GetPyData(selected)
+if pydata["type"] != CATEGORY:
+blocktype = self.Controler.GetBlockType(self.LibraryTree.GetItemText(selected), pydata["inputs"])
+if blocktype:
+self.LibraryComment.SetValue(blocktype["comment"])
+else:
+self.LibraryComment.SetValue("")
+else:
+self.LibraryComment.SetValue("")
+event.Skip()
+def OnLibraryTreeBeginDrag(self, event):
+selected = event.GetItem()
+pydata = self.LibraryTree.GetPyData(selected)
+if selected is not None and pydata["type"] == BLOCK:
+data = wx.TextDataObject(str((self.LibraryTree.GetItemText(selected),
+pydata["block_type"], "", pydata["inputs"])))
+dragSource = wx.DropSource(self.LibraryTree)
+dragSource.SetData(data)
+dragSource.DoDragDrop()
 #-------------------------------------------------------------------------------
 #                          ToolBar Management Functions
 #-------------------------------------------------------------------------------
 values = dialog.GetValues()
 self.Controler.ProjectAddPou(values["pouName"], values["pouType"], values["language"])
 self.RefreshTitle()
 self.RefreshEditMenu()
 self.RefreshTypesTree()
+self.RefreshLibraryTree()
 dialog.Destroy()
 event.Skip()
 return OnAddPouMenu
 def GenerateAddTransitionFunction(self, pou_name):
 values = dialog.GetValues()
 self.Controler.ProjectAddPouTransition(pou_name, values["transitionName"], values["language"])
 self.RefreshTitle()
 self.RefreshEditMenu()
 self.RefreshTypesTree()
 dialog.Destroy()
 event.Skip()
 return OnAddTransitionMenu
 def GenerateAddActionFunction(self, pou_name):
 def OnAddActionMenu(event):
 value = dialog.GetValue()
 self.Controler.ProjectAddConfiguration(value)
 self.RefreshTitle()
 self.RefreshEditMenu()
 self.RefreshTypesTree()
+self.RefreshInstancesTree()
 dialog.Destroy()
 event.Skip()
 def GenerateAddResourceFunction(self, config_name):
 def OnAddResourceMenu(event):
 value = dialog.GetValue()
 self.Controler.ProjectAddConfigurationResource(config_name, value)
 self.RefreshTitle()
 self.RefreshEditMenu()
 self.RefreshTypesTree()
+self.RefreshInstancesTree()
 dialog.Destroy()
 event.Skip()
 return OnAddResourceMenu
 self.VariablePanelIndexer.RemoveVariablePanel(tagname)
 self.TabsOpened.DeletePage(idx)
 self.RefreshTitle()
 self.RefreshEditMenu()
 self.RefreshTypesTree()
+self.RefreshInstancesTree()
+self.RefreshLibraryTree()
 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.TypesTree.GetSelection()
-if self.TypesTree.GetPyData(selected) == ITEM_CONFIGURATION:
-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.TabsOpened.DeletePage(idx)
-self.RefreshTitle()
-self.RefreshEditMenu()
-self.RefreshTypesTree()
 event.Skip()
 def OnRemoveTransitionMenu(self, event):
 selected = self.TypesTree.GetSelection()
 if self.TypesTree.GetPyData(selected) == ITEM_TRANSITION:
 self.RefreshTitle()
 self.RefreshEditMenu()
 self.RefreshTypesTree()
 event.Skip()
+def OnRemoveConfigurationMenu(self, event):
+selected = self.TypesTree.GetSelection()
+if self.TypesTree.GetPyData(selected) == ITEM_CONFIGURATION:
+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.TabsOpened.DeletePage(idx)
+self.RefreshTitle()
+self.RefreshEditMenu()
+self.RefreshTypesTree()
+self.RefreshInstancesTree()
+event.Skip()
 def OnRemoveResourceMenu(self, event):
 selected = self.TypesTree.GetSelection()
 if self.TypesTree.GetPyData(selected) == ITEM_RESOURCE:
 resource = self.TypesTree.GetItemText(selected)
 item = self.TypesTree.GetItemParent(selected)
 self.VariablePanelIndexer.RemoveVariablePanel(tagname)
 self.TabsOpened.DeletePage(idx)
 self.RefreshTitle()
 self.RefreshEditMenu()
 self.RefreshTypesTree()
+self.RefreshInstancesTree()
 event.Skip()
 def OnPLCOpenEditorMenu(self, event):
 wx.MessageBox("No documentation available.\nComing soon.")
 #event.Skip()
 new_row["Class"] = self.Filter
 self.Values.append(new_row)
 self.SaveValues()
 self.RefreshValues()
 self.RefreshButtons()
+self.ParentWindow.RefreshInstancesTree()
 event.Skip()
 def OnDeleteButton(self, event):
 row = self.Table.GetRow(self.VariablesGrid.GetGridCursorRow())
 self.Values.remove(row)
 self.SaveValues()
 self.RefreshValues()
 self.RefreshButtons()
+self.ParentWindow.RefreshInstancesTree()
 event.Skip()
 def OnUpButton(self, event):
 self.MoveValue(self.VariablesGrid.GetGridCursorRow(), -1)
 self.RefreshButtons()
+self.ParentWindow.RefreshInstancesTree()
 event.Skip()
 def OnDownButton(self, event):
 self.MoveValue(self.VariablesGrid.GetGridCursorRow(), 1)
 self.RefreshButtons()
+self.ParentWindow.RefreshInstancesTree()
 event.Skip()
 def OnVariablesGridCellChange(self, event):
 row, col = event.GetRow(), event.GetCol()
 colname = self.Table.GetColLabelValue(col)
 self.Controler.UpdateEditedElementUsedVariable(self.TagName, old_value, value)
 self.Controler.BufferProject()
 self.ParentWindow.RefreshEditor(variablepanel = False)
 self.ParentWindow.RefreshTitle()
 self.ParentWindow.RefreshEditMenu()
+self.ParentWindow.RefreshInstancesTree()
 event.Skip()
 else:
 self.SaveValues()
 if colname == "Class":
 self.Table.ResetView(self.VariablesGrid)
+self.ParentWindow.RefreshInstancesTree()
 event.Skip()
 def OnVariablesGridEditorShown(self, event):
 row, col = event.GetRow(), event.GetCol()
 if self.Table.GetColLabelValue(col) == "Type":

changeset 239	d12779e971bd
parent 235	7b58a3b5b6ec
child 240	714000906db1