plcopen/BlockInstanceCollector.py
branchpython3
changeset 3792 365f866ee120
parent 3751 a80a66ba52d6
child 3866 eb107a25556b
equal deleted inserted replaced
3791:c98646b1c981 3792:365f866ee120
   122         specific_values = specific_values_tuple(*_translate_args(
   122         specific_values = specific_values_tuple(*_translate_args(
   123             specific_values_translation, self.SpecificValues))
   123             specific_values_translation, self.SpecificValues))
   124         self.SpecificValues = None
   124         self.SpecificValues = None
   125 
   125 
   126         self.CurrentInstance = _BlockInstanceInfos(
   126         self.CurrentInstance = _BlockInstanceInfos(
   127             *(_translate_args([_StringValue, int] + [float] * 4, args) +
   127             *(_translate_args([_StringValue, int] + [int] * 4, args) +
   128               [specific_values, [], []]))
   128               [specific_values, [], []]))
   129 
   129 
   130         self.BlockInstances[self.CurrentInstance.id] = self.CurrentInstance
   130         self.BlockInstances[self.CurrentInstance.id] = self.CurrentInstance
   131 
   131 
   132     def AddInstanceConnection(self, context, *args):
   132     def AddInstanceConnection(self, context, *args):
   133         connection_args = _translate_args(
   133         connection_args = _translate_args(
   134             [_StringValue] * 2 + [_BoolValue, _StringValue] + [float] * 2, args)
   134             [_StringValue] * 2 + [_BoolValue, _StringValue] + [int] * 2, args)
   135 
   135 
   136         self.CurrentConnection = _InstanceConnectionInfos(
   136         self.CurrentConnection = _InstanceConnectionInfos(
   137             *(connection_args[1:4] + [
   137             *(connection_args[1:4] + [
   138                 _Point(*connection_args[4:6]), []]))
   138                 _Point(*connection_args[4:6]), []]))
   139 
   139 
   150             *(_translate_args([int, _StringValue], args) + [[]]))
   150             *(_translate_args([int, _StringValue], args) + [[]]))
   151         self.CurrentConnection.links.append(self.CurrentLink)
   151         self.CurrentConnection.links.append(self.CurrentLink)
   152 
   152 
   153     def AddLinkPoint(self, context, *args):
   153     def AddLinkPoint(self, context, *args):
   154         self.CurrentLink.points.append(_Point(
   154         self.CurrentLink.points.append(_Point(
   155             *_translate_args([float] * 2, args)))
   155             *_translate_args([int] * 2, args)))
   156 
   156 
   157     def AddAction(self, context, *args):
   157     def AddAction(self, context, *args):
   158         if len(self.SpecificValues) == 0:
   158         if len(self.SpecificValues) == 0:
   159             self.SpecificValues.append([[]])
   159             self.SpecificValues.append([[]])
   160         translated_args = _translate_args([_StringValue] * 5, args)
   160         translated_args = _translate_args([_StringValue] * 5, args)