beremiz: comparison plcopen/plcopen.py

equal deleted inserted replaced

-:cd639725fba5
+:f034fb2b1aab
 infos = _getelementinfos(self)
 infos["type"] = "step"
 specific_values = infos["specific_values"]
 specific_values["name"] = self.getname()
 specific_values["initial"] = self.getinitialStep()
-if self.connectionPointIn:
+if self.connectionPointIn is not None:
 infos["inputs"].append(_getconnectioninfos(self, self.connectionPointIn, True))
-if self.connectionPointOut:
+if self.connectionPointOut is not None:
 infos["outputs"].append(_getconnectioninfos(self, self.connectionPointOut))
-if self.connectionPointOutAction:
+if self.connectionPointOutAction is not None:
 specific_values["action"] = _getconnectioninfos(self, self.connectionPointOutAction)
 return infos
 setattr(cls, "getinfos", getinfos)
 def Search(self, criteria, parent_infos=[]):
 priority = 0
 specific_values["priority"] = priority
 condition = self.getconditionContent()
 specific_values["condition_type"] = condition["type"]
 if specific_values["condition_type"] == "connection":
-specific_values["connection"] = _getconnectioninfos(self, condition, True)
+specific_values["connection"] = _getconnectioninfos(self, condition["value"], True)
 else:
-specific_values["condition"] = condition
+specific_values["condition"] = condition["value"]
 infos["inputs"].append(_getconnectioninfos(self, self.connectionPointIn, True))
 infos["outputs"].append(_getconnectioninfos(self, self.connectionPointOut))
 return infos
 setattr(cls, "getinfos", getinfos)
 def setconditionContent(self, condition_type, value):
-if not self.condition:
+if self.condition is None:
 self.addcondition()
 if condition_type == "connection":
 condition = PLCOpenParser.CreateElement("connectionPointIn", "condition")
 else:
 condition = PLCOpenParser.CreateElement(condition_type, "condition")
 condition.setcontent(PLCOpenParser.CreateElement("ST", "inline"))
 condition.settext(value)
 setattr(cls, "setconditionContent", setconditionContent)
 def getconditionContent(self):
-if self.condition:
+if self.condition is not None:
 content = self.condition.getcontent()
 values = {"type" : content.getLocalTag()}
 if values["type"] == "reference":
 values["value"] = content.getname()
 elif values["type"] == "inline":
 return values
 return ""
 setattr(cls, "getconditionContent", getconditionContent)
 def getconditionConnection(self):
-if self.condition:
+if self.condition is not None:
 content = self.condition.getcontent()
 if content.getLocalTag() == "connection":
 return content
 return None
 setattr(cls, "getconditionConnection", getconditionConnection)
 NodeSetAttr(node, "y", "0")
 tree.childNodes.insert(0, node)
 setattr(cls, "compatibility", compatibility)
 def setreferenceName(self, name):
-if self.reference:
+if self.reference is not None:
 self.reference.setname(name)
 setattr(cls, "setreferenceName", setreferenceName)
 def getreferenceName(self):
-if self.reference:
+if self.reference is not None:
 return self.reference.getname()
 return None
 setattr(cls, "getreferenceName", getreferenceName)
 def setinlineContent(self, content):
-if self.inline:
+if self.inline is not None:
-self.inline.setcontent(PLCOpenParser.CreateElement("ST", "action"))
+self.inline.setcontent(PLCOpenParser.CreateElement("ST", "inline"))
-self.inline.setanyText(content)
+self.inline.settext(content)
 setattr(cls, "setinlineContent", setinlineContent)
 def getinlineContent(self):
-if self.inline:
+if self.inline is not None:
-return self.inline.getanyText()
+return self.inline.gettext()
 return None
 setattr(cls, "getinlineContent", getinlineContent)
 def updateElementName(self, old_name, new_name):
-if self.reference and self.reference.getname() == old_name:
+if self.reference is not None and self.reference.getname() == old_name:
 self.reference.setname(new_name)
-if self.inline:
+if self.inline is not None:
 self.inline.updateElementName(old_name, new_name)
 setattr(cls, "updateElementName", updateElementName)
 def updateElementAddress(self, address_model, new_leading):
-if self.reference:
+if self.reference is not None:
 self.reference.setname(update_address(self.reference.getname(), address_model, new_leading))
-if self.inline:
+if self.inline is not None:
 self.inline.updateElementAddress(address_model, new_leading)
 setattr(cls, "updateElementAddress", updateElementAddress)
 def Search(self, criteria, parent_infos=[]):
 qualifier = self.getqualifier()
 setattr(cls, "getinfos", getinfos)
 def setactions(self, actions):
 self.action = []
 for params in actions:
-action = PLCOpenParser.GetElementClass("action", "actionBlock")()
+action = PLCOpenParser.CreateElement("action", "actionBlock")
+self.appendaction(action)
 action.setqualifier(params["qualifier"])
 if params["type"] == "reference":
 action.addreference()
 action.setreferenceName(params["value"])
 else:
 action.setinlineContent(params["value"])
 if params.has_key("duration"):
 action.setduration(params["duration"])
 if params.has_key("indicator"):
 action.setindicator(params["indicator"])
-self.action.append(action)
 setattr(cls, "setactions", setactions)
 def getactions(self):
 actions = []
 for action in self.action:
 params = {}
 params["qualifier"] = action.getqualifier()
 if params["qualifier"] is None:
 params["qualifier"] = "N"
-if action.getreference():
+if action.getreference() is not None:
 params["type"] = "reference"
 params["value"] = action.getreferenceName()
-elif action.getinline():
+elif action.getinline() is not None:
 params["type"] = "inline"
 params["value"] = action.getinlineContent()
 duration = action.getduration()
 if duration:
 params["duration"] = duration
 indicator = action.getindicator()
-if indicator:
+if indicator is not None:
 params["indicator"] = indicator
 actions.append(params)
 return actions
 setattr(cls, "getactions", getactions)

changeset 1298	f034fb2b1aab
parent 1294	f02ba5b83811
child 1299	9ffc49bfdf9d