canfestival: comparison objdictgen/nodelist.py

equal deleted inserted replaced

-:4ecc2f3690f4
+:4864f7f01e1d
 from node import *
 import eds_utils
 import os, shutil
 #-------------------------------------------------------------------------------
 #                          Definition of NodeList Object
 #-------------------------------------------------------------------------------
 """
 Class recording a node list for a CANOpen network.
 """
 class NodeList:
-def __init__(self, manager):
+def __init__(self, manager, netname = ""):
 self.Root = ""
 self.Manager = manager
-self.NetworkName = ""
+self.NetworkName = netname
 self.SlaveNodes = {}
 self.EDSNodes = {}
 self.CurrentSelected = None
+self.Changed = False
+def HasChanged(self):
+return self.Changed or not self.Manager.CurrentIsSaved()
+def ForceChanged(self, changed):
+self.Changed = changed
 def GetNetworkName(self):
 return self.NetworkName
 def SetNetworkName(self, name):
 self.CurrentSelected = selected
 def GetCurrentSelected(self):
 return self.CurrentSelected
-def LoadProject(self, root):
+def LoadProject(self, root, netname = None):
 self.SlaveNodes = {}
 self.EDSNodes = {}
 self.Root = root
 if not os.path.exists(self.Root):
 for file in files:
 result = self.LoadEDS(file)
 if result != None:
 return result
-result = self.LoadMasterNode()
+result = self.LoadMasterNode(netname)
 if result != None:
 return result
-result = self.LoadSlaveNodes()
+result = self.LoadSlaveNodes(netname)
 if result != None:
 return result
-def SaveProject(self):
+self.NetworkName = netname
-result = self.SaveMasterNode()
+def SaveProject(self, netname = None):
+result = self.SaveMasterNode(netname)
 if result != None:
 return result
-result = self.SaveNodeList()
+result = self.SaveNodeList(netname)
 if result != None:
 return result
 def ImportEDSFile(self, edspath):
 dir, file = os.path.split(edspath)
 def AddSlaveNode(self, nodeName, nodeID, eds):
 if eds in self.EDSNodes.keys():
 slave = {"Name" : nodeName, "EDS" : eds, "Node" : self.EDSNodes[eds]}
 self.SlaveNodes[nodeID] = slave
+self.Changed = True
 return None
 else:
 return "\"%s\" EDS file is not available"%eds
 def RemoveSlaveNode(self, index):
 if index in self.SlaveNodes.keys():
 self.SlaveNodes.pop(index)
+OnCloseProjectMenu
 return None
 else:
 return "Node with \"0x%2.2X\" ID doesn't exist"
-def LoadMasterNode(self):
+def LoadMasterNode(self, netname = None):
-masterpath = os.path.join(self.Root, "master.od")
+if netname:
+masterpath = os.path.join(self.Root, "%s_master.od"%netname)
+else:
+masterpath = os.path.join(self.Root, "master.od")
 if os.path.isfile(masterpath):
 self.Manager.OpenFileInCurrent(masterpath)
 else:
 self.Manager.CreateNewNode("MasterNode", 0x00, "master", "", "None", "", "heartbeat", ["DS302"])
 return None
-def SaveMasterNode(self):
+def SaveMasterNode(self, netname = None):
-masterpath = os.path.join(self.Root, "master.od")
+if netname:
+masterpath = os.path.join(self.Root, "%s_master.od"%netname)
+else:
+masterpath = os.path.join(self.Root, "master.od")
 if self.Manager.SaveCurrentInFile(masterpath):
 return None
 else:
 return "Fail to save Master Node"
-def LoadSlaveNodes(self):
+def LoadSlaveNodes(self, netname = None):
 cpjpath = os.path.join(self.Root, "nodelist.cpj")
 if os.path.isfile(cpjpath):
 try:
 networks = eds_utils.ParseCPJFile(cpjpath)
-if len(networks) > 0:
+network = None
-self.NetworkName = networks[0]["Name"]
+if netname:
-for nodeid, node in networks[0]["Nodes"].items():
+for net in networks:
+if net["Name"] == netname:
+network = net
+self.NetworkName = netname
+elif len(networks) > 0:
+network = networks[0]
+self.NetworkName = network["Name"]
+if network:
+for nodeid, node in network["Nodes"].items():
 if node["Present"] == 1:
 result = self.AddSlaveNode(node["Name"], nodeid, node["DCFName"])
 if result != None:
 return result
+self.Changed = False
 except SyntaxError, message:
 return "Unable to load CPJ file\n%s"%message
 return None
-def SaveNodeList(self):
+def SaveNodeList(self, netname = None):
-cpjpath = os.path.join(self.Root, "nodelist.cpj")
+try:
-content = eds_utils.GenerateCPJContent(self)
+cpjpath = os.path.join(self.Root, "nodelist.cpj")
-file = open(cpjpath, "w")
+content = eds_utils.GenerateCPJContent(self)
-file.write(content)
+if netname:
-file.close()
+file = open(cpjpath, "a")
+else:
+file = open(cpjpath, "w")
+file.write(content)
+file.close()
+self.Changed = False
+return None
+except:
+return "Fail to save node list"
 def GetSlaveNodeEntry(self, nodeid, index, subindex = None):
 if nodeid in self.SlaveNodes.keys():
 self.SlaveNodes[nodeid]["Node"].SetNodeID(nodeid)
 return self.SlaveNodes[nodeid]["Node"].GetEntry(index, subindex)
 return self.Manager.GetEntryInfos(index)
 else:
 node = self.SlaveNodes[self.CurrentSelected]["Node"]
 if node:
 return node.GetEntryInfos(index)
+return None
+def GetSubentryInfos(self, index, subindex):
+if self.CurrentSelected != None:
+if self.CurrentSelected == 0:
+return self.Manager.GetSubentryInfos(index, subindex)
+else:
+node = self.SlaveNodes[self.CurrentSelected]["Node"]
+if node:
+return node.GetSubentryInfos(index, subindex)
 return None
 def GetCurrentValidIndexes(self, min, max):
 if self.CurrentSelected != None:
 if self.CurrentSelected == 0:
 return []
 def GetCurrentEntryValues(self, index):
 if self.CurrentSelected != None:
 node = self.SlaveNodes[self.CurrentSelected]["Node"]
-node.SetNodeID(self.CurrentSelected)
 if node:
 return self.Manager.GetNodeEntryValues(node, index)
 else:
 print "Can't find node"
 return [], []
 if __name__ == "__main__":
 from nodemanager import *
 import os, sys, shutil
 manager = NodeManager(sys.path[0])
 nodelist = NodeList(manager)
-#result = nodelist.LoadProject("/home/deobox/beremiz/test_nodelist")
-result = nodelist.LoadProject("/home/deobox/Desktop/TestMapping")
+result = nodelist.LoadProject("/home/laurent/test_nodelist")
 if result != None:
 print result
 else:
 print "MasterNode :"
 manager.CurrentNode.Print()
+print
 for nodeid, node in nodelist.SlaveNodes.items():
 print "SlaveNode name=%s id=0x%2.2X :"%(node["Name"], nodeid)
 node["Node"].Print()
+print

changeset 242	4864f7f01e1d
parent 239	f45fd4cd3832
child 243	7fcc129a06ce