60 else: |
60 else: |
61 vars.append(generator.ExtractModifier(variable, value, input_info)) |
61 vars.append(generator.ExtractModifier(variable, value, input_info)) |
62 for i, variable in enumerate(output_variables): |
62 for i, variable in enumerate(output_variables): |
63 parameter = variable.getformalParameter() |
63 parameter = variable.getformalParameter() |
64 if variable.getformalParameter() == "": |
64 if variable.getformalParameter() == "": |
65 variable_name = "%s%d_OUT"%(type, block.getlocalId()) |
65 variable_name = "%s%d"%(type, block.getlocalId()) |
66 else: |
66 else: |
67 variable_name = "%s%d_%s"%(type, block.getlocalId(), parameter) |
67 variable_name = "%s%d_%s"%(type, block.getlocalId(), parameter) |
68 if generator.Interface[-1][0] != "VAR" or generator.Interface[-1][1] or generator.Interface[-1][2] or generator.Interface[-1][3]: |
68 if generator.Interface[-1][0] != "VAR" or generator.Interface[-1][1] or generator.Interface[-1][2] or generator.Interface[-1][3]: |
69 generator.Interface.append(("VAR", False, False, False, [])) |
69 generator.Interface.append(("VAR", False, False, False, [])) |
70 if variable.connectionPointOut in generator.ConnectionTypes: |
70 if variable.connectionPointOut in generator.ConnectionTypes: |
92 blockPointx, blockPointy = variable.connectionPointOut.getrelPositionXY() |
92 blockPointx, blockPointy = variable.connectionPointOut.getrelPositionXY() |
93 if not connectionPoint or block.getx() + blockPointx == connectionPoint.getx() and block.gety() + blockPointy == connectionPoint.gety(): |
93 if not connectionPoint or block.getx() + blockPointx == connectionPoint.getx() and block.gety() + blockPointy == connectionPoint.gety(): |
94 output_info = (generator.TagName, "block", block.getlocalId(), "output", i) |
94 output_info = (generator.TagName, "block", block.getlocalId(), "output", i) |
95 output_name = variable.getformalParameter() |
95 output_name = variable.getformalParameter() |
96 if variable.getformalParameter() == "": |
96 if variable.getformalParameter() == "": |
97 output_name = "%s%d_OUT"%(type, block.getlocalId()) |
97 output_name = "%s%d"%(type, block.getlocalId()) |
98 else: |
98 else: |
99 output_name = "%s%d_%s"%(type, block.getlocalId(), variable.getformalParameter()) |
99 output_name = "%s%d_%s"%(type, block.getlocalId(), variable.getformalParameter()) |
100 return generator.ExtractModifier(variable, [(output_name, output_info)], output_info) |
100 return generator.ExtractModifier(variable, [(output_name, output_info)], output_info) |
101 elif block_infos["type"] == "functionBlock": |
101 elif block_infos["type"] == "functionBlock": |
102 if not generator.ComputedBlocks.get(block, False) and not order: |
102 if not generator.ComputedBlocks.get(block, False) and not order: |