diff -r da5f1fa46f2b -r fb73a6b6622d PLCControler.py --- a/PLCControler.py Thu Oct 19 10:57:35 2017 +0300 +++ b/PLCControler.py Thu Oct 19 11:03:03 2017 +0300 @@ -202,8 +202,8 @@ self.TreeStack[-1].append(var) def AddVariable(self, context, *args): - self.Variables.append(_VariableInfos(*(_translate_args( - [_StringValue] * 5 + [_BoolValue] + [_StringValue], args) + + self.Variables.append(_VariableInfos(*( + _translate_args([_StringValue] * 5 + [_BoolValue] + [_StringValue], args) + [self.GetType(), self.GetTree()]))) # ------------------------------------------------------------------------------- @@ -1590,9 +1590,9 @@ def GetConfNodeDataTypes(self, exclude=None, only_locatables=False): return [{"name": _("%s Data Types") % confnodetypes["name"], "list": [ - datatype.getname() - for datatype in confnodetypes["types"].getdataTypes() - if not only_locatables or self.IsLocatableDataType(datatype)]} + datatype.getname() + for datatype in confnodetypes["types"].getdataTypes() + if not only_locatables or self.IsLocatableDataType(datatype)]} for confnodetypes in self.ConfNodeTypes] def GetVariableLocationTree(self): @@ -2989,7 +2989,7 @@ SELECTION_CONVERGENCE: "selectionConvergence", SIMULTANEOUS_DIVERGENCE: "simultaneousDivergence", SIMULTANEOUS_CONVERGENCE: "simultaneousConvergence"}.get( - divergence_type), "sfcObjects") + divergence_type), "sfcObjects") divergence.setlocalId(id) element.addinstance(divergence)