beremiz: comparison LPCBeremiz.py

equal deleted inserted replaced

-:1c23952dbde1
+:5d4dc150b956
 from PLCOpenEditor import IDEFrame, ProjectDialog
 havecanfestival = False
 try:
 from confnodes.canfestival import RootClass as CanOpenRootClass
-from confnodes.canfestival.canfestival import _SlavePlug, _NodeListPlug, NodeManager
+from confnodes.canfestival.canfestival import _SlaveCTN, _NodeListCTN, NodeManager
 havecanfestival = True
 except:
 havecanfestival = False
 def __getitem__(self, key):
 if key == "children":
 return self.VariableLocationTree
 raise KeyError, "Only 'children' key is available"
-def PlugEnabled(self):
+def CTNEnabled(self):
 return None
 def SetIcon(self, icon):
 self.Icon = icon
 def _GetChildBySomething(self, something, toks):
 return _GetModuleBySomething({"children" : self.VariableLocationTree}, something, toks)
 def GetBaseTypes(self):
-return self.GetPlugRoot().GetBaseTypes()
+return self.GetCTRoot().GetBaseTypes()
 def GetSizeOfType(self, type):
-return LOCATION_SIZES[self.GetPlugRoot().GetBaseType(type)]
+return LOCATION_SIZES[self.GetCTRoot().GetBaseType(type)]
 def _GetVariableLocationTree(self, current_location, infos):
 if infos["type"] == LOCATION_MODULE:
 location = current_location + (infos["IEC_Channel"],)
 return {"name": infos["name"],
 "location": self.GetFullIEC_Channel(),
 "icon": self.Icon,
 "children": [self._GetVariableLocationTree(self.GetCurrentLocation(), child)
 for child in self.VariableLocationTree]}
-def PlugTestModified(self):
+def CTNTestModified(self):
 return False
-def PlugMakeDir(self):
+def CTNMakeDir(self):
 pass
-def PlugRequestSave(self):
+def CTNRequestSave(self):
 return None
 def ResetUsedLocations(self):
 self.UsedLocations = {}
 def CheckLocationConflicts(self, location):
 if len(location) > 0:
 return self._CheckLocationConflicts(self.UsedLocations, list(location))
 return False
-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", ...)
 "Type": variable["IEC_type"],
 "Retrieve": variable["retrieve"],
 "Publish": variable["publish"],
 })
 break
-base_types = self.GetPlugRoot().GetBaseTypes()
+base_types = self.GetCTRoot().GetBaseTypes()
 for var in vars:
 prefix = ""
 if var["Type"] in base_types:
 prefix = "IEC_"
 code_str["var_decl"] += "%s%s beremiz%s;\n"%(prefix, var["Type"], var["location"])
 Gen_Module_path = os.path.join(buildpath, "Bus_%s.c"%location_str)
 module = open(Gen_Module_path,'w')
 module.write(BUS_TEXT % code_str)
 module.close()
-matiec_flags = '"-I%s"'%os.path.abspath(self.GetPlugRoot().GetIECLibPath())
+matiec_flags = '"-I%s"'%os.path.abspath(self.GetCTRoot().GetIECLibPath())
 return [(Gen_Module_path, matiec_flags)],"",True
 #-------------------------------------------------------------------------------
 #                          LPC CanFestival ConfNode Class
 #-------------------------------------------------------------------------------
 "CAN_Baudrate": "125K",
 "Slave_NodeId": 2,
 "Master_NodeId": 1,
 }
-class LPCCanOpenSlave(_SlavePlug):
+class LPCCanOpenSlave(_SlaveCTN):
 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_Baudrate" type="xsd:string" use="optional" default="%(CAN_Baudrate)s"/>
 "",           # description
 "None",       # profile
 "", # prfile filepath
 "heartbeat",  # NMT
 [])           # options
-self.OnPlugSave()
+self.OnCTNSave()
 def GetCanDevice(self):
 return str(self.BaseParams.getIEC_Channel())
-class LPCCanOpenMaster(_NodeListPlug):
+class LPCCanOpenMaster(_NodeListCTN):
 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_Baudrate" type="xsd:string" use="optional" default="%(CAN_Baudrate)s"/>
 def GetCanDevice(self):
 return str(self.BaseParams.getIEC_Channel())
 class LPCCanOpen(CanOpenRootClass):
 XSD = None
-PlugChildsTypes = [("CanOpenNode",LPCCanOpenMaster, "CanOpen Master"),
+CTNChildrenTypes = [("CanOpenNode",LPCCanOpenMaster, "CanOpen Master"),
 ("CanOpenSlave",LPCCanOpenSlave, "CanOpen Slave")]
 def GetCanDriver(self):
 return ""
-def LoadChilds(self):
+def LoadChildren(self):
-ConfigTreeNode.LoadChilds(self)
+ConfigTreeNode.LoadChildren(self)
 if self.GetChildByName("Master") is None:
-master = self.PlugAddChild("Master", "CanOpenNode", 0)
+master = self.CTNAddChild("Master", "CanOpenNode", 0)
 master.BaseParams.setEnabled(False)
 if self.GetChildByName("Slave") is None:
-slave = self.PlugAddChild("Slave", "CanOpenSlave", 1)
+slave = self.CTNAddChild("Slave", "CanOpenSlave", 1)
 slave.BaseParams.setEnabled(False)
 #-------------------------------------------------------------------------------
 #                              LPCConfigTreeRoot Class
 self.OrigBuildPath = buildpath
 ConfigTreeRoot.__init__(self, frame, logger)
 if havecanfestival:
-self.PlugChildsTypes += [("LPCBus", LPCBus, "LPC bus"), ("CanOpen", LPCCanOpen, "CanOpen bus")]
+self.CTNChildrenTypes += [("LPCBus", LPCBus, "LPC bus"), ("CanOpen", LPCCanOpen, "CanOpen bus")]
 else:
-self.PlugChildsTypes += [("LPCBus", LPCBus, "LPC bus")]
+self.CTNChildrenTypes += [("LPCBus", LPCBus, "LPC bus")]
-self.PlugType = "LPC"
+self.CTNType = "LPC"
 self.OnlineMode = "OFF"
 self.LPCConnector = None
 self.CurrentMode = None
 "pageSize": (0, 0),
 "scaling": {}})
 # Change XSD into class members
 self._AddParamsMembers()
-self.PluggedChilds = {}
+self.Children = {}
 # 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.ConfNodeXmlFilePath()):
+if os.path.isdir(self.CTNPath()) and os.path.isfile(self.ConfNodeXmlFilePath()):
 #Load the confnode.xml file into parameters members
 result = self.LoadXMLParams()
 if result:
 return result
-#Load and init all the childs
+#Load and init all the children
-self.LoadChilds()
+self.LoadChildren()
 if havecanfestival and self.GetChildByName("CanOpen") is None:
-canopen = self.PlugAddChild("CanOpen", "CanOpen", 0)
+canopen = self.CTNAddChild("CanOpen", "CanOpen", 0)
 canopen.BaseParams.setEnabled(False)
-canopen.LoadChilds()
+canopen.LoadChildren()
-if self.PlugTestModified():
+if self.CTNTestModified():
 self.SaveProject()
 if wx.GetApp() is None:
 self.RefreshConfNodesBlockLists()
 else:
 # Reset variable and program list that are parsed from
 # CSV file generated by IEC2C compiler.
 self.ResetIECProgramsAndVariables()
-gen_result = self.PlugGenerate_C(buildpath, self.PLCGeneratedLocatedVars)
+gen_result = self.CTNGenerate_C(buildpath, self.PLCGeneratedLocatedVars)
-PlugCFilesAndCFLAGS, PlugLDFLAGS, DoCalls = gen_result[:3]
+CTNCFilesAndCFLAGS, CTNLDFLAGS, DoCalls = gen_result[:3]
 # if some files have been generated put them in the list with their location
-if PlugCFilesAndCFLAGS:
+if CTNCFilesAndCFLAGS:
-self.LocationCFilesAndCFLAGS = [(self.GetCurrentLocation(), PlugCFilesAndCFLAGS, DoCalls)]
+self.LocationCFilesAndCFLAGS = [(self.GetCurrentLocation(), CTNCFilesAndCFLAGS, DoCalls)]
 else:
 self.LocationCFilesAndCFLAGS = []
 # confnode asks for some LDFLAGS
-if PlugLDFLAGS:
+if CTNLDFLAGS:
 # LDFLAGS can be either string
-if type(PlugLDFLAGS)==type(str()):
+if type(CTNLDFLAGS)==type(str()):
-self.LDFLAGS=[PlugLDFLAGS]
+self.LDFLAGS=[CTNLDFLAGS]
 #or list of strings
-elif type(PlugLDFLAGS)==type(list()):
+elif type(CTNLDFLAGS)==type(list()):
-self.LDFLAGS=PlugLDFLAGS[:]
+self.LDFLAGS=CTNLDFLAGS[:]
 else:
 self.LDFLAGS=[]
 # Template based part of C code generation
 # files are stacked at the beginning, as files of confnode tree root
 self.Freeze()
 self.ClearSizer(self.PLCParamsSizer)
 if self.CTR is not None:
 plcwindow = wx.Panel(self.PLCConfig, -1, size=wx.Size(-1, -1))
-if self.CTR.PlugTestModified():
+if self.CTR.CTNTestModified():
 bkgdclr = CHANGED_TITLE_COLOUR
 else:
 bkgdclr = TITLE_COLOUR
 if self.CTR not in self.ConfNodeInfos:
 self.RefreshScrollBars()
 self.Thaw()
 def GenerateTreeBranch(self, confnode):
 leftwindow = wx.Panel(self.PLCConfig, -1, size=wx.Size(-1, -1))
-if confnode.PlugTestModified():
+if confnode.CTNTestModified():
 bkgdclr=CHANGED_WINDOW_COLOUR
 else:
 bkgdclr=WINDOW_COLOUR
 leftwindow.SetBackgroundColour(bkgdclr)
 if confnode not in self.ConfNodeInfos:
 self.ConfNodeInfos[confnode] = {"expanded" : False, "left_visible" : False, "right_visible" : False}
-self.ConfNodeInfos[confnode]["children"] = confnode.IECSortedChilds()
+self.ConfNodeInfos[confnode]["children"] = confnode.IECSortedChildren()
 confnode_infos = confnode.GetVariableLocationTree()
 confnode_locations = []
 if len(self.ConfNodeInfos[confnode]["children"]) == 0:
 confnode_locations = confnode_infos["children"]
 if not self.ConfNodeInfos[confnode].has_key("locations_infos"):
 def SetOnlineMode(self, mode, path=None):
 self.CTR.SetOnlineMode(mode, path)
 self.RestartTimer()
 def AddBus(self, iec_channel, name, icon=None):
-for child in self.CTR.IterChilds():
+for child in self.CTR.IterChildren():
 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.CTR.PlugAddChild(name, "LPCBus", iec_channel)
+bus = self.CTR.CTNAddChild(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.CTR.GetChildByIECLocation((iec_channel,))
 if bus is None:
 return "Error: No bus found\n"
-for child in self.CTR.IterChilds():
+for child in self.CTR.IterChildren():
 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.CTR.GetChildByIECLocation((old_iec_channel,))
 if bus is None:
 return "Error: No bus found\n"
-for child in self.CTR.IterChilds():
+for child in self.CTR.IterChildren():
 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.CTR.UpdateProjectVariableLocation(str(old_iec_channel),
 str(new_iec_channel))
 def RemoveBus(self, iec_channel):
 bus = self.CTR.GetChildByIECLocation((iec_channel,))
 if bus is None:
 return "Error: No bus found\n"
 self.CTR.RemoveProjectVariableByFilter(str(iec_channel))
-self.CTR.PluggedChilds["LPCBus"].remove(bus)
+self.CTR.Children["LPCBus"].remove(bus)
 self.RestartTimer()
 def AddModule(self, parent, iec_channel, name, icode, icon=None):
 module = self.CTR.GetChildByIECLocation(parent)
 if module is None:

changeset 718	5d4dc150b956
parent 717	1c23952dbde1
child 721	ecf4d203c4d4