author | Laurent Bessard |
Wed, 05 Sep 2012 11:23:15 +0200 | |
changeset 758 | bb7a881b20cf |
parent 754 | 48966b6ceedc |
permissions | -rw-r--r-- |
0 | 1 |
#!/usr/bin/env python |
2 |
# -*- coding: utf-8 -*- |
|
3 |
||
4 |
#This file is part of PLCOpenEditor, a library implementing an IEC 61131-3 editor |
|
5 |
#based on the plcopen standard. |
|
6 |
# |
|
58 | 7 |
#Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD |
0 | 8 |
# |
9 |
#See COPYING file for copyrights details. |
|
10 |
# |
|
11 |
#This library is free software; you can redistribute it and/or |
|
5 | 12 |
#modify it under the terms of the GNU General Public |
0 | 13 |
#License as published by the Free Software Foundation; either |
14 |
#version 2.1 of the License, or (at your option) any later version. |
|
15 |
# |
|
16 |
#This library is distributed in the hope that it will be useful, |
|
17 |
#but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
18 |
#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
|
58 | 19 |
#General Public License for more details. |
0 | 20 |
# |
5 | 21 |
#You should have received a copy of the GNU General Public |
0 | 22 |
#License along with this library; if not, write to the Free Software |
23 |
#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
|
24 |
||
25 |
from plcopen import plcopen |
|
26 |
from plcopen.structures import * |
|
27 |
from types import * |
|
340 | 28 |
import re |
0 | 29 |
|
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
30 |
# Dictionary associating PLCOpen variable categories to the corresponding |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
31 |
# IEC 61131-3 variable categories |
0 | 32 |
varTypeNames = {"localVars" : "VAR", "tempVars" : "VAR_TEMP", "inputVars" : "VAR_INPUT", |
33 |
"outputVars" : "VAR_OUTPUT", "inOutVars" : "VAR_IN_OUT", "externalVars" : "VAR_EXTERNAL", |
|
34 |
"globalVars" : "VAR_GLOBAL", "accessVars" : "VAR_ACCESS"} |
|
1 | 35 |
|
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
36 |
|
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
37 |
# Dictionary associating PLCOpen POU categories to the corresponding |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
38 |
# IEC 61131-3 POU categories |
6 | 39 |
pouTypeNames = {"function" : "FUNCTION", "functionBlock" : "FUNCTION_BLOCK", "program" : "PROGRAM"} |
40 |
||
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
41 |
|
566
6014ef82a98a
Adding support for searching text or regular expression in whole project
laurent
parents:
558
diff
changeset
|
42 |
errorVarTypes = { |
6014ef82a98a
Adding support for searching text or regular expression in whole project
laurent
parents:
558
diff
changeset
|
43 |
"VAR_INPUT": "var_input", |
6014ef82a98a
Adding support for searching text or regular expression in whole project
laurent
parents:
558
diff
changeset
|
44 |
"VAR_OUTPUT": "var_output", |
6014ef82a98a
Adding support for searching text or regular expression in whole project
laurent
parents:
558
diff
changeset
|
45 |
"VAR_INOUT": "var_inout", |
6014ef82a98a
Adding support for searching text or regular expression in whole project
laurent
parents:
558
diff
changeset
|
46 |
} |
6014ef82a98a
Adding support for searching text or regular expression in whole project
laurent
parents:
558
diff
changeset
|
47 |
|
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
48 |
# Helper function for reindenting text |
1 | 49 |
def ReIndentText(text, nb_spaces): |
50 |
compute = "" |
|
51 |
lines = text.splitlines() |
|
52 |
if len(lines) > 0: |
|
151 | 53 |
line_num = 0 |
54 |
while line_num < len(lines) and len(lines[line_num].strip()) == 0: |
|
55 |
line_num += 1 |
|
56 |
if line_num < len(lines): |
|
57 |
spaces = 0 |
|
58 |
while lines[line_num][spaces] == " ": |
|
59 |
spaces += 1 |
|
60 |
indent = "" |
|
61 |
for i in xrange(spaces, nb_spaces): |
|
62 |
indent += " " |
|
63 |
for line in lines: |
|
64 |
if line != "": |
|
65 |
compute += "%s%s\n"%(indent, line) |
|
66 |
else: |
|
67 |
compute += "\n" |
|
1 | 68 |
return compute |
69 |
||
269
34eff05909b0
Adding support for EN/ENO variables (temporarily disabled, waiting for matiec support)
lbessard
parents:
261
diff
changeset
|
70 |
def SortInstances(a, b): |
34eff05909b0
Adding support for EN/ENO variables (temporarily disabled, waiting for matiec support)
lbessard
parents:
261
diff
changeset
|
71 |
ax, ay = int(a.getx()), int(a.gety()) |
34eff05909b0
Adding support for EN/ENO variables (temporarily disabled, waiting for matiec support)
lbessard
parents:
261
diff
changeset
|
72 |
bx, by = int(b.getx()), int(b.gety()) |
280
9ca192486f2f
Bug in coil and output element sorting function fixed
lbessard
parents:
276
diff
changeset
|
73 |
if abs(ay - by) < 10: |
9ca192486f2f
Bug in coil and output element sorting function fixed
lbessard
parents:
276
diff
changeset
|
74 |
return cmp(ax, bx) |
269
34eff05909b0
Adding support for EN/ENO variables (temporarily disabled, waiting for matiec support)
lbessard
parents:
261
diff
changeset
|
75 |
else: |
280
9ca192486f2f
Bug in coil and output element sorting function fixed
lbessard
parents:
276
diff
changeset
|
76 |
return cmp(ay, by) |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
77 |
|
742
75096d6c271c
Fix bug while generating code with structured_variables as Standard Function inputs (enable to compute function return type in some cases)
Laurent Bessard
parents:
684
diff
changeset
|
78 |
REAL_MODEL = re.compile("[0-9]+\.[0-9]+$") |
75096d6c271c
Fix bug while generating code with structured_variables as Standard Function inputs (enable to compute function return type in some cases)
Laurent Bessard
parents:
684
diff
changeset
|
79 |
INTEGER_MODEL = re.compile("[0-9]+$") |
75096d6c271c
Fix bug while generating code with structured_variables as Standard Function inputs (enable to compute function return type in some cases)
Laurent Bessard
parents:
684
diff
changeset
|
80 |
|
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
81 |
#------------------------------------------------------------------------------- |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
82 |
# Specific exception for PLC generating errors |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
83 |
#------------------------------------------------------------------------------- |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
84 |
|
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
85 |
|
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
86 |
class PLCGenException(Exception): |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
87 |
pass |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
88 |
|
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
89 |
|
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
90 |
#------------------------------------------------------------------------------- |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
91 |
# Generator of PLC program |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
92 |
#------------------------------------------------------------------------------- |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
93 |
|
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
94 |
|
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
95 |
class ProgramGenerator: |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
96 |
|
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
97 |
# Create a new PCL program generator |
307
fd1f6ae26d4f
Adding support for cancelling code generation of function with no input connected
lbessard
parents:
295
diff
changeset
|
98 |
def __init__(self, controler, project, errors, warnings): |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
99 |
# Keep reference of the controler and project |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
100 |
self.Controler = controler |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
101 |
self.Project = project |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
102 |
# Reset the internal variables used to generate PLC programs |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
103 |
self.Program = [] |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
104 |
self.DatatypeComputed = {} |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
105 |
self.PouComputed = {} |
307
fd1f6ae26d4f
Adding support for cancelling code generation of function with no input connected
lbessard
parents:
295
diff
changeset
|
106 |
self.Errors = errors |
fd1f6ae26d4f
Adding support for cancelling code generation of function with no input connected
lbessard
parents:
295
diff
changeset
|
107 |
self.Warnings = warnings |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
108 |
|
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
109 |
# Compute value according to type given |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
110 |
def ComputeValue(self, value, var_type): |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
111 |
base_type = self.Controler.GetBaseType(var_type) |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
112 |
if base_type == "STRING": |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
113 |
return "'%s'"%value |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
114 |
elif base_type == "WSTRING": |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
115 |
return "\"%s\""%value |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
116 |
return value |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
117 |
|
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
118 |
# Generate a data type from its name |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
119 |
def GenerateDataType(self, datatype_name): |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
120 |
# Verify that data type hasn't been generated yet |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
121 |
if not self.DatatypeComputed.get(datatype_name, True): |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
122 |
# If not mark data type as computed |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
123 |
self.DatatypeComputed[datatype_name] = True |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
124 |
|
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
125 |
# Getting datatype model from project |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
126 |
datatype = self.Project.getdataType(datatype_name) |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
127 |
tagname = self.Controler.ComputeDataTypeName(datatype.getname()) |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
128 |
datatype_def = [(" ", ()), |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
129 |
(datatype.getname(), (tagname, "name")), |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
130 |
(" : ", ())] |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
131 |
basetype_content = datatype.baseType.getcontent() |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
132 |
# Data type derived directly from a string type |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
133 |
if basetype_content["name"] in ["string", "wstring"]: |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
134 |
datatype_def += [(basetype_content["name"].upper(), (tagname, "base"))] |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
135 |
# Data type derived directly from a user defined type |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
136 |
elif basetype_content["name"] == "derived": |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
137 |
basetype_name = basetype_content["value"].getname() |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
138 |
self.GenerateDataType(basetype_name) |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
139 |
datatype_def += [(basetype_name, (tagname, "base"))] |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
140 |
# Data type is a subrange |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
141 |
elif basetype_content["name"] in ["subrangeSigned", "subrangeUnsigned"]: |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
142 |
base_type = basetype_content["value"].baseType.getcontent() |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
143 |
# Subrange derived directly from a user defined type |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
144 |
if base_type["name"] == "derived": |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
145 |
basetype_name = base_type["value"].getname() |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
146 |
self.GenerateDataType(basetype_name) |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
147 |
# Subrange derived directly from an elementary type |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
148 |
else: |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
149 |
basetype_name = base_type["name"] |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
150 |
min_value = basetype_content["value"].range.getlower() |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
151 |
max_value = basetype_content["value"].range.getupper() |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
152 |
datatype_def += [(basetype_name, (tagname, "base")), |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
153 |
(" (", ()), |
389 | 154 |
("%s"%min_value, (tagname, "lower")), |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
155 |
("..", ()), |
389 | 156 |
("%s"%max_value, (tagname, "upper")), |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
157 |
(")",())] |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
158 |
# Data type is an enumerated type |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
159 |
elif basetype_content["name"] == "enum": |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
160 |
values = [[(value.getname(), (tagname, "value", i))] |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
161 |
for i, value in enumerate(basetype_content["value"].values.getvalue())] |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
162 |
datatype_def += [("(", ())] |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
163 |
datatype_def += JoinList([(", ", ())], values) |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
164 |
datatype_def += [(")", ())] |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
165 |
# Data type is an array |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
166 |
elif basetype_content["name"] == "array": |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
167 |
base_type = basetype_content["value"].baseType.getcontent() |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
168 |
# Array derived directly from a user defined type |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
169 |
if base_type["name"] == "derived": |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
170 |
basetype_name = base_type["value"].getname() |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
171 |
self.GenerateDataType(basetype_name) |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
172 |
# Array derived directly from a string type |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
173 |
elif base_type["name"] in ["string", "wstring"]: |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
174 |
basetype_name = base_type["name"].upper() |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
175 |
# Array derived directly from an elementary type |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
176 |
else: |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
177 |
basetype_name = base_type["name"] |
389 | 178 |
dimensions = [[("%s"%dimension.getlower(), (tagname, "range", i, "lower")), |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
179 |
("..", ()), |
389 | 180 |
("%s"%dimension.getupper(), (tagname, "range", i, "upper"))] |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
181 |
for i, dimension in enumerate(basetype_content["value"].getdimension())] |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
182 |
datatype_def += [("ARRAY [", ())] |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
183 |
datatype_def += JoinList([(",", ())], dimensions) |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
184 |
datatype_def += [("] OF " , ()), |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
185 |
(basetype_name, (tagname, "base"))] |
295
c6ef6d92ce16
Adding support for editing and using struct data types
lbessard
parents:
281
diff
changeset
|
186 |
# Data type is a structure |
c6ef6d92ce16
Adding support for editing and using struct data types
lbessard
parents:
281
diff
changeset
|
187 |
elif basetype_content["name"] == "struct": |
c6ef6d92ce16
Adding support for editing and using struct data types
lbessard
parents:
281
diff
changeset
|
188 |
elements = [] |
c6ef6d92ce16
Adding support for editing and using struct data types
lbessard
parents:
281
diff
changeset
|
189 |
for i, element in enumerate(basetype_content["value"].getvariable()): |
c6ef6d92ce16
Adding support for editing and using struct data types
lbessard
parents:
281
diff
changeset
|
190 |
element_type = element.type.getcontent() |
c6ef6d92ce16
Adding support for editing and using struct data types
lbessard
parents:
281
diff
changeset
|
191 |
# Structure element derived directly from a user defined type |
c6ef6d92ce16
Adding support for editing and using struct data types
lbessard
parents:
281
diff
changeset
|
192 |
if element_type["name"] == "derived": |
c6ef6d92ce16
Adding support for editing and using struct data types
lbessard
parents:
281
diff
changeset
|
193 |
elementtype_name = element_type["value"].getname() |
c6ef6d92ce16
Adding support for editing and using struct data types
lbessard
parents:
281
diff
changeset
|
194 |
self.GenerateDataType(elementtype_name) |
c6ef6d92ce16
Adding support for editing and using struct data types
lbessard
parents:
281
diff
changeset
|
195 |
# Structure element derived directly from a string type |
c6ef6d92ce16
Adding support for editing and using struct data types
lbessard
parents:
281
diff
changeset
|
196 |
elif element_type["name"] in ["string", "wstring"]: |
c6ef6d92ce16
Adding support for editing and using struct data types
lbessard
parents:
281
diff
changeset
|
197 |
elementtype_name = element_type["name"].upper() |
c6ef6d92ce16
Adding support for editing and using struct data types
lbessard
parents:
281
diff
changeset
|
198 |
# Structure element derived directly from an elementary type |
c6ef6d92ce16
Adding support for editing and using struct data types
lbessard
parents:
281
diff
changeset
|
199 |
else: |
c6ef6d92ce16
Adding support for editing and using struct data types
lbessard
parents:
281
diff
changeset
|
200 |
elementtype_name = element_type["name"] |
c6ef6d92ce16
Adding support for editing and using struct data types
lbessard
parents:
281
diff
changeset
|
201 |
element_text = [("\n ", ()), |
c6ef6d92ce16
Adding support for editing and using struct data types
lbessard
parents:
281
diff
changeset
|
202 |
(element.getname(), (tagname, "struct", i, "name")), |
c6ef6d92ce16
Adding support for editing and using struct data types
lbessard
parents:
281
diff
changeset
|
203 |
(" : ", ()), |
c6ef6d92ce16
Adding support for editing and using struct data types
lbessard
parents:
281
diff
changeset
|
204 |
(elementtype_name, (tagname, "struct", i, "type"))] |
c6ef6d92ce16
Adding support for editing and using struct data types
lbessard
parents:
281
diff
changeset
|
205 |
if element.initialValue is not None: |
c6ef6d92ce16
Adding support for editing and using struct data types
lbessard
parents:
281
diff
changeset
|
206 |
element_text.extend([(" := ", ()), |
617 | 207 |
(self.ComputeValue(element.initialValue.getvalue(), elementtype_name), (tagname, "struct", i, "initial value"))]) |
295
c6ef6d92ce16
Adding support for editing and using struct data types
lbessard
parents:
281
diff
changeset
|
208 |
element_text.append((";", ())) |
c6ef6d92ce16
Adding support for editing and using struct data types
lbessard
parents:
281
diff
changeset
|
209 |
elements.append(element_text) |
c6ef6d92ce16
Adding support for editing and using struct data types
lbessard
parents:
281
diff
changeset
|
210 |
datatype_def += [("STRUCT", ())] |
c6ef6d92ce16
Adding support for editing and using struct data types
lbessard
parents:
281
diff
changeset
|
211 |
datatype_def += JoinList([("", ())], elements) |
c6ef6d92ce16
Adding support for editing and using struct data types
lbessard
parents:
281
diff
changeset
|
212 |
datatype_def += [("\n END_STRUCT", ())] |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
213 |
# Data type derived directly from a elementary type |
141 | 214 |
else: |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
215 |
datatype_def += [(basetype_content["name"], (tagname, "base"))] |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
216 |
# Data type has an initial value |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
217 |
if datatype.initialValue is not None: |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
218 |
datatype_def += [(" := ", ()), |
617 | 219 |
(self.ComputeValue(datatype.initialValue.getvalue(), datatype_name), (tagname, "initial value"))] |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
220 |
datatype_def += [(";\n", ())] |
295
c6ef6d92ce16
Adding support for editing and using struct data types
lbessard
parents:
281
diff
changeset
|
221 |
self.Program += datatype_def |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
222 |
|
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
223 |
# Generate a POU from its name |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
224 |
def GeneratePouProgram(self, pou_name): |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
225 |
# Verify that POU hasn't been generated yet |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
226 |
if not self.PouComputed.get(pou_name, True): |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
227 |
# If not mark POU as computed |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
228 |
self.PouComputed[pou_name] = True |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
229 |
|
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
230 |
# Getting POU model from project |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
231 |
pou = self.Project.getpou(pou_name) |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
232 |
pou_type = pou.getpouType() |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
233 |
# Verify that POU type exists |
340 | 234 |
if pouTypeNames.has_key(pou_type): |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
235 |
# Create a POU program generator |
307
fd1f6ae26d4f
Adding support for cancelling code generation of function with no input connected
lbessard
parents:
295
diff
changeset
|
236 |
pou_program = PouProgramGenerator(self, pou.getname(), pouTypeNames[pou_type], self.Errors, self.Warnings) |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
237 |
program = pou_program.GenerateProgram(pou) |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
238 |
self.Program += program |
141 | 239 |
else: |
391 | 240 |
raise PLCGenException, _("Undefined pou type \"%s\"")%pou_type |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
241 |
|
340 | 242 |
# Generate a POU defined and used in text |
243 |
def GeneratePouProgramInText(self, text): |
|
244 |
for pou_name in self.PouComputed.keys(): |
|
245 |
model = re.compile("(?:^|[^0-9^A-Z])%s(?:$|[^0-9^A-Z])"%pou_name.upper()) |
|
246 |
if model.search(text) is not None: |
|
247 |
self.GeneratePouProgram(pou_name) |
|
248 |
||
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
249 |
# Generate a configuration from its model |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
250 |
def GenerateConfiguration(self, configuration): |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
251 |
tagname = self.Controler.ComputeConfigurationName(configuration.getname()) |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
252 |
config = [("\nCONFIGURATION ", ()), |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
253 |
(configuration.getname(), (tagname, "name")), |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
254 |
("\n", ())] |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
255 |
var_number = 0 |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
256 |
# Generate any global variable in configuration |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
257 |
for varlist in configuration.getglobalVars(): |
566
6014ef82a98a
Adding support for searching text or regular expression in whole project
laurent
parents:
558
diff
changeset
|
258 |
variable_type = errorVarTypes.get("VAR_GLOBAL", "var_local") |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
259 |
# Generate variable block with modifier |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
260 |
config += [(" VAR_GLOBAL", ())] |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
261 |
if varlist.getconstant(): |
566
6014ef82a98a
Adding support for searching text or regular expression in whole project
laurent
parents:
558
diff
changeset
|
262 |
config += [(" CONSTANT", (tagname, variable_type, (var_number, var_number + len(varlist.getvariable())), "constant"))] |
483
779a519f78f2
Replace Retain and Constant column in VariablePanel by Option and add the option Non-Retain
laurent
parents:
408
diff
changeset
|
263 |
elif varlist.getretain(): |
566
6014ef82a98a
Adding support for searching text or regular expression in whole project
laurent
parents:
558
diff
changeset
|
264 |
config += [(" RETAIN", (tagname, variable_type, (var_number, var_number + len(varlist.getvariable())), "retain"))] |
527 | 265 |
elif varlist.getnonretain(): |
566
6014ef82a98a
Adding support for searching text or regular expression in whole project
laurent
parents:
558
diff
changeset
|
266 |
config += [(" NON_RETAIN", (tagname, variable_type, (var_number, var_number + len(varlist.getvariable())), "non_retain"))] |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
267 |
config += [("\n", ())] |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
268 |
# Generate any variable of this block |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
269 |
for var in varlist.getvariable(): |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
270 |
vartype_content = var.gettype().getcontent() |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
271 |
if vartype_content["name"] == "derived": |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
272 |
var_type = vartype_content["value"].getname() |
566
6014ef82a98a
Adding support for searching text or regular expression in whole project
laurent
parents:
558
diff
changeset
|
273 |
self.GenerateDataType(var_type) |
597
7b17e3c8dbed
Fixing bug in PLCGenerator when generating global variables
laurent
parents:
566
diff
changeset
|
274 |
else: |
7b17e3c8dbed
Fixing bug in PLCGenerator when generating global variables
laurent
parents:
566
diff
changeset
|
275 |
var_type = var.gettypeAsText() |
566
6014ef82a98a
Adding support for searching text or regular expression in whole project
laurent
parents:
558
diff
changeset
|
276 |
|
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
277 |
config += [(" ", ()), |
566
6014ef82a98a
Adding support for searching text or regular expression in whole project
laurent
parents:
558
diff
changeset
|
278 |
(var.getname(), (tagname, variable_type, var_number, "name")), |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
279 |
(" ", ())] |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
280 |
# Generate variable address if exists |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
281 |
address = var.getaddress() |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
282 |
if address: |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
283 |
config += [("AT ", ()), |
617 | 284 |
(address, (tagname, variable_type, var_number, "location")), |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
285 |
(" ", ())] |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
286 |
config += [(": ", ()), |
566
6014ef82a98a
Adding support for searching text or regular expression in whole project
laurent
parents:
558
diff
changeset
|
287 |
(var.gettypeAsText(), (tagname, variable_type, var_number, "type"))] |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
288 |
# Generate variable initial value if exists |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
289 |
initial = var.getinitialValue() |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
290 |
if initial: |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
291 |
config += [(" := ", ()), |
617 | 292 |
(self.ComputeValue(initial.getvalue(), var_type), (tagname, variable_type, var_number, "initial value"))] |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
293 |
config += [(";\n", ())] |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
294 |
var_number += 1 |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
295 |
config += [(" END_VAR\n", ())] |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
296 |
# Generate any resource in the configuration |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
297 |
for resource in configuration.getresource(): |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
298 |
config += self.GenerateResource(resource, configuration.getname()) |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
299 |
config += [("END_CONFIGURATION\n", ())] |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
300 |
return config |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
301 |
|
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
302 |
# Generate a resource from its model |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
303 |
def GenerateResource(self, resource, config_name): |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
304 |
tagname = self.Controler.ComputeConfigurationResourceName(config_name, resource.getname()) |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
305 |
resrce = [("\n RESOURCE ", ()), |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
306 |
(resource.getname(), (tagname, "name")), |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
307 |
(" ON PLC\n", ())] |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
308 |
var_number = 0 |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
309 |
# Generate any global variable in configuration |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
310 |
for varlist in resource.getglobalVars(): |
566
6014ef82a98a
Adding support for searching text or regular expression in whole project
laurent
parents:
558
diff
changeset
|
311 |
variable_type = errorVarTypes.get("VAR_GLOBAL", "var_local") |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
312 |
# Generate variable block with modifier |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
313 |
resrce += [(" VAR_GLOBAL", ())] |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
314 |
if varlist.getconstant(): |
566
6014ef82a98a
Adding support for searching text or regular expression in whole project
laurent
parents:
558
diff
changeset
|
315 |
resrce += [(" CONSTANT", (tagname, variable_type, (var_number, var_number + len(varlist.getvariable())), "constant"))] |
483
779a519f78f2
Replace Retain and Constant column in VariablePanel by Option and add the option Non-Retain
laurent
parents:
408
diff
changeset
|
316 |
elif varlist.getretain(): |
566
6014ef82a98a
Adding support for searching text or regular expression in whole project
laurent
parents:
558
diff
changeset
|
317 |
resrce += [(" RETAIN", (tagname, variable_type, (var_number, var_number + len(varlist.getvariable())), "retain"))] |
483
779a519f78f2
Replace Retain and Constant column in VariablePanel by Option and add the option Non-Retain
laurent
parents:
408
diff
changeset
|
318 |
elif varlist.getnonretain(): |
566
6014ef82a98a
Adding support for searching text or regular expression in whole project
laurent
parents:
558
diff
changeset
|
319 |
resrce += [(" NON_RETAIN", (tagname, variable_type, (var_number, var_number + len(varlist.getvariable())), "non_retain"))] |
370
23af12b5a9fb
Bug that prevent to see errors in editor with double click fixed.
lbessard
parents:
356
diff
changeset
|
320 |
resrce += [("\n", ())] |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
321 |
# Generate any variable of this block |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
322 |
for var in varlist.getvariable(): |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
323 |
vartype_content = var.gettype().getcontent() |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
324 |
if vartype_content["name"] == "derived": |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
325 |
var_type = vartype_content["value"].getname() |
566
6014ef82a98a
Adding support for searching text or regular expression in whole project
laurent
parents:
558
diff
changeset
|
326 |
self.GenerateDataType(var_type) |
597
7b17e3c8dbed
Fixing bug in PLCGenerator when generating global variables
laurent
parents:
566
diff
changeset
|
327 |
else: |
7b17e3c8dbed
Fixing bug in PLCGenerator when generating global variables
laurent
parents:
566
diff
changeset
|
328 |
var_type = var.gettypeAsText() |
566
6014ef82a98a
Adding support for searching text or regular expression in whole project
laurent
parents:
558
diff
changeset
|
329 |
|
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
330 |
resrce += [(" ", ()), |
566
6014ef82a98a
Adding support for searching text or regular expression in whole project
laurent
parents:
558
diff
changeset
|
331 |
(var.getname(), (tagname, variable_type, var_number, "name")), |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
332 |
(" ", ())] |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
333 |
address = var.getaddress() |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
334 |
# Generate variable address if exists |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
335 |
if address: |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
336 |
resrce += [("AT ", ()), |
617 | 337 |
(address, (tagname, variable_type, var_number, "location")), |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
338 |
(" ", ())] |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
339 |
resrce += [(": ", ()), |
566
6014ef82a98a
Adding support for searching text or regular expression in whole project
laurent
parents:
558
diff
changeset
|
340 |
(var.gettypeAsText(), (tagname, variable_type, var_number, "type"))] |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
341 |
# Generate variable initial value if exists |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
342 |
initial = var.getinitialValue() |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
343 |
if initial: |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
344 |
resrce += [(" := ", ()), |
617 | 345 |
(self.ComputeValue(initial.getvalue(), var_type), (tagname, variable_type, var_number, "initial value"))] |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
346 |
resrce += [(";\n", ())] |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
347 |
var_number += 1 |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
348 |
resrce += [(" END_VAR\n", ())] |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
349 |
# Generate any task in the resource |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
350 |
tasks = resource.gettask() |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
351 |
task_number = 0 |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
352 |
for task in tasks: |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
353 |
# Task declaration |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
354 |
resrce += [(" TASK ", ()), |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
355 |
(task.getname(), (tagname, "task", task_number, "name")), |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
356 |
("(", ())] |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
357 |
args = [] |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
358 |
single = task.getsingle() |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
359 |
# Single argument if exists |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
360 |
if single: |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
361 |
resrce += [("SINGLE := ", ()), |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
362 |
(single, (tagname, "task", task_number, "single")), |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
363 |
(",", ())] |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
364 |
# Interval argument if exists |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
365 |
interval = task.getinterval() |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
366 |
if interval: |
389 | 367 |
resrce += [("INTERVAL := ", ()), |
368 |
(interval, (tagname, "task", task_number, "interval")), |
|
369 |
(",", ())] |
|
370 |
## resrce += [("INTERVAL := t#", ())] |
|
371 |
## if interval.hour != 0: |
|
372 |
## resrce += [("%dh"%interval.hour, (tagname, "task", task_number, "interval", "hour"))] |
|
373 |
## if interval.minute != 0: |
|
374 |
## resrce += [("%dm"%interval.minute, (tagname, "task", task_number, "interval", "minute"))] |
|
375 |
## if interval.second != 0: |
|
376 |
## resrce += [("%ds"%interval.second, (tagname, "task", task_number, "interval", "second"))] |
|
377 |
## if interval.microsecond != 0: |
|
378 |
## resrce += [("%dms"%(interval.microsecond / 1000), (tagname, "task", task_number, "interval", "millisecond"))] |
|
379 |
## resrce += [(",", ())] |
|
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
380 |
# Priority argument |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
381 |
resrce += [("PRIORITY := ", ()), |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
382 |
("%d"%task.getpriority(), (tagname, "task", task_number, "priority")), |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
383 |
(");\n", ())] |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
384 |
task_number += 1 |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
385 |
instance_number = 0 |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
386 |
# Generate any program assign to each task |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
387 |
for task in tasks: |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
388 |
for instance in task.getpouInstance(): |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
389 |
resrce += [(" PROGRAM ", ()), |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
390 |
(instance.getname(), (tagname, "instance", instance_number, "name")), |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
391 |
(" WITH ", ()), |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
392 |
(task.getname(), (tagname, "instance", instance_number, "task")), |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
393 |
(" : ", ()), |
389 | 394 |
(instance.gettypeName(), (tagname, "instance", instance_number, "type")), |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
395 |
(";\n", ())] |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
396 |
instance_number += 1 |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
397 |
# Generate any program assign to no task |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
398 |
for instance in resource.getpouInstance(): |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
399 |
resrce += [(" PROGRAM ", ()), |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
400 |
(instance.getname(), (tagname, "instance", instance_number, "name")), |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
401 |
(" : ", ()), |
389 | 402 |
(instance.gettypeName(), (tagname, "instance", instance_number, "type")), |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
403 |
(";\n", ())] |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
404 |
instance_number += 1 |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
405 |
resrce += [(" END_RESOURCE\n", ())] |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
406 |
return resrce |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
407 |
|
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
408 |
# Generate the entire program for current project |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
409 |
def GenerateProgram(self): |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
410 |
# Find all data types defined |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
411 |
for datatype in self.Project.getdataTypes(): |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
412 |
self.DatatypeComputed[datatype.getname()] = False |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
413 |
# Find all data types defined |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
414 |
for pou in self.Project.getpous(): |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
415 |
self.PouComputed[pou.getname()] = False |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
416 |
# Generate data type declaration structure if there is at least one data |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
417 |
# type defined |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
418 |
if len(self.DatatypeComputed) > 0: |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
419 |
self.Program += [("TYPE\n", ())] |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
420 |
# Generate every data types defined |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
421 |
for datatype_name in self.DatatypeComputed.keys(): |
295
c6ef6d92ce16
Adding support for editing and using struct data types
lbessard
parents:
281
diff
changeset
|
422 |
self.GenerateDataType(datatype_name) |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
423 |
self.Program += [("END_TYPE\n\n", ())] |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
424 |
# Generate every POUs defined |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
425 |
for pou_name in self.PouComputed.keys(): |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
426 |
self.GeneratePouProgram(pou_name) |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
427 |
# Generate every configurations defined |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
428 |
for config in self.Project.getconfigurations(): |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
429 |
self.Program += self.GenerateConfiguration(config) |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
430 |
|
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
431 |
# Return generated program |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
432 |
def GetGeneratedProgram(self): |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
433 |
return self.Program |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
434 |
|
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
435 |
|
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
436 |
#------------------------------------------------------------------------------- |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
437 |
# Generator of POU programs |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
438 |
#------------------------------------------------------------------------------- |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
439 |
|
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
440 |
|
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
441 |
class PouProgramGenerator: |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
442 |
|
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
443 |
# Create a new POU program generator |
307
fd1f6ae26d4f
Adding support for cancelling code generation of function with no input connected
lbessard
parents:
295
diff
changeset
|
444 |
def __init__(self, parent, name, type, errors, warnings): |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
445 |
# Keep Reference to the parent generator |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
446 |
self.ParentGenerator = parent |
0 | 447 |
self.Name = name |
448 |
self.Type = type |
|
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
449 |
self.TagName = self.ParentGenerator.Controler.ComputePouName(name) |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
450 |
self.CurrentIndent = " " |
1 | 451 |
self.ReturnType = None |
452 |
self.Interface = [] |
|
453 |
self.InitialSteps = [] |
|
72
73212220ad22
Adding support for generating FBD with connectors and continuations
lbessard
parents:
71
diff
changeset
|
454 |
self.ComputedBlocks = {} |
73212220ad22
Adding support for generating FBD with connectors and continuations
lbessard
parents:
71
diff
changeset
|
455 |
self.ComputedConnectors = {} |
125
394d9f168258
Adding support for execution order in PLCGenerator
lbessard
parents:
108
diff
changeset
|
456 |
self.ConnectionTypes = {} |
394d9f168258
Adding support for execution order in PLCGenerator
lbessard
parents:
108
diff
changeset
|
457 |
self.RelatedConnections = [] |
1 | 458 |
self.SFCNetworks = {"Steps":{}, "Transitions":{}, "Actions":{}} |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
459 |
self.SFCComputedBlocks = [] |
46 | 460 |
self.ActionNumber = 0 |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
461 |
self.Program = [] |
307
fd1f6ae26d4f
Adding support for cancelling code generation of function with no input connected
lbessard
parents:
295
diff
changeset
|
462 |
self.Errors = errors |
fd1f6ae26d4f
Adding support for cancelling code generation of function with no input connected
lbessard
parents:
295
diff
changeset
|
463 |
self.Warnings = warnings |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
464 |
|
526
79900abdfa3c
Bug when using arithmetic functions (ADD, SUB, MUL, DIV) for TIME datatypes fixed.
laurent
parents:
507
diff
changeset
|
465 |
def GetBlockType(self, type, inputs=None): |
79900abdfa3c
Bug when using arithmetic functions (ADD, SUB, MUL, DIV) for TIME datatypes fixed.
laurent
parents:
507
diff
changeset
|
466 |
return self.ParentGenerator.Controler.GetBlockType(type, inputs) |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
467 |
|
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
468 |
def IndentLeft(self): |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
469 |
if len(self.CurrentIndent) >= 2: |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
470 |
self.CurrentIndent = self.CurrentIndent[:-2] |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
471 |
|
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
472 |
def IndentRight(self): |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
473 |
self.CurrentIndent += " " |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
474 |
|
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
475 |
# Generator of unique ID for inline actions |
46 | 476 |
def GetActionNumber(self): |
477 |
self.ActionNumber += 1 |
|
478 |
return self.ActionNumber |
|
479 |
||
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
480 |
# Test if a variable has already been defined |
1 | 481 |
def IsAlreadyDefined(self, name): |
483
779a519f78f2
Replace Retain and Constant column in VariablePanel by Option and add the option Non-Retain
laurent
parents:
408
diff
changeset
|
482 |
for list_type, option, located, vars in self.Interface: |
30 | 483 |
for var_type, var_name, var_address, var_initial in vars: |
1 | 484 |
if name == var_name: |
485 |
return True |
|
486 |
return False |
|
487 |
||
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
488 |
# Return the type of a variable defined in interface |
125
394d9f168258
Adding support for execution order in PLCGenerator
lbessard
parents:
108
diff
changeset
|
489 |
def GetVariableType(self, name): |
742
75096d6c271c
Fix bug while generating code with structured_variables as Standard Function inputs (enable to compute function return type in some cases)
Laurent Bessard
parents:
684
diff
changeset
|
490 |
parts = name.split('.') |
75096d6c271c
Fix bug while generating code with structured_variables as Standard Function inputs (enable to compute function return type in some cases)
Laurent Bessard
parents:
684
diff
changeset
|
491 |
current_type = None |
75096d6c271c
Fix bug while generating code with structured_variables as Standard Function inputs (enable to compute function return type in some cases)
Laurent Bessard
parents:
684
diff
changeset
|
492 |
if len(parts) > 0: |
75096d6c271c
Fix bug while generating code with structured_variables as Standard Function inputs (enable to compute function return type in some cases)
Laurent Bessard
parents:
684
diff
changeset
|
493 |
name = parts.pop(0) |
75096d6c271c
Fix bug while generating code with structured_variables as Standard Function inputs (enable to compute function return type in some cases)
Laurent Bessard
parents:
684
diff
changeset
|
494 |
for list_type, option, located, vars in self.Interface: |
75096d6c271c
Fix bug while generating code with structured_variables as Standard Function inputs (enable to compute function return type in some cases)
Laurent Bessard
parents:
684
diff
changeset
|
495 |
for var_type, var_name, var_address, var_initial in vars: |
75096d6c271c
Fix bug while generating code with structured_variables as Standard Function inputs (enable to compute function return type in some cases)
Laurent Bessard
parents:
684
diff
changeset
|
496 |
if name == var_name: |
75096d6c271c
Fix bug while generating code with structured_variables as Standard Function inputs (enable to compute function return type in some cases)
Laurent Bessard
parents:
684
diff
changeset
|
497 |
current_type = var_type |
75096d6c271c
Fix bug while generating code with structured_variables as Standard Function inputs (enable to compute function return type in some cases)
Laurent Bessard
parents:
684
diff
changeset
|
498 |
break |
75096d6c271c
Fix bug while generating code with structured_variables as Standard Function inputs (enable to compute function return type in some cases)
Laurent Bessard
parents:
684
diff
changeset
|
499 |
while current_type is not None and len(parts) > 0: |
75096d6c271c
Fix bug while generating code with structured_variables as Standard Function inputs (enable to compute function return type in some cases)
Laurent Bessard
parents:
684
diff
changeset
|
500 |
tagname = self.ParentGenerator.Controler.ComputeDataTypeName(current_type) |
75096d6c271c
Fix bug while generating code with structured_variables as Standard Function inputs (enable to compute function return type in some cases)
Laurent Bessard
parents:
684
diff
changeset
|
501 |
infos = self.ParentGenerator.Controler.GetDataTypeInfos(tagname) |
75096d6c271c
Fix bug while generating code with structured_variables as Standard Function inputs (enable to compute function return type in some cases)
Laurent Bessard
parents:
684
diff
changeset
|
502 |
name = parts.pop(0) |
75096d6c271c
Fix bug while generating code with structured_variables as Standard Function inputs (enable to compute function return type in some cases)
Laurent Bessard
parents:
684
diff
changeset
|
503 |
current_type = None |
75096d6c271c
Fix bug while generating code with structured_variables as Standard Function inputs (enable to compute function return type in some cases)
Laurent Bessard
parents:
684
diff
changeset
|
504 |
if infos is not None and infos["type"] == "Structure": |
75096d6c271c
Fix bug while generating code with structured_variables as Standard Function inputs (enable to compute function return type in some cases)
Laurent Bessard
parents:
684
diff
changeset
|
505 |
for element in infos["elements"]: |
75096d6c271c
Fix bug while generating code with structured_variables as Standard Function inputs (enable to compute function return type in some cases)
Laurent Bessard
parents:
684
diff
changeset
|
506 |
if element["Name"] == name: |
75096d6c271c
Fix bug while generating code with structured_variables as Standard Function inputs (enable to compute function return type in some cases)
Laurent Bessard
parents:
684
diff
changeset
|
507 |
current_type = element["Type"] |
75096d6c271c
Fix bug while generating code with structured_variables as Standard Function inputs (enable to compute function return type in some cases)
Laurent Bessard
parents:
684
diff
changeset
|
508 |
break |
75096d6c271c
Fix bug while generating code with structured_variables as Standard Function inputs (enable to compute function return type in some cases)
Laurent Bessard
parents:
684
diff
changeset
|
509 |
return current_type |
125
394d9f168258
Adding support for execution order in PLCGenerator
lbessard
parents:
108
diff
changeset
|
510 |
|
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
511 |
# Return connectors linked by a connection to the given connector |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
512 |
def GetConnectedConnector(self, connector, body): |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
513 |
links = connector.getconnections() |
125
394d9f168258
Adding support for execution order in PLCGenerator
lbessard
parents:
108
diff
changeset
|
514 |
if links and len(links) == 1: |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
515 |
return self.GetLinkedConnector(links[0], body) |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
516 |
return None |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
517 |
|
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
518 |
def GetLinkedConnector(self, link, body): |
151 | 519 |
parameter = link.getformalParameter() |
520 |
instance = body.getcontentInstance(link.getrefLocalId()) |
|
521 |
if isinstance(instance, (plcopen.fbdObjects_inVariable, plcopen.fbdObjects_inOutVariable, plcopen.commonObjects_continuation, plcopen.ldObjects_contact, plcopen.ldObjects_coil)): |
|
125
394d9f168258
Adding support for execution order in PLCGenerator
lbessard
parents:
108
diff
changeset
|
522 |
return instance.connectionPointOut |
151 | 523 |
elif isinstance(instance, plcopen.fbdObjects_block): |
524 |
outputvariables = instance.outputVariables.getvariable() |
|
125
394d9f168258
Adding support for execution order in PLCGenerator
lbessard
parents:
108
diff
changeset
|
525 |
if len(outputvariables) == 1: |
394d9f168258
Adding support for execution order in PLCGenerator
lbessard
parents:
108
diff
changeset
|
526 |
return outputvariables[0].connectionPointOut |
394d9f168258
Adding support for execution order in PLCGenerator
lbessard
parents:
108
diff
changeset
|
527 |
elif parameter: |
394d9f168258
Adding support for execution order in PLCGenerator
lbessard
parents:
108
diff
changeset
|
528 |
for variable in outputvariables: |
151 | 529 |
if variable.getformalParameter() == parameter: |
125
394d9f168258
Adding support for execution order in PLCGenerator
lbessard
parents:
108
diff
changeset
|
530 |
return variable.connectionPointOut |
394d9f168258
Adding support for execution order in PLCGenerator
lbessard
parents:
108
diff
changeset
|
531 |
else: |
276 | 532 |
point = link.getposition()[-1] |
125
394d9f168258
Adding support for execution order in PLCGenerator
lbessard
parents:
108
diff
changeset
|
533 |
for variable in outputvariables: |
151 | 534 |
relposition = variable.connectionPointOut.getrelPositionXY() |
535 |
blockposition = instance.getposition() |
|
125
394d9f168258
Adding support for execution order in PLCGenerator
lbessard
parents:
108
diff
changeset
|
536 |
if point.x == blockposition.x + relposition[0] and point.y == blockposition.y + relposition[1]: |
394d9f168258
Adding support for execution order in PLCGenerator
lbessard
parents:
108
diff
changeset
|
537 |
return variable.connectionPointOut |
151 | 538 |
elif isinstance(instance, plcopen.ldObjects_leftPowerRail): |
539 |
outputconnections = instance.getconnectionPointOut() |
|
125
394d9f168258
Adding support for execution order in PLCGenerator
lbessard
parents:
108
diff
changeset
|
540 |
if len(outputconnections) == 1: |
394d9f168258
Adding support for execution order in PLCGenerator
lbessard
parents:
108
diff
changeset
|
541 |
return outputconnections[0] |
394d9f168258
Adding support for execution order in PLCGenerator
lbessard
parents:
108
diff
changeset
|
542 |
else: |
151 | 543 |
point = link.getposition()[-1] |
125
394d9f168258
Adding support for execution order in PLCGenerator
lbessard
parents:
108
diff
changeset
|
544 |
for outputconnection in outputconnections: |
151 | 545 |
relposition = outputconnection.getrelPositionXY() |
546 |
powerrailposition = instance.getposition() |
|
125
394d9f168258
Adding support for execution order in PLCGenerator
lbessard
parents:
108
diff
changeset
|
547 |
if point.x == powerrailposition.x + relposition[0] and point.y == powerrailposition.y + relposition[1]: |
394d9f168258
Adding support for execution order in PLCGenerator
lbessard
parents:
108
diff
changeset
|
548 |
return outputconnection |
394d9f168258
Adding support for execution order in PLCGenerator
lbessard
parents:
108
diff
changeset
|
549 |
return None |
394d9f168258
Adding support for execution order in PLCGenerator
lbessard
parents:
108
diff
changeset
|
550 |
|
394d9f168258
Adding support for execution order in PLCGenerator
lbessard
parents:
108
diff
changeset
|
551 |
def ExtractRelatedConnections(self, connection): |
394d9f168258
Adding support for execution order in PLCGenerator
lbessard
parents:
108
diff
changeset
|
552 |
for i, related in enumerate(self.RelatedConnections): |
394d9f168258
Adding support for execution order in PLCGenerator
lbessard
parents:
108
diff
changeset
|
553 |
if connection in related: |
394d9f168258
Adding support for execution order in PLCGenerator
lbessard
parents:
108
diff
changeset
|
554 |
return self.RelatedConnections.pop(i) |
394d9f168258
Adding support for execution order in PLCGenerator
lbessard
parents:
108
diff
changeset
|
555 |
return [connection] |
394d9f168258
Adding support for execution order in PLCGenerator
lbessard
parents:
108
diff
changeset
|
556 |
|
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
557 |
def ComputeInterface(self, pou): |
194
1b3f8b4f8e04
Adding support for Beremiz svgui plugin variable declaration
lbessard
parents:
191
diff
changeset
|
558 |
interface = pou.getinterface() |
1b3f8b4f8e04
Adding support for Beremiz svgui plugin variable declaration
lbessard
parents:
191
diff
changeset
|
559 |
if interface is not None: |
1b3f8b4f8e04
Adding support for Beremiz svgui plugin variable declaration
lbessard
parents:
191
diff
changeset
|
560 |
body = pou.getbody() |
389 | 561 |
if isinstance(body, ListType): |
562 |
body = body[0] |
|
194
1b3f8b4f8e04
Adding support for Beremiz svgui plugin variable declaration
lbessard
parents:
191
diff
changeset
|
563 |
body_content = body.getcontent() |
1b3f8b4f8e04
Adding support for Beremiz svgui plugin variable declaration
lbessard
parents:
191
diff
changeset
|
564 |
if self.Type == "FUNCTION": |
1b3f8b4f8e04
Adding support for Beremiz svgui plugin variable declaration
lbessard
parents:
191
diff
changeset
|
565 |
returntype_content = interface.getreturnType().getcontent() |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
566 |
if returntype_content["name"] == "derived": |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
567 |
self.ReturnType = returntype_content["value"].getname() |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
568 |
elif returntype_content["name"] in ["string", "wstring"]: |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
569 |
self.ReturnType = returntype_content["name"].upper() |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
570 |
else: |
194
1b3f8b4f8e04
Adding support for Beremiz svgui plugin variable declaration
lbessard
parents:
191
diff
changeset
|
571 |
self.ReturnType = returntype_content["name"] |
1b3f8b4f8e04
Adding support for Beremiz svgui plugin variable declaration
lbessard
parents:
191
diff
changeset
|
572 |
for varlist in interface.getcontent(): |
1b3f8b4f8e04
Adding support for Beremiz svgui plugin variable declaration
lbessard
parents:
191
diff
changeset
|
573 |
variables = [] |
1b3f8b4f8e04
Adding support for Beremiz svgui plugin variable declaration
lbessard
parents:
191
diff
changeset
|
574 |
located = [] |
1b3f8b4f8e04
Adding support for Beremiz svgui plugin variable declaration
lbessard
parents:
191
diff
changeset
|
575 |
for var in varlist["value"].getvariable(): |
1b3f8b4f8e04
Adding support for Beremiz svgui plugin variable declaration
lbessard
parents:
191
diff
changeset
|
576 |
vartype_content = var.gettype().getcontent() |
1b3f8b4f8e04
Adding support for Beremiz svgui plugin variable declaration
lbessard
parents:
191
diff
changeset
|
577 |
if vartype_content["name"] == "derived": |
1b3f8b4f8e04
Adding support for Beremiz svgui plugin variable declaration
lbessard
parents:
191
diff
changeset
|
578 |
var_type = vartype_content["value"].getname() |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
579 |
blocktype = self.GetBlockType(var_type) |
194
1b3f8b4f8e04
Adding support for Beremiz svgui plugin variable declaration
lbessard
parents:
191
diff
changeset
|
580 |
if blocktype is not None: |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
581 |
self.ParentGenerator.GeneratePouProgram(var_type) |
194
1b3f8b4f8e04
Adding support for Beremiz svgui plugin variable declaration
lbessard
parents:
191
diff
changeset
|
582 |
if body_content["name"] in ["FBD", "LD", "SFC"]: |
1b3f8b4f8e04
Adding support for Beremiz svgui plugin variable declaration
lbessard
parents:
191
diff
changeset
|
583 |
block = pou.getinstanceByName(var.getname()) |
191
d77f9b783ce8
Bug with located variables generated by Beremiz svgui plugin fixed
lbessard
parents:
189
diff
changeset
|
584 |
else: |
194
1b3f8b4f8e04
Adding support for Beremiz svgui plugin variable declaration
lbessard
parents:
191
diff
changeset
|
585 |
block = None |
1b3f8b4f8e04
Adding support for Beremiz svgui plugin variable declaration
lbessard
parents:
191
diff
changeset
|
586 |
for variable in blocktype["initialise"](var_type, var.getname(), block): |
1b3f8b4f8e04
Adding support for Beremiz svgui plugin variable declaration
lbessard
parents:
191
diff
changeset
|
587 |
if variable[2] is not None: |
1b3f8b4f8e04
Adding support for Beremiz svgui plugin variable declaration
lbessard
parents:
191
diff
changeset
|
588 |
located.append(variable) |
1b3f8b4f8e04
Adding support for Beremiz svgui plugin variable declaration
lbessard
parents:
191
diff
changeset
|
589 |
else: |
1b3f8b4f8e04
Adding support for Beremiz svgui plugin variable declaration
lbessard
parents:
191
diff
changeset
|
590 |
variables.append(variable) |
1b3f8b4f8e04
Adding support for Beremiz svgui plugin variable declaration
lbessard
parents:
191
diff
changeset
|
591 |
else: |
566
6014ef82a98a
Adding support for searching text or regular expression in whole project
laurent
parents:
558
diff
changeset
|
592 |
self.ParentGenerator.GenerateDataType(var_type) |
194
1b3f8b4f8e04
Adding support for Beremiz svgui plugin variable declaration
lbessard
parents:
191
diff
changeset
|
593 |
initial = var.getinitialValue() |
1b3f8b4f8e04
Adding support for Beremiz svgui plugin variable declaration
lbessard
parents:
191
diff
changeset
|
594 |
if initial: |
1b3f8b4f8e04
Adding support for Beremiz svgui plugin variable declaration
lbessard
parents:
191
diff
changeset
|
595 |
initial_value = initial.getvalue() |
1b3f8b4f8e04
Adding support for Beremiz svgui plugin variable declaration
lbessard
parents:
191
diff
changeset
|
596 |
else: |
1b3f8b4f8e04
Adding support for Beremiz svgui plugin variable declaration
lbessard
parents:
191
diff
changeset
|
597 |
initial_value = None |
1b3f8b4f8e04
Adding support for Beremiz svgui plugin variable declaration
lbessard
parents:
191
diff
changeset
|
598 |
address = var.getaddress() |
1b3f8b4f8e04
Adding support for Beremiz svgui plugin variable declaration
lbessard
parents:
191
diff
changeset
|
599 |
if address is not None: |
1b3f8b4f8e04
Adding support for Beremiz svgui plugin variable declaration
lbessard
parents:
191
diff
changeset
|
600 |
located.append((vartype_content["value"].getname(), var.getname(), address, initial_value)) |
1b3f8b4f8e04
Adding support for Beremiz svgui plugin variable declaration
lbessard
parents:
191
diff
changeset
|
601 |
else: |
1b3f8b4f8e04
Adding support for Beremiz svgui plugin variable declaration
lbessard
parents:
191
diff
changeset
|
602 |
variables.append((vartype_content["value"].getname(), var.getname(), None, initial_value)) |
125
394d9f168258
Adding support for execution order in PLCGenerator
lbessard
parents:
108
diff
changeset
|
603 |
else: |
566
6014ef82a98a
Adding support for searching text or regular expression in whole project
laurent
parents:
558
diff
changeset
|
604 |
var_type = var.gettypeAsText() |
151 | 605 |
initial = var.getinitialValue() |
125
394d9f168258
Adding support for execution order in PLCGenerator
lbessard
parents:
108
diff
changeset
|
606 |
if initial: |
151 | 607 |
initial_value = initial.getvalue() |
125
394d9f168258
Adding support for execution order in PLCGenerator
lbessard
parents:
108
diff
changeset
|
608 |
else: |
394d9f168258
Adding support for execution order in PLCGenerator
lbessard
parents:
108
diff
changeset
|
609 |
initial_value = None |
151 | 610 |
address = var.getaddress() |
507
42150e041dbe
Adding support for direct array variable declaration in variable panel (still disable cause matiec doesn't support this feature)
laurent
parents:
501
diff
changeset
|
611 |
if address is not None: |
42150e041dbe
Adding support for direct array variable declaration in variable panel (still disable cause matiec doesn't support this feature)
laurent
parents:
501
diff
changeset
|
612 |
located.append((var_type, var.getname(), address, initial_value)) |
42150e041dbe
Adding support for direct array variable declaration in variable panel (still disable cause matiec doesn't support this feature)
laurent
parents:
501
diff
changeset
|
613 |
else: |
42150e041dbe
Adding support for direct array variable declaration in variable panel (still disable cause matiec doesn't support this feature)
laurent
parents:
501
diff
changeset
|
614 |
variables.append((var_type, var.getname(), None, initial_value)) |
483
779a519f78f2
Replace Retain and Constant column in VariablePanel by Option and add the option Non-Retain
laurent
parents:
408
diff
changeset
|
615 |
if varlist["value"].getconstant(): |
779a519f78f2
Replace Retain and Constant column in VariablePanel by Option and add the option Non-Retain
laurent
parents:
408
diff
changeset
|
616 |
option = "CONSTANT" |
779a519f78f2
Replace Retain and Constant column in VariablePanel by Option and add the option Non-Retain
laurent
parents:
408
diff
changeset
|
617 |
elif varlist["value"].getretain(): |
779a519f78f2
Replace Retain and Constant column in VariablePanel by Option and add the option Non-Retain
laurent
parents:
408
diff
changeset
|
618 |
option = "RETAIN" |
779a519f78f2
Replace Retain and Constant column in VariablePanel by Option and add the option Non-Retain
laurent
parents:
408
diff
changeset
|
619 |
elif varlist["value"].getnonretain(): |
779a519f78f2
Replace Retain and Constant column in VariablePanel by Option and add the option Non-Retain
laurent
parents:
408
diff
changeset
|
620 |
option = "NON_RETAIN" |
779a519f78f2
Replace Retain and Constant column in VariablePanel by Option and add the option Non-Retain
laurent
parents:
408
diff
changeset
|
621 |
else: |
779a519f78f2
Replace Retain and Constant column in VariablePanel by Option and add the option Non-Retain
laurent
parents:
408
diff
changeset
|
622 |
option = None |
194
1b3f8b4f8e04
Adding support for Beremiz svgui plugin variable declaration
lbessard
parents:
191
diff
changeset
|
623 |
if len(variables) > 0: |
483
779a519f78f2
Replace Retain and Constant column in VariablePanel by Option and add the option Non-Retain
laurent
parents:
408
diff
changeset
|
624 |
self.Interface.append((varTypeNames[varlist["name"]], option, False, variables)) |
194
1b3f8b4f8e04
Adding support for Beremiz svgui plugin variable declaration
lbessard
parents:
191
diff
changeset
|
625 |
if len(located) > 0: |
483
779a519f78f2
Replace Retain and Constant column in VariablePanel by Option and add the option Non-Retain
laurent
parents:
408
diff
changeset
|
626 |
self.Interface.append((varTypeNames[varlist["name"]], option, True, located)) |
191
d77f9b783ce8
Bug with located variables generated by Beremiz svgui plugin fixed
lbessard
parents:
189
diff
changeset
|
627 |
|
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
628 |
def ComputeConnectionTypes(self, pou): |
151 | 629 |
body = pou.getbody() |
389 | 630 |
if isinstance(body, ListType): |
631 |
body = body[0] |
|
151 | 632 |
body_content = body.getcontent() |
125
394d9f168258
Adding support for execution order in PLCGenerator
lbessard
parents:
108
diff
changeset
|
633 |
body_type = body_content["name"] |
394d9f168258
Adding support for execution order in PLCGenerator
lbessard
parents:
108
diff
changeset
|
634 |
if body_type in ["FBD", "LD", "SFC"]: |
526
79900abdfa3c
Bug when using arithmetic functions (ADD, SUB, MUL, DIV) for TIME datatypes fixed.
laurent
parents:
507
diff
changeset
|
635 |
undefined_blocks = [] |
151 | 636 |
for instance in body.getcontentInstances(): |
637 |
if isinstance(instance, (plcopen.fbdObjects_inVariable, plcopen.fbdObjects_outVariable, plcopen.fbdObjects_inOutVariable)): |
|
638 |
expression = instance.getexpression() |
|
125
394d9f168258
Adding support for execution order in PLCGenerator
lbessard
parents:
108
diff
changeset
|
639 |
var_type = self.GetVariableType(expression) |
408
0e389fa5b160
Bug on ST code generating for variables with the same name than POU when POU isn't a function fixed
laurent
parents:
391
diff
changeset
|
640 |
if pou.getpouType() == "function" and expression == pou.getname(): |
151 | 641 |
returntype_content = pou.interface.getreturnType().getcontent() |
141 | 642 |
if returntype_content["name"] == "derived": |
151 | 643 |
var_type = returntype_content["value"].getname() |
141 | 644 |
elif returntype_content["name"] in ["string", "wstring"]: |
645 |
var_type = returntype_content["name"].upper() |
|
646 |
else: |
|
125
394d9f168258
Adding support for execution order in PLCGenerator
lbessard
parents:
108
diff
changeset
|
647 |
var_type = returntype_content["name"] |
394d9f168258
Adding support for execution order in PLCGenerator
lbessard
parents:
108
diff
changeset
|
648 |
elif var_type is None: |
269
34eff05909b0
Adding support for EN/ENO variables (temporarily disabled, waiting for matiec support)
lbessard
parents:
261
diff
changeset
|
649 |
parts = expression.split("#") |
34eff05909b0
Adding support for EN/ENO variables (temporarily disabled, waiting for matiec support)
lbessard
parents:
261
diff
changeset
|
650 |
if len(parts) > 1: |
34eff05909b0
Adding support for EN/ENO variables (temporarily disabled, waiting for matiec support)
lbessard
parents:
261
diff
changeset
|
651 |
var_type = parts[0] |
742
75096d6c271c
Fix bug while generating code with structured_variables as Standard Function inputs (enable to compute function return type in some cases)
Laurent Bessard
parents:
684
diff
changeset
|
652 |
elif REAL_MODEL.match(expression): |
75096d6c271c
Fix bug while generating code with structured_variables as Standard Function inputs (enable to compute function return type in some cases)
Laurent Bessard
parents:
684
diff
changeset
|
653 |
var_type = "ANY_REAL" |
75096d6c271c
Fix bug while generating code with structured_variables as Standard Function inputs (enable to compute function return type in some cases)
Laurent Bessard
parents:
684
diff
changeset
|
654 |
elif INTEGER_MODEL.match(expression): |
75096d6c271c
Fix bug while generating code with structured_variables as Standard Function inputs (enable to compute function return type in some cases)
Laurent Bessard
parents:
684
diff
changeset
|
655 |
var_type = "ANY_NUM" |
356
f6453b89e7f9
Adding support for finding character_string while computing connector types. Adding 'ANY' type on continuation by default.
greg
parents:
340
diff
changeset
|
656 |
elif expression.startswith("'"): |
f6453b89e7f9
Adding support for finding character_string while computing connector types. Adding 'ANY' type on continuation by default.
greg
parents:
340
diff
changeset
|
657 |
var_type = "STRING" |
f6453b89e7f9
Adding support for finding character_string while computing connector types. Adding 'ANY' type on continuation by default.
greg
parents:
340
diff
changeset
|
658 |
elif expression.startswith('"'): |
f6453b89e7f9
Adding support for finding character_string while computing connector types. Adding 'ANY' type on continuation by default.
greg
parents:
340
diff
changeset
|
659 |
var_type = "WSTRING" |
269
34eff05909b0
Adding support for EN/ENO variables (temporarily disabled, waiting for matiec support)
lbessard
parents:
261
diff
changeset
|
660 |
if var_type is not None: |
34eff05909b0
Adding support for EN/ENO variables (temporarily disabled, waiting for matiec support)
lbessard
parents:
261
diff
changeset
|
661 |
if isinstance(instance, (plcopen.fbdObjects_inVariable, plcopen.fbdObjects_inOutVariable)): |
34eff05909b0
Adding support for EN/ENO variables (temporarily disabled, waiting for matiec support)
lbessard
parents:
261
diff
changeset
|
662 |
for connection in self.ExtractRelatedConnections(instance.connectionPointOut): |
125
394d9f168258
Adding support for execution order in PLCGenerator
lbessard
parents:
108
diff
changeset
|
663 |
self.ConnectionTypes[connection] = var_type |
269
34eff05909b0
Adding support for EN/ENO variables (temporarily disabled, waiting for matiec support)
lbessard
parents:
261
diff
changeset
|
664 |
if isinstance(instance, (plcopen.fbdObjects_outVariable, plcopen.fbdObjects_inOutVariable)): |
34eff05909b0
Adding support for EN/ENO variables (temporarily disabled, waiting for matiec support)
lbessard
parents:
261
diff
changeset
|
665 |
self.ConnectionTypes[instance.connectionPointIn] = var_type |
34eff05909b0
Adding support for EN/ENO variables (temporarily disabled, waiting for matiec support)
lbessard
parents:
261
diff
changeset
|
666 |
connected = self.GetConnectedConnector(instance.connectionPointIn, body) |
340 | 667 |
if connected and not self.ConnectionTypes.has_key(connected): |
269
34eff05909b0
Adding support for EN/ENO variables (temporarily disabled, waiting for matiec support)
lbessard
parents:
261
diff
changeset
|
668 |
for connection in self.ExtractRelatedConnections(connected): |
34eff05909b0
Adding support for EN/ENO variables (temporarily disabled, waiting for matiec support)
lbessard
parents:
261
diff
changeset
|
669 |
self.ConnectionTypes[connection] = var_type |
151 | 670 |
elif isinstance(instance, (plcopen.ldObjects_contact, plcopen.ldObjects_coil)): |
208
c70aefcadf66
Bugs with feedback path in View, Controler and Generator fixed
lbessard
parents:
207
diff
changeset
|
671 |
for connection in self.ExtractRelatedConnections(instance.connectionPointOut): |
c70aefcadf66
Bugs with feedback path in View, Controler and Generator fixed
lbessard
parents:
207
diff
changeset
|
672 |
self.ConnectionTypes[connection] = "BOOL" |
125
394d9f168258
Adding support for execution order in PLCGenerator
lbessard
parents:
108
diff
changeset
|
673 |
self.ConnectionTypes[instance.connectionPointIn] = "BOOL" |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
674 |
connected = self.GetConnectedConnector(instance.connectionPointIn, body) |
340 | 675 |
if connected and not self.ConnectionTypes.has_key(connected): |
125
394d9f168258
Adding support for execution order in PLCGenerator
lbessard
parents:
108
diff
changeset
|
676 |
for connection in self.ExtractRelatedConnections(connected): |
394d9f168258
Adding support for execution order in PLCGenerator
lbessard
parents:
108
diff
changeset
|
677 |
self.ConnectionTypes[connection] = "BOOL" |
151 | 678 |
elif isinstance(instance, plcopen.ldObjects_leftPowerRail): |
679 |
for connection in instance.getconnectionPointOut(): |
|
208
c70aefcadf66
Bugs with feedback path in View, Controler and Generator fixed
lbessard
parents:
207
diff
changeset
|
680 |
for related in self.ExtractRelatedConnections(connection): |
c70aefcadf66
Bugs with feedback path in View, Controler and Generator fixed
lbessard
parents:
207
diff
changeset
|
681 |
self.ConnectionTypes[related] = "BOOL" |
151 | 682 |
elif isinstance(instance, plcopen.ldObjects_rightPowerRail): |
683 |
for connection in instance.getconnectionPointIn(): |
|
125
394d9f168258
Adding support for execution order in PLCGenerator
lbessard
parents:
108
diff
changeset
|
684 |
self.ConnectionTypes[connection] = "BOOL" |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
685 |
connected = self.GetConnectedConnector(connection, body) |
340 | 686 |
if connected and not self.ConnectionTypes.has_key(connected): |
125
394d9f168258
Adding support for execution order in PLCGenerator
lbessard
parents:
108
diff
changeset
|
687 |
for connection in self.ExtractRelatedConnections(connected): |
394d9f168258
Adding support for execution order in PLCGenerator
lbessard
parents:
108
diff
changeset
|
688 |
self.ConnectionTypes[connection] = "BOOL" |
151 | 689 |
elif isinstance(instance, plcopen.sfcObjects_transition): |
690 |
content = instance.condition.getcontent() |
|
125
394d9f168258
Adding support for execution order in PLCGenerator
lbessard
parents:
108
diff
changeset
|
691 |
if content["name"] == "connection" and len(content["value"]) == 1: |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
692 |
connected = self.GetLinkedConnector(content["value"][0], body) |
340 | 693 |
if connected and not self.ConnectionTypes.has_key(connected): |
125
394d9f168258
Adding support for execution order in PLCGenerator
lbessard
parents:
108
diff
changeset
|
694 |
for connection in self.ExtractRelatedConnections(connected): |
394d9f168258
Adding support for execution order in PLCGenerator
lbessard
parents:
108
diff
changeset
|
695 |
self.ConnectionTypes[connection] = "BOOL" |
340 | 696 |
elif isinstance(instance, plcopen.commonObjects_continuation): |
697 |
name = instance.getname() |
|
698 |
connector = None |
|
356
f6453b89e7f9
Adding support for finding character_string while computing connector types. Adding 'ANY' type on continuation by default.
greg
parents:
340
diff
changeset
|
699 |
var_type = "ANY" |
340 | 700 |
for element in body.getcontentInstances(): |
701 |
if isinstance(element, plcopen.commonObjects_connector) and element.getname() == name: |
|
702 |
if connector is not None: |
|
391 | 703 |
raise PLCGenException, _("More than one connector found corresponding to \"%s\" continuation in \"%s\" POU")%(name, self.Name) |
340 | 704 |
connector = element |
705 |
if connector is not None: |
|
706 |
undefined = [instance.connectionPointOut, connector.connectionPointIn] |
|
707 |
connected = self.GetConnectedConnector(connector.connectionPointIn, body) |
|
708 |
if connected: |
|
709 |
undefined.append(connected) |
|
710 |
related = [] |
|
711 |
for connection in undefined: |
|
712 |
if self.ConnectionTypes.has_key(connection): |
|
713 |
var_type = self.ConnectionTypes[connection] |
|
714 |
else: |
|
715 |
related.extend(self.ExtractRelatedConnections(connection)) |
|
716 |
if var_type.startswith("ANY") and len(related) > 0: |
|
717 |
self.RelatedConnections.append(related) |
|
718 |
else: |
|
719 |
for connection in related: |
|
720 |
self.ConnectionTypes[connection] = var_type |
|
721 |
else: |
|
391 | 722 |
raise PLCGenException, _("No connector found corresponding to \"%s\" continuation in \"%s\" POU")%(name, self.Name) |
151 | 723 |
elif isinstance(instance, plcopen.fbdObjects_block): |
526
79900abdfa3c
Bug when using arithmetic functions (ADD, SUB, MUL, DIV) for TIME datatypes fixed.
laurent
parents:
507
diff
changeset
|
724 |
block_infos = self.GetBlockType(instance.gettypeName(), "undefined") |
389 | 725 |
if block_infos is not None: |
526
79900abdfa3c
Bug when using arithmetic functions (ADD, SUB, MUL, DIV) for TIME datatypes fixed.
laurent
parents:
507
diff
changeset
|
726 |
self.ComputeBlockInputTypes(instance, block_infos, body) |
79900abdfa3c
Bug when using arithmetic functions (ADD, SUB, MUL, DIV) for TIME datatypes fixed.
laurent
parents:
507
diff
changeset
|
727 |
else: |
389 | 728 |
for variable in instance.inputVariables.getvariable(): |
526
79900abdfa3c
Bug when using arithmetic functions (ADD, SUB, MUL, DIV) for TIME datatypes fixed.
laurent
parents:
507
diff
changeset
|
729 |
connected = self.GetConnectedConnector(variable.connectionPointIn, body) |
79900abdfa3c
Bug when using arithmetic functions (ADD, SUB, MUL, DIV) for TIME datatypes fixed.
laurent
parents:
507
diff
changeset
|
730 |
if connected is not None: |
79900abdfa3c
Bug when using arithmetic functions (ADD, SUB, MUL, DIV) for TIME datatypes fixed.
laurent
parents:
507
diff
changeset
|
731 |
var_type = self.ConnectionTypes.get(connected, None) |
79900abdfa3c
Bug when using arithmetic functions (ADD, SUB, MUL, DIV) for TIME datatypes fixed.
laurent
parents:
507
diff
changeset
|
732 |
if var_type is not None: |
79900abdfa3c
Bug when using arithmetic functions (ADD, SUB, MUL, DIV) for TIME datatypes fixed.
laurent
parents:
507
diff
changeset
|
733 |
self.ConnectionTypes[variable.connectionPointIn] = var_type |
125
394d9f168258
Adding support for execution order in PLCGenerator
lbessard
parents:
108
diff
changeset
|
734 |
else: |
526
79900abdfa3c
Bug when using arithmetic functions (ADD, SUB, MUL, DIV) for TIME datatypes fixed.
laurent
parents:
507
diff
changeset
|
735 |
related = self.ExtractRelatedConnections(connected) |
79900abdfa3c
Bug when using arithmetic functions (ADD, SUB, MUL, DIV) for TIME datatypes fixed.
laurent
parents:
507
diff
changeset
|
736 |
related.append(variable.connectionPointIn) |
79900abdfa3c
Bug when using arithmetic functions (ADD, SUB, MUL, DIV) for TIME datatypes fixed.
laurent
parents:
507
diff
changeset
|
737 |
self.RelatedConnections.append(related) |
79900abdfa3c
Bug when using arithmetic functions (ADD, SUB, MUL, DIV) for TIME datatypes fixed.
laurent
parents:
507
diff
changeset
|
738 |
undefined_blocks.append(instance) |
79900abdfa3c
Bug when using arithmetic functions (ADD, SUB, MUL, DIV) for TIME datatypes fixed.
laurent
parents:
507
diff
changeset
|
739 |
for instance in undefined_blocks: |
528
7ac133b11321
Fix bug in block with execution control generation fixed
laurent
parents:
527
diff
changeset
|
740 |
block_infos = self.GetBlockType(instance.gettypeName(), tuple([self.ConnectionTypes.get(variable.connectionPointIn, "ANY") for variable in instance.inputVariables.getvariable() if variable.getformalParameter() != "EN"])) |
526
79900abdfa3c
Bug when using arithmetic functions (ADD, SUB, MUL, DIV) for TIME datatypes fixed.
laurent
parents:
507
diff
changeset
|
741 |
if block_infos is not None: |
79900abdfa3c
Bug when using arithmetic functions (ADD, SUB, MUL, DIV) for TIME datatypes fixed.
laurent
parents:
507
diff
changeset
|
742 |
self.ComputeBlockInputTypes(instance, block_infos, body) |
79900abdfa3c
Bug when using arithmetic functions (ADD, SUB, MUL, DIV) for TIME datatypes fixed.
laurent
parents:
507
diff
changeset
|
743 |
else: |
79900abdfa3c
Bug when using arithmetic functions (ADD, SUB, MUL, DIV) for TIME datatypes fixed.
laurent
parents:
507
diff
changeset
|
744 |
raise PLCGenException, _("No informations found for \"%s\" block")%(instance.gettypeName()) |
79900abdfa3c
Bug when using arithmetic functions (ADD, SUB, MUL, DIV) for TIME datatypes fixed.
laurent
parents:
507
diff
changeset
|
745 |
|
79900abdfa3c
Bug when using arithmetic functions (ADD, SUB, MUL, DIV) for TIME datatypes fixed.
laurent
parents:
507
diff
changeset
|
746 |
def ComputeBlockInputTypes(self, instance, block_infos, body): |
79900abdfa3c
Bug when using arithmetic functions (ADD, SUB, MUL, DIV) for TIME datatypes fixed.
laurent
parents:
507
diff
changeset
|
747 |
undefined = {} |
79900abdfa3c
Bug when using arithmetic functions (ADD, SUB, MUL, DIV) for TIME datatypes fixed.
laurent
parents:
507
diff
changeset
|
748 |
for variable in instance.outputVariables.getvariable(): |
79900abdfa3c
Bug when using arithmetic functions (ADD, SUB, MUL, DIV) for TIME datatypes fixed.
laurent
parents:
507
diff
changeset
|
749 |
output_name = variable.getformalParameter() |
79900abdfa3c
Bug when using arithmetic functions (ADD, SUB, MUL, DIV) for TIME datatypes fixed.
laurent
parents:
507
diff
changeset
|
750 |
if output_name == "ENO": |
79900abdfa3c
Bug when using arithmetic functions (ADD, SUB, MUL, DIV) for TIME datatypes fixed.
laurent
parents:
507
diff
changeset
|
751 |
for connection in self.ExtractRelatedConnections(variable.connectionPointOut): |
79900abdfa3c
Bug when using arithmetic functions (ADD, SUB, MUL, DIV) for TIME datatypes fixed.
laurent
parents:
507
diff
changeset
|
752 |
self.ConnectionTypes[connection] = "BOOL" |
79900abdfa3c
Bug when using arithmetic functions (ADD, SUB, MUL, DIV) for TIME datatypes fixed.
laurent
parents:
507
diff
changeset
|
753 |
else: |
79900abdfa3c
Bug when using arithmetic functions (ADD, SUB, MUL, DIV) for TIME datatypes fixed.
laurent
parents:
507
diff
changeset
|
754 |
for oname, otype, oqualifier in block_infos["outputs"]: |
79900abdfa3c
Bug when using arithmetic functions (ADD, SUB, MUL, DIV) for TIME datatypes fixed.
laurent
parents:
507
diff
changeset
|
755 |
if output_name == oname: |
79900abdfa3c
Bug when using arithmetic functions (ADD, SUB, MUL, DIV) for TIME datatypes fixed.
laurent
parents:
507
diff
changeset
|
756 |
if otype.startswith("ANY"): |
79900abdfa3c
Bug when using arithmetic functions (ADD, SUB, MUL, DIV) for TIME datatypes fixed.
laurent
parents:
507
diff
changeset
|
757 |
if not undefined.has_key(otype): |
79900abdfa3c
Bug when using arithmetic functions (ADD, SUB, MUL, DIV) for TIME datatypes fixed.
laurent
parents:
507
diff
changeset
|
758 |
undefined[otype] = [] |
79900abdfa3c
Bug when using arithmetic functions (ADD, SUB, MUL, DIV) for TIME datatypes fixed.
laurent
parents:
507
diff
changeset
|
759 |
undefined[otype].append(variable.connectionPointOut) |
79900abdfa3c
Bug when using arithmetic functions (ADD, SUB, MUL, DIV) for TIME datatypes fixed.
laurent
parents:
507
diff
changeset
|
760 |
elif not self.ConnectionTypes.has_key(variable.connectionPointOut): |
79900abdfa3c
Bug when using arithmetic functions (ADD, SUB, MUL, DIV) for TIME datatypes fixed.
laurent
parents:
507
diff
changeset
|
761 |
for connection in self.ExtractRelatedConnections(variable.connectionPointOut): |
79900abdfa3c
Bug when using arithmetic functions (ADD, SUB, MUL, DIV) for TIME datatypes fixed.
laurent
parents:
507
diff
changeset
|
762 |
self.ConnectionTypes[connection] = otype |
79900abdfa3c
Bug when using arithmetic functions (ADD, SUB, MUL, DIV) for TIME datatypes fixed.
laurent
parents:
507
diff
changeset
|
763 |
for variable in instance.inputVariables.getvariable(): |
79900abdfa3c
Bug when using arithmetic functions (ADD, SUB, MUL, DIV) for TIME datatypes fixed.
laurent
parents:
507
diff
changeset
|
764 |
input_name = variable.getformalParameter() |
79900abdfa3c
Bug when using arithmetic functions (ADD, SUB, MUL, DIV) for TIME datatypes fixed.
laurent
parents:
507
diff
changeset
|
765 |
if input_name == "EN": |
79900abdfa3c
Bug when using arithmetic functions (ADD, SUB, MUL, DIV) for TIME datatypes fixed.
laurent
parents:
507
diff
changeset
|
766 |
for connection in self.ExtractRelatedConnections(variable.connectionPointIn): |
79900abdfa3c
Bug when using arithmetic functions (ADD, SUB, MUL, DIV) for TIME datatypes fixed.
laurent
parents:
507
diff
changeset
|
767 |
self.ConnectionTypes[connection] = "BOOL" |
79900abdfa3c
Bug when using arithmetic functions (ADD, SUB, MUL, DIV) for TIME datatypes fixed.
laurent
parents:
507
diff
changeset
|
768 |
else: |
79900abdfa3c
Bug when using arithmetic functions (ADD, SUB, MUL, DIV) for TIME datatypes fixed.
laurent
parents:
507
diff
changeset
|
769 |
for iname, itype, iqualifier in block_infos["inputs"]: |
79900abdfa3c
Bug when using arithmetic functions (ADD, SUB, MUL, DIV) for TIME datatypes fixed.
laurent
parents:
507
diff
changeset
|
770 |
if input_name == iname: |
79900abdfa3c
Bug when using arithmetic functions (ADD, SUB, MUL, DIV) for TIME datatypes fixed.
laurent
parents:
507
diff
changeset
|
771 |
connected = self.GetConnectedConnector(variable.connectionPointIn, body) |
79900abdfa3c
Bug when using arithmetic functions (ADD, SUB, MUL, DIV) for TIME datatypes fixed.
laurent
parents:
507
diff
changeset
|
772 |
if itype.startswith("ANY"): |
79900abdfa3c
Bug when using arithmetic functions (ADD, SUB, MUL, DIV) for TIME datatypes fixed.
laurent
parents:
507
diff
changeset
|
773 |
if not undefined.has_key(itype): |
79900abdfa3c
Bug when using arithmetic functions (ADD, SUB, MUL, DIV) for TIME datatypes fixed.
laurent
parents:
507
diff
changeset
|
774 |
undefined[itype] = [] |
79900abdfa3c
Bug when using arithmetic functions (ADD, SUB, MUL, DIV) for TIME datatypes fixed.
laurent
parents:
507
diff
changeset
|
775 |
undefined[itype].append(variable.connectionPointIn) |
79900abdfa3c
Bug when using arithmetic functions (ADD, SUB, MUL, DIV) for TIME datatypes fixed.
laurent
parents:
507
diff
changeset
|
776 |
if connected: |
79900abdfa3c
Bug when using arithmetic functions (ADD, SUB, MUL, DIV) for TIME datatypes fixed.
laurent
parents:
507
diff
changeset
|
777 |
undefined[itype].append(connected) |
79900abdfa3c
Bug when using arithmetic functions (ADD, SUB, MUL, DIV) for TIME datatypes fixed.
laurent
parents:
507
diff
changeset
|
778 |
else: |
79900abdfa3c
Bug when using arithmetic functions (ADD, SUB, MUL, DIV) for TIME datatypes fixed.
laurent
parents:
507
diff
changeset
|
779 |
self.ConnectionTypes[variable.connectionPointIn] = itype |
79900abdfa3c
Bug when using arithmetic functions (ADD, SUB, MUL, DIV) for TIME datatypes fixed.
laurent
parents:
507
diff
changeset
|
780 |
if connected and not self.ConnectionTypes.has_key(connected): |
79900abdfa3c
Bug when using arithmetic functions (ADD, SUB, MUL, DIV) for TIME datatypes fixed.
laurent
parents:
507
diff
changeset
|
781 |
for connection in self.ExtractRelatedConnections(connected): |
79900abdfa3c
Bug when using arithmetic functions (ADD, SUB, MUL, DIV) for TIME datatypes fixed.
laurent
parents:
507
diff
changeset
|
782 |
self.ConnectionTypes[connection] = itype |
79900abdfa3c
Bug when using arithmetic functions (ADD, SUB, MUL, DIV) for TIME datatypes fixed.
laurent
parents:
507
diff
changeset
|
783 |
for var_type, connections in undefined.items(): |
79900abdfa3c
Bug when using arithmetic functions (ADD, SUB, MUL, DIV) for TIME datatypes fixed.
laurent
parents:
507
diff
changeset
|
784 |
related = [] |
79900abdfa3c
Bug when using arithmetic functions (ADD, SUB, MUL, DIV) for TIME datatypes fixed.
laurent
parents:
507
diff
changeset
|
785 |
for connection in connections: |
79900abdfa3c
Bug when using arithmetic functions (ADD, SUB, MUL, DIV) for TIME datatypes fixed.
laurent
parents:
507
diff
changeset
|
786 |
if self.ConnectionTypes.has_key(connection): |
79900abdfa3c
Bug when using arithmetic functions (ADD, SUB, MUL, DIV) for TIME datatypes fixed.
laurent
parents:
507
diff
changeset
|
787 |
var_type = self.ConnectionTypes[connection] |
79900abdfa3c
Bug when using arithmetic functions (ADD, SUB, MUL, DIV) for TIME datatypes fixed.
laurent
parents:
507
diff
changeset
|
788 |
else: |
79900abdfa3c
Bug when using arithmetic functions (ADD, SUB, MUL, DIV) for TIME datatypes fixed.
laurent
parents:
507
diff
changeset
|
789 |
related.extend(self.ExtractRelatedConnections(connection)) |
79900abdfa3c
Bug when using arithmetic functions (ADD, SUB, MUL, DIV) for TIME datatypes fixed.
laurent
parents:
507
diff
changeset
|
790 |
if var_type.startswith("ANY") and len(related) > 0: |
79900abdfa3c
Bug when using arithmetic functions (ADD, SUB, MUL, DIV) for TIME datatypes fixed.
laurent
parents:
507
diff
changeset
|
791 |
self.RelatedConnections.append(related) |
79900abdfa3c
Bug when using arithmetic functions (ADD, SUB, MUL, DIV) for TIME datatypes fixed.
laurent
parents:
507
diff
changeset
|
792 |
else: |
79900abdfa3c
Bug when using arithmetic functions (ADD, SUB, MUL, DIV) for TIME datatypes fixed.
laurent
parents:
507
diff
changeset
|
793 |
for connection in related: |
79900abdfa3c
Bug when using arithmetic functions (ADD, SUB, MUL, DIV) for TIME datatypes fixed.
laurent
parents:
507
diff
changeset
|
794 |
self.ConnectionTypes[connection] = var_type |
389 | 795 |
|
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
796 |
def ComputeProgram(self, pou): |
151 | 797 |
body = pou.getbody() |
389 | 798 |
if isinstance(body, ListType): |
799 |
body = body[0] |
|
151 | 800 |
body_content = body.getcontent() |
0 | 801 |
body_type = body_content["name"] |
802 |
if body_type in ["IL","ST"]: |
|
340 | 803 |
text = body_content["value"].gettext() |
804 |
self.ParentGenerator.GeneratePouProgramInText(text.upper()) |
|
805 |
self.Program = [(ReIndentText(text, len(self.CurrentIndent)), |
|
228
da7ddaf27cca
Bug with indentation in textual languages while error display fixed
lbessard
parents:
227
diff
changeset
|
806 |
(self.TagName, "body", len(self.CurrentIndent)))] |
0 | 807 |
elif body_type == "SFC": |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
808 |
self.IndentRight() |
151 | 809 |
for instance in body.getcontentInstances(): |
810 |
if isinstance(instance, plcopen.sfcObjects_step): |
|
1 | 811 |
self.GenerateSFCStep(instance, pou) |
151 | 812 |
elif isinstance(instance, plcopen.commonObjects_actionBlock): |
1 | 813 |
self.GenerateSFCStepActions(instance, pou) |
151 | 814 |
elif isinstance(instance, plcopen.sfcObjects_transition): |
1 | 815 |
self.GenerateSFCTransition(instance, pou) |
151 | 816 |
elif isinstance(instance, plcopen.sfcObjects_jumpStep): |
0 | 817 |
self.GenerateSFCJump(instance, pou) |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
818 |
if len(self.InitialSteps) > 0 and len(self.SFCComputedBlocks) > 0: |
66
fd138fc77510
Adding support for generating network and rung connected to transitions into SFC
lbessard
parents:
58
diff
changeset
|
819 |
action_name = "COMPUTE_FUNCTION_BLOCKS" |
fd138fc77510
Adding support for generating network and rung connected to transitions into SFC
lbessard
parents:
58
diff
changeset
|
820 |
action_infos = {"qualifier" : "S", "content" : action_name} |
fd138fc77510
Adding support for generating network and rung connected to transitions into SFC
lbessard
parents:
58
diff
changeset
|
821 |
self.SFCNetworks["Steps"][self.InitialSteps[0]]["actions"].append(action_infos) |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
822 |
self.SFCNetworks["Actions"][action_name] = (self.SFCComputedBlocks, ()) |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
823 |
self.Program = [] |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
824 |
self.IndentLeft() |
1 | 825 |
for initialstep in self.InitialSteps: |
826 |
self.ComputeSFCStep(initialstep) |
|
248
f7df265edd54
Problem with multi-connection on block in LD fixed
lbessard
parents:
244
diff
changeset
|
827 |
else: |
269
34eff05909b0
Adding support for EN/ENO variables (temporarily disabled, waiting for matiec support)
lbessard
parents:
261
diff
changeset
|
828 |
otherInstances = {"outVariables&coils" : [], "blocks" : [], "connectors" : []} |
248
f7df265edd54
Problem with multi-connection on block in LD fixed
lbessard
parents:
244
diff
changeset
|
829 |
orderedInstances = [] |
f7df265edd54
Problem with multi-connection on block in LD fixed
lbessard
parents:
244
diff
changeset
|
830 |
for instance in body.getcontentInstances(): |
f7df265edd54
Problem with multi-connection on block in LD fixed
lbessard
parents:
244
diff
changeset
|
831 |
if isinstance(instance, (plcopen.fbdObjects_outVariable, plcopen.fbdObjects_inOutVariable, plcopen.fbdObjects_block)): |
f7df265edd54
Problem with multi-connection on block in LD fixed
lbessard
parents:
244
diff
changeset
|
832 |
executionOrderId = instance.getexecutionOrderId() |
f7df265edd54
Problem with multi-connection on block in LD fixed
lbessard
parents:
244
diff
changeset
|
833 |
if executionOrderId > 0: |
f7df265edd54
Problem with multi-connection on block in LD fixed
lbessard
parents:
244
diff
changeset
|
834 |
orderedInstances.append((executionOrderId, instance)) |
f7df265edd54
Problem with multi-connection on block in LD fixed
lbessard
parents:
244
diff
changeset
|
835 |
elif isinstance(instance, (plcopen.fbdObjects_outVariable, plcopen.fbdObjects_inOutVariable)): |
269
34eff05909b0
Adding support for EN/ENO variables (temporarily disabled, waiting for matiec support)
lbessard
parents:
261
diff
changeset
|
836 |
otherInstances["outVariables&coils"].append(instance) |
248
f7df265edd54
Problem with multi-connection on block in LD fixed
lbessard
parents:
244
diff
changeset
|
837 |
elif isinstance(instance, plcopen.fbdObjects_block): |
269
34eff05909b0
Adding support for EN/ENO variables (temporarily disabled, waiting for matiec support)
lbessard
parents:
261
diff
changeset
|
838 |
otherInstances["blocks"].append(instance) |
248
f7df265edd54
Problem with multi-connection on block in LD fixed
lbessard
parents:
244
diff
changeset
|
839 |
elif isinstance(instance, plcopen.commonObjects_connector): |
269
34eff05909b0
Adding support for EN/ENO variables (temporarily disabled, waiting for matiec support)
lbessard
parents:
261
diff
changeset
|
840 |
otherInstances["connectors"].append(instance) |
248
f7df265edd54
Problem with multi-connection on block in LD fixed
lbessard
parents:
244
diff
changeset
|
841 |
elif isinstance(instance, plcopen.ldObjects_coil): |
269
34eff05909b0
Adding support for EN/ENO variables (temporarily disabled, waiting for matiec support)
lbessard
parents:
261
diff
changeset
|
842 |
otherInstances["outVariables&coils"].append(instance) |
248
f7df265edd54
Problem with multi-connection on block in LD fixed
lbessard
parents:
244
diff
changeset
|
843 |
orderedInstances.sort() |
269
34eff05909b0
Adding support for EN/ENO variables (temporarily disabled, waiting for matiec support)
lbessard
parents:
261
diff
changeset
|
844 |
otherInstances["outVariables&coils"].sort(SortInstances) |
684 | 845 |
otherInstances["blocks"].sort(SortInstances) |
248
f7df265edd54
Problem with multi-connection on block in LD fixed
lbessard
parents:
244
diff
changeset
|
846 |
instances = [instance for (executionOrderId, instance) in orderedInstances] |
269
34eff05909b0
Adding support for EN/ENO variables (temporarily disabled, waiting for matiec support)
lbessard
parents:
261
diff
changeset
|
847 |
instances.extend(otherInstances["connectors"] + otherInstances["outVariables&coils"] + otherInstances["blocks"]) |
248
f7df265edd54
Problem with multi-connection on block in LD fixed
lbessard
parents:
244
diff
changeset
|
848 |
for instance in instances: |
f7df265edd54
Problem with multi-connection on block in LD fixed
lbessard
parents:
244
diff
changeset
|
849 |
if isinstance(instance, (plcopen.fbdObjects_outVariable, plcopen.fbdObjects_inOutVariable)): |
f7df265edd54
Problem with multi-connection on block in LD fixed
lbessard
parents:
244
diff
changeset
|
850 |
connections = instance.connectionPointIn.getconnections() |
f7df265edd54
Problem with multi-connection on block in LD fixed
lbessard
parents:
244
diff
changeset
|
851 |
if connections is not None: |
f7df265edd54
Problem with multi-connection on block in LD fixed
lbessard
parents:
244
diff
changeset
|
852 |
expression = self.ComputeExpression(body, connections) |
f7df265edd54
Problem with multi-connection on block in LD fixed
lbessard
parents:
244
diff
changeset
|
853 |
self.Program += [(self.CurrentIndent, ()), |
f7df265edd54
Problem with multi-connection on block in LD fixed
lbessard
parents:
244
diff
changeset
|
854 |
(instance.getexpression(), (self.TagName, "io_variable", instance.getlocalId(), "expression")), |
f7df265edd54
Problem with multi-connection on block in LD fixed
lbessard
parents:
244
diff
changeset
|
855 |
(" := ", ())] |
f7df265edd54
Problem with multi-connection on block in LD fixed
lbessard
parents:
244
diff
changeset
|
856 |
self.Program += expression |
f7df265edd54
Problem with multi-connection on block in LD fixed
lbessard
parents:
244
diff
changeset
|
857 |
self.Program += [(";\n", ())] |
f7df265edd54
Problem with multi-connection on block in LD fixed
lbessard
parents:
244
diff
changeset
|
858 |
elif isinstance(instance, plcopen.fbdObjects_block): |
f7df265edd54
Problem with multi-connection on block in LD fixed
lbessard
parents:
244
diff
changeset
|
859 |
block_type = instance.gettypeName() |
f7df265edd54
Problem with multi-connection on block in LD fixed
lbessard
parents:
244
diff
changeset
|
860 |
self.ParentGenerator.GeneratePouProgram(block_type) |
528
7ac133b11321
Fix bug in block with execution control generation fixed
laurent
parents:
527
diff
changeset
|
861 |
block_infos = self.GetBlockType(block_type, tuple([self.ConnectionTypes.get(variable.connectionPointIn, "ANY") for variable in instance.inputVariables.getvariable() if variable.getformalParameter() != "EN"])) |
566
6014ef82a98a
Adding support for searching text or regular expression in whole project
laurent
parents:
558
diff
changeset
|
862 |
if block_infos is None: |
6014ef82a98a
Adding support for searching text or regular expression in whole project
laurent
parents:
558
diff
changeset
|
863 |
block_infos = self.GetBlockType(block_type) |
6014ef82a98a
Adding support for searching text or regular expression in whole project
laurent
parents:
558
diff
changeset
|
864 |
if block_infos is None: |
6014ef82a98a
Adding support for searching text or regular expression in whole project
laurent
parents:
558
diff
changeset
|
865 |
raise PLCGenException, _("Undefined block type \"%s\" in \"%s\" POU")%(block_type, self.Name) |
526
79900abdfa3c
Bug when using arithmetic functions (ADD, SUB, MUL, DIV) for TIME datatypes fixed.
laurent
parents:
507
diff
changeset
|
866 |
block_infos["generate"](self, instance, block_infos, body, None) |
248
f7df265edd54
Problem with multi-connection on block in LD fixed
lbessard
parents:
244
diff
changeset
|
867 |
elif isinstance(instance, plcopen.commonObjects_connector): |
f7df265edd54
Problem with multi-connection on block in LD fixed
lbessard
parents:
244
diff
changeset
|
868 |
connector = instance.getname() |
f7df265edd54
Problem with multi-connection on block in LD fixed
lbessard
parents:
244
diff
changeset
|
869 |
if self.ComputedConnectors.get(connector, None): |
f7df265edd54
Problem with multi-connection on block in LD fixed
lbessard
parents:
244
diff
changeset
|
870 |
continue |
f7df265edd54
Problem with multi-connection on block in LD fixed
lbessard
parents:
244
diff
changeset
|
871 |
self.ComputedConnectors[connector] = self.ComputeExpression(body, instance.connectionPointIn.getconnections()) |
f7df265edd54
Problem with multi-connection on block in LD fixed
lbessard
parents:
244
diff
changeset
|
872 |
elif isinstance(instance, plcopen.ldObjects_coil): |
f7df265edd54
Problem with multi-connection on block in LD fixed
lbessard
parents:
244
diff
changeset
|
873 |
connections = instance.connectionPointIn.getconnections() |
f7df265edd54
Problem with multi-connection on block in LD fixed
lbessard
parents:
244
diff
changeset
|
874 |
if connections is not None: |
f7df265edd54
Problem with multi-connection on block in LD fixed
lbessard
parents:
244
diff
changeset
|
875 |
coil_info = (self.TagName, "coil", instance.getlocalId()) |
269
34eff05909b0
Adding support for EN/ENO variables (temporarily disabled, waiting for matiec support)
lbessard
parents:
261
diff
changeset
|
876 |
expression = self.ExtractModifier(instance, self.ComputeExpression(body, connections), coil_info) |
34eff05909b0
Adding support for EN/ENO variables (temporarily disabled, waiting for matiec support)
lbessard
parents:
261
diff
changeset
|
877 |
self.Program += [(self.CurrentIndent, ())] |
34eff05909b0
Adding support for EN/ENO variables (temporarily disabled, waiting for matiec support)
lbessard
parents:
261
diff
changeset
|
878 |
self.Program += [(instance.getvariable(), coil_info + ("reference",))] |
248
f7df265edd54
Problem with multi-connection on block in LD fixed
lbessard
parents:
244
diff
changeset
|
879 |
self.Program += [(" := ", ())] + expression + [(";\n", ())] |
269
34eff05909b0
Adding support for EN/ENO variables (temporarily disabled, waiting for matiec support)
lbessard
parents:
261
diff
changeset
|
880 |
|
248
f7df265edd54
Problem with multi-connection on block in LD fixed
lbessard
parents:
244
diff
changeset
|
881 |
def FactorizePaths(self, paths): |
242 | 882 |
same_paths = {} |
883 |
uncomputed_index = range(len(paths)) |
|
884 |
factorized_paths = [] |
|
885 |
for num, path in enumerate(paths): |
|
886 |
if type(path) == ListType: |
|
273
5b18d98aa4f9
Support for unhandled factorization cases added by fixing bug
lbessard
parents:
269
diff
changeset
|
887 |
if len(path) > 1: |
5b18d98aa4f9
Support for unhandled factorization cases added by fixing bug
lbessard
parents:
269
diff
changeset
|
888 |
str_path = str(path[-1:]) |
242 | 889 |
same_paths.setdefault(str_path, []) |
273
5b18d98aa4f9
Support for unhandled factorization cases added by fixing bug
lbessard
parents:
269
diff
changeset
|
890 |
same_paths[str_path].append((path[:-1], num)) |
242 | 891 |
else: |
892 |
factorized_paths.append(path) |
|
893 |
uncomputed_index.remove(num) |
|
894 |
for same_path, elements in same_paths.items(): |
|
895 |
if len(elements) > 1: |
|
273
5b18d98aa4f9
Support for unhandled factorization cases added by fixing bug
lbessard
parents:
269
diff
changeset
|
896 |
elements_paths = self.FactorizePaths([path for path, num in elements]) |
5b18d98aa4f9
Support for unhandled factorization cases added by fixing bug
lbessard
parents:
269
diff
changeset
|
897 |
if len(elements_paths) > 1: |
5b18d98aa4f9
Support for unhandled factorization cases added by fixing bug
lbessard
parents:
269
diff
changeset
|
898 |
factorized_paths.append([tuple(elements_paths)] + eval(same_path)) |
5b18d98aa4f9
Support for unhandled factorization cases added by fixing bug
lbessard
parents:
269
diff
changeset
|
899 |
else: |
5b18d98aa4f9
Support for unhandled factorization cases added by fixing bug
lbessard
parents:
269
diff
changeset
|
900 |
factorized_paths.append(elements_paths + eval(same_path)) |
242 | 901 |
for path, num in elements: |
902 |
uncomputed_index.remove(num) |
|
903 |
for num in uncomputed_index: |
|
904 |
factorized_paths.append(paths[num]) |
|
244
05f6e0d7710c
Adding sort in LD factorized paths to avoid combination problem
lbessard
parents:
242
diff
changeset
|
905 |
factorized_paths.sort() |
242 | 906 |
return factorized_paths |
907 |
||
754
48966b6ceedc
Fix bug in ST code generated for in-out variables in Function and FunctionBlock interface
Laurent Bessard
parents:
742
diff
changeset
|
908 |
def GeneratePaths(self, connections, body, order = False, to_inout = False): |
0 | 909 |
paths = [] |
910 |
for connection in connections: |
|
151 | 911 |
localId = connection.getrefLocalId() |
912 |
next = body.getcontentInstance(localId) |
|
913 |
if isinstance(next, plcopen.ldObjects_leftPowerRail): |
|
0 | 914 |
paths.append(None) |
248
f7df265edd54
Problem with multi-connection on block in LD fixed
lbessard
parents:
244
diff
changeset
|
915 |
elif isinstance(next, (plcopen.fbdObjects_inVariable, plcopen.fbdObjects_inOutVariable)): |
f7df265edd54
Problem with multi-connection on block in LD fixed
lbessard
parents:
244
diff
changeset
|
916 |
paths.append(str([(next.getexpression(), (self.TagName, "io_variable", localId, "expression"))])) |
151 | 917 |
elif isinstance(next, plcopen.fbdObjects_block): |
918 |
block_type = next.gettypeName() |
|
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
919 |
self.ParentGenerator.GeneratePouProgram(block_type) |
528
7ac133b11321
Fix bug in block with execution control generation fixed
laurent
parents:
527
diff
changeset
|
920 |
block_infos = self.GetBlockType(block_type, tuple([self.ConnectionTypes.get(variable.connectionPointIn, "ANY") for variable in next.inputVariables.getvariable() if variable.getformalParameter() != "EN"])) |
566
6014ef82a98a
Adding support for searching text or regular expression in whole project
laurent
parents:
558
diff
changeset
|
921 |
if block_infos is None: |
6014ef82a98a
Adding support for searching text or regular expression in whole project
laurent
parents:
558
diff
changeset
|
922 |
block_infos = self.GetBlockType(block_type) |
6014ef82a98a
Adding support for searching text or regular expression in whole project
laurent
parents:
558
diff
changeset
|
923 |
if block_infos is None: |
6014ef82a98a
Adding support for searching text or regular expression in whole project
laurent
parents:
558
diff
changeset
|
924 |
raise PLCGenException, _("Undefined block type \"%s\" in \"%s\" POU")%(block_type, self.Name) |
754
48966b6ceedc
Fix bug in ST code generated for in-out variables in Function and FunctionBlock interface
Laurent Bessard
parents:
742
diff
changeset
|
925 |
paths.append(str(block_infos["generate"](self, next, block_infos, body, connection, order, to_inout))) |
248
f7df265edd54
Problem with multi-connection on block in LD fixed
lbessard
parents:
244
diff
changeset
|
926 |
elif isinstance(next, plcopen.commonObjects_continuation): |
f7df265edd54
Problem with multi-connection on block in LD fixed
lbessard
parents:
244
diff
changeset
|
927 |
name = next.getname() |
f7df265edd54
Problem with multi-connection on block in LD fixed
lbessard
parents:
244
diff
changeset
|
928 |
computed_value = self.ComputedConnectors.get(name, None) |
f7df265edd54
Problem with multi-connection on block in LD fixed
lbessard
parents:
244
diff
changeset
|
929 |
if computed_value != None: |
257 | 930 |
paths.append(str(computed_value)) |
931 |
else: |
|
932 |
connector = None |
|
933 |
for instance in body.getcontentInstances(): |
|
934 |
if isinstance(instance, plcopen.commonObjects_connector) and instance.getname() == name: |
|
935 |
if connector is not None: |
|
391 | 936 |
raise PLCGenException, _("More than one connector found corresponding to \"%s\" continuation in \"%s\" POU")%(name, self.Name) |
257 | 937 |
connector = instance |
938 |
if connector is not None: |
|
939 |
connections = connector.connectionPointIn.getconnections() |
|
940 |
if connections is not None: |
|
941 |
expression = self.ComputeExpression(body, connections, order) |
|
942 |
self.ComputedConnectors[name] = expression |
|
943 |
paths.append(str(expression)) |
|
944 |
else: |
|
391 | 945 |
raise PLCGenException, _("No connector found corresponding to \"%s\" continuation in \"%s\" POU")%(name, self.Name) |
257 | 946 |
elif isinstance(next, plcopen.ldObjects_contact): |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
947 |
contact_info = (self.TagName, "contact", next.getlocalId()) |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
948 |
variable = str(self.ExtractModifier(next, [(next.getvariable(), contact_info + ("reference",))], contact_info)) |
248
f7df265edd54
Problem with multi-connection on block in LD fixed
lbessard
parents:
244
diff
changeset
|
949 |
result = self.GeneratePaths(next.connectionPointIn.getconnections(), body, order) |
66
fd138fc77510
Adding support for generating network and rung connected to transitions into SFC
lbessard
parents:
58
diff
changeset
|
950 |
if len(result) > 1: |
248
f7df265edd54
Problem with multi-connection on block in LD fixed
lbessard
parents:
244
diff
changeset
|
951 |
factorized_paths = self.FactorizePaths(result) |
242 | 952 |
if len(factorized_paths) > 1: |
953 |
paths.append([variable, tuple(factorized_paths)]) |
|
954 |
else: |
|
955 |
paths.append([variable] + factorized_paths) |
|
66
fd138fc77510
Adding support for generating network and rung connected to transitions into SFC
lbessard
parents:
58
diff
changeset
|
956 |
elif type(result[0]) == ListType: |
fd138fc77510
Adding support for generating network and rung connected to transitions into SFC
lbessard
parents:
58
diff
changeset
|
957 |
paths.append([variable] + result[0]) |
242 | 958 |
elif result[0] is not None: |
66
fd138fc77510
Adding support for generating network and rung connected to transitions into SFC
lbessard
parents:
58
diff
changeset
|
959 |
paths.append([variable, result[0]]) |
fd138fc77510
Adding support for generating network and rung connected to transitions into SFC
lbessard
parents:
58
diff
changeset
|
960 |
else: |
fd138fc77510
Adding support for generating network and rung connected to transitions into SFC
lbessard
parents:
58
diff
changeset
|
961 |
paths.append(variable) |
257 | 962 |
elif isinstance(next, plcopen.ldObjects_coil): |
963 |
paths.append(str(self.GeneratePaths(next.connectionPointIn.getconnections(), body, order))) |
|
66
fd138fc77510
Adding support for generating network and rung connected to transitions into SFC
lbessard
parents:
58
diff
changeset
|
964 |
return paths |
fd138fc77510
Adding support for generating network and rung connected to transitions into SFC
lbessard
parents:
58
diff
changeset
|
965 |
|
248
f7df265edd54
Problem with multi-connection on block in LD fixed
lbessard
parents:
244
diff
changeset
|
966 |
def ComputePaths(self, paths, first = False): |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
967 |
if type(paths) == TupleType: |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
968 |
if None in paths: |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
969 |
return [("TRUE", ())] |
66
fd138fc77510
Adding support for generating network and rung connected to transitions into SFC
lbessard
parents:
58
diff
changeset
|
970 |
else: |
248
f7df265edd54
Problem with multi-connection on block in LD fixed
lbessard
parents:
244
diff
changeset
|
971 |
vars = [self.ComputePaths(path) for path in paths] |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
972 |
if first: |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
973 |
return JoinList([(" OR ", ())], vars) |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
974 |
else: |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
975 |
return [("(", ())] + JoinList([(" OR ", ())], vars) + [(")", ())] |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
976 |
elif type(paths) == ListType: |
248
f7df265edd54
Problem with multi-connection on block in LD fixed
lbessard
parents:
244
diff
changeset
|
977 |
vars = [self.ComputePaths(path) for path in paths] |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
978 |
return JoinList([(" AND ", ())], vars) |
501
edfa63d3c26d
Bug in PLCGenerator when Coil is directly connected to LeftPowerRail fixed
pizza
parents:
499
diff
changeset
|
979 |
elif paths is None: |
edfa63d3c26d
Bug in PLCGenerator when Coil is directly connected to LeftPowerRail fixed
pizza
parents:
499
diff
changeset
|
980 |
return [("TRUE", ())] |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
981 |
else: |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
982 |
return eval(paths) |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
983 |
|
754
48966b6ceedc
Fix bug in ST code generated for in-out variables in Function and FunctionBlock interface
Laurent Bessard
parents:
742
diff
changeset
|
984 |
def ComputeExpression(self, body, connections, order = False, to_inout = False): |
48966b6ceedc
Fix bug in ST code generated for in-out variables in Function and FunctionBlock interface
Laurent Bessard
parents:
742
diff
changeset
|
985 |
paths = self.GeneratePaths(connections, body, order, to_inout) |
242 | 986 |
if len(paths) > 1: |
248
f7df265edd54
Problem with multi-connection on block in LD fixed
lbessard
parents:
244
diff
changeset
|
987 |
factorized_paths = self.FactorizePaths(paths) |
242 | 988 |
if len(factorized_paths) > 1: |
989 |
paths = tuple(factorized_paths) |
|
990 |
else: |
|
991 |
paths = factorized_paths[0] |
|
992 |
else: |
|
993 |
paths = paths[0] |
|
248
f7df265edd54
Problem with multi-connection on block in LD fixed
lbessard
parents:
244
diff
changeset
|
994 |
return self.ComputePaths(paths, True) |
242 | 995 |
|
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
996 |
def ExtractModifier(self, variable, expression, var_info): |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
997 |
if variable.getnegated(): |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
998 |
return [("NOT(", var_info + ("negated",))] + expression + [(")", ())] |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
999 |
else: |
269
34eff05909b0
Adding support for EN/ENO variables (temporarily disabled, waiting for matiec support)
lbessard
parents:
261
diff
changeset
|
1000 |
storage = variable.getstorage() |
34eff05909b0
Adding support for EN/ENO variables (temporarily disabled, waiting for matiec support)
lbessard
parents:
261
diff
changeset
|
1001 |
if storage in ["set", "reset"]: |
34eff05909b0
Adding support for EN/ENO variables (temporarily disabled, waiting for matiec support)
lbessard
parents:
261
diff
changeset
|
1002 |
self.Program += [(self.CurrentIndent + "IF ", var_info + (storage,))] + expression |
34eff05909b0
Adding support for EN/ENO variables (temporarily disabled, waiting for matiec support)
lbessard
parents:
261
diff
changeset
|
1003 |
self.Program += [(" THEN\n ", ())] |
34eff05909b0
Adding support for EN/ENO variables (temporarily disabled, waiting for matiec support)
lbessard
parents:
261
diff
changeset
|
1004 |
if storage == "set": |
281 | 1005 |
return [("TRUE; (*set*)\n" + self.CurrentIndent + "END_IF", ())] |
1006 |
else: |
|
1007 |
return [("FALSE; (*reset*)\n" + self.CurrentIndent + "END_IF", ())] |
|
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1008 |
edge = variable.getedge() |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1009 |
if edge == "rising": |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1010 |
return self.AddTrigger("R_TRIG", expression, var_info + ("rising",)) |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1011 |
elif edge == "falling": |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1012 |
return self.AddTrigger("F_TRIG", expression, var_info + ("falling",)) |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1013 |
return expression |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1014 |
|
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1015 |
def AddTrigger(self, edge, expression, var_info): |
483
779a519f78f2
Replace Retain and Constant column in VariablePanel by Option and add the option Non-Retain
laurent
parents:
408
diff
changeset
|
1016 |
if self.Interface[-1][0] != "VAR" or self.Interface[-1][1] is not None or self.Interface[-1][2]: |
779a519f78f2
Replace Retain and Constant column in VariablePanel by Option and add the option Non-Retain
laurent
parents:
408
diff
changeset
|
1017 |
self.Interface.append(("VAR", None, False, [])) |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1018 |
i = 1 |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1019 |
name = "%s%d"%(edge, i) |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1020 |
while self.IsAlreadyDefined(name): |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1021 |
i += 1 |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1022 |
name = "%s%d"%(edge, i) |
483
779a519f78f2
Replace Retain and Constant column in VariablePanel by Option and add the option Non-Retain
laurent
parents:
408
diff
changeset
|
1023 |
self.Interface[-1][3].append((edge, name, None, None)) |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1024 |
self.Program += [(self.CurrentIndent, ()), (name, var_info), ("(CLK := ", ())] |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1025 |
self.Program += expression |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1026 |
self.Program += [(");\n", ())] |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1027 |
return [("%s.Q"%name, var_info)] |
66
fd138fc77510
Adding support for generating network and rung connected to transitions into SFC
lbessard
parents:
58
diff
changeset
|
1028 |
|
2 | 1029 |
def ExtractDivergenceInput(self, divergence, pou): |
151 | 1030 |
connectionPointIn = divergence.getconnectionPointIn() |
2 | 1031 |
if connectionPointIn: |
151 | 1032 |
connections = connectionPointIn.getconnections() |
201 | 1033 |
if connections is not None and len(connections) == 1: |
151 | 1034 |
instanceLocalId = connections[0].getrefLocalId() |
389 | 1035 |
body = pou.getbody() |
1036 |
if isinstance(body, ListType): |
|
1037 |
body = body[0] |
|
1038 |
return body.getcontentInstance(instanceLocalId) |
|
2 | 1039 |
return None |
1040 |
||
1041 |
def ExtractConvergenceInputs(self, convergence, pou): |
|
1042 |
instances = [] |
|
151 | 1043 |
for connectionPointIn in convergence.getconnectionPointIn(): |
1044 |
connections = connectionPointIn.getconnections() |
|
499
cecb4369fa42
Bug when trying to generate SFC with unconnected connectors fixed
laurent
parents:
483
diff
changeset
|
1045 |
if connections is not None and len(connections) == 1: |
151 | 1046 |
instanceLocalId = connections[0].getrefLocalId() |
389 | 1047 |
body = pou.getbody() |
1048 |
if isinstance(body, ListType): |
|
1049 |
body = body[0] |
|
1050 |
instances.append(body.getcontentInstance(instanceLocalId)) |
|
2 | 1051 |
return instances |
1052 |
||
1 | 1053 |
def GenerateSFCStep(self, step, pou): |
151 | 1054 |
step_name = step.getname() |
1 | 1055 |
if step_name not in self.SFCNetworks["Steps"].keys(): |
151 | 1056 |
if step.getinitialStep(): |
1 | 1057 |
self.InitialSteps.append(step_name) |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1058 |
step_infos = {"id" : step.getlocalId(), |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1059 |
"initial" : step.getinitialStep(), |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1060 |
"transitions" : [], |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1061 |
"actions" : []} |
0 | 1062 |
if step.connectionPointIn: |
1063 |
instances = [] |
|
151 | 1064 |
connections = step.connectionPointIn.getconnections() |
499
cecb4369fa42
Bug when trying to generate SFC with unconnected connectors fixed
laurent
parents:
483
diff
changeset
|
1065 |
if connections is not None and len(connections) == 1: |
151 | 1066 |
instanceLocalId = connections[0].getrefLocalId() |
389 | 1067 |
body = pou.getbody() |
1068 |
if isinstance(body, ListType): |
|
1069 |
body = body[0] |
|
1070 |
instance = body.getcontentInstance(instanceLocalId) |
|
151 | 1071 |
if isinstance(instance, plcopen.sfcObjects_transition): |
0 | 1072 |
instances.append(instance) |
151 | 1073 |
elif isinstance(instance, plcopen.sfcObjects_selectionConvergence): |
2 | 1074 |
instances.extend(self.ExtractConvergenceInputs(instance, pou)) |
151 | 1075 |
elif isinstance(instance, plcopen.sfcObjects_simultaneousDivergence): |
2 | 1076 |
transition = self.ExtractDivergenceInput(instance, pou) |
1077 |
if transition: |
|
151 | 1078 |
if isinstance(transition, plcopen.sfcObjects_transition): |
1 | 1079 |
instances.append(transition) |
151 | 1080 |
elif isinstance(transition, plcopen.sfcObjects_selectionConvergence): |
2 | 1081 |
instances.extend(self.ExtractConvergenceInputs(transition, pou)) |
0 | 1082 |
for instance in instances: |
2 | 1083 |
self.GenerateSFCTransition(instance, pou) |
1 | 1084 |
if instance in self.SFCNetworks["Transitions"].keys(): |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1085 |
target_info = (self.TagName, "transition", instance.getlocalId(), "to", step_infos["id"]) |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1086 |
self.SFCNetworks["Transitions"][instance]["to"].append([(step_name, target_info)]) |
1 | 1087 |
self.SFCNetworks["Steps"][step_name] = step_infos |
0 | 1088 |
|
1089 |
def GenerateSFCJump(self, jump, pou): |
|
151 | 1090 |
jump_target = jump.gettargetName() |
0 | 1091 |
if jump.connectionPointIn: |
1092 |
instances = [] |
|
151 | 1093 |
connections = jump.connectionPointIn.getconnections() |
499
cecb4369fa42
Bug when trying to generate SFC with unconnected connectors fixed
laurent
parents:
483
diff
changeset
|
1094 |
if connections is not None and len(connections) == 1: |
151 | 1095 |
instanceLocalId = connections[0].getrefLocalId() |
389 | 1096 |
body = pou.getbody() |
1097 |
if isinstance(body, ListType): |
|
1098 |
body = body[0] |
|
1099 |
instance = body.getcontentInstance(instanceLocalId) |
|
151 | 1100 |
if isinstance(instance, plcopen.sfcObjects_transition): |
0 | 1101 |
instances.append(instance) |
151 | 1102 |
elif isinstance(instance, plcopen.sfcObjects_selectionConvergence): |
2 | 1103 |
instances.extend(self.ExtractConvergenceInputs(instance, pou)) |
151 | 1104 |
elif isinstance(instance, plcopen.sfcObjects_simultaneousDivergence): |
2 | 1105 |
transition = self.ExtractDivergenceInput(instance, pou) |
1106 |
if transition: |
|
151 | 1107 |
if isinstance(transition, plcopen.sfcObjects_transition): |
1 | 1108 |
instances.append(transition) |
151 | 1109 |
elif isinstance(transition, plcopen.sfcObjects_selectionConvergence): |
2 | 1110 |
instances.extend(self.ExtractConvergenceInputs(transition, pou)) |
0 | 1111 |
for instance in instances: |
2 | 1112 |
self.GenerateSFCTransition(instance, pou) |
1 | 1113 |
if instance in self.SFCNetworks["Transitions"].keys(): |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1114 |
target_info = (self.TagName, "jump", jump.getlocalId(), "target") |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1115 |
self.SFCNetworks["Transitions"][instance]["to"].append([(jump_target, target_info)]) |
1 | 1116 |
|
1117 |
def GenerateSFCStepActions(self, actionBlock, pou): |
|
151 | 1118 |
connections = actionBlock.connectionPointIn.getconnections() |
201 | 1119 |
if connections is not None and len(connections) == 1: |
151 | 1120 |
stepLocalId = connections[0].getrefLocalId() |
389 | 1121 |
body = pou.getbody() |
1122 |
if isinstance(body, ListType): |
|
1123 |
body = body[0] |
|
1124 |
step = body.getcontentInstance(stepLocalId) |
|
1 | 1125 |
self.GenerateSFCStep(step, pou) |
151 | 1126 |
step_name = step.getname() |
1 | 1127 |
if step_name in self.SFCNetworks["Steps"].keys(): |
151 | 1128 |
actions = actionBlock.getactions() |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1129 |
for i, action in enumerate(actions): |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1130 |
action_infos = {"id" : actionBlock.getlocalId(), |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1131 |
"qualifier" : action["qualifier"], |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1132 |
"content" : action["value"], |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1133 |
"num" : i} |
1 | 1134 |
if "duration" in action: |
1135 |
action_infos["duration"] = action["duration"] |
|
1136 |
if "indicator" in action: |
|
1137 |
action_infos["indicator"] = action["indicator"] |
|
1138 |
if action["type"] == "reference": |
|
1139 |
self.GenerateSFCAction(action["value"], pou) |
|
46 | 1140 |
else: |
168
fb500cc79164
Adding support for structure variable list generation module in matiec
lbessard
parents:
151
diff
changeset
|
1141 |
action_name = "%s_INLINE%d"%(step_name.upper(), self.GetActionNumber()) |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1142 |
self.SFCNetworks["Actions"][action_name] = ([(self.CurrentIndent, ()), |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1143 |
(action["value"], (self.TagName, "action_block", action_infos["id"], "action", i, "inline")), |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1144 |
("\n", ())], ()) |
46 | 1145 |
action_infos["content"] = action_name |
1 | 1146 |
self.SFCNetworks["Steps"][step_name]["actions"].append(action_infos) |
1147 |
||
1148 |
def GenerateSFCAction(self, action_name, pou): |
|
1149 |
if action_name not in self.SFCNetworks["Actions"].keys(): |
|
151 | 1150 |
actionContent = pou.getaction(action_name) |
1 | 1151 |
if actionContent: |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1152 |
previous_tagname = self.TagName |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1153 |
self.TagName = self.ParentGenerator.Controler.ComputePouActionName(self.Name, action_name) |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1154 |
self.ComputeProgram(actionContent) |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1155 |
self.SFCNetworks["Actions"][action_name] = (self.Program, (self.TagName, "name")) |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1156 |
self.Program = [] |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1157 |
self.TagName = previous_tagname |
1 | 1158 |
|
1159 |
def GenerateSFCTransition(self, transition, pou): |
|
1160 |
if transition not in self.SFCNetworks["Transitions"].keys(): |
|
1161 |
steps = [] |
|
151 | 1162 |
connections = transition.connectionPointIn.getconnections() |
201 | 1163 |
if connections is not None and len(connections) == 1: |
151 | 1164 |
instanceLocalId = connections[0].getrefLocalId() |
389 | 1165 |
body = pou.getbody() |
1166 |
if isinstance(body, ListType): |
|
1167 |
body = body[0] |
|
1168 |
instance = body.getcontentInstance(instanceLocalId) |
|
151 | 1169 |
if isinstance(instance, plcopen.sfcObjects_step): |
2 | 1170 |
steps.append(instance) |
151 | 1171 |
elif isinstance(instance, plcopen.sfcObjects_selectionDivergence): |
2 | 1172 |
step = self.ExtractDivergenceInput(instance, pou) |
1173 |
if step: |
|
151 | 1174 |
if isinstance(step, plcopen.sfcObjects_step): |
2 | 1175 |
steps.append(step) |
151 | 1176 |
elif isinstance(step, plcopen.sfcObjects_simultaneousConvergence): |
2 | 1177 |
steps.extend(self.ExtractConvergenceInputs(step, pou)) |
151 | 1178 |
elif isinstance(instance, plcopen.sfcObjects_simultaneousConvergence): |
2 | 1179 |
steps.extend(self.ExtractConvergenceInputs(instance, pou)) |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1180 |
transition_infos = {"id" : transition.getlocalId(), |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1181 |
"priority": transition.getpriority(), |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1182 |
"from": [], |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1183 |
"to" : []} |
151 | 1184 |
transitionValues = transition.getconditionContent() |
1 | 1185 |
if transitionValues["type"] == "inline": |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1186 |
transition_infos["content"] = [("\n%s:= "%self.CurrentIndent, ()), |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1187 |
(transitionValues["value"], (self.TagName, "transition", transition.getlocalId(), "inline")), |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1188 |
(";\n", ())] |
66
fd138fc77510
Adding support for generating network and rung connected to transitions into SFC
lbessard
parents:
58
diff
changeset
|
1189 |
elif transitionValues["type"] == "reference": |
151 | 1190 |
transitionContent = pou.gettransition(transitionValues["value"]) |
1191 |
transitionType = transitionContent.getbodyType() |
|
1192 |
transitionBody = transitionContent.getbody() |
|
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1193 |
previous_tagname = self.TagName |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1194 |
self.TagName = self.ParentGenerator.Controler.ComputePouTransitionName(self.Name, transitionValues["value"]) |
1 | 1195 |
if transitionType == "IL": |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1196 |
transition_infos["content"] = [(":\n", ()), |
228
da7ddaf27cca
Bug with indentation in textual languages while error display fixed
lbessard
parents:
227
diff
changeset
|
1197 |
(ReIndentText(transitionBody.gettext(), len(self.CurrentIndent)), (self.TagName, "body", len(self.CurrentIndent)))] |
1 | 1198 |
elif transitionType == "ST": |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1199 |
transition_infos["content"] = [("\n", ()), |
228
da7ddaf27cca
Bug with indentation in textual languages while error display fixed
lbessard
parents:
227
diff
changeset
|
1200 |
(ReIndentText(transitionBody.gettext(), len(self.CurrentIndent)), (self.TagName, "body", len(self.CurrentIndent)))] |
248
f7df265edd54
Problem with multi-connection on block in LD fixed
lbessard
parents:
244
diff
changeset
|
1201 |
else: |
151 | 1202 |
for instance in transitionBody.getcontentInstances(): |
248
f7df265edd54
Problem with multi-connection on block in LD fixed
lbessard
parents:
244
diff
changeset
|
1203 |
if isinstance(instance, plcopen.fbdObjects_outVariable) and instance.getexpression() == transitionValues["value"]\ |
f7df265edd54
Problem with multi-connection on block in LD fixed
lbessard
parents:
244
diff
changeset
|
1204 |
or isinstance(instance, plcopen.ldObjects_coil) and instance.getvariable() == transitionValues["value"]: |
151 | 1205 |
connections = instance.connectionPointIn.getconnections() |
248
f7df265edd54
Problem with multi-connection on block in LD fixed
lbessard
parents:
244
diff
changeset
|
1206 |
if connections is not None: |
f7df265edd54
Problem with multi-connection on block in LD fixed
lbessard
parents:
244
diff
changeset
|
1207 |
expression = self.ComputeExpression(transitionBody, connections) |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1208 |
transition_infos["content"] = [("\n%s:= "%self.CurrentIndent, ())] + expression + [(";\n", ())] |
72
73212220ad22
Adding support for generating FBD with connectors and continuations
lbessard
parents:
71
diff
changeset
|
1209 |
self.SFCComputedBlocks += self.Program |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1210 |
self.Program = [] |
644
6ff54a34102b
Adding error message when SFC Transition body is not well formatted (no reference to transition name)
laurent
parents:
617
diff
changeset
|
1211 |
if not transition_infos.has_key("content"): |
6ff54a34102b
Adding error message when SFC Transition body is not well formatted (no reference to transition name)
laurent
parents:
617
diff
changeset
|
1212 |
raise PLCGenException, _("Transition \"%s\" body must contain an output variable or coil referring to its name") % transitionValues["value"] |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1213 |
self.TagName = previous_tagname |
66
fd138fc77510
Adding support for generating network and rung connected to transitions into SFC
lbessard
parents:
58
diff
changeset
|
1214 |
elif transitionValues["type"] == "connection": |
151 | 1215 |
body = pou.getbody() |
389 | 1216 |
if isinstance(body, ListType): |
1217 |
body = body[0] |
|
151 | 1218 |
connections = transition.getconnections() |
248
f7df265edd54
Problem with multi-connection on block in LD fixed
lbessard
parents:
244
diff
changeset
|
1219 |
if connections is not None: |
f7df265edd54
Problem with multi-connection on block in LD fixed
lbessard
parents:
244
diff
changeset
|
1220 |
expression = self.ComputeExpression(body, connections) |
f7df265edd54
Problem with multi-connection on block in LD fixed
lbessard
parents:
244
diff
changeset
|
1221 |
transition_infos["content"] = [("\n%s:= "%self.CurrentIndent, ())] + expression + [(";\n", ())] |
f7df265edd54
Problem with multi-connection on block in LD fixed
lbessard
parents:
244
diff
changeset
|
1222 |
self.SFCComputedBlocks += self.Program |
f7df265edd54
Problem with multi-connection on block in LD fixed
lbessard
parents:
244
diff
changeset
|
1223 |
self.Program = [] |
2 | 1224 |
for step in steps: |
1225 |
self.GenerateSFCStep(step, pou) |
|
151 | 1226 |
step_name = step.getname() |
1 | 1227 |
if step_name in self.SFCNetworks["Steps"].keys(): |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1228 |
transition_infos["from"].append([(step_name, (self.TagName, "transition", transition.getlocalId(), "from", step.getlocalId()))]) |
1 | 1229 |
self.SFCNetworks["Steps"][step_name]["transitions"].append(transition) |
1230 |
self.SFCNetworks["Transitions"][transition] = transition_infos |
|
1231 |
||
1232 |
def ComputeSFCStep(self, step_name): |
|
1233 |
if step_name in self.SFCNetworks["Steps"].keys(): |
|
1234 |
step_infos = self.SFCNetworks["Steps"].pop(step_name) |
|
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1235 |
self.Program += [(self.CurrentIndent, ())] |
1 | 1236 |
if step_infos["initial"]: |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1237 |
self.Program += [("INITIAL_", ())] |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1238 |
self.Program += [("STEP ", ()), |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1239 |
(step_name, (self.TagName, "step", step_infos["id"], "name")), |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1240 |
(":\n", ())] |
1 | 1241 |
actions = [] |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1242 |
self.IndentRight() |
1 | 1243 |
for action_infos in step_infos["actions"]: |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1244 |
if action_infos.get("id", None) is not None: |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1245 |
action_info = (self.TagName, "action_block", action_infos["id"], "action", action_infos["num"]) |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1246 |
else: |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1247 |
action_info = () |
1 | 1248 |
actions.append(action_infos["content"]) |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1249 |
self.Program += [(self.CurrentIndent, ()), |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1250 |
(action_infos["content"], action_info + ("reference",)), |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1251 |
("(", ()), |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1252 |
(action_infos["qualifier"], action_info + ("qualifier",))] |
1 | 1253 |
if "duration" in action_infos: |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1254 |
self.Program += [(", ", ()), |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1255 |
(action_infos["duration"], action_info + ("duration",))] |
1 | 1256 |
if "indicator" in action_infos: |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1257 |
self.Program += [(", ", ()), |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1258 |
(action_infos["indicator"], action_info + ("indicator",))] |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1259 |
self.Program += [(");\n", ())] |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1260 |
self.IndentLeft() |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1261 |
self.Program += [("%sEND_STEP\n\n"%self.CurrentIndent, ())] |
1 | 1262 |
for action in actions: |
1263 |
self.ComputeSFCAction(action) |
|
1264 |
for transition in step_infos["transitions"]: |
|
1265 |
self.ComputeSFCTransition(transition) |
|
1266 |
||
1267 |
def ComputeSFCAction(self, action_name): |
|
1268 |
if action_name in self.SFCNetworks["Actions"].keys(): |
|
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1269 |
action_content, action_info = self.SFCNetworks["Actions"].pop(action_name) |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1270 |
self.Program += [("%sACTION "%self.CurrentIndent, ()), |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1271 |
(action_name, action_info), |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1272 |
(" :\n", ())] |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1273 |
self.Program += action_content |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1274 |
self.Program += [("%sEND_ACTION\n\n"%self.CurrentIndent, ())] |
1 | 1275 |
|
1276 |
def ComputeSFCTransition(self, transition): |
|
1277 |
if transition in self.SFCNetworks["Transitions"].keys(): |
|
1278 |
transition_infos = self.SFCNetworks["Transitions"].pop(transition) |
|
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1279 |
self.Program += [("%sTRANSITION"%self.CurrentIndent, ())] |
80 | 1280 |
if transition_infos["priority"] != None: |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1281 |
self.Program += [(" (PRIORITY := ", ()), |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1282 |
("%d"%transition_infos["priority"], (self.TagName, "transition", transition_infos["id"], "priority")), |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1283 |
(")", ())] |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1284 |
self.Program += [(" FROM ", ())] |
1 | 1285 |
if len(transition_infos["from"]) > 1: |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1286 |
self.Program += [("(", ())] |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1287 |
self.Program += JoinList([(", ", ())], transition_infos["from"]) |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1288 |
self.Program += [(")", ())] |
201 | 1289 |
elif len(transition_infos["from"]) == 1: |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1290 |
self.Program += transition_infos["from"][0] |
201 | 1291 |
else: |
391 | 1292 |
raise PLCGenException, _("Transition with content \"%s\" not connected to a previous step in \"%s\" POU")%(transition_infos["content"], self.Name) |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1293 |
self.Program += [(" TO ", ())] |
1 | 1294 |
if len(transition_infos["to"]) > 1: |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1295 |
self.Program += [("(", ())] |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1296 |
self.Program += JoinList([(", ", ())], transition_infos["to"]) |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1297 |
self.Program += [(")", ())] |
201 | 1298 |
elif len(transition_infos["to"]) == 1: |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1299 |
self.Program += transition_infos["to"][0] |
201 | 1300 |
else: |
391 | 1301 |
raise PLCGenException, _("Transition with content \"%s\" not connected to a next step in \"%s\" POU")%(transition_infos["content"], self.Name) |
1 | 1302 |
self.Program += transition_infos["content"] |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1303 |
self.Program += [("%sEND_TRANSITION\n\n"%self.CurrentIndent, ())] |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1304 |
for [(step_name, step_infos)] in transition_infos["to"]: |
1 | 1305 |
self.ComputeSFCStep(step_name) |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1306 |
|
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1307 |
def GenerateProgram(self, pou): |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1308 |
self.ComputeInterface(pou) |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1309 |
self.ComputeConnectionTypes(pou) |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1310 |
self.ComputeProgram(pou) |
1 | 1311 |
|
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1312 |
program = [("%s "%self.Type, ()), |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1313 |
(self.Name, (self.TagName, "name"))] |
1 | 1314 |
if self.ReturnType: |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1315 |
program += [(" : ", ()), |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1316 |
(self.ReturnType, (self.TagName, "return"))] |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1317 |
program += [("\n", ())] |
214
a88b377f75cb
Adding tests for detecting POUs with no variables or/and no body
lbessard
parents:
208
diff
changeset
|
1318 |
if len(self.Interface) == 0: |
391 | 1319 |
raise PLCGenException, _("No variable defined in \"%s\" POU")%self.Name |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1320 |
if len(self.Program) == 0 : |
391 | 1321 |
raise PLCGenException, _("No body defined in \"%s\" POU")%self.Name |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1322 |
var_number = 0 |
483
779a519f78f2
Replace Retain and Constant column in VariablePanel by Option and add the option Non-Retain
laurent
parents:
408
diff
changeset
|
1323 |
for list_type, option, located, variables in self.Interface: |
566
6014ef82a98a
Adding support for searching text or regular expression in whole project
laurent
parents:
558
diff
changeset
|
1324 |
variable_type = errorVarTypes.get(list_type, "var_local") |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1325 |
program += [(" %s"%list_type, ())] |
483
779a519f78f2
Replace Retain and Constant column in VariablePanel by Option and add the option Non-Retain
laurent
parents:
408
diff
changeset
|
1326 |
if option is not None: |
566
6014ef82a98a
Adding support for searching text or regular expression in whole project
laurent
parents:
558
diff
changeset
|
1327 |
program += [(" %s"%option, (self.TagName, variable_type, (var_number, var_number + len(variables)), option.lower()))] |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1328 |
program += [("\n", ())] |
30 | 1329 |
for var_type, var_name, var_address, var_initial in variables: |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1330 |
program += [(" ", ())] |
93 | 1331 |
if var_name: |
566
6014ef82a98a
Adding support for searching text or regular expression in whole project
laurent
parents:
558
diff
changeset
|
1332 |
program += [(var_name, (self.TagName, variable_type, var_number, "name")), |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1333 |
(" ", ())] |
30 | 1334 |
if var_address != None: |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1335 |
program += [("AT ", ()), |
617 | 1336 |
(var_address, (self.TagName, variable_type, var_number, "location")), |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1337 |
(" ", ())] |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1338 |
program += [(": ", ()), |
566
6014ef82a98a
Adding support for searching text or regular expression in whole project
laurent
parents:
558
diff
changeset
|
1339 |
(var_type, (self.TagName, variable_type, var_number, "type"))] |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
6
diff
changeset
|
1340 |
if var_initial != None: |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1341 |
program += [(" := ", ()), |
617 | 1342 |
(self.ParentGenerator.ComputeValue(var_initial, var_type), (self.TagName, variable_type, var_number, "initial value"))] |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1343 |
program += [(";\n", ())] |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1344 |
var_number += 1 |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1345 |
program += [(" END_VAR\n", ())] |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1346 |
program += [("\n", ())] |
0 | 1347 |
program += self.Program |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1348 |
program += [("END_%s\n\n"%self.Type, ())] |
0 | 1349 |
return program |
71 | 1350 |
|
307
fd1f6ae26d4f
Adding support for cancelling code generation of function with no input connected
lbessard
parents:
295
diff
changeset
|
1351 |
def GenerateCurrentProgram(controler, project, errors, warnings): |
fd1f6ae26d4f
Adding support for cancelling code generation of function with no input connected
lbessard
parents:
295
diff
changeset
|
1352 |
generator = ProgramGenerator(controler, project, errors, warnings) |
227
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1353 |
generator.GenerateProgram() |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1354 |
return generator.GetGeneratedProgram() |
c6fee379d446
Adding informations to program chunks to allow display of compiling errors from matiec
lbessard
parents:
215
diff
changeset
|
1355 |