beremiz: comparison PLCControler.py

equal deleted inserted replaced

-:14b40afccd69
+:6198190bc121
 def ChangePouVariableName(self, pou_name, old_name, new_name):
 if self.Project is not None:
 # Found the pou action corresponding to old name and change its name to new name
 pou = self.Project.getpou(pou_name)
 if pou is not None:
-for type, varlist in pou.getvars():
+for _type, varlist in pou.getvars():
 for var in varlist.getvariable():
 if var.getname() == old_name:
 var.setname(new_name)
 self.BufferProject()
 tempvar.setname(var.Name)
 var_type = PLCOpenParser.CreateElement("type", "variable")
 if isinstance(var.Type, TupleType):
 if var.Type[0] == "array":
-array_type, base_type_name, dimensions = var.Type
+_array_type, base_type_name, dimensions = var.Type
 array = PLCOpenParser.CreateElement("array", "dataType")
 baseType = PLCOpenParser.CreateElement("baseType", "array")
 array.setbaseType(baseType)
 for i, dimension in enumerate(dimensions):
 dimension_range = PLCOpenParser.CreateElement("dimension", "array")
 # Found the configuration corresponding to name
 configuration = self.Project.getconfiguration(name)
 if configuration is not None:
 # Set configuration global vars
 configuration.setglobalVars([
-varlist for vartype, varlist
+varlist for _vartype, varlist
 in self.ExtractVarLists(vars)])
 # Return the configuration globalvars
 def GetConfigurationGlobalVars(self, name, debug=False):
 project = self.GetProject(debug)
 # Found the resource corresponding to name
 resource = self.Project.getconfigurationResource(config_name, name)
 # Set resource global vars
 if resource is not None:
 resource.setglobalVars([
-varlist for vartype, varlist
+varlist for _vartype, varlist
 in self.ExtractVarLists(vars)])
 # Return the resource globalvars
 def GetConfigurationResourceGlobalVars(self, config_name, name, debug=False):
 project = self.GetProject(debug)
 pou = self.Project.getpou(name)
 if pou is not None:
 if pou.interface is None:
 pou.interface = PLCOpenParser.CreateElement("interface", "pou")
 # Set Pou interface
-pou.setvars([varlist for varlist_type, varlist in self.ExtractVarLists(vars)])
+pou.setvars([varlist for _varlist_type, varlist in self.ExtractVarLists(vars)])
 # Replace the return type of the pou given by its name (only for functions)
 def SetPouInterfaceReturnType(self, name, return_type):
 if self.Project is not None:
 pou = self.Project.getpou(name)
 return global_vars
 # Function that returns the block definition associated to the block type given
 def GetBlockType(self, typename, inputs=None, debug=False):
 result_blocktype = None
-for sectioname, blocktype in self.TotalTypesDict.get(typename, []):
+for _sectioname, blocktype in self.TotalTypesDict.get(typename, []):
 if inputs is not None and inputs != "undefined":
-block_inputs = tuple([var_type for name, var_type, modifier in blocktype["inputs"]])
+block_inputs = tuple([var_type for _name, var_type, _modifier in blocktype["inputs"]])
 if reduce(lambda x, y: x and y, map(lambda x: x[0] == "ANY" or self.IsOfType(*x), zip(inputs, block_inputs)), True):
 return blocktype
 else:
 if result_blocktype is not None:
 if inputs == "undefined":
 blocktype_infos = blocktype.getblockInfos()
 if inputs in [None, "undefined"]:
 return blocktype_infos
 if inputs == tuple([var_type
-for name, var_type, modifier in blocktype_infos["inputs"]]):
+for _name, var_type, _modifier in blocktype_infos["inputs"]]):
 return blocktype_infos
 return None
 # Return Block types checking for recursion
 name = None
 if project is not None and words[0] in ["P", "T", "A"]:
 name = words[1]
 blocktypes = []
 for blocks in self.TotalTypesDict.itervalues():
-for sectioname, block in blocks:
+for _sectioname, block in blocks:
 if block["type"] == "functionBlock":
 blocktypes.append(block["name"])
 if project is not None:
 blocktypes.extend([
 pou.getname()
 '''
 return the list of datatypes defined in IEC 61131-3.
 TypeHierarchy_list has a rough order to it (e.g. SINT, INT, DINT, ...),
 which makes it easy for a user to find a type in a menu.
 '''
-return [x for x, y in TypeHierarchy_list if not x.startswith("ANY")]
+return [x for x, _y in TypeHierarchy_list if not x.startswith("ANY")]
 def IsOfType(self, typename, reference, debug=False):
 if reference is None or typename == reference:
 return True
 element = PLCOpenParser.CreateElement("variable", "struct")
 element.setname(element_infos["Name"])
 element_type = PLCOpenParser.CreateElement("type", "variable")
 if isinstance(element_infos["Type"], TupleType):
 if element_infos["Type"][0] == "array":
-array_type, base_type_name, dimensions = element_infos["Type"]
+_array_type, base_type_name, dimensions = element_infos["Type"]
 array = PLCOpenParser.CreateElement("array", "dataType")
 baseType = PLCOpenParser.CreateElement("baseType", "array")
 array.setbaseType(baseType)
 element_type.setcontent(array)
 for j, dimension in enumerate(dimensions):
 i += 1
 return name
 def PasteEditedElementInstances(self, tagname, text, new_pos, middle=False, debug=False):
 element = self.GetEditedElement(tagname, debug)
-element_name, element_type = self.GetEditedElementType(tagname, debug)
+_element_name, element_type = self.GetEditedElementType(tagname, debug)
 if element is not None:
 bodytype = element.getbodyType()
 # Get edited element type scaling
 scaling = None

changeset 1847	6198190bc121
parent 1846	14b40afccd69
child 1850	614396cbffbf