plcopen/structures.py
changeset 1298 f034fb2b1aab
parent 1297 cd639725fba5
child 1310 3d7fa2257b24
equal deleted inserted replaced
1297:cd639725fba5 1298:f034fb2b1aab
   156                                   (name, (generator.TagName, "block", block.getlocalId(), "name")),
   156                                   (name, (generator.TagName, "block", block.getlocalId(), "name")),
   157                                   ("(", ())]
   157                                   ("(", ())]
   158             generator.Program += JoinList([(", ", ())], vars)
   158             generator.Program += JoinList([(", ", ())], vars)
   159             generator.Program += [(");\n", ())]
   159             generator.Program += [(");\n", ())]
   160     
   160     
   161     if link:
   161     if link is not None:
   162         connectionPoint = link.getposition()[-1]
   162         connectionPoint = link.getposition()[-1]
   163         output_parameter = link.getformalParameter()
   163         output_parameter = link.getformalParameter()
   164     else:
   164     else:
   165         connectionPoint = None
   165         connectionPoint = None
   166         output_parameter = None
   166         output_parameter = None
   175                     if output_parameter != "ENO":
   175                     if output_parameter != "ENO":
   176                         output_idx = output_names.index(output_parameter)
   176                         output_idx = output_names.index(output_parameter)
   177     else:
   177     else:
   178         for i, variable in enumerate(output_variables):
   178         for i, variable in enumerate(output_variables):
   179             blockPointx, blockPointy = variable.connectionPointOut.getrelPositionXY()
   179             blockPointx, blockPointy = variable.connectionPointOut.getrelPositionXY()
   180             if (not connectionPoint or 
   180             if (connectionPoint is None or 
   181                 block.getx() + blockPointx == connectionPoint.getx() and 
   181                 block.getx() + blockPointx == connectionPoint.getx() and 
   182                 block.gety() + blockPointy == connectionPoint.gety()):
   182                 block.gety() + blockPointy == connectionPoint.gety()):
   183                 output_variable = variable
   183                 output_variable = variable
   184                 output_parameter = variable.getformalParameter()
   184                 output_parameter = variable.getformalParameter()
   185                 output_idx = i
   185                 output_idx = i