beremiz: comparison confnodes/canfestival/canfestival.py

equal deleted inserted replaced

-:1c23952dbde1
+:5d4dc150b956
 #--------------------------------------------------
 #                    SLAVE
 #--------------------------------------------------
-class _SlavePlug(NodeManager):
+class _SlaveCTN(NodeManager):
 XSD = """<?xml version="1.0" encoding="ISO-8859-1" ?>
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
 <xsd:element name="CanFestivalSlaveNode">
 <xsd:complexType>
 <xsd:attribute name="CAN_Device" type="xsd:string" use="optional" default="%(CAN_Device)s"/>
 "None",       # profile
 "", # prfile filepath
 "heartbeat",  # NMT
 [])           # options
 dialog.Destroy()
-self.OnPlugSave()
+self.OnCTNSave()
 def GetSlaveODPath(self):
-return os.path.join(self.PlugPath(), 'slave.od')
+return os.path.join(self.CTNPath(), 'slave.od')
 def GetCanDevice(self):
 return self.CanFestivalSlaveNode.getCan_Device()
 def _OpenView(self):
 "name" : "Edit slave",
 "tooltip" : "Edit CanOpen slave with ObjdictEdit",
 "method" : "_OpenView"},
 ]
-def OnPlugClose(self):
+def OnCTNClose(self):
 if self._View:
 self._View.Close()
-def PlugTestModified(self):
+def CTNTestModified(self):
 return self.ChangesToSave or self.OneFileHasChanged()
-def OnPlugSave(self):
+def OnCTNSave(self):
 return self.SaveCurrentInFile(self.GetSlaveODPath())
 def SetParamsAttribute(self, path, value):
 result = ConfigTreeNode.SetParamsAttribute(self, path, value)
 if path == "BaseParams.IEC_Channel" and self._View is not None:
 self._View.SetBusId(self.GetCurrentLocation())
 return result
-def PlugGenerate_C(self, buildpath, locations):
+def CTNGenerate_C(self, buildpath, locations):
 """
 Generate C code
 @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", ...)
 self.Fullname = fullname
 def OnCloseEditor(self, view):
 self.Parent.OnCloseEditor(view)
-def PlugFullName(self):
+def CTNFullName(self):
 return self.Fullname
 def GetBufferState(self):
 return self.GetCurrentBufferState()
-class _NodeListPlug(NodeList):
+class _NodeListCTN(NodeList):
 XSD = """<?xml version="1.0" encoding="ISO-8859-1" ?>
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
 <xsd:element name="CanFestivalNode">
 <xsd:complexType>
 <xsd:attribute name="CAN_Device" type="xsd:string" use="optional" default="%(CAN_Device)s"/>
 EditorType = NetworkEditor
 def __init__(self):
 manager = NodeManager()
 NodeList.__init__(self, manager)
-self.LoadProject(self.PlugPath())
+self.LoadProject(self.CTNPath())
 self.SetNetworkName(self.BaseParams.getName())
 def GetCanDevice(self):
 return self.CanFestivalNode.getCan_Device()
 def _ShowMasterGenerated(self):
 if self._GeneratedView is None:
 buildpath = self._getBuildPath()
 # Eventually create build dir
 if not os.path.exists(buildpath):
-self.GetPlugRoot().logger.write_error(_("Error: No PLC built\n"))
+self.GetCTRoot().logger.write_error(_("Error: No PLC built\n"))
 return
 masterpath = os.path.join(buildpath, "MasterGenerated.od")
 if not os.path.exists(masterpath):
-self.GetPlugRoot().logger.write_error(_("Error: No Master generated\n"))
+self.GetCTRoot().logger.write_error(_("Error: No Master generated\n"))
 return
-app_frame = self.GetPlugRoot().AppFrame
+app_frame = self.GetCTRoot().AppFrame
-manager = MiniNodeManager(self, masterpath, self.PlugFullName() + ".generated_master")
+manager = MiniNodeManager(self, masterpath, self.CTNFullName() + ".generated_master")
 self._GeneratedView = SlaveEditor(app_frame.TabsOpened, manager, app_frame, False)
 app_frame.EditProjectElement(self._GeneratedView, "MasterGenerated")
 def _CloseGenerateView(self):
 if self._GeneratedView is not None:
-app_frame = self.GetPlugRoot().AppFrame
+app_frame = self.GetCTRoot().AppFrame
 if app_frame is not None:
 app_frame.DeletePage(self._GeneratedView)
 ConfNodeMethods = [
 {"bitmap" : os.path.join("images", "NetworkEdit"),
 def OnCloseEditor(self, view):
 ConfigTreeNode.OnCloseEditor(self, view)
 if self._GeneratedView == view:
 self._GeneratedView = None
-def OnPlugClose(self):
+def OnCTNClose(self):
-ConfigTreeNode.OnPlugClose(self)
+ConfigTreeNode.OnCTNClose(self)
 self._CloseGenerateView()
 return True
-def PlugTestModified(self):
+def CTNTestModified(self):
 return self.ChangesToSave or self.HasChanged()
-def OnPlugSave(self):
+def OnCTNSave(self):
-self.SetRoot(self.PlugPath())
+self.SetRoot(self.CTNPath())
 return self.SaveProject() is None
-def PlugGenerate_C(self, buildpath, locations):
+def CTNGenerate_C(self, buildpath, locations):
 """
 Generate C code
 @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", ...)
 </xsd:complexType>
 </xsd:element>
 </xsd:schema>
 """ % DEFAULT_SETTINGS
-PlugChildsTypes = [("CanOpenNode",_NodeListPlug, "CanOpen Master"),
+CTNChildrenTypes = [("CanOpenNode",_NodeListCTN, "CanOpen Master"),
-("CanOpenSlave",_SlavePlug, "CanOpen Slave")]
+("CanOpenSlave",_SlaveCTN, "CanOpen Slave")]
 def GetParamsAttributes(self, path = None):
 infos = ConfigTreeNode.GetParamsAttributes(self, path = None)
 for element in infos:
 if element["name"] == "CanFestivalInstance":
 for child in element["children"]:
 can_driver += '_DEBUG.dll'
 else:
 can_driver += '.dll'
 return can_driver
-def PlugGenerate_C(self, buildpath, locations):
+def CTNGenerate_C(self, buildpath, locations):
 format_dict = {"locstr" : "_".join(map(str,self.GetCurrentLocation())),
 "candriver" : self.GetCanDriver(),
 "nodes_includes" : "",
 "board_decls" : "",
 "slavebootups" : "",
 "slavebootup_register" : "",
 "post_sync" : "",
 "post_sync_register" : "",
 }
-for child in self.IECSortedChilds():
+for child in self.IECSortedChildren():
 childlocstr = "_".join(map(str,child.GetCurrentLocation()))
 nodename = "OD_%s" % childlocstr
 # Try to get Slave Node
 child_data = getattr(child, "CanFestivalSlaveNode", None)

changeset 718	5d4dc150b956
parent 717	1c23952dbde1