plcopeneditor_history: comparison PLCOpenEditor.py

equal deleted inserted replaced

-:af07b091bbee
+:0a324a874981
 from DataTypeEditor import *
 from PLCControler import *
 from plcopen.structures import LOCATIONDATATYPES
 # Define PLCOpenEditor controls id
-[ID_PLCOPENEDITOR, ID_PLCOPENEDITORTREENOTEBOOK,
+[ID_PLCOPENEDITOR, ID_PLCOPENEDITORLEFTNOTEBOOK,
+ID_PLCOPENEDITORBOTTOMNOTEBOOK, ID_PLCOPENEDITORRIGHTNOTEBOOK,
 ID_PLCOPENEDITORTYPESTREE, ID_PLCOPENEDITORINSTANCESTREE,
 ID_PLCOPENEDITORMAINSPLITTER, ID_PLCOPENEDITORSECONDSPLITTER,
 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(17)]
+] = [wx.NewId() for _init_ctrls in range(19)]
 # Define PLCOpenEditor FileMenu extra items id
 [ID_PLCOPENEDITORFILEMENUGENERATE,
 ] = [wx.NewId() for _init_coll_FileMenu_Items in range(1)]
 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 check_function is None or not check_function(self.Controler, name):
 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)
 self.ShowErrorMessage(_("\"%s\" is used by one or more POUs. It can't be removed!")%name)
 return DeleteElementFunction
 #-------------------------------------------------------------------------------
-#                            PLCOpenEditor Main Class
+#                              IDEFrame Base Class
 #-------------------------------------------------------------------------------
 UNEDITABLE_NAMES_DICT = dict([(_(name), name) for name in UNEDITABLE_NAMES])
-class PLCOpenEditor(wx.Frame):
+class IDEFrame(wx.Frame):
 # Compatibility function for wx versions < 2.6
 if wx.VERSION < (2, 6, 0):
 def Bind(self, event, function, id = None):
 if id is not None:
 else:
 event(self, function)
 def _init_coll_MenuBar_Menus(self, parent):
 parent.Append(menu=self.FileMenu, title=_(u'File'))
-if not self.Debug:
+parent.Append(menu=self.EditMenu, title=_(u'Edit'))
-parent.Append(menu=self.EditMenu, title=_(u'Edit'))
 parent.Append(menu=self.DisplayMenu, title=_(u'Display'))
 parent.Append(menu=self.HelpMenu, title=_(u'Help'))
 def _init_coll_FileMenu_Items(self, parent):
-if self.ModeSolo:
+pass
-AppendMenu(parent, help='', id=wx.ID_NEW,
-kind=wx.ITEM_NORMAL, text=_(u'New\tCTRL+N'))
-AppendMenu(parent, help='', id=wx.ID_OPEN,
-kind=wx.ITEM_NORMAL, text=_(u'Open\tCTRL+O'))
-AppendMenu(parent, help='', id=wx.ID_CLOSE,
-kind=wx.ITEM_NORMAL, text=_(u'Close Tab\tCTRL+W'))
-if self.ModeSolo:
-AppendMenu(parent, help='', id=wx.ID_CLOSE_ALL,
-kind=wx.ITEM_NORMAL, text=_(u'Close Project'))
-parent.AppendSeparator()
-if not self.Debug:
-AppendMenu(parent, help='', id=wx.ID_SAVE,
-kind=wx.ITEM_NORMAL, text=_(u'Save\tCTRL+S'))
-if self.ModeSolo:
-AppendMenu(parent, help='', id=wx.ID_SAVEAS,
-kind=wx.ITEM_NORMAL, text=_(u'Save As...\tCTRL+SHIFT+S'))
-AppendMenu(parent, help='', id=ID_PLCOPENEDITORFILEMENUGENERATE,
-kind=wx.ITEM_NORMAL, text=_(u'Generate Program\tCTRL+G'))
-parent.AppendSeparator()
-AppendMenu(parent, help='', id=wx.ID_PAGE_SETUP,
-kind=wx.ITEM_NORMAL, text=_(u'Page Setup'))
-AppendMenu(parent, help='', id=wx.ID_PREVIEW,
-kind=wx.ITEM_NORMAL, text=_(u'Preview'))
-AppendMenu(parent, help='', id=wx.ID_PRINT,
-kind=wx.ITEM_NORMAL, text=_(u'Print'))
-if not self.Debug:
-parent.AppendSeparator()
-AppendMenu(parent, help='', id=wx.ID_PROPERTIES,
-kind=wx.ITEM_NORMAL, text=_(u'Properties'))
-parent.AppendSeparator()
-if self.ModeSolo:
-AppendMenu(parent, help='', id=wx.ID_EXIT,
-kind=wx.ITEM_NORMAL, text=_(u'Quit\tCTRL+Q'))
-else:
-AppendMenu(parent, help='', id=wx.ID_STOP,
-kind=wx.ITEM_NORMAL, text=_(u'Close\tCTRL+Q'))
-if self.ModeSolo:
-self.Bind(wx.EVT_MENU, self.OnNewProjectMenu, id=wx.ID_NEW)
-self.Bind(wx.EVT_MENU, self.OnOpenProjectMenu, id=wx.ID_OPEN)
-self.Bind(wx.EVT_MENU, self.OnCloseTabMenu, id=wx.ID_CLOSE)
-if self.ModeSolo:
-self.Bind(wx.EVT_MENU, self.OnCloseProjectMenu, id=wx.ID_CLOSE_ALL)
-if not self.Debug:
-self.Bind(wx.EVT_MENU, self.OnSaveProjectMenu, id=wx.ID_SAVE)
-if self.ModeSolo:
-self.Bind(wx.EVT_MENU, self.OnSaveProjectAsMenu, id=wx.ID_SAVEAS)
-self.Bind(wx.EVT_MENU, self.OnGenerateProgramMenu,
-id=ID_PLCOPENEDITORFILEMENUGENERATE)
-self.Bind(wx.EVT_MENU, self.OnPageSetupMenu, id=wx.ID_PAGE_SETUP)
-self.Bind(wx.EVT_MENU, self.OnPreviewMenu, id=wx.ID_PREVIEW)
-self.Bind(wx.EVT_MENU, self.OnPrintMenu, id=wx.ID_PRINT)
-if not self.Debug:
-self.Bind(wx.EVT_MENU, self.OnPropertiesMenu, id=wx.ID_PROPERTIES)
-if self.ModeSolo:
-self.Bind(wx.EVT_MENU, self.OnQuitMenu, id=wx.ID_EXIT)
-else:
-self.Bind(wx.EVT_MENU, self.OnQuitMenu, id=wx.ID_STOP)
 def _init_coll_EditMenu_Items(self, parent):
 AppendMenu(parent, help='', id=wx.ID_UNDO,
 kind=wx.ITEM_NORMAL, text=_(u'Undo\tCTRL+Z'))
 AppendMenu(parent, help='', id=wx.ID_REDO,
 self.Bind(wx.EVT_MENU, self.OnDeleteMenu, id=wx.ID_DELETE)
 def _init_coll_DisplayMenu_Items(self, parent):
 AppendMenu(parent, help='', id=wx.ID_REFRESH,
 kind=wx.ITEM_NORMAL, text=_(u'Refresh\tF5'))
-if not self.Debug and not self.ModeSolo:
+if self.EnableDebug:
 AppendMenu(parent, help='', id=wx.ID_CLEAR,
 kind=wx.ITEM_NORMAL, text=_(u'Clear Errors\tCTRL+K'))
 parent.AppendSeparator()
 zoommenu = wx.Menu(title='')
 parent.AppendMenu(wx.ID_ZOOM_FIT, _("Zoom"), zoommenu)
 new_id = wx.NewId()
 AppendMenu(zoommenu, help='', id=new_id,
 kind=wx.ITEM_RADIO, text=str(int(round(value * 100))) + "%")
 self.Bind(wx.EVT_MENU, self.GenerateZoomFunction(idx), id=new_id)
 self.Bind(wx.EVT_MENU, self.OnRefreshMenu, id=wx.ID_REFRESH)
-if not self.Debug and not self.ModeSolo:
+if self.EnableDebug:
 self.Bind(wx.EVT_MENU, self.OnClearErrorsMenu, id=wx.ID_CLEAR)
 def _init_coll_HelpMenu_Items(self, parent):
-AppendMenu(parent, help='', id=wx.ID_HELP,
+pass
-kind=wx.ITEM_NORMAL, text=_(u'PLCOpenEditor\tF1'))
-#AppendMenu(parent, help='', id=wx.ID_HELP_CONTENTS,
-#      kind=wx.ITEM_NORMAL, text=u'PLCOpen\tF2')
-#AppendMenu(parent, help='', id=wx.ID_HELP_CONTEXT,
-#      kind=wx.ITEM_NORMAL, text=u'IEC 61131-3\tF3')
-if self.ModeSolo:
-AppendMenu(parent, help='', id=wx.ID_ABOUT,
-kind=wx.ITEM_NORMAL, text=_(u'About'))
-self.Bind(wx.EVT_MENU, self.OnPLCOpenEditorMenu, id=wx.ID_HELP)
-#self.Bind(wx.EVT_MENU, self.OnPLCOpenMenu, id=wx.ID_HELP_CONTENTS)
-self.Bind(wx.EVT_MENU, self.OnAboutMenu, id=wx.ID_ABOUT)
 def _init_utils(self):
 self.MenuBar = wx.MenuBar()
 self.FileMenu = wx.Menu(title='')
-if not self.Debug:
+self.EditMenu = wx.Menu(title='')
-self.EditMenu = wx.Menu(title='')
 self.DisplayMenu = wx.Menu(title='')
 self.HelpMenu = wx.Menu(title='')
 self._init_coll_MenuBar_Menus(self.MenuBar)
 self._init_coll_FileMenu_Items(self.FileMenu)
-if not self.Debug:
+self._init_coll_EditMenu_Items(self.EditMenu)
-self._init_coll_EditMenu_Items(self.EditMenu)
 self._init_coll_DisplayMenu_Items(self.DisplayMenu)
 self._init_coll_HelpMenu_Items(self.HelpMenu)
 def _init_coll_MainLibrarySizer_Items(self, parent):
 parent.AddWindow(self.LibraryTree, 0, border=0, flag=wx.GROW)
 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',
+wx.Frame.__init__(self, id=ID_PLCOPENEDITOR, name='IDEFrame',
 parent=prnt, pos=wx.DefaultPosition, size=wx.Size(1000, 600),
-style=wx.DEFAULT_FRAME_STYLE, title=_(u'PLCOpenEditor'))
+style=wx.DEFAULT_FRAME_STYLE)
 self._init_utils()
 self.SetClientSize(wx.Size(1000, 600))
 self.SetMenuBar(self.MenuBar)
-self.Bind(wx.EVT_CLOSE, self.OnCloseFrame)
+self.TabsImageList = wx.ImageList(31, 16)
+self.TabsImageListIndexes = {}
+#-----------------------------------------------------------------------
+#                          Creating main structure
+#-----------------------------------------------------------------------
 if USE_AUI:
 self.AUIManager = wx.aui.AuiManager(self)
 self.AUIManager.SetDockSizeConstraint(0.5, 0.5)
 self.Panes = {}
-self.TreeNoteBook = wx.aui.AuiNotebook(self)
+self.LeftNoteBook = wx.aui.AuiNotebook(self, ID_PLCOPENEDITORLEFTNOTEBOOK,
-self.AUIManager.AddPane(self.TreeNoteBook, wx.aui.AuiPaneInfo().Caption(_("Project")).Left().Layer(1).BestSize(wx.Size(200, 500)).CloseButton(False))
+style=wx.aui.AUI_NB_TOP|wx.aui.AUI_NB_TAB_SPLIT|wx.aui.AUI_NB_TAB_MOVE|
+wx.aui.AUI_NB_SCROLL_BUTTONS|wx.aui.AUI_NB_TAB_EXTERNAL_MOVE)
+self.AUIManager.AddPane(self.LeftNoteBook,
+wx.aui.AuiPaneInfo().Caption(_("Project")).Left().Layer(1).
+BestSize(wx.Size(300, 500)).CloseButton(False))
+self.BottomNoteBook = wx.aui.AuiNotebook(self, ID_PLCOPENEDITORBOTTOMNOTEBOOK,
+style=wx.aui.AUI_NB_TOP|wx.aui.AUI_NB_TAB_SPLIT|wx.aui.AUI_NB_TAB_MOVE|
+wx.aui.AUI_NB_SCROLL_BUTTONS|wx.aui.AUI_NB_TAB_EXTERNAL_MOVE)
+self.AUIManager.AddPane(self.BottomNoteBook,
+wx.aui.AuiPaneInfo().Bottom().Layer(0).
+BestSize(wx.Size(800, 200)).CloseButton(False))
+self.RightNoteBook = wx.aui.AuiNotebook(self, ID_PLCOPENEDITORRIGHTNOTEBOOK,
+style=wx.aui.AUI_NB_TOP|wx.aui.AUI_NB_TAB_SPLIT|wx.aui.AUI_NB_TAB_MOVE|
+wx.aui.AUI_NB_SCROLL_BUTTONS|wx.aui.AUI_NB_TAB_EXTERNAL_MOVE)
+self.AUIManager.AddPane(self.RightNoteBook,
+wx.aui.AuiPaneInfo().Right().Layer(0).
+BestSize(wx.Size(250, 400)).CloseButton(False))
+self.TabsOpened = wx.aui.AuiNotebook(self, ID_PLCOPENEDITORTABSOPENED,
+style=wx.aui.AUI_NB_DEFAULT_STYLE|wx.aui.AUI_NB_WINDOWLIST_BUTTON)
+self.TabsOpened.Bind(wx.aui.EVT_AUINOTEBOOK_PAGE_CHANGED,
+self.OnPouSelectedChanged)
+self.TabsOpened.Bind(wx.aui.EVT_AUINOTEBOOK_PAGE_CLOSE,
+self.OnPageClose)
+self.TabsOpened.Bind(wx.aui.EVT_AUINOTEBOOK_END_DRAG,
+self.OnPageDragged)
+self.AUIManager.AddPane(self.TabsOpened, wx.aui.AuiPaneInfo().CentrePane())
 else:
 self.MainSplitter = wx.SplitterWindow(id=ID_PLCOPENEDITORMAINSPLITTER,
 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.TreeNoteBook = wx.Notebook(id=ID_PLCOPENEDITORTREENOTEBOOK,
+self.LeftNoteBook = wx.Notebook(id=ID_PLCOPENEDITORLEFTNOTEBOOK,
-name='TreeNoteBook', parent=self.MainSplitter, pos=wx.Point(0,
+name='LeftNoteBook', parent=self.MainSplitter, pos=wx.Point(0,
+0), size=wx.Size(0, 0), style=0)
+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.LeftNoteBook, self.SecondSplitter, 200)
+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.BottomNoteBook = wx.Notebook(id=ID_PLCOPENEDITORBOTTOMNOTEBOOK,
+name='BottomNoteBook', parent=self.SecondSplitter, pos=wx.Point(0,
 0), size=wx.Size(0, 0), style=0)
-typestreestyle = wx.TR_HAS_BUTTONS|wx.TR_SINGLE|wx.SUNKEN_BORDER
+self.SecondSplitter.SplitHorizontally(self.ThirdSplitter, self.BottomNoteBook, -200)
-if not self.Debug:
-typestreestyle |= wx.TR_EDIT_LABELS
+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.TabsOpened.SetImageList(self.TabsImageList)
+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)
+self.RightNoteBook = wx.Notebook(id=ID_PLCOPENEDITORRIGHTNOTEBOOK,
+name='RightNoteBook', parent=self.ThirdSplitter, pos=wx.Point(0,
+0), size=wx.Size(0, 0), style=0)
+self.ThirdSplitter.SplitVertically(self.TabsOpened, self.RightNoteBook, -250)
+#-----------------------------------------------------------------------
+#                       Creating PLCopen Project tree
+#-----------------------------------------------------------------------
 self.TypesTree = wx.TreeCtrl(id=ID_PLCOPENEDITORTYPESTREE,
-name='TypesTree', parent=self.TreeNoteBook,
+name='TypesTree', parent=self.LeftNoteBook,
 pos=wx.Point(0, 0), size=wx.Size(0, 0),
-style=typestreestyle)
+style=wx.TR_HAS_BUTTONS|wx.TR_SINGLE|wx.SUNKEN_BORDER|wx.TR_EDIT_LABELS)
-if not self.Debug:
+if wx.Platform == '__WXMSW__':
-if wx.Platform == '__WXMSW__':
+self.Bind(wx.EVT_TREE_ITEM_RIGHT_CLICK, self.OnTypesTreeRightUp,
-self.Bind(wx.EVT_TREE_ITEM_RIGHT_CLICK, self.OnTypesTreeRightUp,
+id=ID_PLCOPENEDITORTYPESTREE)
-id=ID_PLCOPENEDITORTYPESTREE)
+self.Bind(wx.EVT_TREE_SEL_CHANGED, self.OnTypesTreeItemSelected,
-self.Bind(wx.EVT_TREE_SEL_CHANGED, self.OnTypesTreeItemSelected,
+id=ID_PLCOPENEDITORTYPESTREE)
-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:
-if wx.VERSION >= (2, 6, 0):
+wx.EVT_RIGHT_UP(self.TypesTree, self.OnTypesTreeRightUp)
-self.TypesTree.Bind(wx.EVT_RIGHT_UP, self.OnTypesTreeRightUp)
+wx.EVT_LEFT_UP(self.TypesTree, self.OnTypesTreeLeftUp)
-self.TypesTree.Bind(wx.EVT_LEFT_UP, self.OnTypesTreeLeftUp)
+self.Bind(wx.EVT_TREE_SEL_CHANGING, self.OnTypesTreeItemChanging,
-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,
+self.Bind(wx.EVT_TREE_BEGIN_DRAG, self.OnTypesTreeBeginDrag,
 id=ID_PLCOPENEDITORTYPESTREE)
-self.Bind(wx.EVT_TREE_END_LABEL_EDIT, self.OnTypesTreeItemEndEdit,
+self.Bind(wx.EVT_TREE_BEGIN_LABEL_EDIT, self.OnTypesTreeItemBeginEdit,
 id=ID_PLCOPENEDITORTYPESTREE)
-self.Bind(wx.EVT_TREE_ITEM_ACTIVATED, self.OnTypesTreeItemActivated,
+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.LeftNoteBook.AddPage(self.TypesTree, _("Types"))
+#-----------------------------------------------------------------------
+#                       Creating PLCopen Project tree
+#-----------------------------------------------------------------------
 self.InstancesTree = wx.TreeCtrl(id=ID_PLCOPENEDITORINSTANCESTREE,
-name='InstancesTree', parent=self.TreeNoteBook,
+name='InstancesTree', parent=self.LeftNoteBook,
 pos=wx.Point(0, 0), size=wx.Size(0, 0),
 style=wx.TR_HAS_BUTTONS|wx.TR_SINGLE|wx.SUNKEN_BORDER)
+if self.EnableDebug:
-self.TabsImageList = wx.ImageList(31, 16)
-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.Bind(wx.EVT_TREE_BEGIN_DRAG, self.OnInstancesTreeBeginDrag,
 id=ID_PLCOPENEDITORINSTANCESTREE)
 self.Bind(wx.EVT_TREE_ITEM_ACTIVATED, self.OnInstancesTreeItemActivated,
 id=ID_PLCOPENEDITORINSTANCESTREE)
+self.LeftNoteBook.AddPage(self.InstancesTree, _("Instances"))
-self.TreeNoteBook.AddPage(self.InstancesTree, _("Instances"))
-self.TreeNoteBook.AddPage(self.TypesTree, _("Types"))
+#-----------------------------------------------------------------------
+#                            Creating Tool Bar
-if USE_AUI:
+#-----------------------------------------------------------------------
-self.TabsOpened = wx.aui.AuiNotebook(self)
-self.TabsOpened.Bind(wx.aui.EVT_AUINOTEBOOK_PAGE_CHANGED,
+if USE_AUI:
-self.OnPouSelectedChanged)
+ToolBar = wx.ToolBar(self, ID_PLCOPENEDITORTOOLBAR, wx.DefaultPosition, wx.DefaultSize,
-self.TabsOpened.Bind(wx.aui.EVT_AUINOTEBOOK_PAGE_CLOSE,
+wx.TB_FLAT | wx.TB_NODIVIDER | wx.NO_BORDER)
-self.OnPageClose)
+ToolBar.SetToolBitmapSize(wx.Size(25, 25))
-self.TabsOpened.Bind(wx.aui.EVT_AUINOTEBOOK_END_DRAG,
+ToolBar.AddRadioTool(ID_PLCOPENEDITORTOOLBARSELECTION,
-self.OnPageDragged)
+wx.Bitmap(os.path.join(CWD, 'Images', 'select.png')), wx.NullBitmap, _("Select an object"))
-self.AUIManager.AddPane(self.TabsOpened, wx.aui.AuiPaneInfo().CentrePane())
+ToolBar.Realize()
+self.Panes["ToolBar"] = ToolBar
-self.DebugVariablePanel = DebugVariablePanel(self, self.Controler)
+self.AUIManager.AddPane(ToolBar, wx.aui.AuiPaneInfo().
-self.AUIManager.AddPane(self.DebugVariablePanel, wx.aui.AuiPaneInfo().Caption(_("Variables")).Right().Layer(0).BestSize(wx.Size(250, 600)).CloseButton(False))
+Name("ToolBar").Caption(_("Toolbar")).
-else:
+ToolbarPane().Top().
-self.SecondSplitter = wx.SplitterWindow(id=ID_PLCOPENEDITORSECONDSPLITTER,
+LeftDockable(False).RightDockable(False))
-name='SecondSplitter', parent=self.MainSplitter, point=wx.Point(0, 0),
+else:
-size=wx.Size(0, 0), style=wx.SP_3D)
+self.ToolBar = self.CreateToolBar(wx.TB_HORIZONTAL|wx.TB_FLAT|wx.NO_BORDER,
-self.SecondSplitter.SetMinimumPaneSize(1)
+ID_PLCOPENEDITORTOOLBAR, 'ToolBar')
+self.ToolBar.SetToolBitmapSize(wx.Size(25, 25))
-self.MainSplitter.SplitVertically(self.TreeNoteBook, self.SecondSplitter, 200)
+self.ToolBar.AddRadioTool(ID_PLCOPENEDITORTOOLBARSELECTION,
+wx.Bitmap(os.path.join(CWD, 'Images', 'select.png')), wx.NullBitmap, _("Select an object"))
-self.TabsOpened = wx.Notebook(id=ID_PLCOPENEDITORTABSOPENED,
+self.ToolBar.Realize()
-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)
-self.DebugVariablePanel = DebugVariablePanel(self.SecondSplitter, self.Controler)
-self.SecondSplitter.SplitVertically(self.TabsOpened, self.DebugVariablePanel, -250)
-else:
-self.TreeNoteBook.AddPage(self.TypesTree, _("Types"))
-self.TreeNoteBook.AddPage(self.InstancesTree, _("Instances"))
-if USE_AUI:
-ToolBar = wx.ToolBar(self, ID_PLCOPENEDITORTOOLBAR, wx.DefaultPosition, wx.DefaultSize,
-wx.TB_FLAT | wx.TB_NODIVIDER | wx.NO_BORDER)
-ToolBar.SetToolBitmapSize(wx.Size(25, 25))
-ToolBar.AddRadioTool(ID_PLCOPENEDITORTOOLBARSELECTION,
-wx.Bitmap(os.path.join(CWD, 'Images', 'select.png')), wx.NullBitmap, _("Select an object"))
-ToolBar.Realize()
-self.Panes["ToolBar"] = ToolBar
-self.AUIManager.AddPane(ToolBar, wx.aui.AuiPaneInfo().
-Name("ToolBar").Caption(_("Toolbar")).
-ToolbarPane().Top().
-LeftDockable(False).RightDockable(False))
-else:
-self.ToolBar = self.CreateToolBar(wx.TB_HORIZONTAL|wx.TB_FLAT|wx.NO_BORDER,
-ID_PLCOPENEDITORTOOLBAR, 'ToolBar')
-self.ToolBar.SetToolBitmapSize(wx.Size(25, 25))
-self.ToolBar.AddRadioTool(ID_PLCOPENEDITORTOOLBARSELECTION,
-wx.Bitmap(os.path.join(CWD, 'Images', 'select.png')), wx.NullBitmap, _("Select an object"))
-self.ToolBar.Realize()
 self.Bind(wx.EVT_TOOL, self.OnSelectionTool,
 id=ID_PLCOPENEDITORTOOLBARSELECTION)
-if USE_AUI:
+self.VariablePanelIndexer = VariablePanelIndexer(self.BottomNoteBook, self)
-self.VariablePanelIndexer = VariablePanelIndexer(self, self, self.Controler)
+self.BottomNoteBook.AddPage(self.VariablePanelIndexer, _("Variables"))
-self.AUIManager.AddPane(self.VariablePanelIndexer, wx.aui.AuiPaneInfo().Caption(_("Variables")).Bottom().Layer(0).BestSize(wx.Size(800, 200)).CloseButton(False))
+self.LibraryPanel = wx.Panel(id=ID_PLCOPENEDITORLIBRARYPANEL,
-self.TabsOpened = wx.aui.AuiNotebook(self)
+name='LibraryPanel', parent=self.RightNoteBook, pos=wx.Point(0,
-self.TabsOpened.Bind(wx.aui.EVT_AUINOTEBOOK_PAGE_CHANGED,
+0), size=wx.Size(0, 0), style=0)
-self.OnPouSelectedChanged)
+self.RightNoteBook.AddPage(self.LibraryPanel, _("Library"))
-self.TabsOpened.Bind(wx.aui.EVT_AUINOTEBOOK_PAGE_CLOSE,
-self.OnPageClose)
+if wx.Platform == '__WXMSW__':
-self.TabsOpened.Bind(wx.aui.EVT_AUINOTEBOOK_END_DRAG,
+librarytreestyle = wx.TR_HAS_BUTTONS|wx.TR_SINGLE|wx.SUNKEN_BORDER
-self.OnPageDragged)
+else:
-self.AUIManager.AddPane(self.TabsOpened, wx.aui.AuiPaneInfo().CentrePane().MinSize(wx.Size(0, 0)))
+librarytreestyle = wx.TR_HAS_BUTTONS|wx.TR_HIDE_ROOT|wx.TR_SINGLE|wx.SUNKEN_BORDER
+self.LibraryTree = wx.TreeCtrl(id=ID_PLCOPENEDITORLIBRARYTREE,
-self.LibraryPanel = wx.Panel(id=ID_PLCOPENEDITORLIBRARYPANEL,
+name='LibraryTree', parent=self.LibraryPanel,
-name='LibraryPanel', parent=self, pos=wx.Point(0,
+pos=wx.Point(0, 0), size=wx.Size(0, 0),
-0), size=wx.Size(0, 0), style=0)
+style=librarytreestyle)
-self.AUIManager.AddPane(self.LibraryPanel, wx.aui.AuiPaneInfo().Caption(_("Library")).Right().Layer(0).BestSize(wx.Size(250, 400)).CloseButton(False))
+self.Bind(wx.EVT_TREE_SEL_CHANGED, self.OnLibraryTreeItemSelected,
-else:
+id=ID_PLCOPENEDITORLIBRARYTREE)
-self.SecondSplitter = wx.SplitterWindow(id=ID_PLCOPENEDITORSECONDSPLITTER,
+self.Bind(wx.EVT_TREE_BEGIN_DRAG, self.OnLibraryTreeBeginDrag,
-name='SecondSplitter', parent=self.MainSplitter, point=wx.Point(0, 0),
+id=ID_PLCOPENEDITORLIBRARYTREE)
-size=wx.Size(0, 0), style=wx.SP_3D)
-self.SecondSplitter.SetMinimumPaneSize(1)
+self.LibraryComment = wx.TextCtrl(id=ID_PLCOPENEDITORLIBRARYCOMMENT,
+name='LibraryComment', parent=self.LibraryPanel,
-self.MainSplitter.SplitVertically(self.TreeNoteBook, self.SecondSplitter, 200)
+pos=wx.Point(0, 0), size=wx.Size(0, 60),
+style=wx.TE_READONLY|wx.TE_MULTILINE)
-self.VariablePanelIndexer = VariablePanelIndexer(self.SecondSplitter, self, self.Controler)
+self._init_sizers()
-self.ThirdSplitter = wx.SplitterWindow(id=ID_PLCOPENEDITORTHIRDSPLITTER,
-name='ThirdSplitter', parent=self.SecondSplitter, point=wx.Point(0, 0),
+if self.EnableDebug:
-size=wx.Size(0, 0), style=wx.SP_3D)
+self.DebugVariablePanel = DebugVariablePanel(self.RightNoteBook, self.Controler)
-self.ThirdSplitter.SetMinimumPaneSize(1)
+self.RightNoteBook.AddPage(self.DebugVariablePanel, _("Debugger"))
-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.TabsOpened.SetImageList(self.TabsImageList)
-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)
-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)
-if wx.Platform == '__WXMSW__':
-librarytreestyle = wx.TR_HAS_BUTTONS|wx.TR_SINGLE|wx.SUNKEN_BORDER
-else:
-librarytreestyle = 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=librarytreestyle)
-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()
 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):
+def __init__(self, parent, enable_debug = False):
-# Variable indicating that PLCOpenEditor was opened with a defined controler
+self.Controler = None
-self.ModeSolo = controler == None
+self.EnableDebug = enable_debug
-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)
-# Define PLCOpenEditor icon
-self.SetIcon(wx.Icon(os.path.join(CWD,"Images", "poe.ico"),wx.BITMAP_TYPE_ICO))
 # Define Tree item icon list
 self.TreeImageList = wx.ImageList(16, 16)
 self.TreeImageDict = {}
 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
+self.SetRefreshFunctions()
-if not self.ModeSolo or fileOpen is not None:
-self._Refresh(TYPESTREE, INSTANCESTREE, LIBRARYTREE)
+self.Maximize()
-self._Refresh(TITLE, TOOLBAR, FILEMENU, EDITMENU, DISPLAYMENU)
 #-------------------------------------------------------------------------------
 #                               General Functions
 #-------------------------------------------------------------------------------
+def SetRefreshFunctions(self):
+self.RefreshFunctions = {
+TITLE : self.RefreshTitle,
+TOOLBAR : self.RefreshToolBar,
+FILEMENU : self.RefreshFileMenu,
+EDITMENU : self.RefreshEditMenu,
+DISPLAYMENU : self.RefreshDisplayMenu,
+TYPESTREE : self.RefreshTypesTree,
+INSTANCESTREE : self.RefreshInstancesTree,
+LIBRARYTREE : self.RefreshLibraryTree,
+SCALING : self.RefreshScaling}
 ## Call PLCOpenEditor refresh functions.
 #  @param elements List of elements to refresh.
 def _Refresh(self, *elements):
 for element in elements:
-self.RefreshFunctions[element](self)
+self.RefreshFunctions[element]()
 ## 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:
+window = self.TabsOpened.GetPage(selected)
-tagname = self.TabsOpened.GetPage(selected).GetTagName()
+if not window.IsDebugging():
-self.VariablePanelIndexer.RemoveVariablePanel(tagname)
+self.VariablePanelIndexer.RemoveVariablePanel(window.GetTagName())
 # 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:
+window = self.TabsOpened.GetPage(selected)
-tagname = self.TabsOpened.GetPage(new_index).GetTagName()
+if not window.IsDebugging():
-self.VariablePanelIndexer.ChangeVariablePanel(tagname)
+self.VariablePanelIndexer.ChangeVariablePanel(window.GetTagName())
 # Refresh all window elements that have changed
 self._Refresh(TITLE, TOOLBAR, FILEMENU, EDITMENU, DISPLAYMENU)
 wx.CallAfter(self.RefreshTabCtrlEvent)
 event.Skip()
 self.RefreshEditMenu()
 def GetDrawingMode(self):
 return self.DrawingMode
-def RefreshTitle(self):
-name = _("PLCOpenEditor")
-if self.Debug:
-name += _(" (Debug)")
-if self.Controler.HasOpenedProject() > 0:
-self.SetTitle("%s - %s"%(name, self.Controler.GetFilename()))
-else:
-self.SetTitle(name)
 def RefreshScaling(self):
 for i in xrange(self.TabsOpened.GetPageCount()):
 editor = self.TabsOpened.GetPage(i)
 editor.RefreshScaling()
 def ShowProperties(self):
-old_values = self.Controler.GetProjectProperties(self.Debug)
+old_values = self.Controler.GetProjectProperties()
 dialog = ProjectDialog(self)
 dialog.SetValues(old_values)
 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._Refresh(TITLE, TOOLBAR, FILEMENU, EDITMENU, DISPLAYMENU,
 TYPESTREE, INSTANCESTREE, SCALING)
 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 self.CheckSaveBeforeClosing():
-event.Skip()
-else:
-event.Veto()
 #-------------------------------------------------------------------------------
 #                            Notebook Unified Functions
 #-------------------------------------------------------------------------------
 #-------------------------------------------------------------------------------
 #                            File Menu Functions
 #-------------------------------------------------------------------------------
 def RefreshFileMenu(self):
-if self.Controler.HasOpenedProject():
+pass
-selected = self.TabsOpened.GetSelection()
-if selected >= 0:
-graphic_viewer = isinstance(self.TabsOpened.GetPage(selected), Viewer)
-else:
-graphic_viewer = False
-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:
-self.FileMenu.Enable(wx.ID_PREVIEW, False)
-self.FileMenu.Enable(wx.ID_PRINT, False)
-else:
-self.FileMenu.Enable(wx.ID_CLOSE, False)
-self.FileMenu.Enable(wx.ID_PREVIEW, False)
-self.FileMenu.Enable(wx.ID_PRINT, False)
-self.FileMenu.Enable(wx.ID_PAGE_SETUP, True)
-if not self.Debug:
-self.FileMenu.Enable(wx.ID_SAVE, True)
-self.FileMenu.Enable(wx.ID_PROPERTIES, True)
-if self.ModeSolo:
-self.FileMenu.Enable(wx.ID_CLOSE_ALL, True)
-self.FileMenu.Enable(wx.ID_SAVEAS, True)
-self.FileMenu.Enable(ID_PLCOPENEDITORFILEMENUGENERATE, True)
-else:
-self.FileMenu.Enable(wx.ID_CLOSE, False)
-self.FileMenu.Enable(wx.ID_PAGE_SETUP, False)
-self.FileMenu.Enable(wx.ID_PREVIEW, False)
-self.FileMenu.Enable(wx.ID_PRINT, False)
-if not self.Debug:
-self.FileMenu.Enable(wx.ID_SAVE, False)
-self.FileMenu.Enable(wx.ID_PROPERTIES, False)
-if self.ModeSolo:
-self.FileMenu.Enable(wx.ID_CLOSE_ALL, False)
-self.FileMenu.Enable(wx.ID_SAVEAS, False)
-self.FileMenu.Enable(ID_PLCOPENEDITORFILEMENUGENERATE, False)
-def OnNewProjectMenu(self, event):
-dialog = ProjectDialog(self)
-if dialog.ShowModal() == wx.ID_OK:
-properties = dialog.GetValues()
-self.Controler.CreateNewProject(properties)
-self._Refresh(TITLE, FILEMENU, EDITMENU, TYPESTREE, INSTANCESTREE,
-LIBRARYTREE)
-event.Skip()
-def OnOpenProjectMenu(self, event):
-if not self.CheckSaveBeforeClosing():
-return
-filepath = self.Controler.GetFilePath()
-if filepath != "":
-directory = os.path.dirname(filepath)
-else:
-directory = os.getcwd()
-dialog = wx.FileDialog(self, _("Choose a file"), directory, "",  _("PLCOpen files (*.xml)|*.xml|All files|*.*"), wx.OPEN)
-if dialog.ShowModal() == wx.ID_OK:
-filepath = dialog.GetPath()
-if os.path.isfile(filepath):
-self.DeleteAllPages()
-self.VariablePanelIndexer.RemoveAllPanels()
-self.Controler.OpenXMLFile(filepath)
-self._Refresh(TYPESTREE, INSTANCESTREE, LIBRARYTREE)
-self._Refresh(TITLE, TOOLBAR, FILEMENU, EDITMENU)
-dialog.Destroy()
-event.Skip()
 def OnCloseTabMenu(self, event):
 selected = self.TabsOpened.GetSelection()
 if selected >= 0:
-if not self.Debug:
+window = self.TabsOpened.GetPage(selected)
-tagname = self.TabsOpened.GetPage(selected).GetTagName()
+if not window.IsDebugging():
-self.VariablePanelIndexer.RemoveVariablePanel(tagname)
+self.VariablePanelIndexer.RemoveVariablePanel(window.GetTagName())
 self.TabsOpened.DeletePage(selected)
 if self.TabsOpened.GetPageCount() > 0:
 new_index = min(selected, self.TabsOpened.GetPageCount() - 1)
 self.TabsOpened.SetSelection(new_index)
-if not self.Debug:
+window = self.TabsOpened.GetPage(new_index)
-tagname = self.TabsOpened.GetPage(new_index).GetTagName()
+if not window.IsDebugging():
-self.VariablePanelIndexer.ChangeVariablePanel(tagname)
+self.VariablePanelIndexer.ChangeVariablePanel(window.GetTagName())
 self._Refresh(TOOLBAR, FILEMENU, EDITMENU)
 event.Skip()
-def OnCloseProjectMenu(self, event):
-if not self.CheckSaveBeforeClosing():
-return
-self.DeleteAllPages()
-self.VariablePanelIndexer.RemoveAllPanels()
-self.TypesTree.DeleteAllItems()
-self.InstancesTree.DeleteAllItems()
-self.Controler.Reset()
-self._Refresh(TITLE, TOOLBAR, FILEMENU, EDITMENU)
-event.Skip()
-def OnSaveProjectMenu(self, event):
-if not self.ModeSolo and getattr(self, "_onsave", None) != None:
-self._onsave()
-else:
-self.SaveProject()
-event.Skip()
-def OnSaveProjectAsMenu(self, event):
-self.SaveProjectAs()
-event.Skip()
-def OnGenerateProgramMenu(self, event):
-dialog = wx.FileDialog(self, _("Choose a file"), os.getcwd(), self.Controler.GetProgramFilePath(),  _("ST files (*.st)|*.st|All files|*.*"), wx.SAVE|wx.CHANGE_DIR)
-if dialog.ShowModal() == wx.ID_OK:
-filepath = dialog.GetPath()
-message_text = ""
-header, icon = _("Done"), wx.ICON_INFORMATION
-if os.path.isdir(os.path.dirname(filepath)):
-program, errors, warnings = self.Controler.GenerateProgram(filepath)
-message_text += "".join([_("warning: %s\n") for warning in warnings])
-if len(errors) > 0:
-message_text += "".join([_("error: %s\n") for warning in warnings])
-message_text += _("Can't generate program to file %s!")%filepath
-header, icon = _("Error"), wx.ICON_ERROR
-else:
-message_text += _("Program was successfully generated!")
-else:
-message_text += _("\"%s\" is not a valid folder!")%os.path.dirname(filepath)
-header, icon = _("Error"), wx.ICON_ERROR
-message = wx.MessageDialog(self, message_text, header, wx.OK|icon)
-message.ShowModal()
-message.Destroy()
-dialog.Destroy()
-event.Skip()
-def SaveProject(self):
-result = self.Controler.SaveXMLFile()
-if not result:
-self.SaveProjectAs()
-else:
-self.RefreshTitle()
-def SaveProjectAs(self):
-filepath = self.Controler.GetFilePath()
-if filepath != "":
-directory, filename = os.path.split(filepath)
-else:
-directory, filename = os.getcwd(), "%(projectName)s.xml"%self.Controler.GetProjectProperties(self.Debug)
-dialog = wx.FileDialog(self, _("Choose a file"), directory, filename,  _("PLCOpen files (*.xml)|*.xml|All files|*.*"), wx.SAVE|wx.OVERWRITE_PROMPT)
-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:
-self.ShowErrorMessage(_("Can't save project to file %s!")%filepath)
-else:
-self.ShowErrorMessage(_("\"%s\" is not a valid folder!")%os.path.dirname(filepath))
-self.RefreshTitle()
-dialog.Destroy()
 def OnPageSetupMenu(self, event):
 dialog = wx.PageSetupDialog(self, self.PageSetupData)
 if dialog.ShowModal() == wx.ID_OK:
 self.PageSetupData = wx.PageSetupDialogData(dialog.GetPageSetupData())
 event.Skip()
 def OnPreviewMenu(self, event):
 selected = self.TabsOpened.GetSelection()
 if selected != -1:
+window = self.TabsOpened.GetPage(selected)
 data = wx.PrintDialogData(self.PrintData)
-properties = self.Controler.GetProjectProperties(self.Debug)
+properties = self.Controler.GetProjectProperties(window.IsDebugging())
 page_size = map(int, properties["pageSize"])
 margins = (self.PageSetupData.GetMarginTopLeft(), self.PageSetupData.GetMarginBottomRight())
-printout = GraphicPrintout(self.TabsOpened.GetPage(selected), page_size, margins, True)
+printout = GraphicPrintout(window, page_size, margins, True)
-printout2 = GraphicPrintout(self.TabsOpened.GetPage(selected), page_size, margins, True)
+printout2 = GraphicPrintout(window, page_size, margins, True)
 preview = wx.PrintPreview(printout, printout2, data)
 if preview.Ok():
 preview_frame = wx.PreviewFrame(preview, self, _("Print preview"))
 event.Skip()
 def OnPrintMenu(self, event):
 selected = self.TabsOpened.GetSelection()
 if selected != -1:
+window = self.TabsOpened.GetPage(selected)
 dialog_data = wx.PrintDialogData(self.PrintData)
 dialog_data.SetToPage(1)
-properties = self.Controler.GetProjectProperties(self.Debug)
+properties = self.Controler.GetProjectProperties(window.IsDebugging())
 page_size = map(int, properties["pageSize"])
 margins = (self.PageSetupData.GetMarginTopLeft(), self.PageSetupData.GetMarginBottomRight())
 printer = wx.Printer(dialog_data)
-printout = GraphicPrintout(self.TabsOpened.GetPage(selected), page_size, margins)
+printout = GraphicPrintout(window, page_size, margins)
 if not printer.Print(self, printout, True):
 self.ShowErrorMessage(_("There was a problem printing.\nPerhaps your current printer is not set correctly?"))
 printout.Destroy()
 event.Skip()
 def OnQuitMenu(self, event):
 self.Close()
 event.Skip()
 #-------------------------------------------------------------------------------
 #                            Edit Menu Functions
 #-------------------------------------------------------------------------------
 def RefreshEditMenu(self):
-if not self.Debug:
+if self.Controler is not None:
+undo, redo = self.Controler.GetBufferState()
+self.EditMenu.Enable(wx.ID_UNDO, undo)
+self.EditMenu.Enable(wx.ID_REDO, redo)
+self.EditMenu.Enable(ID_PLCOPENEDITOREDITMENUENABLEUNDOREDO, True)
 self.EditMenu.Check(ID_PLCOPENEDITOREDITMENUENABLEUNDOREDO,
 self.Controler.IsProjectBufferEnabled())
-if self.Controler.HasOpenedProject():
+self.EditMenu.Enable(wx.ID_ADD, True)
-undo, redo = self.Controler.GetBufferState()
+self.EditMenu.Enable(wx.ID_DELETE, True)
-self.EditMenu.Enable(wx.ID_UNDO, undo)
+if self.TabsOpened.GetPageCount() > 0:
-self.EditMenu.Enable(wx.ID_REDO, redo)
+self.EditMenu.Enable(wx.ID_CUT, True)
-self.EditMenu.Enable(wx.ID_ADD, True)
+self.EditMenu.Enable(wx.ID_COPY, True)
-self.EditMenu.Enable(wx.ID_DELETE, True)
+if self.GetCopyBuffer() is not None:
-if self.TabsOpened.GetPageCount() > 0:
+self.EditMenu.Enable(wx.ID_PASTE, True)
-self.EditMenu.Enable(wx.ID_CUT, True)
-self.EditMenu.Enable(wx.ID_COPY, True)
-if self.GetCopyBuffer() is not None:
-self.EditMenu.Enable(wx.ID_PASTE, True)
-else:
-self.EditMenu.Enable(wx.ID_PASTE, False)
-self.EditMenu.Enable(wx.ID_SELECTALL, True)
 else:
-self.EditMenu.Enable(wx.ID_CUT, False)
-self.EditMenu.Enable(wx.ID_COPY, False)
 self.EditMenu.Enable(wx.ID_PASTE, False)
-self.EditMenu.Enable(wx.ID_SELECTALL, False)
+self.EditMenu.Enable(wx.ID_SELECTALL, True)
 else:
-self.EditMenu.Enable(wx.ID_UNDO, False)
-self.EditMenu.Enable(wx.ID_REDO, False)
 self.EditMenu.Enable(wx.ID_CUT, False)
 self.EditMenu.Enable(wx.ID_COPY, False)
 self.EditMenu.Enable(wx.ID_PASTE, False)
 self.EditMenu.Enable(wx.ID_SELECTALL, False)
-self.EditMenu.Enable(wx.ID_ADD, False)
+else:
-self.EditMenu.Enable(wx.ID_DELETE, False)
+self.EditMenu.Enable(wx.ID_UNDO, False)
+self.EditMenu.Enable(wx.ID_REDO, False)
+self.EditMenu.Enable(ID_PLCOPENEDITOREDITMENUENABLEUNDOREDO, False)
+self.EditMenu.Enable(ID_PLCOPENEDITOREDITMENUENABLEUNDOREDO, False)
+self.EditMenu.Enable(wx.ID_CUT, False)
+self.EditMenu.Enable(wx.ID_COPY, False)
+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 CloseTabsWithoutModel(self):
 idxs = range(self.TabsOpened.GetPageCount())
 idxs.reverse()
 for idx in idxs:
-tagname = self.TabsOpened.GetPage(idx).GetTagName()
+window = self.TabsOpened.GetPage(idx)
-if self.Controler.GetEditedElement(tagname, self.Debug) is None:
+if not window.IsDebugging():
-self.VariablePanelIndexer.RemoveVariablePanel(tagname)
+tagname = window.GetTagName()
-self.TabsOpened.DeletePage(idx)
+if self.Controler.GetEditedElement(tagname) is None:
+self.VariablePanelIndexer.RemoveVariablePanel(tagname)
+self.TabsOpened.DeletePage(idx)
+def CloseDebugTabs(self):
+if self.EnableDebug:
+idxs = range(self.TabsOpened.GetPageCount())
+idxs.reverse()
+for idx in idxs:
+window = self.TabsOpened.GetPage(idx)
+if window.IsDebugging():
+self.TabsOpened.DeletePage(idx)
+self.DebugVariablePanel.ResetGrid()
 def OnUndoMenu(self, event):
 self.Controler.LoadPrevious()
 self.CloseTabsWithoutModel()
 self.RefreshEditor()
 self._Refresh(TITLE, EDITMENU, TYPESTREE, INSTANCESTREE, LIBRARYTREE,
 #-------------------------------------------------------------------------------
 #                             Display Menu Functions
 #-------------------------------------------------------------------------------
 def RefreshDisplayMenu(self):
-if self.Controler.HasOpenedProject():
+if self.Controler is not None:
 if self.TabsOpened.GetPageCount() > 0:
 self.DisplayMenu.Enable(wx.ID_REFRESH, True)
 selected = self.TabsOpened.GetSelection()
 if selected != -1:
 window = self.TabsOpened.GetPage(selected)
 else:
 self.DisplayMenu.Enable(wx.ID_ZOOM_FIT, False)
 else:
 self.DisplayMenu.Enable(wx.ID_REFRESH, False)
 self.DisplayMenu.Enable(wx.ID_ZOOM_FIT, False)
-if not self.Debug and not self.ModeSolo:
+if self.EnableDebug:
 self.DisplayMenu.Enable(wx.ID_CLEAR, True)
 else:
 self.DisplayMenu.Enable(wx.ID_REFRESH, False)
-if not self.Debug and not self.ModeSolo:
+if self.EnableDebug:
 self.DisplayMenu.Enable(wx.ID_CLEAR, False)
 self.DisplayMenu.Enable(wx.ID_ZOOM_FIT, False)
 def OnRefreshMenu(self, event):
-self.RefreshEditor(not self.Debug)
+self.RefreshEditor()
 event.Skip()
 def OnClearErrorsMenu(self, event):
 self.ClearErrors()
 event.Skip()
 self.AUIManager.Update()
 def OnPouSelectedChanged(self, event):
 old_selected = self.TabsOpened.GetSelection()
 if old_selected >= 0:
-if self.Debug:
+window = self.TabsOpened.GetPage(old_selected)
-pass
+if not window.IsDebugging():
-else:
+window.ResetBuffer()
-self.TabsOpened.GetPage(old_selected).ResetBuffer()
 selected = event.GetSelection()
 if selected >= 0:
 window = self.TabsOpened.GetPage(selected)
-if not self.Debug:
+if not window.IsDebugging():
 self.SelectTypesTreeItem(window.GetTagName())
 else:
 self.SelectInstancesTreeItem(self.InstancesTree.GetRootItem(), window.GetInstancePath())
 window.RefreshView()
-if not self.Debug:
+if not window.IsDebugging():
 self.VariablePanelIndexer.ChangeVariablePanel(window.GetTagName())
 self._Refresh(FILEMENU, EDITMENU, DISPLAYMENU, TOOLBAR)
 event.Skip()
 def RefreshEditor(self, variablepanel = True):
 selected = self.TabsOpened.GetSelection()
 if selected != -1:
 window = self.TabsOpened.GetPage(selected)
 window.RefreshView()
-if variablepanel:
+if window.IsDebugging() and variablepanel:
 self.RefreshVariablePanel(window.GetTagName())
 def RefreshVariablePanel(self, tagname):
 self.VariablePanelIndexer.RefreshVariablePanel(tagname)
 return None
 def RefreshPageTitles(self):
 for idx in xrange(self.TabsOpened.GetPageCount()):
 window = self.TabsOpened.GetPage(idx)
+debug = window.IsDebugging()
 words = window.GetTagName().split("::")
 if words[0] == "P":
-pou_type = self.Controler.GetEditedElementType(window.GetTagName(), self.Debug)[1].upper()
+pou_type = self.Controler.GetEditedElementType(window.GetTagName(), debug)[1].upper()
-pou_body_type = self.Controler.GetEditedElementBodyType(window.GetTagName(), self.Debug)
+pou_body_type = self.Controler.GetEditedElementBodyType(window.GetTagName(), debug)
 self.SetPageBitmap(idx, self.GenerateBitmap(pou_type, pou_body_type))
 elif words[0] == "T":
-pou_body_type = self.Controler.GetEditedElementBodyType(window.GetTagName(), self.Debug)
+pou_body_type = self.Controler.GetEditedElementBodyType(window.GetTagName(), debug)
 self.SetPageBitmap(idx, self.GenerateBitmap("TRANSITION", pou_body_type))
 elif words[0] == "A":
-pou_body_type = self.Controler.GetEditedElementBodyType(window.GetTagName(), self.Debug)
+pou_body_type = self.Controler.GetEditedElementBodyType(window.GetTagName(), debug)
 self.SetPageBitmap(idx, self.GenerateBitmap("ACTION", pou_body_type))
 elif words[0] == "C":
 self.SetPageBitmap(idx, self.GenerateBitmap("CONFIGURATION"))
 elif words[0] == "R":
 self.SetPageBitmap(idx, self.GenerateBitmap("RESOURCE"))
 elif words[0] == "D":
 self.SetPageBitmap(idx, self.GenerateBitmap("DATATYPE"))
-if self.Debug:
+if debug:
-self.TabsOpened.SetPageText(idx, window.GetInstancePath())
+text = window.GetInstancePath()
+if len(text) > 15:
+text = "..." + text[-12:]
+self.TabsOpened.SetPageText(idx, text)
 else:
 self.TabsOpened.SetPageText(idx, "-".join(words[1:]))
 def GetTabsOpenedDClickFunction(self, tabctrl):
 def OnTabsOpenedDClick(event):
 #-------------------------------------------------------------------------------
 #                         Types Tree Management Functions
 #-------------------------------------------------------------------------------
 def RefreshTypesTree(self):
-infos = self.Controler.GetProjectInfos(self.Debug)
+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(root)
 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.TreeImageDict[self.Controler.GetPouBodyType(infos["name"], self.Debug)])
+self.TypesTree.SetItemImage(root, self.TreeImageDict[self.Controler.GetPouBodyType(infos["name"])])
 else:
 self.TypesTree.SetItemImage(root, self.TreeImageDict[infos["type"]])
 if wx.VERSION >= (2, 6, 0):
 item, root_cookie = self.TypesTree.GetFirstChild(root)
 def OnTypesTreeBeginDrag(self, event):
 if wx.Platform == '__WXMSW__':
 self.SelectedItem = event.GetItem()
 if self.SelectedItem is not None and self.TypesTree.GetPyData(self.SelectedItem) == ITEM_POU:
 block_name = self.TypesTree.GetItemText(self.SelectedItem)
-block_type = self.Controler.GetPouType(block_name, self.Debug)
+block_type = self.Controler.GetPouType(block_name)
 if block_type != "program":
 data = wx.TextDataObject(str((block_name, block_type, "")))
 dragSource = wx.DropSource(self.TypesTree)
 dragSource.SetData(data)
 dragSource.DoDragDrop()
 old_name = self.TypesTree.GetItemText(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(self.Debug) if name != old_name]:
+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
 abort = True
 if not abort:
 self.Controler.ChangeDataTypeName(old_name, new_name)
 self.RefreshEditorNames(self.Controler.ComputeDataTypeName(old_name),
 self.Controler.ComputeDataTypeName(new_name))
 self.RefreshPageTitles()
 elif itemtype == ITEM_POU:
-if new_name.upper() in [name.upper() for name in self.Controler.GetProjectPouNames(self.Debug) if name != old_name]:
+if new_name.upper() in [name.upper() for name in self.Controler.GetProjectPouNames() if name != old_name]:
 message = _("\"%s\" pou already exists!")%new_name
 abort = True
-elif new_name.upper() in [name.upper() for name in self.Controler.GetProjectPouVariables(debug = self.Debug)]:
+elif new_name.upper() in [name.upper() for name in self.Controler.GetProjectPouVariables()]:
 messageDialog = wx.MessageDialog(self, _("A pou has an element with \"%s\" as name. It can generate a conflict. Do you wish to continue?")%new_name, _("Error"), wx.YES_NO|wx.ICON_QUESTION)
 if messageDialog.ShowModal() == wx.ID_NO:
 abort = True
 messageDialog.Destroy()
 if not abort:
 self.Controler.ComputePouName(new_name))
 self.RefreshLibraryTree()
 self.RefreshPageTitles()
 elif itemtype == ITEM_TRANSITION:
 pou_name = GetParentName(self.TypesTree, item, ITEM_POU)
-if new_name.upper() in [name.upper() for name in self.Controler.GetProjectPouNames(self.Debug)]:
+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, self.Debug) if name != old_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:
 pou_name = GetParentName(self.TypesTree, item, ITEM_POU)
-if new_name.upper() in [name.upper() for name in self.Controler.GetProjectPouNames(self.Debug)]:
+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, self.Debug) if name != old_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.ChangePouActionName(pou_name, old_name, new_name)
 self.RefreshEditorNames(self.Controler.ComputePouActionName(pou_name, old_name),
 self.Controler.ComputePouActionName(pou_name, new_name))
 self.RefreshPageTitles()
 elif itemtype == ITEM_CONFIGURATION:
-if new_name.upper() in [name.upper() for name in self.Controler.GetProjectConfigNames(self.Debug) if name != old_name]:
+if new_name.upper() in [name.upper() for name in self.Controler.GetProjectConfigNames() if name != old_name]:
 message = _("\"%s\" config already exists!")%new_name
 abort = True
-elif new_name.upper() in [name.upper() for name in self.Controler.GetProjectPouNames(self.Debug)]:
+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 messageDialog.ShowModal() == wx.ID_NO:
 abort = True
 messageDialog.Destroy()
-elif new_name.upper() in [name.upper() for name in self.Controler.GetProjectPouVariables(debug = self.Debug)]:
+elif new_name.upper() in [name.upper() for name in self.Controler.GetProjectPouVariables()]:
 messageDialog = wx.MessageDialog(self, _("A pou has an element with \"%s\" as name. It can generate a conflict. Do you wish to continue?")%new_name, _("Error"), wx.YES_NO|wx.ICON_QUESTION)
 if messageDialog.ShowModal() == wx.ID_NO:
 abort = True
 messageDialog.Destroy()
 if not abort:
 self.RefreshEditorNames(self.Controler.ComputeConfigurationName(old_name),
 self.Controler.ComputeConfigurationName(new_name))
 self.RefreshPageTitles()
 elif itemtype == ITEM_RESOURCE:
 config_name = GetParentName(self.TypesTree, item, ITEM_CONFIGURATION)
-if new_name.upper() in [name.upper() for name in self.Controler.GetProjectConfigNames(self.Debug)]:
+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(self.Debug)]:
+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 messageDialog.ShowModal() == wx.ID_NO:
 abort = True
 messageDialog.Destroy()
-elif new_name.upper() in [name.upper() for name in self.Controler.GetProjectPouVariables(debug = self.Debug)]:
+elif new_name.upper() in [name.upper() for name in self.Controler.GetProjectPouVariables()]:
 messageDialog = wx.MessageDialog(self, _("A pou has an element with \"%s\" as name. It can generate a conflict. Do you wish to continue?")%new_name, _("Error"), wx.YES_NO|wx.ICON_QUESTION)
 if messageDialog.ShowModal() == wx.ID_NO:
 abort = True
 messageDialog.Destroy()
 if not abort:
 elif elementtype == ITEM_RESOURCE:
 new_window = ResourceEditor(self.TabsOpened, tagname, self, self.Controler)
 self.AddPage(new_window, "")
 self.VariablePanelIndexer.AddVariablePanel(tagname, "resource")
 elif elementtype in [ITEM_POU, ITEM_TRANSITION, ITEM_ACTION]:
-bodytype = self.Controler.GetEditedElementBodyType(tagname, self.Debug)
+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.SetKeywords(IL_KEYWORDS)
 else:
 new_window.SetKeywords(ST_KEYWORDS)
 self.AddPage(new_window, "")
 words = tagname.split("::")
-self.VariablePanelIndexer.AddVariablePanel(tagname, self.Controler.GetPouType(words[1], self.Debug))
+self.VariablePanelIndexer.AddVariablePanel(tagname, self.Controler.GetPouType(words[1]))
 elif elementtype == ITEM_DATATYPE:
 new_window = DataTypeEditor(self.TabsOpened, tagname, self, self.Controler)
 self.AddPage(new_window, "")
 self.VariablePanelIndexer.ChangeVariablePanel(tagname)
 openedidx = self.IsOpened(tagname)
 item = self.TypesTree.GetSelection()
 name = self.TypesTree.GetItemText(item)
 type = self.TypesTree.GetPyData(item)
 if type == ITEM_POU:
 menu = wx.Menu(title='')
-if self.Controler.GetPouBodyType(name, self.Debug) == "SFC":
+if self.Controler.GetPouBodyType(name) == "SFC":
 new_id = wx.NewId()
 AppendMenu(menu, help='', id=new_id, kind=wx.ITEM_NORMAL, text=_("Add Transition"))
 self.Bind(wx.EVT_MENU, self.GenerateAddTransitionFunction(name), id=new_id)
 new_id = wx.NewId()
 AppendMenu(menu, help='', id=new_id, kind=wx.ITEM_NORMAL, text=_("Add Action"))
 self.Bind(wx.EVT_MENU, self.GenerateAddActionFunction(name), id=new_id)
 menu.AppendSeparator()
 new_id = wx.NewId()
 AppendMenu(menu, help='', id=new_id, kind=wx.ITEM_NORMAL, text=_("Create a new POU from"))
 self.Bind(wx.EVT_MENU, self.OnCreatePouFromMenu, id=new_id)
-pou_type = self.Controler.GetPouType(name, self.Debug)
+pou_type = self.Controler.GetPouType(name)
 if pou_type in ["function", "functionBlock"]:
 change_menu = wx.Menu(title='')
 if pou_type == "function":
 new_id = wx.NewId()
 AppendMenu(change_menu, help='', id=new_id, kind=wx.ITEM_NORMAL, text=_("Function Block"))
 #-------------------------------------------------------------------------------
 #                         Instances Tree Management Functions
 #-------------------------------------------------------------------------------
 def RefreshInstancesTree(self):
-infos = self.Controler.GetProjectTopology(self.Debug)
+infos = self.Controler.GetProjectTopology(self.EnableDebug)
 root = self.InstancesTree.GetRootItem()
 if not root.IsOk():
 root = self.InstancesTree.AddRoot(infos["name"])
 self.GenerateInstancesTreeBranch(root, infos)
 self.InstancesTree.Expand(root)
 item, root_cookie = self.InstancesTree.GetNextChild(root, root_cookie)
 for item in to_delete:
 self.InstancesTree.Delete(item)
 def OnInstancesTreeBeginDrag(self, event):
-selected_item = event.GetItem()
+if self.Controler.DebugAvailable():
-selected_infos = self.InstancesTree.GetPyData(selected_item)
+selected_item = event.GetItem()
-if selected_item is not None and selected_infos[0] in ITEMS_VARIABLE:
+selected_infos = self.InstancesTree.GetPyData(selected_item)
-var_path = self.InstancesTree.GetItemText(selected_item).split(" (")[0]
+if selected_item is not None and selected_infos[0] in ITEMS_VARIABLE:
-parent_item = self.InstancesTree.GetItemParent(selected_item)
+var_path = self.InstancesTree.GetItemText(selected_item).split(" (")[0]
-while self.InstancesTree.GetPyData(parent_item)[0] != ITEM_PROJECT:
-parent_name = self.InstancesTree.GetItemText(parent_item).split(" (")[0]
-var_path = "%s.%s"%(parent_name, var_path)
-parent_item = self.InstancesTree.GetItemParent(parent_item)
-data = wx.TextDataObject(str((var_path, "debug")))
-dragSource = wx.DropSource(self.InstancesTree)
-dragSource.SetData(data)
-dragSource.DoDragDrop()
-event.Skip()
-def OnInstancesTreeItemActivated(self, event):
-selected_item = event.GetItem()
-selected_infos = self.InstancesTree.GetPyData(selected_item)
-if selected_item is not None and selected_infos[0] in [ITEM_FUNCTIONBLOCK, ITEM_PROGRAM, ITEM_TRANSITION, ITEM_ACTION]:
-instance_path = self.InstancesTree.GetItemText(selected_item).split(" (")[0]
-parent_item = self.InstancesTree.GetItemParent(selected_item)
-while self.InstancesTree.GetPyData(parent_item)[0] != ITEM_PROJECT:
-parent_name = self.InstancesTree.GetItemText(parent_item).split(" (")[0]
-instance_path = "%s.%s"%(parent_name, instance_path)
-parent_item = self.InstancesTree.GetItemParent(parent_item)
-openedidx = self.IsOpened(instance_path)
-if openedidx is not None:
-old_selected = self.TabsOpened.GetSelection()
-if old_selected != openedidx:
-if old_selected >= 0:
-self.TabsOpened.GetPage(old_selected).ResetBuffer()
-self.TabsOpened.SetSelection(openedidx)
-elif selected_infos[1] is not None:
-bodytype = self.Controler.GetEditedElementBodyType(selected_infos[1], self.Debug)
-if bodytype == "FBD":
-new_window = Viewer(self.TabsOpened, selected_infos[1], self, self.Controler, True, instance_path)
-new_window.RefreshScaling(False)
-elif bodytype == "LD":
-new_window = LD_Viewer(self.TabsOpened, selected_infos[1], self, self.Controler, True, instance_path)
-new_window.RefreshScaling(False)
-elif bodytype == "SFC":
-new_window = SFC_Viewer(self.TabsOpened, selected_infos[1], self, self.Controler, True, instance_path)
-new_window.RefreshScaling(False)
-else:
-new_window = TextViewer(self.TabsOpened, selected_infos[1], self, self.Controler, True, instance_path)
-new_window.SetTextSyntax(bodytype)
-if bodytype == "IL":
-new_window.SetKeywords(IL_KEYWORDS)
-else:
-new_window.SetKeywords(ST_KEYWORDS)
-self.AddPage(new_window, "")
-new_window.SetFocus()
-self.RefreshPageTitles()
-if selected_item is not None and selected_infos[0] in ITEMS_VARIABLE:
-var_path, var_type = self.InstancesTree.GetItemText(selected_item).split(" (")
-var_type = var_type.split(")")[0]
-if self.Controler.IsOfType(var_type, "ANY_NUM", self.Debug) or\
-self.Controler.IsOfType(var_type, "ANY_BIT", self.Debug):
 parent_item = self.InstancesTree.GetItemParent(selected_item)
 while self.InstancesTree.GetPyData(parent_item)[0] != ITEM_PROJECT:
 parent_name = self.InstancesTree.GetItemText(parent_item).split(" (")[0]
 var_path = "%s.%s"%(parent_name, var_path)
 parent_item = self.InstancesTree.GetItemParent(parent_item)
+data = wx.TextDataObject(str((var_path, "debug")))
+dragSource = wx.DropSource(self.InstancesTree)
+dragSource.SetData(data)
+dragSource.DoDragDrop()
+event.Skip()
+else:
+event.Veto()
+def OnInstancesTreeItemActivated(self, event):
+if self.Controler.DebugAvailable():
+selected_item = event.GetItem()
+selected_infos = self.InstancesTree.GetPyData(selected_item)
+if selected_item is not None and selected_infos[0] in [ITEM_FUNCTIONBLOCK, ITEM_PROGRAM, ITEM_TRANSITION, ITEM_ACTION]:
+instance_path = self.InstancesTree.GetItemText(selected_item).split(" (")[0]
+parent_item = self.InstancesTree.GetItemParent(selected_item)
+while self.InstancesTree.GetPyData(parent_item)[0] != ITEM_PROJECT:
+parent_name = self.InstancesTree.GetItemText(parent_item).split(" (")[0]
+instance_path = "%s.%s"%(parent_name, instance_path)
+parent_item = self.InstancesTree.GetItemParent(parent_item)
+openedidx = self.IsOpened(instance_path)
+if openedidx is not None:
+old_selected = self.TabsOpened.GetSelection()
+if old_selected != openedidx:
+if old_selected >= 0:
+self.TabsOpened.GetPage(old_selected).ResetBuffer()
+self.TabsOpened.SetSelection(openedidx)
+elif selected_infos[1] is not None:
+bodytype = self.Controler.GetEditedElementBodyType(selected_infos[1], True)
+if bodytype == "FBD":
+new_window = Viewer(self.TabsOpened, selected_infos[1], self, self.Controler, True, instance_path)
+new_window.RefreshScaling(False)
+elif bodytype == "LD":
+new_window = LD_Viewer(self.TabsOpened, selected_infos[1], self, self.Controler, True, instance_path)
+new_window.RefreshScaling(False)
+elif bodytype == "SFC":
+new_window = SFC_Viewer(self.TabsOpened, selected_infos[1], self, self.Controler, True, instance_path)
+new_window.RefreshScaling(False)
+else:
+new_window = TextViewer(self.TabsOpened, selected_infos[1], self, self.Controler, True, instance_path)
+new_window.SetTextSyntax(bodytype)
+if bodytype == "IL":
+new_window.SetKeywords(IL_KEYWORDS)
+else:
+new_window.SetKeywords(ST_KEYWORDS)
+self.AddPage(new_window, "")
+new_window.SetFocus()
+self.RefreshPageTitles()
+if selected_item is not None and selected_infos[0] in ITEMS_VARIABLE:
+var_path, var_type = self.InstancesTree.GetItemText(selected_item).split(" (")
+var_type = var_type.split(")")[0]
-self.OpenGraphicViewer(var_path)
+if self.Controler.IsOfType(var_type, "ANY_NUM", True) or\
+self.Controler.IsOfType(var_type, "ANY_BIT", True):
+parent_item = self.InstancesTree.GetItemParent(selected_item)
+while self.InstancesTree.GetPyData(parent_item)[0] != ITEM_PROJECT:
+parent_name = self.InstancesTree.GetItemText(parent_item).split(" (")[0]
+var_path = "%s.%s"%(parent_name, var_path)
+parent_item = self.InstancesTree.GetItemParent(parent_item)
+self.OpenGraphicViewer(var_path)
 event.Skip()
 def OpenGraphicViewer(self, var_path):
 new_window = GraphicViewer(self.TabsOpened, self, self.Controler, var_path)
 self.AddPage(new_window, "")
 new_window.SetFocus()
 self.RefreshPageTitles()
 def OnInstancesTreeRightUp(self, event):
-if wx.Platform == '__WXMSW__':
+if self.Controler.DebugAvailable():
-selected_item = event.GetItem()
+if wx.Platform == '__WXMSW__':
-else:
+selected_item = event.GetItem()
-selected_item = self.InstancesTree.GetSelection()
+else:
-selected_infos = self.InstancesTree.GetPyData(selected_item)
+selected_item = self.InstancesTree.GetSelection()
-if selected_item is not None and selected_infos[0] in ITEMS_VARIABLE:
+selected_infos = self.InstancesTree.GetPyData(selected_item)
-var_path, var_type = self.InstancesTree.GetItemText(selected_item).split(" (")
+if selected_item is not None and selected_infos[0] in ITEMS_VARIABLE:
-var_type = var_type.split(")")[0]
+var_path, var_type = self.InstancesTree.GetItemText(selected_item).split(" (")
+var_type = var_type.split(")")[0]
-if self.Controler.IsOfType(var_type, "ANY_NUM", self.Debug) or\
-self.Controler.IsOfType(var_type, "ANY_BIT", self.Debug):
-parent_item = self.InstancesTree.GetItemParent(selected_item)
-while self.InstancesTree.GetPyData(parent_item)[0] != ITEM_PROJECT:
-parent_name = self.InstancesTree.GetItemText(parent_item).split(" (")[0]
-var_path = "%s.%s"%(parent_name, var_path)
-parent_item = self.InstancesTree.GetItemParent(parent_item)
-menu = wx.Menu(title='')
+if self.Controler.IsOfType(var_type, "ANY_NUM", True) or\
-new_id = wx.NewId()
+self.Controler.IsOfType(var_type, "ANY_BIT", True):
-AppendMenu(menu, help='', id=new_id, kind=wx.ITEM_NORMAL, text=_("Graphic Panel"))
+parent_item = self.InstancesTree.GetItemParent(selected_item)
-self.Bind(wx.EVT_MENU, self.AddVariableGraphicFunction(var_path), id=new_id)
+while self.InstancesTree.GetPyData(parent_item)[0] != ITEM_PROJECT:
-new_id = wx.NewId()
+parent_name = self.InstancesTree.GetItemText(parent_item).split(" (")[0]
-AppendMenu(menu, help='', id=new_id, kind=wx.ITEM_NORMAL, text=_("CSV Log"))
+var_path = "%s.%s"%(parent_name, var_path)
-self.PopupMenu(menu)
+parent_item = self.InstancesTree.GetItemParent(parent_item)
+menu = wx.Menu(title='')
+new_id = wx.NewId()
+AppendMenu(menu, help='', id=new_id, kind=wx.ITEM_NORMAL, text=_("Graphic Panel"))
+self.Bind(wx.EVT_MENU, self.AddVariableGraphicFunction(var_path), id=new_id)
+new_id = wx.NewId()
+AppendMenu(menu, help='', id=new_id, kind=wx.ITEM_NORMAL, text=_("CSV Log"))
+self.PopupMenu(menu)
 event.Skip()
 def AddVariableGraphicFunction(self, iec_path):
 def AddVariableGraphic(event):
 self.OpenGraphicViewer(iec_path)
 #-------------------------------------------------------------------------------
 #                         Library Tree Management Functions
 #-------------------------------------------------------------------------------
 def RefreshLibraryTree(self):
-if not self.Debug:
+to_delete = []
-to_delete = []
+blocktypes = self.Controler.GetBlockTypes()
-blocktypes = self.Controler.GetBlockTypes(debug = self.Debug)
+root = self.LibraryTree.GetRootItem()
-root = self.LibraryTree.GetRootItem()
+if not root.IsOk():
-if not root.IsOk():
+if wx.Platform == '__WXMSW__':
-if wx.Platform == '__WXMSW__':
+root = self.LibraryTree.AddRoot(_("Block Types"))
-root = self.LibraryTree.AddRoot(_("Block Types"))
+self.LibraryTree.SetPyData(root, {"type" : CATEGORY})
-self.LibraryTree.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:
+category_name = 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:
-root = self.LibraryTree.AddRoot("")
+self.LibraryTree.SetItemText(blocktype_item, blocktype["name"])
-if wx.VERSION >= (2, 6, 0):
+self.LibraryTree.SetPyData(blocktype_item, {"type" : BLOCK, "block_type" : blocktype["type"], "inputs" : tuple([type for name, type, modifier in blocktype["inputs"]])})
-category_item, root_cookie = self.LibraryTree.GetFirstChild(root)
+blocktype_item, category_cookie = self.LibraryTree.GetNextChild(category_item, category_cookie)
-else:
+while blocktype_item.IsOk():
-category_item, root_cookie = self.LibraryTree.GetFirstChild(root, 0)
+to_delete.append(blocktype_item)
-for category in blocktypes:
+blocktype_item, category_cookie = self.LibraryTree.GetNextChild(category_item, category_cookie)
-category_name = category["name"]
+category_item, root_cookie = self.LibraryTree.GetNextChild(root, root_cookie)
-if not category_item.IsOk():
+while category_item.IsOk():
-category_item = self.LibraryTree.AppendItem(root, _(category_name))
+to_delete.append(category_item)
-if wx.Platform != '__WXMSW__':
+category_item, root_cookie = self.LibraryTree.GetNextChild(root, root_cookie)
-category_item, root_cookie = self.LibraryTree.GetNextChild(root, root_cookie)
+for item in to_delete:
-else:
+self.LibraryTree.Delete(item)
-self.LibraryTree.SetItemText(category_item, _(category_name))
+if wx.Platform == '__WXMSW__':
-self.LibraryTree.SetPyData(category_item, {"type" : CATEGORY})
+self.LibraryTree.Expand(root)
-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 is not None and pydata["type"] != CATEGORY:
-blocktype = self.Controler.GetBlockType(self.LibraryTree.GetItemText(selected), pydata["inputs"], debug = self.Debug)
+blocktype = self.Controler.GetBlockType(self.LibraryTree.GetItemText(selected), pydata["inputs"])
 if blocktype:
 comment = blocktype["comment"]
 self.LibraryComment.SetValue(_(comment) + blocktype.get("usage", ""))
 else:
 self.LibraryComment.SetValue("")
 #-------------------------------------------------------------------------------
 #                          ToolBar Management Functions
 #-------------------------------------------------------------------------------
 def ResetToolBar(self):
-if not self.Debug:
+for item in self.CurrentToolBar:
-for item in self.CurrentToolBar:
+if wx.VERSION >= (2, 6, 0):
-if wx.VERSION >= (2, 6, 0):
+self.Unbind(wx.EVT_MENU, id=item)
-self.Unbind(wx.EVT_MENU, id=item)
+else:
-else:
+self.Disconnect(id=item, eventType=wx.wxEVT_COMMAND_MENU_SELECTED)
-self.Disconnect(id=item, eventType=wx.wxEVT_COMMAND_MENU_SELECTED)
+if USE_AUI:
+ToolBar = self.Panes["ToolBar"]
+else:
+ToolBar = self.ToolBar
+if ToolBar:
+ToolBar.DeleteTool(item)
+ToolBar.Realize()
 if USE_AUI:
-ToolBar = self.Panes["ToolBar"]
+self.AUIManager.GetPane("ToolBar").BestSize(ToolBar.GetBestSize())
-else:
+self.AUIManager.Update()
-ToolBar = self.ToolBar
-if ToolBar:
-ToolBar.DeleteTool(item)
-ToolBar.Realize()
-if USE_AUI:
-self.AUIManager.GetPane("ToolBar").BestSize(ToolBar.GetBestSize())
-self.AUIManager.Update()
 def RefreshToolBar(self):
-if not self.Debug:
+selected = self.TabsOpened.GetSelection()
-selected = self.TabsOpened.GetSelection()
+language = None
 if selected != -1:
-language = self.Controler.GetEditedElementBodyType(self.TabsOpened.GetPage(selected).GetTagName(), self.Debug)
+window = self.TabsOpened.GetPage(selected)
+if not window.IsDebugging():
+language = self.Controler.GetEditedElementBodyType(window.GetTagName())
+if language is not None and language != self.CurrentLanguage:
+self.ResetToolBar()
+self.CurrentLanguage = language
+self.CurrentToolBar = []
+if USE_AUI:
+ToolBar = self.Panes["ToolBar"]
 else:
-language = None
+ToolBar = self.ToolBar
-if language is not None and language != self.CurrentLanguage:
+if ToolBar:
-self.ResetToolBar()
+for radio, modes, id, method, picture, help in ToolBarItems[language]:
-self.CurrentLanguage = language
+if modes & self.DrawingMode:
-self.CurrentToolBar = []
+if radio or self.DrawingMode == FREEDRAWING_MODE:
+ToolBar.AddRadioTool(id, wx.Bitmap(os.path.join(CWD, "Images", picture)), wx.NullBitmap, help)
+else:
+ToolBar.AddSimpleTool(id, wx.Bitmap(os.path.join(CWD, "Images", picture)), help)
+self.Bind(wx.EVT_TOOL, getattr(self, method), id=id)
+self.CurrentToolBar.append(id)
+ToolBar.Realize()
 if USE_AUI:
-ToolBar = self.Panes["ToolBar"]
+self.AUIManager.GetPane("ToolBar").BestSize(ToolBar.GetBestSize())
-else:
+self.AUIManager.Update()
-ToolBar = self.ToolBar
+elif not language:
-if ToolBar:
+self.ResetToolBar()
-for radio, modes, id, method, picture, help in ToolBarItems[language]:
+self.CurrentLanguage = language
-if modes & self.DrawingMode:
+self.ResetCurrentMode()
-if radio or self.DrawingMode == FREEDRAWING_MODE:
-ToolBar.AddRadioTool(id, wx.Bitmap(os.path.join(CWD, "Images", picture)), wx.NullBitmap, help)
-else:
-ToolBar.AddSimpleTool(id, wx.Bitmap(os.path.join(CWD, "Images", picture)), help)
-self.Bind(wx.EVT_TOOL, getattr(self, method), id=id)
-self.CurrentToolBar.append(id)
-ToolBar.Realize()
-if USE_AUI:
-self.AUIManager.GetPane("ToolBar").BestSize(ToolBar.GetBestSize())
-self.AUIManager.Update()
-elif not language:
-self.ResetToolBar()
-self.CurrentLanguage = language
-self.ResetCurrentMode()
 #-------------------------------------------------------------------------------
 #                           ToolBar Items Functions
 #-------------------------------------------------------------------------------
 #                         Add Project Elements Functions
 #-------------------------------------------------------------------------------
 def OnAddDataTypeMenu(self, event):
 dialog = DataTypeDialog(self, _("Add a new data type"), _("Please enter data type name"), "", wx.OK|wx.CANCEL)
-dialog.SetDataTypeNames(self.Controler.GetProjectDataTypeNames(self.Debug))
+dialog.SetDataTypeNames(self.Controler.GetProjectDataTypeNames())
 if dialog.ShowModal() == wx.ID_OK:
 self.Controler.ProjectAddDataType(dialog.GetValue())
-self.RefreshTitle()
+self._Refresh(TITLE, EDITMENU, TYPESTREE)
-self.RefreshEditMenu()
-self.RefreshTypesTree()
 dialog.Destroy()
 event.Skip()
 def GenerateAddPouFunction(self, pou_type):
 def OnAddPouMenu(event):
 dialog = PouDialog(self, pou_type)
-dialog.SetPouNames(self.Controler.GetProjectPouNames(self.Debug))
+dialog.SetPouNames(self.Controler.GetProjectPouNames())
-dialog.SetPouElementNames(self.Controler.GetProjectPouVariables(debug = self.Debug))
+dialog.SetPouElementNames(self.Controler.GetProjectPouVariables())
 if dialog.ShowModal() == wx.ID_OK:
 values = dialog.GetValues()
 self.Controler.ProjectAddPou(values["pouName"], values["pouType"], values["language"])
-self.RefreshTitle()
+self._Refresh(TITLE, EDITMENU, TYPESTREE, LIBRARYTREE)
-self.RefreshEditMenu()
-self.RefreshTypesTree()
-self.RefreshLibraryTree()
 dialog.Destroy()
 event.Skip()
 return OnAddPouMenu
 def GenerateAddTransitionFunction(self, pou_name):
 def OnAddTransitionMenu(event):
 dialog = PouTransitionDialog(self)
-dialog.SetPouNames(self.Controler.GetProjectPouNames(self.Debug))
+dialog.SetPouNames(self.Controler.GetProjectPouNames())
-dialog.SetPouElementNames(self.Controler.GetProjectPouVariables(pou_name, self.Debug))
+dialog.SetPouElementNames(self.Controler.GetProjectPouVariables(pou_name))
 if dialog.ShowModal() == wx.ID_OK:
 values = dialog.GetValues()
 self.Controler.ProjectAddPouTransition(pou_name, values["transitionName"], values["language"])
-self.RefreshTitle()
+self._Refresh(TITLE, EDITMENU, TYPESTREE)
-self.RefreshEditMenu()
-self.RefreshTypesTree()
 dialog.Destroy()
 event.Skip()
 return OnAddTransitionMenu
 def GenerateAddActionFunction(self, pou_name):
 def OnAddActionMenu(event):
 dialog = PouActionDialog(self)
-dialog.SetPouNames(self.Controler.GetProjectPouNames(self.Debug))
+dialog.SetPouNames(self.Controler.GetProjectPouNames())
-dialog.SetPouElementNames(self.Controler.GetProjectPouVariables(pou_name, self.Debug))
+dialog.SetPouElementNames(self.Controler.GetProjectPouVariables(pou_name))
 if dialog.ShowModal() == wx.ID_OK:
 values = dialog.GetValues()
 self.Controler.ProjectAddPouAction(pou_name, values["actionName"], values["language"])
-self.RefreshTitle()
+self._Refresh(TITLE, EDITMENU, TYPESTREE)
-self.RefreshEditMenu()
-self.RefreshTypesTree()
 dialog.Destroy()
 event.Skip()
 return OnAddActionMenu
 def OnAddConfigurationMenu(self, event):
 dialog = ConfigurationNameDialog(self, _("Please enter configuration name"), _("Add new configuration"))
-dialog.SetPouNames(self.Controler.GetProjectPouNames(self.Debug))
+dialog.SetPouNames(self.Controler.GetProjectPouNames())
-dialog.SetPouElementNames(self.Controler.GetProjectPouVariables(debug = self.Debug))
+dialog.SetPouElementNames(self.Controler.GetProjectPouVariables())
 if dialog.ShowModal() == wx.ID_OK:
 value = dialog.GetValue()
 self.Controler.ProjectAddConfiguration(value)
-self.RefreshTitle()
+self._Refresh(TITLE, EDITMENU, TYPESTREE, INSTANCESTREE)
-self.RefreshEditMenu()
-self.RefreshTypesTree()
-self.RefreshInstancesTree()
 dialog.Destroy()
 event.Skip()
 def GenerateAddResourceFunction(self, config_name):
 def OnAddResourceMenu(event):
 dialog = ResourceNameDialog(self, _("Please enter resource name"), _("Add new resource"))
-dialog.SetPouNames(self.Controler.GetProjectPouNames(self.Debug))
+dialog.SetPouNames(self.Controler.GetProjectPouNames())
-dialog.SetPouElementNames(self.Controler.GetProjectPouVariables(debug = self.Debug))
+dialog.SetPouElementNames(self.Controler.GetProjectPouVariables())
 if dialog.ShowModal() == wx.ID_OK:
 value = dialog.GetValue()
 self.Controler.ProjectAddConfigurationResource(config_name, value)
-self.RefreshTitle()
+self._Refresh(TITLE, EDITMENU, TYPESTREE, INSTANCESTREE)
-self.RefreshEditMenu()
-self.RefreshTypesTree()
-self.RefreshInstancesTree()
 dialog.Destroy()
 event.Skip()
 return OnAddResourceMenu
 def GenerateChangePouTypeFunction(self, name, new_type):
 def OnChangePouTypeMenu(event):
 selected = self.TypesTree.GetSelection()
 if self.TypesTree.GetPyData(selected) == ITEM_POU:
 self.Controler.ProjectChangePouType(name, new_type)
-self.RefreshTitle()
+self._Refresh(TITLE, TOOLBAR, EDITMENU, TYPESTREE, LIBRARYTREE)
-self.RefreshEditMenu()
-self.RefreshTypesTree()
-self.RefreshLibraryTree()
-self.RefreshToolBar()
 event.Skip()
 return OnChangePouTypeMenu
 def OnCreatePouFromMenu(self, event):
 selected = self.TypesTree.GetSelection()
 if self.TypesTree.GetPyData(selected) == ITEM_POU:
 dialog = PouNameDialog(self, _("Please enter POU name"), _("Create a new POU from"), "", wx.OK|wx.CANCEL)
-dialog.SetPouNames(self.Controler.GetProjectPouNames(self.Debug))
+dialog.SetPouNames(self.Controler.GetProjectPouNames())
 if dialog.ShowModal() == wx.ID_OK:
 self.Controler.ProjectCreatePouFrom(dialog.GetValue(), self.TypesTree.GetItemText(selected))
-self.RefreshTitle()
+self._Refresh(TITLE, TOOLBAR, EDITMENU, TYPESTREE, LIBRARYTREE)
-self.RefreshEditMenu()
-self.RefreshTypesTree()
-self.RefreshLibraryTree()
-self.RefreshToolBar()
 event.Skip()
 #-------------------------------------------------------------------------------
 #                        Remove Project Elements Functions
 #-------------------------------------------------------------------------------
 def OnRemoveDataTypeMenu(self, event):
 selected = self.TypesTree.GetSelection()
 if self.TypesTree.GetPyData(selected) == ITEM_DATATYPE:
 name = self.TypesTree.GetItemText(selected)
-if not self.Controler.DataTypeIsUsed(name, self.Debug):
+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.TabsOpened.DeletePage(idx)
-self.RefreshTitle()
+self._Refresh(TITLE, TOOLBAR, EDITMENU, TYPESTREE)
-self.RefreshEditMenu()
-self.RefreshTypesTree()
-self.RefreshToolBar()
 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)
+self.ShowErrorMessage(_("\"%s\" is used by one or more POUs. It can't be removed!"))
-message.ShowModal()
-message.Destroy()
 event.Skip()
 def OnRenamePouMenu(self, event):
 selected = self.TypesTree.GetSelection()
 if self.TypesTree.GetPyData(selected) == ITEM_POU:
 def OnRemovePouMenu(self, event):
 selected = self.TypesTree.GetSelection()
 if self.TypesTree.GetPyData(selected) == ITEM_POU:
 name = self.TypesTree.GetItemText(selected)
-if not self.Controler.PouIsUsed(name, self.Debug):
+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.TabsOpened.DeletePage(idx)
-self.RefreshTitle()
+self._Refresh(TITLE, TOOLBAR, EDITMENU, TYPESTREE, INSTANCESTREE, LIBRARYTREE)
-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!")%name, _("Error"), wx.OK|wx.ICON_ERROR)
+self.ShowErrorMessage(_("\"%s\" is used by one or more POUs. It can't be removed!"))
-message.ShowModal()
-message.Destroy()
 event.Skip()
 def OnRemoveTransitionMenu(self, event):
 selected = self.TypesTree.GetSelection()
 if self.TypesTree.GetPyData(selected) == ITEM_TRANSITION:
 tagname = self.Controler.ComputePouTransitionName(pou_name, transition)
 idx = self.IsOpened(tagname)
 if idx is not None:
 self.VariablePanelIndexer.RemoveVariablePanel(tagname)
 self.TabsOpened.DeletePage(idx)
-self.RefreshTitle()
+self._Refresh(TITLE, EDITMENU, TYPESTREE)
-self.RefreshEditMenu()
-self.RefreshTypesTree()
 event.Skip()
 def OnRemoveActionMenu(self, event):
 selected = self.TypesTree.GetSelection()
 if self.TypesTree.GetPyData(selected) == ITEM_ACTION:
 tagname = self.Controler.ComputePouActionName(pou_name, action)
 idx = self.IsOpened(tagname)
 if idx is not None:
 self.VariablePanelIndexer.RemoveVariablePanel(tagname)
 self.TabsOpened.DeletePage(idx)
-self.RefreshTitle()
+self._Refresh(TITLE, EDITMENU, TYPESTREE)
-self.RefreshEditMenu()
-self.RefreshTypesTree()
 event.Skip()
 def OnRemoveConfigurationMenu(self, event):
 selected = self.TypesTree.GetSelection()
 if self.TypesTree.GetPyData(selected) == ITEM_CONFIGURATION:
 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._Refresh(TITLE, EDITMENU, TYPESTREE, INSTANCESTREE)
-self.RefreshEditMenu()
-self.RefreshTypesTree()
-self.RefreshInstancesTree()
 event.Skip()
 def OnRemoveResourceMenu(self, event):
 selected = self.TypesTree.GetSelection()
 if self.TypesTree.GetPyData(selected) == ITEM_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._Refresh(TITLE, EDITMENU, TYPESTREE, INSTANCESTREE)
-self.RefreshEditMenu()
-self.RefreshTypesTree()
-self.RefreshInstancesTree()
 event.Skip()
 def OnPLCOpenEditorMenu(self, event):
 wx.MessageBox(_("No documentation available.\nComing soon."))
 #event.Skip()
 self.VariablePanelIndexer.ClearErrors()
 for i in xrange(self.TabsOpened.GetPageCount()):
 viewer = self.TabsOpened.GetPage(i)
 viewer.ClearErrors()
-RefreshFunctions = {
+#-------------------------------------------------------------------------------
-TITLE : RefreshTitle,
+#                            PLCOpenEditor Main Class
-TOOLBAR : RefreshToolBar,
+#-------------------------------------------------------------------------------
-FILEMENU : RefreshFileMenu,
-EDITMENU : RefreshEditMenu,
+class PLCOpenEditor(IDEFrame):
-DISPLAYMENU : RefreshDisplayMenu,
-TYPESTREE : RefreshTypesTree,
+# Compatibility function for wx versions < 2.6
-INSTANCESTREE : RefreshInstancesTree,
+if wx.VERSION < (2, 6, 0):
-LIBRARYTREE : RefreshLibraryTree,
+def Bind(self, event, function, id = None):
-SCALING : RefreshScaling}
+if id is not None:
+event(self, id, function)
-current_num = 0
+else:
-def GetNewNum():
+event(self, function)
-global current_num
-current_num += 1
+def _init_coll_FileMenu_Items(self, parent):
-return current_num
+AppendMenu(parent, help='', id=wx.ID_NEW,
+kind=wx.ITEM_NORMAL, text=_(u'New\tCTRL+N'))
+AppendMenu(parent, help='', id=wx.ID_OPEN,
+kind=wx.ITEM_NORMAL, text=_(u'Open\tCTRL+O'))
+AppendMenu(parent, help='', id=wx.ID_CLOSE,
+kind=wx.ITEM_NORMAL, text=_(u'Close Tab\tCTRL+W'))
+AppendMenu(parent, help='', id=wx.ID_CLOSE_ALL,
+kind=wx.ITEM_NORMAL, text=_(u'Close Project'))
+parent.AppendSeparator()
+AppendMenu(parent, help='', id=wx.ID_SAVE,
+kind=wx.ITEM_NORMAL, text=_(u'Save\tCTRL+S'))
+AppendMenu(parent, help='', id=wx.ID_SAVEAS,
+kind=wx.ITEM_NORMAL, text=_(u'Save As...\tCTRL+SHIFT+S'))
+AppendMenu(parent, help='', id=ID_PLCOPENEDITORFILEMENUGENERATE,
+kind=wx.ITEM_NORMAL, text=_(u'Generate Program\tCTRL+G'))
+parent.AppendSeparator()
+AppendMenu(parent, help='', id=wx.ID_PAGE_SETUP,
+kind=wx.ITEM_NORMAL, text=_(u'Page Setup'))
+AppendMenu(parent, help='', id=wx.ID_PREVIEW,
+kind=wx.ITEM_NORMAL, text=_(u'Preview'))
+AppendMenu(parent, help='', id=wx.ID_PRINT,
+kind=wx.ITEM_NORMAL, text=_(u'Print'))
+parent.AppendSeparator()
+AppendMenu(parent, help='', id=wx.ID_PROPERTIES,
+kind=wx.ITEM_NORMAL, text=_(u'Properties'))
+parent.AppendSeparator()
+AppendMenu(parent, help='', id=wx.ID_EXIT,
+kind=wx.ITEM_NORMAL, text=_(u'Quit\tCTRL+Q'))
+self.Bind(wx.EVT_MENU, self.OnNewProjectMenu, id=wx.ID_NEW)
+self.Bind(wx.EVT_MENU, self.OnOpenProjectMenu, id=wx.ID_OPEN)
+self.Bind(wx.EVT_MENU, self.OnCloseTabMenu, id=wx.ID_CLOSE)
+self.Bind(wx.EVT_MENU, self.OnCloseProjectMenu, id=wx.ID_CLOSE_ALL)
+self.Bind(wx.EVT_MENU, self.OnSaveProjectMenu, id=wx.ID_SAVE)
+self.Bind(wx.EVT_MENU, self.OnSaveProjectAsMenu, id=wx.ID_SAVEAS)
+self.Bind(wx.EVT_MENU, self.OnGenerateProgramMenu,
+id=ID_PLCOPENEDITORFILEMENUGENERATE)
+self.Bind(wx.EVT_MENU, self.OnPageSetupMenu, id=wx.ID_PAGE_SETUP)
+self.Bind(wx.EVT_MENU, self.OnPreviewMenu, id=wx.ID_PREVIEW)
+self.Bind(wx.EVT_MENU, self.OnPrintMenu, id=wx.ID_PRINT)
+self.Bind(wx.EVT_MENU, self.OnPropertiesMenu, id=wx.ID_PROPERTIES)
+self.Bind(wx.EVT_MENU, self.OnQuitMenu, id=wx.ID_EXIT)
+def _init_coll_HelpMenu_Items(self, parent):
+AppendMenu(parent, help='', id=wx.ID_HELP,
+kind=wx.ITEM_NORMAL, text=_(u'PLCOpenEditor\tF1'))
+#AppendMenu(parent, help='', id=wx.ID_HELP_CONTENTS,
+#      kind=wx.ITEM_NORMAL, text=u'PLCOpen\tF2')
+#AppendMenu(parent, help='', id=wx.ID_HELP_CONTEXT,
+#      kind=wx.ITEM_NORMAL, text=u'IEC 61131-3\tF3')
+AppendMenu(parent, help='', id=wx.ID_ABOUT,
+kind=wx.ITEM_NORMAL, text=_(u'About'))
+self.Bind(wx.EVT_MENU, self.OnPLCOpenEditorMenu, id=wx.ID_HELP)
+#self.Bind(wx.EVT_MENU, self.OnPLCOpenMenu, id=wx.ID_HELP_CONTENTS)
+self.Bind(wx.EVT_MENU, self.OnAboutMenu, id=wx.ID_ABOUT)
+## 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, fileOpen = None):
+IDEFrame.__init__(self, parent)
+# Open the filepath if defined
+if fileOpen is not None:
+# Create a new controller
+self.Controler = PLCControler()
+self.Controler.OpenXMLFile(fileOpen)
+# Define PLCOpenEditor icon
+self.SetIcon(wx.Icon(os.path.join(CWD,"Images", "poe.ico"),wx.BITMAP_TYPE_ICO))
+self.Bind(wx.EVT_CLOSE, self.OnCloseFrame)
+self._Refresh(TITLE, TOOLBAR, FILEMENU, EDITMENU, DISPLAYMENU)
+def OnCloseFrame(self, event):
+if self.Controler is None or self.CheckSaveBeforeClosing():
+if USE_AUI:
+self.AUIManager.UnInit()
+event.Skip()
+else:
+event.Veto()
+def RefreshTitle(self):
+name = _("PLCOpenEditor")
+if self.Controler is not None:
+self.SetTitle("%s - %s"%(name, self.Controler.GetFilename()))
+else:
+self.SetTitle(name)
+#-------------------------------------------------------------------------------
+#                            File Menu Functions
+#-------------------------------------------------------------------------------
+def RefreshFileMenu(self):
+if self.Controler is not None:
+selected = self.TabsOpened.GetSelection()
+if selected >= 0:
+graphic_viewer = isinstance(self.TabsOpened.GetPage(selected), Viewer)
+else:
+graphic_viewer = False
+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:
+self.FileMenu.Enable(wx.ID_PREVIEW, False)
+self.FileMenu.Enable(wx.ID_PRINT, False)
+else:
+self.FileMenu.Enable(wx.ID_CLOSE, False)
+self.FileMenu.Enable(wx.ID_PREVIEW, False)
+self.FileMenu.Enable(wx.ID_PRINT, False)
+self.FileMenu.Enable(wx.ID_PAGE_SETUP, True)
+self.FileMenu.Enable(wx.ID_SAVE, True)
+self.FileMenu.Enable(wx.ID_PROPERTIES, True)
+self.FileMenu.Enable(wx.ID_CLOSE_ALL, True)
+self.FileMenu.Enable(wx.ID_SAVEAS, True)
+self.FileMenu.Enable(ID_PLCOPENEDITORFILEMENUGENERATE, True)
+else:
+self.FileMenu.Enable(wx.ID_CLOSE, False)
+self.FileMenu.Enable(wx.ID_PAGE_SETUP, False)
+self.FileMenu.Enable(wx.ID_PREVIEW, False)
+self.FileMenu.Enable(wx.ID_PRINT, False)
+self.FileMenu.Enable(wx.ID_SAVE, False)
+self.FileMenu.Enable(wx.ID_PROPERTIES, False)
+self.FileMenu.Enable(wx.ID_CLOSE_ALL, False)
+self.FileMenu.Enable(wx.ID_SAVEAS, False)
+self.FileMenu.Enable(ID_PLCOPENEDITORFILEMENUGENERATE, False)
+def OnNewProjectMenu(self, event):
+if self.Controler is not None and not self.CheckSaveBeforeClosing():
+return
+dialog = ProjectDialog(self)
+if dialog.ShowModal() == wx.ID_OK:
+properties = dialog.GetValues()
+self.Controler = PLCControler()
+self.Controler.CreateNewProject(properties)
+self._Refresh(TITLE, FILEMENU, EDITMENU, TYPESTREE, INSTANCESTREE,
+LIBRARYTREE)
+event.Skip()
+def OnOpenProjectMenu(self, event):
+if self.Controler is not None and not self.CheckSaveBeforeClosing():
+return
+filepath = ""
+if self.Controler is not None:
+filepath = self.Controler.GetFilePath()
+if filepath != "":
+directory = os.path.dirname(filepath)
+else:
+directory = os.getcwd()
+dialog = wx.FileDialog(self, _("Choose a file"), directory, "",  _("PLCOpen files (*.xml)|*.xml|All files|*.*"), wx.OPEN)
+if dialog.ShowModal() == wx.ID_OK:
+filepath = dialog.GetPath()
+if os.path.isfile(filepath):
+self.DeleteAllPages()
+self.VariablePanelIndexer.RemoveAllPanels()
+self.Controler = PLCControler()
+self.Controler.OpenXMLFile(filepath)
+self._Refresh(TYPESTREE, INSTANCESTREE, LIBRARYTREE)
+self._Refresh(TITLE, TOOLBAR, FILEMENU, EDITMENU)
+dialog.Destroy()
+event.Skip()
+def OnCloseProjectMenu(self, event):
+if not self.CheckSaveBeforeClosing():
+return
+self.DeleteAllPages()
+self.VariablePanelIndexer.RemoveAllPanels()
+self.TypesTree.DeleteAllItems()
+self.InstancesTree.DeleteAllItems()
+self.LibraryTree.DeleteAllItems()
+self.Controler = None
+self._Refresh(TITLE, TOOLBAR, FILEMENU, EDITMENU)
+event.Skip()
+def OnSaveProjectMenu(self, event):
+self.SaveProject()
+event.Skip()
+def OnSaveProjectAsMenu(self, event):
+self.SaveProjectAs()
+event.Skip()
+def OnGenerateProgramMenu(self, event):
+dialog = wx.FileDialog(self, _("Choose a file"), os.getcwd(), self.Controler.GetProgramFilePath(),  _("ST files (*.st)|*.st|All files|*.*"), wx.SAVE|wx.CHANGE_DIR)
+if dialog.ShowModal() == wx.ID_OK:
+filepath = dialog.GetPath()
+message_text = ""
+header, icon = _("Done"), wx.ICON_INFORMATION
+if os.path.isdir(os.path.dirname(filepath)):
+program, errors, warnings = self.Controler.GenerateProgram(filepath)
+message_text += "".join([_("warning: %s\n") for warning in warnings])
+if len(errors) > 0:
+message_text += "".join([_("error: %s\n") for warning in warnings])
+message_text += _("Can't generate program to file %s!")%filepath
+header, icon = _("Error"), wx.ICON_ERROR
+else:
+message_text += _("Program was successfully generated!")
+else:
+message_text += _("\"%s\" is not a valid folder!")%os.path.dirname(filepath)
+header, icon = _("Error"), wx.ICON_ERROR
+message = wx.MessageDialog(self, message_text, header, wx.OK|icon)
+message.ShowModal()
+message.Destroy()
+dialog.Destroy()
+event.Skip()
+def SaveProject(self):
+result = self.Controler.SaveXMLFile()
+if not result:
+self.SaveProjectAs()
+else:
+self.RefreshTitle()
+def SaveProjectAs(self):
+filepath = self.Controler.GetFilePath()
+if filepath != "":
+directory, filename = os.path.split(filepath)
+else:
+directory, filename = os.getcwd(), "%(projectName)s.xml"%self.Controler.GetProjectProperties()
+dialog = wx.FileDialog(self, _("Choose a file"), directory, filename,  _("PLCOpen files (*.xml)|*.xml|All files|*.*"), wx.SAVE|wx.OVERWRITE_PROMPT)
+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:
+self.ShowErrorMessage(_("Can't save project to file %s!")%filepath)
+else:
+self.ShowErrorMessage(_("\"%s\" is not a valid folder!")%os.path.dirname(filepath))
+self.RefreshTitle()
+dialog.Destroy()
 #-------------------------------------------------------------------------------
 #                            Create Project Dialog
 #-------------------------------------------------------------------------------
 name='VariablePanelIndexer', parent=prnt, pos=wx.Point(0, 0),
 size=wx.Size(0, 300), style=wx.TAB_TRAVERSAL)
 self._init_sizers()
-def __init__(self, parent, window, controler):
+def __init__(self, parent, window):
 self._init_ctrls(parent)
 self.ParentWindow = window
-self.Controler = controler
 self.VariablePanelList = {}
 self.CurrentPanel = None
 def AddVariablePanel(self, tagname, element_type):
-new_panel = VariablePanel(self, self.ParentWindow, self.Controler, element_type)
+new_panel = VariablePanel(self, self.ParentWindow, self.ParentWindow.Controler, element_type)
 new_panel.SetTagName(tagname)
 new_panel.Hide()
 new_panel.RefreshView()
 self.MainSizer.AddWindow(new_panel, 1, border=0, flag=wx.GROW)
 self.VariablePanelList[tagname] = new_panel
 Otherwise default to the default renderer.
 """
 for row in range(self.GetNumberRows()):
+grid.SetRowMinimalHeight(row, 28)
+grid.AutoSizeRow(row, False)
 for col in range(self.GetNumberCols()):
 editor = None
 renderer = None
 colname = self.GetColLabelValue(col, False)
 if col != 0 and self.GetValueByName(row, "Edit"):
 def SetTagName(self, tagname):
 self.TagName = tagname
 def IsFunctionBlockType(self, name):
-bodytype = self.Controler.GetEditedElementBodyType(self.TagName, self.ParentWindow.Debug)
+bodytype = self.Controler.GetEditedElementBodyType(self.TagName)
-pouname, poutype = self.Controler.GetEditedElementType(self.TagName, self.ParentWindow.Debug)
+pouname, poutype = self.Controler.GetEditedElementType(self.TagName)
 if poutype != "function" and bodytype in ["ST", "IL"]:
 return False
 else:
-return name in self.Controler.GetFunctionBlockTypes(self.TagName, self.ParentWindow.Debug)
+return name in self.Controler.GetFunctionBlockTypes(self.TagName)
 def RefreshView(self):
-self.PouNames = self.Controler.GetProjectPouNames(self.ParentWindow.Debug)
+self.PouNames = self.Controler.GetProjectPouNames()
 words = self.TagName.split("::")
 if self.ElementType == "config":
 self.PouIsUsed = False
 returnType = None
-self.Values = self.Controler.GetConfigurationGlobalVars(words[1], self.ParentWindow.Debug)
+self.Values = self.Controler.GetConfigurationGlobalVars(words[1])
 elif self.ElementType == "resource":
 self.PouIsUsed = False
 returnType = None
-self.Values = self.Controler.GetConfigurationResourceGlobalVars(words[1], words[2], self.ParentWindow.Debug)
+self.Values = self.Controler.GetConfigurationResourceGlobalVars(words[1], words[2])
 else:
-self.PouIsUsed = self.Controler.PouIsUsed(words[1], self.ParentWindow.Debug)
+self.PouIsUsed = self.Controler.PouIsUsed(words[1])
-returnType = self.Controler.GetEditedElementInterfaceReturnType(self.TagName, self.ParentWindow.Debug)
+returnType = self.Controler.GetEditedElementInterfaceReturnType(self.TagName)
-self.Values = self.Controler.GetEditedElementInterfaceVars(self.TagName, self.ParentWindow.Debug)
+self.Values = self.Controler.GetEditedElementInterfaceVars(self.TagName)
 if returnType and self.ReturnType.IsEnabled():
 self.ReturnType.SetStringSelection(returnType)
 self.RefreshValues()
 def OnReturnTypeChanged(self, event):
 words = self.TagName.split("::")
 self.Controler.SetPouInterfaceReturnType(words[1], self.ReturnType.GetStringSelection())
 self.Controler.BufferProject()
 self.ParentWindow.RefreshEditor(variablepanel = False)
-self.ParentWindow.RefreshTitle()
+self.ParentWindow._Refresh(TITLE, EDITMENU, INSTANCESTREE, LIBRARYTREE)
-self.ParentWindow.RefreshEditMenu()
-self.ParentWindow.RefreshInstancesTree()
-self.ParentWindow.RefreshLibraryTree()
 event.Skip()
 def OnClassFilter(self, event):
 self.Filter = self.FilterChoiceTransfer[self.ClassFilter.GetStringSelection()]
 self.RefreshTypeList()
 self.RefreshButtons()
 event.Skip()
 def OnVariablesGridCellChange(self, event):
 row, col = event.GetRow(), event.GetCol()
-colname = self.Table.GetColLabelValue(col)
+colname = self.Table.GetColLabelValue(col, False)
 value = self.Table.GetValue(row, col)
 if colname == "Name" and value != "":
 if not TestIdentifier(value):
 message = wx.MessageDialog(self, _("\"%s\" is not a valid identifier!")%value, _("Error"), wx.OK|wx.ICON_ERROR)
 message.ShowModal()
 old_value = self.Table.GetOldValue()
 if old_value != "":
 self.Controler.UpdateEditedElementUsedVariable(self.TagName, old_value, value)
 self.Controler.BufferProject()
 self.ParentWindow.RefreshEditor(variablepanel = False)
-self.ParentWindow.RefreshTitle()
+self.ParentWindow._Refresh(TITLE, EDITMENU, INSTANCESTREE, LIBRARYTREE)
-self.ParentWindow.RefreshEditMenu()
-self.ParentWindow.RefreshInstancesTree()
-self.ParentWindow.RefreshLibraryTree()
 event.Skip()
 else:
 self.SaveValues()
 if colname == "Class":
 self.Table.ResetView(self.VariablesGrid)
 new_id = wx.NewId()
 AppendMenu(base_menu, help='', id=new_id, kind=wx.ITEM_NORMAL, text=base_type)
 self.Bind(wx.EVT_MENU, self.GetVariableTypeFunction(base_type), id=new_id)
 type_menu.AppendMenu(wx.NewId(), _("Base Types"), base_menu)
 datatype_menu = wx.Menu(title='')
-for datatype in self.Controler.GetDataTypes(basetypes = False, debug = self.ParentWindow.Debug):
+for datatype in self.Controler.GetDataTypes(basetypes = False):
 new_id = wx.NewId()
 AppendMenu(datatype_menu, help='', id=new_id, kind=wx.ITEM_NORMAL, text=datatype)
 self.Bind(wx.EVT_MENU, self.GetVariableTypeFunction(datatype), id=new_id)
 type_menu.AppendMenu(wx.NewId(), _("User Data Types"), datatype_menu)
 functionblock_menu = wx.Menu(title='')
-bodytype = self.Controler.GetEditedElementBodyType(self.TagName, self.ParentWindow.Debug)
+bodytype = self.Controler.GetEditedElementBodyType(self.TagName)
-pouname, poutype = self.Controler.GetEditedElementType(self.TagName, self.ParentWindow.Debug)
+pouname, poutype = self.Controler.GetEditedElementType(self.TagName)
 if classtype in ["Input","Output","InOut","External","Global"] or poutype != "function" and bodytype in ["ST", "IL"]:
-for functionblock_type in self.Controler.GetFunctionBlockTypes(self.TagName, self.ParentWindow.Debug):
+for functionblock_type in self.Controler.GetFunctionBlockTypes(self.TagName):
 new_id = wx.NewId()
 AppendMenu(functionblock_menu, help='', id=new_id, kind=wx.ITEM_NORMAL, text=functionblock_type)
 self.Bind(wx.EVT_MENU, self.GetVariableTypeFunction(functionblock_type), id=new_id)
 type_menu.AppendMenu(wx.NewId(), _("Function Block Types"), functionblock_menu)
 rect = self.VariablesGrid.BlockToDeviceRect((row, col), (row, col))
 self.Table.SetValueByName(row, "Type", base_type)
 self.Table.ResetView(self.VariablesGrid)
 self.SaveValues(False)
 self.ParentWindow.RefreshEditor(variablepanel = False)
 self.Controler.BufferProject()
-self.ParentWindow.RefreshTitle()
+self.ParentWindow._Refresh(TITLE, EDITMENU, INSTANCESTREE, LIBRARYTREE)
-self.ParentWindow.RefreshEditMenu()
-self.ParentWindow.RefreshInstancesTree()
-self.ParentWindow.RefreshLibraryTree()
 event.Skip()
 return VariableTypeFunction
 def OnVariablesGridCellLeftClick(self, event):
 row = event.GetRow()
 if self.ReturnType.IsEnabled():
 self.Controler.SetPouInterfaceReturnType(words[1], self.ReturnType.GetStringSelection())
 self.Controler.SetPouInterfaceVars(words[1], self.Values)
 if buffer:
 self.Controler.BufferProject()
-self.ParentWindow.RefreshTitle()
+self.ParentWindow._Refresh(TITLE, EDITMENU, INSTANCESTREE, LIBRARYTREE)
-self.ParentWindow.RefreshEditMenu()
-self.ParentWindow.RefreshInstancesTree()
-self.ParentWindow.RefreshLibraryTree()
 def AddVariableError(self, infos):
 if isinstance(infos[0], TupleType):
 for i in xrange(*infos[0]):
 self.Table.AddError((i,) + infos[1:])
 size=wx.Size(32, 32), style=0)
 self.Bind(wx.EVT_BUTTON, self.OnDownButton, id=ID_DEBUGVARIABLEPANELDOWNBUTTON)
 self.DeleteButton = wx.Button(id=ID_DEBUGVARIABLEPANELDELETEBUTTON, label=_('Delete'),
 name='DeleteButton', parent=self, pos=wx.Point(0, 0),
-size=wx.Size(72, 32), style=0)
+size=wx.DefaultSize, style=0)
 self.Bind(wx.EVT_BUTTON, self.OnDeleteButton, id=ID_DEBUGVARIABLEPANELDELETEBUTTON)
 self._init_sizers()
 def __init__(self, parent, controler):
 self.HasNewData = False
 self.RefreshGrid()
 DebugViewer.RefreshNewData(self)
 def RefreshGrid(self):
+self.Freeze()
+self.Table.ResetView(self.VariablesGrid)
+self.Thaw()
+def ResetGrid(self):
+self.DeleteDataConsumers()
+self.Table.Empty()
 self.Freeze()
 self.Table.ResetView(self.VariablesGrid)
 self.Thaw()
 def OnDeleteButton(self, event):

changeset 407	0a324a874981
parent 403	2160fd6d83ed
child 411	9ab97d517ae8