plcopeneditor_history: comparison PLCControler.py

equal deleted inserted replaced

-:36d378bd852e
+:dae55dd9ee14
 #You should have received a copy of the GNU General Public
 #License along with this library; if not, write to the Free Software
 #Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 from minixsv import pyxsval
+from xml.dom import minidom
 import cPickle
 import os,sys,re
 from datetime import *
 from plcopen import plcopen
 self.LastNewIndex = 0
 self.Reset()
 # Reset PLCControler internal variables
 def Reset(self):
+self.VerifyXML = False
 self.Project = None
 self.ProjectBuffer = None
 self.FilePath = ""
 self.FileName = ""
 self.ElementsOpened = []
 def CreateNewProject(self, name):
 # Create the project
 self.Project = plcopen.project()
 self.Project.setName(name)
 # Initialize the project buffer
-self.ProjectBuffer = UndoBuffer(self.Copy(self.Project))
+#self.ProjectBuffer = UndoBuffer(self.Copy(self.Project))
 # Change project name
 def SetProjectName(self, name):
 self.Project.setName(name)
 connector["edge"] = variable.getConnectorEdge()
 connector["links"] = []
 connections = variable.connectionPointIn.getConnections()
 if connections:
 for link in connections:
-dic = {"refLocalId":link.getRefLocalId(),"points":link.getPoints()}
+dic = {"refLocalId":link.getRefLocalId(),"points":link.getPoints(),"formalParameter":link.getFormalParameter()}
 connector["links"].append(dic)
 infos["connectors"]["inputs"].append(connector)
 for variable in instance.outputVariables.getVariable():
 connector = {}
 connector["position"] = variable.connectionPointOut.getRelPosition()
 infos["connector"]["edge"] = instance.getConnectorEdge()
 infos["connector"]["links"] = []
 connections = instance.connectionPointIn.getConnections()
 if connections:
 for link in connections:
-dic = {"refLocalId":link.getRefLocalId(),"points":link.getPoints()}
+dic = {"refLocalId":link.getRefLocalId(),"points":link.getPoints(),"formalParameter":link.getFormalParameter()}
 infos["connector"]["links"].append(dic)
 elif isinstance(instance, plcopen.inOutVariable):
 infos["name"] = instance.getExpression()
 infos["value_type"] = self.GetPouVarValueType(self.GetCurrentElementEditing(), infos["name"])
 infos["type"] = "inout"
 infos["connectors"]["input"]["edge"] = instance.getInputEdge()
 infos["connectors"]["input"]["links"] = []
 connections = instance.connectionPointIn.getConnections()
 if connections:
 for link in connections:
-dic = {"refLocalId":link.getRefLocalId(),"points":link.getPoints()}
+dic = {"refLocalId":link.getRefLocalId(),"points":link.getPoints(),"formalParameter":link.getFormalParameter()}
 infos["connectors"]["input"]["links"].append(dic)
 elif isinstance(instance, plcopen.continuation):
 infos["name"] = instance.getName()
 infos["value_type"] = self.GetPouVarValueType(self.GetCurrentElementEditing(), infos["name"])
 infos["type"] = "continuation"
 infos["connector"]["position"] = instance.connectionPointIn.getRelPosition()
 infos["connector"]["links"] = []
 connections = instance.connectionPointIn.getConnections()
 if connections:
 for link in connections:
-dic = {"refLocalId":link.getRefLocalId(),"points":link.getPoints()}
+dic = {"refLocalId":link.getRefLocalId(),"points":link.getPoints(),"formalParameter":link.getFormalParameter()}
 infos["connector"]["links"].append(dic)
 elif isinstance(instance, plcopen.comment):
 infos["type"] = "comment"
 infos["content"] = instance.getContentText()
 elif isinstance(instance, plcopen.leftPowerRail):
 for connection in instance.getConnectionPointIn():
 connector = {}
 connector["position"] = connection.getRelPosition()
 connector["links"] = []
 for link in connection.getConnections():
-dic = {"refLocalId":link.getRefLocalId(),"points":link.getPoints()}
+dic = {"refLocalId":link.getRefLocalId(),"points":link.getPoints(),"formalParameter":link.getFormalParameter()}
 connector["links"].append(dic)
 infos["connectors"].append(connector)
 elif isinstance(instance, plcopen.contact):
 infos["type"] = "contact"
 infos["name"] = instance.getVariable()
 infos["connectors"]["input"]["position"] = instance.connectionPointIn.getRelPosition()
 infos["connectors"]["input"]["links"] = []
 connections = instance.connectionPointIn.getConnections()
 if connections:
 for link in connections:
-dic = {"refLocalId":link.getRefLocalId(),"points":link.getPoints()}
+dic = {"refLocalId":link.getRefLocalId(),"points":link.getPoints(),"formalParameter":link.getFormalParameter()}
 infos["connectors"]["input"]["links"].append(dic)
 infos["connectors"]["output"]["position"] = instance.connectionPointOut.getRelPosition()
 elif isinstance(instance, plcopen.coil):
 infos["type"] = "coil"
 infos["name"] = instance.getVariable()
 infos["connectors"]["input"]["position"] = instance.connectionPointIn.getRelPosition()
 infos["connectors"]["input"]["links"] = []
 connections = instance.connectionPointIn.getConnections()
 if connections:
 for link in connections:
-dic = {"refLocalId":link.getRefLocalId(),"points":link.getPoints()}
+dic = {"refLocalId":link.getRefLocalId(),"points":link.getPoints(),"formalParameter":link.getFormalParameter()}
 infos["connectors"]["input"]["links"].append(dic)
 infos["connectors"]["output"]["position"] = instance.connectionPointOut.getRelPosition()
 elif isinstance(instance, plcopen.step):
 infos["type"] = "step"
 infos["name"] = instance.getName()
 infos["connectors"]["input"]["position"] = instance.connectionPointIn.getRelPosition()
 infos["connectors"]["input"]["links"] = []
 connections = instance.connectionPointIn.getConnections()
 if connections:
 for link in connections:
-dic = {"refLocalId":link.getRefLocalId(),"points":link.getPoints()}
+dic = {"refLocalId":link.getRefLocalId(),"points":link.getPoints(),"formalParameter":link.getFormalParameter()}
 infos["connectors"]["input"]["links"].append(dic)
 if instance.connectionPointOut:
 infos["connectors"]["output"] = {"position" : instance.connectionPointOut.getRelPosition()}
 if instance.connectionPointOutAction:
 infos["connectors"]["action"] = {"position" : instance.connectionPointOutAction.getRelPosition()}
 infos["connectors"]["input"]["position"] = instance.connectionPointIn.getRelPosition()
 infos["connectors"]["input"]["links"] = []
 connections = instance.connectionPointIn.getConnections()
 if connections:
 for link in connections:
-dic = {"refLocalId":link.getRefLocalId(),"points":link.getPoints()}
+dic = {"refLocalId":link.getRefLocalId(),"points":link.getPoints(),"formalParameter":link.getFormalParameter()}
 infos["connectors"]["input"]["links"].append(dic)
 infos["connectors"]["output"]["position"] = instance.connectionPointOut.getRelPosition()
 elif isinstance(instance, (plcopen.selectionDivergence, plcopen.simultaneousDivergence)):
 if isinstance(instance, plcopen.selectionDivergence):
 infos["type"] = "selectionDivergence"
 connector["position"] = instance.connectionPointIn.getRelPosition()
 connector["links"] = []
 connections = instance.connectionPointIn.getConnections()
 if connections:
 for link in connections:
-dic = {"refLocalId":link.getRefLocalId(),"points":link.getPoints()}
+dic = {"refLocalId":link.getRefLocalId(),"points":link.getPoints(),"formalParameter":link.getFormalParameter()}
 connector["links"].append(dic)
 infos["connectors"]["inputs"].append(connector)
 for sequence in instance.getConnectionPointOut():
 connector = {}
 connector["position"] = sequence.getRelPosition()
 connector["position"] = sequence.getRelPosition()
 connector["links"] = []
 connections = sequence.getConnections()
 if connections:
 for link in connections:
-dic = {"refLocalId":link.getRefLocalId(),"points":link.getPoints()}
+dic = {"refLocalId":link.getRefLocalId(),"points":link.getPoints(),"formalParameter":link.getFormalParameter()}
 connector["links"].append(dic)
 infos["connectors"]["inputs"].append(connector)
 connector = {}
 connector["position"] = instance.connectionPointOut.getRelPosition()
 infos["connectors"]["outputs"].append(connector)
 infos["connector"]["position"] = instance.connectionPointIn.getRelPosition()
 infos["connector"]["links"] = []
 connections = instance.connectionPointIn.getConnections()
 if connections:
 for link in connections:
-dic = {"refLocalId":link.getRefLocalId(),"points":link.getPoints()}
+dic = {"refLocalId":link.getRefLocalId(),"points":link.getPoints(),"formalParameter":link.getFormalParameter()}
 infos["connector"]["links"].append(dic)
 elif isinstance(instance, plcopen.actionBlock):
 infos["type"] = "actionBlock"
 infos["actions"] = instance.getActions()
 infos["connector"] = {}
 infos["connector"]["position"] = instance.connectionPointIn.getRelPosition()
 infos["connector"]["links"] = []
 connections = instance.connectionPointIn.getConnections()
 if connections:
 for link in connections:
-dic = {"refLocalId":link.getRefLocalId(),"points":link.getPoints()}
+dic = {"refLocalId":link.getRefLocalId(),"points":link.getPoints(),"formalParameter":link.getFormalParameter()}
 infos["connector"]["links"].append(dic)
 return infos
 return False
 # Return the variable type of the given pou
 wires = connector.GetWires()
 idx = 0
 for wire, handle in wires:
 points = wire.GetPoints(handle != 0)
 if handle == 0:
-refLocalId = wire.GetConnectedId(-1)
+result = wire.GetConnectedInfos(-1)
 else:
-refLocalId = wire.GetConnectedId(0)
+result = wire.GetConnectedInfos(0)
-if refLocalId != None:
+if result != None:
+refLocalId, formalParameter = result
 connection.addConnection()
 connection.setConnectionId(idx, refLocalId)
 connection.setConnectionPoints(idx, points)
+if formalParameter != "":
+connection.setConnectionParameter(idx, formalParameter)
+else:
+connection.setConnectionParameter(idx, None)
 idx += 1
 def AddCurrentElementEditingBlock(self, id):
 block = plcopen.block()
 block.setLocalId(id)
 new_instance["Task"] = ""
 instances_data.append(new_instance)
 return tasks_data, instances_data
 def OpenXMLFile(self, filepath):
-if sys:
+if self.VerifyXML:
-sys.stdout = HolePseudoFile()
+if sys:
-tree = pyxsval.parseAndValidate(filepath, os.path.join(sys.path[0], "plcopen/TC6_XML_V10_B.xsd"))
+sys.stdout = HolePseudoFile()
-if sys:
+result = pyxsval.parseAndValidate(filepath, os.path.join(sys.path[0], "plcopen/TC6_XML_V10_B.xsd"))
-sys.stdout = sys.__stdout__
+if sys:
+sys.stdout = sys.__stdout__
+tree = result.getTree()
+else:
+xmlfile = open(filepath, 'r')
+tree = minidom.parse(xmlfile)
+xmlfile.close()
 self.Project = plcopen.project()
-self.Project.loadXMLTree(tree.getTree().childNodes[0])
+self.Project.loadXMLTree(tree.childNodes[0])
 self.UndoBuffer = UndoBuffer(self.Copy(self.Project), True)
 self.SetFilePath(filepath)
 self.ElementsOpened = []
 self.CurrentElementEditing = None
 self.RefreshPouUsingTree()
 "xmlns:xhtml" : "http://www.w3.org/1999/xhtml",
 "xmlns:xsi" : "http://www.w3.org/2001/XMLSchema-instance",
 "xsi:schemaLocation" : "http://www.plcopen.org/xml/tc6.xsd http://www.plcopen.org/xml/tc6.xsd"}
 text += self.Project.generateXMLText("project", 0, extras)
-if sys:
+if self.VerifyXML:
-sys.stdout = HolePseudoFile()
+if sys:
-pyxsval.parseAndValidateString(text, open(os.path.join(sys.path[0], "plcopen/TC6_XML_V10_B.xsd"),"r").read())
+sys.stdout = HolePseudoFile()
-if sys:
+pyxsval.parseAndValidateString(text, open(os.path.join(sys.path[0], "plcopen/TC6_XML_V10_B.xsd"),"r").read())
-sys.stdout = sys.__stdout__
+if sys:
+sys.stdout = sys.__stdout__
 if filepath:
 xmlfile = open(filepath,"w")
 else:
 xmlfile = open(self.FilePath,"w")
 xmlfile.write(text)
 xmlfile.close()
-self.UndoBuffer.CurrentSaved()
+#self.ProjectBuffer.CurrentSaved()
 if filepath:
 self.SetFilePath(filepath)
 return True
 #-------------------------------------------------------------------------------
 """
 def Copy(self, model):
 return cPickle.loads(cPickle.dumps(model))
 def BufferProject(self):
-self.UndoBuffer.Buffering(self.Copy(self))
+self.ProjectBuffer.Buffering(self.Copy(self))
 def ProjectIsSaved(self):
-return self.UndoBuffer.IsCurrentSaved()
+return self.ProjectBuffer.IsCurrentSaved()
 def LoadPrevious(self):
-self.Project = self.Copy(self.UndoBuffer.Previous())
+self.Project = self.Copy(self.ProjectBuffer.Previous())
 self.RefreshElementsOpened()
 def LoadNext(self):
-self.Project = self.Copy(self.UndoBuffer.Next())
+self.Project = self.Copy(self.ProjectBuffer.Next())
 self.RefreshElementsOpened()
 def GetBufferState(self):
-first = self.UndoBuffer.IsFirst()
+first = self.ProjectBuffer.IsFirst()
-last = self.UndoBuffer.IsLast()
+last = self.ProjectBuffer.IsLast()
 return not first, not last

changeset 27	dae55dd9ee14
parent 24	364320323b4d
child 28	fc23e1f415d8