plcopeneditor_history: comparison plcopen/plcopen.py

equal deleted inserted replaced

-:f39377f6c47a
+:765b741fc38f
 """
 QualifierList = {"N" : False, "R" : False, "S" : False, "L" : True, "D" : True,
 "P" : False, "P0" : False, "P1" : False, "SD" : True, "DS" : True, "SL" : True}
+FILTER_ADDRESS_MODEL = "(%%[IQM](?:[XBWDL])?)(%s)((?:\.[0-9]+)*)"
+def update_address(address, address_model, new_leading):
+result = address_model.match(address)
+if result is None:
+return address
+groups = result.groups()
+return groups[0] + new_leading + groups[2]
 def _init_and_compare(function, v1, v2):
 if v1 is None:
 return v2
 if v2 is not None:
 return function(v1, v2)
 index = self.text.find(old_name, index + len(old_name))
 else:
 self.text = self.text[:index] + new_name + self.text[index + len(old_name):]
 index = self.text.find(old_name, index + len(new_name))
 setattr(cls, "updateElementName", updateElementName)
+def updateElementAddress(self, address_model, new_leading):
+startpos = 0
+result = address_model.search(self.text, startpos)
+while result is not None:
+groups = result.groups()
+new_address = groups[0] + new_leading + groups[2]
+self.text = self.text[:result.start()] + new_address + self.text[result.end():]
+startpos = result.start() + len(new_address)
+result = address_model.search(self.text, startpos)
+setattr(cls, "updateElementAddress", updateElementAddress)
 cls = PLCOpenClasses.get("project", None)
 if cls:
 cls.singleLineAttributes = False
 cls.EnumeratedDataTypeValues = {}
 for pou in self.types.getpouElements():
 pou.updateElementName(old_name, new_name)
 for configuration in self.instances.configurations.getconfiguration():
 configuration.updateElementName(old_name, new_name)
 setattr(cls, "updateElementName", updateElementName)
+def updateElementAddress(self, old_leading, new_leading):
+address_model = re.compile(FILTER_ADDRESS_MODEL % old_leading)
+for pou in self.types.getpouElements():
+pou.updateElementAddress(address_model, new_leading)
+for configuration in self.instances.configurations.getconfiguration():
+configuration.updateElementAddress(address_model, new_leading)
+setattr(cls, "updateElementAddress", updateElementAddress)
+def removeVariableByAddress(self, address):
+for pou in self.types.getpouElements():
+pou.removeVariableByAddress(address)
+for configuration in self.instances.configurations.getconfiguration():
+configuration.removeVariableByAddress(address)
+setattr(cls, "removeVariableByAddress", removeVariableByAddress)
+def removeVariableByFilter(self, leading):
+address_model = re.compile(FILTER_ADDRESS_MODEL % leading)
+for pou in self.types.getpouElements():
+pou.removeVariableByFilter(address_model)
+for configuration in self.instances.configurations.getconfiguration():
+configuration.removeVariableByFilter(address_model)
+setattr(cls, "removeVariableByFilter", removeVariableByFilter)
 def RefreshDataTypeHierarchy(self):
 self.EnumeratedDataTypeValues = {}
 self.CustomDataTypeRange = {}
 self.CustomTypeHierarchy = {}
 setattr(cls, "getscaling", getscaling)
 cls = PLCOpenClasses.get("configurations_configuration", None)
 if cls:
 def updateElementName(self, old_name, new_name):
+for varlist in self.getglobalVars():
+for var in varlist.getvariable():
+var_address = var.getaddress()
+if var_address is not None:
+if var_address == oldname:
+var.setaddress(new_name)
+if var.getname() == old_name:
+var.setname(new_name)
 for resource in self.getresource():
 resource.updateElementName(old_name, new_name)
 setattr(cls, "updateElementName", updateElementName)
+def updateElementAddress(self, address_model, new_leading):
+for varlist in self.getglobalVars():
+for var in varlist.getvariable():
+var_address = var.getaddress()
+if var_address is not None:
+var.setaddress(update_address(var_address, address_model, new_leading))
+for resource in self.getresource():
+resource.updateElementAddress(address_model, new_leading)
+setattr(cls, "updateElementAddress", updateElementAddress)
+def removeVariableByAddress(self, address):
+for varlist in self.getglobalVars():
+variables = varlist.getvariable()
+for i in xrange(len(variables)-1, -1, -1):
+if variables[i].getaddress() == address:
+variables.pop(i)
+setattr(cls, "removeVariableByAddress", removeVariableByAddress)
+def removeVariableByFilter(self, address_model):
+for varlist in self.getglobalVars():
+variables = varlist.getvariable()
+for i in xrange(len(variables)-1, -1, -1):
+var_address = variables[i].getaddress()
+if var_address is not None:
+result = address_model.match(var_address)
+if result is not None:
+variables.pop(i)
+setattr(cls, "removeVariableByFilter", removeVariableByFilter)
 cls = PLCOpenClasses.get("configuration_resource", None)
 if cls:
 def updateElementName(self, old_name, new_name):
+for varlist in self.getglobalVars():
+for var in varlist.getvariable():
+var_address = var.getaddress()
+if var_address is not None:
+if var_address == oldname:
+var.setaddress(new_name)
+if var.getname() == old_name:
+var.setname(new_name)
 for instance in self.getpouInstance():
 instance.updateElementName(old_name, new_name)
 for task in self.gettask():
 task.updateElementName(old_name, new_name)
 setattr(cls, "updateElementName", updateElementName)
+def updateElementAddress(self, address_model, new_leading):
+for varlist in self.getglobalVars():
+for var in varlist.getvariable():
+var_address = var.getaddress()
+if var_address is not None:
+var.setaddress(update_address(var_address, address_model, new_leading))
+for task in self.gettask():
+task.updateElementAddress(address_model, new_leading)
+setattr(cls, "updateElementAddress", updateElementAddress)
+def removeVariableByAddress(self, address):
+for varlist in self.getglobalVars():
+variables = varlist.getvariable()
+for i in xrange(len(variables)-1, -1, -1):
+if variables[i].getaddress() == address:
+variables.pop(i)
+setattr(cls, "removeVariableByAddress", removeVariableByAddress)
+def removeVariableByFilter(self, address_model):
+for varlist in self.getglobalVars():
+variables = varlist.getvariable()
+for i in xrange(len(variables)-1, -1, -1):
+var_address = variables[i].getaddress()
+if var_address is not None:
+result = address_model.match(var_address)
+if result is not None:
+variables.pop(i)
+setattr(cls, "removeVariableByFilter", removeVariableByFilter)
 cls = PLCOpenClasses.get("resource_task", None)
 if cls:
 def compatibility(self, tree):
 if tree.hasAttribute("interval"):
 setattr(cls, "compatibility", compatibility)
 def updateElementName(self, old_name, new_name):
 if self.single == old_name:
 self.single = new_name
+if self.interval == old_name:
+self.interval = new_name
 for instance in self.getpouInstance():
 instance.updateElementName(old_name, new_name)
 setattr(cls, "updateElementName", updateElementName)
+def updateElementAddress(self, address_model, new_leading):
+if self.single is not None:
+self.single = update_address(self.single, address_model, new_leading)
+if self.interval is not None:
+self.interval = update_address(self.interval, address_model, new_leading)
+setattr(cls, "updateElementAddress", updateElementAddress)
 cls = PLCOpenClasses.get("pouInstance", None)
 if cls:
 def compatibility(self, tree):
 if tree.hasAttribute("type"):
 def updateElementName(self, old_name, new_name):
 if self.interface:
 for content in self.interface.getcontent():
 for var in content["value"].getvariable():
+var_address = var.getaddress()
+if var_address is not None:
+if var_address == oldname:
+var.setaddress(new_name)
+if var.getname() == old_name:
+var.setname(new_name)
 var_type_content = var.gettype().getcontent()
 if var_type_content["name"] == "derived":
 if var_type_content["value"].getname() == old_name:
 var_type_content["value"].setname(new_name)
 self.body[0].updateElementName(old_name, new_name)
 for action in self.getactionList():
 action.updateElementName(old_name, new_name)
 for transition in self.gettransitionList():
 transition.updateElementName(old_name, new_name)
 setattr(cls, "updateElementName", updateElementName)
+def updateElementAddress(self, address_model, new_leading):
+if self.interface:
+for content in self.interface.getcontent():
+for var in content["value"].getvariable():
+var_address = var.getaddress()
+if var_address is not None:
+var.setaddress(update_address(var_address, address_model, new_leading))
+self.body[0].updateElementAddress(address_model, new_leading)
+for action in self.getactionList():
+action.updateElementAddress(address_model, new_leading)
+for transition in self.gettransitionList():
+transition.updateElementAddress(address_model, new_leading)
+setattr(cls, "updateElementAddress", updateElementAddress)
+def removeVariableByAddress(self, address):
+if self.interface:
+for content in self.interface.getcontent():
+variables = content["value"].getvariable()
+for i in xrange(len(variables)-1, -1, -1):
+if variables[i].getaddress() == address:
+variables.pop(i)
+setattr(cls, "removeVariableByAddress", removeVariableByAddress)
+def removeVariableByFilter(self, address_model):
+if self.interface:
+for content in self.interface.getcontent():
+variables = content["value"].getvariable()
+for i in xrange(len(variables)-1, -1, -1):
+var_address = variables[i].getaddress()
+if var_address is not None:
+result = address_model.match(var_address)
+if result is not None:
+variables.pop(i)
+setattr(cls, "removeVariableByFilter", removeVariableByFilter)
 def setbodyType(self, type):
 if type == "IL":
 self.body.setcontent({"name" : "IL", "value" : PLCOpenClasses["formattedText"]()})
 elif type == "ST":
 def updateElementName(self, old_name, new_name):
 self.body.updateElementName(old_name, new_name)
 setattr(cls, "updateElementName", updateElementName)
+def updateElementAddress(self, address_model, new_leading):
+self.body.updateElementAddress(address_model, new_leading)
+setattr(cls, "updateElementAddress", updateElementAddress)
 def hasblock(self, name):
 if self.getbodyType() in ["FBD", "LD", "SFC"]:
 for instance in self.getinstances():
 if isinstance(instance, PLCOpenClasses["fbdObjects_block"]) and instance.getinstanceName() == name:
 return True
 setattr(cls, "gettext", gettext)
 def updateElementName(self, old_name, new_name):
 self.body.updateElementName(old_name, new_name)
 setattr(cls, "updateElementName", updateElementName)
+def updateElementAddress(self, address_model, new_leading):
+self.body.updateElementAddress(address_model, new_leading)
+setattr(cls, "updateElementAddress", updateElementAddress)
 def hasblock(self, name):
 if self.getbodyType() in ["FBD", "LD", "SFC"]:
 for instance in self.getinstances():
 if isinstance(instance, PLCOpenClasses["fbdObjects_block"]) and instance.getinstanceName() == name:
 else:
 for element in self.content["value"].getcontent():
 element["value"].updateElementName(old_name, new_name)
 setattr(cls, "updateElementName", updateElementName)
+def updateElementAddress(self, address_model, new_leading):
+if self.content["name"] in ["IL", "ST"]:
+self.content["value"].updateElementAddress(address_model, new_leading)
+else:
+for element in self.content["value"].getcontent():
+element["value"].updateElementAddress(address_model, new_leading)
+setattr(cls, "updateElementAddress", updateElementAddress)
 def getx(self):
 return self.position.getx()
 def gety(self):
 return self.position.gety()
 _translate(self, dx, dy)
 for connectionPointIn in self.getconnectionPointIn():
 _translateConnections(connectionPointIn, dx, dy)
 def _updateElementName(self, old_name, new_name):
+pass
+def _updateElementAddress(self, address_model, new_leading):
 pass
 _connectionsFunctions = {
 "bbox": {"none": _getBoundingBox,
 "single": _getBoundingBoxSingle,
 setattr(cls, "getx", getx)
 setattr(cls, "gety", gety)
 setattr(cls, "setx", setx)
 setattr(cls, "sety", sety)
 setattr(cls, "updateElementName", _updateElementName)
+setattr(cls, "updateElementAddress", _updateElementAddress)
 setattr(cls, "getBoundingBox", _connectionsFunctions["bbox"][connectionPointInType])
 setattr(cls, "translate", _connectionsFunctions["translate"][connectionPointInType])
 setattr(cls, "filterConnections", _connectionsFunctions["filter"][connectionPointInType])
 setattr(cls, "updateConnectionsId", _connectionsFunctions["update"][connectionPointInType])
 return cls
 def updateElementName(self, old_name, new_name):
 self.content.updateElementName(old_name, new_name)
 setattr(cls, "updateElementName", updateElementName)
+def updateElementAddress(self, address_model, new_leading):
+self.content.updateElementAddress(address_model, new_leading)
+setattr(cls, "updateElementAddress", updateElementAddress)
 cls = _initElementClass("block", "fbdObjects_block")
 if cls:
 def getBoundingBox(self):
 bbox = _getBoundingBox(self)
 for input in self.inputVariables.getvariable():
 def updateElementName(self, old_name, new_name):
 if self.variable == old_name:
 self.variable = new_name
 setattr(cls, "updateElementName", updateElementName)
+def updateElementAddress(self, address_model, new_leading):
+self.variable = update_address(self.variable, address_model, new_leading)
+setattr(cls, "updateElementAddress", updateElementAddress)
 cls = _initElementClass("coil", "ldObjects_coil", "single")
 if cls:
 setattr(cls, "getinfos", _getldelementinfosFunction("coil"))
 def updateElementName(self, old_name, new_name):
 if self.variable == old_name:
 self.variable = new_name
 setattr(cls, "updateElementName", updateElementName)
+def updateElementAddress(self, address_model, new_leading):
+self.variable = update_address(self.variable, address_model, new_leading)
+setattr(cls, "updateElementAddress", updateElementAddress)
 cls = _initElementClass("step", "sfcObjects_step", "single")
 if cls:
 def getinfos(self):
 infos = _getelementinfos(self)
 content["value"].setname(new_name)
 elif content["name"] == "inline":
 content["value"].updateElementName(old_name, new_name)
 setattr(cls, "updateElementName", updateElementName)
+def updateElementAddress(self, address_model, new_leading):
+if self.condition:
+content = self.condition.getcontent()
+if content["name"] == "reference":
+content["value"].setname(update_address(content["value"].getname(), address_model, new_leading))
+elif content["name"] == "inline":
+content["value"].updateElementAddress(address_model, new_leading)
+setattr(cls, "updateElementAddress", updateElementAddress)
 def getconnections(self):
 if self.condition:
 content = self.condition.getcontent()
 if content["name"] == "connectionPointIn":
 return content["value"].getconnections()
 if self.reference and self.reference.getname() == old_name:
 self.reference.setname(new_name)
 if self.inline:
 self.inline.updateElementName(old_name, new_name)
 setattr(cls, "updateElementName", updateElementName)
+def updateElementAddress(self, address_model, new_leading):
+if self.reference:
+self.reference.setname(update_address(self.reference.getname(), address_model, new_leading))
+if self.inline:
+self.inline.updateElementAddress(address_model, new_leading)
+setattr(cls, "updateElementAddress", updateElementAddress)
 cls = _initElementClass("actionBlock", "commonObjects_actionBlock", "single")
 if cls:
 def compatibility(self, tree):
 for child in tree.childNodes[:]:
 def updateElementName(self, old_name, new_name):
 for action in self.action:
 action.updateElementName(old_name, new_name)
 setattr(cls, "updateElementName", updateElementName)
+def updateElementAddress(self, address_model, new_leading):
+for action in self.action:
+action.updateElementAddress(address_model, new_leading)
+setattr(cls, "updateElementAddress", updateElementAddress)
 cls = _initElementClass("inVariable", "fbdObjects_inVariable")
 if cls:
 setattr(cls, "getinfos", _getvariableinfosFunction("input", False, True))
 def updateElementName(self, old_name, new_name):
 if self.expression == old_name:
 self.expression = new_name
 setattr(cls, "updateElementName", updateElementName)
+def updateElementAddress(self, address_model, new_leading):
+self.expression = update_address(self.expression, address_model, new_leading)
+setattr(cls, "updateElementAddress", updateElementAddress)
 cls = _initElementClass("outVariable", "fbdObjects_outVariable", "single")
 if cls:
 setattr(cls, "getinfos", _getvariableinfosFunction("output", True, False))
 def updateElementName(self, old_name, new_name):
 if self.expression == old_name:
 self.expression = new_name
 setattr(cls, "updateElementName", updateElementName)
+def updateElementAddress(self, address_model, new_leading):
+self.expression = update_address(self.expression, address_model, new_leading)
+setattr(cls, "updateElementAddress", updateElementAddress)
 cls = _initElementClass("inOutVariable", "fbdObjects_inOutVariable", "single")
 if cls:
 setattr(cls, "getinfos", _getvariableinfosFunction("inout", True, True))
 def updateElementName(self, old_name, new_name):
 if self.expression == old_name:
 self.expression = new_name
 setattr(cls, "updateElementName", updateElementName)
+def updateElementAddress(self, address_model, new_leading):
+self.expression = update_address(self.expression, address_model, new_leading)
+setattr(cls, "updateElementAddress", updateElementAddress)
 cls = _initElementClass("continuation", "commonObjects_continuation")
 if cls:
 setattr(cls, "getinfos", _getconnectorinfosFunction("continuation"))

changeset 464	765b741fc38f
parent 461	649a8465148d
child 470	cc64bbb1d654