beremiz: comparison LPCBeremiz.py

equal deleted inserted replaced

-:180e4a7d945c
+:1c23952dbde1
 if __name__ == '__main__':
 __builtin__.__dict__['_'] = wx.GetTranslation#unicode_translation
 from Beremiz import *
-from plugger import PluginsRoot, PlugTemplate, opjimg, connectors
+from ConfigTree import ConfigTreeRoot, ConfigTreeNode, opjimg, connectors
 from plcopen.structures import LOCATIONDATATYPES
-from PLCControler import LOCATION_PLUGIN, LOCATION_MODULE, LOCATION_GROUP,\
+from PLCControler import LOCATION_CONFNODE, LOCATION_MODULE, LOCATION_GROUP,\
 LOCATION_VAR_INPUT, LOCATION_VAR_OUTPUT, LOCATION_VAR_MEMORY
 from PLCOpenEditor import IDEFrame, ProjectDialog
 havecanfestival = False
 try:
-from plugins.canfestival import RootClass as CanOpenRootClass
+from confnodes.canfestival import RootClass as CanOpenRootClass
-from plugins.canfestival.canfestival import _SlavePlug, _NodeListPlug, NodeManager
+from confnodes.canfestival.canfestival import _SlavePlug, _NodeListPlug, NodeManager
 havecanfestival = True
 except:
 havecanfestival = False
 #-------------------------------------------------------------------------------
-#                          CANFESTIVAL PLUGIN HACK
+#                          CANFESTIVAL CONFNODE HACK
 #-------------------------------------------------------------------------------
-# from plugins.canfestival import canfestival
+# from confnodes.canfestival import canfestival
 # class LPC_canfestival_config:
 #     def getCFLAGS(self, *args):
 #         return ""
 #
 #     def getLDFLAGS(self, *args):
 else:
 for group in module["children"]:
 if group["type"] == LOCATION_GROUP and child in group["children"]:
 group["children"].remove(child)
-BUS_TEXT = """/* Code generated by LPCBus plugin */
+BUS_TEXT = """/* Code generated by LPCBus confnode */
-/* LPCBus plugin includes */
+/* LPCBus confnode includes */
 #include "app_glue.h"
 #ifdef _WINDOWS_H
 #include "iec_types.h"
 #else
 #include "iec_std_lib.h"
 #endif
 %(declare_code)s
-/* LPCBus plugin user variables definition */
+/* LPCBus confnode user variables definition */
 %(var_decl)s
-/* LPCBus plugin functions */
+/* LPCBus confnode functions */
 int __init_%(location_str)s(int argc,char **argv)
 {
 %(init_code)s
 return 0;
 }
 "description": infos["description"],
 "children": []}
 def GetVariableLocationTree(self):
 return {"name": self.BaseParams.getName(),
-"type": LOCATION_PLUGIN,
+"type": LOCATION_CONFNODE,
 "location": self.GetFullIEC_Channel(),
 "icon": self.Icon,
 "children": [self._GetVariableLocationTree(self.GetCurrentLocation(), child)
 for child in self.VariableLocationTree]}
 return False
 def PlugGenerate_C(self, buildpath, locations):
 """
 Generate C code
-@param current_location: Tupple containing plugin IEC location : %I0.0.4.5 => (0,0,4,5)
+@param current_location: Tupple containing confnode IEC location : %I0.0.4.5 => (0,0,4,5)
 @param locations: List of complete variables locations \
 [{"IEC_TYPE" : the IEC type (i.e. "INT", "STRING", ...)
 "NAME" : name of the variable (generally "__IW0_1_2" style)
 "DIR" : direction "Q","I" or "M"
 "SIZE" : size "X", "B", "W", "D", "L"
 matiec_flags = '"-I%s"'%os.path.abspath(self.GetPlugRoot().GetIECLibPath())
 return [(Gen_Module_path, matiec_flags)],"",True
 #-------------------------------------------------------------------------------
-#                          LPC CanFestival Plugin Class
+#                          LPC CanFestival ConfNode Class
 #-------------------------------------------------------------------------------
 if havecanfestival:
 DEFAULT_SETTINGS = {
 def GetCanDriver(self):
 return ""
 def LoadChilds(self):
-PlugTemplate.LoadChilds(self)
+ConfigTreeNode.LoadChilds(self)
 if self.GetChildByName("Master") is None:
 master = self.PlugAddChild("Master", "CanOpenNode", 0)
 master.BaseParams.setEnabled(False)
 slave = self.PlugAddChild("Slave", "CanOpenSlave", 1)
 slave.BaseParams.setEnabled(False)
 #-------------------------------------------------------------------------------
-#                              LPCPluginsRoot Class
+#                              LPCConfigTreeRoot Class
 #-------------------------------------------------------------------------------
 def mycopytree(src, dst):
 """
 Copy content of a directory to an other, omit hidden files
 elif os.path.isfile(srcpath):
 shutil.copy2(srcpath, dstpath)
 [SIMULATION_MODE, TRANSFER_MODE] = range(2)
-class LPCPluginsRoot(PluginsRoot):
+class LPCConfigTreeRoot(ConfigTreeRoot):
-PluginMethods = [
+ConfNodeMethods = [
 {"bitmap" : opjimg("Debug"),
 "name" : _("Simulate"),
 "tooltip" : _("Simulate PLC"),
 "method" : "_Simulate"},
 {"bitmap" : opjimg("Run"),
 ]
 def __init__(self, frame, logger, buildpath):
 self.OrigBuildPath = buildpath
-PluginsRoot.__init__(self, frame, logger)
+ConfigTreeRoot.__init__(self, frame, logger)
 if havecanfestival:
 self.PlugChildsTypes += [("LPCBus", LPCBus, "LPC bus"), ("CanOpen", LPCCanOpen, "CanOpen bus")]
 else:
 self.PlugChildsTypes += [("LPCBus", LPCBus, "LPC bus")]
 self.SimulationBuildPath = None
 self.AbortTransferTimer = None
-def PluginLibraryFilePath(self):
+def ConfNodeLibraryFilePath(self):
 if self.OrigBuildPath is not None:
 return os.path.join(self.OrigBuildPath, "pous.xml")
 else:
-return PluginsRoot.PluginLibraryFilePath(self)
+return ConfigTreeRoot.ConfNodeLibraryFilePath(self)
 def GetProjectName(self):
 return self.Project.getname()
 def GetDefaultTargetName(self):
 if self.CurrentMode == SIMULATION_MODE:
-return PluginsRoot.GetDefaultTargetName(self)
+return ConfigTreeRoot.GetDefaultTargetName(self)
 else:
 return "LPC"
 def GetTarget(self):
-target = PluginsRoot.GetTarget(self)
+target = ConfigTreeRoot.GetTarget(self)
 if self.CurrentMode != SIMULATION_MODE:
 target.getcontent()["value"].setBuildPath(self.BuildPath)
 return target
 def _getBuildPath(self):
 if self.CurrentMode == SIMULATION_MODE:
 if self.SimulationBuildPath is None:
 self.SimulationBuildPath = os.path.join(tempfile.mkdtemp(), os.path.basename(self.ProjectPath), "build")
 return self.SimulationBuildPath
 else:
-return PluginsRoot._getBuildPath(self)
+return ConfigTreeRoot._getBuildPath(self)
 def _Build(self):
 save = self.ProjectTestModified()
 if save:
 self.SaveProject()
 self.AppFrame._Refresh(TITLE, FILEMENU)
 if self.BuildPath is not None:
 mycopytree(self.OrigBuildPath, self.BuildPath)
-PluginsRoot._Build(self)
+ConfigTreeRoot._Build(self)
 if save:
 wx.CallAfter(self.AppFrame.RefreshAll)
 def SetProjectName(self, name):
 return self.Project.setname(name)
 # Change XSD into class members
 self._AddParamsMembers()
 self.PluggedChilds = {}
-# Keep track of the root plugin (i.e. project path)
+# Keep track of the root confnode (i.e. project path)
 self.ProjectPath = ProjectPath
 self.BuildPath = self._getBuildPath()
 if self.OrigBuildPath is not None:
 mycopytree(self.OrigBuildPath, self.BuildPath)
 # If dir have already be made, and file exist
-if os.path.isdir(self.PlugPath()) and os.path.isfile(self.PluginXmlFilePath()):
+if os.path.isdir(self.PlugPath()) and os.path.isfile(self.ConfNodeXmlFilePath()):
-#Load the plugin.xml file into parameters members
+#Load the confnode.xml file into parameters members
 result = self.LoadXMLParams()
 if result:
 return result
 #Load and init all the childs
 self.LoadChilds()
 if self.PlugTestModified():
 self.SaveProject()
 if wx.GetApp() is None:
-self.RefreshPluginsBlockLists()
+self.RefreshConfNodesBlockLists()
 else:
-wx.CallAfter(self.RefreshPluginsBlockLists)
+wx.CallAfter(self.RefreshConfNodesBlockLists)
 return None
 ############# Real PLC object access #############
 def UpdateMethodsFromPLCStatus(self):
 if PlugCFilesAndCFLAGS:
 self.LocationCFilesAndCFLAGS = [(self.GetCurrentLocation(), PlugCFilesAndCFLAGS, DoCalls)]
 else:
 self.LocationCFilesAndCFLAGS = []
-# plugin asks for some LDFLAGS
+# confnode asks for some LDFLAGS
 if PlugLDFLAGS:
 # LDFLAGS can be either string
 if type(PlugLDFLAGS)==type(str()):
 self.LDFLAGS=[PlugLDFLAGS]
 #or list of strings
 self.LDFLAGS=PlugLDFLAGS[:]
 else:
 self.LDFLAGS=[]
 # Template based part of C code generation
-# files are stacked at the beginning, as files of plugin tree root
+# files are stacked at the beginning, as files of confnode tree root
 for generator, filename, name in [
 # debugger code
 (self.Generate_plc_debugger, "plc_debugger.c", "Debugger"),
 # init/cleanup/retrieve/publish, run and align code
 (self.Generate_plc_common_main,"plc_common_main.c","Common runtime"),
 code = generator()
 if code is None:
 raise
 code_path = os.path.join(buildpath,filename)
 open(code_path, "w").write(code)
-# Insert this file as first file to be compiled at root plugin
+# Insert this file as first file to be compiled at root confnode
 self.LocationCFilesAndCFLAGS[0][1].insert(0,(code_path, self.plcCFLAGS))
 except Exception, exc:
 self.logger.write_error(name+_(" generation failed !\n"))
 self.logger.write_error(traceback.format_exc())
 self.StopSimulation()
 def StopSimulation(self):
 self.CurrentMode = None
 self.ApplyOnlineMode()
 def _Stop(self):
-PluginsRoot._Stop(self)
+ConfigTreeRoot._Stop(self)
 if self.CurrentMode == SIMULATION_MODE:
 self.StopSimulation()
 def CompareLocalAndRemotePLC(self):
 def _Transfer(self):
 if self.CurrentMode is None and self.OnlineMode != "OFF":
 self.CurrentMode = TRANSFER_MODE
-if PluginsRoot._Build(self):
+if ConfigTreeRoot._Build(self):
 ID_ABORTTRANSFERTIMER = wx.NewId()
 self.AbortTransferTimer = wx.Timer(self.AppFrame, ID_ABORTTRANSFERTIMER)
 self.AppFrame.Bind(wx.EVT_TIMER, self.AbortTransfer, self.AbortTransferTimer)
 def BeginTransfer(self):
 self.logger.write(_("Start PLC transfer\n"))
 self.AbortTransferTimer.Stop()
-PluginsRoot._Transfer(self)
+ConfigTreeRoot._Transfer(self)
 self.AbortTransferTimer.Start(milliseconds=5000, oneShot=True)
 def AbortTransfer(self, event):
 self.logger.write_warning(_("Timeout waiting PLC to recover\n"))
 if self.CheckSaveBeforeClosing(_("Close Application")):
 frame.Hide()
-self.PluginRoot.ResetAppFrame(lpcberemiz_cmd.Log)
+self.CTR.ResetAppFrame(lpcberemiz_cmd.Log)
-if self.PluginRoot.OnlineMode == 0:
+if self.CTR.OnlineMode == 0:
-self.PluginRoot._connector = None
+self.CTR._connector = None
-self.PluginRoot.KillDebugThread()
+self.CTR.KillDebugThread()
 self.KillLocalRuntime()
 self.SaveLastState()
 lpcberemiz_cmd.Log.write("Closed\n")
 TYPESTREE, INSTANCESTREE, SCALING)
 dialog.Destroy()
 def RefreshFileMenu(self):
 MenuToolBar = self.Panes["MenuToolBar"]
-if self.PluginRoot is not None:
+if self.CTR is not None:
 selected = self.TabsOpened.GetSelection()
 if selected >= 0:
 graphic_viewer = isinstance(self.TabsOpened.GetPage(selected), Viewer)
 else:
 graphic_viewer = False
 self.FileMenu.Enable(wx.ID_CLOSE, False)
 self.FileMenu.Enable(wx.ID_PREVIEW, False)
 self.FileMenu.Enable(wx.ID_PRINT, False)
 MenuToolBar.EnableTool(wx.ID_PRINT, False)
 self.FileMenu.Enable(wx.ID_PAGE_SETUP, True)
-project_modified = self.PluginRoot.ProjectTestModified()
+project_modified = self.CTR.ProjectTestModified()
 self.FileMenu.Enable(wx.ID_SAVE, project_modified)
 MenuToolBar.EnableTool(wx.ID_SAVE, project_modified)
 self.FileMenu.Enable(wx.ID_PROPERTIES, True)
 else:
 self.FileMenu.Enable(wx.ID_CLOSE, False)
 def RefreshPLCParams(self):
 self.Freeze()
 self.ClearSizer(self.PLCParamsSizer)
-if self.PluginRoot is not None:
+if self.CTR is not None:
 plcwindow = wx.Panel(self.PLCConfig, -1, size=wx.Size(-1, -1))
-if self.PluginRoot.PlugTestModified():
+if self.CTR.PlugTestModified():
 bkgdclr = CHANGED_TITLE_COLOUR
 else:
 bkgdclr = TITLE_COLOUR
-if self.PluginRoot not in self.PluginInfos:
+if self.CTR not in self.ConfNodeInfos:
-self.PluginInfos[self.PluginRoot] = {"right_visible" : False}
+self.ConfNodeInfos[self.CTR] = {"right_visible" : False}
 plcwindow.SetBackgroundColour(TITLE_COLOUR)
 plcwindow.Bind(wx.EVT_LEFT_DOWN, self.OnPanelLeftDown)
 self.PLCParamsSizer.AddWindow(plcwindow, 0, border=0, flag=wx.GROW)
 plcwindowsizer = wx.BoxSizer(wx.HORIZONTAL)
 plcwindow.SetSizer(plcwindowsizer)
 st = wx.StaticText(plcwindow, -1)
 st.SetFont(wx.Font(faces["size"], wx.DEFAULT, wx.NORMAL, wx.BOLD, faceName = faces["helv"]))
-st.SetLabel(self.PluginRoot.GetProjectName())
+st.SetLabel(self.CTR.GetProjectName())
 plcwindowsizer.AddWindow(st, 0, border=5, flag=wx.ALL|wx.ALIGN_CENTER)
 plcwindowmainsizer = wx.BoxSizer(wx.VERTICAL)
 plcwindowsizer.AddSizer(plcwindowmainsizer, 0, border=5, flag=wx.ALL)
 plcwindowbuttonsizer = wx.BoxSizer(wx.HORIZONTAL)
 plcwindowmainsizer.AddSizer(plcwindowbuttonsizer, 0, border=0, flag=wx.ALIGN_CENTER)
-msizer = self.GenerateMethodButtonSizer(self.PluginRoot, plcwindow, not self.PluginInfos[self.PluginRoot]["right_visible"])
+msizer = self.GenerateMethodButtonSizer(self.CTR, plcwindow, not self.ConfNodeInfos[self.CTR]["right_visible"])
 plcwindowbuttonsizer.AddSizer(msizer, 0, border=0, flag=wx.GROW)
 self.PLCConfigMainSizer.Layout()
 self.RefreshScrollBars()
 self.Thaw()
-def GenerateTreeBranch(self, plugin):
+def GenerateTreeBranch(self, confnode):
 leftwindow = wx.Panel(self.PLCConfig, -1, size=wx.Size(-1, -1))
-if plugin.PlugTestModified():
+if confnode.PlugTestModified():
 bkgdclr=CHANGED_WINDOW_COLOUR
 else:
 bkgdclr=WINDOW_COLOUR
 leftwindow.SetBackgroundColour(bkgdclr)
-if plugin not in self.PluginInfos:
+if confnode not in self.ConfNodeInfos:
-self.PluginInfos[plugin] = {"expanded" : False, "left_visible" : False, "right_visible" : False}
+self.ConfNodeInfos[confnode] = {"expanded" : False, "left_visible" : False, "right_visible" : False}
-self.PluginInfos[plugin]["children"] = plugin.IECSortedChilds()
+self.ConfNodeInfos[confnode]["children"] = confnode.IECSortedChilds()
-plugin_infos = plugin.GetVariableLocationTree()
+confnode_infos = confnode.GetVariableLocationTree()
-plugin_locations = []
+confnode_locations = []
-if len(self.PluginInfos[plugin]["children"]) == 0:
+if len(self.ConfNodeInfos[confnode]["children"]) == 0:
-plugin_locations = plugin_infos["children"]
+confnode_locations = confnode_infos["children"]
-if not self.PluginInfos[plugin].has_key("locations_infos"):
+if not self.ConfNodeInfos[confnode].has_key("locations_infos"):
-self.PluginInfos[plugin]["locations_infos"] = {"root": {"expanded" : False}}
+self.ConfNodeInfos[confnode]["locations_infos"] = {"root": {"expanded" : False}}
-self.PluginInfos[plugin]["locations_infos"]["root"]["left"] = None
+self.ConfNodeInfos[confnode]["locations_infos"]["root"]["left"] = None
-self.PluginInfos[plugin]["locations_infos"]["root"]["right"] = None
+self.ConfNodeInfos[confnode]["locations_infos"]["root"]["right"] = None
-self.PluginInfos[plugin]["locations_infos"]["root"]["children"] = []
+self.ConfNodeInfos[confnode]["locations_infos"]["root"]["children"] = []
-self.PluginTreeSizer.AddWindow(leftwindow, 0, border=0, flag=wx.GROW)
+self.ConfNodeTreeSizer.AddWindow(leftwindow, 0, border=0, flag=wx.GROW)
 leftwindowvsizer = wx.BoxSizer(wx.VERTICAL)
 leftwindow.SetSizer(leftwindowvsizer)
 leftwindowsizer = wx.BoxSizer(wx.HORIZONTAL)
 leftwindowvsizer.AddSizer(leftwindowsizer, 0, border=0, flag=0)
-self.GenerateEnableButton(leftwindow, leftwindowsizer, plugin)
+self.GenerateEnableButton(leftwindow, leftwindowsizer, confnode)
 st = wx.StaticText(leftwindow, -1)
 st.SetFont(wx.Font(faces["size"], wx.DEFAULT, wx.NORMAL, wx.BOLD, faceName = faces["helv"]))
-st.SetLabel(plugin.GetFullIEC_Channel())
+st.SetLabel(confnode.GetFullIEC_Channel())
 leftwindowsizer.AddWindow(st, 0, border=5, flag=wx.RIGHT)
 expandbutton_id = wx.NewId()
 expandbutton = wx.lib.buttons.GenBitmapToggleButton(id=expandbutton_id, bitmap=wx.Bitmap(Bpath( 'images', 'plus.png')),
 name='ExpandButton', parent=leftwindow, pos=wx.Point(0, 0),
 expandbutton.labelDelta = 0
 expandbutton.SetBezelWidth(0)
 expandbutton.SetUseFocusIndicator(False)
 expandbutton.SetBitmapSelected(wx.Bitmap(Bpath( 'images', 'minus.png')))
-if len(self.PluginInfos[plugin]["children"]) > 0:
+if len(self.ConfNodeInfos[confnode]["children"]) > 0:
-expandbutton.SetToggle(self.PluginInfos[plugin]["expanded"])
+expandbutton.SetToggle(self.ConfNodeInfos[confnode]["expanded"])
 def togglebutton(event):
 if expandbutton.GetToggle():
-self.ExpandPlugin(plugin)
+self.ExpandConfNode(confnode)
 else:
-self.CollapsePlugin(plugin)
+self.CollapseConfNode(confnode)
-self.PluginInfos[plugin]["expanded"] = expandbutton.GetToggle()
+self.ConfNodeInfos[confnode]["expanded"] = expandbutton.GetToggle()
 self.PLCConfigMainSizer.Layout()
 self.RefreshScrollBars()
 event.Skip()
 expandbutton.Bind(wx.EVT_BUTTON, togglebutton, id=expandbutton_id)
-elif len(plugin_locations) > 0:
+elif len(confnode_locations) > 0:
-locations_infos = self.PluginInfos[plugin]["locations_infos"]
+locations_infos = self.ConfNodeInfos[confnode]["locations_infos"]
 expandbutton.SetToggle(locations_infos["root"]["expanded"])
 def togglebutton(event):
 if expandbutton.GetToggle():
 self.ExpandLocation(locations_infos, "root")
 else:
 self.CollapseLocation(locations_infos, "root")
-self.PluginInfos[plugin]["expanded"] = expandbutton.GetToggle()
+self.ConfNodeInfos[confnode]["expanded"] = expandbutton.GetToggle()
 locations_infos["root"]["expanded"] = expandbutton.GetToggle()
 self.PLCConfigMainSizer.Layout()
 self.RefreshScrollBars()
 event.Skip()
 expandbutton.Bind(wx.EVT_BUTTON, togglebutton, id=expandbutton_id)
 else:
 expandbutton.Enable(False)
 leftwindowsizer.AddWindow(expandbutton, 0, border=5, flag=wx.RIGHT|wx.ALIGN_CENTER_VERTICAL)
 sb = wx.StaticBitmap(leftwindow, -1)
-icon = plugin_infos.get("icon", None)
+icon = confnode_infos.get("icon", None)
 if icon is None:
-icon_bitmap = self.LocationImageList.GetBitmap(self.LocationImageDict[plugin_infos["type"]])
+icon_bitmap = self.LocationImageList.GetBitmap(self.LocationImageDict[confnode_infos["type"]])
 else:
 icon_bitmap = wx.Bitmap(icon)
 sb.SetBitmap(icon_bitmap)
 leftwindowsizer.AddWindow(sb, 0, border=5, flag=wx.RIGHT|wx.ALIGN_CENTER_VERTICAL)
 st_id = wx.NewId()
 st = wx.StaticText(leftwindow, st_id, size=wx.DefaultSize, style=wx.NO_BORDER)
 st.SetFont(wx.Font(faces["size"] * 0.75, wx.DEFAULT, wx.NORMAL, wx.BOLD, faceName = faces["helv"]))
-st.SetLabel(plugin.MandatoryParams[1].getName())
+st.SetLabel(confnode.MandatoryParams[1].getName())
 leftwindowsizer.AddWindow(st, 0, border=5, flag=wx.RIGHT|wx.ALIGN_CENTER_VERTICAL)
-rightwindow = self.GenerateParamsPanel(plugin, bkgdclr)
+rightwindow = self.GenerateParamsPanel(confnode, bkgdclr)
-self.PluginTreeSizer.AddWindow(rightwindow, 0, border=0, flag=wx.GROW)
+self.ConfNodeTreeSizer.AddWindow(rightwindow, 0, border=0, flag=wx.GROW)
-self.PluginInfos[plugin]["left"] = leftwindow
+self.ConfNodeInfos[confnode]["left"] = leftwindow
-self.PluginInfos[plugin]["right"] = rightwindow
+self.ConfNodeInfos[confnode]["right"] = rightwindow
-for child in self.PluginInfos[plugin]["children"]:
+for child in self.ConfNodeInfos[confnode]["children"]:
 self.GenerateTreeBranch(child)
-if not self.PluginInfos[child]["expanded"]:
+if not self.ConfNodeInfos[child]["expanded"]:
-self.CollapsePlugin(child)
+self.CollapseConfNode(child)
-if len(plugin_locations) > 0:
+if len(confnode_locations) > 0:
-locations_infos = self.PluginInfos[plugin]["locations_infos"]
+locations_infos = self.ConfNodeInfos[confnode]["locations_infos"]
 treectrl = wx.TreeCtrl(self.PLCConfig, -1, size=wx.DefaultSize,
 style=wx.TR_HAS_BUTTONS|wx.TR_SINGLE|wx.NO_BORDER|wx.TR_HIDE_ROOT|wx.TR_NO_LINES|wx.TR_LINES_AT_ROOT)
 treectrl.SetImageList(self.LocationImageList)
 treectrl.Bind(wx.EVT_TREE_BEGIN_DRAG, self.GenerateLocationBeginDragFunction(locations_infos))
 treectrl.Bind(wx.EVT_TREE_ITEM_EXPANDED, self.GenerateLocationExpandCollapseFunction(locations_infos, True))
 treectrl.Bind(wx.EVT_TREE_ITEM_COLLAPSED, self.GenerateLocationExpandCollapseFunction(locations_infos, False))
 treectrl.AddRoot("")
-self.PluginTreeSizer.AddWindow(treectrl, 0, border=0, flag=0)
+self.ConfNodeTreeSizer.AddWindow(treectrl, 0, border=0, flag=0)
 rightwindow = wx.Panel(self.PLCConfig, -1, size=wx.Size(-1, -1))
 rightwindow.SetBackgroundColour(wx.WHITE)
-self.PluginTreeSizer.AddWindow(rightwindow, 0, border=0, flag=wx.GROW)
+self.ConfNodeTreeSizer.AddWindow(rightwindow, 0, border=0, flag=wx.GROW)
 locations_infos["root"]["left"] = treectrl
 locations_infos["root"]["right"] = rightwindow
-for location in plugin_locations:
+for location in confnode_locations:
 locations_infos["root"]["children"].append("root.%s" % location["name"])
 self.GenerateLocationTreeBranch(treectrl, treectrl.GetRootItem(), locations_infos, "root", location)
 if locations_infos["root"]["expanded"]:
 self.ExpandLocation(locations_infos, "root")
 class LPCBeremiz_Cmd(cmd.Cmd):
 prompt = ""
 RefreshTimer = None
-def __init__(self, PluginRoot, Log):
+def __init__(self, CTR, Log):
 cmd.Cmd.__init__(self, stdin=Log, stdout=Log)
 self.use_rawinput = False
 self.Log = Log
-self.PluginRoot = PluginRoot
+self.CTR = CTR
 def RestartTimer(self):
 if self.RefreshTimer is not None:
 self.RefreshTimer.cancel()
 self.RefreshTimer = Timer(0.1, wx.CallAfter, args = [self.Refresh])
 return self.Exit()
 def Show(self):
 global frame
 if frame is not None:
-self.PluginRoot.SetAppFrame(frame, frame.Log)
+self.CTR.SetAppFrame(frame, frame.Log)
 frame.Show()
 frame.Raise()
 def Refresh(self):
 global frame
 frame.RefreshAll()
 def Close(self):
 global frame
-self.PluginRoot.ResetAppFrame(self.Log)
+self.CTR.ResetAppFrame(self.Log)
 if frame is not None:
 frame.Hide()
 def Compile(self):
-self.PluginRoot._Build()
+self.CTR._Build()
 def SetProjectProperties(self, projectname, productname, productversion, companyname):
-properties = self.PluginRoot.GetProjectProperties()
+properties = self.CTR.GetProjectProperties()
 new_properties = properties.copy()
 new_properties["projectName"] = projectname
 new_properties["productName"] = productname
 new_properties["productVersion"] = productversion
 new_properties["companyName"] = companyname
 if new_properties != properties:
-self.PluginRoot.SetProjectProperties(properties=new_properties, buffer=False)
+self.CTR.SetProjectProperties(properties=new_properties, buffer=False)
 self.RestartTimer()
 def SetOnlineMode(self, mode, path=None):
-self.PluginRoot.SetOnlineMode(mode, path)
+self.CTR.SetOnlineMode(mode, path)
 self.RestartTimer()
 def AddBus(self, iec_channel, name, icon=None):
-for child in self.PluginRoot.IterChilds():
+for child in self.CTR.IterChilds():
 if child.BaseParams.getName() == name:
 return "Error: A bus named %s already exists\n" % name
 elif child.BaseParams.getIEC_Channel() == iec_channel:
 return "Error: A bus with IEC_channel %d already exists\n" % iec_channel
-bus = self.PluginRoot.PlugAddChild(name, "LPCBus", iec_channel)
+bus = self.CTR.PlugAddChild(name, "LPCBus", iec_channel)
 if bus is None:
 return "Error: Unable to create bus\n"
 bus.SetIcon(icon)
 self.RestartTimer()
 def RenameBus(self, iec_channel, name):
-bus = self.PluginRoot.GetChildByIECLocation((iec_channel,))
+bus = self.CTR.GetChildByIECLocation((iec_channel,))
 if bus is None:
 return "Error: No bus found\n"
-for child in self.PluginRoot.IterChilds():
+for child in self.CTR.IterChilds():
 if child != bus and child.BaseParams.getName() == name:
 return "Error: A bus named %s already exists\n" % name
 bus.BaseParams.setName(name)
 self.RestartTimer()
 def ChangeBusIECChannel(self, old_iec_channel, new_iec_channel):
-bus = self.PluginRoot.GetChildByIECLocation((old_iec_channel,))
+bus = self.CTR.GetChildByIECLocation((old_iec_channel,))
 if bus is None:
 return "Error: No bus found\n"
-for child in self.PluginRoot.IterChilds():
+for child in self.CTR.IterChilds():
 if child != bus and child.BaseParams.getIEC_Channel() == new_iec_channel:
 return "Error: A bus with IEC_channel %d already exists\n" % new_iec_channel
 if wx.GetApp() is None:
-self.PluginRoot.UpdateProjectVariableLocation(str(old_iec_channel),
+self.CTR.UpdateProjectVariableLocation(str(old_iec_channel),
 str(new_iec_channel))
 else:
-self.PluginRoot.UpdateProjectVariableLocation(
+self.CTR.UpdateProjectVariableLocation(
 str(old_iec_channel),
 str(new_iec_channel))
 bus.BaseParams.setIEC_Channel(new_iec_channel)
 self.RestartTimer()
 def RemoveBus(self, iec_channel):
-bus = self.PluginRoot.GetChildByIECLocation((iec_channel,))
+bus = self.CTR.GetChildByIECLocation((iec_channel,))
 if bus is None:
 return "Error: No bus found\n"
-self.PluginRoot.RemoveProjectVariableByFilter(str(iec_channel))
+self.CTR.RemoveProjectVariableByFilter(str(iec_channel))
-self.PluginRoot.PluggedChilds["LPCBus"].remove(bus)
+self.CTR.PluggedChilds["LPCBus"].remove(bus)
 self.RestartTimer()
 def AddModule(self, parent, iec_channel, name, icode, icon=None):
-module = self.PluginRoot.GetChildByIECLocation(parent)
+module = self.CTR.GetChildByIECLocation(parent)
 if module is None:
 return "Error: No parent found\n"
 for child in _GetModuleChildren(module):
 if child["name"] == name:
 return "Error: A module named %s already exists\n" % name
 "init": icode,
 "children": []})
 self.RestartTimer()
 def RenameModule(self, iec_location, name):
-module = self.PluginRoot.GetChildByIECLocation(iec_location)
+module = self.CTR.GetChildByIECLocation(iec_location)
 if module is None:
 return "Error: No module found\n"
-parent = self.PluginRoot.GetChildByIECLocation(iec_location[:-1])
+parent = self.CTR.GetChildByIECLocation(iec_location[:-1])
-if parent is self.PluginRoot:
+if parent is self.CTR:
 return "Error: No module found\n"
 if module["name"] != name:
 for child in _GetModuleChildren(parent):
 if child["name"] == name:
 return "Error: A module named %s already exists\n" % name
 module["name"] = name
 self.RestartTimer()
 def ChangeModuleIECChannel(self, old_iec_location, new_iec_channel):
-module = self.PluginRoot.GetChildByIECLocation(old_iec_location)
+module = self.CTR.GetChildByIECLocation(old_iec_location)
 if module is None:
 return "Error: No module found\n"
-parent = self.PluginRoot.GetChildByIECLocation(old_iec_location[:-1])
+parent = self.CTR.GetChildByIECLocation(old_iec_location[:-1])
-if parent is self.PluginRoot:
+if parent is self.CTR:
 return "Error: No module found\n"
 if module["IEC_Channel"] != new_iec_channel:
 for child in _GetModuleChildren(parent):
 if child["IEC_Channel"] == new_iec_channel:
 return "Error: A module with IEC_channel %d already exists\n" % new_iec_channel
-self.PluginRoot.UpdateProjectVariableLocation(".".join(map(str, old_iec_location)), ".".join(map(str, old_iec_location[:1] + (new_iec_channel,))))
+self.CTR.UpdateProjectVariableLocation(".".join(map(str, old_iec_location)), ".".join(map(str, old_iec_location[:1] + (new_iec_channel,))))
 module["IEC_Channel"] = new_iec_channel
 self.RestartTimer()
 def ChangeModuleInitCode(self, iec_location, icode):
-module = self.PluginRoot.GetChildByIECLocation(iec_location)
+module = self.CTR.GetChildByIECLocation(iec_location)
 if module is None:
 return "Error: No module found\n"
 module["init"] = icode
 def RemoveModule(self, parent, iec_channel):
-module = self.PluginRoot.GetChildByIECLocation(parent)
+module = self.CTR.GetChildByIECLocation(parent)
 if module is None:
 return "Error: No parent found\n"
 child = _GetModuleBySomething(module, "IEC_Channel", (iec_channel,))
 if child is None:
 return "Error: No module found\n"
-self.PluginRoot.RemoveProjectVariableByFilter(".".join(map(str, parent + (iec_channel,))))
+self.CTR.RemoveProjectVariableByFilter(".".join(map(str, parent + (iec_channel,))))
 _RemoveModuleChild(module, child)
 self.RestartTimer()
 def StartGroup(self, parent, name, icon=None):
-module = self.PluginRoot.GetChildByIECLocation(parent)
+module = self.CTR.GetChildByIECLocation(parent)
 if module is None:
 return "Error: No parent found\n"
 for child in module["children"]:
 if child["type"] == LOCATION_GROUP and child["name"] == name:
 return "Error: A group named %s already exists\n" % name
 "icon": icon,
 "children": []})
 self.RestartTimer()
 def AddVariable(self, parent, location, name, direction, type, rcode, pcode, description=""):
-module = self.PluginRoot.GetChildByIECLocation(parent)
+module = self.CTR.GetChildByIECLocation(parent)
 if module is None:
 return "Error: No parent found\n"
 for child in _GetModuleChildren(module):
 if child["name"] == name:
 return "Error: A variable named %s already exists\n" % name
 "retrieve": rcode,
 "publish": pcode})
 self.RestartTimer()
 def ChangeVariableParams(self, parent, location, new_name, new_direction, new_type, new_rcode, new_pcode, new_description=None):
-module = self.PluginRoot.GetChildByIECLocation(parent)
+module = self.CTR.GetChildByIECLocation(parent)
 if module is None:
 return "Error: No parent found\n"
 variable = None
 for child in _GetModuleChildren(module):
 if child["location"] == location and child["type"] == LOCATION_TYPES[new_direction]:
 elif child["name"] == new_name:
 return "Error: A variable named %s already exists\n" % new_name
 if variable is None:
 return "Error: No variable found\n"
 if variable["name"] != new_name:
-self.PluginRoot.UpdateProjectVariableName(variable["name"], new_name)
+self.CTR.UpdateProjectVariableName(variable["name"], new_name)
 variable["name"] = new_name
 variable["type"] = LOCATION_TYPES[new_direction]
 variable["IEC_type"] = new_type
 variable["retrieve"] = new_rcode
 variable["publish"] = new_pcode
 if new_description is not None:
 variable["description"] = new_description
 self.RestartTimer()
 def RemoveVariable(self, parent, location, direction):
-module = self.PluginRoot.GetChildByIECLocation(parent)
+module = self.CTR.GetChildByIECLocation(parent)
 if module is None:
 return "Error: No parent found\n"
 child = _GetModuleVariable(module, location, direction)
 if child is None:
 return "Error: No variable found\n"
-size = LOCATION_SIZES[self.PluginRoot.GetBaseType(child["IEC_type"])]
+size = LOCATION_SIZES[self.CTR.GetBaseType(child["IEC_type"])]
 address = "%" + LOCATION_DIRS[child["type"]] + size + ".".join(map(str, parent + location))
-self.PluginRoot.RemoveProjectVariableByAddress(address)
+self.CTR.RemoveProjectVariableByAddress(address)
 _RemoveModuleChild(module, child)
 self.RestartTimer()
 def location(loc):
 return tuple(map(int, loc.split(".")))
 return False
 else:
 return res
 return CmdFunction
-def CmdThreadProc(PluginRoot, Log):
+def CmdThreadProc(CTR, Log):
 global lpcberemiz_cmd
 for function, (arg_types, opt) in {"Exit": ([], 0),
 "Show": ([], 0),
 "Refresh": ([], 0),
 "Close": ([], 0),
 "AddVariable": ([location, location, str, str, str, str, str, str], 1),
 "ChangeVariableParams": ([location, location, str, str, str, str, str, str], 1),
 "RemoveVariable": ([location, location], 0)}.iteritems():
 setattr(LPCBeremiz_Cmd, "do_%s" % function, GetCmdFunction(function, arg_types, opt))
-lpcberemiz_cmd = LPCBeremiz_Cmd(PluginRoot, Log)
+lpcberemiz_cmd = LPCBeremiz_Cmd(CTR, Log)
 lpcberemiz_cmd.cmdloop()
 Log = StdoutPseudoFile(port)
-PluginRoot = LPCPluginsRoot(None, Log, buildpath)
+CTR = LPCConfigTreeRoot(None, Log, buildpath)
 if projectOpen is not None and os.path.isdir(projectOpen):
-result = PluginRoot.LoadProject(projectOpen)
+result = CTR.LoadProject(projectOpen)
 if result:
 Log.write("Error: Invalid project directory", result)
 else:
 Log.write("Error: No such file or directory")
-cmd_thread=Thread(target=CmdThreadProc, args=[PluginRoot, Log])
+cmd_thread=Thread(target=CmdThreadProc, args=[CTR, Log])
 cmd_thread.start()
 # Install a exception handle for bug reports
 AddExceptHook(os.getcwd(),__version__)
-frame = LPCBeremiz(None, plugin_root=PluginRoot, debug=True)
+frame = LPCBeremiz(None, ctr=CTR, debug=True)
 app.MainLoop()

changeset 717	1c23952dbde1
parent 715	135566ab0807
child 718	5d4dc150b956