PLCGenerator.py
changeset 2629 caa43c61f90c
parent 2521 48ebcbe7f19b
child 2633 fecdb71e7514
equal deleted inserted replaced
2628:40c4449001df 2629:caa43c61f90c
  1158                         parameter = variable.getformalParameter()
  1158                         parameter = variable.getformalParameter()
  1159                         if parameter not in inout_variables and parameter in output_names + ["", "ENO"]:
  1159                         if parameter not in inout_variables and parameter in output_names + ["", "ENO"]:
  1160                             if variable.getformalParameter() == "":
  1160                             if variable.getformalParameter() == "":
  1161                                 variable_name = "%s%d" % (type, block.getlocalId())
  1161                                 variable_name = "%s%d" % (type, block.getlocalId())
  1162                             else:
  1162                             else:
  1163                                 variable_name = "%s%d_%s" % (type, block.getlocalId(), parameter)
  1163                                 variable_name = "_TMP_%s%d_%s" % (type, block.getlocalId(), parameter)
  1164                             if self.Interface[-1][0] != "VAR" or self.Interface[-1][1] is not None or self.Interface[-1][2]:
  1164                             if self.Interface[-1][0] != "VAR" or self.Interface[-1][1] is not None or self.Interface[-1][2]:
  1165                                 self.Interface.append(("VAR", None, False, []))
  1165                                 self.Interface.append(("VAR", None, False, []))
  1166                             if variable.connectionPointOut in self.ConnectionTypes:
  1166                             if variable.connectionPointOut in self.ConnectionTypes:
  1167                                 self.Interface[-1][3].append((self.ConnectionTypes[variable.connectionPointOut], variable_name, None, None))
  1167                                 self.Interface[-1][3].append((self.ConnectionTypes[variable.connectionPointOut], variable_name, None, None))
  1168                             else:
  1168                             else:
  1251                                 break
  1251                                 break
  1252                 else:
  1252                 else:
  1253                     if output_parameter == "":
  1253                     if output_parameter == "":
  1254                         output_name = "%s%d" % (type, block.getlocalId())
  1254                         output_name = "%s%d" % (type, block.getlocalId())
  1255                     else:
  1255                     else:
  1256                         output_name = "%s%d_%s" % (type, block.getlocalId(), output_parameter)
  1256                         output_name = "_TMP_%s%d_%s" % (type, block.getlocalId(), output_parameter)
  1257                     output_value = [(output_name, output_info)]
  1257                     output_value = [(output_name, output_info)]
  1258                 return self.ExtractModifier(output_variable, output_value, output_info)
  1258                 return self.ExtractModifier(output_variable, output_value, output_info)
  1259             if block_infos["type"] == "functionBlock":
  1259             if block_infos["type"] == "functionBlock":
  1260                 output_info = (self.TagName, "block", block.getlocalId(), "output", output_idx)
  1260                 output_info = (self.TagName, "block", block.getlocalId(), "output", output_idx)
  1261                 output_name = self.ExtractModifier(output_variable, [("%s.%s" % (name, output_parameter), output_info)], output_info)
  1261                 output_name = self.ExtractModifier(output_variable, [("%s.%s" % (name, output_parameter), output_info)], output_info)