beremiz: comparison plcopen/plcopen.py

equal deleted inserted replaced

-:f427352f9727
+:f3cfe1ff917e
 from xmlclass import *
 from structures import *
 from types import *
 import os, re
+from collections import OrderedDict
 """
 Dictionary that makes the relation between var names in plcopen and displayed values
 """
 VarTypes = {"Local" : "localVars", "Temp" : "tempVars", "Input" : "inputVars",
 "Output" : "outputVars", "InOut" : "inOutVars", "External" : "externalVars",
 cls.singleLineAttributes = False
 cls.EnumeratedDataTypeValues = {}
 cls.CustomDataTypeRange = {}
 cls.CustomTypeHierarchy = {}
 cls.ElementUsingTree = {}
-cls.CustomBlockTypes = []
+cls.CustomBlockTypes = OrderedDict()
 def setname(self, name):
 self.contentHeader.setname(name)
 setattr(cls, "setname", setname)
 setattr(cls, "AddCustomDataType", AddCustomDataType)
 # Update Block types with user-defined pou added
 def RefreshCustomBlockTypes(self):
 # Reset the tree of user-defined pou cross-use
-self.CustomBlockTypes = []
+self.CustomBlockTypes = OrderedDict()
 for pou in self.getpous():
 self.AddCustomBlockType(pou)
 setattr(cls, "RefreshCustomBlockTypes", RefreshCustomBlockTypes)
 def AddCustomBlockType(self, pou):
 block_infos["outputs"].append((var.getname(), var_type["name"].upper(), "none"))
 else:
 block_infos["outputs"].append((var.getname(), var_type["name"], "none"))
 block_infos["usage"] = "\n (%s) => (%s)" % (", ".join(["%s:%s" % (input[1], input[0]) for input in block_infos["inputs"]]),
 ", ".join(["%s:%s" % (output[1], output[0]) for output in block_infos["outputs"]]))
-self.CustomBlockTypes.append(block_infos)
+self.CustomBlockTypes[pou_name]=block_infos
 setattr(cls, "AddCustomBlockType", AddCustomBlockType)
 def AddElementUsingTreeInstance(self, name, type_infos):
 typename = type_infos.getname()
 elements = self.ElementUsingTree.setdefault(typename, set())
 return self.EnumeratedDataTypeValues[type]
 return []
 setattr(cls, "GetEnumeratedDataTypeValues", GetEnumeratedDataTypeValues)
 # Function that returns the block definition associated to the block type given
-def GetCustomBlockType(self, type, inputs = None):
+def GetCustomBlockType(self, typename, inputs = None):
-for customblocktype in self.CustomBlockTypes:
+customblocktype = self.CustomBlockTypes.get(typename,None)
+if customblocktype is not None:
 if inputs is not None and inputs != "undefined":
 customblock_inputs = tuple([var_type for name, var_type, modifier in customblocktype["inputs"]])
-same_inputs = inputs == customblock_inputs
+if inputs == customblock_inputs:
+return customblocktype
 else:
-same_inputs = True
-if customblocktype["name"] == type and same_inputs:
 return customblocktype
 return None
 setattr(cls, "GetCustomBlockType", GetCustomBlockType)
 # Return Block types checking for recursion
 def GetCustomBlockTypes(self, exclude = None, onlyfunctions = False):
 if exclude is not None:
-return [customblocktype for customblocktype in self.CustomBlockTypes
+return [customblocktype for name,customblocktype in self.CustomBlockTypes.iteritems()
 if (customblocktype["type"] != "program"
-and customblocktype["name"] != exclude
+and name != exclude
-and not self.ElementIsUsedBy(exclude, customblocktype["name"])
+and not self.ElementIsUsedBy(exclude, name)
 and not (onlyfunctions and customblocktype["type"] != "function"))]
-return [customblocktype for customblocktype in self.CustomBlockTypes
+return [customblocktype for customblocktype in self.CustomBlockTypes.itervalues()
 if (customblocktype["type"] != "program"
 and not (onlyfunctions and customblocktype["type"] != "function"))]
 setattr(cls, "GetCustomBlockTypes", GetCustomBlockTypes)
 # Return Function Block types checking for recursion
-def GetCustomFunctionBlockTypes(self, exclude = ""):
+def GetCustomFunctionBlockTypes(self, exclude = None):
-customblocktypes = []
+if exclude is not None:
-for customblocktype in self.CustomBlockTypes:
+return [customblocktype for name,customblocktype in self.CustomBlockTypes.iteritems()
-if customblocktype["type"] == "functionBlock" and customblocktype["name"] != exclude and not self.ElementIsUsedBy(exclude, customblocktype["name"]):
+if (customblocktype["type"] == "functionBlock"
-customblocktypes.append(customblocktype["name"])
+and name != exclude
-return customblocktypes
+and not self.ElementIsUsedBy(exclude, name))]
+return [customblocktype for customblocktype in self.CustomBlockTypes.itervalues()
+if customblocktype["type"] == "functionBlock"]
 setattr(cls, "GetCustomFunctionBlockTypes", GetCustomFunctionBlockTypes)
 # Return Block types checking for recursion
 def GetCustomBlockResource(self):
-customblocktypes = []
+return [customblocktype for customblocktype in self.CustomBlockTypes.itervalues()
-for customblocktype in self.CustomBlockTypes:
+if customblocktype["type"] == "program"]
-if customblocktype["type"] == "program":
-customblocktypes.append(customblocktype["name"])
-return customblocktypes
 setattr(cls, "GetCustomBlockResource", GetCustomBlockResource)
 # Return Data Types checking for recursion
 def GetCustomDataTypes(self, exclude = "", only_locatable = False):
 customdatatypes = []

changeset 1283	f3cfe1ff917e
parent 1281	47131e3388f4
child 1285	fa77f3b8f182