author | Laurent Bessard |
Mon, 09 Sep 2013 23:36:12 +0200 | |
changeset 1308 | ad61268dbdb6 |
parent 1306 | 1ff1cdf6c318 |
child 1311 | 85ca4fa0720b |
permissions | -rw-r--r-- |
814 | 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 |
# |
|
7 |
#Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD |
|
8 |
# |
|
9 |
#See COPYING file for copyrights details. |
|
10 |
# |
|
11 |
#This library is free software; you can redistribute it and/or |
|
12 |
#modify it under the terms of the GNU General Public |
|
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 |
|
19 |
#General Public License for more details. |
|
20 |
# |
|
21 |
#You should have received a copy of the GNU General Public |
|
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 xml.dom import minidom |
|
26 |
from types import StringType, UnicodeType, TupleType |
|
1308
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
27 |
from lxml import etree |
1299
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
28 |
from copy import deepcopy |
814 | 29 |
import os,sys,re |
30 |
import datetime |
|
31 |
from time import localtime |
|
32 |
||
1299
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
33 |
from plcopen import* |
814 | 34 |
from graphics.GraphicCommons import * |
35 |
from PLCGenerator import * |
|
36 |
||
37 |
duration_model = re.compile("(?:([0-9]{1,2})h)?(?:([0-9]{1,2})m(?!s))?(?:([0-9]{1,2})s)?(?:([0-9]{1,3}(?:\.[0-9]*)?)ms)?") |
|
38 |
||
39 |
ITEMS_EDITABLE = [ITEM_PROJECT, |
|
40 |
ITEM_POU, |
|
41 |
ITEM_VARIABLE, |
|
42 |
ITEM_TRANSITION, |
|
43 |
ITEM_ACTION, |
|
44 |
ITEM_CONFIGURATION, |
|
45 |
ITEM_RESOURCE, |
|
46 |
ITEM_DATATYPE |
|
47 |
] = range(8) |
|
48 |
||
49 |
ITEMS_UNEDITABLE = [ITEM_DATATYPES, |
|
50 |
ITEM_FUNCTION, |
|
51 |
ITEM_FUNCTIONBLOCK, |
|
52 |
ITEM_PROGRAM, |
|
53 |
ITEM_TRANSITIONS, |
|
54 |
ITEM_ACTIONS, |
|
55 |
ITEM_CONFIGURATIONS, |
|
56 |
ITEM_RESOURCES, |
|
57 |
ITEM_PROPERTIES |
|
58 |
] = range(8, 17) |
|
59 |
||
60 |
ITEMS_VARIABLE = [ITEM_VAR_LOCAL, |
|
61 |
ITEM_VAR_GLOBAL, |
|
62 |
ITEM_VAR_EXTERNAL, |
|
63 |
ITEM_VAR_TEMP, |
|
64 |
ITEM_VAR_INPUT, |
|
65 |
ITEM_VAR_OUTPUT, |
|
66 |
ITEM_VAR_INOUT |
|
67 |
] = range(17, 24) |
|
68 |
||
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
69 |
VAR_CLASS_INFOS = { |
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
70 |
"Local": ("localVars", ITEM_VAR_LOCAL), |
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
71 |
"Global": ("globalVars", ITEM_VAR_GLOBAL), |
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
72 |
"External": ("externalVars", ITEM_VAR_EXTERNAL), |
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
73 |
"Temp": ("tempVars", ITEM_VAR_TEMP), |
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
74 |
"Input": ("inputVars", ITEM_VAR_INPUT), |
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
75 |
"Output": ("outputVars", ITEM_VAR_OUTPUT), |
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
76 |
"InOut": ("inOutVars", ITEM_VAR_INOUT)} |
814 | 77 |
|
78 |
POU_TYPES = {"program": ITEM_PROGRAM, |
|
79 |
"functionBlock": ITEM_FUNCTIONBLOCK, |
|
80 |
"function": ITEM_FUNCTION, |
|
81 |
} |
|
82 |
||
83 |
LOCATIONS_ITEMS = [LOCATION_CONFNODE, |
|
84 |
LOCATION_MODULE, |
|
85 |
LOCATION_GROUP, |
|
86 |
LOCATION_VAR_INPUT, |
|
87 |
LOCATION_VAR_OUTPUT, |
|
88 |
LOCATION_VAR_MEMORY] = range(6) |
|
89 |
||
90 |
ScriptDirectory = os.path.split(os.path.realpath(__file__))[0] |
|
91 |
||
92 |
def GetUneditableNames(): |
|
93 |
_ = lambda x:x |
|
94 |
return [_("User-defined POUs"), _("Functions"), _("Function Blocks"), |
|
95 |
_("Programs"), _("Data Types"), _("Transitions"), _("Actions"), |
|
96 |
_("Configurations"), _("Resources"), _("Properties")] |
|
97 |
UNEDITABLE_NAMES = GetUneditableNames() |
|
98 |
[USER_DEFINED_POUS, FUNCTIONS, FUNCTION_BLOCKS, PROGRAMS, |
|
99 |
DATA_TYPES, TRANSITIONS, ACTIONS, CONFIGURATIONS, |
|
100 |
RESOURCES, PROPERTIES] = UNEDITABLE_NAMES |
|
101 |
||
102 |
#------------------------------------------------------------------------------- |
|
1308
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
103 |
# Helpers object for generating pou var list |
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
104 |
#------------------------------------------------------------------------------- |
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
105 |
|
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
106 |
def compute_dimensions(el): |
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
107 |
return [ |
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
108 |
(dimension.get("lower"), dimension.get("upper")) |
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
109 |
for dimension in el.findall("dimension")] |
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
110 |
|
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
111 |
def extract_param(el): |
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
112 |
if el.tag == "Type" and el.text is None: |
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
113 |
array = el.find("array") |
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
114 |
return ('array', array.text, compute_dimensions(array)) |
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
115 |
elif el.tag == "Tree": |
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
116 |
return generate_var_tree(el) |
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
117 |
elif el.tag == "Edit": |
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
118 |
return True |
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
119 |
elif el.text is None: |
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
120 |
return '' |
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
121 |
return el.text |
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
122 |
|
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
123 |
def generate_var_tree(tree): |
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
124 |
return ([ |
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
125 |
(var.get("name"), var.text, generate_var_tree(var)) |
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
126 |
for var in tree.findall("var")], |
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
127 |
compute_dimensions(tree)) |
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
128 |
|
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
129 |
class AddVariable(etree.XSLTExtension): |
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
130 |
|
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
131 |
def __init__(self, variables): |
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
132 |
etree.XSLTExtension.__init__(self) |
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
133 |
self.Variables = variables |
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
134 |
|
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
135 |
def execute(self, context, self_node, input_node, output_parent): |
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
136 |
infos = etree.Element('var_infos') |
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
137 |
self.process_children(context, infos) |
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
138 |
self.Variables.append( |
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
139 |
{el.tag.replace("_", " "): extract_param(el) for el in infos}) |
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
140 |
|
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
141 |
class VarTree(etree.XSLTExtension): |
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
142 |
|
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
143 |
def __init__(self, controller): |
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
144 |
etree.XSLTExtension.__init__(self) |
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
145 |
self.Controller = controller |
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
146 |
|
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
147 |
def execute(self, context, self_node, input_node, output_parent): |
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
148 |
typename = input_node.get("name") |
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
149 |
pou_infos = self.Controller.GetPou(typename) |
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
150 |
if pou_infos is not None: |
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
151 |
self.apply_templates(context, pou_infos, output_parent) |
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
152 |
return |
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
153 |
|
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
154 |
datatype_infos = self.Controller.GetDataType(typename) |
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
155 |
if datatype_infos is not None: |
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
156 |
self.apply_templates(context, datatype_infos, output_parent) |
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
157 |
return |
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
158 |
|
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
159 |
variables_infos_xslt = etree.parse( |
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
160 |
os.path.join(ScriptDirectory, "plcopen", "variables_infos.xslt")) |
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
161 |
|
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
162 |
#------------------------------------------------------------------------------- |
814 | 163 |
# Undo Buffer for PLCOpenEditor |
164 |
#------------------------------------------------------------------------------- |
|
165 |
||
166 |
# Length of the buffer |
|
167 |
UNDO_BUFFER_LENGTH = 20 |
|
168 |
||
169 |
""" |
|
170 |
Class implementing a buffer of changes made on the current editing model |
|
171 |
""" |
|
172 |
class UndoBuffer: |
|
173 |
||
174 |
# Constructor initialising buffer |
|
175 |
def __init__(self, currentstate, issaved = False): |
|
176 |
self.Buffer = [] |
|
177 |
self.CurrentIndex = -1 |
|
178 |
self.MinIndex = -1 |
|
179 |
self.MaxIndex = -1 |
|
180 |
# if current state is defined |
|
181 |
if currentstate: |
|
182 |
self.CurrentIndex = 0 |
|
183 |
self.MinIndex = 0 |
|
184 |
self.MaxIndex = 0 |
|
185 |
# Initialising buffer with currentstate at the first place |
|
186 |
for i in xrange(UNDO_BUFFER_LENGTH): |
|
187 |
if i == 0: |
|
188 |
self.Buffer.append(currentstate) |
|
189 |
else: |
|
190 |
self.Buffer.append(None) |
|
191 |
# Initialising index of state saved |
|
192 |
if issaved: |
|
193 |
self.LastSave = 0 |
|
194 |
else: |
|
195 |
self.LastSave = -1 |
|
196 |
||
197 |
# Add a new state in buffer |
|
198 |
def Buffering(self, currentstate): |
|
199 |
self.CurrentIndex = (self.CurrentIndex + 1) % UNDO_BUFFER_LENGTH |
|
200 |
self.Buffer[self.CurrentIndex] = currentstate |
|
201 |
# Actualising buffer limits |
|
202 |
self.MaxIndex = self.CurrentIndex |
|
203 |
if self.MinIndex == self.CurrentIndex: |
|
204 |
# If the removed state was the state saved, there is no state saved in the buffer |
|
205 |
if self.LastSave == self.MinIndex: |
|
206 |
self.LastSave = -1 |
|
207 |
self.MinIndex = (self.MinIndex + 1) % UNDO_BUFFER_LENGTH |
|
208 |
self.MinIndex = max(self.MinIndex, 0) |
|
209 |
||
210 |
# Return current state of buffer |
|
211 |
def Current(self): |
|
212 |
return self.Buffer[self.CurrentIndex] |
|
213 |
||
214 |
# Change current state to previous in buffer and return new current state |
|
215 |
def Previous(self): |
|
216 |
if self.CurrentIndex != self.MinIndex: |
|
217 |
self.CurrentIndex = (self.CurrentIndex - 1) % UNDO_BUFFER_LENGTH |
|
218 |
return self.Buffer[self.CurrentIndex] |
|
219 |
return None |
|
220 |
||
221 |
# Change current state to next in buffer and return new current state |
|
222 |
def Next(self): |
|
223 |
if self.CurrentIndex != self.MaxIndex: |
|
224 |
self.CurrentIndex = (self.CurrentIndex + 1) % UNDO_BUFFER_LENGTH |
|
225 |
return self.Buffer[self.CurrentIndex] |
|
226 |
return None |
|
227 |
||
228 |
# Return True if current state is the first in buffer |
|
229 |
def IsFirst(self): |
|
230 |
return self.CurrentIndex == self.MinIndex |
|
231 |
||
232 |
# Return True if current state is the last in buffer |
|
233 |
def IsLast(self): |
|
234 |
return self.CurrentIndex == self.MaxIndex |
|
235 |
||
236 |
# Note that current state is saved |
|
237 |
def CurrentSaved(self): |
|
238 |
self.LastSave = self.CurrentIndex |
|
239 |
||
240 |
# Return True if current state is saved |
|
241 |
def IsCurrentSaved(self): |
|
242 |
return self.LastSave == self.CurrentIndex |
|
243 |
||
244 |
||
245 |
#------------------------------------------------------------------------------- |
|
246 |
# Controler for PLCOpenEditor |
|
247 |
#------------------------------------------------------------------------------- |
|
248 |
||
249 |
""" |
|
250 |
Class which controls the operations made on the plcopen model and answers to view requests |
|
251 |
""" |
|
252 |
class PLCControler: |
|
253 |
||
254 |
# Create a new PLCControler |
|
255 |
def __init__(self): |
|
256 |
self.LastNewIndex = 0 |
|
257 |
self.Reset() |
|
258 |
||
259 |
# Reset PLCControler internal variables |
|
260 |
def Reset(self): |
|
261 |
self.Project = None |
|
262 |
self.ProjectBufferEnabled = True |
|
263 |
self.ProjectBuffer = None |
|
264 |
self.ProjectSaved = True |
|
265 |
self.Buffering = False |
|
266 |
self.FilePath = "" |
|
267 |
self.FileName = "" |
|
268 |
self.ProgramChunks = [] |
|
269 |
self.ProgramOffset = 0 |
|
270 |
self.NextCompiledProject = None |
|
271 |
self.CurrentCompiledProject = None |
|
272 |
self.ConfNodeTypes = [] |
|
1283
f3cfe1ff917e
More optimization attemps in type handling
Edouard Tisserant
parents:
1265
diff
changeset
|
273 |
self.TotalTypesDict = StdBlckDct.copy() |
f3cfe1ff917e
More optimization attemps in type handling
Edouard Tisserant
parents:
1265
diff
changeset
|
274 |
self.TotalTypes = StdBlckLst[:] |
1284 | 275 |
self.ProgramFilePath = "" |
276 |
||
814 | 277 |
def GetQualifierTypes(self): |
1298
f034fb2b1aab
Fixed SFC block edition and SFC to SFC_textual code generating
Laurent Bessard
parents:
1297
diff
changeset
|
278 |
return QualifierList |
814 | 279 |
|
280 |
def GetProject(self, debug = False): |
|
281 |
if debug and self.CurrentCompiledProject is not None: |
|
282 |
return self.CurrentCompiledProject |
|
283 |
else: |
|
284 |
return self.Project |
|
285 |
||
286 |
#------------------------------------------------------------------------------- |
|
287 |
# Project management functions |
|
288 |
#------------------------------------------------------------------------------- |
|
289 |
||
290 |
# Return if a project is opened |
|
291 |
def HasOpenedProject(self): |
|
292 |
return self.Project is not None |
|
293 |
||
294 |
# Create a new project by replacing the current one |
|
295 |
def CreateNewProject(self, properties): |
|
296 |
# Create the project |
|
1290
13ee5f4ab612
First stage of xmlclass refactoring using lxml
Laurent Bessard
parents:
1284
diff
changeset
|
297 |
self.Project = PLCOpenParser.CreateRoot() |
814 | 298 |
properties["creationDateTime"] = datetime.datetime(*localtime()[:6]) |
299 |
self.Project.setfileHeader(properties) |
|
300 |
self.Project.setcontentHeader(properties) |
|
301 |
self.SetFilePath("") |
|
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
302 |
|
814 | 303 |
# Initialize the project buffer |
304 |
self.CreateProjectBuffer(False) |
|
305 |
self.ProgramChunks = [] |
|
306 |
self.ProgramOffset = 0 |
|
1299
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
307 |
self.NextCompiledProject = self.Copy(self.Project) |
814 | 308 |
self.CurrentCompiledProject = None |
309 |
self.Buffering = False |
|
310 |
||
311 |
# Return project data type names |
|
312 |
def GetProjectDataTypeNames(self, debug = False): |
|
313 |
project = self.GetProject(debug) |
|
314 |
if project is not None: |
|
315 |
return [datatype.getname() for datatype in project.getdataTypes()] |
|
316 |
return [] |
|
317 |
||
318 |
# Return project pou names |
|
319 |
def GetProjectPouNames(self, debug = False): |
|
320 |
project = self.GetProject(debug) |
|
321 |
if project is not None: |
|
322 |
return [pou.getname() for pou in project.getpous()] |
|
323 |
return [] |
|
324 |
||
325 |
# Return project pou names |
|
326 |
def GetProjectConfigNames(self, debug = False): |
|
327 |
project = self.GetProject(debug) |
|
328 |
if project is not None: |
|
329 |
return [config.getname() for config in project.getconfigurations()] |
|
330 |
return [] |
|
331 |
||
1171
a506e4de8f84
Add support for Drag'n dropping located variables to function block creating global located variable in configuration and external variable in function block
Laurent Bessard
parents:
1127
diff
changeset
|
332 |
# Return project pou variable names |
a506e4de8f84
Add support for Drag'n dropping located variables to function block creating global located variable in configuration and external variable in function block
Laurent Bessard
parents:
1127
diff
changeset
|
333 |
def GetProjectPouVariableNames(self, pou_name = None, debug = False): |
814 | 334 |
variables = [] |
335 |
project = self.GetProject(debug) |
|
336 |
if project is not None: |
|
337 |
for pou in project.getpous(): |
|
338 |
if pou_name is None or pou_name == pou.getname(): |
|
339 |
variables.extend([var["Name"] for var in self.GetPouInterfaceVars(pou, debug)]) |
|
340 |
for transition in pou.gettransitionList(): |
|
341 |
variables.append(transition.getname()) |
|
342 |
for action in pou.getactionList(): |
|
343 |
variables.append(action.getname()) |
|
344 |
return variables |
|
345 |
||
346 |
# Return file path if project is an open file |
|
347 |
def GetFilePath(self): |
|
348 |
return self.FilePath |
|
349 |
||
350 |
# Return file path if project is an open file |
|
351 |
def GetProgramFilePath(self): |
|
352 |
return self.ProgramFilePath |
|
353 |
||
354 |
# Return file name and point out if file is up to date |
|
355 |
def GetFilename(self): |
|
356 |
if self.Project is not None: |
|
357 |
if self.ProjectIsSaved(): |
|
358 |
return self.FileName |
|
359 |
else: |
|
360 |
return "~%s~"%self.FileName |
|
361 |
return "" |
|
362 |
||
363 |
# Change file path and save file name or create a default one if file path not defined |
|
364 |
def SetFilePath(self, filepath): |
|
365 |
self.FilePath = filepath |
|
366 |
if filepath == "": |
|
367 |
self.LastNewIndex += 1 |
|
368 |
self.FileName = _("Unnamed%d")%self.LastNewIndex |
|
369 |
else: |
|
370 |
self.FileName = os.path.splitext(os.path.basename(filepath))[0] |
|
371 |
||
372 |
# Change project properties |
|
373 |
def SetProjectProperties(self, name = None, properties = None, buffer = True): |
|
374 |
if self.Project is not None: |
|
375 |
if name is not None: |
|
376 |
self.Project.setname(name) |
|
377 |
if properties is not None: |
|
378 |
self.Project.setfileHeader(properties) |
|
379 |
self.Project.setcontentHeader(properties) |
|
380 |
if buffer and (name is not None or properties is not None): |
|
381 |
self.BufferProject() |
|
382 |
||
383 |
# Return project name |
|
384 |
def GetProjectName(self, debug=False): |
|
385 |
project = self.GetProject(debug) |
|
386 |
if project is not None: |
|
387 |
return project.getname() |
|
388 |
return None |
|
389 |
||
390 |
# Return project properties |
|
391 |
def GetProjectProperties(self, debug = False): |
|
392 |
project = self.GetProject(debug) |
|
393 |
if project is not None: |
|
394 |
properties = project.getfileHeader() |
|
395 |
properties.update(project.getcontentHeader()) |
|
396 |
return properties |
|
397 |
return None |
|
398 |
||
399 |
# Return project informations |
|
400 |
def GetProjectInfos(self, debug = False): |
|
401 |
project = self.GetProject(debug) |
|
402 |
if project is not None: |
|
403 |
infos = {"name": project.getname(), "type": ITEM_PROJECT} |
|
404 |
datatypes = {"name": DATA_TYPES, "type": ITEM_DATATYPES, "values":[]} |
|
405 |
for datatype in project.getdataTypes(): |
|
406 |
datatypes["values"].append({"name": datatype.getname(), "type": ITEM_DATATYPE, |
|
407 |
"tagname": self.ComputeDataTypeName(datatype.getname()), "values": []}) |
|
408 |
pou_types = {"function": {"name": FUNCTIONS, "type": ITEM_FUNCTION, "values":[]}, |
|
409 |
"functionBlock": {"name": FUNCTION_BLOCKS, "type": ITEM_FUNCTIONBLOCK, "values":[]}, |
|
410 |
"program": {"name": PROGRAMS, "type": ITEM_PROGRAM, "values":[]}} |
|
411 |
for pou in project.getpous(): |
|
412 |
pou_type = pou.getpouType() |
|
413 |
pou_infos = {"name": pou.getname(), "type": ITEM_POU, |
|
414 |
"tagname": self.ComputePouName(pou.getname())} |
|
415 |
pou_values = [] |
|
416 |
if pou.getbodyType() == "SFC": |
|
417 |
transitions = [] |
|
418 |
for transition in pou.gettransitionList(): |
|
419 |
transitions.append({"name": transition.getname(), "type": ITEM_TRANSITION, |
|
420 |
"tagname": self.ComputePouTransitionName(pou.getname(), transition.getname()), |
|
421 |
"values": []}) |
|
422 |
pou_values.append({"name": TRANSITIONS, "type": ITEM_TRANSITIONS, "values": transitions}) |
|
423 |
actions = [] |
|
424 |
for action in pou.getactionList(): |
|
425 |
actions.append({"name": action.getname(), "type": ITEM_ACTION, |
|
426 |
"tagname": self.ComputePouActionName(pou.getname(), action.getname()), |
|
427 |
"values": []}) |
|
428 |
pou_values.append({"name": ACTIONS, "type": ITEM_ACTIONS, "values": actions}) |
|
429 |
if pou_type in pou_types: |
|
430 |
pou_infos["values"] = pou_values |
|
431 |
pou_types[pou_type]["values"].append(pou_infos) |
|
432 |
configurations = {"name": CONFIGURATIONS, "type": ITEM_CONFIGURATIONS, "values": []} |
|
433 |
for config in project.getconfigurations(): |
|
434 |
config_name = config.getname() |
|
435 |
config_infos = {"name": config_name, "type": ITEM_CONFIGURATION, |
|
436 |
"tagname": self.ComputeConfigurationName(config.getname()), |
|
437 |
"values": []} |
|
438 |
resources = {"name": RESOURCES, "type": ITEM_RESOURCES, "values": []} |
|
439 |
for resource in config.getresource(): |
|
440 |
resource_name = resource.getname() |
|
441 |
resource_infos = {"name": resource_name, "type": ITEM_RESOURCE, |
|
442 |
"tagname": self.ComputeConfigurationResourceName(config.getname(), resource.getname()), |
|
443 |
"values": []} |
|
444 |
resources["values"].append(resource_infos) |
|
445 |
config_infos["values"] = [resources] |
|
446 |
configurations["values"].append(config_infos) |
|
447 |
infos["values"] = [datatypes, pou_types["function"], pou_types["functionBlock"], |
|
448 |
pou_types["program"], configurations] |
|
449 |
return infos |
|
450 |
return None |
|
451 |
||
452 |
def GetPouVariableInfos(self, project, variable, var_class, debug=False): |
|
453 |
vartype_content = variable.gettype().getcontent() |
|
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
454 |
vartype_content_type = vartype_content.getLocalTag() |
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
455 |
if vartype_content_type == "derived": |
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
456 |
var_type = vartype_content.getname() |
814 | 457 |
pou_type = None |
458 |
pou = project.getpou(var_type) |
|
459 |
if pou is not None: |
|
460 |
pou_type = pou.getpouType() |
|
461 |
edit = debug = pou_type is not None |
|
462 |
if pou_type is None: |
|
463 |
block_infos = self.GetBlockType(var_type, debug = debug) |
|
464 |
if block_infos is not None: |
|
465 |
pou_type = block_infos["type"] |
|
466 |
if pou_type is not None: |
|
467 |
var_class = None |
|
468 |
if pou_type == "program": |
|
469 |
var_class = ITEM_PROGRAM |
|
470 |
elif pou_type != "function": |
|
471 |
var_class = ITEM_FUNCTIONBLOCK |
|
472 |
if var_class is not None: |
|
473 |
return {"name": variable.getname(), |
|
474 |
"type": var_type, |
|
475 |
"class": var_class, |
|
476 |
"edit": edit, |
|
477 |
"debug": debug} |
|
478 |
elif var_type in self.GetDataTypes(debug = debug): |
|
479 |
return {"name": variable.getname(), |
|
480 |
"type": var_type, |
|
481 |
"class": var_class, |
|
482 |
"edit": False, |
|
483 |
"debug": False} |
|
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
484 |
elif vartype_content_type in ["string", "wstring"]: |
814 | 485 |
return {"name": variable.getname(), |
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
486 |
"type": vartype_content_type.upper(), |
814 | 487 |
"class": var_class, |
488 |
"edit": False, |
|
489 |
"debug": True} |
|
490 |
else: |
|
491 |
return {"name": variable.getname(), |
|
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
492 |
"type": vartype_content_type, |
814 | 493 |
"class": var_class, |
494 |
"edit": False, |
|
495 |
"debug": True} |
|
496 |
return None |
|
497 |
||
498 |
def GetPouVariables(self, tagname, debug = False): |
|
499 |
vars = [] |
|
500 |
pou_type = None |
|
501 |
project = self.GetProject(debug) |
|
502 |
if project is not None: |
|
503 |
words = tagname.split("::") |
|
504 |
if words[0] == "P": |
|
505 |
pou = project.getpou(words[1]) |
|
506 |
if pou is not None: |
|
507 |
pou_type = pou.getpouType() |
|
508 |
if (pou_type in ["program", "functionBlock"] and |
|
509 |
pou.interface is not None): |
|
510 |
# Extract variables from every varLists |
|
511 |
for varlist_type, varlist in pou.getvars(): |
|
512 |
var_infos = VAR_CLASS_INFOS.get(varlist_type, None) |
|
513 |
if var_infos is not None: |
|
514 |
var_class = var_infos[1] |
|
515 |
else: |
|
516 |
var_class = ITEM_VAR_LOCAL |
|
517 |
for variable in varlist.getvariable(): |
|
518 |
var_infos = self.GetPouVariableInfos(project, variable, var_class, debug) |
|
519 |
if var_infos is not None: |
|
520 |
vars.append(var_infos) |
|
826
098f822ef308
Adding transition and action in list of instances of SFC POU in PouInstanceVariablesPanel
laurent
parents:
823
diff
changeset
|
521 |
if pou.getbodyType() == "SFC": |
098f822ef308
Adding transition and action in list of instances of SFC POU in PouInstanceVariablesPanel
laurent
parents:
823
diff
changeset
|
522 |
for transition in pou.gettransitionList(): |
098f822ef308
Adding transition and action in list of instances of SFC POU in PouInstanceVariablesPanel
laurent
parents:
823
diff
changeset
|
523 |
vars.append({ |
098f822ef308
Adding transition and action in list of instances of SFC POU in PouInstanceVariablesPanel
laurent
parents:
823
diff
changeset
|
524 |
"name": transition.getname(), |
098f822ef308
Adding transition and action in list of instances of SFC POU in PouInstanceVariablesPanel
laurent
parents:
823
diff
changeset
|
525 |
"type": None, |
098f822ef308
Adding transition and action in list of instances of SFC POU in PouInstanceVariablesPanel
laurent
parents:
823
diff
changeset
|
526 |
"class": ITEM_TRANSITION, |
098f822ef308
Adding transition and action in list of instances of SFC POU in PouInstanceVariablesPanel
laurent
parents:
823
diff
changeset
|
527 |
"edit": True, |
098f822ef308
Adding transition and action in list of instances of SFC POU in PouInstanceVariablesPanel
laurent
parents:
823
diff
changeset
|
528 |
"debug": True}) |
098f822ef308
Adding transition and action in list of instances of SFC POU in PouInstanceVariablesPanel
laurent
parents:
823
diff
changeset
|
529 |
for action in pou.getactionList(): |
098f822ef308
Adding transition and action in list of instances of SFC POU in PouInstanceVariablesPanel
laurent
parents:
823
diff
changeset
|
530 |
vars.append({ |
098f822ef308
Adding transition and action in list of instances of SFC POU in PouInstanceVariablesPanel
laurent
parents:
823
diff
changeset
|
531 |
"name": action.getname(), |
098f822ef308
Adding transition and action in list of instances of SFC POU in PouInstanceVariablesPanel
laurent
parents:
823
diff
changeset
|
532 |
"type": None, |
098f822ef308
Adding transition and action in list of instances of SFC POU in PouInstanceVariablesPanel
laurent
parents:
823
diff
changeset
|
533 |
"class": ITEM_ACTION, |
098f822ef308
Adding transition and action in list of instances of SFC POU in PouInstanceVariablesPanel
laurent
parents:
823
diff
changeset
|
534 |
"edit": True, |
098f822ef308
Adding transition and action in list of instances of SFC POU in PouInstanceVariablesPanel
laurent
parents:
823
diff
changeset
|
535 |
"debug": True}) |
814 | 536 |
return {"class": POU_TYPES[pou_type], |
537 |
"type": words[1], |
|
538 |
"variables": vars, |
|
539 |
"edit": True, |
|
540 |
"debug": True} |
|
541 |
else: |
|
542 |
block_infos = self.GetBlockType(words[1], debug = debug) |
|
543 |
if (block_infos is not None and |
|
544 |
block_infos["type"] in ["program", "functionBlock"]): |
|
545 |
for varname, vartype, varmodifier in block_infos["inputs"]: |
|
546 |
vars.append({"name" : varname, |
|
547 |
"type" : vartype, |
|
548 |
"class" : ITEM_VAR_INPUT, |
|
549 |
"edit": False, |
|
550 |
"debug": True}) |
|
551 |
for varname, vartype, varmodifier in block_infos["outputs"]: |
|
552 |
vars.append({"name" : varname, |
|
553 |
"type" : vartype, |
|
554 |
"class" : ITEM_VAR_OUTPUT, |
|
555 |
"edit": False, |
|
556 |
"debug": True}) |
|
557 |
return {"class": POU_TYPES[block_infos["type"]], |
|
558 |
"type": None, |
|
559 |
"variables": vars, |
|
560 |
"edit": False, |
|
561 |
"debug": False} |
|
826
098f822ef308
Adding transition and action in list of instances of SFC POU in PouInstanceVariablesPanel
laurent
parents:
823
diff
changeset
|
562 |
elif words[0] in ['A', 'T']: |
098f822ef308
Adding transition and action in list of instances of SFC POU in PouInstanceVariablesPanel
laurent
parents:
823
diff
changeset
|
563 |
pou_vars = self.GetPouVariables(self.ComputePouName(words[1]), debug) |
098f822ef308
Adding transition and action in list of instances of SFC POU in PouInstanceVariablesPanel
laurent
parents:
823
diff
changeset
|
564 |
if pou_vars is not None: |
098f822ef308
Adding transition and action in list of instances of SFC POU in PouInstanceVariablesPanel
laurent
parents:
823
diff
changeset
|
565 |
if words[0] == 'A': |
098f822ef308
Adding transition and action in list of instances of SFC POU in PouInstanceVariablesPanel
laurent
parents:
823
diff
changeset
|
566 |
element_type = ITEM_ACTION |
098f822ef308
Adding transition and action in list of instances of SFC POU in PouInstanceVariablesPanel
laurent
parents:
823
diff
changeset
|
567 |
elif words[0] == 'T': |
098f822ef308
Adding transition and action in list of instances of SFC POU in PouInstanceVariablesPanel
laurent
parents:
823
diff
changeset
|
568 |
element_type = ITEM_TRANSITION |
098f822ef308
Adding transition and action in list of instances of SFC POU in PouInstanceVariablesPanel
laurent
parents:
823
diff
changeset
|
569 |
return {"class": element_type, |
098f822ef308
Adding transition and action in list of instances of SFC POU in PouInstanceVariablesPanel
laurent
parents:
823
diff
changeset
|
570 |
"type": None, |
098f822ef308
Adding transition and action in list of instances of SFC POU in PouInstanceVariablesPanel
laurent
parents:
823
diff
changeset
|
571 |
"variables": [var for var in pou_vars["variables"] |
098f822ef308
Adding transition and action in list of instances of SFC POU in PouInstanceVariablesPanel
laurent
parents:
823
diff
changeset
|
572 |
if var["class"] not in [ITEM_ACTION, ITEM_TRANSITION]], |
098f822ef308
Adding transition and action in list of instances of SFC POU in PouInstanceVariablesPanel
laurent
parents:
823
diff
changeset
|
573 |
"edit": True, |
098f822ef308
Adding transition and action in list of instances of SFC POU in PouInstanceVariablesPanel
laurent
parents:
823
diff
changeset
|
574 |
"debug": True} |
814 | 575 |
elif words[0] in ['C', 'R']: |
576 |
if words[0] == 'C': |
|
577 |
element_type = ITEM_CONFIGURATION |
|
578 |
element = project.getconfiguration(words[1]) |
|
579 |
if element is not None: |
|
580 |
for resource in element.getresource(): |
|
581 |
vars.append({"name": resource.getname(), |
|
582 |
"type": None, |
|
583 |
"class": ITEM_RESOURCE, |
|
584 |
"edit": True, |
|
585 |
"debug": False}) |
|
586 |
elif words[0] == 'R': |
|
587 |
element_type = ITEM_RESOURCE |
|
588 |
element = project.getconfigurationResource(words[1], words[2]) |
|
589 |
if element is not None: |
|
590 |
for task in element.gettask(): |
|
591 |
for pou in task.getpouInstance(): |
|
592 |
vars.append({"name": pou.getname(), |
|
593 |
"type": pou.gettypeName(), |
|
594 |
"class": ITEM_PROGRAM, |
|
595 |
"edit": True, |
|
596 |
"debug": True}) |
|
597 |
for pou in element.getpouInstance(): |
|
598 |
vars.append({"name": pou.getname(), |
|
599 |
"type": pou.gettypeName(), |
|
600 |
"class": ITEM_PROGRAM, |
|
601 |
"edit": True, |
|
602 |
"debug": True}) |
|
603 |
if element is not None: |
|
604 |
for varlist in element.getglobalVars(): |
|
605 |
for variable in varlist.getvariable(): |
|
606 |
var_infos = self.GetPouVariableInfos(project, variable, ITEM_VAR_GLOBAL, debug) |
|
607 |
if var_infos is not None: |
|
608 |
vars.append(var_infos) |
|
609 |
return {"class": element_type, |
|
610 |
"type": None, |
|
611 |
"variables": vars, |
|
612 |
"edit": True, |
|
613 |
"debug": False} |
|
614 |
return None |
|
615 |
||
616 |
def RecursiveSearchPouInstances(self, project, pou_type, parent_path, varlists, debug = False): |
|
617 |
instances = [] |
|
618 |
for varlist in varlists: |
|
619 |
for variable in varlist.getvariable(): |
|
620 |
vartype_content = variable.gettype().getcontent() |
|
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
621 |
if vartype_content.getLocalTag() == "derived": |
814 | 622 |
var_path = "%s.%s" % (parent_path, variable.getname()) |
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
623 |
var_type = vartype_content.getname() |
814 | 624 |
if var_type == pou_type: |
625 |
instances.append(var_path) |
|
626 |
else: |
|
627 |
pou = project.getpou(var_type) |
|
1302
7856cd7767d6
Removed dictionaries storing datatypes and pous defined in project and pou and datatype using tree from model
Laurent Bessard
parents:
1301
diff
changeset
|
628 |
if pou is not None:# and project.ElementIsUsedBy(pou_type, var_type): |
814 | 629 |
instances.extend( |
630 |
self.RecursiveSearchPouInstances( |
|
631 |
project, pou_type, var_path, |
|
632 |
[varlist for type, varlist in pou.getvars()], |
|
633 |
debug)) |
|
634 |
return instances |
|
635 |
||
636 |
def SearchPouInstances(self, tagname, debug = False): |
|
637 |
project = self.GetProject(debug) |
|
638 |
if project is not None: |
|
639 |
words = tagname.split("::") |
|
640 |
if words[0] == "P": |
|
641 |
instances = [] |
|
642 |
for config in project.getconfigurations(): |
|
643 |
config_name = config.getname() |
|
644 |
instances.extend( |
|
645 |
self.RecursiveSearchPouInstances( |
|
646 |
project, words[1], config_name, |
|
647 |
config.getglobalVars(), debug)) |
|
648 |
for resource in config.getresource(): |
|
649 |
res_path = "%s.%s" % (config_name, resource.getname()) |
|
650 |
instances.extend( |
|
651 |
self.RecursiveSearchPouInstances( |
|
652 |
project, words[1], res_path, |
|
653 |
resource.getglobalVars(), debug)) |
|
654 |
pou_instances = resource.getpouInstance()[:] |
|
655 |
for task in resource.gettask(): |
|
656 |
pou_instances.extend(task.getpouInstance()) |
|
657 |
for pou_instance in pou_instances: |
|
658 |
pou_path = "%s.%s" % (res_path, pou_instance.getname()) |
|
659 |
pou_type = pou_instance.gettypeName() |
|
660 |
if pou_type == words[1]: |
|
661 |
instances.append(pou_path) |
|
662 |
pou = project.getpou(pou_type) |
|
1302
7856cd7767d6
Removed dictionaries storing datatypes and pous defined in project and pou and datatype using tree from model
Laurent Bessard
parents:
1301
diff
changeset
|
663 |
if pou is not None:# and project.ElementIsUsedBy(words[1], pou_type): |
814 | 664 |
instances.extend( |
665 |
self.RecursiveSearchPouInstances( |
|
666 |
project, words[1], pou_path, |
|
667 |
[varlist for type, varlist in pou.getvars()], |
|
668 |
debug)) |
|
669 |
return instances |
|
670 |
elif words[0] == 'C': |
|
671 |
return [words[1]] |
|
672 |
elif words[0] == 'R': |
|
673 |
return ["%s.%s" % (words[1], words[2])] |
|
826
098f822ef308
Adding transition and action in list of instances of SFC POU in PouInstanceVariablesPanel
laurent
parents:
823
diff
changeset
|
674 |
elif words[0] in ['T', 'A']: |
098f822ef308
Adding transition and action in list of instances of SFC POU in PouInstanceVariablesPanel
laurent
parents:
823
diff
changeset
|
675 |
return ["%s.%s" % (instance, words[2]) |
098f822ef308
Adding transition and action in list of instances of SFC POU in PouInstanceVariablesPanel
laurent
parents:
823
diff
changeset
|
676 |
for instance in self.SearchPouInstances( |
098f822ef308
Adding transition and action in list of instances of SFC POU in PouInstanceVariablesPanel
laurent
parents:
823
diff
changeset
|
677 |
self.ComputePouName(words[1]), debug)] |
814 | 678 |
return [] |
679 |
||
886
ace92afe9100
Fix bug debug variables from standard and library function blocks unregistered when transferring program
Laurent Bessard
parents:
884
diff
changeset
|
680 |
def RecursiveGetPouInstanceTagName(self, project, pou_type, parts, debug = False): |
814 | 681 |
pou = project.getpou(pou_type) |
682 |
if pou is not None: |
|
683 |
if len(parts) == 0: |
|
684 |
return self.ComputePouName(pou_type) |
|
685 |
||
686 |
for varlist_type, varlist in pou.getvars(): |
|
687 |
for variable in varlist.getvariable(): |
|
827
a2ce084fb598
Fix restore project tab layout with transition and action debug tabs
laurent
parents:
826
diff
changeset
|
688 |
if variable.getname() == parts[0]: |
a2ce084fb598
Fix restore project tab layout with transition and action debug tabs
laurent
parents:
826
diff
changeset
|
689 |
vartype_content = variable.gettype().getcontent() |
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
690 |
if vartype_content.getLocalTag() == "derived": |
827
a2ce084fb598
Fix restore project tab layout with transition and action debug tabs
laurent
parents:
826
diff
changeset
|
691 |
return self.RecursiveGetPouInstanceTagName( |
a2ce084fb598
Fix restore project tab layout with transition and action debug tabs
laurent
parents:
826
diff
changeset
|
692 |
project, |
a2ce084fb598
Fix restore project tab layout with transition and action debug tabs
laurent
parents:
826
diff
changeset
|
693 |
vartype_content["value"].getname(), |
886
ace92afe9100
Fix bug debug variables from standard and library function blocks unregistered when transferring program
Laurent Bessard
parents:
884
diff
changeset
|
694 |
parts[1:], debug) |
827
a2ce084fb598
Fix restore project tab layout with transition and action debug tabs
laurent
parents:
826
diff
changeset
|
695 |
|
a2ce084fb598
Fix restore project tab layout with transition and action debug tabs
laurent
parents:
826
diff
changeset
|
696 |
if pou.getbodyType() == "SFC" and len(parts) == 1: |
a2ce084fb598
Fix restore project tab layout with transition and action debug tabs
laurent
parents:
826
diff
changeset
|
697 |
for action in pou.getactionList(): |
a2ce084fb598
Fix restore project tab layout with transition and action debug tabs
laurent
parents:
826
diff
changeset
|
698 |
if action.getname() == parts[0]: |
a2ce084fb598
Fix restore project tab layout with transition and action debug tabs
laurent
parents:
826
diff
changeset
|
699 |
return self.ComputePouActionName(pou_type, parts[0]) |
a2ce084fb598
Fix restore project tab layout with transition and action debug tabs
laurent
parents:
826
diff
changeset
|
700 |
for transition in pou.gettransitionList(): |
a2ce084fb598
Fix restore project tab layout with transition and action debug tabs
laurent
parents:
826
diff
changeset
|
701 |
if transition.getname() == parts[0]: |
a2ce084fb598
Fix restore project tab layout with transition and action debug tabs
laurent
parents:
826
diff
changeset
|
702 |
return self.ComputePouTransitionName(pou_type, parts[0]) |
886
ace92afe9100
Fix bug debug variables from standard and library function blocks unregistered when transferring program
Laurent Bessard
parents:
884
diff
changeset
|
703 |
else: |
ace92afe9100
Fix bug debug variables from standard and library function blocks unregistered when transferring program
Laurent Bessard
parents:
884
diff
changeset
|
704 |
block_infos = self.GetBlockType(pou_type, debug=debug) |
ace92afe9100
Fix bug debug variables from standard and library function blocks unregistered when transferring program
Laurent Bessard
parents:
884
diff
changeset
|
705 |
if (block_infos is not None and |
ace92afe9100
Fix bug debug variables from standard and library function blocks unregistered when transferring program
Laurent Bessard
parents:
884
diff
changeset
|
706 |
block_infos["type"] in ["program", "functionBlock"]): |
ace92afe9100
Fix bug debug variables from standard and library function blocks unregistered when transferring program
Laurent Bessard
parents:
884
diff
changeset
|
707 |
|
ace92afe9100
Fix bug debug variables from standard and library function blocks unregistered when transferring program
Laurent Bessard
parents:
884
diff
changeset
|
708 |
if len(parts) == 0: |
ace92afe9100
Fix bug debug variables from standard and library function blocks unregistered when transferring program
Laurent Bessard
parents:
884
diff
changeset
|
709 |
return self.ComputePouName(pou_type) |
ace92afe9100
Fix bug debug variables from standard and library function blocks unregistered when transferring program
Laurent Bessard
parents:
884
diff
changeset
|
710 |
|
ace92afe9100
Fix bug debug variables from standard and library function blocks unregistered when transferring program
Laurent Bessard
parents:
884
diff
changeset
|
711 |
for varname, vartype, varmodifier in block_infos["inputs"] + block_infos["outputs"]: |
ace92afe9100
Fix bug debug variables from standard and library function blocks unregistered when transferring program
Laurent Bessard
parents:
884
diff
changeset
|
712 |
if varname == parts[0]: |
ace92afe9100
Fix bug debug variables from standard and library function blocks unregistered when transferring program
Laurent Bessard
parents:
884
diff
changeset
|
713 |
return self.RecursiveGetPouInstanceTagName(project, vartype, parts[1:], debug) |
814 | 714 |
return None |
715 |
||
1254
ebc765355536
Fixed bug when trying to add a global function block instance variable to debug variable panel and not connected
Laurent Bessard
parents:
1223
diff
changeset
|
716 |
def GetGlobalInstanceTagName(self, project, element, parts, debug = False): |
ebc765355536
Fixed bug when trying to add a global function block instance variable to debug variable panel and not connected
Laurent Bessard
parents:
1223
diff
changeset
|
717 |
for varlist in element.getglobalVars(): |
ebc765355536
Fixed bug when trying to add a global function block instance variable to debug variable panel and not connected
Laurent Bessard
parents:
1223
diff
changeset
|
718 |
for variable in varlist.getvariable(): |
ebc765355536
Fixed bug when trying to add a global function block instance variable to debug variable panel and not connected
Laurent Bessard
parents:
1223
diff
changeset
|
719 |
if variable.getname() == parts[0]: |
ebc765355536
Fixed bug when trying to add a global function block instance variable to debug variable panel and not connected
Laurent Bessard
parents:
1223
diff
changeset
|
720 |
vartype_content = variable.gettype().getcontent() |
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
721 |
if vartype_content.getLocalTag() == "derived": |
1254
ebc765355536
Fixed bug when trying to add a global function block instance variable to debug variable panel and not connected
Laurent Bessard
parents:
1223
diff
changeset
|
722 |
if len(parts) == 1: |
ebc765355536
Fixed bug when trying to add a global function block instance variable to debug variable panel and not connected
Laurent Bessard
parents:
1223
diff
changeset
|
723 |
return self.ComputePouName( |
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
724 |
vartype_content.getname()) |
1254
ebc765355536
Fixed bug when trying to add a global function block instance variable to debug variable panel and not connected
Laurent Bessard
parents:
1223
diff
changeset
|
725 |
else: |
ebc765355536
Fixed bug when trying to add a global function block instance variable to debug variable panel and not connected
Laurent Bessard
parents:
1223
diff
changeset
|
726 |
return self.RecursiveGetPouInstanceTagName( |
ebc765355536
Fixed bug when trying to add a global function block instance variable to debug variable panel and not connected
Laurent Bessard
parents:
1223
diff
changeset
|
727 |
project, |
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
728 |
vartype_content.getname(), |
1254
ebc765355536
Fixed bug when trying to add a global function block instance variable to debug variable panel and not connected
Laurent Bessard
parents:
1223
diff
changeset
|
729 |
parts[1:], debug) |
ebc765355536
Fixed bug when trying to add a global function block instance variable to debug variable panel and not connected
Laurent Bessard
parents:
1223
diff
changeset
|
730 |
return None |
ebc765355536
Fixed bug when trying to add a global function block instance variable to debug variable panel and not connected
Laurent Bessard
parents:
1223
diff
changeset
|
731 |
|
814 | 732 |
def GetPouInstanceTagName(self, instance_path, debug = False): |
1254
ebc765355536
Fixed bug when trying to add a global function block instance variable to debug variable panel and not connected
Laurent Bessard
parents:
1223
diff
changeset
|
733 |
project = self.GetProject(debug) |
814 | 734 |
parts = instance_path.split(".") |
735 |
if len(parts) == 1: |
|
736 |
return self.ComputeConfigurationName(parts[0]) |
|
737 |
elif len(parts) == 2: |
|
1254
ebc765355536
Fixed bug when trying to add a global function block instance variable to debug variable panel and not connected
Laurent Bessard
parents:
1223
diff
changeset
|
738 |
for config in project.getconfigurations(): |
ebc765355536
Fixed bug when trying to add a global function block instance variable to debug variable panel and not connected
Laurent Bessard
parents:
1223
diff
changeset
|
739 |
if config.getname() == parts[0]: |
ebc765355536
Fixed bug when trying to add a global function block instance variable to debug variable panel and not connected
Laurent Bessard
parents:
1223
diff
changeset
|
740 |
result = self.GetGlobalInstanceTagName(project, |
ebc765355536
Fixed bug when trying to add a global function block instance variable to debug variable panel and not connected
Laurent Bessard
parents:
1223
diff
changeset
|
741 |
config, |
ebc765355536
Fixed bug when trying to add a global function block instance variable to debug variable panel and not connected
Laurent Bessard
parents:
1223
diff
changeset
|
742 |
parts[1:], |
ebc765355536
Fixed bug when trying to add a global function block instance variable to debug variable panel and not connected
Laurent Bessard
parents:
1223
diff
changeset
|
743 |
debug) |
ebc765355536
Fixed bug when trying to add a global function block instance variable to debug variable panel and not connected
Laurent Bessard
parents:
1223
diff
changeset
|
744 |
if result is not None: |
ebc765355536
Fixed bug when trying to add a global function block instance variable to debug variable panel and not connected
Laurent Bessard
parents:
1223
diff
changeset
|
745 |
return result |
814 | 746 |
return self.ComputeConfigurationResourceName(parts[0], parts[1]) |
747 |
else: |
|
748 |
for config in project.getconfigurations(): |
|
749 |
if config.getname() == parts[0]: |
|
750 |
for resource in config.getresource(): |
|
751 |
if resource.getname() == parts[1]: |
|
752 |
pou_instances = resource.getpouInstance()[:] |
|
753 |
for task in resource.gettask(): |
|
754 |
pou_instances.extend(task.getpouInstance()) |
|
755 |
for pou_instance in pou_instances: |
|
756 |
if pou_instance.getname() == parts[2]: |
|
757 |
if len(parts) == 3: |
|
758 |
return self.ComputePouName( |
|
759 |
pou_instance.gettypeName()) |
|
760 |
else: |
|
761 |
return self.RecursiveGetPouInstanceTagName( |
|
762 |
project, |
|
763 |
pou_instance.gettypeName(), |
|
886
ace92afe9100
Fix bug debug variables from standard and library function blocks unregistered when transferring program
Laurent Bessard
parents:
884
diff
changeset
|
764 |
parts[3:], debug) |
1254
ebc765355536
Fixed bug when trying to add a global function block instance variable to debug variable panel and not connected
Laurent Bessard
parents:
1223
diff
changeset
|
765 |
return self.GetGlobalInstanceTagName(project, |
ebc765355536
Fixed bug when trying to add a global function block instance variable to debug variable panel and not connected
Laurent Bessard
parents:
1223
diff
changeset
|
766 |
resource, |
ebc765355536
Fixed bug when trying to add a global function block instance variable to debug variable panel and not connected
Laurent Bessard
parents:
1223
diff
changeset
|
767 |
parts[2:], |
ebc765355536
Fixed bug when trying to add a global function block instance variable to debug variable panel and not connected
Laurent Bessard
parents:
1223
diff
changeset
|
768 |
debug) |
ebc765355536
Fixed bug when trying to add a global function block instance variable to debug variable panel and not connected
Laurent Bessard
parents:
1223
diff
changeset
|
769 |
return self.GetGlobalInstanceTagName(project, |
ebc765355536
Fixed bug when trying to add a global function block instance variable to debug variable panel and not connected
Laurent Bessard
parents:
1223
diff
changeset
|
770 |
config, |
ebc765355536
Fixed bug when trying to add a global function block instance variable to debug variable panel and not connected
Laurent Bessard
parents:
1223
diff
changeset
|
771 |
parts[1:], |
ebc765355536
Fixed bug when trying to add a global function block instance variable to debug variable panel and not connected
Laurent Bessard
parents:
1223
diff
changeset
|
772 |
debug) |
814 | 773 |
return None |
774 |
||
775 |
def GetInstanceInfos(self, instance_path, debug = False): |
|
776 |
tagname = self.GetPouInstanceTagName(instance_path) |
|
777 |
if tagname is not None: |
|
827
a2ce084fb598
Fix restore project tab layout with transition and action debug tabs
laurent
parents:
826
diff
changeset
|
778 |
infos = self.GetPouVariables(tagname, debug) |
a2ce084fb598
Fix restore project tab layout with transition and action debug tabs
laurent
parents:
826
diff
changeset
|
779 |
infos["type"] = tagname |
a2ce084fb598
Fix restore project tab layout with transition and action debug tabs
laurent
parents:
826
diff
changeset
|
780 |
return infos |
814 | 781 |
else: |
782 |
pou_path, var_name = instance_path.rsplit(".", 1) |
|
783 |
tagname = self.GetPouInstanceTagName(pou_path) |
|
784 |
if tagname is not None: |
|
785 |
pou_infos = self.GetPouVariables(tagname, debug) |
|
786 |
for var_infos in pou_infos["variables"]: |
|
787 |
if var_infos["name"] == var_name: |
|
788 |
return var_infos |
|
789 |
return None |
|
790 |
||
791 |
# Return if data type given by name is used by another data type or pou |
|
792 |
def DataTypeIsUsed(self, name, debug = False): |
|
1302
7856cd7767d6
Removed dictionaries storing datatypes and pous defined in project and pou and datatype using tree from model
Laurent Bessard
parents:
1301
diff
changeset
|
793 |
#project = self.GetProject(debug) |
7856cd7767d6
Removed dictionaries storing datatypes and pous defined in project and pou and datatype using tree from model
Laurent Bessard
parents:
1301
diff
changeset
|
794 |
#if project is not None: |
7856cd7767d6
Removed dictionaries storing datatypes and pous defined in project and pou and datatype using tree from model
Laurent Bessard
parents:
1301
diff
changeset
|
795 |
# return project.ElementIsUsed(name) |
814 | 796 |
return False |
797 |
||
798 |
# Return if pou given by name is used by another pou |
|
799 |
def PouIsUsed(self, name, debug = False): |
|
1302
7856cd7767d6
Removed dictionaries storing datatypes and pous defined in project and pou and datatype using tree from model
Laurent Bessard
parents:
1301
diff
changeset
|
800 |
#project = self.GetProject(debug) |
7856cd7767d6
Removed dictionaries storing datatypes and pous defined in project and pou and datatype using tree from model
Laurent Bessard
parents:
1301
diff
changeset
|
801 |
#if project is not None: |
7856cd7767d6
Removed dictionaries storing datatypes and pous defined in project and pou and datatype using tree from model
Laurent Bessard
parents:
1301
diff
changeset
|
802 |
# return project.ElementIsUsed(name) |
814 | 803 |
return False |
804 |
||
805 |
# Return if pou given by name is directly or undirectly used by the reference pou |
|
806 |
def PouIsUsedBy(self, name, reference, debug = False): |
|
1302
7856cd7767d6
Removed dictionaries storing datatypes and pous defined in project and pou and datatype using tree from model
Laurent Bessard
parents:
1301
diff
changeset
|
807 |
#project = self.GetProject(debug) |
7856cd7767d6
Removed dictionaries storing datatypes and pous defined in project and pou and datatype using tree from model
Laurent Bessard
parents:
1301
diff
changeset
|
808 |
#if project is not None: |
7856cd7767d6
Removed dictionaries storing datatypes and pous defined in project and pou and datatype using tree from model
Laurent Bessard
parents:
1301
diff
changeset
|
809 |
# return project.ElementIsUsedBy(name, reference) |
814 | 810 |
return False |
811 |
||
812 |
def GenerateProgram(self, filepath=None): |
|
813 |
errors = [] |
|
814 |
warnings = [] |
|
815 |
if self.Project is not None: |
|
816 |
try: |
|
817 |
self.ProgramChunks = GenerateCurrentProgram(self, self.Project, errors, warnings) |
|
1299
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
818 |
self.NextCompiledProject = self.Copy(self.Project) |
901
ab43f3e40b9d
Fix bug when compiling project containing non-ascii characters
Laurent Bessard
parents:
887
diff
changeset
|
819 |
program_text = "".join([item[0] for item in self.ProgramChunks]) |
814 | 820 |
if filepath is not None: |
821 |
programfile = open(filepath, "w") |
|
822 |
programfile.write(program_text.encode("utf-8")) |
|
823 |
programfile.close() |
|
824 |
self.ProgramFilePath = filepath |
|
825 |
return program_text, errors, warnings |
|
826 |
except PLCGenException, e: |
|
827 |
errors.append(e.message) |
|
828 |
else: |
|
829 |
errors.append("No project opened") |
|
830 |
return "", errors, warnings |
|
831 |
||
832 |
def DebugAvailable(self): |
|
833 |
return self.CurrentCompiledProject is not None |
|
834 |
||
835 |
def ProgramTransferred(self): |
|
836 |
if self.NextCompiledProject is None: |
|
837 |
self.CurrentCompiledProject = self.NextCompiledProject |
|
838 |
else: |
|
839 |
self.CurrentCompiledProject = self.Copy(self.Project) |
|
840 |
||
841 |
def GetChunkInfos(self, from_location, to_location): |
|
842 |
row = self.ProgramOffset + 1 |
|
843 |
col = 1 |
|
844 |
infos = [] |
|
845 |
for chunk, chunk_infos in self.ProgramChunks: |
|
846 |
lines = chunk.split("\n") |
|
847 |
if len(lines) > 1: |
|
848 |
next_row = row + len(lines) - 1 |
|
849 |
next_col = len(lines[-1]) + 1 |
|
850 |
else: |
|
851 |
next_row = row |
|
852 |
next_col = col + len(chunk) |
|
853 |
if (next_row > from_location[0] or next_row == from_location[0] and next_col >= from_location[1]) and len(chunk_infos) > 0: |
|
854 |
infos.append((chunk_infos, (row, col))) |
|
855 |
if next_row == to_location[0] and next_col > to_location[1] or next_row > to_location[0]: |
|
856 |
return infos |
|
857 |
row, col = next_row, next_col |
|
858 |
return infos |
|
859 |
||
860 |
#------------------------------------------------------------------------------- |
|
861 |
# Project Pous management functions |
|
862 |
#------------------------------------------------------------------------------- |
|
863 |
||
864 |
# Add a Data Type to Project |
|
865 |
def ProjectAddDataType(self, datatype_name=None): |
|
866 |
if self.Project is not None: |
|
867 |
if datatype_name is None: |
|
868 |
datatype_name = self.GenerateNewName(None, None, "datatype%d") |
|
869 |
# Add the datatype to project |
|
870 |
self.Project.appenddataType(datatype_name) |
|
871 |
self.BufferProject() |
|
872 |
return self.ComputeDataTypeName(datatype_name) |
|
873 |
return None |
|
874 |
||
875 |
# Remove a Data Type from project |
|
876 |
def ProjectRemoveDataType(self, datatype_name): |
|
877 |
if self.Project is not None: |
|
878 |
self.Project.removedataType(datatype_name) |
|
879 |
self.BufferProject() |
|
880 |
||
881 |
# Add a Pou to Project |
|
882 |
def ProjectAddPou(self, pou_name, pou_type, body_type): |
|
883 |
if self.Project is not None: |
|
884 |
# Add the pou to project |
|
885 |
self.Project.appendpou(pou_name, pou_type, body_type) |
|
886 |
if pou_type == "function": |
|
887 |
self.SetPouInterfaceReturnType(pou_name, "BOOL") |
|
888 |
self.BufferProject() |
|
889 |
return self.ComputePouName(pou_name) |
|
890 |
return None |
|
891 |
||
892 |
def ProjectChangePouType(self, name, pou_type): |
|
893 |
if self.Project is not None: |
|
894 |
pou = self.Project.getpou(name) |
|
895 |
if pou is not None: |
|
896 |
pou.setpouType(pou_type) |
|
897 |
self.BufferProject() |
|
898 |
||
899 |
def GetPouXml(self, pou_name): |
|
900 |
if self.Project is not None: |
|
901 |
pou = self.Project.getpou(pou_name) |
|
902 |
if pou is not None: |
|
1299
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
903 |
return pou.tostring() |
814 | 904 |
return None |
905 |
||
906 |
def PastePou(self, pou_type, pou_xml): |
|
907 |
''' |
|
908 |
Adds the POU defined by 'pou_xml' to the current project with type 'pou_type' |
|
909 |
''' |
|
910 |
try: |
|
1299
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
911 |
new_pou = LoadPou(pou_xml) |
814 | 912 |
except: |
913 |
return _("Couldn't paste non-POU object.") |
|
1299
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
914 |
|
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
915 |
name = new_pou.getname() |
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
916 |
|
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
917 |
idx = 0 |
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
918 |
new_name = name |
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
919 |
while self.Project.getpou(new_name): |
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
920 |
# a POU with that name already exists. |
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
921 |
# make a new name and test if a POU with that name exists. |
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
922 |
# append an incrementing numeric suffix to the POU name. |
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
923 |
idx += 1 |
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
924 |
new_name = "%s%d" % (name, idx) |
814 | 925 |
|
1299
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
926 |
# we've found a name that does not already exist, use it |
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
927 |
new_pou.setname(new_name) |
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
928 |
|
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
929 |
if pou_type is not None: |
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
930 |
orig_type = new_pou.getpouType() |
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
931 |
|
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
932 |
# prevent violations of POU content restrictions: |
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
933 |
# function blocks cannot be pasted as functions, |
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
934 |
# programs cannot be pasted as functions or function blocks |
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
935 |
if orig_type == 'functionBlock' and pou_type == 'function' or \ |
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
936 |
orig_type == 'program' and pou_type in ['function', 'functionBlock']: |
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
937 |
return _('''%s "%s" can't be pasted as a %s.''') % (orig_type, name, pou_type) |
814 | 938 |
|
1299
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
939 |
new_pou.setpouType(pou_type) |
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
940 |
|
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
941 |
self.Project.insertpou(-1, new_pou) |
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
942 |
self.BufferProject() |
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
943 |
|
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
944 |
return self.ComputePouName(new_name), |
814 | 945 |
|
946 |
# Remove a Pou from project |
|
947 |
def ProjectRemovePou(self, pou_name): |
|
948 |
if self.Project is not None: |
|
949 |
self.Project.removepou(pou_name) |
|
950 |
self.BufferProject() |
|
951 |
||
952 |
# Return the name of the configuration if only one exist |
|
953 |
def GetProjectMainConfigurationName(self): |
|
954 |
if self.Project is not None: |
|
955 |
# Found the configuration corresponding to old name and change its name to new name |
|
956 |
configurations = self.Project.getconfigurations() |
|
957 |
if len(configurations) == 1: |
|
958 |
return configurations[0].getname() |
|
959 |
return None |
|
960 |
||
961 |
# Add a configuration to Project |
|
962 |
def ProjectAddConfiguration(self, config_name=None): |
|
963 |
if self.Project is not None: |
|
964 |
if config_name is None: |
|
965 |
config_name = self.GenerateNewName(None, None, "configuration%d") |
|
966 |
self.Project.addconfiguration(config_name) |
|
967 |
self.BufferProject() |
|
968 |
return self.ComputeConfigurationName(config_name) |
|
969 |
return None |
|
970 |
||
971 |
# Remove a configuration from project |
|
972 |
def ProjectRemoveConfiguration(self, config_name): |
|
973 |
if self.Project is not None: |
|
974 |
self.Project.removeconfiguration(config_name) |
|
975 |
self.BufferProject() |
|
976 |
||
977 |
# Add a resource to a configuration of the Project |
|
978 |
def ProjectAddConfigurationResource(self, config_name, resource_name=None): |
|
979 |
if self.Project is not None: |
|
980 |
if resource_name is None: |
|
981 |
resource_name = self.GenerateNewName(None, None, "resource%d") |
|
982 |
self.Project.addconfigurationResource(config_name, resource_name) |
|
983 |
self.BufferProject() |
|
984 |
return self.ComputeConfigurationResourceName(config_name, resource_name) |
|
985 |
return None |
|
986 |
||
987 |
# Remove a resource from a configuration of the project |
|
988 |
def ProjectRemoveConfigurationResource(self, config_name, resource_name): |
|
989 |
if self.Project is not None: |
|
990 |
self.Project.removeconfigurationResource(config_name, resource_name) |
|
991 |
self.BufferProject() |
|
992 |
||
993 |
# Add a Transition to a Project Pou |
|
994 |
def ProjectAddPouTransition(self, pou_name, transition_name, transition_type): |
|
995 |
if self.Project is not None: |
|
996 |
pou = self.Project.getpou(pou_name) |
|
997 |
if pou is not None: |
|
998 |
pou.addtransition(transition_name, transition_type) |
|
999 |
self.BufferProject() |
|
1000 |
return self.ComputePouTransitionName(pou_name, transition_name) |
|
1001 |
return None |
|
1002 |
||
1003 |
# Remove a Transition from a Project Pou |
|
1004 |
def ProjectRemovePouTransition(self, pou_name, transition_name): |
|
1005 |
# Search if the pou removed is currently opened |
|
1006 |
if self.Project is not None: |
|
1007 |
pou = self.Project.getpou(pou_name) |
|
1008 |
if pou is not None: |
|
1009 |
pou.removetransition(transition_name) |
|
1010 |
self.BufferProject() |
|
1011 |
||
1012 |
# Add an Action to a Project Pou |
|
1013 |
def ProjectAddPouAction(self, pou_name, action_name, action_type): |
|
1014 |
if self.Project is not None: |
|
1015 |
pou = self.Project.getpou(pou_name) |
|
1016 |
if pou is not None: |
|
1017 |
pou.addaction(action_name, action_type) |
|
1018 |
self.BufferProject() |
|
1019 |
return self.ComputePouActionName(pou_name, action_name) |
|
1020 |
return None |
|
1021 |
||
1022 |
# Remove an Action from a Project Pou |
|
1023 |
def ProjectRemovePouAction(self, pou_name, action_name): |
|
1024 |
# Search if the pou removed is currently opened |
|
1025 |
if self.Project is not None: |
|
1026 |
pou = self.Project.getpou(pou_name) |
|
1027 |
if pou is not None: |
|
1028 |
pou.removeaction(action_name) |
|
1029 |
self.BufferProject() |
|
1030 |
||
1031 |
# Change the name of a pou |
|
1032 |
def ChangeDataTypeName(self, old_name, new_name): |
|
1033 |
if self.Project is not None: |
|
1034 |
# Found the pou corresponding to old name and change its name to new name |
|
1035 |
datatype = self.Project.getdataType(old_name) |
|
1036 |
if datatype is not None: |
|
1037 |
datatype.setname(new_name) |
|
1038 |
self.Project.updateElementName(old_name, new_name) |
|
1039 |
self.BufferProject() |
|
1040 |
||
1041 |
# Change the name of a pou |
|
1042 |
def ChangePouName(self, old_name, new_name): |
|
1043 |
if self.Project is not None: |
|
1044 |
# Found the pou corresponding to old name and change its name to new name |
|
1045 |
pou = self.Project.getpou(old_name) |
|
1046 |
if pou is not None: |
|
1047 |
pou.setname(new_name) |
|
1048 |
self.Project.updateElementName(old_name, new_name) |
|
1049 |
self.BufferProject() |
|
1050 |
||
1051 |
# Change the name of a pou transition |
|
1052 |
def ChangePouTransitionName(self, pou_name, old_name, new_name): |
|
1053 |
if self.Project is not None: |
|
1054 |
# Found the pou transition corresponding to old name and change its name to new name |
|
1055 |
pou = self.Project.getpou(pou_name) |
|
1056 |
if pou is not None: |
|
1057 |
transition = pou.gettransition(old_name) |
|
1058 |
if transition is not None: |
|
1059 |
transition.setname(new_name) |
|
1060 |
pou.updateElementName(old_name, new_name) |
|
1061 |
self.BufferProject() |
|
1062 |
||
1063 |
# Change the name of a pou action |
|
1064 |
def ChangePouActionName(self, pou_name, old_name, new_name): |
|
1065 |
if self.Project is not None: |
|
1066 |
# Found the pou action corresponding to old name and change its name to new name |
|
1067 |
pou = self.Project.getpou(pou_name) |
|
1068 |
if pou is not None: |
|
1069 |
action = pou.getaction(old_name) |
|
1070 |
if action is not None: |
|
1071 |
action.setname(new_name) |
|
1072 |
pou.updateElementName(old_name, new_name) |
|
1073 |
self.BufferProject() |
|
1074 |
||
1075 |
# Change the name of a pou variable |
|
1076 |
def ChangePouVariableName(self, pou_name, old_name, new_name): |
|
1077 |
if self.Project is not None: |
|
1078 |
# Found the pou action corresponding to old name and change its name to new name |
|
1079 |
pou = self.Project.getpou(pou_name) |
|
1080 |
if pou is not None: |
|
1081 |
for type, varlist in pou.getvars(): |
|
1082 |
for var in varlist.getvariable(): |
|
1083 |
if var.getname() == old_name: |
|
1084 |
var.setname(new_name) |
|
1085 |
self.BufferProject() |
|
1086 |
||
1087 |
# Change the name of a configuration |
|
1088 |
def ChangeConfigurationName(self, old_name, new_name): |
|
1089 |
if self.Project is not None: |
|
1090 |
# Found the configuration corresponding to old name and change its name to new name |
|
1091 |
configuration = self.Project.getconfiguration(old_name) |
|
1092 |
if configuration is not None: |
|
1093 |
configuration.setname(new_name) |
|
1094 |
self.BufferProject() |
|
1095 |
||
1096 |
# Change the name of a configuration resource |
|
1097 |
def ChangeConfigurationResourceName(self, config_name, old_name, new_name): |
|
1098 |
if self.Project is not None: |
|
1099 |
# Found the resource corresponding to old name and change its name to new name |
|
1100 |
resource = self.Project.getconfigurationResource(config_name, old_name) |
|
1101 |
if resource is not None: |
|
1102 |
resource.setname(new_name) |
|
1103 |
self.BufferProject() |
|
1104 |
||
1105 |
# Return the description of the pou given by its name |
|
1106 |
def GetPouDescription(self, name, debug = False): |
|
1107 |
project = self.GetProject(debug) |
|
1108 |
if project is not None: |
|
1109 |
# Found the pou correponding to name and return its type |
|
1110 |
pou = project.getpou(name) |
|
1111 |
if pou is not None: |
|
1112 |
return pou.getdescription() |
|
1113 |
return "" |
|
1114 |
||
1115 |
# Return the description of the pou given by its name |
|
1116 |
def SetPouDescription(self, name, description, debug = False): |
|
1117 |
project = self.GetProject(debug) |
|
1118 |
if project is not None: |
|
1119 |
# Found the pou correponding to name and return its type |
|
1120 |
pou = project.getpou(name) |
|
1121 |
if pou is not None: |
|
1122 |
pou.setdescription(description) |
|
1123 |
self.BufferProject() |
|
1124 |
||
1125 |
# Return the type of the pou given by its name |
|
1126 |
def GetPouType(self, name, debug = False): |
|
1127 |
project = self.GetProject(debug) |
|
1128 |
if project is not None: |
|
1129 |
# Found the pou correponding to name and return its type |
|
1130 |
pou = project.getpou(name) |
|
1131 |
if pou is not None: |
|
1132 |
return pou.getpouType() |
|
1133 |
return None |
|
1134 |
||
1135 |
# Return pous with SFC language |
|
1136 |
def GetSFCPous(self, debug = False): |
|
1137 |
list = [] |
|
1138 |
project = self.GetProject(debug) |
|
1139 |
if project is not None: |
|
1140 |
for pou in project.getpous(): |
|
1141 |
if pou.getBodyType() == "SFC": |
|
1142 |
list.append(pou.getname()) |
|
1143 |
return list |
|
1144 |
||
1145 |
# Return the body language of the pou given by its name |
|
1146 |
def GetPouBodyType(self, name, debug = False): |
|
1147 |
project = self.GetProject(debug) |
|
1148 |
if project is not None: |
|
1149 |
# Found the pou correponding to name and return its body language |
|
1150 |
pou = project.getpou(name) |
|
1151 |
if pou is not None: |
|
1152 |
return pou.getbodyType() |
|
1153 |
return None |
|
1154 |
||
1155 |
# Return the actions of a pou |
|
1156 |
def GetPouTransitions(self, pou_name, debug = False): |
|
1157 |
transitions = [] |
|
1158 |
project = self.GetProject(debug) |
|
1159 |
if project is not None: |
|
1160 |
# Found the pou correponding to name and return its transitions if SFC |
|
1161 |
pou = project.getpou(pou_name) |
|
1162 |
if pou is not None and pou.getbodyType() == "SFC": |
|
1163 |
for transition in pou.gettransitionList(): |
|
1164 |
transitions.append(transition.getname()) |
|
1165 |
return transitions |
|
1166 |
||
1167 |
# Return the body language of the transition given by its name |
|
1168 |
def GetTransitionBodyType(self, pou_name, pou_transition, debug = False): |
|
1169 |
project = self.GetProject(debug) |
|
1170 |
if project is not None: |
|
1171 |
# Found the pou correponding to name |
|
1172 |
pou = project.getpou(pou_name) |
|
1173 |
if pou is not None: |
|
1174 |
# Found the pou transition correponding to name and return its body language |
|
1175 |
transition = pou.gettransition(pou_transition) |
|
1176 |
if transition is not None: |
|
1177 |
return transition.getbodyType() |
|
1178 |
return None |
|
1179 |
||
1180 |
# Return the actions of a pou |
|
1181 |
def GetPouActions(self, pou_name, debug = False): |
|
1182 |
actions = [] |
|
1183 |
project = self.GetProject(debug) |
|
1184 |
if project is not None: |
|
1185 |
# Found the pou correponding to name and return its actions if SFC |
|
1186 |
pou = project.getpou(pou_name) |
|
1187 |
if pou.getbodyType() == "SFC": |
|
1188 |
for action in pou.getactionList(): |
|
1189 |
actions.append(action.getname()) |
|
1190 |
return actions |
|
1191 |
||
1192 |
# Return the body language of the pou given by its name |
|
1193 |
def GetActionBodyType(self, pou_name, pou_action, debug = False): |
|
1194 |
project = self.GetProject(debug) |
|
1195 |
if project is not None: |
|
1196 |
# Found the pou correponding to name and return its body language |
|
1197 |
pou = project.getpou(pou_name) |
|
1198 |
if pou is not None: |
|
1199 |
action = pou.getaction(pou_action) |
|
1200 |
if action is not None: |
|
1201 |
return action.getbodyType() |
|
1202 |
return None |
|
1203 |
||
1204 |
# Extract varlists from a list of vars |
|
1205 |
def ExtractVarLists(self, vars): |
|
1206 |
varlist_list = [] |
|
1207 |
current_varlist = None |
|
1208 |
current_type = None |
|
1209 |
for var in vars: |
|
1210 |
next_type = (var["Class"], |
|
1211 |
var["Option"], |
|
1212 |
var["Location"] in ["", None] or |
|
1213 |
# When declaring globals, located |
|
1214 |
# and not located variables are |
|
1215 |
# in the same declaration block |
|
1216 |
var["Class"] == "Global") |
|
1217 |
if current_type != next_type: |
|
1218 |
current_type = next_type |
|
1219 |
infos = VAR_CLASS_INFOS.get(var["Class"], None) |
|
1220 |
if infos is not None: |
|
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1221 |
current_varlist = PLCOpenParser.CreateElement(infos[0], "interface") |
814 | 1222 |
else: |
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1223 |
current_varlist = PLCOpenParser.CreateElement("varList") |
814 | 1224 |
varlist_list.append((var["Class"], current_varlist)) |
1225 |
if var["Option"] == "Constant": |
|
1226 |
current_varlist.setconstant(True) |
|
1227 |
elif var["Option"] == "Retain": |
|
1228 |
current_varlist.setretain(True) |
|
1229 |
elif var["Option"] == "Non-Retain": |
|
1230 |
current_varlist.setnonretain(True) |
|
1231 |
# Create variable and change its properties |
|
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1232 |
tempvar = PLCOpenParser.CreateElement("variable", "varListPlain") |
814 | 1233 |
tempvar.setname(var["Name"]) |
1234 |
||
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1235 |
var_type = PLCOpenParser.CreateElement("type", "variable") |
814 | 1236 |
if isinstance(var["Type"], TupleType): |
1237 |
if var["Type"][0] == "array": |
|
1238 |
array_type, base_type_name, dimensions = var["Type"] |
|
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1239 |
array = PLCOpenParser.CreateElement("array", "dataType") |
1306
1ff1cdf6c318
Fixed bug with direct array variable type definition
Laurent Bessard
parents:
1304
diff
changeset
|
1240 |
baseType = PLCOpenParser.CreateElement("baseType", "array") |
1ff1cdf6c318
Fixed bug with direct array variable type definition
Laurent Bessard
parents:
1304
diff
changeset
|
1241 |
array.setbaseType(baseType) |
814 | 1242 |
for i, dimension in enumerate(dimensions): |
1306
1ff1cdf6c318
Fixed bug with direct array variable type definition
Laurent Bessard
parents:
1304
diff
changeset
|
1243 |
dimension_range = PLCOpenParser.CreateElement("dimension", "array") |
814 | 1244 |
if i == 0: |
1245 |
array.setdimension([dimension_range]) |
|
1246 |
else: |
|
1247 |
array.appenddimension(dimension_range) |
|
1298
f034fb2b1aab
Fixed SFC block edition and SFC to SFC_textual code generating
Laurent Bessard
parents:
1297
diff
changeset
|
1248 |
dimension_range.setlower(dimension[0]) |
f034fb2b1aab
Fixed SFC block edition and SFC to SFC_textual code generating
Laurent Bessard
parents:
1297
diff
changeset
|
1249 |
dimension_range.setupper(dimension[1]) |
814 | 1250 |
if base_type_name in self.GetBaseTypes(): |
1306
1ff1cdf6c318
Fixed bug with direct array variable type definition
Laurent Bessard
parents:
1304
diff
changeset
|
1251 |
baseType.setcontent(PLCOpenParser.CreateElement( |
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1252 |
base_type_name.lower() |
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1253 |
if base_type_name in ["STRING", "WSTRING"] |
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1254 |
else base_type_name, "dataType")) |
814 | 1255 |
else: |
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1256 |
derived_datatype = PLCOpenParser.CreateElement("derived", "dataType") |
814 | 1257 |
derived_datatype.setname(base_type_name) |
1306
1ff1cdf6c318
Fixed bug with direct array variable type definition
Laurent Bessard
parents:
1304
diff
changeset
|
1258 |
baseType.setcontent(derived_datatype) |
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1259 |
var_type.setcontent(array) |
814 | 1260 |
elif var["Type"] in self.GetBaseTypes(): |
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1261 |
var_type.setcontent(PLCOpenParser.CreateElement( |
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1262 |
var["Type"].lower() |
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1263 |
if var["Type"] in ["STRING", "WSTRING"] |
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1264 |
else var["Type"], "dataType")) |
814 | 1265 |
else: |
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1266 |
derived_type = PLCOpenParser.CreateElement("derived", "dataType") |
814 | 1267 |
derived_type.setname(var["Type"]) |
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1268 |
var_type.setcontent(derived_type) |
814 | 1269 |
tempvar.settype(var_type) |
1270 |
||
1271 |
if var["Initial Value"] != "": |
|
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1272 |
value = PLCOpenParser.CreateElement("initialValue", "variable") |
814 | 1273 |
value.setvalue(var["Initial Value"]) |
1274 |
tempvar.setinitialValue(value) |
|
1275 |
if var["Location"] != "": |
|
1276 |
tempvar.setaddress(var["Location"]) |
|
1277 |
else: |
|
1278 |
tempvar.setaddress(None) |
|
1279 |
if var['Documentation'] != "": |
|
1294
f02ba5b83811
Fixed datatype and configuration editing in xmlclass refactoring
Laurent Bessard
parents:
1293
diff
changeset
|
1280 |
ft = PLCOpenParser.CreateElement("documentation", "variable") |
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1281 |
ft.setanyText(var['Documentation']) |
814 | 1282 |
tempvar.setdocumentation(ft) |
1283 |
||
1284 |
# Add variable to varList |
|
1285 |
current_varlist.appendvariable(tempvar) |
|
1286 |
return varlist_list |
|
1287 |
||
1308
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
1288 |
def GetVariableDictionary(self, object_with_vars): |
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
1289 |
variables = [] |
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1290 |
|
1308
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
1291 |
variables_infos_xslt_tree = etree.XSLT( |
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
1292 |
variables_infos_xslt, extensions = { |
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
1293 |
("var_infos_ns", "add_variable"): AddVariable(variables), |
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
1294 |
("var_infos_ns", "var_tree"): VarTree(self)}) |
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
1295 |
variables_infos_xslt_tree(object_with_vars) |
1293
40117d02601b
Fixed diagram editing in xmlclass refactoring
Laurent Bessard
parents:
1291
diff
changeset
|
1296 |
|
1308
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
1297 |
return variables |
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
1298 |
|
1171
a506e4de8f84
Add support for Drag'n dropping located variables to function block creating global located variable in configuration and external variable in function block
Laurent Bessard
parents:
1127
diff
changeset
|
1299 |
# Add a global var to configuration to configuration |
a506e4de8f84
Add support for Drag'n dropping located variables to function block creating global located variable in configuration and external variable in function block
Laurent Bessard
parents:
1127
diff
changeset
|
1300 |
def AddConfigurationGlobalVar(self, config_name, type, var_name, |
a506e4de8f84
Add support for Drag'n dropping located variables to function block creating global located variable in configuration and external variable in function block
Laurent Bessard
parents:
1127
diff
changeset
|
1301 |
location="", description=""): |
a506e4de8f84
Add support for Drag'n dropping located variables to function block creating global located variable in configuration and external variable in function block
Laurent Bessard
parents:
1127
diff
changeset
|
1302 |
if self.Project is not None: |
a506e4de8f84
Add support for Drag'n dropping located variables to function block creating global located variable in configuration and external variable in function block
Laurent Bessard
parents:
1127
diff
changeset
|
1303 |
# Found the configuration corresponding to name |
a506e4de8f84
Add support for Drag'n dropping located variables to function block creating global located variable in configuration and external variable in function block
Laurent Bessard
parents:
1127
diff
changeset
|
1304 |
configuration = self.Project.getconfiguration(config_name) |
a506e4de8f84
Add support for Drag'n dropping located variables to function block creating global located variable in configuration and external variable in function block
Laurent Bessard
parents:
1127
diff
changeset
|
1305 |
if configuration is not None: |
a506e4de8f84
Add support for Drag'n dropping located variables to function block creating global located variable in configuration and external variable in function block
Laurent Bessard
parents:
1127
diff
changeset
|
1306 |
# Set configuration global vars |
a506e4de8f84
Add support for Drag'n dropping located variables to function block creating global located variable in configuration and external variable in function block
Laurent Bessard
parents:
1127
diff
changeset
|
1307 |
configuration.addglobalVar(type, var_name, location, description) |
814 | 1308 |
|
1309 |
# Replace the configuration globalvars by those given |
|
1310 |
def SetConfigurationGlobalVars(self, name, vars): |
|
1311 |
if self.Project is not None: |
|
1312 |
# Found the configuration corresponding to name |
|
1313 |
configuration = self.Project.getconfiguration(name) |
|
1314 |
if configuration is not None: |
|
1315 |
# Set configuration global vars |
|
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1316 |
configuration.setglobalVars([ |
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1317 |
varlist for vartype, varlist |
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1318 |
in self.ExtractVarLists(vars)]) |
814 | 1319 |
|
1320 |
# Return the configuration globalvars |
|
1321 |
def GetConfigurationGlobalVars(self, name, debug = False): |
|
1322 |
project = self.GetProject(debug) |
|
1323 |
if project is not None: |
|
1324 |
# Found the configuration corresponding to name |
|
1325 |
configuration = project.getconfiguration(name) |
|
1326 |
if configuration is not None: |
|
1308
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
1327 |
# Extract variables defined in configuration |
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
1328 |
return self.GetVariableDictionary(configuration) |
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
1329 |
|
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
1330 |
return [] |
814 | 1331 |
|
1171
a506e4de8f84
Add support for Drag'n dropping located variables to function block creating global located variable in configuration and external variable in function block
Laurent Bessard
parents:
1127
diff
changeset
|
1332 |
# Return configuration variable names |
a506e4de8f84
Add support for Drag'n dropping located variables to function block creating global located variable in configuration and external variable in function block
Laurent Bessard
parents:
1127
diff
changeset
|
1333 |
def GetConfigurationVariableNames(self, config_name = None, debug = False): |
a506e4de8f84
Add support for Drag'n dropping located variables to function block creating global located variable in configuration and external variable in function block
Laurent Bessard
parents:
1127
diff
changeset
|
1334 |
variables = [] |
a506e4de8f84
Add support for Drag'n dropping located variables to function block creating global located variable in configuration and external variable in function block
Laurent Bessard
parents:
1127
diff
changeset
|
1335 |
project = self.GetProject(debug) |
a506e4de8f84
Add support for Drag'n dropping located variables to function block creating global located variable in configuration and external variable in function block
Laurent Bessard
parents:
1127
diff
changeset
|
1336 |
if project is not None: |
a506e4de8f84
Add support for Drag'n dropping located variables to function block creating global located variable in configuration and external variable in function block
Laurent Bessard
parents:
1127
diff
changeset
|
1337 |
for configuration in self.Project.getconfigurations(): |
a506e4de8f84
Add support for Drag'n dropping located variables to function block creating global located variable in configuration and external variable in function block
Laurent Bessard
parents:
1127
diff
changeset
|
1338 |
if config_name is None or config_name == configuration.getname(): |
a506e4de8f84
Add support for Drag'n dropping located variables to function block creating global located variable in configuration and external variable in function block
Laurent Bessard
parents:
1127
diff
changeset
|
1339 |
variables.extend( |
a506e4de8f84
Add support for Drag'n dropping located variables to function block creating global located variable in configuration and external variable in function block
Laurent Bessard
parents:
1127
diff
changeset
|
1340 |
[var.getname() for var in reduce( |
a506e4de8f84
Add support for Drag'n dropping located variables to function block creating global located variable in configuration and external variable in function block
Laurent Bessard
parents:
1127
diff
changeset
|
1341 |
lambda x, y: x + y, [varlist.getvariable() |
a506e4de8f84
Add support for Drag'n dropping located variables to function block creating global located variable in configuration and external variable in function block
Laurent Bessard
parents:
1127
diff
changeset
|
1342 |
for varlist in configuration.globalVars], |
a506e4de8f84
Add support for Drag'n dropping located variables to function block creating global located variable in configuration and external variable in function block
Laurent Bessard
parents:
1127
diff
changeset
|
1343 |
[])]) |
a506e4de8f84
Add support for Drag'n dropping located variables to function block creating global located variable in configuration and external variable in function block
Laurent Bessard
parents:
1127
diff
changeset
|
1344 |
return variables |
a506e4de8f84
Add support for Drag'n dropping located variables to function block creating global located variable in configuration and external variable in function block
Laurent Bessard
parents:
1127
diff
changeset
|
1345 |
|
814 | 1346 |
# Replace the resource globalvars by those given |
1347 |
def SetConfigurationResourceGlobalVars(self, config_name, name, vars): |
|
1348 |
if self.Project is not None: |
|
1349 |
# Found the resource corresponding to name |
|
1350 |
resource = self.Project.getconfigurationResource(config_name, name) |
|
1351 |
# Set resource global vars |
|
1352 |
if resource is not None: |
|
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1353 |
resource.setglobalVars([ |
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1354 |
varlist for vartype, varlist |
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1355 |
in self.ExtractVarLists(vars)]) |
814 | 1356 |
|
1357 |
# Return the resource globalvars |
|
1358 |
def GetConfigurationResourceGlobalVars(self, config_name, name, debug = False): |
|
1359 |
project = self.GetProject(debug) |
|
1360 |
if project is not None: |
|
1361 |
# Found the resource corresponding to name |
|
1362 |
resource = project.getconfigurationResource(config_name, name) |
|
1294
f02ba5b83811
Fixed datatype and configuration editing in xmlclass refactoring
Laurent Bessard
parents:
1293
diff
changeset
|
1363 |
if resource is not None: |
1308
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
1364 |
# Extract variables defined in configuration |
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
1365 |
return self.GetVariableDictionary(resource) |
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
1366 |
|
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
1367 |
return [] |
814 | 1368 |
|
1171
a506e4de8f84
Add support for Drag'n dropping located variables to function block creating global located variable in configuration and external variable in function block
Laurent Bessard
parents:
1127
diff
changeset
|
1369 |
# Return resource variable names |
a506e4de8f84
Add support for Drag'n dropping located variables to function block creating global located variable in configuration and external variable in function block
Laurent Bessard
parents:
1127
diff
changeset
|
1370 |
def GetConfigurationResourceVariableNames(self, |
a506e4de8f84
Add support for Drag'n dropping located variables to function block creating global located variable in configuration and external variable in function block
Laurent Bessard
parents:
1127
diff
changeset
|
1371 |
config_name = None, resource_name = None, debug = False): |
a506e4de8f84
Add support for Drag'n dropping located variables to function block creating global located variable in configuration and external variable in function block
Laurent Bessard
parents:
1127
diff
changeset
|
1372 |
variables = [] |
a506e4de8f84
Add support for Drag'n dropping located variables to function block creating global located variable in configuration and external variable in function block
Laurent Bessard
parents:
1127
diff
changeset
|
1373 |
project = self.GetProject(debug) |
a506e4de8f84
Add support for Drag'n dropping located variables to function block creating global located variable in configuration and external variable in function block
Laurent Bessard
parents:
1127
diff
changeset
|
1374 |
if project is not None: |
a506e4de8f84
Add support for Drag'n dropping located variables to function block creating global located variable in configuration and external variable in function block
Laurent Bessard
parents:
1127
diff
changeset
|
1375 |
for configuration in self.Project.getconfigurations(): |
a506e4de8f84
Add support for Drag'n dropping located variables to function block creating global located variable in configuration and external variable in function block
Laurent Bessard
parents:
1127
diff
changeset
|
1376 |
if config_name is None or config_name == configuration.getname(): |
a506e4de8f84
Add support for Drag'n dropping located variables to function block creating global located variable in configuration and external variable in function block
Laurent Bessard
parents:
1127
diff
changeset
|
1377 |
for resource in configuration.getresource(): |
a506e4de8f84
Add support for Drag'n dropping located variables to function block creating global located variable in configuration and external variable in function block
Laurent Bessard
parents:
1127
diff
changeset
|
1378 |
if resource_name is None or resource.getname() == resource_name: |
a506e4de8f84
Add support for Drag'n dropping located variables to function block creating global located variable in configuration and external variable in function block
Laurent Bessard
parents:
1127
diff
changeset
|
1379 |
variables.extend( |
a506e4de8f84
Add support for Drag'n dropping located variables to function block creating global located variable in configuration and external variable in function block
Laurent Bessard
parents:
1127
diff
changeset
|
1380 |
[var.getname() for var in reduce( |
a506e4de8f84
Add support for Drag'n dropping located variables to function block creating global located variable in configuration and external variable in function block
Laurent Bessard
parents:
1127
diff
changeset
|
1381 |
lambda x, y: x + y, [varlist.getvariable() |
a506e4de8f84
Add support for Drag'n dropping located variables to function block creating global located variable in configuration and external variable in function block
Laurent Bessard
parents:
1127
diff
changeset
|
1382 |
for varlist in resource.globalVars], |
a506e4de8f84
Add support for Drag'n dropping located variables to function block creating global located variable in configuration and external variable in function block
Laurent Bessard
parents:
1127
diff
changeset
|
1383 |
[])]) |
a506e4de8f84
Add support for Drag'n dropping located variables to function block creating global located variable in configuration and external variable in function block
Laurent Bessard
parents:
1127
diff
changeset
|
1384 |
return variables |
814 | 1385 |
|
1386 |
# Return the interface for the given pou |
|
1387 |
def GetPouInterfaceVars(self, pou, debug = False): |
|
1308
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
1388 |
interface = pou.interface |
814 | 1389 |
# Verify that the pou has an interface |
1308
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
1390 |
if interface is not None: |
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
1391 |
# Extract variables defined in interface |
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
1392 |
return self.GetVariableDictionary(interface) |
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
1393 |
return [] |
814 | 1394 |
|
1395 |
# Replace the Pou interface by the one given |
|
1396 |
def SetPouInterfaceVars(self, name, vars): |
|
1397 |
if self.Project is not None: |
|
1398 |
# Found the pou corresponding to name and add interface if there isn't one yet |
|
1399 |
pou = self.Project.getpou(name) |
|
1400 |
if pou is not None: |
|
1401 |
if pou.interface is None: |
|
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1402 |
pou.interface = PLCOpenParser.CreateElement("interface", "pou") |
814 | 1403 |
# Set Pou interface |
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1404 |
pou.setvars([varlist for varlist_type, varlist in self.ExtractVarLists(vars)]) |
1302
7856cd7767d6
Removed dictionaries storing datatypes and pous defined in project and pou and datatype using tree from model
Laurent Bessard
parents:
1301
diff
changeset
|
1405 |
|
814 | 1406 |
# Replace the return type of the pou given by its name (only for functions) |
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1407 |
def SetPouInterfaceReturnType(self, name, return_type): |
814 | 1408 |
if self.Project is not None: |
1409 |
pou = self.Project.getpou(name) |
|
1410 |
if pou is not None: |
|
1411 |
if pou.interface is None: |
|
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1412 |
pou.interface = PLCOpenParser.CreateElement("interface", "pou") |
814 | 1413 |
# If there isn't any return type yet, add it |
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1414 |
return_type_obj = pou.interface.getreturnType() |
1294
f02ba5b83811
Fixed datatype and configuration editing in xmlclass refactoring
Laurent Bessard
parents:
1293
diff
changeset
|
1415 |
if return_type_obj is None: |
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1416 |
return_type_obj = PLCOpenParser.CreateElement("returnType", "interface") |
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1417 |
pou.interface.setreturnType(return_type_obj) |
814 | 1418 |
# Change return type |
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1419 |
if return_type in self.GetBaseTypes(): |
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1420 |
return_type_obj.setcontent(PLCOpenParser.CreateElement( |
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1421 |
return_type.lower() |
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1422 |
if return_type in ["STRING", "WSTRING"] |
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1423 |
else return_type, "dataType")) |
814 | 1424 |
else: |
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1425 |
derived_type = PLCOpenParser.CreateElement("derived", "dataType") |
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1426 |
derived_type.setname(return_type) |
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1427 |
return_type.setcontent(derived_type) |
1302
7856cd7767d6
Removed dictionaries storing datatypes and pous defined in project and pou and datatype using tree from model
Laurent Bessard
parents:
1301
diff
changeset
|
1428 |
|
814 | 1429 |
def UpdateProjectUsedPous(self, old_name, new_name): |
1294
f02ba5b83811
Fixed datatype and configuration editing in xmlclass refactoring
Laurent Bessard
parents:
1293
diff
changeset
|
1430 |
if self.Project is not None: |
814 | 1431 |
self.Project.updateElementName(old_name, new_name) |
1432 |
||
1433 |
def UpdateEditedElementUsedVariable(self, tagname, old_name, new_name): |
|
1434 |
pou = self.GetEditedElement(tagname) |
|
1294
f02ba5b83811
Fixed datatype and configuration editing in xmlclass refactoring
Laurent Bessard
parents:
1293
diff
changeset
|
1435 |
if pou is not None: |
814 | 1436 |
pou.updateElementName(old_name, new_name) |
1437 |
||
1438 |
# Return the return type of the pou given by its name |
|
1439 |
def GetPouInterfaceReturnTypeByName(self, name): |
|
1440 |
project = self.GetProject(debug) |
|
1441 |
if project is not None: |
|
1442 |
# Found the pou correponding to name and return the return type |
|
1443 |
pou = project.getpou(name) |
|
1444 |
if pou is not None: |
|
1445 |
return self.GetPouInterfaceReturnType(pou) |
|
1446 |
return False |
|
1447 |
||
1448 |
# Return the return type of the given pou |
|
1449 |
def GetPouInterfaceReturnType(self, pou): |
|
1450 |
# Verify that the pou has an interface |
|
1451 |
if pou.interface is not None: |
|
1452 |
# Return the return type if there is one |
|
1453 |
return_type = pou.interface.getreturnType() |
|
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1454 |
if return_type is not None: |
1308
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
1455 |
return_type_infos_xslt_tree = etree.XSLT( |
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
1456 |
variables_infos_xslt, extensions = { |
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
1457 |
("var_infos_ns", "var_tree"): VarTree(self)}) |
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
1458 |
return [extract_param(el) |
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
1459 |
for el in return_type_infos_xslt_tree(return_type).getroot()] |
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
1460 |
|
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
1461 |
return [None, ([], [])] |
814 | 1462 |
|
1463 |
# Function that add a new confnode to the confnode list |
|
1464 |
def AddConfNodeTypesList(self, typeslist): |
|
1465 |
self.ConfNodeTypes.extend(typeslist) |
|
1283
f3cfe1ff917e
More optimization attemps in type handling
Edouard Tisserant
parents:
1265
diff
changeset
|
1466 |
addedcat = [{"name": _("%s POUs") % confnodetypes["name"], |