beremiz: comparison Beremiz.py

equal deleted inserted replaced

-:0c06f7874a3f
+:9c6fdf60ad2e
 __version__ = "$Revision$"
 import wx
 import wx.lib.buttons
-if wx.VERSION >= (2, 8, 0):
-import wx.lib.customtreectrl as CT
 import types
 import time
 from plugger import PluginsRoot
 from wxPopen import wxPopen3
+SCROLLBAR_UNIT = 10
+WINDOW_COLOUR = wx.Colour(240,240,240)
+if wx.Platform == '__WXMSW__':
+faces = { 'times': 'Times New Roman',
+'mono' : 'Courier New',
+'helv' : 'Arial',
+'other': 'Comic Sans MS',
+'size' : 18,
+}
+else:
+faces = { 'times': 'Times',
+'mono' : 'Courier',
+'helv' : 'Helvetica',
+'other': 'new century schoolbook',
+'size' : 18,
+}
 CWD = os.path.split(os.path.realpath(__file__))[0]
+gen_mini_GetBackgroundBrush = lambda obj:lambda dc: wx.Brush(obj.faceDnClr, wx.SOLID)
+gen_mini_GetLabelSize = lambda obj:lambda:(wx.lib.buttons.GenBitmapTextButton._GetLabelSize(obj)[:-1] + (False,))
+def GenerateEmptyBitmap():
+bitmap = wx.EmptyBitmap(24, 24)
+dc = wx.MemoryDC(bitmap)
+dc.SetPen(wx.Pen(WINDOW_COLOUR))
+dc.SetBrush(wx.Brush(WINDOW_COLOUR))
+dc.DrawRectangle(0, 0, 24, 24)
+return bitmap
 class LogPseudoFile:
 """ Base class for file like objects to facilitate StdOut for the Shell."""
 def __init__(self, output = None):
 self.red_white = wx.TextAttr("RED", "WHITE")
 self.red_yellow = wx.TextAttr("RED", "YELLOW")
 	spin(p)
 return (self.exitcode, self.outdata, self.errdata)
 [ID_BEREMIZ, ID_BEREMIZMAINSPLITTER,
-ID_BEREMIZSECONDSPLITTER, ID_BEREMIZLEFTPANEL,
+ID_BEREMIZPLCCONFIG, ID_BEREMIZLOGCONSOLE,
-ID_BEREMIZPARAMSPANEL, ID_BEREMIZLOGCONSOLE,
+] = [wx.NewId() for _init_ctrls in range(4)]
-ID_BEREMIZPLUGINTREE, ID_BEREMIZPLUGINCHILDS,
-ID_BEREMIZADDBUTTON, ID_BEREMIZDELETEBUTTON,
-ID_BEREMIZPARAMSSTATICBOX, ID_BEREMIZPARAMSENABLE,
-ID_BEREMIZPARAMSTARGETTYPE, ID_BEREMIZPARAMSIECCHANNEL,
-ID_BEREMIZPARAMSSTATICTEXT1, ID_BEREMIZPARAMSSTATICTEXT2,
-ID_BEREMIZPARAMSATTRIBUTESGRID,
-] = [wx.NewId() for _init_ctrls in range(17)]
 [ID_BEREMIZFILEMENUITEMS0, ID_BEREMIZFILEMENUITEMS1,
 ID_BEREMIZFILEMENUITEMS2, ID_BEREMIZFILEMENUITEMS3,
 ID_BEREMIZFILEMENUITEMS5, ID_BEREMIZFILEMENUITEMS7,
 ] = [wx.NewId() for _init_coll_FileMenu_Items in range(6)]
 self._init_coll_FileMenu_Items(self.FileMenu)
 #self._init_coll_EditMenu_Items(self.EditMenu)
 #self._init_coll_RunMenu_Items(self.RunMenu)
 self._init_coll_HelpMenu_Items(self.HelpMenu)
-def _init_coll_LeftGridSizer_Items(self, parent):
+def _init_coll_PLCConfigMainSizer_Items(self, parent):
-parent.AddWindow(self.PluginTree, 0, border=0, flag=wx.GROW)
+parent.AddSizer(self.PLCParamsSizer, 0, border=10, flag=wx.GROW|wx.TOP|wx.LEFT|wx.RIGHT)
-parent.AddSizer(self.ButtonGridSizer, 0, border=0, flag=wx.GROW)
+parent.AddSizer(self.PluginTreeSizer, 0, border=10, flag=wx.BOTTOM|wx.LEFT|wx.RIGHT)
-def _init_coll_LeftGridSizer_Growables(self, parent):
+def _init_coll_PLCConfigMainSizer_Growables(self, parent):
-parent.AddGrowableCol(0)
-parent.AddGrowableRow(0)
-def _init_coll_RightGridSizer_Items(self, parent):
-parent.AddSizer(self.MenuSizer, 0, border=0, flag=wx.GROW)
-if wx.VERSION < (2, 8, 0):
-parent.AddWindow(self.SecondSplitter, 0, border=0, flag=wx.GROW)
-else:
-parent.AddWindow(self.ParamsPanel, 0, border=0, flag=wx.GROW)
-def _init_coll_RightGridSizer_Growables(self, parent):
 parent.AddGrowableCol(0)
 parent.AddGrowableRow(1)
-def _init_coll_ButtonGridSizer_Items(self, parent):
+def _init_coll_PluginTreeSizer_Growables(self, parent):
-parent.AddWindow(self.PluginChilds, 0, border=0, flag=wx.GROW)
-parent.AddWindow(self.AddButton, 0, border=0, flag=0)
-parent.AddWindow(self.DeleteButton, 0, border=0, flag=0)
-def _init_coll_ButtonGridSizer_Growables(self, parent):
 parent.AddGrowableCol(0)
-parent.AddGrowableRow(0)
+parent.AddGrowableCol(1)
 def _init_sizers(self):
-self.LeftGridSizer = wx.FlexGridSizer(cols=1, hgap=2, rows=1, vgap=2)
+self.PLCConfigMainSizer = wx.FlexGridSizer(cols=1, hgap=2, rows=2, vgap=2)
-self.ButtonGridSizer = wx.FlexGridSizer(cols=3, hgap=2, rows=1, vgap=2)
+self.PLCParamsSizer = wx.BoxSizer(wx.VERTICAL)
-self.RightGridSizer = wx.FlexGridSizer(cols=1, hgap=2, rows=2, vgap=2)
+self.PluginTreeSizer = wx.FlexGridSizer(cols=2, hgap=0, rows=0, vgap=2)
-self.MenuSizer = wx.BoxSizer(wx.VERTICAL)
-self.ParamsPanelMainSizer = wx.BoxSizer(wx.VERTICAL)
+self._init_coll_PLCConfigMainSizer_Items(self.PLCConfigMainSizer)
+self._init_coll_PLCConfigMainSizer_Growables(self.PLCConfigMainSizer)
-self._init_coll_LeftGridSizer_Growables(self.LeftGridSizer)
+self._init_coll_PluginTreeSizer_Growables(self.PluginTreeSizer)
-self._init_coll_LeftGridSizer_Items(self.LeftGridSizer)
-self._init_coll_ButtonGridSizer_Growables(self.ButtonGridSizer)
+self.PLCConfig.SetSizer(self.PLCConfigMainSizer)
-self._init_coll_ButtonGridSizer_Items(self.ButtonGridSizer)
-self._init_coll_RightGridSizer_Growables(self.RightGridSizer)
-self._init_coll_RightGridSizer_Items(self.RightGridSizer)
-self.LeftPanel.SetSizer(self.LeftGridSizer)
-self.RightPanel.SetSizer(self.RightGridSizer)
-self.ParamsPanel.SetSizer(self.ParamsPanelMainSizer)
 def _init_ctrls(self, prnt):
 wx.Frame.__init__(self, id=ID_BEREMIZ, name=u'Beremiz',
 parent=prnt, pos=wx.Point(0, 0), size=wx.Size(1000, 600),
 style=wx.DEFAULT_FRAME_STYLE|wx.CLIP_CHILDREN, title=u'Beremiz')
 self._init_utils()
 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.LeftPanel = wx.Panel(id=ID_BEREMIZLEFTPANEL,
+parent = self.MainSplitter
-name='LeftPanel', parent=self.MainSplitter, pos=wx.Point(0, 0),
+else:
-size=wx.Size(0, 0), style=wx.TAB_TRAVERSAL)
+parent = self
-self.PluginTree = wx.TreeCtrl(id=ID_BEREMIZPLUGINTREE,
+self.PLCConfig = wx.ScrolledWindow(id=ID_BEREMIZPLCCONFIG,
-name='PluginTree', parent=self.LeftPanel, pos=wx.Point(0, 0),
+name='PLCConfig', parent=parent, pos=wx.Point(0, 0),
-size=wx.Size(-1, -1), style=wx.TR_HAS_BUTTONS|wx.TR_SINGLE|wx.SUNKEN_BORDER)
+size=wx.Size(-1, -1), style=wx.TAB_TRAVERSAL|wx.SUNKEN_BORDER|wx.HSCROLL|wx.VSCROLL)
-self.PluginTree.Bind(wx.EVT_RIGHT_UP, self.OnPluginTreeRightUp)
+self.PLCConfig.SetBackgroundColour(wx.WHITE)
-self.Bind(wx.EVT_TREE_SEL_CHANGED, self.OnPluginTreeItemSelected,
+self.PLCConfig.Bind(wx.EVT_SIZE, self.OnMoveWindow)
-id=ID_BEREMIZPLUGINTREE)
+self.LogConsole = wx.TextCtrl(id=ID_BEREMIZLOGCONSOLE, value='',
-self.PluginChilds = wx.Choice(id=ID_BEREMIZPLUGINCHILDS,
+name='LogConsole', parent=parent, pos=wx.Point(0, 0),
-name='PluginChilds', parent=self.LeftPanel, pos=wx.Point(0, 0),
-size=wx.Size(-1, -1), style=0)
-self.AddButton = wx.lib.buttons.GenBitmapButton(ID=ID_BEREMIZADDBUTTON, bitmap=wx.Bitmap(os.path.join(CWD, 'images', 'Add32x32.png')),
-name='AddBusButton', parent=self.LeftPanel, pos=wx.Point(0, 0),
-size=wx.Size(32, 32), style=wx.NO_BORDER)
-self.AddButton.SetToolTipString("Add a plugin of the type selected")
-self.AddButton.Bind(wx.EVT_BUTTON, self.OnAddButton,
-id=ID_BEREMIZADDBUTTON)
-self.DeleteButton = wx.lib.buttons.GenBitmapButton(ID=ID_BEREMIZDELETEBUTTON, bitmap=wx.Bitmap(os.path.join(CWD, 'images', 'Delete32x32.png')),
-name='DeleteBusButton', parent=self.LeftPanel, pos=wx.Point(0, 0),
-size=wx.Size(32, 32), style=wx.NO_BORDER)
-self.DeleteButton.SetToolTipString("Delete the current selected plugin")
-self.DeleteButton.Bind(wx.EVT_BUTTON, self.OnDeleteButton,
-id=ID_BEREMIZDELETEBUTTON)
-self.RightPanel = wx.Panel(id=ID_BEREMIZLEFTPANEL,
-name='RightPanel', parent=self.MainSplitter, pos=wx.Point(0, 0),
-size=wx.Size(0, 0), style=wx.TAB_TRAVERSAL)
-self.SecondSplitter = wx.SplitterWindow(id=ID_BEREMIZSECONDSPLITTER,
-name='SecondSplitter', parent=self.RightPanel, point=wx.Point(0, 0),
-size=wx.Size(0, 0), style=wx.SP_3D)
-self.SecondSplitter.SetNeedUpdating(True)
-self.SecondSplitter.SetMinimumPaneSize(1)
-self.MainSplitter.SplitVertically(self.LeftPanel, self.RightPanel,
-300)
-self.ParamsPanel = wx.ScrolledWindow(id=ID_BEREMIZPARAMSPANEL,
-name='ParamsPanel', parent=self.SecondSplitter, pos=wx.Point(0, 0),
-size=wx.Size(0, 0), style=wx.TAB_TRAVERSAL)
-self.ParamsPanel.SetScrollbars(10, 10, 0, 0, 0, 0)
-self.LogConsole = wx.TextCtrl(id=ID_BEREMIZLOGCONSOLE, value='',
-name='LogConsole', parent=self.SecondSplitter, pos=wx.Point(0, 0),
 size=wx.Size(0, 0), style=wx.TE_MULTILINE|wx.TE_RICH2)
-self.SecondSplitter.SplitHorizontally(self.ParamsPanel, self.LogConsole,
+if wx.VERSION < (2, 8, 0):
--250)
+self.MainSplitter.SplitHorizontally(self.PLCConfig, self.LogConsole, -250)
-self._init_sizers()
 else:
 self.AUIManager = wx.aui.AuiManager(self)
 self.AUIManager.SetDockSizeConstraint(0.5, 0.5)
-self.Panes = {}
+self.AUIManager.AddPane(self.PLCConfig, wx.aui.AuiPaneInfo().CenterPane())
-self.PluginTree = CT.CustomTreeCtrl(id=ID_BEREMIZPLUGINTREE,
-name='PluginTree', parent=self, pos=wx.Point(0, 0),
+self.AUIManager.AddPane(self.LogConsole, wx.aui.AuiPaneInfo().
-size=wx.Size(-1, -1), style=CT.TR_HAS_BUTTONS|CT.TR_EDIT_LABELS|CT.TR_HAS_VARIABLE_ROW_HEIGHT|wx.TR_SINGLE|wx.SUNKEN_BORDER)
+Caption("Log Console").Bottom().Layer(1).
-self.PluginTree.Bind(wx.EVT_RIGHT_UP, self.OnPluginTreeRightUp)
+BestSize(wx.Size(800, 200)).CloseButton(False))
-self.PluginTree.Bind(wx.EVT_IDLE, self.OnPluginTreeIdle)
-self.Bind(CT.EVT_TREE_SEL_CHANGED, self.OnPluginTreeItemSelected,
-id=ID_BEREMIZPLUGINTREE)
-self.Bind(CT.EVT_TREE_ITEM_CHECKED, self.OnPluginTreeItemChecked,
-id=ID_BEREMIZPLUGINTREE)
-self.Bind(wx.EVT_TREE_BEGIN_LABEL_EDIT, self.OnPluginTreeItemBeginEdit,
-id=ID_BEREMIZPLUGINTREE)
-self.Bind(CT.EVT_TREE_END_LABEL_EDIT, self.OnPluginTreeItemEndEdit,
-id=ID_BEREMIZPLUGINTREE)
-self.Bind(CT.EVT_TREE_ITEM_EXPANDED, self.OnPluginTreeItemExpanded,
-id=ID_BEREMIZPLUGINTREE)
-self.Bind(CT.EVT_TREE_ITEM_COLLAPSED, self.OnPluginTreeItemCollapsed,
-id=ID_BEREMIZPLUGINTREE)
-self.AUIManager.AddPane(self.PluginTree, wx.aui.AuiPaneInfo().CenterPane())
-self.LogConsole = wx.TextCtrl(id=ID_BEREMIZLOGCONSOLE, value='',
-name='LogConsole', parent=self, pos=wx.Point(0, 0),
-size=wx.Size(0, 0), style=wx.TE_MULTILINE|wx.TE_RICH2)
-self.AUIManager.AddPane(self.LogConsole, wx.aui.AuiPaneInfo().Caption("Log Console").Bottom().Layer(1).BestSize(wx.Size(800, 200)).CloseButton(False))
 self.AUIManager.Update()
+self._init_sizers()
 def __init__(self, parent, projectOpen):
 self._init_ctrls(parent)
 self.Log = LogPseudoFile(self.LogConsole)
 self.PluginRoot = PluginsRoot(self)
 self.DisableEvents = False
+self.PluginInfos = {}
 if projectOpen:
 self.PluginRoot.LoadProject(projectOpen, self.Log)
+self.RefreshPLCParams()
 self.RefreshPluginTree()
-self.RefreshPluginToolBar()
-self.PluginTree.SelectItem(self.PluginTree.GetRootItem())
-if wx.VERSION < (2, 8, 0):
-self.RefreshPluginParams()
-self.RefreshButtons()
 self.RefreshMainMenu()
+def OnMoveWindow(self, event):
+self.GetBestSize()
+self.RefreshScrollBars()
+event.Skip()
 def OnFrameActivated(self, event):
 if not event.GetActive():
 self.PluginRoot.RefreshPluginsBlockLists()
-def RefreshButtons(self):
-if wx.VERSION < (2, 8, 0):
-if self.PluginRoot.HasProjectOpened():
-self.PluginChilds.Enable(True)
-self.AddButton.Enable(True)
-self.DeleteButton.Enable(True)
-else:
-self.PluginChilds.Enable(False)
-self.AddButton.Enable(False)
-self.DeleteButton.Enable(False)
 def RefreshMainMenu(self):
 if self.menuBar1:
 if self.PluginRoot.HasProjectOpened():
 ##                self.menuBar1.EnableTop(1, True)
 ##                self.menuBar1.EnableTop(2, True)
 ##                self.menuBar1.EnableTop(2, False)
 self.FileMenu.Enable(ID_BEREMIZFILEMENUITEMS2, False)
 self.FileMenu.Enable(ID_BEREMIZFILEMENUITEMS3, False)
 self.FileMenu.Enable(ID_BEREMIZFILEMENUITEMS5, False)
+def RefreshScrollBars(self):
+xstart, ystart = self.PLCConfig.GetViewStart()
+window_size = self.PLCConfig.GetClientSize()
+sizer = self.PLCConfig.GetSizer()
+if sizer:
+maxx, maxy = sizer.GetMinSize()
+self.PLCConfig.SetScrollbars(SCROLLBAR_UNIT, SCROLLBAR_UNIT,
+maxx / SCROLLBAR_UNIT, maxy / SCROLLBAR_UNIT, xstart, ystart, True)
+def RefreshPLCParams(self):
+self.ClearSizer(self.PLCParamsSizer)
+if self.PluginRoot.HasProjectOpened():
+plcwindow = wx.Panel(self.PLCConfig, -1, size=wx.Size(-1, -1))
+plcwindow.SetBackgroundColour(WINDOW_COLOUR)
+self.PLCParamsSizer.AddWindow(plcwindow, 0, border=0, flag=wx.GROW)
+plcwindowsizer = wx.BoxSizer(wx.VERTICAL)
+plcwindow.SetSizer(plcwindowsizer)
+titlesizer = wx.BoxSizer(wx.HORIZONTAL)
+plcwindowsizer.AddSizer(titlesizer, 0, border=0, flag=wx.ALIGN_CENTER)
+st = wx.StaticText(plcwindow, -1)
+st.SetFont(wx.Font(faces["size"] * 2, wx.DEFAULT, wx.NORMAL, wx.BOLD, faceName = faces["helv"]))
+st.SetLabel("PLC (%s)"%self.PluginRoot.GetProjectName())
+titlesizer.AddWindow(st, 0, border=5, flag=wx.ALL|wx.ALIGN_CENTER)
+if len(self.PluginRoot.PlugChildsTypes) > 0:
+addbutton_id = wx.NewId()
+addbutton = wx.lib.buttons.GenBitmapButton(id=addbutton_id, bitmap=wx.Bitmap(os.path.join(CWD, 'images', 'AddPlugin.png')),
+name='AddBusButton', parent=plcwindow, pos=wx.Point(0, 0),
+size=wx.Size(24, 24), style=wx.NO_BORDER)
+addbutton.GetBackgroundBrush = gen_mini_GetBackgroundBrush(addbutton)
+addbutton.SetToolTipString("Add a plugin to this one")
+addbutton.Bind(wx.EVT_BUTTON, self.GetAddButtonFunction(self.PluginRoot, plcwindow), id=addbutton_id)
+titlesizer.AddWindow(addbutton, 0, border=5, flag=wx.ALL|wx.ALIGN_CENTER)
+plcwindowmainsizer = wx.BoxSizer(wx.HORIZONTAL)
+plcwindowsizer.AddSizer(plcwindowmainsizer, 0, border=0, flag=wx.ALIGN_CENTER)
+msizer = wx.FlexGridSizer(cols=len(self.PluginRoot.PluginMethods))
+plcwindowmainsizer.AddSizer(msizer, 0, border=0, flag=wx.GROW)
+if len(self.PluginRoot.PluginMethods) > 0:
+for plugin_method in self.PluginRoot.PluginMethods:
+if "method" in plugin_method:
+id = wx.NewId()
+button = wx.lib.buttons.GenBitmapTextButton(id=id, parent=plcwindow,
+bitmap=wx.Bitmap(os.path.join(CWD, "%s24x24.png"%plugin_method.get("bitmap", os.path.join("images", "Unknown")))), label=plugin_method["name"],
+name=plugin_method["name"], pos=wx.DefaultPosition, style=wx.NO_BORDER)
+button.SetToolTipString(plugin_method["tooltip"])
+button.Bind(wx.EVT_BUTTON, self.GetButtonCallBackFunction(self.PluginRoot, plugin_method["method"]), id=id)
+#hack to force size to mini
+button._GetLabelSize = gen_mini_GetLabelSize(button)
+#button._GetLabelSize = lambda :(-1,-1,False)
+msizer.AddWindow(button, 0, border=0, flag=0)
+paramswindow = wx.Panel(plcwindow, -1, size=wx.Size(-1, -1))
+paramswindow.SetBackgroundColour(WINDOW_COLOUR)
+plcwindowmainsizer.AddWindow(paramswindow, 0, border=0, flag=0)
+psizer = wx.BoxSizer(wx.HORIZONTAL)
+paramswindow.SetSizer(psizer)
+plugin_infos = self.PluginRoot.GetParamsAttributes()
+self.RefreshSizerElement(paramswindow, psizer, self.PluginRoot, plugin_infos, None, False)
+paramswindow.Hide()
+minimizebutton_id = wx.NewId()
+minimizebutton = wx.lib.buttons.GenBitmapToggleButton(id=minimizebutton_id, bitmap=wx.Bitmap(os.path.join(CWD, 'images', 'Maximize.png')),
+name='MinimizeButton', parent=plcwindow, pos=wx.Point(0, 0),
+size=wx.Size(24, 24), style=wx.NO_BORDER)
+minimizebutton.GetBackgroundBrush = gen_mini_GetBackgroundBrush(minimizebutton)
+minimizebutton.SetBackgroundColour(wx.Colour(208, 208, 208))
+minimizebutton.labelDelta = 0
+minimizebutton.SetBezelWidth(0)
+minimizebutton.SetUseFocusIndicator(False)
+minimizebutton.SetBitmapSelected(wx.Bitmap(os.path.join(CWD, 'images', 'Minimize.png')))
+def togglewindow(event):
+if minimizebutton.GetToggle():
+paramswindow.Show()
+msizer.SetCols(1)
+else:
+paramswindow.Hide()
+msizer.SetCols(len(self.PluginRoot.PluginMethods))
+self.PLCConfigMainSizer.Layout()
+self.RefreshScrollBars()
+event.Skip()
+minimizebutton.Bind(wx.EVT_BUTTON, togglewindow, id=minimizebutton_id)
+plcwindowmainsizer.AddWindow(minimizebutton, 0, border=5, flag=wx.ALL)
+self.PLCConfigMainSizer.Layout()
+self.RefreshScrollBars()
 def RefreshPluginTree(self):
-self.DisableEvents = True
+self.ClearSizer(self.PluginTreeSizer)
-infos = self.PluginRoot.GetPlugInfos()
+if self.PluginRoot.HasProjectOpened():
-root = self.PluginTree.GetRootItem()
+index = [0]
-if root is None or not root.IsOk():
+for child in self.PluginRoot.IECSortedChilds():
-root = self.PluginTree.AddRoot(infos["name"])
+self.GenerateTreeBranch(child, index)
-last_selected = self.GetSelectedPluginName()
+if not self.PluginInfos[child]["expanded"]:
-self.GenerateTreeBranch(root, infos, True)
+self.CollapsePlugin(child)
-self.PluginTree.Expand(self.PluginTree.GetRootItem())
+self.PLCConfigMainSizer.Layout()
-self.SelectedPluginByName(root, last_selected)
+self.RefreshScrollBars()
-if wx.VERSION < (2, 8, 0):
+def ExpandPlugin(self, plugin, force = False):
-self.RefreshPluginParams()
+for child in self.PluginInfos[plugin]["children"]:
+self.PluginTreeSizer.Show(self.PluginInfos[child]["left"])
-self.DisableEvents = False
+self.PluginTreeSizer.Show(self.PluginInfos[child]["right"])
-self.MustRecalTreeSizes = True
+if force or not self.PluginInfos[child]["expanded"]:
+self.ExpandPlugin(child, force)
-def SelectedPluginByName(self, root, name):
+if force:
-if name:
+self.PluginInfos[child]["expanded"] = True
-toks = name.split('.', 1)
-item, root_cookie = self.PluginTree.GetFirstChild(root)
+def CollapsePlugin(self, plugin, force = False):
-while item is not None and item.IsOk():
+for child in self.PluginInfos[plugin]["children"]:
-if self.PluginTree.GetPyData(item) == toks[0]:
+self.PluginTreeSizer.Hide(self.PluginInfos[child]["left"])
-if len(toks)>1:
+self.PluginTreeSizer.Hide(self.PluginInfos[child]["right"])
-return self.SelectedPluginByName(item, toks[1])
+if force or self.PluginInfos[child]["expanded"]:
-else:
+self.CollapsePlugin(child, force)
-self.PluginTree.SelectItem(item, True)
+if force:
-return True
+self.PluginInfos[child]["expanded"] = False
-item, root_cookie = self.PluginTree.GetNextChild(root, root_cookie)
-return False
+def GenerateTreeBranch(self, plugin, index):
+leftwindow = wx.Panel(self.PLCConfig, -1, size=wx.Size(-1, -1))
-def GenerateTreeBranch(self, root, infos, first = False):
+leftwindow.SetBackgroundColour(WINDOW_COLOUR)
-to_delete = []
-self.PluginTree.SetItemText(root, infos["name"])
+if plugin not in self.PluginInfos:
-self.PluginTree.SetPyData(root, infos["type"])
+self.PluginInfos[plugin] = {"expanded" : False, "left_visible" : False, "right_visible" : False}
-if wx.VERSION >= (2, 8, 0):
+self.PluginInfos[plugin]["children"] = plugin.IECSortedChilds()
-plugin = self.GetSelectedPlugin(root)
-if plugin is not None:
+self.PluginTreeSizer.AddWindow(leftwindow, 0, border=0, flag=wx.GROW)
-old_window = self.PluginTree.GetItemWindow(root)
-if old_window is not None:
+leftwindowsizer = wx.FlexGridSizer(cols=1, rows=2)
-old_window.GetSizer().Clear(True)
+leftwindowsizer.AddGrowableCol(0)
-old_window.Destroy()
+leftwindowsizer.AddGrowableRow(1)
+leftwindow.SetSizer(leftwindowsizer)
-outside = wx.Panel(self.PluginTree, -1, size=wx.Size(-1, -1))
-outside.SetBackgroundColour(wx.WHITE)
+leftbuttonmainsizer = wx.FlexGridSizer(cols=3, rows=1)
+leftbuttonmainsizer.AddGrowableCol(0)
-insidesizer = wx.FlexGridSizer(cols=2,rows=1)
+leftwindowsizer.AddSizer(leftbuttonmainsizer, 0, border=5, flag=wx.GROW|wx.ALL)
-insidesizer.AddGrowableCol(1)
+leftbuttonsizer = wx.BoxSizer(wx.HORIZONTAL)
-outside.SetSizer(insidesizer)
+leftbuttonmainsizer.AddSizer(leftbuttonsizer, 0, border=15, flag=wx.GROW|wx.RIGHT)
-insidesizer.AddSpacer(-1)
+ieccsizer = wx.BoxSizer(wx.VERTICAL)
+leftbuttonsizer.AddSizer(ieccsizer, 0, border=15, flag=wx.RIGHT|wx.ALIGN_CENTER_VERTICAL)
-window = wx.Panel(outside, -1, size=wx.Size(-1, -1))
-window.SetBackgroundColour(wx.Colour(250,250,255))
+plugin_IECChannel = plugin.BaseParams.getIEC_Channel()
-insidesizer.AddWindow(window, border=1, flag=wx.GROW|wx.ALL)
+ieccdownbutton_id = wx.NewId()
-tcsizer = wx.FlexGridSizer(cols=3, hgap=0, rows=1, vgap=0)
+ieccdownbutton = wx.lib.buttons.GenBitmapButton(id=ieccdownbutton_id, bitmap=wx.Bitmap(os.path.join(CWD, 'images', 'IECCDown.png')),
+name='IECCDownButton', parent=leftwindow, pos=wx.Point(0, 0),
-if "channel" in infos:
+size=wx.Size(16, 16), style=wx.NO_BORDER)
-sc = wx.SpinCtrl(window, -1, size=wx.Size(50, 25))
+if plugin_IECChannel > 0:
-sc.SetValue(infos["channel"])
+ieccdownbutton.Bind(wx.EVT_BUTTON, self.GetItemChannelChangedFunction(plugin, plugin_IECChannel - 1), id=ieccdownbutton_id)
-sc.Bind(wx.EVT_SPINCTRL, self.GetItemChannelChangedFunction(root))
+else:
-tcsizer.AddWindow(sc, 0, border=5, flag=wx.LEFT|wx.TOP|wx.BOTTOM|wx.ALIGN_CENTER)
+ieccdownbutton.Enable(False)
+ieccsizer.AddWindow(ieccdownbutton, 0, border=0, flag=wx.ALIGN_CENTER)
-bsizer = wx.BoxSizer(wx.HORIZONTAL)
+st = wx.StaticText(leftwindow, -1)
-if "parent" in infos or plugin == self.PluginRoot:
+st.SetFont(wx.Font(faces["size"], wx.DEFAULT, wx.NORMAL, wx.BOLD, faceName = faces["helv"]))
-addbutton_id = wx.NewId()
+st.SetLabel(plugin.GetFullIEC_Channel())
-addbutton = wx.lib.buttons.GenBitmapButton(id=addbutton_id, bitmap=wx.Bitmap(os.path.join(CWD, 'images', 'Add24x24.png')),
+ieccsizer.AddWindow(st, 0, border=0, flag=0)
-name='AddBusButton', parent=window, pos=wx.Point(0, 0),
-size=wx.Size(24, 24), style=wx.NO_BORDER)
+ieccupbutton_id = wx.NewId()
-addbutton.SetToolTipString("Add a plugin to this one")
+ieccupbutton = wx.lib.buttons.GenBitmapTextButton(id=ieccupbutton_id, bitmap=wx.Bitmap(os.path.join(CWD, 'images', 'IECCUp.png')),
-addbutton.Bind(wx.EVT_BUTTON, self.GetAddButtonFunction(root, window), id=addbutton_id)
+name='IECCUpButton', parent=leftwindow, pos=wx.Point(0, 0),
-bsizer.AddWindow(addbutton, 0, border=5, flag=wx.LEFT|wx.RIGHT|wx.TOP|wx.BOTTOM|wx.ALIGN_CENTER)
+size=wx.Size(16, 16), style=wx.NO_BORDER)
+ieccupbutton.Bind(wx.EVT_BUTTON, self.GetItemChannelChangedFunction(plugin, plugin_IECChannel + 1), id=ieccupbutton_id)
-if plugin != self.PluginRoot:
+ieccsizer.AddWindow(ieccupbutton, 0, border=0, flag=wx.ALIGN_CENTER)
-deletebutton_id = wx.NewId()
-deletebutton = wx.lib.buttons.GenBitmapButton(id=deletebutton_id, bitmap=wx.Bitmap(os.path.join(CWD, 'images', 'Delete24x24.png')),
+if len(self.PluginInfos[plugin]["children"]) > 0:
-name='DeleteBusButton', parent=window, pos=wx.Point(0, 0),
+expandbutton_id = wx.NewId()
-size=wx.Size(24, 24), style=wx.NO_BORDER)
+expandbutton = wx.lib.buttons.GenBitmapToggleButton(id=expandbutton_id, bitmap=wx.Bitmap(os.path.join(CWD, 'images', 'plus.png')),
-deletebutton.SetToolTipString("Delete this plugin")
+name='ExpandButton', parent=leftwindow, pos=wx.Point(0, 0),
-deletebutton.Bind(wx.EVT_BUTTON, self.GetDeleteButtonFunction(root), id=deletebutton_id)
+size=wx.Size(13, 13), style=wx.NO_BORDER)
-bsizer.AddWindow(deletebutton, 0, border=5, flag=wx.RIGHT|wx.TOP|wx.BOTTOM|wx.ALIGN_CENTER)
+expandbutton.labelDelta = 0
+expandbutton.SetBezelWidth(0)
-plugin_infos = plugin.GetParamsAttributes()
+expandbutton.SetUseFocusIndicator(False)
+expandbutton.SetBitmapSelected(wx.Bitmap(os.path.join(CWD, 'images', 'minus.png')))
-psizer = wx.BoxSizer(wx.HORIZONTAL)
+expandbutton.SetToggle(self.PluginInfos[plugin]["expanded"])
-self.RefreshSizerElement(window, psizer, plugin, plugin_infos, None, True, root)
+def togglebutton(event):
-msizer = wx.BoxSizer(wx.VERTICAL)
+if expandbutton.GetToggle():
-msizer.AddSizer(bsizer, 0, border=0, flag=wx.GROW)
+self.ExpandPlugin(plugin)
-if len(plugin.PluginMethods) > 0: #and plugin != self.PluginRoot
-for plugin_method in plugin.PluginMethods:
-if "method" in plugin_method:
-id = wx.NewId()
-button = wx.lib.buttons.GenBitmapTextButton(id=id, parent=window,
-bitmap=wx.Bitmap(os.path.join(CWD, "%s24x24.png"%plugin_method.get("bitmap", os.path.join("images", "Unknown")))), label=plugin_method["name"],
-name=plugin_method["name"], pos=wx.DefaultPosition, style=wx.NO_BORDER)
-button.SetToolTipString(plugin_method["tooltip"])
-button.Bind(wx.EVT_BUTTON, self.GetButtonCallBackFunction(plugin, plugin_method["method"]), id=id)
-#hack to force size to mini
-gen_mini_GetLabelSize = lambda obj:lambda:(wx.lib.buttons.GenBitmapTextButton._GetLabelSize(obj)[:-1] + (False,))
-button._GetLabelSize = gen_mini_GetLabelSize(button)
-#button._GetLabelSize = lambda :(-1,-1,False)
-msizer.AddWindow(button, 0, border=5, flag=0)
-tcsizer.AddSizer(msizer, 0, border=0, flag=wx.ALIGN_CENTER_VERTICAL)
-tcsizer.AddSizer(psizer, 0, border=0, flag=wx.GROW)
-if plugin == self.PluginRoot:
-tcsizer.AddGrowableCol(0)
 else:
-tcsizer.AddGrowableCol(1)
+self.CollapsePlugin(plugin)
+self.PluginInfos[plugin]["expanded"] = expandbutton.GetToggle()
-window.SetSizer(tcsizer)
+self.PLCConfigMainSizer.Layout()
-insidesizer.Fit(outside)
+self.RefreshScrollBars()
-self.PluginTree.SetItemWindow(root, outside)
+event.Skip()
-if "enabled" in infos:
+expandbutton.Bind(wx.EVT_BUTTON, togglebutton, id=expandbutton_id)
-self.PluginTree.CheckItem(root, infos["enabled"])
+leftbuttonsizer.AddWindow(expandbutton, 0, border=5, flag=wx.RIGHT|wx.ALIGN_CENTER_VERTICAL)
-self.PluginTree.SetItemWindowEnabled(root, infos["enabled"])
+tc_id = wx.NewId()
-item, root_cookie = self.PluginTree.GetFirstChild(root)
+tc = wx.TextCtrl(leftwindow, tc_id, size=wx.Size(150, 35), style=wx.TE_PROCESS_ENTER|wx.NO_BORDER)
-for values in infos["values"]:
+tc.SetFont(wx.Font(faces["size"] * 0.75, wx.DEFAULT, wx.NORMAL, wx.BOLD, faceName = faces["helv"]))
-if item is None or not item.IsOk():
+tc.SetValue(plugin.MandatoryParams[1].getName())
-item = self.PluginTree.AppendItem(root, "")
+tc.Bind(wx.EVT_TEXT_ENTER, self.GetTextCtrlCallBackFunction(tc, plugin, "BaseParams.Name"), id=tc_id)
-# 2.6.x returns bad item on gtk
+leftbuttonsizer.AddWindow(tc, 0, border=5, flag=wx.RIGHT|wx.ALIGN_CENTER_VERTICAL)
-if wx.Platform != '__WXMSW__' or wx.VERSION >= (2, 8, 0):
-item, root_cookie = self.PluginTree.GetNextChild(root, root_cookie)
+enablebutton_id = wx.NewId()
-self.GenerateTreeBranch(item, values)
+enablebutton = wx.lib.buttons.GenBitmapTextToggleButton(id=enablebutton_id, bitmap=wx.Bitmap(os.path.join(CWD, 'images', 'Disabled.png')),
-item, root_cookie = self.PluginTree.GetNextChild(root, root_cookie)
+name='EnableButton', parent=leftwindow, pos=wx.Point(0, 0), label="Enabled", style=wx.NO_BORDER)
-while item is not None and item.IsOk():
+enablebutton.GetBackgroundBrush = gen_mini_GetBackgroundBrush(enablebutton)
-to_delete.append(item)
+enablebutton.SetBackgroundColour(wx.Colour(208, 208, 208))
-item, root_cookie = self.PluginTree.GetNextChild(root, root_cookie)
+enablebutton._GetLabelSize = gen_mini_GetLabelSize(enablebutton)
-for item in to_delete:
+enablebutton.labelDelta = 0
-self.PluginTree.Delete(item)
+enablebutton.SetBezelWidth(0)
+enablebutton.SetUseFocusIndicator(False)
-MustRecalTreeSizes = False
+enablebutton.SetBitmapSelected(wx.Bitmap(os.path.join(CWD, 'images', 'Enabled.png')))
-def OnPluginTreeIdle(self,event):
+enablebutton.SetToggle(plugin.MandatoryParams[1].getEnabled())
-if self.MustRecalTreeSizes:
-self.ResizePluginTreeWindow()
+def toggleenablebutton(event):
-event.RequestMore()
+res, StructChanged = plugin.SetParamsAttribute("BaseParams.Enabled", enablebutton.GetToggle(), self.Log)
-event.Skip()
+if StructChanged: wx.CallAfter(self.RefreshPluginTree)
+enablebutton.SetToggle(res)
-def ResizePluginTreeWindow(self):
+event.Skip()
-if getattr(self, "PluginRoot", None):
+enablebutton.Bind(wx.EVT_BUTTON, toggleenablebutton, id=enablebutton_id)
-root = self.PluginTree.GetRootItem()
+leftbuttonsizer.AddWindow(enablebutton, 0, border=5, flag=wx.RIGHT|wx.ALIGN_CENTER_VERTICAL)
-if root is not None and root.IsOk():
-minimalsz = wx.Size(-1,-1)
+if len(plugin.PlugChildsTypes) > 0:
-minimalpos = wx.Point(-1,-1)
+addbutton_id = wx.NewId()
-itemswindows = self.ResizePluginTreeWindow_r(root, minimalsz, minimalpos)
+addbutton = wx.lib.buttons.GenBitmapButton(id=addbutton_id, bitmap=wx.Bitmap(os.path.join(CWD, 'images', 'AddPlugin.png')),
-for window, posx in itemswindows:
+name='AddBusButton', parent=leftwindow, pos=wx.Point(0, 0),
-spacer_width = minimalpos.x - posx
+size=wx.Size(24, 24), style=wx.NO_BORDER)
-window.GetSizer().GetItem(0).SetSpacer(wx.Size(spacer_width,-1))
+addbutton.GetBackgroundBrush = gen_mini_GetBackgroundBrush(addbutton)
-window.SetSize(wx.Size(spacer_width + minimalsz.x, -1))
+addbutton.SetToolTipString("Add a plugin to this one")
-window.GetSizer().Layout()
+addbutton.Bind(wx.EVT_BUTTON, self.GetAddButtonFunction(plugin, leftwindow), id=addbutton_id)
-#wx.MessageBox(str(itemswindows) + "\n" + str(minimalpos) + "\n" + str(minimalsz) + "\n" + str(window.GetSizer().GetItem(0).GetSpacer()))
+leftbuttonsizer.AddWindow(addbutton, 0, border=5, flag=wx.RIGHT|wx.ALIGN_CENTER)
-self.MustRecalTreeSizes = False
+leftminimizebutton_id = wx.NewId()
-def ResizePluginTreeWindow_r(self, root, sz, pt):
+leftminimizebutton = wx.lib.buttons.GenBitmapToggleButton(id=leftminimizebutton_id, bitmap=wx.Bitmap(os.path.join(CWD, 'images', 'Maximize.png')),
-window = self.PluginTree.GetItemWindow(root)
+name='MinimizeButton', parent=leftwindow, pos=wx.Point(0, 0),
-posx = window.GetPosition().x
+size=wx.Size(24, 24), style=wx.NO_BORDER)
-res = [(window,posx)]
+leftminimizebutton.GetBackgroundBrush = gen_mini_GetBackgroundBrush(leftminimizebutton)
-window.GetSizer().GetItem(0).SetSpacer(wx.Size(0,0))
+leftminimizebutton.SetBackgroundColour(wx.Colour(208, 208, 208))
-bestsz = window.GetBestSize()
+leftminimizebutton.labelDelta = 0
-pt.x = max(pt.x, posx)
+leftminimizebutton.SetBezelWidth(0)
-sz.x = max(sz.x, bestsz.x)
+leftminimizebutton.SetUseFocusIndicator(False)
-if root.IsExpanded():
+leftminimizebutton.SetBitmapSelected(wx.Bitmap(os.path.join(CWD, 'images', 'Minimize.png')))
-item, root_cookie = self.PluginTree.GetFirstChild(root)
+leftminimizebutton.SetToggle(self.PluginInfos[plugin]["left_visible"])
-while item is not None and item.IsOk() :
+def toggleleftwindow(event):
-res.extend(self.ResizePluginTreeWindow_r(item, sz, pt))
+if leftminimizebutton.GetToggle():
-item, root_cookie = self.PluginTree.GetNextChild(root, root_cookie)
+leftwindowsizer.Show(1)
-return res
+else:
+leftwindowsizer.Hide(1)
-def GetSelectedPluginName(self, selected = None):
+self.PluginInfos[plugin]["left_visible"] = leftminimizebutton.GetToggle()
-if selected is None:
+self.PLCConfigMainSizer.Layout()
-selected = self.PluginTree.GetSelection()
+self.RefreshScrollBars()
-if selected is None or not selected.IsOk():
+event.Skip()
-return None
+leftminimizebutton.Bind(wx.EVT_BUTTON, toggleleftwindow, id=leftminimizebutton_id)
-if selected == self.PluginTree.GetRootItem():
+leftbuttonmainsizer.AddWindow(leftminimizebutton, 0, border=5, flag=wx.RIGHT|wx.ALIGN_CENTER)
-return ""
+deletebutton_id = wx.NewId()
+deletebutton = wx.lib.buttons.GenBitmapButton(id=deletebutton_id, bitmap=wx.Bitmap(os.path.join(CWD, 'images', 'Delete24x24.png')),
+name='DeleteBusButton', parent=leftwindow, pos=wx.Point(0, 0),
+size=wx.Size(24, 24), style=wx.NO_BORDER)
+deletebutton.SetToolTipString("Delete this plugin")
+deletebutton.Bind(wx.EVT_BUTTON, self.GetDeleteButtonFunction(plugin), id=deletebutton_id)
+leftbuttonmainsizer.AddWindow(deletebutton, 0, border=5, flag=wx.RIGHT|wx.ALIGN_CENTER)
+lb = wx.ListBox(leftwindow, -1, size=wx.Size(-1, 100), style=wx.NO_BORDER)
+for location in plugin.GetLocations():
+lb.Append(location["NAME"].replace("__", "%").replace("_", "."))
+if not self.PluginInfos[plugin]["left_visible"]:
+lb.Hide()
+leftwindowsizer.AddWindow(lb, 0, border=5, flag=wx.GROW|wx.ALL)
+rightwindow = wx.Panel(self.PLCConfig, -1, size=wx.Size(-1, -1))
+rightwindow.SetBackgroundColour(wx.Colour(240,240,240))
+self.PluginTreeSizer.AddWindow(rightwindow, 0, border=0, flag=wx.GROW)
+rightwindowmainsizer = wx.BoxSizer(wx.VERTICAL)
+rightwindow.SetSizer(rightwindowmainsizer)
+rightwindowsizer = wx.FlexGridSizer(cols=2, rows=1)
+rightwindowsizer.AddGrowableCol(1)
+rightwindowsizer.AddGrowableRow(0)
+rightwindowmainsizer.AddSizer(rightwindowsizer, 0, border=17, flag=wx.TOP|wx.GROW)
+if self.PluginInfos[plugin]["right_visible"]:
+msizer = wx.FlexGridSizer(cols=1)
 else:
-name = self.PluginTree.GetPyData(selected)
+msizer = wx.FlexGridSizer(cols=len(plugin.PluginMethods))
-item = self.PluginTree.GetItemParent(selected)
+rightwindowsizer.AddSizer(msizer, 0, border=0, flag=wx.GROW)
-while item.IsOk() and item != self.PluginTree.GetRootItem():
+if len(plugin.PluginMethods) > 0:
-name = "%s.%s"%(self.PluginTree.GetPyData(item), name)
+for plugin_method in plugin.PluginMethods:
-item = self.PluginTree.GetItemParent(item)
+if "method" in plugin_method:
-return name
+id = wx.NewId()
+button = wx.lib.buttons.GenBitmapTextButton(id=id, parent=rightwindow,
-def GetSelectedPlugin(self, selected = None):
+bitmap=wx.Bitmap(os.path.join(CWD, "%s24x24.png"%plugin_method.get("bitmap", os.path.join("images", "Unknown")))), label=plugin_method["name"],
-name = self.GetSelectedPluginName(selected)
+name=plugin_method["name"], pos=wx.DefaultPosition, style=wx.NO_BORDER)
-if name is None:
+button.SetToolTipString(plugin_method["tooltip"])
-return None
+button.Bind(wx.EVT_BUTTON, self.GetButtonCallBackFunction(plugin, plugin_method["method"]), id=id)
-elif name == "":
+#hack to force size to mini
-return self.PluginRoot
+button._GetLabelSize = gen_mini_GetLabelSize(button)
-else:
+#button._GetLabelSize = lambda :(-1,-1,False)
-return self.PluginRoot.GetChildByName(name)
+msizer.AddWindow(button, 0, border=0, flag=0)
-def OnPluginTreeItemSelected(self, event):
+rightparamssizer = wx.BoxSizer(wx.HORIZONTAL)
-if wx.VERSION < (2, 8, 0):
+rightwindowsizer.AddSizer(rightparamssizer, 0, border=0, flag=wx.ALIGN_RIGHT)
-wx.CallAfter(self.RefreshPluginParams)
-event.Skip()
+paramswindow = wx.Panel(rightwindow, -1, size=wx.Size(-1, -1))
+paramswindow.SetBackgroundColour(WINDOW_COLOUR)
-def OnPluginTreeItemChecked(self, event):
-if not self.DisableEvents:
+psizer = wx.BoxSizer(wx.HORIZONTAL)
-item = event.GetItem()
+paramswindow.SetSizer(psizer)
-plugin = self.GetSelectedPlugin(item)
-if plugin:
+rightparamssizer.AddWindow(paramswindow, 0, border=5, flag=wx.ALL)
-res, StructChanged = plugin.SetParamsAttribute("BaseParams.Enabled", self.PluginTree.IsItemChecked(item), self.Log)
-wx.CallAfter(self.RefreshPluginTree)
+plugin_infos = plugin.GetParamsAttributes()
-event.Skip()
+self.RefreshSizerElement(paramswindow, psizer, plugin, plugin_infos, None, False)
-def OnPluginTreeItemBeginEdit(self, event):
+if not self.PluginInfos[plugin]["right_visible"]:
-if event.GetItem() == self.PluginTree.GetRootItem():
+paramswindow.Hide()
-event.Veto()
-else:
+rightminimizebutton_id = wx.NewId()
+rightminimizebutton = wx.lib.buttons.GenBitmapToggleButton(id=rightminimizebutton_id, bitmap=wx.Bitmap(os.path.join(CWD, 'images', 'Maximize.png')),
+name='MinimizeButton', parent=rightwindow, pos=wx.Point(0, 0),
+size=wx.Size(24, 24), style=wx.NO_BORDER)
+rightminimizebutton.GetBackgroundBrush = gen_mini_GetBackgroundBrush(rightminimizebutton)
+rightminimizebutton.SetBackgroundColour(wx.Colour(208, 208, 208))
+rightminimizebutton.labelDelta = 0
+rightminimizebutton.SetBezelWidth(0)
+rightminimizebutton.SetUseFocusIndicator(False)
+rightminimizebutton.SetBitmapSelected(wx.Bitmap(os.path.join(CWD, 'images', 'Minimize.png')))
+rightminimizebutton.SetToggle(self.PluginInfos[plugin]["right_visible"])
+def togglerightwindow(event):
+if rightminimizebutton.GetToggle():
+rightparamssizer.Show(0)
+msizer.SetCols(1)
+else:
+rightparamssizer.Hide(0)
+msizer.SetCols(len(plugin.PluginMethods))
+self.PluginInfos[plugin]["right_visible"] = rightminimizebutton.GetToggle()
+self.PLCConfigMainSizer.Layout()
+self.RefreshScrollBars()
 event.Skip()
+rightminimizebutton.Bind(wx.EVT_BUTTON, togglerightwindow, id=rightminimizebutton_id)
-def OnPluginTreeItemEndEdit(self, event):
+rightparamssizer.AddWindow(rightminimizebutton, 0, border=5, flag=wx.ALL)
-if event.GetLabel() == "":
-event.Veto()
+self.PluginInfos[plugin]["left"] = index[0]
-elif not self.DisableEvents:
+self.PluginInfos[plugin]["right"] = index[0] + 1
-plugin = self.GetSelectedPlugin()
+index[0] += 2
-if plugin:
+for child in self.PluginInfos[plugin]["children"]:
-res, StructChanged = plugin.SetParamsAttribute("BaseParams.Name", event.GetLabel(), self.Log)
+self.GenerateTreeBranch(child, index)
-wx.CallAfter(self.RefreshPluginTree)
+if not self.PluginInfos[child]["expanded"]:
-event.Skip()
+self.CollapsePlugin(child)
-def ShowChildrenWindows(self, root, show = True):
+def GetItemChannelChangedFunction(self, plugin, value):
-item, root_cookie = self.PluginTree.GetFirstChild(root)
-while item is not None and item.IsOk():
-window = self.PluginTree.GetItemWindow(item)
-if show:
-window.Show()
-else:
-window.Hide()
-if self.PluginTree.IsExpanded(item):
-self.ShowChildrenWindows(item, show)
-item, root_cookie = self.PluginTree.GetNextChild(root, root_cookie)
-def OnPluginTreeItemExpanded(self, event):
-self.ShowChildrenWindows(event.GetItem(), True)
-self.MustRecalTreeSizes = True
-event.Skip()
-def OnPluginTreeItemCollapsed(self, event):
-self.ShowChildrenWindows(event.GetItem(), False)
-event.Skip()
-def GetItemChannelChangedFunction(self, item):
 def OnPluginTreeItemChannelChanged(event):
-if not self.DisableEvents:
+res, StructChanged = plugin.SetParamsAttribute("BaseParams.IEC_Channel", value, self.Log)
-plugin = self.GetSelectedPlugin(item)
+wx.CallAfter(self.RefreshPluginTree)
-if plugin:
-res, StructChanged = plugin.SetParamsAttribute("BaseParams.IEC_Channel", event.GetInt(), self.Log)
-wx.CallAfter(self.RefreshPluginTree)
 event.Skip()
 return OnPluginTreeItemChannelChanged
-def _GetAddPluginFunction(self, name, selected = None):
+def _GetAddPluginFunction(self, name, plugin):
 def OnPluginMenu(event):
-self.AddPlugin(name, selected)
+self.AddPlugin(name, plugin)
 event.Skip()
 return OnPluginMenu
 def OnPluginTreeRightUp(self, event):
 plugin = self.GetSelectedPlugin()
 self.Bind(wx.EVT_MENU, self.OnDeleteButton, id=new_id)
 pos_x, pos_y = event.GetPosition()
 self.PluginTree.PopupMenuXY(main_menu, pos_x, pos_y)
 event.Skip()
-def RefreshPluginToolBar(self):
-if wx.VERSION < (2, 8, 0):
-self.ClearSizer(self.MenuSizer)
-else:
-# toolbar temporarely disabled.
-return
-if "ToolBar" in self.Panes:
-self.AUIManager.DetachPane(self.Panes["ToolBar"])
-self.Panes["ToolBar"].Destroy()
-if self.PluginRoot.HasOpenedProject() and len(self.PluginRoot.PluginMethods) > 0:
-if wx.VERSION > (2, 8, 0):
-toolbar = wx.ToolBar(self, -1, wx.DefaultPosition, wx.DefaultSize,
-wx.TB_FLAT | wx.TB_NODIVIDER | wx.NO_BORDER | wx.TB_TEXT)
-toolbar.SetToolBitmapSize(wx.Size(48, 48))
-else:
-boxsizer = wx.BoxSizer(wx.HORIZONTAL)
-width = 0
-for plugin_infos in self.PluginRoot.PluginMethods:
-if "method" in plugin_infos:
-id = wx.NewId()
-if "bitmap" in plugin_infos:
-if wx.VERSION < (2, 8, 0):
-button = wx.lib.buttons.GenBitmapTextButton(ID=id, parent=self.RightPanel,
-bitmap=wx.Bitmap(os.path.join(CWD, "%s32x32.png"%plugin_infos["bitmap"])), label=plugin_infos["name"],
-name=plugin_infos["name"], pos=wx.Point(0, 0), style=wx.BU_EXACTFIT|wx.NO_BORDER)
-else:
-button = wx.lib.buttons.GenBitmapTextButton(id=id, parent=toolbar,
-bitmap=wx.Bitmap(os.path.join(CWD, "%s32x32.png"%plugin_infos["bitmap"])), label=plugin_infos["name"],
-name=plugin_infos["name"], pos=wx.Point(0, 0), style=wx.BU_EXACTFIT|wx.NO_BORDER)
-button.SetSize(button.GetBestSize())
-else:
-if wx.VERSION < (2, 8, 0):
-button = wx.Button(id=id, label=plugin_infos["name"],
-name=plugin_infos["name"], parent=self.RightPanel,
-pos=wx.Point(0, 0), style=wx.BU_EXACTFIT)
-else:
-button = wx.Button(id=id, label=plugin_infos["name"],
-name=plugin_infos["name"], parent=toolbar,
-pos=wx.Point(0, 0), size=(-1, 48), style=wx.BU_EXACTFIT)
-button.SetToolTipString(plugin_infos["tooltip"])
-button.Bind(wx.EVT_BUTTON, self.GetButtonCallBackFunction(self.PluginRoot, plugin_infos["method"]), id=id)
-width += button.GetSize()[0]
-if wx.VERSION < (2, 8, 0):
-boxsizer.AddWindow(button, 0, border=5, flag=wx.GROW|wx.RIGHT)
-else:
-toolbar.AddControl(button)
-if wx.VERSION < (2, 8, 0):
-self.MenuSizer.AddSizer(boxsizer, 0, border=5, flag=wx.GROW|wx.ALL)
-self.RightGridSizer.Layout()
-else:
-toolbar.Realize()
-self.Panes["ToolBar"] = toolbar
-self.AUIManager.AddPane(toolbar, wx.aui.AuiPaneInfo().
-Name("ToolBar").Caption("Toolbar").
-ToolbarPane().Top().
-LeftDockable(False).RightDockable(False))
-if wx.Platform == '__WXMSW__':
-self.AUIManager.GetPane("ToolBar").BestSize(wx.Size(width + 3, 55))
-self.AUIManager.Update()
-def RefreshPluginParams(self):
-plugin = self.GetSelectedPlugin()
-if not plugin:
-# Refresh ParamsPanel
-self.ParamsPanel.Hide()
-# Refresh PluginChilds
-self.PluginChilds.Clear()
-self.PluginChilds.Enable(False)
-self.AddButton.Enable(False)
-self.DeleteButton.Enable(False)
-else:
-# Refresh ParamsPanel
-self.ParamsPanel.Show()
-infos = plugin.GetParamsAttributes()
-if len(self.MenuSizer.GetChildren()) > 1:
-self.ClearSizer(self.MenuSizer.GetChildren()[1].GetSizer())
-self.MenuSizer.Remove(1)
-self.ClearSizer(self.ParamsPanelMainSizer)
-self.RefreshSizerElement(self.ParamsPanel, self.ParamsPanelMainSizer, plugin, infos, None, False)
-if plugin != self.PluginRoot and len(plugin.PluginMethods) > 0:
-boxsizer = wx.BoxSizer(wx.HORIZONTAL)
-self.MenuSizer.AddSizer(boxsizer, 0, border=5, flag=wx.GROW|wx.ALL)
-for plugin_infos in plugin.PluginMethods:
-if "method" in plugin_infos:
-id = wx.NewId()
-if "bitmap" in plugin_infos:
-button = wx.lib.buttons.GenBitmapTextButton(ID=id, parent=self.RightPanel,
-bitmap=wx.Bitmap(os.path.join(CWD, "%s32x32.png"%plugin_infos["bitmap"])), label=plugin_infos["name"],
-name=plugin_infos["name"], pos=wx.Point(0, 0), style=wx.BU_EXACTFIT|wx.NO_BORDER)
-else:
-button = wx.Button(id=id, label=plugin_infos["name"],
-name=plugin_infos["name"], parent=self.RightPanel,
-pos=wx.Point(0, 0), style=wx.BU_EXACTFIT)
-button.SetToolTipString(plugin_infos["tooltip"])
-button.Bind(wx.EVT_BUTTON, self.GetButtonCallBackFunction(plugin, plugin_infos["method"]), id=id)
-boxsizer.AddWindow(button, 0, border=5, flag=wx.GROW|wx.RIGHT)
-self.RightGridSizer.Layout()
-self.ParamsPanelMainSizer.Layout()
-self.ParamsPanel.SetClientSize(self.ParamsPanel.GetClientSize())
-# Refresh PluginChilds
-self.PluginChilds.Clear()
-if len(plugin.PlugChildsTypes) > 0:
-self.PluginChilds.Append("")
-for name, XSDClass in plugin.PlugChildsTypes:
-self.PluginChilds.Append(name)
-self.PluginChilds.Enable(True)
-self.AddButton.Enable(True)
-else:
-self.PluginChilds.Enable(False)
-self.AddButton.Enable(False)
-self.DeleteButton.Enable(True)
 def GetButtonCallBackFunction(self, plugin, method):
 def OnButtonClick(event):
 method(plugin, self.Log)
 event.Skip()
 return OnButtonClick
-def GetChoiceCallBackFunction(self, choicectrl, plugin, path, selected=None):
+def GetChoiceCallBackFunction(self, choicectrl, plugin, path):
 def OnChoiceChanged(event):
-if plugin:
+res, StructChanged = plugin.SetParamsAttribute(path, choicectrl.GetStringSelection(), self.Log)
-res, StructChanged = plugin.SetParamsAttribute(path, choicectrl.GetStringSelection(), self.Log)
+if StructChanged: wx.CallAfter(self.RefreshPluginTree)
-if StructChanged: wx.CallAfter(self.RefreshPluginTree)
+choicectrl.SetStringSelection(res)
-choicectrl.SetStringSelection(res)
 event.Skip()
 return OnChoiceChanged
-def GetChoiceContentCallBackFunction(self, choicectrl, staticboxsizer, plugin, path, selected=None):
+def GetChoiceContentCallBackFunction(self, choicectrl, staticboxsizer, plugin, path):
 def OnChoiceContentChanged(event):
-if plugin:
+res, StructChanged = plugin.SetParamsAttribute(path, choicectrl.GetStringSelection(), self.Log)
-res, StructChanged = plugin.SetParamsAttribute(path, choicectrl.GetStringSelection(), self.Log)
+if StructChanged: wx.CallAfter(self.RefreshPluginTree)
-if StructChanged: wx.CallAfter(self.RefreshPluginTree)
+choicectrl.SetStringSelection(res)
-choicectrl.SetStringSelection(res)
+infos = self.PluginRoot.GetParamsAttributes(path)
-infos = self.PluginRoot.GetParamsAttributes(path)
+staticbox = staticboxsizer.GetStaticBox()
-staticbox = staticboxsizer.GetStaticBox()
+staticbox.SetLabel("%(name)s - %(value)s"%infos)
-staticbox.SetLabel("%(name)s - %(value)s"%infos)
+if wx.VERSION < (2, 8, 0):
-if wx.VERSION < (2, 8, 0):
+self.ParamsPanel.Freeze()
-self.ParamsPanel.Freeze()
+self.RefreshSizerElement(self.ParamsPanel, staticboxsizer, infos["children"], "%s.%s"%(path, infos["name"]), selected=selected)
-self.RefreshSizerElement(self.ParamsPanel, staticboxsizer, plugin, infos["children"], "%s.%s"%(path, infos["name"]), selected=selected)
+self.ParamsPanelMainSizer.Layout()
-self.ParamsPanelMainSizer.Layout()
+self.ParamsPanel.Thaw()
-self.ParamsPanel.Thaw()
+self.ParamsPanel.Refresh()
-self.ParamsPanel.Refresh()
+else:
-else:
+wx.CallAfter(self.RefreshPluginTree)
-wx.CallAfter(self.RefreshPluginTree)
 event.Skip()
 return OnChoiceContentChanged
-def GetTextCtrlCallBackFunction(self, textctrl, plugin, path, selected=None):
+def GetTextCtrlCallBackFunction(self, textctrl, plugin, path):
 def OnTextCtrlChanged(event):
-if plugin:
+res, StructChanged = plugin.SetParamsAttribute(path, textctrl.GetValue(), self.Log)
-res, StructChanged = plugin.SetParamsAttribute(path, textctrl.GetValue(), self.Log)
+if StructChanged: wx.CallAfter(self.RefreshPluginTree)
-if StructChanged: wx.CallAfter(self.RefreshPluginTree)
+textctrl.SetValue(res)
-textctrl.SetValue(res)
 event.Skip()
 return OnTextCtrlChanged
-def GetCheckBoxCallBackFunction(self, chkbx, plugin, path, selected=None):
+def GetCheckBoxCallBackFunction(self, chkbx, plugin, path):
 def OnCheckBoxChanged(event):
-if plugin:
+res, StructChanged = plugin.SetParamsAttribute(path, chkbx.IsChecked(), self.Log)
-res, StructChanged = plugin.SetParamsAttribute(path, chkbx.IsChecked(), self.Log)
+if StructChanged: wx.CallAfter(self.RefreshPluginTree)
-if StructChanged: wx.CallAfter(self.RefreshPluginTree)
+chkbx.SetValue(res)
-chkbx.SetValue(res)
 event.Skip()
 return OnCheckBoxChanged
 def ClearSizer(self, sizer):
 staticboxes = []
 staticboxes.append(item_sizer.GetStaticBox())
 sizer.Clear(True)
 for staticbox in staticboxes:
 staticbox.Destroy()
-def RefreshSizerElement(self, parent, sizer, plugin, elements, path, clean = True, selected = None):
+def RefreshSizerElement(self, parent, sizer, plugin, elements, path, clean = True):
 if clean:
-sizer.Clear(True)
+if wx.VERSION < (2, 8, 0):
+self.ClearSizer(sizer)
+else:
+sizer.Clear(True)
 first = True
 for element_infos in elements:
 if path:
 element_path = "%s.%s"%(path, element_infos["name"])
 else:
 else:
 sizer.AddSizer(boxsizer, 0, border=5, flag=wx.GROW|wx.LEFT|wx.RIGHT|wx.BOTTOM)
 bitmappath = os.path.join("images", "%s.png"%element_infos["name"])
 if os.path.isfile(bitmappath):
 staticbitmap = wx.StaticBitmap(id=-1, bitmap=wx.Bitmap(bitmappath),
+name="%s_bitmap"%element_infos["name"], parent=parent,
+pos=wx.Point(0, 0), size=wx.Size(24, 24), style=0)
+boxsizer.AddWindow(staticbitmap, 0, border=5, flag=wx.RIGHT)
+else:
+staticbitmap = wx.StaticBitmap(id=-1, bitmap=GenerateEmptyBitmap(),
 name="%s_bitmap"%element_infos["name"], parent=parent,
 pos=wx.Point(0, 0), size=wx.Size(24, 24), style=0)
 boxsizer.AddWindow(staticbitmap, 0, border=5, flag=wx.RIGHT)
 statictext = wx.StaticText(id=-1, label="%s:"%element_infos["name"],
 name="%s_label"%element_infos["name"], parent=parent,
 staticbox = wx.StaticBox(id=-1, label="%(name)s - %(value)s"%element_infos,
 name='%s_staticbox'%element_infos["name"], parent=parent,
 pos=wx.Point(0, 0), size=wx.Size(0, 0), style=0)
 staticboxsizer = wx.StaticBoxSizer(staticbox, wx.VERTICAL)
 sizer.AddSizer(staticboxsizer, 0, border=5, flag=wx.GROW|wx.BOTTOM)
-self.RefreshSizerElement(parent, staticboxsizer, plugin, element_infos["children"], element_path, selected)
+self.RefreshSizerElement(parent, staticboxsizer, plugin, element_infos["children"], element_path)
-callback = self.GetChoiceContentCallBackFunction(choicectrl, staticboxsizer, plugin, element_path, selected)
+callback = self.GetChoiceContentCallBackFunction(choicectrl, staticboxsizer, plugin, element_path)
 else:
 for choice in element_infos["type"]:
 choicectrl.Append(choice)
-callback = self.GetChoiceCallBackFunction(choicectrl, plugin, element_path, selected)
+callback = self.GetChoiceCallBackFunction(choicectrl, plugin, element_path)
 if element_infos["value"]:
 choicectrl.SetStringSelection(element_infos["value"])
 choicectrl.Bind(wx.EVT_CHOICE, callback, id=id)
 elif isinstance(element_infos["type"], types.DictType):
 boxsizer = wx.BoxSizer(wx.HORIZONTAL)
 else:
 sizer.AddSizer(boxsizer, 0, border=5, flag=wx.GROW|wx.LEFT|wx.RIGHT|wx.BOTTOM)
 bitmappath = os.path.join("images", "%s.png"%element_infos["name"])
 if os.path.isfile(bitmappath):
 staticbitmap = wx.StaticBitmap(id=-1, bitmap=wx.Bitmap(bitmappath),
+name="%s_bitmap"%element_infos["name"], parent=parent,
+pos=wx.Point(0, 0), size=wx.Size(24, 24), style=0)
+boxsizer.AddWindow(staticbitmap, 0, border=5, flag=wx.RIGHT)
+else:
+staticbitmap = wx.StaticBitmap(id=-1, bitmap=GenerateEmptyBitmap(),
 name="%s_bitmap"%element_infos["name"], parent=parent,
 pos=wx.Point(0, 0), size=wx.Size(24, 24), style=0)
 boxsizer.AddWindow(staticbitmap, 0, border=5, flag=wx.RIGHT)
 statictext = wx.StaticText(id=-1, label="%s:"%element_infos["name"],
 name="%s_label"%element_infos["name"], parent=parent,
 spinctrl = wx.SpinCtrl(id=id, name=element_infos["name"], parent=parent,
 pos=wx.Point(0, 0), size=wx.Size(150, 25), style=wx.SP_ARROW_KEYS|wx.ALIGN_RIGHT)
 spinctrl.SetRange(scmin,scmax)
 boxsizer.AddWindow(spinctrl, 0, border=0, flag=0)
 spinctrl.SetValue(element_infos["value"])
-spinctrl.Bind(wx.EVT_SPINCTRL, self.GetTextCtrlCallBackFunction(spinctrl, plugin, element_path, selected), id=id)
+spinctrl.Bind(wx.EVT_SPINCTRL, self.GetTextCtrlCallBackFunction(spinctrl, plugin, element_path), id=id)
 elif element_infos["type"] == "element":
 staticbox = wx.StaticBox(id=-1, label=element_infos["name"],
 name='%s_staticbox'%element_infos["name"], parent=parent,
 pos=wx.Point(0, 0), size=wx.Size(0, 0), style=0)
 staticboxsizer = wx.StaticBoxSizer(staticbox, wx.VERTICAL)
 if first:
 sizer.AddSizer(staticboxsizer, 0, border=0, flag=wx.GROW|wx.TOP)
 else:
 sizer.AddSizer(staticboxsizer, 0, border=0, flag=wx.GROW)
-self.RefreshSizerElement(parent, staticboxsizer, plugin, element_infos["children"], element_path, False, selected)
+self.RefreshSizerElement(parent, staticboxsizer, plugin, element_infos["children"], element_path)
 else:
 boxsizer = wx.BoxSizer(wx.HORIZONTAL)
 if first:
 sizer.AddSizer(boxsizer, 0, border=5, flag=wx.GROW|wx.ALL)
 else:
 if os.path.isfile(bitmappath):
 staticbitmap = wx.StaticBitmap(id=-1, bitmap=wx.Bitmap(bitmappath),
 name="%s_bitmap"%element_infos["name"], parent=parent,
 pos=wx.Point(0, 0), size=wx.Size(24, 24), style=0)
 boxsizer.AddWindow(staticbitmap, 0, border=5, flag=wx.RIGHT)
+else:
+staticbitmap = wx.StaticBitmap(id=-1, bitmap=GenerateEmptyBitmap(),
+name="%s_bitmap"%element_infos["name"], parent=parent,
+pos=wx.Point(0, 0), size=wx.Size(24, 24), style=0)
+boxsizer.AddWindow(staticbitmap, 0, border=5, flag=wx.RIGHT)
 statictext = wx.StaticText(id=-1, label="%s:"%element_infos["name"],
 name="%s_label"%element_infos["name"], parent=parent,
 pos=wx.Point(0, 0), size=wx.Size(100, 17), style=0)
 boxsizer.AddWindow(statictext, 0, border=4, flag=wx.TOP)
 id = wx.NewId()
 if element_infos["type"] == "boolean":
 checkbox = wx.CheckBox(id=id, name=element_infos["name"], parent=parent,
 pos=wx.Point(0, 0), size=wx.Size(17, 25), style=0)
 boxsizer.AddWindow(checkbox, 0, border=0, flag=0)
 checkbox.SetValue(element_infos["value"])
-checkbox.Bind(wx.EVT_CHECKBOX, self.GetCheckBoxCallBackFunction(checkbox, plugin, element_path, selected), id=id)
+checkbox.Bind(wx.EVT_CHECKBOX, self.GetCheckBoxCallBackFunction(checkbox, plugin, element_path), id=id)
 elif element_infos["type"] in ["unsignedLong", "long","integer"]:
 if element_infos["type"].startswith("unsigned"):
 scmin = 0
 else:
 scmin = -(2**31)
 spinctrl = wx.SpinCtrl(id=id, name=element_infos["name"], parent=parent,
 pos=wx.Point(0, 0), size=wx.Size(150, 25), style=wx.SP_ARROW_KEYS|wx.ALIGN_RIGHT)
 spinctrl.SetRange(scmin, scmax)
 boxsizer.AddWindow(spinctrl, 0, border=0, flag=0)
 spinctrl.SetValue(element_infos["value"])
-spinctrl.Bind(wx.EVT_SPINCTRL, self.GetTextCtrlCallBackFunction(spinctrl, plugin, element_path, selected), id=id)
+spinctrl.Bind(wx.EVT_SPINCTRL, self.GetTextCtrlCallBackFunction(spinctrl, plugin, element_path), id=id)
 else:
 textctrl = wx.TextCtrl(id=id, name=element_infos["name"], parent=parent,
 pos=wx.Point(0, 0), size=wx.Size(150, 25), style=wx.TE_PROCESS_ENTER)
 boxsizer.AddWindow(textctrl, 0, border=0, flag=0)
 textctrl.SetValue(str(element_infos["value"]))
-textctrl.Bind(wx.EVT_TEXT_ENTER, self.GetTextCtrlCallBackFunction(textctrl, plugin, element_path, selected), id=id)
+textctrl.Bind(wx.EVT_TEXT_ENTER, self.GetTextCtrlCallBackFunction(textctrl, plugin, element_path), id=id)
-textctrl.Bind(wx.EVT_KILL_FOCUS, self.GetTextCtrlCallBackFunction(textctrl, plugin, element_path, selected))
+textctrl.Bind(wx.EVT_KILL_FOCUS, self.GetTextCtrlCallBackFunction(textctrl, plugin, element_path))
 first = False
 def OnNewProjectMenu(self, event):
 defaultpath = self.PluginRoot.GetProjectPath()
 if not defaultpath:
 if dialog.ShowModal() == wx.ID_OK:
 projectpath = dialog.GetPath()
 dialog.Destroy()
 res = self.PluginRoot.NewProject(projectpath)
 if not res :
-self.RefreshPluginToolBar()
+self.RefreshPLCParams()
 self.RefreshPluginTree()
-self.RefreshButtons()
 self.RefreshMainMenu()
 else:
 message = wx.MessageDialog(self, res, "ERROR", wx.OK|wx.ICON_ERROR)
 message.ShowModal()
 message.Destroy()
 if dialog.ShowModal() == wx.ID_OK:
 projectpath = dialog.GetPath()
 if os.path.isdir(projectpath):
 result = self.PluginRoot.LoadProject(projectpath, self.Log)
 if not result:
-self.RefreshPluginToolBar()
+self.RefreshPLCParams()
 self.RefreshPluginTree()
-self.PluginTree.SelectItem(self.PluginTree.GetRootItem())
-self.RefreshButtons()
 self.RefreshMainMenu()
-self.PluginTree.ScrollWindow(0, self.PluginTree.GetClientSize()[1])
 else:
 message = wx.MessageDialog(self, result, "Error", wx.OK|wx.ICON_ERROR)
 message.ShowModal()
 message.Destroy()
 else:
 message.Destroy()
 dialog.Destroy()
 event.Skip()
 def OnCloseProjectMenu(self, event):
-self.RefreshPluginToolBar()
+self.PluginInfos = {}
+self.RefreshPLCParams()
 self.RefreshPluginTree()
-self.RefreshButtons()
 self.RefreshMainMenu()
 event.Skip()
 def OnSaveProjectMenu(self, event):
 if self.PluginRoot.HasProjectOpened():
 def OnDeleteButton(self, event):
 self.DeletePlugin()
 event.Skip()
-def CloseEditor(self, bus_id):
+def GetAddButtonFunction(self, plugin, window):
-if self.BusManagers.get(bus_id, None) != None:
-self.BusManagers[bus_id]["Editor"] = None
-def GetAddButtonFunction(self, item, window):
 def AddButtonFunction(event):
-plugin = self.GetSelectedPlugin(item)
 if plugin and len(plugin.PlugChildsTypes) > 0:
 plugin_menu = wx.Menu(title='')
 for name, XSDClass in plugin.PlugChildsTypes:
 new_id = wx.NewId()
 plugin_menu.Append(help='', id=new_id, kind=wx.ITEM_NORMAL, text=name)
-self.Bind(wx.EVT_MENU, self._GetAddPluginFunction(name, item), id=new_id)
+self.Bind(wx.EVT_MENU, self._GetAddPluginFunction(name, plugin), id=new_id)
 window_pos = window.GetPosition()
-wx.CallAfter(self.PluginTree.PopupMenu, plugin_menu)
+wx.CallAfter(self.PLCConfig.PopupMenu, plugin_menu)
 event.Skip()
 return AddButtonFunction
-def GetDeleteButtonFunction(self, item):
+def GetDeleteButtonFunction(self, plugin):
 def DeleteButtonFunction(event):
-wx.CallAfter(self.DeletePlugin, item)
+wx.CallAfter(self.DeletePlugin, plugin)
 event.Skip()
 return DeleteButtonFunction
-def AddPlugin(self, PluginType, selected = None):
+def AddPlugin(self, PluginType, plugin):
 dialog = wx.TextEntryDialog(self, "Please enter a name for plugin:", "Add Plugin", "", wx.OK|wx.CANCEL)
 if dialog.ShowModal() == wx.ID_OK:
 PluginName = dialog.GetValue()
-plugin = self.GetSelectedPlugin(selected)
 plugin.PlugAddChild(PluginName, PluginType, self.Log)
 self.RefreshPluginTree()
 dialog.Destroy()
-def DeletePlugin(self, selected = None):
+def DeletePlugin(self, plugin):
 dialog = wx.MessageDialog(self, "Really delete plugin ?", "Remove plugin", wx.YES_NO|wx.NO_DEFAULT)
 if dialog.ShowModal() == wx.ID_YES:
-plugin = self.GetSelectedPlugin(selected)
+self.PluginInfos.pop(plugin)
 plugin.PlugRemove()
 del plugin
 self.RefreshPluginTree()
 dialog.Destroy()

changeset 97	9c6fdf60ad2e
parent 94	c7fac98c9351
child 98	d359f0e7a97c