author | Edouard Tisserant <edouard.tisserant@gmail.com> |
Thu, 28 Nov 2024 14:46:50 +0100 | |
changeset 4055 | c325749651d1 |
parent 4008 | f30573e98600 |
child 4059 | 03f007a175b5 |
permissions | -rw-r--r-- |
814 | 1 |
#!/usr/bin/env python |
2 |
# -*- coding: utf-8 -*- |
|
3 |
||
1571
486f94a8032c
fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1508
diff
changeset
|
4 |
# This file is part of Beremiz, a Integrated Development Environment for |
486f94a8032c
fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1508
diff
changeset
|
5 |
# programming IEC 61131-3 automates supporting plcopen standard and CanFestival. |
814 | 6 |
# |
1571
486f94a8032c
fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1508
diff
changeset
|
7 |
# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD |
1680
6db967480b7d
make run Beremiz and PLCOpen Editor, if full path contain non-lating
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1619
diff
changeset
|
8 |
# Copyright (C) 2017: Andrey Skvortsov |
814 | 9 |
# |
1571
486f94a8032c
fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1508
diff
changeset
|
10 |
# See COPYING file for copyrights details. |
814 | 11 |
# |
1571
486f94a8032c
fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1508
diff
changeset
|
12 |
# This program is free software; you can redistribute it and/or |
486f94a8032c
fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1508
diff
changeset
|
13 |
# modify it under the terms of the GNU General Public License |
486f94a8032c
fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1508
diff
changeset
|
14 |
# as published by the Free Software Foundation; either version 2 |
486f94a8032c
fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1508
diff
changeset
|
15 |
# of the License, or (at your option) any later version. |
814 | 16 |
# |
1571
486f94a8032c
fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1508
diff
changeset
|
17 |
# This program is distributed in the hope that it will be useful, |
486f94a8032c
fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1508
diff
changeset
|
18 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of |
486f94a8032c
fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1508
diff
changeset
|
19 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
486f94a8032c
fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1508
diff
changeset
|
20 |
# GNU General Public License for more details. |
814 | 21 |
# |
1571
486f94a8032c
fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1508
diff
changeset
|
22 |
# You should have received a copy of the GNU General Public License |
486f94a8032c
fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1508
diff
changeset
|
23 |
# along with this program; if not, write to the Free Software |
486f94a8032c
fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1508
diff
changeset
|
24 |
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
814 | 25 |
|
1850
614396cbffbf
fix pylint warning '(unused-import), Unused import connectors'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1847
diff
changeset
|
26 |
|
1299
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
27 |
from copy import deepcopy |
1732
94ffe74e6895
clean-up: fix PEP8 E401 multiple imports on one line
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1686
diff
changeset
|
28 |
import os |
94ffe74e6895
clean-up: fix PEP8 E401 multiple imports on one line
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1686
diff
changeset
|
29 |
import re |
814 | 30 |
import datetime |
31 |
from time import localtime |
|
2456
7373e3048167
python3 support: pylint,W1610 # (reduce-builtin) reduce built-in referenced
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2450
diff
changeset
|
32 |
from functools import reduce |
1832
0f1081928d65
fix wrong-import-order. first standard modules are imported, then others
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1831
diff
changeset
|
33 |
|
0f1081928d65
fix wrong-import-order. first standard modules are imported, then others
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1831
diff
changeset
|
34 |
import util.paths as paths |
1313
85c167bfff93
Replaced standard function blocks library definition from dictionary to plcopen xml files
Laurent Bessard
parents:
1311
diff
changeset
|
35 |
from plcopen import * |
1944
6162e34fb246
Moved some code from PLCController.py to other modules. Added necessary imports.
Edouard Tisserant <edouard.tisserant@gmail.com>
parents:
1943
diff
changeset
|
36 |
from plcopen.types_enums import * |
1942
a4382ae1ba82
Added /plcopen/InstancesPathCollector.py, to move more model xslt querying code away from PLCController.py.
Edouard Tisserant <edouard.tisserant@gmail.com>
parents:
1940
diff
changeset
|
37 |
from plcopen.InstancesPathCollector import InstancesPathCollector |
1943
9dc0e38552b2
GetPouVariables optimized with XSLTModelQuery
Edouard Tisserant <edouard.tisserant@gmail.com>
parents:
1942
diff
changeset
|
38 |
from plcopen.POUVariablesCollector import POUVariablesCollector |
1950
752ec68da94d
GetPouInstanceTagName optimized with XSLTModelQuery.
Edouard Tisserant
parents:
1948
diff
changeset
|
39 |
from plcopen.InstanceTagnameCollector import InstanceTagnameCollector |
1957
2d1cc4f5e4ef
GetEditedElementInstancesInfos now optimized as well. Forgotten because not using [R.I.P]LibraryResolver, but still XSLT compiling was hapenning on each call.
Edouard Tisserant
parents:
1954
diff
changeset
|
40 |
from plcopen.BlockInstanceCollector import BlockInstanceCollector |
1951
bbd1e1744c91
GetVariableDictionary and GetPouInterfaceReturnType optimized with new VariableInfoCollector based on XSLTModelQuery. Moved corresponding definitions out of PLCControler.py.
Edouard Tisserant
parents:
1950
diff
changeset
|
41 |
from plcopen.VariableInfoCollector import VariableInfoCollector |
814 | 42 |
from graphics.GraphicCommons import * |
43 |
from PLCGenerator import * |
|
44 |
||
2439
f0a040f1de1b
Fix pep8 warning: W605 invalid escape sequence ?x?
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2437
diff
changeset
|
45 |
duration_model = re.compile(r"(?:([0-9]{1,2})h)?(?:([0-9]{1,2})m(?!s))?(?:([0-9]{1,2})s)?(?:([0-9]{1,3}(?:\.[0-9]*)?)ms)?") |
f0a040f1de1b
Fix pep8 warning: W605 invalid escape sequence ?x?
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2437
diff
changeset
|
46 |
VARIABLE_NAME_SUFFIX_MODEL = re.compile(r'(\d+)$') |
814 | 47 |
|
1680
6db967480b7d
make run Beremiz and PLCOpen Editor, if full path contain non-lating
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1619
diff
changeset
|
48 |
ScriptDirectory = paths.AbsDir(__file__) |
814 | 49 |
|
50 |
# Length of the buffer |
|
51 |
UNDO_BUFFER_LENGTH = 20 |
|
52 |
||
1736
7e61baa047f0
clean-up: fix PEP8 E302 expected 2 blank lines, found 1
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1735
diff
changeset
|
53 |
|
1831
56b48961cc68
fix (old-style-class) Old-style class defined error for most parts of
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1785
diff
changeset
|
54 |
class UndoBuffer(object): |
1736
7e61baa047f0
clean-up: fix PEP8 E302 expected 2 blank lines, found 1
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1735
diff
changeset
|
55 |
""" |
1782
5b6ad7a7fd9d
clean-up: fix PEP8 E265 block comment should start with '# '
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1780
diff
changeset
|
56 |
Undo Buffer for PLCOpenEditor |
1736
7e61baa047f0
clean-up: fix PEP8 E302 expected 2 blank lines, found 1
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1735
diff
changeset
|
57 |
Class implementing a buffer of changes made on the current editing model |
7e61baa047f0
clean-up: fix PEP8 E302 expected 2 blank lines, found 1
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1735
diff
changeset
|
58 |
""" |
7e61baa047f0
clean-up: fix PEP8 E302 expected 2 blank lines, found 1
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1735
diff
changeset
|
59 |
|
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1743
diff
changeset
|
60 |
def __init__(self, currentstate, issaved=False): |
1736
7e61baa047f0
clean-up: fix PEP8 E302 expected 2 blank lines, found 1
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1735
diff
changeset
|
61 |
""" |
7e61baa047f0
clean-up: fix PEP8 E302 expected 2 blank lines, found 1
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1735
diff
changeset
|
62 |
Constructor initialising buffer |
7e61baa047f0
clean-up: fix PEP8 E302 expected 2 blank lines, found 1
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1735
diff
changeset
|
63 |
""" |
814 | 64 |
self.Buffer = [] |
65 |
self.CurrentIndex = -1 |
|
66 |
self.MinIndex = -1 |
|
67 |
self.MaxIndex = -1 |
|
68 |
# if current state is defined |
|
69 |
if currentstate: |
|
70 |
self.CurrentIndex = 0 |
|
71 |
self.MinIndex = 0 |
|
72 |
self.MaxIndex = 0 |
|
73 |
# Initialising buffer with currentstate at the first place |
|
3750
f62625418bff
automated conversion using 2to3-3.9 tool
GP Orcullo <kinsamanka@gmail.com>
parents:
3704
diff
changeset
|
74 |
for i in range(UNDO_BUFFER_LENGTH): |
814 | 75 |
if i == 0: |
76 |
self.Buffer.append(currentstate) |
|
77 |
else: |
|
78 |
self.Buffer.append(None) |
|
79 |
# Initialising index of state saved |
|
80 |
if issaved: |
|
81 |
self.LastSave = 0 |
|
82 |
else: |
|
83 |
self.LastSave = -1 |
|
1411 | 84 |
|
814 | 85 |
def Buffering(self, currentstate): |
1736
7e61baa047f0
clean-up: fix PEP8 E302 expected 2 blank lines, found 1
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1735
diff
changeset
|
86 |
""" |
7e61baa047f0
clean-up: fix PEP8 E302 expected 2 blank lines, found 1
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1735
diff
changeset
|
87 |
Add a new state in buffer |
7e61baa047f0
clean-up: fix PEP8 E302 expected 2 blank lines, found 1
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1735
diff
changeset
|
88 |
""" |
814 | 89 |
self.CurrentIndex = (self.CurrentIndex + 1) % UNDO_BUFFER_LENGTH |
90 |
self.Buffer[self.CurrentIndex] = currentstate |
|
91 |
# Actualising buffer limits |
|
92 |
self.MaxIndex = self.CurrentIndex |
|
93 |
if self.MinIndex == self.CurrentIndex: |
|
94 |
# If the removed state was the state saved, there is no state saved in the buffer |
|
95 |
if self.LastSave == self.MinIndex: |
|
96 |
self.LastSave = -1 |
|
97 |
self.MinIndex = (self.MinIndex + 1) % UNDO_BUFFER_LENGTH |
|
98 |
self.MinIndex = max(self.MinIndex, 0) |
|
1411 | 99 |
|
814 | 100 |
def Current(self): |
1736
7e61baa047f0
clean-up: fix PEP8 E302 expected 2 blank lines, found 1
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1735
diff
changeset
|
101 |
""" |
7e61baa047f0
clean-up: fix PEP8 E302 expected 2 blank lines, found 1
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1735
diff
changeset
|
102 |
Return current state of buffer |
7e61baa047f0
clean-up: fix PEP8 E302 expected 2 blank lines, found 1
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1735
diff
changeset
|
103 |
""" |
814 | 104 |
return self.Buffer[self.CurrentIndex] |
1411 | 105 |
|
814 | 106 |
# Change current state to previous in buffer and return new current state |
107 |
def Previous(self): |
|
108 |
if self.CurrentIndex != self.MinIndex: |
|
109 |
self.CurrentIndex = (self.CurrentIndex - 1) % UNDO_BUFFER_LENGTH |
|
110 |
return self.Buffer[self.CurrentIndex] |
|
111 |
return None |
|
1411 | 112 |
|
814 | 113 |
# Change current state to next in buffer and return new current state |
114 |
def Next(self): |
|
115 |
if self.CurrentIndex != self.MaxIndex: |
|
116 |
self.CurrentIndex = (self.CurrentIndex + 1) % UNDO_BUFFER_LENGTH |
|
117 |
return self.Buffer[self.CurrentIndex] |
|
118 |
return None |
|
1411 | 119 |
|
814 | 120 |
# Return True if current state is the first in buffer |
121 |
def IsFirst(self): |
|
122 |
return self.CurrentIndex == self.MinIndex |
|
1411 | 123 |
|
814 | 124 |
# Return True if current state is the last in buffer |
125 |
def IsLast(self): |
|
126 |
return self.CurrentIndex == self.MaxIndex |
|
127 |
||
128 |
# Note that current state is saved |
|
129 |
def CurrentSaved(self): |
|
130 |
self.LastSave = self.CurrentIndex |
|
1411 | 131 |
|
814 | 132 |
# Return True if current state is saved |
133 |
def IsCurrentSaved(self): |
|
134 |
return self.LastSave == self.CurrentIndex |
|
135 |
||
136 |
||
1831
56b48961cc68
fix (old-style-class) Old-style class defined error for most parts of
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1785
diff
changeset
|
137 |
class PLCControler(object): |
1736
7e61baa047f0
clean-up: fix PEP8 E302 expected 2 blank lines, found 1
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1735
diff
changeset
|
138 |
""" |
1782
5b6ad7a7fd9d
clean-up: fix PEP8 E265 block comment should start with '# '
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1780
diff
changeset
|
139 |
Controler for PLCOpenEditor |
1736
7e61baa047f0
clean-up: fix PEP8 E302 expected 2 blank lines, found 1
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1735
diff
changeset
|
140 |
Class which controls the operations made on the plcopen model and answers to view requests |
7e61baa047f0
clean-up: fix PEP8 E302 expected 2 blank lines, found 1
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1735
diff
changeset
|
141 |
""" |
1411 | 142 |
|
814 | 143 |
# Create a new PLCControler |
144 |
def __init__(self): |
|
145 |
self.LastNewIndex = 0 |
|
146 |
self.Reset() |
|
1935
f2b0d849ea77
Prevent compiling XSLT on each call of GetInstanceList. To be continued. More optimization needed here. 100x would be fine...
Edouard Tisserant
parents:
1881
diff
changeset
|
147 |
self.InstancesPathCollector = InstancesPathCollector(self) |
1943
9dc0e38552b2
GetPouVariables optimized with XSLTModelQuery
Edouard Tisserant <edouard.tisserant@gmail.com>
parents:
1942
diff
changeset
|
148 |
self.POUVariablesCollector = POUVariablesCollector(self) |
1950
752ec68da94d
GetPouInstanceTagName optimized with XSLTModelQuery.
Edouard Tisserant
parents:
1948
diff
changeset
|
149 |
self.InstanceTagnameCollector = InstanceTagnameCollector(self) |
1957
2d1cc4f5e4ef
GetEditedElementInstancesInfos now optimized as well. Forgotten because not using [R.I.P]LibraryResolver, but still XSLT compiling was hapenning on each call.
Edouard Tisserant
parents:
1954
diff
changeset
|
150 |
self.BlockInstanceCollector = BlockInstanceCollector(self) |
1951
bbd1e1744c91
GetVariableDictionary and GetPouInterfaceReturnType optimized with new VariableInfoCollector based on XSLTModelQuery. Moved corresponding definitions out of PLCControler.py.
Edouard Tisserant
parents:
1950
diff
changeset
|
151 |
self.VariableInfoCollector = VariableInfoCollector(self) |
1411 | 152 |
|
814 | 153 |
# Reset PLCControler internal variables |
154 |
def Reset(self): |
|
155 |
self.Project = None |
|
156 |
self.ProjectBufferEnabled = True |
|
157 |
self.ProjectBuffer = None |
|
158 |
self.ProjectSaved = True |
|
159 |
self.Buffering = False |
|
160 |
self.FilePath = "" |
|
161 |
self.FileName = "" |
|
162 |
self.ProgramChunks = [] |
|
163 |
self.ProgramOffset = 0 |
|
164 |
self.NextCompiledProject = None |
|
165 |
self.CurrentCompiledProject = None |
|
166 |
self.ConfNodeTypes = [] |
|
1283
f3cfe1ff917e
More optimization attemps in type handling
Edouard Tisserant
parents:
1265
diff
changeset
|
167 |
self.TotalTypesDict = StdBlckDct.copy() |
f3cfe1ff917e
More optimization attemps in type handling
Edouard Tisserant
parents:
1265
diff
changeset
|
168 |
self.TotalTypes = StdBlckLst[:] |
1284 | 169 |
self.ProgramFilePath = "" |
1411 | 170 |
|
814 | 171 |
def GetQualifierTypes(self): |
1298
f034fb2b1aab
Fixed SFC block edition and SFC to SFC_textual code generating
Laurent Bessard
parents:
1297
diff
changeset
|
172 |
return QualifierList |
814 | 173 |
|
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1743
diff
changeset
|
174 |
def GetProject(self, debug=False): |
814 | 175 |
if debug and self.CurrentCompiledProject is not None: |
176 |
return self.CurrentCompiledProject |
|
177 |
else: |
|
178 |
return self.Project |
|
179 |
||
1782
5b6ad7a7fd9d
clean-up: fix PEP8 E265 block comment should start with '# '
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1780
diff
changeset
|
180 |
# ------------------------------------------------------------------------------- |
5b6ad7a7fd9d
clean-up: fix PEP8 E265 block comment should start with '# '
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1780
diff
changeset
|
181 |
# Project management functions |
5b6ad7a7fd9d
clean-up: fix PEP8 E265 block comment should start with '# '
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1780
diff
changeset
|
182 |
# ------------------------------------------------------------------------------- |
814 | 183 |
|
184 |
# Return if a project is opened |
|
185 |
def HasOpenedProject(self): |
|
186 |
return self.Project is not None |
|
187 |
||
188 |
# Create a new project by replacing the current one |
|
189 |
def CreateNewProject(self, properties): |
|
190 |
# Create the project |
|
1290
13ee5f4ab612
First stage of xmlclass refactoring using lxml
Laurent Bessard
parents:
1284
diff
changeset
|
191 |
self.Project = PLCOpenParser.CreateRoot() |
814 | 192 |
properties["creationDateTime"] = datetime.datetime(*localtime()[:6]) |
193 |
self.Project.setfileHeader(properties) |
|
194 |
self.Project.setcontentHeader(properties) |
|
195 |
self.SetFilePath("") |
|
1411 | 196 |
|
814 | 197 |
# Initialize the project buffer |
198 |
self.CreateProjectBuffer(False) |
|
199 |
self.ProgramChunks = [] |
|
200 |
self.ProgramOffset = 0 |
|
1299
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
201 |
self.NextCompiledProject = self.Copy(self.Project) |
814 | 202 |
self.CurrentCompiledProject = None |
203 |
self.Buffering = False |
|
1411 | 204 |
|
814 | 205 |
# Return project data type names |
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1743
diff
changeset
|
206 |
def GetProjectDataTypeNames(self, debug=False): |
814 | 207 |
project = self.GetProject(debug) |
208 |
if project is not None: |
|
209 |
return [datatype.getname() for datatype in project.getdataTypes()] |
|
210 |
return [] |
|
1411 | 211 |
|
814 | 212 |
# Return project pou names |
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1743
diff
changeset
|
213 |
def GetProjectPouNames(self, debug=False): |
814 | 214 |
project = self.GetProject(debug) |
215 |
if project is not None: |
|
216 |
return [pou.getname() for pou in project.getpous()] |
|
217 |
return [] |
|
1411 | 218 |
|
814 | 219 |
# Return project pou names |
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1743
diff
changeset
|
220 |
def GetProjectConfigNames(self, debug=False): |
814 | 221 |
project = self.GetProject(debug) |
222 |
if project is not None: |
|
223 |
return [config.getname() for config in project.getconfigurations()] |
|
224 |
return [] |
|
1411 | 225 |
|
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
|
226 |
# Return project pou variable names |
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1743
diff
changeset
|
227 |
def GetProjectPouVariableNames(self, pou_name=None, debug=False): |
814 | 228 |
variables = [] |
229 |
project = self.GetProject(debug) |
|
230 |
if project is not None: |
|
231 |
for pou in project.getpous(): |
|
232 |
if pou_name is None or pou_name == pou.getname(): |
|
1347
533741e5075c
Fixed pou variables information loading stylesheet
Laurent Bessard
parents:
1341
diff
changeset
|
233 |
variables.extend([var.Name for var in self.GetPouInterfaceVars(pou, debug=debug)]) |
814 | 234 |
for transition in pou.gettransitionList(): |
235 |
variables.append(transition.getname()) |
|
236 |
for action in pou.getactionList(): |
|
237 |
variables.append(action.getname()) |
|
238 |
return variables |
|
1411 | 239 |
|
814 | 240 |
# Return file path if project is an open file |
241 |
def GetFilePath(self): |
|
242 |
return self.FilePath |
|
1411 | 243 |
|
814 | 244 |
# Return file path if project is an open file |
245 |
def GetProgramFilePath(self): |
|
246 |
return self.ProgramFilePath |
|
1411 | 247 |
|
814 | 248 |
# Return file name and point out if file is up to date |
249 |
def GetFilename(self): |
|
250 |
if self.Project is not None: |
|
251 |
if self.ProjectIsSaved(): |
|
252 |
return self.FileName |
|
253 |
else: |
|
1734
750eeb7230a1
clean-up: fix some PEP8 E228 missing whitespace around modulo operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1732
diff
changeset
|
254 |
return "~%s~" % self.FileName |
814 | 255 |
return "" |
1411 | 256 |
|
814 | 257 |
# Change file path and save file name or create a default one if file path not defined |
258 |
def SetFilePath(self, filepath): |
|
259 |
self.FilePath = filepath |
|
260 |
if filepath == "": |
|
261 |
self.LastNewIndex += 1 |
|
1734
750eeb7230a1
clean-up: fix some PEP8 E228 missing whitespace around modulo operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1732
diff
changeset
|
262 |
self.FileName = _("Unnamed%d") % self.LastNewIndex |
814 | 263 |
else: |
264 |
self.FileName = os.path.splitext(os.path.basename(filepath))[0] |
|
1411 | 265 |
|
814 | 266 |
# Change project properties |
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1743
diff
changeset
|
267 |
def SetProjectProperties(self, name=None, properties=None, buffer=True): |
814 | 268 |
if self.Project is not None: |
269 |
if name is not None: |
|
270 |
self.Project.setname(name) |
|
271 |
if properties is not None: |
|
272 |
self.Project.setfileHeader(properties) |
|
273 |
self.Project.setcontentHeader(properties) |
|
274 |
if buffer and (name is not None or properties is not None): |
|
275 |
self.BufferProject() |
|
1411 | 276 |
|
814 | 277 |
# Return project name |
278 |
def GetProjectName(self, debug=False): |
|
279 |
project = self.GetProject(debug) |
|
280 |
if project is not None: |
|
281 |
return project.getname() |
|
282 |
return None |
|
1411 | 283 |
|
814 | 284 |
# Return project properties |
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1743
diff
changeset
|
285 |
def GetProjectProperties(self, debug=False): |
814 | 286 |
project = self.GetProject(debug) |
287 |
if project is not None: |
|
288 |
properties = project.getfileHeader() |
|
289 |
properties.update(project.getcontentHeader()) |
|
290 |
return properties |
|
291 |
return None |
|
1411 | 292 |
|
814 | 293 |
# Return project informations |
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1743
diff
changeset
|
294 |
def GetProjectInfos(self, debug=False): |
814 | 295 |
project = self.GetProject(debug) |
296 |
if project is not None: |
|
297 |
infos = {"name": project.getname(), "type": ITEM_PROJECT} |
|
1740
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
298 |
datatypes = {"name": DATA_TYPES, "type": ITEM_DATATYPES, "values": []} |
814 | 299 |
for datatype in project.getdataTypes(): |
1768
691083b5682a
clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1767
diff
changeset
|
300 |
datatypes["values"].append({ |
691083b5682a
clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1767
diff
changeset
|
301 |
"name": datatype.getname(), |
691083b5682a
clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1767
diff
changeset
|
302 |
"type": ITEM_DATATYPE, |
1948
b9a3f771aaab
Moved some definitions away from controller class, and adaped references them through all code.
Edouard Tisserant
parents:
1944
diff
changeset
|
303 |
"tagname": ComputeDataTypeName(datatype.getname()), |
1768
691083b5682a
clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1767
diff
changeset
|
304 |
"values": []}) |
1740
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
305 |
pou_types = { |
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
306 |
"function": { |
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
307 |
"name": FUNCTIONS, |
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
308 |
"type": ITEM_FUNCTION, |
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
309 |
"values": [] |
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
310 |
}, |
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
311 |
"functionBlock": { |
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
312 |
"name": FUNCTION_BLOCKS, |
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
313 |
"type": ITEM_FUNCTIONBLOCK, |
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
314 |
"values": [] |
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
315 |
}, |
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
316 |
"program": { |
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
317 |
"name": PROGRAMS, |
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
318 |
"type": ITEM_PROGRAM, |
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
319 |
"values": [] |
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
320 |
} |
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
321 |
} |
814 | 322 |
for pou in project.getpous(): |
323 |
pou_type = pou.getpouType() |
|
324 |
pou_infos = {"name": pou.getname(), "type": ITEM_POU, |
|
1948
b9a3f771aaab
Moved some definitions away from controller class, and adaped references them through all code.
Edouard Tisserant
parents:
1944
diff
changeset
|
325 |
"tagname": ComputePouName(pou.getname())} |
814 | 326 |
pou_values = [] |
327 |
if pou.getbodyType() == "SFC": |
|
328 |
transitions = [] |
|
329 |
for transition in pou.gettransitionList(): |
|
1768
691083b5682a
clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1767
diff
changeset
|
330 |
transitions.append({ |
691083b5682a
clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1767
diff
changeset
|
331 |
"name": transition.getname(), |
691083b5682a
clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1767
diff
changeset
|
332 |
"type": ITEM_TRANSITION, |
1948
b9a3f771aaab
Moved some definitions away from controller class, and adaped references them through all code.
Edouard Tisserant
parents:
1944
diff
changeset
|
333 |
"tagname": ComputePouTransitionName(pou.getname(), transition.getname()), |
814 | 334 |
"values": []}) |
335 |
pou_values.append({"name": TRANSITIONS, "type": ITEM_TRANSITIONS, "values": transitions}) |
|
336 |
actions = [] |
|
337 |
for action in pou.getactionList(): |
|
1768
691083b5682a
clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1767
diff
changeset
|
338 |
actions.append({ |
691083b5682a
clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1767
diff
changeset
|
339 |
"name": action.getname(), |
691083b5682a
clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1767
diff
changeset
|
340 |
"type": ITEM_ACTION, |
1948
b9a3f771aaab
Moved some definitions away from controller class, and adaped references them through all code.
Edouard Tisserant
parents:
1944
diff
changeset
|
341 |
"tagname": ComputePouActionName(pou.getname(), action.getname()), |
814 | 342 |
"values": []}) |
343 |
pou_values.append({"name": ACTIONS, "type": ITEM_ACTIONS, "values": actions}) |
|
344 |
if pou_type in pou_types: |
|
345 |
pou_infos["values"] = pou_values |
|
346 |
pou_types[pou_type]["values"].append(pou_infos) |
|
347 |
configurations = {"name": CONFIGURATIONS, "type": ITEM_CONFIGURATIONS, "values": []} |
|
348 |
for config in project.getconfigurations(): |
|
349 |
config_name = config.getname() |
|
1768
691083b5682a
clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1767
diff
changeset
|
350 |
config_infos = { |
691083b5682a
clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1767
diff
changeset
|
351 |
"name": config_name, |
691083b5682a
clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1767
diff
changeset
|
352 |
"type": ITEM_CONFIGURATION, |
1948
b9a3f771aaab
Moved some definitions away from controller class, and adaped references them through all code.
Edouard Tisserant
parents:
1944
diff
changeset
|
353 |
"tagname": ComputeConfigurationName(config.getname()), |
814 | 354 |
"values": []} |
355 |
resources = {"name": RESOURCES, "type": ITEM_RESOURCES, "values": []} |
|
356 |
for resource in config.getresource(): |
|
357 |
resource_name = resource.getname() |
|
1768
691083b5682a
clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1767
diff
changeset
|
358 |
resource_infos = { |
691083b5682a
clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1767
diff
changeset
|
359 |
"name": resource_name, |
691083b5682a
clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1767
diff
changeset
|
360 |
"type": ITEM_RESOURCE, |
1948
b9a3f771aaab
Moved some definitions away from controller class, and adaped references them through all code.
Edouard Tisserant
parents:
1944
diff
changeset
|
361 |
"tagname": ComputeConfigurationResourceName(config.getname(), resource.getname()), |
814 | 362 |
"values": []} |
363 |
resources["values"].append(resource_infos) |
|
364 |
config_infos["values"] = [resources] |
|
365 |
configurations["values"].append(config_infos) |
|
1411 | 366 |
infos["values"] = [datatypes, pou_types["function"], pou_types["functionBlock"], |
814 | 367 |
pou_types["program"], configurations] |
368 |
return infos |
|
369 |
return None |
|
370 |
||
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1743
diff
changeset
|
371 |
def GetPouVariables(self, tagname, debug=False): |
814 | 372 |
project = self.GetProject(debug) |
373 |
if project is not None: |
|
1348
aee0a7eb833a
Fixed pou variables instance information loading stylesheet
Laurent Bessard
parents:
1347
diff
changeset
|
374 |
obj = None |
814 | 375 |
words = tagname.split("::") |
376 |
if words[0] == "P": |
|
1319
748347102c97
Replaced old list of pou instance in project generating process by xslt stylesheet
Laurent Bessard
parents:
1316
diff
changeset
|
377 |
obj = self.GetPou(words[1], debug) |
1348
aee0a7eb833a
Fixed pou variables instance information loading stylesheet
Laurent Bessard
parents:
1347
diff
changeset
|
378 |
elif words[0] != "D": |
1319
748347102c97
Replaced old list of pou instance in project generating process by xslt stylesheet
Laurent Bessard
parents:
1316
diff
changeset
|
379 |
obj = self.GetEditedElement(tagname, debug) |
748347102c97
Replaced old list of pou instance in project generating process by xslt stylesheet
Laurent Bessard
parents:
1316
diff
changeset
|
380 |
if obj is not None: |
1943
9dc0e38552b2
GetPouVariables optimized with XSLTModelQuery
Edouard Tisserant <edouard.tisserant@gmail.com>
parents:
1942
diff
changeset
|
381 |
return self.POUVariablesCollector.Collect(obj, debug) |
1411 | 382 |
|
1321
83f41ea00b97
Replaced old pou instance type tagname computing by xslt stylesheet
Laurent Bessard
parents:
1319
diff
changeset
|
383 |
return None |
1319
748347102c97
Replaced old list of pou instance in project generating process by xslt stylesheet
Laurent Bessard
parents:
1316
diff
changeset
|
384 |
|
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1743
diff
changeset
|
385 |
def GetInstanceList(self, root, name, debug=False): |
1939
db478d17bc3a
Added a class to speedup all XSLT queries. WIP, now only for instances_path.xslt / GetInstanceList()
Edouard Tisserant <edouard.tisserant@gmail.com>
parents:
1937
diff
changeset
|
386 |
return self.InstancesPathCollector.Collect(root, name, debug) |
1411 | 387 |
|
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1743
diff
changeset
|
388 |
def SearchPouInstances(self, tagname, debug=False): |
1319
748347102c97
Replaced old list of pou instance in project generating process by xslt stylesheet
Laurent Bessard
parents:
1316
diff
changeset
|
389 |
project = self.GetProject(debug) |
748347102c97
Replaced old list of pou instance in project generating process by xslt stylesheet
Laurent Bessard
parents:
1316
diff
changeset
|
390 |
if project is not None: |
748347102c97
Replaced old list of pou instance in project generating process by xslt stylesheet
Laurent Bessard
parents:
1316
diff
changeset
|
391 |
words = tagname.split("::") |
748347102c97
Replaced old list of pou instance in project generating process by xslt stylesheet
Laurent Bessard
parents:
1316
diff
changeset
|
392 |
if words[0] == "P": |
1350
7280349a3375
Fixed pou instance path list computing stylesheet
Laurent Bessard
parents:
1348
diff
changeset
|
393 |
return self.GetInstanceList(project, words[1]) |
814 | 394 |
elif words[0] == 'C': |
395 |
return [words[1]] |
|
396 |
elif words[0] == 'R': |
|
397 |
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
|
398 |
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
|
399 |
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
|
400 |
for instance in self.SearchPouInstances( |
1948
b9a3f771aaab
Moved some definitions away from controller class, and adaped references them through all code.
Edouard Tisserant
parents:
1944
diff
changeset
|
401 |
ComputePouName(words[1]), debug)] |
814 | 402 |
return [] |
1411 | 403 |
|
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1743
diff
changeset
|
404 |
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
|
405 |
project = self.GetProject(debug) |
1953
5736d25bb393
PEP8 and PyLint conformance: whitespaces and stuff
Edouard Tisserant
parents:
1951
diff
changeset
|
406 |
if project is not None: |
1950
752ec68da94d
GetPouInstanceTagName optimized with XSLTModelQuery.
Edouard Tisserant
parents:
1948
diff
changeset
|
407 |
return self.InstanceTagnameCollector.Collect(project, |
752ec68da94d
GetPouInstanceTagName optimized with XSLTModelQuery.
Edouard Tisserant
parents:
1948
diff
changeset
|
408 |
debug, |
752ec68da94d
GetPouInstanceTagName optimized with XSLTModelQuery.
Edouard Tisserant
parents:
1948
diff
changeset
|
409 |
instance_path) |
1411 | 410 |
|
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1743
diff
changeset
|
411 |
def GetInstanceInfos(self, instance_path, debug=False): |
814 | 412 |
tagname = self.GetPouInstanceTagName(instance_path) |
413 |
if tagname is not None: |
|
827
a2ce084fb598
Fix restore project tab layout with transition and action debug tabs
laurent
parents:
826
diff
changeset
|
414 |
infos = self.GetPouVariables(tagname, debug) |
1360
ebfe9c22af2a
Fixed bug when debugging PLC with Graphic Viewer in debug open and re-transfer PLC
Laurent Bessard
parents:
1354
diff
changeset
|
415 |
infos.type = tagname |
827
a2ce084fb598
Fix restore project tab layout with transition and action debug tabs
laurent
parents:
826
diff
changeset
|
416 |
return infos |
814 | 417 |
else: |
418 |
pou_path, var_name = instance_path.rsplit(".", 1) |
|
419 |
tagname = self.GetPouInstanceTagName(pou_path) |
|
420 |
if tagname is not None: |
|
421 |
pou_infos = self.GetPouVariables(tagname, debug) |
|
1360
ebfe9c22af2a
Fixed bug when debugging PLC with Graphic Viewer in debug open and re-transfer PLC
Laurent Bessard
parents:
1354
diff
changeset
|
422 |
for var_infos in pou_infos.variables: |
ebfe9c22af2a
Fixed bug when debugging PLC with Graphic Viewer in debug open and re-transfer PLC
Laurent Bessard
parents:
1354
diff
changeset
|
423 |
if var_infos.name == var_name: |
814 | 424 |
return var_infos |
425 |
return None |
|
1411 | 426 |
|
814 | 427 |
# Return if data type given by name is used by another data type or pou |
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1743
diff
changeset
|
428 |
def DataTypeIsUsed(self, name, debug=False): |
1319
748347102c97
Replaced old list of pou instance in project generating process by xslt stylesheet
Laurent Bessard
parents:
1316
diff
changeset
|
429 |
project = self.GetProject(debug) |
748347102c97
Replaced old list of pou instance in project generating process by xslt stylesheet
Laurent Bessard
parents:
1316
diff
changeset
|
430 |
if project is not None: |
1354
241c19ea80da
Fixed bug when selecting pou that is not used in project
Laurent Bessard
parents:
1351
diff
changeset
|
431 |
return len(self.GetInstanceList(project, name, debug)) > 0 |
814 | 432 |
return False |
433 |
||
434 |
# Return if pou given by name is used by another pou |
|
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1743
diff
changeset
|
435 |
def PouIsUsed(self, name, debug=False): |
1319
748347102c97
Replaced old list of pou instance in project generating process by xslt stylesheet
Laurent Bessard
parents:
1316
diff
changeset
|
436 |
project = self.GetProject(debug) |
748347102c97
Replaced old list of pou instance in project generating process by xslt stylesheet
Laurent Bessard
parents:
1316
diff
changeset
|
437 |
if project is not None: |
1354
241c19ea80da
Fixed bug when selecting pou that is not used in project
Laurent Bessard
parents:
1351
diff
changeset
|
438 |
return len(self.GetInstanceList(project, name, debug)) > 0 |
814 | 439 |
return False |
440 |
||
441 |
# Return if pou given by name is directly or undirectly used by the reference pou |
|
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1743
diff
changeset
|
442 |
def PouIsUsedBy(self, name, reference, debug=False): |
1319
748347102c97
Replaced old list of pou instance in project generating process by xslt stylesheet
Laurent Bessard
parents:
1316
diff
changeset
|
443 |
pou_infos = self.GetPou(reference, debug) |
748347102c97
Replaced old list of pou instance in project generating process by xslt stylesheet
Laurent Bessard
parents:
1316
diff
changeset
|
444 |
if pou_infos is not None: |
1354
241c19ea80da
Fixed bug when selecting pou that is not used in project
Laurent Bessard
parents:
1351
diff
changeset
|
445 |
return len(self.GetInstanceList(pou_infos, name, debug)) > 0 |
814 | 446 |
return False |
447 |
||
3704
c17fac18c663
ST code generator: when including PLCopen TC6 XML libraries (for example py_ext/pous.xml or NativeLib.xml), also includes libraries globals in result
Edouard Tisserant
parents:
2739
diff
changeset
|
448 |
def GenerateProgram(self, filepath=None, **kwargs): |
814 | 449 |
errors = [] |
450 |
warnings = [] |
|
451 |
if self.Project is not None: |
|
452 |
try: |
|
3704
c17fac18c663
ST code generator: when including PLCopen TC6 XML libraries (for example py_ext/pous.xml or NativeLib.xml), also includes libraries globals in result
Edouard Tisserant
parents:
2739
diff
changeset
|
453 |
self.ProgramChunks = GenerateCurrentProgram(self, self.Project, errors, warnings,**kwargs) |
1299
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
454 |
self.NextCompiledProject = self.Copy(self.Project) |
901
ab43f3e40b9d
Fix bug when compiling project containing non-ascii characters
Laurent Bessard
parents:
887
diff
changeset
|
455 |
program_text = "".join([item[0] for item in self.ProgramChunks]) |
814 | 456 |
if filepath is not None: |
3755 | 457 |
programfile = open(filepath, "w", encoding='utf-8') |
458 |
programfile.write(program_text) |
|
814 | 459 |
programfile.close() |
460 |
self.ProgramFilePath = filepath |
|
461 |
return program_text, errors, warnings |
|
2418
5587c490a070
Use python 3 compatible exception syntax everywhere
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1973
diff
changeset
|
462 |
except PLCGenException as ex: |
2520
3a1c0c161f80
Fix backtrace on printing localized (non-ascii) error message in PLCGenerator.
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2457
diff
changeset
|
463 |
errors.append(ex) |
814 | 464 |
else: |
465 |
errors.append("No project opened") |
|
466 |
return "", errors, warnings |
|
467 |
||
468 |
def DebugAvailable(self): |
|
469 |
return self.CurrentCompiledProject is not None |
|
470 |
||
471 |
def ProgramTransferred(self): |
|
472 |
if self.NextCompiledProject is None: |
|
473 |
self.CurrentCompiledProject = self.NextCompiledProject |
|
474 |
else: |
|
475 |
self.CurrentCompiledProject = self.Copy(self.Project) |
|
476 |
||
477 |
def GetChunkInfos(self, from_location, to_location): |
|
478 |
row = self.ProgramOffset + 1 |
|
479 |
col = 1 |
|
480 |
infos = [] |
|
481 |
for chunk, chunk_infos in self.ProgramChunks: |
|
482 |
lines = chunk.split("\n") |
|
483 |
if len(lines) > 1: |
|
484 |
next_row = row + len(lines) - 1 |
|
485 |
next_col = len(lines[-1]) + 1 |
|
486 |
else: |
|
487 |
next_row = row |
|
488 |
next_col = col + len(chunk) |
|
489 |
if (next_row > from_location[0] or next_row == from_location[0] and next_col >= from_location[1]) and len(chunk_infos) > 0: |
|
490 |
infos.append((chunk_infos, (row, col))) |
|
491 |
if next_row == to_location[0] and next_col > to_location[1] or next_row > to_location[0]: |
|
492 |
return infos |
|
493 |
row, col = next_row, next_col |
|
494 |
return infos |
|
1411 | 495 |
|
1782
5b6ad7a7fd9d
clean-up: fix PEP8 E265 block comment should start with '# '
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1780
diff
changeset
|
496 |
# ------------------------------------------------------------------------------- |
5b6ad7a7fd9d
clean-up: fix PEP8 E265 block comment should start with '# '
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1780
diff
changeset
|
497 |
# Project Pous management functions |
5b6ad7a7fd9d
clean-up: fix PEP8 E265 block comment should start with '# '
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1780
diff
changeset
|
498 |
# ------------------------------------------------------------------------------- |
1411 | 499 |
|
814 | 500 |
# Add a Data Type to Project |
501 |
def ProjectAddDataType(self, datatype_name=None): |
|
502 |
if self.Project is not None: |
|
503 |
if datatype_name is None: |
|
504 |
datatype_name = self.GenerateNewName(None, None, "datatype%d") |
|
505 |
# Add the datatype to project |
|
506 |
self.Project.appenddataType(datatype_name) |
|
507 |
self.BufferProject() |
|
1948
b9a3f771aaab
Moved some definitions away from controller class, and adaped references them through all code.
Edouard Tisserant
parents:
1944
diff
changeset
|
508 |
return ComputeDataTypeName(datatype_name) |
814 | 509 |
return None |
1411 | 510 |
|
814 | 511 |
# Remove a Data Type from project |
512 |
def ProjectRemoveDataType(self, datatype_name): |
|
513 |
if self.Project is not None: |
|
514 |
self.Project.removedataType(datatype_name) |
|
515 |
self.BufferProject() |
|
1411 | 516 |
|
814 | 517 |
# Add a Pou to Project |
518 |
def ProjectAddPou(self, pou_name, pou_type, body_type): |
|
519 |
if self.Project is not None: |
|
520 |
# Add the pou to project |
|
521 |
self.Project.appendpou(pou_name, pou_type, body_type) |
|
522 |
if pou_type == "function": |
|
523 |
self.SetPouInterfaceReturnType(pou_name, "BOOL") |
|
524 |
self.BufferProject() |
|
1948
b9a3f771aaab
Moved some definitions away from controller class, and adaped references them through all code.
Edouard Tisserant
parents:
1944
diff
changeset
|
525 |
return ComputePouName(pou_name) |
814 | 526 |
return None |
1411 | 527 |
|
814 | 528 |
def ProjectChangePouType(self, name, pou_type): |
529 |
if self.Project is not None: |
|
530 |
pou = self.Project.getpou(name) |
|
531 |
if pou is not None: |
|
2614
6b4061f6ced6
'Change POU Type To' becomes 'Duplicate as...', avoiding side effects of type change when POU is already instanciated. Also remove leftover returType tag in ex-function POUs, triggering exceptions at build time.
Edouard Tisserant
parents:
2551
diff
changeset
|
532 |
new_pou = self.Copy(pou) |
6b4061f6ced6
'Change POU Type To' becomes 'Duplicate as...', avoiding side effects of type change when POU is already instanciated. Also remove leftover returType tag in ex-function POUs, triggering exceptions at build time.
Edouard Tisserant
parents:
2551
diff
changeset
|
533 |
idx = 0 |
6b4061f6ced6
'Change POU Type To' becomes 'Duplicate as...', avoiding side effects of type change when POU is already instanciated. Also remove leftover returType tag in ex-function POUs, triggering exceptions at build time.
Edouard Tisserant
parents:
2551
diff
changeset
|
534 |
new_name = name + "_" + pou_type |
6b4061f6ced6
'Change POU Type To' becomes 'Duplicate as...', avoiding side effects of type change when POU is already instanciated. Also remove leftover returType tag in ex-function POUs, triggering exceptions at build time.
Edouard Tisserant
parents:
2551
diff
changeset
|
535 |
while self.Project.getpou(new_name) is not None: |
6b4061f6ced6
'Change POU Type To' becomes 'Duplicate as...', avoiding side effects of type change when POU is already instanciated. Also remove leftover returType tag in ex-function POUs, triggering exceptions at build time.
Edouard Tisserant
parents:
2551
diff
changeset
|
536 |
idx += 1 |
6b4061f6ced6
'Change POU Type To' becomes 'Duplicate as...', avoiding side effects of type change when POU is already instanciated. Also remove leftover returType tag in ex-function POUs, triggering exceptions at build time.
Edouard Tisserant
parents:
2551
diff
changeset
|
537 |
new_name = "%s%d" % (name, idx) |
6b4061f6ced6
'Change POU Type To' becomes 'Duplicate as...', avoiding side effects of type change when POU is already instanciated. Also remove leftover returType tag in ex-function POUs, triggering exceptions at build time.
Edouard Tisserant
parents:
2551
diff
changeset
|
538 |
new_pou.setname(new_name) |
6b4061f6ced6
'Change POU Type To' becomes 'Duplicate as...', avoiding side effects of type change when POU is already instanciated. Also remove leftover returType tag in ex-function POUs, triggering exceptions at build time.
Edouard Tisserant
parents:
2551
diff
changeset
|
539 |
|
6b4061f6ced6
'Change POU Type To' becomes 'Duplicate as...', avoiding side effects of type change when POU is already instanciated. Also remove leftover returType tag in ex-function POUs, triggering exceptions at build time.
Edouard Tisserant
parents:
2551
diff
changeset
|
540 |
orig_type = pou.getpouType() |
6b4061f6ced6
'Change POU Type To' becomes 'Duplicate as...', avoiding side effects of type change when POU is already instanciated. Also remove leftover returType tag in ex-function POUs, triggering exceptions at build time.
Edouard Tisserant
parents:
2551
diff
changeset
|
541 |
if orig_type == 'function' and pou_type in ['functionBlock', 'program']: |
2625
e5ce6c4a8672
Fixed code quality according to pep8 and pylint.
Edouard Tisserant <edouard.tisserant@gmail.com>
parents:
2614
diff
changeset
|
542 |
# delete return type |
2614
6b4061f6ced6
'Change POU Type To' becomes 'Duplicate as...', avoiding side effects of type change when POU is already instanciated. Also remove leftover returType tag in ex-function POUs, triggering exceptions at build time.
Edouard Tisserant
parents:
2551
diff
changeset
|
543 |
return_type_obj = new_pou.interface.getreturnType() |
6b4061f6ced6
'Change POU Type To' becomes 'Duplicate as...', avoiding side effects of type change when POU is already instanciated. Also remove leftover returType tag in ex-function POUs, triggering exceptions at build time.
Edouard Tisserant
parents:
2551
diff
changeset
|
544 |
new_pou.interface.remove(return_type_obj) |
2625
e5ce6c4a8672
Fixed code quality according to pep8 and pylint.
Edouard Tisserant <edouard.tisserant@gmail.com>
parents:
2614
diff
changeset
|
545 |
# To be ultimately correct we could re-create an |
e5ce6c4a8672
Fixed code quality according to pep8 and pylint.
Edouard Tisserant <edouard.tisserant@gmail.com>
parents:
2614
diff
changeset
|
546 |
# output variable with same name+_out or so |
e5ce6c4a8672
Fixed code quality according to pep8 and pylint.
Edouard Tisserant <edouard.tisserant@gmail.com>
parents:
2614
diff
changeset
|
547 |
# but in any case user will have to connect/assign |
2614
6b4061f6ced6
'Change POU Type To' becomes 'Duplicate as...', avoiding side effects of type change when POU is already instanciated. Also remove leftover returType tag in ex-function POUs, triggering exceptions at build time.
Edouard Tisserant
parents:
2551
diff
changeset
|
548 |
# this output, so better leave it as-is |
6b4061f6ced6
'Change POU Type To' becomes 'Duplicate as...', avoiding side effects of type change when POU is already instanciated. Also remove leftover returType tag in ex-function POUs, triggering exceptions at build time.
Edouard Tisserant
parents:
2551
diff
changeset
|
549 |
|
6b4061f6ced6
'Change POU Type To' becomes 'Duplicate as...', avoiding side effects of type change when POU is already instanciated. Also remove leftover returType tag in ex-function POUs, triggering exceptions at build time.
Edouard Tisserant
parents:
2551
diff
changeset
|
550 |
new_pou.setpouType(pou_type) |
6b4061f6ced6
'Change POU Type To' becomes 'Duplicate as...', avoiding side effects of type change when POU is already instanciated. Also remove leftover returType tag in ex-function POUs, triggering exceptions at build time.
Edouard Tisserant
parents:
2551
diff
changeset
|
551 |
self.Project.insertpou(0, new_pou) |
814 | 552 |
self.BufferProject() |
1411 | 553 |
|
814 | 554 |
def GetPouXml(self, pou_name): |
555 |
if self.Project is not None: |
|
556 |
pou = self.Project.getpou(pou_name) |
|
557 |
if pou is not None: |
|
1299
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
558 |
return pou.tostring() |
814 | 559 |
return None |
1411 | 560 |
|
814 | 561 |
def PastePou(self, pou_type, pou_xml): |
562 |
''' |
|
563 |
Adds the POU defined by 'pou_xml' to the current project with type 'pou_type' |
|
564 |
''' |
|
565 |
try: |
|
1330
96b242e4c59d
Added support for loading XML file even if not following XSD schema (but still following XML syntax), warning user of errors in XML file
Laurent Bessard
parents:
1328
diff
changeset
|
566 |
new_pou, error = LoadPou(pou_xml) |
1780
c52d1460cea8
clean-up: fix PEP8 E722 do not use bare except'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1779
diff
changeset
|
567 |
except Exception: |
1330
96b242e4c59d
Added support for loading XML file even if not following XSD schema (but still following XML syntax), warning user of errors in XML file
Laurent Bessard
parents:
1328
diff
changeset
|
568 |
error = "" |
96b242e4c59d
Added support for loading XML file even if not following XSD schema (but still following XML syntax), warning user of errors in XML file
Laurent Bessard
parents:
1328
diff
changeset
|
569 |
if error is not None: |
814 | 570 |
return _("Couldn't paste non-POU object.") |
1411 | 571 |
|
1299
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
572 |
name = new_pou.getname() |
1411 | 573 |
|
1299
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
574 |
idx = 0 |
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
575 |
new_name = name |
1411 | 576 |
while self.Project.getpou(new_name) is not None: |
1299
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
577 |
# a POU with that name already exists. |
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
578 |
# 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
|
579 |
# append an incrementing numeric suffix to the POU name. |
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
580 |
idx += 1 |
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
581 |
new_name = "%s%d" % (name, idx) |
1411 | 582 |
|
1299
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
583 |
# 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
|
584 |
new_pou.setname(new_name) |
1411 | 585 |
|
1299
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
586 |
if pou_type is not None: |
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
587 |
orig_type = new_pou.getpouType() |
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
588 |
|
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
589 |
# prevent violations of POU content restrictions: |
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
590 |
# function blocks cannot be pasted as functions, |
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
591 |
# programs cannot be pasted as functions or function blocks |
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
592 |
if orig_type == 'functionBlock' and pou_type == 'function' or \ |
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
593 |
orig_type == 'program' and pou_type in ['function', 'functionBlock']: |
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1743
diff
changeset
|
594 |
msg = _('''{a1} "{a2}" can't be pasted as a {a3}.''').format(a1=orig_type, a2=name, a3=pou_type) |
1581
2295fdc5c271
fix translation strings with multiple parameters
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1571
diff
changeset
|
595 |
return msg |
1411 | 596 |
|
1299
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
597 |
new_pou.setpouType(pou_type) |
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
598 |
|
1411 | 599 |
self.Project.insertpou(0, new_pou) |
1299
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
600 |
self.BufferProject() |
1411 | 601 |
|
1948
b9a3f771aaab
Moved some definitions away from controller class, and adaped references them through all code.
Edouard Tisserant
parents:
1944
diff
changeset
|
602 |
return ComputePouName(new_name), |
814 | 603 |
|
604 |
# Remove a Pou from project |
|
605 |
def ProjectRemovePou(self, pou_name): |
|
606 |
if self.Project is not None: |
|
607 |
self.Project.removepou(pou_name) |
|
608 |
self.BufferProject() |
|
1411 | 609 |
|
814 | 610 |
# Return the name of the configuration if only one exist |
611 |
def GetProjectMainConfigurationName(self): |
|
612 |
if self.Project is not None: |
|
613 |
# Found the configuration corresponding to old name and change its name to new name |
|
614 |
configurations = self.Project.getconfigurations() |
|
615 |
if len(configurations) == 1: |
|
616 |
return configurations[0].getname() |
|
617 |
return None |
|
1411 | 618 |
|
814 | 619 |
# Add a configuration to Project |
620 |
def ProjectAddConfiguration(self, config_name=None): |
|
621 |
if self.Project is not None: |
|
622 |
if config_name is None: |
|
623 |
config_name = self.GenerateNewName(None, None, "configuration%d") |
|
624 |
self.Project.addconfiguration(config_name) |
|
625 |
self.BufferProject() |
|
1948
b9a3f771aaab
Moved some definitions away from controller class, and adaped references them through all code.
Edouard Tisserant
parents:
1944
diff
changeset
|
626 |
return ComputeConfigurationName(config_name) |
814 | 627 |
return None |
1411 | 628 |
|
814 | 629 |
# Remove a configuration from project |
630 |
def ProjectRemoveConfiguration(self, config_name): |
|
631 |
if self.Project is not None: |
|
632 |
self.Project.removeconfiguration(config_name) |
|
633 |
self.BufferProject() |
|
1411 | 634 |
|
814 | 635 |
# Add a resource to a configuration of the Project |
636 |
def ProjectAddConfigurationResource(self, config_name, resource_name=None): |
|
637 |
if self.Project is not None: |
|
638 |
if resource_name is None: |
|
639 |
resource_name = self.GenerateNewName(None, None, "resource%d") |
|
640 |
self.Project.addconfigurationResource(config_name, resource_name) |
|
641 |
self.BufferProject() |
|
1948
b9a3f771aaab
Moved some definitions away from controller class, and adaped references them through all code.
Edouard Tisserant
parents:
1944
diff
changeset
|
642 |
return ComputeConfigurationResourceName(config_name, resource_name) |
814 | 643 |
return None |
1411 | 644 |
|
814 | 645 |
# Remove a resource from a configuration of the project |
646 |
def ProjectRemoveConfigurationResource(self, config_name, resource_name): |
|
647 |
if self.Project is not None: |
|
648 |
self.Project.removeconfigurationResource(config_name, resource_name) |
|
649 |
self.BufferProject() |
|
1411 | 650 |
|
814 | 651 |
# Add a Transition to a Project Pou |
652 |
def ProjectAddPouTransition(self, pou_name, transition_name, transition_type): |
|
653 |
if self.Project is not None: |
|
654 |
pou = self.Project.getpou(pou_name) |
|
655 |
if pou is not None: |
|
656 |
pou.addtransition(transition_name, transition_type) |
|
657 |
self.BufferProject() |
|
1948
b9a3f771aaab
Moved some definitions away from controller class, and adaped references them through all code.
Edouard Tisserant
parents:
1944
diff
changeset
|
658 |
return ComputePouTransitionName(pou_name, transition_name) |
814 | 659 |
return None |
1411 | 660 |
|
814 | 661 |
# Remove a Transition from a Project Pou |
662 |
def ProjectRemovePouTransition(self, pou_name, transition_name): |
|
663 |
# Search if the pou removed is currently opened |
|
664 |
if self.Project is not None: |
|
665 |
pou = self.Project.getpou(pou_name) |
|
666 |
if pou is not None: |
|
667 |
pou.removetransition(transition_name) |
|
668 |
self.BufferProject() |
|
1411 | 669 |
|
814 | 670 |
# Add an Action to a Project Pou |
671 |
def ProjectAddPouAction(self, pou_name, action_name, action_type): |
|
672 |
if self.Project is not None: |
|
673 |
pou = self.Project.getpou(pou_name) |
|
674 |
if pou is not None: |
|
675 |
pou.addaction(action_name, action_type) |
|
676 |
self.BufferProject() |
|
1948
b9a3f771aaab
Moved some definitions away from controller class, and adaped references them through all code.
Edouard Tisserant
parents:
1944
diff
changeset
|
677 |
return ComputePouActionName(pou_name, action_name) |
814 | 678 |
return None |
1411 | 679 |
|
814 | 680 |
# Remove an Action from a Project Pou |
681 |
def ProjectRemovePouAction(self, pou_name, action_name): |
|
682 |
# Search if the pou removed is currently opened |
|
683 |
if self.Project is not None: |
|
684 |
pou = self.Project.getpou(pou_name) |
|
685 |
if pou is not None: |
|
686 |
pou.removeaction(action_name) |
|
687 |
self.BufferProject() |
|
1411 | 688 |
|
814 | 689 |
# Change the name of a pou |
690 |
def ChangeDataTypeName(self, old_name, new_name): |
|
691 |
if self.Project is not None: |
|
692 |
# Found the pou corresponding to old name and change its name to new name |
|
693 |
datatype = self.Project.getdataType(old_name) |
|
694 |
if datatype is not None: |
|
695 |
datatype.setname(new_name) |
|
696 |
self.Project.updateElementName(old_name, new_name) |
|
697 |
self.BufferProject() |
|
1411 | 698 |
|
814 | 699 |
# Change the name of a pou |
700 |
def ChangePouName(self, old_name, new_name): |
|
701 |
if self.Project is not None: |
|
702 |
# Found the pou corresponding to old name and change its name to new name |
|
703 |
pou = self.Project.getpou(old_name) |
|
704 |
if pou is not None: |
|
705 |
pou.setname(new_name) |
|
706 |
self.Project.updateElementName(old_name, new_name) |
|
707 |
self.BufferProject() |
|
1411 | 708 |
|
814 | 709 |
# Change the name of a pou transition |
710 |
def ChangePouTransitionName(self, pou_name, old_name, new_name): |
|
711 |
if self.Project is not None: |
|
712 |
# Found the pou transition corresponding to old name and change its name to new name |
|
713 |
pou = self.Project.getpou(pou_name) |
|
714 |
if pou is not None: |
|
715 |
transition = pou.gettransition(old_name) |
|
716 |
if transition is not None: |
|
717 |
transition.setname(new_name) |
|
718 |
pou.updateElementName(old_name, new_name) |
|
719 |
self.BufferProject() |
|
1411 | 720 |
|
814 | 721 |
# Change the name of a pou action |
722 |
def ChangePouActionName(self, pou_name, old_name, new_name): |
|
723 |
if self.Project is not None: |
|
724 |
# Found the pou action corresponding to old name and change its name to new name |
|
725 |
pou = self.Project.getpou(pou_name) |
|
726 |
if pou is not None: |
|
727 |
action = pou.getaction(old_name) |
|
728 |
if action is not None: |
|
729 |
action.setname(new_name) |
|
730 |
pou.updateElementName(old_name, new_name) |
|
731 |
self.BufferProject() |
|
1411 | 732 |
|
814 | 733 |
# Change the name of a pou variable |
734 |
def ChangePouVariableName(self, pou_name, old_name, new_name): |
|
735 |
if self.Project is not None: |
|
736 |
# Found the pou action corresponding to old name and change its name to new name |
|
737 |
pou = self.Project.getpou(pou_name) |
|
738 |
if pou is not None: |
|
1847
6198190bc121
explicitly mark unused variables found by pylint with _ or dummy
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1846
diff
changeset
|
739 |
for _type, varlist in pou.getvars(): |
814 | 740 |
for var in varlist.getvariable(): |
741 |
if var.getname() == old_name: |
|
742 |
var.setname(new_name) |
|
743 |
self.BufferProject() |
|
1411 | 744 |
|
814 | 745 |
# Change the name of a configuration |
746 |
def ChangeConfigurationName(self, old_name, new_name): |
|
747 |
if self.Project is not None: |
|
748 |
# Found the configuration corresponding to old name and change its name to new name |
|
749 |
configuration = self.Project.getconfiguration(old_name) |
|
750 |
if configuration is not None: |
|
751 |
configuration.setname(new_name) |
|
752 |
self.BufferProject() |
|
1411 | 753 |
|
814 | 754 |
# Change the name of a configuration resource |
755 |
def ChangeConfigurationResourceName(self, config_name, old_name, new_name): |
|
756 |
if self.Project is not None: |
|
757 |
# Found the resource corresponding to old name and change its name to new name |
|
758 |
resource = self.Project.getconfigurationResource(config_name, old_name) |
|
759 |
if resource is not None: |
|
760 |
resource.setname(new_name) |
|
761 |
self.BufferProject() |
|
1411 | 762 |
|
814 | 763 |
# Return the description of the pou given by its name |
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1743
diff
changeset
|
764 |
def GetPouDescription(self, name, debug=False): |
814 | 765 |
project = self.GetProject(debug) |
766 |
if project is not None: |
|
767 |
# Found the pou correponding to name and return its type |
|
768 |
pou = project.getpou(name) |
|
769 |
if pou is not None: |
|
770 |
return pou.getdescription() |
|
771 |
return "" |
|
1411 | 772 |
|
814 | 773 |
# Return the description of the pou given by its name |
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1743
diff
changeset
|
774 |
def SetPouDescription(self, name, description, debug=False): |
814 | 775 |
project = self.GetProject(debug) |
776 |
if project is not None: |
|
777 |
# Found the pou correponding to name and return its type |
|
778 |
pou = project.getpou(name) |
|
779 |
if pou is not None: |
|
780 |
pou.setdescription(description) |
|
781 |
self.BufferProject() |
|
1411 | 782 |
|
814 | 783 |
# Return the type of the pou given by its name |
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1743
diff
changeset
|
784 |
def GetPouType(self, name, debug=False): |
814 | 785 |
project = self.GetProject(debug) |
786 |
if project is not None: |
|
787 |
# Found the pou correponding to name and return its type |
|
788 |
pou = project.getpou(name) |
|
789 |
if pou is not None: |
|
790 |
return pou.getpouType() |
|
791 |
return None |
|
1411 | 792 |
|
814 | 793 |
# Return pous with SFC language |
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1743
diff
changeset
|
794 |
def GetSFCPous(self, debug=False): |
814 | 795 |
list = [] |
796 |
project = self.GetProject(debug) |
|
797 |
if project is not None: |
|
798 |
for pou in project.getpous(): |
|
799 |
if pou.getBodyType() == "SFC": |
|
800 |
list.append(pou.getname()) |
|
801 |
return list |
|
1411 | 802 |
|
814 | 803 |
# Return the body language of the pou given by its name |
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1743
diff
changeset
|
804 |
def GetPouBodyType(self, name, debug=False): |
814 | 805 |
project = self.GetProject(debug) |
806 |
if project is not None: |
|
807 |
# Found the pou correponding to name and return its body language |
|
808 |
pou = project.getpou(name) |
|
809 |
if pou is not None: |
|
810 |
return pou.getbodyType() |
|
811 |
return None |
|
1411 | 812 |
|
814 | 813 |
# Return the actions of a pou |
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1743
diff
changeset
|
814 |
def GetPouTransitions(self, pou_name, debug=False): |
814 | 815 |
transitions = [] |
816 |
project = self.GetProject(debug) |
|
817 |
if project is not None: |
|
818 |
# Found the pou correponding to name and return its transitions if SFC |
|
819 |
pou = project.getpou(pou_name) |
|
820 |
if pou is not None and pou.getbodyType() == "SFC": |
|
821 |
for transition in pou.gettransitionList(): |
|
822 |
transitions.append(transition.getname()) |
|
823 |
return transitions |
|
1411 | 824 |
|
814 | 825 |
# Return the body language of the transition given by its name |
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1743
diff
changeset
|
826 |
def GetTransitionBodyType(self, pou_name, pou_transition, debug=False): |
814 | 827 |
project = self.GetProject(debug) |
828 |
if project is not None: |
|
829 |
# Found the pou correponding to name |
|
830 |
pou = project.getpou(pou_name) |
|
831 |
if pou is not None: |
|
832 |
# Found the pou transition correponding to name and return its body language |
|
833 |
transition = pou.gettransition(pou_transition) |
|
834 |
if transition is not None: |
|
835 |
return transition.getbodyType() |
|
836 |
return None |
|
1411 | 837 |
|
814 | 838 |
# Return the actions of a pou |
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1743
diff
changeset
|
839 |
def GetPouActions(self, pou_name, debug=False): |
814 | 840 |
actions = [] |
841 |
project = self.GetProject(debug) |
|
842 |
if project is not None: |
|
843 |
# Found the pou correponding to name and return its actions if SFC |
|
844 |
pou = project.getpou(pou_name) |
|
845 |
if pou.getbodyType() == "SFC": |
|
846 |
for action in pou.getactionList(): |
|
847 |
actions.append(action.getname()) |
|
848 |
return actions |
|
1411 | 849 |
|
814 | 850 |
# Return the body language of the pou given by its name |
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1743
diff
changeset
|
851 |
def GetActionBodyType(self, pou_name, pou_action, debug=False): |
814 | 852 |
project = self.GetProject(debug) |
853 |
if project is not None: |
|
854 |
# Found the pou correponding to name and return its body language |
|
855 |
pou = project.getpou(pou_name) |
|
856 |
if pou is not None: |
|
857 |
action = pou.getaction(pou_action) |
|
858 |
if action is not None: |
|
859 |
return action.getbodyType() |
|
860 |
return None |
|
1411 | 861 |
|
814 | 862 |
# Extract varlists from a list of vars |
863 |
def ExtractVarLists(self, vars): |
|
864 |
varlist_list = [] |
|
865 |
current_varlist = None |
|
866 |
current_type = None |
|
867 |
for var in vars: |
|
1411 | 868 |
next_type = (var.Class, |
869 |
var.Option, |
|
870 |
var.Location in ["", None] or |
|
871 |
# When declaring globals, located |
|
872 |
# and not located variables are |
|
814 | 873 |
# in the same declaration block |
1347
533741e5075c
Fixed pou variables information loading stylesheet
Laurent Bessard
parents:
1341
diff
changeset
|
874 |
var.Class == "Global") |
814 | 875 |
if current_type != next_type: |
876 |
current_type = next_type |
|
1347
533741e5075c
Fixed pou variables information loading stylesheet
Laurent Bessard
parents:
1341
diff
changeset
|
877 |
infos = VAR_CLASS_INFOS.get(var.Class, None) |
814 | 878 |
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
|
879 |
current_varlist = PLCOpenParser.CreateElement(infos[0], "interface") |
814 | 880 |
else: |
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
881 |
current_varlist = PLCOpenParser.CreateElement("varList") |
1347
533741e5075c
Fixed pou variables information loading stylesheet
Laurent Bessard
parents:
1341
diff
changeset
|
882 |
varlist_list.append((var.Class, current_varlist)) |
533741e5075c
Fixed pou variables information loading stylesheet
Laurent Bessard
parents:
1341
diff
changeset
|
883 |
if var.Option == "Constant": |
814 | 884 |
current_varlist.setconstant(True) |
1347
533741e5075c
Fixed pou variables information loading stylesheet
Laurent Bessard
parents:
1341
diff
changeset
|
885 |
elif var.Option == "Retain": |
814 | 886 |
current_varlist.setretain(True) |
1347
533741e5075c
Fixed pou variables information loading stylesheet
Laurent Bessard
parents:
1341
diff
changeset
|
887 |
elif var.Option == "Non-Retain": |
814 | 888 |
current_varlist.setnonretain(True) |
889 |
# 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
|
890 |
tempvar = PLCOpenParser.CreateElement("variable", "varListPlain") |
1347
533741e5075c
Fixed pou variables information loading stylesheet
Laurent Bessard
parents:
1341
diff
changeset
|
891 |
tempvar.setname(var.Name) |
1411 | 892 |
|
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
893 |
var_type = PLCOpenParser.CreateElement("type", "variable") |
2450
5024c19ca8f0
python3 support: pylint, W1652 # (deprecated-types-field) Accessing a deprecated fields on the types module
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2447
diff
changeset
|
894 |
if isinstance(var.Type, tuple): |
1347
533741e5075c
Fixed pou variables information loading stylesheet
Laurent Bessard
parents:
1341
diff
changeset
|
895 |
if var.Type[0] == "array": |
1847
6198190bc121
explicitly mark unused variables found by pylint with _ or dummy
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1846
diff
changeset
|
896 |
_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
|
897 |
array = PLCOpenParser.CreateElement("array", "dataType") |
1306
1ff1cdf6c318
Fixed bug with direct array variable type definition
Laurent Bessard
parents:
1304
diff
changeset
|
898 |
baseType = PLCOpenParser.CreateElement("baseType", "array") |
1ff1cdf6c318
Fixed bug with direct array variable type definition
Laurent Bessard
parents:
1304
diff
changeset
|
899 |
array.setbaseType(baseType) |
814 | 900 |
for i, dimension in enumerate(dimensions): |
1306
1ff1cdf6c318
Fixed bug with direct array variable type definition
Laurent Bessard
parents:
1304
diff
changeset
|
901 |
dimension_range = PLCOpenParser.CreateElement("dimension", "array") |
814 | 902 |
if i == 0: |
903 |
array.setdimension([dimension_range]) |
|
904 |
else: |
|
905 |
array.appenddimension(dimension_range) |
|
1298
f034fb2b1aab
Fixed SFC block edition and SFC to SFC_textual code generating
Laurent Bessard
parents:
1297
diff
changeset
|
906 |
dimension_range.setlower(dimension[0]) |
f034fb2b1aab
Fixed SFC block edition and SFC to SFC_textual code generating
Laurent Bessard
parents:
1297
diff
changeset
|
907 |
dimension_range.setupper(dimension[1]) |
814 | 908 |
if base_type_name in self.GetBaseTypes(): |
1306
1ff1cdf6c318
Fixed bug with direct array variable type definition
Laurent Bessard
parents:
1304
diff
changeset
|
909 |
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
|
910 |
base_type_name.lower() |
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
911 |
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
|
912 |
else base_type_name, "dataType")) |
814 | 913 |
else: |
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
914 |
derived_datatype = PLCOpenParser.CreateElement("derived", "dataType") |
814 | 915 |
derived_datatype.setname(base_type_name) |
1306
1ff1cdf6c318
Fixed bug with direct array variable type definition
Laurent Bessard
parents:
1304
diff
changeset
|
916 |
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
|
917 |
var_type.setcontent(array) |
1347
533741e5075c
Fixed pou variables information loading stylesheet
Laurent Bessard
parents:
1341
diff
changeset
|
918 |
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
|
919 |
var_type.setcontent(PLCOpenParser.CreateElement( |
1347
533741e5075c
Fixed pou variables information loading stylesheet
Laurent Bessard
parents:
1341
diff
changeset
|
920 |
var.Type.lower() |
533741e5075c
Fixed pou variables information loading stylesheet
Laurent Bessard
parents:
1341
diff
changeset
|
921 |
if var.Type in ["STRING", "WSTRING"] |
533741e5075c
Fixed pou variables information loading stylesheet
Laurent Bessard
parents:
1341
diff
changeset
|
922 |
else var.Type, "dataType")) |
814 | 923 |
else: |
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
924 |
derived_type = PLCOpenParser.CreateElement("derived", "dataType") |
1347
533741e5075c
Fixed pou variables information loading stylesheet
Laurent Bessard
parents:
1341
diff
changeset
|
925 |
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
|
926 |
var_type.setcontent(derived_type) |
814 | 927 |
tempvar.settype(var_type) |
928 |
||
1347
533741e5075c
Fixed pou variables information loading stylesheet
Laurent Bessard
parents:
1341
diff
changeset
|
929 |
if var.InitialValue != "": |
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
930 |
value = PLCOpenParser.CreateElement("initialValue", "variable") |
1347
533741e5075c
Fixed pou variables information loading stylesheet
Laurent Bessard
parents:
1341
diff
changeset
|
931 |
value.setvalue(var.InitialValue) |
814 | 932 |
tempvar.setinitialValue(value) |
1347
533741e5075c
Fixed pou variables information loading stylesheet
Laurent Bessard
parents:
1341
diff
changeset
|
933 |
if var.Location != "": |
533741e5075c
Fixed pou variables information loading stylesheet
Laurent Bessard
parents:
1341
diff
changeset
|
934 |
tempvar.setaddress(var.Location) |
814 | 935 |
else: |
936 |
tempvar.setaddress(None) |
|
1347
533741e5075c
Fixed pou variables information loading stylesheet
Laurent Bessard
parents:
1341
diff
changeset
|
937 |
if var.Documentation != "": |
1294
f02ba5b83811
Fixed datatype and configuration editing in xmlclass refactoring
Laurent Bessard
parents:
1293
diff
changeset
|
938 |
ft = PLCOpenParser.CreateElement("documentation", "variable") |
1347
533741e5075c
Fixed pou variables information loading stylesheet
Laurent Bessard
parents:
1341
diff
changeset
|
939 |
ft.setanyText(var.Documentation) |
814 | 940 |
tempvar.setdocumentation(ft) |
941 |
||
942 |
# Add variable to varList |
|
943 |
current_varlist.appendvariable(tempvar) |
|
944 |
return varlist_list |
|
1411 | 945 |
|
1347
533741e5075c
Fixed pou variables information loading stylesheet
Laurent Bessard
parents:
1341
diff
changeset
|
946 |
def GetVariableDictionary(self, object_with_vars, tree=False, debug=False): |
1308
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
947 |
variables = [] |
1953
5736d25bb393
PEP8 and PyLint conformance: whitespaces and stuff
Edouard Tisserant
parents:
1951
diff
changeset
|
948 |
self.VariableInfoCollector.Collect(object_with_vars, |
5736d25bb393
PEP8 and PyLint conformance: whitespaces and stuff
Edouard Tisserant
parents:
1951
diff
changeset
|
949 |
debug, variables, tree) |
1308
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
950 |
return variables |
1411 | 951 |
|
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
|
952 |
# Add a global var to configuration to configuration |
1411 | 953 |
def AddConfigurationGlobalVar(self, config_name, var_type, var_name, |
1767
c74815729afd
clean-up: fix PEP8 E127 continuation line over-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1766
diff
changeset
|
954 |
location="", description=""): |
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
|
955 |
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
|
956 |
# 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
|
957 |
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
|
958 |
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
|
959 |
# Set configuration global vars |
1313
85c167bfff93
Replaced standard function blocks library definition from dictionary to plcopen xml files
Laurent Bessard
parents:
1311
diff
changeset
|
960 |
configuration.addglobalVar( |
1411 | 961 |
self.GetVarTypeObject(var_type), |
1313
85c167bfff93
Replaced standard function blocks library definition from dictionary to plcopen xml files
Laurent Bessard
parents:
1311
diff
changeset
|
962 |
var_name, location, description) |
814 | 963 |
|
964 |
# Replace the configuration globalvars by those given |
|
965 |
def SetConfigurationGlobalVars(self, name, vars): |
|
966 |
if self.Project is not None: |
|
967 |
# Found the configuration corresponding to name |
|
968 |
configuration = self.Project.getconfiguration(name) |
|
969 |
if configuration is not None: |
|
970 |
# 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
|
971 |
configuration.setglobalVars([ |
1847
6198190bc121
explicitly mark unused variables found by pylint with _ or dummy
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1846
diff
changeset
|
972 |
varlist for _vartype, varlist |
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
973 |
in self.ExtractVarLists(vars)]) |
1411 | 974 |
|
814 | 975 |
# Return the configuration globalvars |
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1743
diff
changeset
|
976 |
def GetConfigurationGlobalVars(self, name, debug=False): |
814 | 977 |
project = self.GetProject(debug) |
978 |
if project is not None: |
|
979 |
# Found the configuration corresponding to name |
|
980 |
configuration = project.getconfiguration(name) |
|
981 |
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
|
982 |
# Extract variables defined in configuration |
1319
748347102c97
Replaced old list of pou instance in project generating process by xslt stylesheet
Laurent Bessard
parents:
1316
diff
changeset
|
983 |
return self.GetVariableDictionary(configuration, debug) |
1411 | 984 |
|
1308
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
985 |
return [] |
814 | 986 |
|
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
|
987 |
# Return configuration variable names |
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1743
diff
changeset
|
988 |
def GetConfigurationVariableNames(self, config_name=None, debug=False): |
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
|
989 |
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
|
990 |
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
|
991 |
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
|
992 |
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
|
993 |
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
|
994 |
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
|
995 |
[var.getname() for var in reduce( |
1768
691083b5682a
clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1767
diff
changeset
|
996 |
lambda x, y: x + y, [ |
691083b5682a
clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1767
diff
changeset
|
997 |
varlist.getvariable() |
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
|
998 |
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
|
999 |
[])]) |
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
|
1000 |
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
|
1001 |
|
814 | 1002 |
# Replace the resource globalvars by those given |
1003 |
def SetConfigurationResourceGlobalVars(self, config_name, name, vars): |
|
1004 |
if self.Project is not None: |
|
1005 |
# Found the resource corresponding to name |
|
1006 |
resource = self.Project.getconfigurationResource(config_name, name) |
|
1007 |
# Set resource global vars |
|
1008 |
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
|
1009 |
resource.setglobalVars([ |
1847
6198190bc121
explicitly mark unused variables found by pylint with _ or dummy
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1846
diff
changeset
|
1010 |
varlist for _vartype, varlist |
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1011 |
in self.ExtractVarLists(vars)]) |
1411 | 1012 |
|
814 | 1013 |
# Return the resource globalvars |
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1743
diff
changeset
|
1014 |
def GetConfigurationResourceGlobalVars(self, config_name, name, debug=False): |
814 | 1015 |
project = self.GetProject(debug) |
1016 |
if project is not None: |
|
1017 |
# Found the resource corresponding to name |
|
1018 |
resource = project.getconfigurationResource(config_name, name) |
|
1294
f02ba5b83811
Fixed datatype and configuration editing in xmlclass refactoring
Laurent Bessard
parents:
1293
diff
changeset
|
1019 |
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
|
1020 |
# Extract variables defined in configuration |
1319
748347102c97
Replaced old list of pou instance in project generating process by xslt stylesheet
Laurent Bessard
parents:
1316
diff
changeset
|
1021 |
return self.GetVariableDictionary(resource, debug) |
1411 | 1022 |
|
1308
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
1023 |
return [] |
1411 | 1024 |
|
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
|
1025 |
# Return resource variable names |
1768
691083b5682a
clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1767
diff
changeset
|
1026 |
def GetConfigurationResourceVariableNames( |
691083b5682a
clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1767
diff
changeset
|
1027 |
self, config_name=None, resource_name=None, debug=False): |
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
|
1028 |
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
|
1029 |
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
|
1030 |
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
|
1031 |
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
|
1032 |
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
|
1033 |
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
|
1034 |
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
|
1035 |
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
|
1036 |
[var.getname() for var in reduce( |
1768
691083b5682a
clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1767
diff
changeset
|
1037 |
lambda x, y: x + y, [ |
691083b5682a
clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1767
diff
changeset
|
1038 |
varlist.getvariable() |
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
|
1039 |
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
|
1040 |
[])]) |
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
|
1041 |
return variables |
814 | 1042 |
|
1043 |
# Return the interface for the given pou |
|
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1743
diff
changeset
|
1044 |
def GetPouInterfaceVars(self, pou, tree=False, debug=False): |
1308
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
1045 |
interface = pou.interface |
814 | 1046 |
# 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
|
1047 |
if interface is not None: |
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
1048 |
# Extract variables defined in interface |
1347
533741e5075c
Fixed pou variables information loading stylesheet
Laurent Bessard
parents:
1341
diff
changeset
|
1049 |
return self.GetVariableDictionary(interface, tree, debug) |
1308
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
1050 |
return [] |
814 | 1051 |
|
1052 |
# Replace the Pou interface by the one given |
|
1053 |
def SetPouInterfaceVars(self, name, vars): |
|
1054 |
if self.Project is not None: |
|
1055 |
# Found the pou corresponding to name and add interface if there isn't one yet |
|
1056 |
pou = self.Project.getpou(name) |
|
1057 |
if pou is not None: |
|
1058 |
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
|
1059 |
pou.interface = PLCOpenParser.CreateElement("interface", "pou") |
814 | 1060 |
# Set Pou interface |
1847
6198190bc121
explicitly mark unused variables found by pylint with _ or dummy
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1846
diff
changeset
|
1061 |
pou.setvars([varlist for _varlist_type, varlist in self.ExtractVarLists(vars)]) |
1411 | 1062 |
|
814 | 1063 |
# 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
|
1064 |
def SetPouInterfaceReturnType(self, name, return_type): |
814 | 1065 |
if self.Project is not None: |
1066 |
pou = self.Project.getpou(name) |
|
1067 |
if pou is not None: |
|
1068 |
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
|
1069 |
pou.interface = PLCOpenParser.CreateElement("interface", "pou") |
814 | 1070 |
# 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
|
1071 |
return_type_obj = pou.interface.getreturnType() |
1294
f02ba5b83811
Fixed datatype and configuration editing in xmlclass refactoring
Laurent Bessard
parents:
1293
diff
changeset
|
1072 |
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
|
1073 |
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
|
1074 |
pou.interface.setreturnType(return_type_obj) |
814 | 1075 |
# Change return type |
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1076 |
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
|
1077 |
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
|
1078 |
return_type.lower() |
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1079 |
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
|
1080 |
else return_type, "dataType")) |
814 | 1081 |
else: |
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1082 |
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
|
1083 |
derived_type.setname(return_type) |
1418
c97dc5281419
Fixed declaration and ST code gen for IEC function that return derivated types
Edouard Tisserant
parents:
1411
diff
changeset
|
1084 |
return_type_obj.setcontent(derived_type) |
1411 | 1085 |
|
814 | 1086 |
def UpdateProjectUsedPous(self, old_name, new_name): |
1294
f02ba5b83811
Fixed datatype and configuration editing in xmlclass refactoring
Laurent Bessard
parents:
1293
diff
changeset
|
1087 |
if self.Project is not None: |
814 | 1088 |
self.Project.updateElementName(old_name, new_name) |
1411 | 1089 |
|
814 | 1090 |
def UpdateEditedElementUsedVariable(self, tagname, old_name, new_name): |
1091 |
pou = self.GetEditedElement(tagname) |
|
1294
f02ba5b83811
Fixed datatype and configuration editing in xmlclass refactoring
Laurent Bessard
parents:
1293
diff
changeset
|
1092 |
if pou is not None: |
814 | 1093 |
pou.updateElementName(old_name, new_name) |
1411 | 1094 |
|
814 | 1095 |
# Return the return type of the given pou |
1347
533741e5075c
Fixed pou variables information loading stylesheet
Laurent Bessard
parents:
1341
diff
changeset
|
1096 |
def GetPouInterfaceReturnType(self, pou, tree=False, debug=False): |
814 | 1097 |
# Verify that the pou has an interface |
1098 |
if pou.interface is not None: |
|
1099 |
# Return the return type if there is one |
|
1100 |
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
|
1101 |
if return_type is not None: |
1953
5736d25bb393
PEP8 and PyLint conformance: whitespaces and stuff
Edouard Tisserant
parents:
1951
diff
changeset
|
1102 |
factory = self.VariableInfoCollector.Collect(return_type, |
1951
bbd1e1744c91
GetVariableDictionary and GetPouInterfaceReturnType optimized with new VariableInfoCollector based on XSLTModelQuery. Moved corresponding definitions out of PLCControler.py.
Edouard Tisserant
parents:
1950
diff
changeset
|
1103 |
debug, [], tree) |
1347
533741e5075c
Fixed pou variables information loading stylesheet
Laurent Bessard
parents:
1341
diff
changeset
|
1104 |
if tree: |
533741e5075c
Fixed pou variables information loading stylesheet
Laurent Bessard
parents:
1341
diff
changeset
|
1105 |
return [factory.GetType(), factory.GetTree()] |
533741e5075c
Fixed pou variables information loading stylesheet
Laurent Bessard
parents:
1341
diff
changeset
|
1106 |
return factory.GetType() |
1411 | 1107 |
|
1347
533741e5075c
Fixed pou variables information loading stylesheet
Laurent Bessard
parents:
1341
diff
changeset
|
1108 |
if tree: |
533741e5075c
Fixed pou variables information loading stylesheet
Laurent Bessard
parents:
1341
diff
changeset
|
1109 |
return [None, ([], [])] |
533741e5075c
Fixed pou variables information loading stylesheet
Laurent Bessard
parents:
1341
diff
changeset
|
1110 |
return None |
814 | 1111 |
|
1112 |
# Function that add a new confnode to the confnode list |
|
1113 |
def AddConfNodeTypesList(self, typeslist): |
|
1114 |
self.ConfNodeTypes.extend(typeslist) |
|
1283
f3cfe1ff917e
More optimization attemps in type handling
Edouard Tisserant
parents:
1265
diff
changeset
|
1115 |
addedcat = [{"name": _("%s POUs") % confnodetypes["name"], |
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
|
1116 |
"list": [pou.getblockInfos() |
7856cd7767d6
Removed dictionaries storing datatypes and pous defined in project and pou and datatype using tree from model
Laurent Bessard
parents:
1301
diff
changeset
|
1117 |
for pou in confnodetypes["types"].getpous()]} |
1767
c74815729afd
clean-up: fix PEP8 E127 continuation line over-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1766
diff
changeset
|
1118 |
for confnodetypes in typeslist] |
1283
f3cfe1ff917e
More optimization attemps in type handling
Edouard Tisserant
parents:
1265
diff
changeset
|
1119 |
self.TotalTypes.extend(addedcat) |
f3cfe1ff917e
More optimization attemps in type handling
Edouard Tisserant
parents:
1265
diff
changeset
|
1120 |
for cat in addedcat: |
f3cfe1ff917e
More optimization attemps in type handling
Edouard Tisserant
parents:
1265
diff
changeset
|
1121 |
for desc in cat["list"]: |
1740
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
1122 |
BlkLst = self.TotalTypesDict.setdefault(desc["name"], []) |
1283
f3cfe1ff917e
More optimization attemps in type handling
Edouard Tisserant
parents:
1265
diff
changeset
|
1123 |
BlkLst.append((section["name"], desc)) |
1411 | 1124 |
|
814 | 1125 |
# Function that clear the confnode list |
1126 |
def ClearConfNodeTypes(self): |
|
1283
f3cfe1ff917e
More optimization attemps in type handling
Edouard Tisserant
parents:
1265
diff
changeset
|
1127 |
self.ConfNodeTypes = [] |
f3cfe1ff917e
More optimization attemps in type handling
Edouard Tisserant
parents:
1265
diff
changeset
|
1128 |
self.TotalTypesDict = StdBlckDct.copy() |
f3cfe1ff917e
More optimization attemps in type handling
Edouard Tisserant
parents:
1265
diff
changeset
|
1129 |
self.TotalTypes = StdBlckLst[:] |
814 | 1130 |
|
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1743
diff
changeset
|
1131 |
def GetConfNodeDataTypes(self, exclude=None, only_locatables=False): |
814 | 1132 |
return [{"name": _("%s Data Types") % confnodetypes["name"], |
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
|
1133 |
"list": [ |
1878
fb73a6b6622d
fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1875
diff
changeset
|
1134 |
datatype.getname() |
fb73a6b6622d
fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1875
diff
changeset
|
1135 |
for datatype in confnodetypes["types"].getdataTypes() |
fb73a6b6622d
fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1875
diff
changeset
|
1136 |
if not only_locatables or self.IsLocatableDataType(datatype)]} |
814 | 1137 |
for confnodetypes in self.ConfNodeTypes] |
1411 | 1138 |
|
814 | 1139 |
def GetVariableLocationTree(self): |
1140 |
return [] |
|
1141 |
||
883
235a9ec83b95
Adding support for defining specific global variables for ConfTreeNodes
Laurent Bessard
parents:
864
diff
changeset
|
1142 |
def GetConfNodeGlobalInstances(self): |
235a9ec83b95
Adding support for defining specific global variables for ConfTreeNodes
Laurent Bessard
parents:
864
diff
changeset
|
1143 |
return [] |
235a9ec83b95
Adding support for defining specific global variables for ConfTreeNodes
Laurent Bessard
parents:
864
diff
changeset
|
1144 |
|
235a9ec83b95
Adding support for defining specific global variables for ConfTreeNodes
Laurent Bessard
parents:
864
diff
changeset
|
1145 |
def GetConfigurationExtraVariables(self): |
235a9ec83b95
Adding support for defining specific global variables for ConfTreeNodes
Laurent Bessard
parents:
864
diff
changeset
|
1146 |
global_vars = [] |
3704
c17fac18c663
ST code generator: when including PLCopen TC6 XML libraries (for example py_ext/pous.xml or NativeLib.xml), also includes libraries globals in result
Edouard Tisserant
parents:
2739
diff
changeset
|
1147 |
for global_instance in self.GetConfNodeGlobalInstances(): |
c17fac18c663
ST code generator: when including PLCopen TC6 XML libraries (for example py_ext/pous.xml or NativeLib.xml), also includes libraries globals in result
Edouard Tisserant
parents:
2739
diff
changeset
|
1148 |
if type(global_instance)==tuple: |
c17fac18c663
ST code generator: when including PLCopen TC6 XML libraries (for example py_ext/pous.xml or NativeLib.xml), also includes libraries globals in result
Edouard Tisserant
parents:
2739
diff
changeset
|
1149 |
# usual global without modifier from a CTN or a library |
c17fac18c663
ST code generator: when including PLCopen TC6 XML libraries (for example py_ext/pous.xml or NativeLib.xml), also includes libraries globals in result
Edouard Tisserant
parents:
2739
diff
changeset
|
1150 |
var_name, var_type, var_initial = global_instance |
c17fac18c663
ST code generator: when including PLCopen TC6 XML libraries (for example py_ext/pous.xml or NativeLib.xml), also includes libraries globals in result
Edouard Tisserant
parents:
2739
diff
changeset
|
1151 |
tempvar = PLCOpenParser.CreateElement("variable", "globalVars") |
c17fac18c663
ST code generator: when including PLCopen TC6 XML libraries (for example py_ext/pous.xml or NativeLib.xml), also includes libraries globals in result
Edouard Tisserant
parents:
2739
diff
changeset
|
1152 |
tempvar.setname(var_name) |
c17fac18c663
ST code generator: when including PLCopen TC6 XML libraries (for example py_ext/pous.xml or NativeLib.xml), also includes libraries globals in result
Edouard Tisserant
parents:
2739
diff
changeset
|
1153 |
|
c17fac18c663
ST code generator: when including PLCopen TC6 XML libraries (for example py_ext/pous.xml or NativeLib.xml), also includes libraries globals in result
Edouard Tisserant
parents:
2739
diff
changeset
|
1154 |
tempvartype = PLCOpenParser.CreateElement("type", "variable") |
c17fac18c663
ST code generator: when including PLCopen TC6 XML libraries (for example py_ext/pous.xml or NativeLib.xml), also includes libraries globals in result
Edouard Tisserant
parents:
2739
diff
changeset
|
1155 |
if var_type in self.GetBaseTypes(): |
c17fac18c663
ST code generator: when including PLCopen TC6 XML libraries (for example py_ext/pous.xml or NativeLib.xml), also includes libraries globals in result
Edouard Tisserant
parents:
2739
diff
changeset
|
1156 |
tempvartype.setcontent(PLCOpenParser.CreateElement( |
c17fac18c663
ST code generator: when including PLCopen TC6 XML libraries (for example py_ext/pous.xml or NativeLib.xml), also includes libraries globals in result
Edouard Tisserant
parents:
2739
diff
changeset
|
1157 |
var_type.lower() |
c17fac18c663
ST code generator: when including PLCopen TC6 XML libraries (for example py_ext/pous.xml or NativeLib.xml), also includes libraries globals in result
Edouard Tisserant
parents:
2739
diff
changeset
|
1158 |
if var_type in ["STRING", "WSTRING"] |
c17fac18c663
ST code generator: when including PLCopen TC6 XML libraries (for example py_ext/pous.xml or NativeLib.xml), also includes libraries globals in result
Edouard Tisserant
parents:
2739
diff
changeset
|
1159 |
else var_type, "dataType")) |
c17fac18c663
ST code generator: when including PLCopen TC6 XML libraries (for example py_ext/pous.xml or NativeLib.xml), also includes libraries globals in result
Edouard Tisserant
parents:
2739
diff
changeset
|
1160 |
else: |
c17fac18c663
ST code generator: when including PLCopen TC6 XML libraries (for example py_ext/pous.xml or NativeLib.xml), also includes libraries globals in result
Edouard Tisserant
parents:
2739
diff
changeset
|
1161 |
tempderivedtype = PLCOpenParser.CreateElement("derived", "dataType") |
c17fac18c663
ST code generator: when including PLCopen TC6 XML libraries (for example py_ext/pous.xml or NativeLib.xml), also includes libraries globals in result
Edouard Tisserant
parents:
2739
diff
changeset
|
1162 |
tempderivedtype.setname(var_type) |
c17fac18c663
ST code generator: when including PLCopen TC6 XML libraries (for example py_ext/pous.xml or NativeLib.xml), also includes libraries globals in result
Edouard Tisserant
parents:
2739
diff
changeset
|
1163 |
tempvartype.setcontent(tempderivedtype) |
c17fac18c663
ST code generator: when including PLCopen TC6 XML libraries (for example py_ext/pous.xml or NativeLib.xml), also includes libraries globals in result
Edouard Tisserant
parents:
2739
diff
changeset
|
1164 |
tempvar.settype(tempvartype) |
c17fac18c663
ST code generator: when including PLCopen TC6 XML libraries (for example py_ext/pous.xml or NativeLib.xml), also includes libraries globals in result
Edouard Tisserant
parents:
2739
diff
changeset
|
1165 |
|
c17fac18c663
ST code generator: when including PLCopen TC6 XML libraries (for example py_ext/pous.xml or NativeLib.xml), also includes libraries globals in result
Edouard Tisserant
parents:
2739
diff
changeset
|
1166 |
if var_initial != "": |
c17fac18c663
ST code generator: when including PLCopen TC6 XML libraries (for example py_ext/pous.xml or NativeLib.xml), also includes libraries globals in result
Edouard Tisserant
parents:
2739
diff
changeset
|
1167 |
value = PLCOpenParser.CreateElement("initialValue", "variable") |
c17fac18c663
ST code generator: when including PLCopen TC6 XML libraries (for example py_ext/pous.xml or NativeLib.xml), also includes libraries globals in result
Edouard Tisserant
parents:
2739
diff
changeset
|
1168 |
value.setvalue(var_initial) |
c17fac18c663
ST code generator: when including PLCopen TC6 XML libraries (for example py_ext/pous.xml or NativeLib.xml), also includes libraries globals in result
Edouard Tisserant
parents:
2739
diff
changeset
|
1169 |
tempvar.setinitialValue(value) |
c17fac18c663
ST code generator: when including PLCopen TC6 XML libraries (for example py_ext/pous.xml or NativeLib.xml), also includes libraries globals in result
Edouard Tisserant
parents:
2739
diff
changeset
|
1170 |
|
c17fac18c663
ST code generator: when including PLCopen TC6 XML libraries (for example py_ext/pous.xml or NativeLib.xml), also includes libraries globals in result
Edouard Tisserant
parents:
2739
diff
changeset
|
1171 |
global_vars.append(tempvar) |
883
235a9ec83b95
Adding support for defining specific global variables for ConfTreeNodes
Laurent Bessard
parents:
864
diff
changeset
|
1172 |
else: |
3704
c17fac18c663
ST code generator: when including PLCopen TC6 XML libraries (for example py_ext/pous.xml or NativeLib.xml), also includes libraries globals in result
Edouard Tisserant
parents:
2739
diff
changeset
|
1173 |
# case of varlists from a TC6 library |
c17fac18c663
ST code generator: when including PLCopen TC6 XML libraries (for example py_ext/pous.xml or NativeLib.xml), also includes libraries globals in result
Edouard Tisserant
parents:
2739
diff
changeset
|
1174 |
global_vars.append(global_instance) |
c17fac18c663
ST code generator: when including PLCopen TC6 XML libraries (for example py_ext/pous.xml or NativeLib.xml), also includes libraries globals in result
Edouard Tisserant
parents:
2739
diff
changeset
|
1175 |
|
883
235a9ec83b95
Adding support for defining specific global variables for ConfTreeNodes
Laurent Bessard
parents:
864
diff
changeset
|
1176 |
return global_vars |
235a9ec83b95
Adding support for defining specific global variables for ConfTreeNodes
Laurent Bessard
parents:
864
diff
changeset
|
1177 |
|
814 | 1178 |
# Function that returns the block definition associated to the block type given |
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1743
diff
changeset
|
1179 |
def GetBlockType(self, typename, inputs=None, debug=False): |
1879
4d81c3bcac82
fix pylint error '(unsubscriptable-object) Value 'X' is unsubscriptable'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1878
diff
changeset
|
1180 |
result_blocktype = {} |
1847
6198190bc121
explicitly mark unused variables found by pylint with _ or dummy
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1846
diff
changeset
|
1181 |
for _sectioname, blocktype in self.TotalTypesDict.get(typename, []): |
1283
f3cfe1ff917e
More optimization attemps in type handling
Edouard Tisserant
parents:
1265
diff
changeset
|
1182 |
if inputs is not None and inputs != "undefined": |
1847
6198190bc121
explicitly mark unused variables found by pylint with _ or dummy
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1846
diff
changeset
|
1183 |
block_inputs = tuple([var_type for _name, var_type, _modifier in blocktype["inputs"]]) |
3750
f62625418bff
automated conversion using 2to3-3.9 tool
GP Orcullo <kinsamanka@gmail.com>
parents:
3704
diff
changeset
|
1184 |
if reduce(lambda x, y: x and y, [x[0] == "ANY" or self.IsOfType(*x) for x in zip(inputs, block_inputs)], True): |
1283
f3cfe1ff917e
More optimization attemps in type handling
Edouard Tisserant
parents:
1265
diff
changeset
|
1185 |
return blocktype |
f3cfe1ff917e
More optimization attemps in type handling
Edouard Tisserant
parents:
1265
diff
changeset
|
1186 |
else: |
1879
4d81c3bcac82
fix pylint error '(unsubscriptable-object) Value 'X' is unsubscriptable'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1878
diff
changeset
|
1187 |
if result_blocktype: |
1283
f3cfe1ff917e
More optimization attemps in type handling
Edouard Tisserant
parents:
1265
diff
changeset
|
1188 |
if inputs == "undefined": |
f3cfe1ff917e
More optimization attemps in type handling
Edouard Tisserant
parents:
1265
diff
changeset
|
1189 |
return None |
814 | 1190 |
else: |
1283
f3cfe1ff917e
More optimization attemps in type handling
Edouard Tisserant
parents:
1265
diff
changeset
|
1191 |
result_blocktype["inputs"] = [(i[0], "ANY", i[2]) for i in result_blocktype["inputs"]] |
f3cfe1ff917e
More optimization attemps in type handling
Edouard Tisserant
parents:
1265
diff
changeset
|
1192 |
result_blocktype["outputs"] = [(o[0], "ANY", o[2]) for o in result_blocktype["outputs"]] |
f3cfe1ff917e
More optimization attemps in type handling
Edouard Tisserant
parents:
1265
diff
changeset
|
1193 |
return result_blocktype |
f3cfe1ff917e
More optimization attemps in type handling
Edouard Tisserant
parents:
1265
diff
changeset
|
1194 |
result_blocktype = blocktype.copy() |
1879
4d81c3bcac82
fix pylint error '(unsubscriptable-object) Value 'X' is unsubscriptable'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1878
diff
changeset
|
1195 |
if result_blocktype: |
814 | 1196 |
return result_blocktype |
1197 |
project = self.GetProject(debug) |
|
1198 |
if project is not None: |
|
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
|
1199 |
blocktype = project.getpou(typename) |
7856cd7767d6
Removed dictionaries storing datatypes and pous defined in project and pou and datatype using tree from model
Laurent Bessard
parents:
1301
diff
changeset
|
1200 |
if blocktype 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
|
1201 |
blocktype_infos = blocktype.getblockInfos() |
7856cd7767d6
Removed dictionaries storing datatypes and pous defined in project and pou and datatype using tree from model
Laurent Bessard
parents:
1301
diff
changeset
|
1202 |
if inputs in [None, "undefined"]: |
7856cd7767d6
Removed dictionaries storing datatypes and pous defined in project and pou and datatype using tree from model
Laurent Bessard
parents:
1301
diff
changeset
|
1203 |
return blocktype_infos |
1411 | 1204 |
|
1205 |
if inputs == tuple([var_type |
|
1847
6198190bc121
explicitly mark unused variables found by pylint with _ or dummy
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1846
diff
changeset
|
1206 |
for _name, var_type, _modifier in blocktype_infos["inputs"]]): |
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
|
1207 |
return blocktype_infos |
1411 | 1208 |
|
814 | 1209 |
return None |
1210 |
||
1211 |
# Return Block types checking for recursion |
|
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1743
diff
changeset
|
1212 |
def GetBlockTypes(self, tagname="", debug=False): |
814 | 1213 |
words = tagname.split("::") |
1283
f3cfe1ff917e
More optimization attemps in type handling
Edouard Tisserant
parents:
1265
diff
changeset
|
1214 |
name = None |
f3cfe1ff917e
More optimization attemps in type handling
Edouard Tisserant
parents:
1265
diff
changeset
|
1215 |
project = self.GetProject(debug) |
f3cfe1ff917e
More optimization attemps in type handling
Edouard Tisserant
parents:
1265
diff
changeset
|
1216 |
if project is not None: |
1284 | 1217 |
pou_type = None |
1740
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
1218 |
if words[0] in ["P", "T", "A"]: |
814 | 1219 |
name = words[1] |
1284 | 1220 |
pou_type = self.GetPouType(name, debug) |
1411 | 1221 |
filter = (["function"] |
1222 |
if pou_type == "function" or words[0] == "T" |
|
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
|
1223 |
else ["functionBlock", "function"]) |
7856cd7767d6
Removed dictionaries storing datatypes and pous defined in project and pou and datatype using tree from model
Laurent Bessard
parents:
1301
diff
changeset
|
1224 |
blocktypes = [ |
7856cd7767d6
Removed dictionaries storing datatypes and pous defined in project and pou and datatype using tree from model
Laurent Bessard
parents:
1301
diff
changeset
|
1225 |
{"name": category["name"], |
7856cd7767d6
Removed dictionaries storing datatypes and pous defined in project and pou and datatype using tree from model
Laurent Bessard
parents:
1301
diff
changeset
|
1226 |
"list": [block for block in category["list"] |
7856cd7767d6
Removed dictionaries storing datatypes and pous defined in project and pou and datatype using tree from model
Laurent Bessard
parents:
1301
diff
changeset
|
1227 |
if block["type"] in filter]} |
7856cd7767d6
Removed dictionaries storing datatypes and pous defined in project and pou and datatype using tree from model
Laurent Bessard
parents:
1301
diff
changeset
|
1228 |
for category in self.TotalTypes] |
1768
691083b5682a
clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1767
diff
changeset
|
1229 |
blocktypes.append({ |
691083b5682a
clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1767
diff
changeset
|
1230 |
"name": USER_DEFINED_POUS, |
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
|
1231 |
"list": [pou.getblockInfos() |
1319
748347102c97
Replaced old list of pou instance in project generating process by xslt stylesheet
Laurent Bessard
parents:
1316
diff
changeset
|
1232 |
for pou in project.getpous(name, filter) |
1411 | 1233 |
if (name is None or |
1768
691083b5682a
clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1767
diff
changeset
|
1234 |
len(self.GetInstanceList(pou, name, debug)) == 0)] |
691083b5682a
clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1767
diff
changeset
|
1235 |
}) |
1284 | 1236 |
return blocktypes |
1283
f3cfe1ff917e
More optimization attemps in type handling
Edouard Tisserant
parents:
1265
diff
changeset
|
1237 |
return self.TotalTypes |
814 | 1238 |
|
1239 |
# Return Function Block types checking for recursion |
|
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1743
diff
changeset
|
1240 |
def GetFunctionBlockTypes(self, tagname="", debug=False): |
1319
748347102c97
Replaced old list of pou instance in project generating process by xslt stylesheet
Laurent Bessard
parents:
1316
diff
changeset
|
1241 |
project = self.GetProject(debug) |
748347102c97
Replaced old list of pou instance in project generating process by xslt stylesheet
Laurent Bessard
parents:
1316
diff
changeset
|
1242 |
words = tagname.split("::") |
748347102c97
Replaced old list of pou instance in project generating process by xslt stylesheet
Laurent Bessard
parents:
1316
diff
changeset
|
1243 |
name = None |
1740
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
1244 |
if project is not None and words[0] in ["P", "T", "A"]: |
1319
748347102c97
Replaced old list of pou instance in project generating process by xslt stylesheet
Laurent Bessard
parents:
1316
diff
changeset
|
1245 |
name = words[1] |
814 | 1246 |
blocktypes = [] |
3750
f62625418bff
automated conversion using 2to3-3.9 tool
GP Orcullo <kinsamanka@gmail.com>
parents:
3704
diff
changeset
|
1247 |
for blocks in self.TotalTypesDict.values(): |
1847
6198190bc121
explicitly mark unused variables found by pylint with _ or dummy
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1846
diff
changeset
|
1248 |
for _sectioname, block in blocks: |
814 | 1249 |
if block["type"] == "functionBlock": |
1250 |
blocktypes.append(block["name"]) |
|
1319
748347102c97
Replaced old list of pou instance in project generating process by xslt stylesheet
Laurent Bessard
parents:
1316
diff
changeset
|
1251 |
if project is not None: |
1768
691083b5682a
clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1767
diff
changeset
|
1252 |
blocktypes.extend([ |
691083b5682a
clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1767
diff
changeset
|
1253 |
pou.getname() |
1319
748347102c97
Replaced old list of pou instance in project generating process by xslt stylesheet
Laurent Bessard
parents:
1316
diff
changeset
|
1254 |
for pou in project.getpous(name, ["functionBlock"]) |
1411 | 1255 |
if (name is None or |
1372
ef26fcb7f5d4
Fixed bug in test if block type is used by current edited pou
Laurent Bessard
parents:
1368
diff
changeset
|
1256 |
len(self.GetInstanceList(pou, name, debug)) == 0)]) |
814 | 1257 |
return blocktypes |
1258 |
||
1259 |
# Return Block types checking for recursion |
|
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1743
diff
changeset
|
1260 |
def GetBlockResource(self, debug=False): |
814 | 1261 |
blocktypes = [] |
1283
f3cfe1ff917e
More optimization attemps in type handling
Edouard Tisserant
parents:
1265
diff
changeset
|
1262 |
for category in StdBlckLst[:-1]: |
814 | 1263 |
for blocktype in category["list"]: |
1264 |
if blocktype["type"] == "program": |
|
1265 |
blocktypes.append(blocktype["name"]) |
|
1266 |
project = self.GetProject(debug) |
|
1267 |
if project is not None: |
|
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
|
1268 |
blocktypes.extend( |
1328
a2f2981df9b0
Fixed bug in Resource POU instance type selection
Laurent Bessard
parents:
1326
diff
changeset
|
1269 |
[pou.getname() |
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
|
1270 |
for pou in project.getpous(filter=["program"])]) |
814 | 1271 |
return blocktypes |
1272 |
||
1273 |
# Return Data Types checking for recursion |
|
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1743
diff
changeset
|
1274 |
def GetDataTypes(self, tagname="", basetypes=True, confnodetypes=True, only_locatables=False, debug=False): |
814 | 1275 |
if basetypes: |
1276 |
datatypes = self.GetBaseTypes() |
|
1277 |
else: |
|
1278 |
datatypes = [] |
|
1279 |
project = self.GetProject(debug) |
|
1283
f3cfe1ff917e
More optimization attemps in type handling
Edouard Tisserant
parents:
1265
diff
changeset
|
1280 |
name = None |
f3cfe1ff917e
More optimization attemps in type handling
Edouard Tisserant
parents:
1265
diff
changeset
|
1281 |
if project is not None: |
814 | 1282 |
words = tagname.split("::") |
1283 |
if words[0] in ["D"]: |
|
1284 |
name = words[1] |
|
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
|
1285 |
datatypes.extend([ |
1411 | 1286 |
datatype.getname() |
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
|
1287 |
for datatype in project.getdataTypes(name) |
1785
0ff2a45dcefa
clean-up: fix PEP8 W503 line break before binary operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1782
diff
changeset
|
1288 |
if ((not only_locatables or self.IsLocatableDataType(datatype, debug)) and |
0ff2a45dcefa
clean-up: fix PEP8 W503 line break before binary operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1782
diff
changeset
|
1289 |
(name is None or len(self.GetInstanceList(datatype, name, debug)) == 0))]) |
863
b1ead41fbd3b
Fix bug in VariablePanel 'Type' cell editor menu entry 'User Data Types' containing ConfNodes data types
Laurent Bessard
parents:
853
diff
changeset
|
1290 |
if confnodetypes: |
b1ead41fbd3b
Fix bug in VariablePanel 'Type' cell editor menu entry 'User Data Types' containing ConfNodes data types
Laurent Bessard
parents:
853
diff
changeset
|
1291 |
for category in self.GetConfNodeDataTypes(name, only_locatables): |
b1ead41fbd3b
Fix bug in VariablePanel 'Type' cell editor menu entry 'User Data Types' containing ConfNodes data types
Laurent Bessard
parents:
853
diff
changeset
|
1292 |
datatypes.extend(category["list"]) |
814 | 1293 |
return datatypes |
1294 |
||
1301
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1295 |
# Return Data Type Object |
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1743
diff
changeset
|
1296 |
def GetPou(self, typename, debug=False): |
1308
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
1297 |
project = self.GetProject(debug) |
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
1298 |
if project is not None: |
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
1299 |
result = project.getpou(typename) |
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
1300 |
if result is not None: |
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
1301 |
return result |
3750
f62625418bff
automated conversion using 2to3-3.9 tool
GP Orcullo <kinsamanka@gmail.com>
parents:
3704
diff
changeset
|
1302 |
for standardlibrary in list(StdBlckLibs.values()): |
1313
85c167bfff93
Replaced standard function blocks library definition from dictionary to plcopen xml files
Laurent Bessard
parents:
1311
diff
changeset
|
1303 |
result = standardlibrary.getpou(typename) |
85c167bfff93
Replaced standard function blocks library definition from dictionary to plcopen xml files
Laurent Bessard
parents:
1311
diff
changeset
|
1304 |
if result is not None: |
85c167bfff93
Replaced standard function blocks library definition from dictionary to plcopen xml files
Laurent Bessard
parents:
1311
diff
changeset
|
1305 |
return result |
1308
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
1306 |
for confnodetype in self.ConfNodeTypes: |
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
1307 |
result = confnodetype["types"].getpou(typename) |
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
1308 |
if result is not None: |
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
1309 |
return result |
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
1310 |
return None |
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
1311 |
|
ad61268dbdb6
Replaced old pou variable list and variable tree generating by xslt stylesheet
Laurent Bessard
parents:
1306
diff
changeset
|
1312 |
# Return Data Type Object |
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1743
diff
changeset
|
1313 |
def GetDataType(self, typename, debug=False): |
1301
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1314 |
project = self.GetProject(debug) |
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1315 |
if project is not None: |
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1316 |
result = project.getdataType(typename) |
814 | 1317 |
if result is not None: |
1318 |
return result |
|
1319 |
for confnodetype in self.ConfNodeTypes: |
|
1301
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1320 |
result = confnodetype["types"].getdataType(typename) |
814 | 1321 |
if result is not None: |
1322 |
return result |
|
1323 |
return None |
|
1324 |
||
1301
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1325 |
# Return Data Type Object Base Type |
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1326 |
def GetDataTypeBaseType(self, datatype): |
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1327 |
basetype_content = datatype.baseType.getcontent() |
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1328 |
basetype_content_type = basetype_content.getLocalTag() |
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1329 |
if basetype_content_type in ["array", "subrangeSigned", "subrangeUnsigned"]: |
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1330 |
basetype = basetype_content.baseType.getcontent() |
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1331 |
basetype_type = basetype.getLocalTag() |
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1332 |
return (basetype.getname() if basetype_type == "derived" |
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1333 |
else basetype_type.upper()) |
1338
c1e6c712cc35
Replaced old graphic viewer blocks loading process by xslt stylesheet
Laurent Bessard
parents:
1337
diff
changeset
|
1334 |
return (basetype_content.getname() if basetype_content_type == "derived" |
c1e6c712cc35
Replaced old graphic viewer blocks loading process by xslt stylesheet
Laurent Bessard
parents:
1337
diff
changeset
|
1335 |
else basetype_content_type.upper()) |
1301
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1336 |
|
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1337 |
# Return Base Type of given possible derived type |
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1743
diff
changeset
|
1338 |
def GetBaseType(self, typename, debug=False): |
1763
bcc07ff2362c
clean-up: fix PEP8 W601 .has_key() is deprecated, use 'in'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1762
diff
changeset
|
1339 |
if typename in TypeHierarchy: |
1301
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1340 |
return typename |
1411 | 1341 |
|
1301
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1342 |
datatype = self.GetDataType(typename, debug) |
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1343 |
if datatype is not None: |
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1344 |
basetype = self.GetDataTypeBaseType(datatype) |
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1345 |
if basetype is not None: |
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1346 |
return self.GetBaseType(basetype, debug) |
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1347 |
return typename |
1411 | 1348 |
|
1301
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1349 |
return None |
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1350 |
|
814 | 1351 |
def GetBaseTypes(self): |
1352 |
''' |
|
1353 |
return the list of datatypes defined in IEC 61131-3. |
|
1354 |
TypeHierarchy_list has a rough order to it (e.g. SINT, INT, DINT, ...), |
|
1355 |
which makes it easy for a user to find a type in a menu. |
|
1356 |
''' |
|
1847
6198190bc121
explicitly mark unused variables found by pylint with _ or dummy
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1846
diff
changeset
|
1357 |
return [x for x, _y in TypeHierarchy_list if not x.startswith("ANY")] |
814 | 1358 |
|
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1743
diff
changeset
|
1359 |
def IsOfType(self, typename, reference, debug=False): |
1301
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1360 |
if reference is None or typename == reference: |
814 | 1361 |
return True |
1411 | 1362 |
|
1301
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1363 |
basetype = TypeHierarchy.get(typename) |
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1364 |
if basetype is not None: |
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1365 |
return self.IsOfType(basetype, reference) |
1411 | 1366 |
|
1301
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1367 |
datatype = self.GetDataType(typename, debug) |
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1368 |
if datatype is not None: |
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1369 |
basetype = self.GetDataTypeBaseType(datatype) |
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1370 |
if basetype is not None: |
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1371 |
return self.IsOfType(basetype, reference, debug) |
1411 | 1372 |
|
814 | 1373 |
return False |
1411 | 1374 |
|
1301
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1375 |
def IsEndType(self, typename): |
3968
d2aecbb377ae
IDE: Fix exception when connecting complex types
Edouard Tisserant <edouard.tisserant@gmail.com>
parents:
3755
diff
changeset
|
1376 |
# Check if the type is a base type |
d2aecbb377ae
IDE: Fix exception when connecting complex types
Edouard Tisserant <edouard.tisserant@gmail.com>
parents:
3755
diff
changeset
|
1377 |
if type(typename) == str: |
1301
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1378 |
return not typename.startswith("ANY") |
814 | 1379 |
return True |
1380 |
||
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1743
diff
changeset
|
1381 |
def IsLocatableDataType(self, datatype, 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
|
1382 |
basetype_content = datatype.baseType.getcontent() |
7856cd7767d6
Removed dictionaries storing datatypes and pous defined in project and pou and datatype using tree from model
Laurent Bessard
parents:
1301
diff
changeset
|
1383 |
basetype_content_type = basetype_content.getLocalTag() |
4008
f30573e98600
IDE: allow structures to be located.
Edouard Tisserant <edouard@beremiz.fr>
parents:
3968
diff
changeset
|
1384 |
if basetype_content_type in ["enum"]: |
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
|
1385 |
return False |
7856cd7767d6
Removed dictionaries storing datatypes and pous defined in project and pou and datatype using tree from model
Laurent Bessard
parents:
1301
diff
changeset
|
1386 |
elif basetype_content_type == "derived": |
7856cd7767d6
Removed dictionaries storing datatypes and pous defined in project and pou and datatype using tree from model
Laurent Bessard
parents:
1301
diff
changeset
|
1387 |
return self.IsLocatableType(basetype_content.getname()) |
1321
83f41ea00b97
Replaced old pou instance type tagname computing by xslt stylesheet
Laurent Bessard
parents:
1319
diff
changeset
|
1388 |
elif basetype_content_type == "array": |
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
|
1389 |
array_base_type = basetype_content.baseType.getcontent() |
7856cd7767d6
Removed dictionaries storing datatypes and pous defined in project and pou and datatype using tree from model
Laurent Bessard
parents:
1301
diff
changeset
|
1390 |
if array_base_type.getLocalTag() == "derived": |
7856cd7767d6
Removed dictionaries storing datatypes and pous defined in project and pou and datatype using tree from model
Laurent Bessard
parents:
1301
diff
changeset
|
1391 |
return self.IsLocatableType(array_base_type.getname(), 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
|
1392 |
return True |
1411 | 1393 |
|
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1743
diff
changeset
|
1394 |
def IsLocatableType(self, typename, debug=False): |
2450
5024c19ca8f0
python3 support: pylint, W1652 # (deprecated-types-field) Accessing a deprecated fields on the types module
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2447
diff
changeset
|
1395 |
if isinstance(typename, tuple) or self.GetBlockType(typename) is not None: |
884
e12228fd8773
Add function block types as data types that are not locatable
Laurent Bessard
parents:
883
diff
changeset
|
1396 |
return False |
1411 | 1397 |
|
1686
85fdcc04da25
disallow setting IEC location addresses for TIME, DATE, DT and TOD variables
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1680
diff
changeset
|
1398 |
# the size of these types is implementation dependend |
85fdcc04da25
disallow setting IEC location addresses for TIME, DATE, DT and TOD variables
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1680
diff
changeset
|
1399 |
if typename in ["TIME", "DATE", "DT", "TOD"]: |
85fdcc04da25
disallow setting IEC location addresses for TIME, DATE, DT and TOD variables
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1680
diff
changeset
|
1400 |
return False |
1735
c02818d7e29f
clean-up: fix PEP8 W293 blank line contains whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1734
diff
changeset
|
1401 |
|
1301
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1402 |
datatype = self.GetDataType(typename, debug) |
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1403 |
if datatype is not None: |
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
|
1404 |
return self.IsLocatableDataType(datatype) |
814 | 1405 |
return True |
1411 | 1406 |
|
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1743
diff
changeset
|
1407 |
def IsEnumeratedType(self, typename, debug=False): |
2450
5024c19ca8f0
python3 support: pylint, W1652 # (deprecated-types-field) Accessing a deprecated fields on the types module
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2447
diff
changeset
|
1408 |
if isinstance(typename, tuple): |
1306
1ff1cdf6c318
Fixed bug with direct array variable type definition
Laurent Bessard
parents:
1304
diff
changeset
|
1409 |
typename = typename[1] |
1301
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1410 |
datatype = self.GetDataType(typename, debug) |
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1411 |
if datatype is not None: |
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1412 |
basetype_content = datatype.baseType.getcontent() |
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1413 |
basetype_content_type = basetype_content.getLocalTag() |
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1414 |
if basetype_content_type == "derived": |
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1415 |
return self.IsEnumeratedType(basetype_content_type, debug) |
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1416 |
return basetype_content_type == "enum" |
814 | 1417 |
return False |
1418 |
||
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1743
diff
changeset
|
1419 |
def IsSubrangeType(self, typename, exclude=None, debug=False): |
1301
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1420 |
if typename == exclude: |
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1421 |
return False |
2450
5024c19ca8f0
python3 support: pylint, W1652 # (deprecated-types-field) Accessing a deprecated fields on the types module
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2447
diff
changeset
|
1422 |
if isinstance(typename, tuple): |
1306
1ff1cdf6c318
Fixed bug with direct array variable type definition
Laurent Bessard
parents:
1304
diff
changeset
|
1423 |
typename = typename[1] |
1301
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1424 |
datatype = self.GetDataType(typename, debug) |
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1425 |
if datatype is not None: |
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1426 |
basetype_content = datatype.baseType.getcontent() |
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1427 |
basetype_content_type = basetype_content.getLocalTag() |
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1428 |
if basetype_content_type == "derived": |
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1429 |
return self.IsSubrangeType(basetype_content_type, exclude, debug) |
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1430 |
elif basetype_content_type in ["subrangeSigned", "subrangeUnsigned"]: |
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1431 |
return not self.IsOfType( |
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1432 |
self.GetDataTypeBaseType(datatype), exclude) |
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1433 |
return False |
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1434 |
|
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1743
diff
changeset
|
1435 |
def IsNumType(self, typename, debug=False): |
1301
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1436 |
return self.IsOfType(typename, "ANY_NUM", debug) or\ |
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1437 |
self.IsOfType(typename, "ANY_BIT", debug) |
1411 | 1438 |
|
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1743
diff
changeset
|
1439 |
def GetDataTypeRange(self, typename, debug=False): |
1301
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1440 |
range = DataTypeRange.get(typename) |
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1441 |
if range is not None: |
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1442 |
return range |
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1443 |
datatype = self.GetDataType(typename, debug) |
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1444 |
if datatype is not None: |
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1445 |
basetype_content = datatype.baseType.getcontent() |
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1446 |
basetype_content_type = basetype_content.getLocalTag() |
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1447 |
if basetype_content_type in ["subrangeSigned", "subrangeUnsigned"]: |
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1448 |
return (basetype_content.range.getlower(), |
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1449 |
basetype_content.range.getupper()) |
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1450 |
elif basetype_content_type == "derived": |
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1451 |
return self.GetDataTypeRange(basetype_content.getname(), debug) |
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1452 |
return None |
1411 | 1453 |
|
1301
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1454 |
# Return Subrange types |
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1743
diff
changeset
|
1455 |
def GetSubrangeBaseTypes(self, exclude, debug=False): |
3750
f62625418bff
automated conversion using 2to3-3.9 tool
GP Orcullo <kinsamanka@gmail.com>
parents:
3704
diff
changeset
|
1456 |
subrange_basetypes = list(DataTypeRange.keys()) |
1301
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1457 |
project = self.GetProject(debug) |
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1458 |
if project is not None: |
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1459 |
subrange_basetypes.extend( |
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1460 |
[datatype.getname() for datatype in project.getdataTypes() |
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1461 |
if self.IsSubrangeType(datatype.getname(), exclude, debug)]) |
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1462 |
for confnodetype in self.ConfNodeTypes: |
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1463 |
subrange_basetypes.extend( |
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1464 |
[datatype.getname() for datatype in confnodetype["types"].getdataTypes() |
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1465 |
if self.IsSubrangeType(datatype.getname(), exclude, debug)]) |
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1466 |
return subrange_basetypes |
1411 | 1467 |
|
1301
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1468 |
# Return Enumerated Values |
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1743
diff
changeset
|
1469 |
def GetEnumeratedDataValues(self, typename=None, debug=False): |
1301
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1470 |
values = [] |
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1471 |
if typename is not None: |
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1472 |
datatype_obj = self.GetDataType(typename, debug) |
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1473 |
if datatype_obj is not None: |
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1474 |
basetype_content = datatype_obj.baseType.getcontent() |
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1475 |
basetype_content_type = basetype_content.getLocalTag() |
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1476 |
if basetype_content_type == "enum": |
1411 | 1477 |
return [value.getname() |
1301
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1478 |
for value in basetype_content.xpath( |
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1479 |
"ppx:values/ppx:value", |
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1480 |
namespaces=PLCOpenParser.NSMAP)] |
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1481 |
elif basetype_content_type == "derived": |
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1482 |
return self.GetEnumeratedDataValues(basetype_content.getname(), debug) |
814 | 1483 |
else: |
1484 |
project = self.GetProject(debug) |
|
1485 |
if project is not None: |
|
1301
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1486 |
values.extend(project.GetEnumeratedDataTypeValues()) |
814 | 1487 |
for confnodetype in self.ConfNodeTypes: |
1301
fcca121a000f
Removed dictionaries storing enumerated datatypes values, subrange datatypes range and project datatype hierarchy from model
Laurent Bessard
parents:
1299
diff
changeset
|
1488 |
values.extend(confnodetype["types"].GetEnumeratedDataTypeValues()) |
814 | 1489 |
return values |
1490 |
||
1782
5b6ad7a7fd9d
clean-up: fix PEP8 E265 block comment should start with '# '
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1780
diff
changeset
|
1491 |
# ------------------------------------------------------------------------------- |
5b6ad7a7fd9d
clean-up: fix PEP8 E265 block comment should start with '# '
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1780
diff
changeset
|
1492 |
# Project opened Data types management functions |
5b6ad7a7fd9d
clean-up: fix PEP8 E265 block comment should start with '# '
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1780
diff
changeset
|
1493 |
# ------------------------------------------------------------------------------- |
814 | 1494 |
|
1495 |
# Return the data type informations |
|
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1743
diff
changeset
|
1496 |
def GetDataTypeInfos(self, tagname, debug=False): |
814 | 1497 |
project = self.GetProject(debug) |
1498 |
if project is not None: |
|
1499 |
words = tagname.split("::") |
|
1500 |
if words[0] == "D": |
|
1501 |
infos = {} |
|
1502 |
datatype = project.getdataType(words[1]) |
|
883
235a9ec83b95
Adding support for defining specific global variables for ConfTreeNodes
Laurent Bessard
parents:
864
diff
changeset
|
1503 |
if datatype is None: |
235a9ec83b95
Adding support for defining specific global variables for ConfTreeNodes
Laurent Bessard
parents:
864
diff
changeset
|
1504 |
return None |
814 | 1505 |
basetype_content = datatype.baseType.getcontent() |
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1506 |
basetype_content_type = basetype_content.getLocalTag() |
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1507 |
if basetype_content_type in ["subrangeSigned", "subrangeUnsigned"]: |
814 | 1508 |
infos["type"] = "Subrange" |
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1509 |
infos["min"] = basetype_content.range.getlower() |
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1510 |
infos["max"] = basetype_content.range.getupper() |
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1511 |
base_type = basetype_content.baseType.getcontent() |
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1512 |
base_type_type = base_type.getLocalTag() |
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1513 |
infos["base_type"] = (base_type.getname() |
1768
691083b5682a
clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1767
diff
changeset
|
1514 |
if base_type_type == "derived" |
691083b5682a
clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1767
diff
changeset
|
1515 |
else base_type_type) |
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1516 |
elif basetype_content_type == "enum": |
814 | 1517 |
infos["type"] = "Enumerated" |
1518 |
infos["values"] = [] |
|
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1519 |
for value in basetype_content.xpath("ppx:values/ppx:value", namespaces=PLCOpenParser.NSMAP): |
814 | 1520 |
infos["values"].append(value.getname()) |
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1521 |
elif basetype_content_type == "array": |
814 | 1522 |
infos["type"] = "Array" |
1523 |
infos["dimensions"] = [] |
|
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1524 |
for dimension in basetype_content.getdimension(): |
814 | 1525 |
infos["dimensions"].append((dimension.getlower(), dimension.getupper())) |
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1526 |
base_type = basetype_content.baseType.getcontent() |
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1527 |
base_type_type = base_type.getLocalTag() |
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1528 |
infos["base_type"] = (base_type.getname() |
1768
691083b5682a
clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1767
diff
changeset
|
1529 |
if base_type_type == "derived" |
691083b5682a
clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1767
diff
changeset
|
1530 |
else base_type_type.upper()) |
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1531 |
elif basetype_content_type == "struct": |
814 | 1532 |
infos["type"] = "Structure" |
1533 |
infos["elements"] = [] |
|
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1534 |
for element in basetype_content.getvariable(): |
814 | 1535 |
element_infos = {} |
1536 |
element_infos["Name"] = element.getname() |
|
1537 |
element_type = element.type.getcontent() |
|
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1538 |
element_type_type = element_type.getLocalTag() |
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1539 |
if element_type_type == "array": |
864
bf4f7f0801b9
Adding support for direct array declaration in structure element declaration
Laurent Bessard
parents:
863
diff
changeset
|
1540 |
dimensions = [] |
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1541 |
for dimension in element_type.getdimension(): |
864
bf4f7f0801b9
Adding support for direct array declaration in structure element declaration
Laurent Bessard
parents:
863
diff
changeset
|
1542 |
dimensions.append((dimension.getlower(), dimension.getupper())) |
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1543 |
base_type = element_type.baseType.getcontent() |
1502
62eb21aab1fb
fix display of ARRAY fields inside of structure data types.
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1477
diff
changeset
|
1544 |
base_type_type = base_type.getLocalTag() |
1411 | 1545 |
element_infos["Type"] = ("array", |
1768
691083b5682a
clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1767
diff
changeset
|
1546 |
base_type.getname() |
691083b5682a
clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1767
diff
changeset
|
1547 |
if base_type_type == "derived" |
691083b5682a
clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1767
diff
changeset
|
1548 |
else base_type_type.upper(), |
691083b5682a
clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1767
diff
changeset
|
1549 |
dimensions) |
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1550 |
elif element_type_type == "derived": |
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1551 |
element_infos["Type"] = element_type.getname() |
814 | 1552 |
else: |
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1553 |
element_infos["Type"] = element_type_type.upper() |
814 | 1554 |
if element.initialValue is not None: |
1508
4c645e6b8c98
fix error if non-latin character was entered in initial value in
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1505
diff
changeset
|
1555 |
element_infos["Initial Value"] = element.initialValue.getvalue() |
814 | 1556 |
else: |
1557 |
element_infos["Initial Value"] = "" |
|
1558 |
infos["elements"].append(element_infos) |
|
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1559 |
else: |
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1560 |
infos["type"] = "Directly" |
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1561 |
infos["base_type"] = (basetype_content.getname() |
1768
691083b5682a
clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1767
diff
changeset
|
1562 |
if basetype_content_type == "derived" |
691083b5682a
clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1767
diff
changeset
|
1563 |
else basetype_content_type.upper()) |
1411 | 1564 |
|
814 | 1565 |
if datatype.initialValue is not None: |
1508
4c645e6b8c98
fix error if non-latin character was entered in initial value in
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1505
diff
changeset
|
1566 |
infos["initial"] = datatype.initialValue.getvalue() |
814 | 1567 |
else: |
1568 |
infos["initial"] = "" |
|
1569 |
return infos |
|
1570 |
return None |
|
1411 | 1571 |
|
814 | 1572 |
# Change the data type informations |
1573 |
def SetDataTypeInfos(self, tagname, infos): |
|
1574 |
words = tagname.split("::") |
|
1575 |
if self.Project is not None and words[0] == "D": |
|
1576 |
datatype = self.Project.getdataType(words[1]) |
|
1577 |
if infos["type"] == "Directly": |
|
1578 |
if infos["base_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
|
1579 |
datatype.baseType.setcontent(PLCOpenParser.CreateElement( |
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1580 |
infos["base_type"].lower() |
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1581 |
if infos["base_type"] in ["STRING", "WSTRING"] |
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1582 |
else infos["base_type"], "dataType")) |
814 | 1583 |
else: |
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1584 |
derived_datatype = PLCOpenParser.CreateElement("derived", "dataType") |
814 | 1585 |
derived_datatype.setname(infos["base_type"]) |
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1586 |
datatype.baseType.setcontent(derived_datatype) |
814 | 1587 |
elif infos["type"] == "Subrange": |
1294
f02ba5b83811
Fixed datatype and configuration editing in xmlclass refactoring
Laurent Bessard
parents:
1293
diff
changeset
|
1588 |
subrange = PLCOpenParser.CreateElement( |
1411 | 1589 |
"subrangeUnsigned" |
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1590 |
if infos["base_type"] in GetSubTypes("ANY_UINT") |
1294
f02ba5b83811
Fixed datatype and configuration editing in xmlclass refactoring
Laurent Bessard
parents:
1293
diff
changeset
|
1591 |
else "subrangeSigned", "dataType") |
f02ba5b83811
Fixed datatype and configuration editing in xmlclass refactoring
Laurent Bessard
parents:
1293
diff
changeset
|
1592 |
datatype.baseType.setcontent(subrange) |
814 | 1593 |
subrange.range.setlower(infos["min"]) |
1594 |
subrange.range.setupper(infos["max"]) |
|
1595 |
if infos["base_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
|
1596 |
subrange.baseType.setcontent( |
1294
f02ba5b83811
Fixed datatype and configuration editing in xmlclass refactoring
Laurent Bessard
parents:
1293
diff
changeset
|
1597 |
PLCOpenParser.CreateElement(infos["base_type"], "dataType")) |
814 | 1598 |
else: |
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1599 |
derived_datatype = PLCOpenParser.CreateElement("derived", "dataType") |
814 | 1600 |
derived_datatype.setname(infos["base_type"]) |
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1601 |
subrange.baseType.setcontent(derived_datatype) |
814 | 1602 |
elif infos["type"] == "Enumerated": |
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1603 |
enumerated = PLCOpenParser.CreateElement("enum", "dataType") |
1294
f02ba5b83811
Fixed datatype and configuration editing in xmlclass refactoring
Laurent Bessard
parents:
1293
diff
changeset
|
1604 |
datatype.baseType.setcontent(enumerated) |
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1605 |
values = PLCOpenParser.CreateElement("values", "enum") |
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1606 |
enumerated.setvalues(values) |
814 | 1607 |
for i, enum_value in enumerate(infos["values"]): |
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1608 |
value = PLCOpenParser.CreateElement("value", "values") |
814 | 1609 |
value.setname(enum_value) |
1610 |
if i == 0: |
|
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1611 |
values.setvalue([value]) |
814 | 1612 |
else: |
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1613 |
values.appendvalue(value) |
814 | 1614 |
elif infos["type"] == "Array": |
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1615 |
array = PLCOpenParser.CreateElement("array", "dataType") |
1294
f02ba5b83811
Fixed datatype and configuration editing in xmlclass refactoring
Laurent Bessard
parents:
1293
diff
changeset
|
1616 |
datatype.baseType.setcontent(array) |
814 | 1617 |
for i, dimension in enumerate(infos["dimensions"]): |
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1618 |
dimension_range = PLCOpenParser.CreateElement("dimension", "array") |
814 | 1619 |
dimension_range.setlower(dimension[0]) |
1620 |
dimension_range.setupper(dimension[1]) |
|
1621 |
if i == 0: |
|
1622 |
array.setdimension([dimension_range]) |
|
1623 |
else: |
|
1624 |
array.appenddimension(dimension_range) |
|
1625 |
if infos["base_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
|
1626 |
array.baseType.setcontent(PLCOpenParser.CreateElement( |
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1627 |
infos["base_type"].lower() |
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1628 |
if infos["base_type"] in ["STRING", "WSTRING"] |
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1629 |
else infos["base_type"], "dataType")) |
814 | 1630 |
else: |
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1631 |
derived_datatype = PLCOpenParser.CreateElement("derived", "dataType") |
814 | 1632 |
derived_datatype.setname(infos["base_type"]) |
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1633 |
array.baseType.setcontent(derived_datatype) |
814 | 1634 |
elif infos["type"] == "Structure": |
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1635 |
struct = PLCOpenParser.CreateElement("struct", "dataType") |
1294
f02ba5b83811
Fixed datatype and configuration editing in xmlclass refactoring
Laurent Bessard
parents:
1293
diff
changeset
|
1636 |
datatype.baseType.setcontent(struct) |
814 | 1637 |
for i, element_infos in enumerate(infos["elements"]): |
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1638 |
element = PLCOpenParser.CreateElement("variable", "struct") |
814 | 1639 |
element.setname(element_infos["Name"]) |
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1640 |
element_type = PLCOpenParser.CreateElement("type", "variable") |
2450
5024c19ca8f0
python3 support: pylint, W1652 # (deprecated-types-field) Accessing a deprecated fields on the types module
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2447
diff
changeset
|
1641 |
if isinstance(element_infos["Type"], tuple): |
864
bf4f7f0801b9
Adding support for direct array declaration in structure element declaration
Laurent Bessard
parents:
863
diff
changeset
|
1642 |
if element_infos["Type"][0] == "array": |
1847
6198190bc121
explicitly mark unused variables found by pylint with _ or dummy
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1846
diff
changeset
|
1643 |
_array_type, base_type_name, dimensions = element_infos["Type"] |
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1644 |
array = PLCOpenParser.CreateElement("array", "dataType") |
1477
270dba8bf87b
fix issue, when structure data type with array field is created
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1418
diff
changeset
|
1645 |
baseType = PLCOpenParser.CreateElement("baseType", "array") |
270dba8bf87b
fix issue, when structure data type with array field is created
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1418
diff
changeset
|
1646 |
array.setbaseType(baseType) |
1294
f02ba5b83811
Fixed datatype and configuration editing in xmlclass refactoring
Laurent Bessard
parents:
1293
diff
changeset
|
1647 |
element_type.setcontent(array) |
864
bf4f7f0801b9
Adding support for direct array declaration in structure element declaration
Laurent Bessard
parents:
863
diff
changeset
|
1648 |
for j, dimension in enumerate(dimensions): |
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1649 |
dimension_range = PLCOpenParser.CreateElement("dimension", "array") |
864
bf4f7f0801b9
Adding support for direct array declaration in structure element declaration
Laurent Bessard
parents:
863
diff
changeset
|
1650 |
dimension_range.setlower(dimension[0]) |
bf4f7f0801b9
Adding support for direct array declaration in structure element declaration
Laurent Bessard
parents:
863
diff
changeset
|
1651 |
dimension_range.setupper(dimension[1]) |
bf4f7f0801b9
Adding support for direct array declaration in structure element declaration
Laurent Bessard
parents:
863
diff
changeset
|
1652 |
if j == 0: |
bf4f7f0801b9
Adding support for direct array declaration in structure element declaration
Laurent Bessard
parents:
863
diff
changeset
|
1653 |
array.setdimension([dimension_range]) |
bf4f7f0801b9
Adding support for direct array declaration in structure element declaration
Laurent Bessard
parents:
863
diff
changeset
|
1654 |
else: |
bf4f7f0801b9
Adding support for direct array declaration in structure element declaration
Laurent Bessard
parents:
863
diff
changeset
|
1655 |
array.appenddimension(dimension_range) |
bf4f7f0801b9
Adding support for direct array declaration in structure element declaration
Laurent Bessard
parents:
863
diff
changeset
|
1656 |
if base_type_name in self.GetBaseTypes(): |
1477
270dba8bf87b
fix issue, when structure data type with array field is created
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1418
diff
changeset
|
1657 |
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
|
1658 |
base_type_name.lower() |
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1659 |
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
|
1660 |
else base_type_name, "dataType")) |
864
bf4f7f0801b9
Adding support for direct array declaration in structure element declaration
Laurent Bessard
parents:
863
diff
changeset
|
1661 |
else: |
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1662 |
derived_datatype = PLCOpenParser.CreateElement("derived", "dataType") |
864
bf4f7f0801b9
Adding support for direct array declaration in structure element declaration
Laurent Bessard
parents:
863
diff
changeset
|
1663 |
derived_datatype.setname(base_type_name) |
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1664 |
array.baseType.setcontent(derived_datatype) |
864
bf4f7f0801b9
Adding support for direct array declaration in structure element declaration
Laurent Bessard
parents:
863
diff
changeset
|
1665 |
elif element_infos["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
|
1666 |
element_type.setcontent( |
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1667 |
PLCOpenParser.CreateElement( |
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1668 |
element_infos["Type"].lower() |
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1669 |
if element_infos["Type"] in ["STRING", "WSTRING"] |
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1670 |
else element_infos["Type"], "dataType")) |
814 | 1671 |
else: |
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1672 |
derived_datatype = PLCOpenParser.CreateElement("derived", "dataType") |
814 | 1673 |
derived_datatype.setname(element_infos["Type"]) |
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1674 |
element_type.setcontent(derived_datatype) |
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1675 |
element.settype(element_type) |
814 | 1676 |
if element_infos["Initial Value"] != "": |
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1677 |
value = PLCOpenParser.CreateElement("initialValue", "variable") |
814 | 1678 |
value.setvalue(element_infos["Initial Value"]) |
1679 |
element.setinitialValue(value) |
|
1680 |
if i == 0: |
|
1681 |
struct.setvariable([element]) |
|
1682 |
else: |
|
1683 |
struct.appendvariable(element) |
|
1684 |
if infos["initial"] != "": |
|
1685 |
if datatype.initialValue is None: |
|
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
1686 |
datatype.initialValue = PLCOpenParser.CreateElement("initialValue", "dataType") |
814 | 1687 |
datatype.initialValue.setvalue(infos["initial"]) |
1688 |
else: |
|
1689 |
datatype.initialValue = None |
|
1690 |
self.BufferProject() |
|
1411 | 1691 |
|
1782
5b6ad7a7fd9d
clean-up: fix PEP8 E265 block comment should start with '# '
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1780
diff
changeset
|
1692 |
# ------------------------------------------------------------------------------- |
5b6ad7a7fd9d
clean-up: fix PEP8 E265 block comment should start with '# '
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1780
diff
changeset
|
1693 |
# Project opened Pous management functions |
5b6ad7a7fd9d
clean-up: fix PEP8 E265 block comment should start with '# '
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1780
diff
changeset
|
1694 |
# ------------------------------------------------------------------------------- |
814 | 1695 |
|
1696 |
# Return edited element |
|
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1743
diff
changeset
|
1697 |
def GetEditedElement(self, tagname, debug=False): |
814 | 1698 |
project = self.GetProject(debug) |
1699 |
if project is not None: |
|
1700 |
words = tagname.split("::") |
|
1701 |
if words[0] == "D": |
|
1702 |
return project.getdataType(words[1]) |
|
1703 |
elif words[0] == "P": |
|
1704 |
return project.getpou(words[1]) |
|
1705 |
elif words[0] in ['T', 'A']: |
|
1706 |
pou = project.getpou(words[1]) |
|
1707 |
if pou is not None: |
|
1708 |
if words[0] == 'T': |
|
1709 |
return pou.gettransition(words[2]) |
|
1710 |
elif words[0] == 'A': |
|
1711 |
return pou.getaction(words[2]) |
|
1712 |
elif words[0] == 'C': |
|
1713 |
return project.getconfiguration(words[1]) |
|
1714 |
elif words[0] == 'R': |
|
1715 |
return project.getconfigurationResource(words[1], words[2]) |
|
1716 |
return None |
|
1411 | 1717 |
|
814 | 1718 |
# Return edited element name |
1719 |
def GetEditedElementName(self, tagname): |
|
1720 |
words = tagname.split("::") |
|
1740
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
1721 |
if words[0] in ["P", "C", "D"]: |
814 | 1722 |
return words[1] |
1723 |
else: |
|
1724 |
return words[2] |
|
1725 |
return None |
|
1411 | 1726 |
|
814 | 1727 |
# Return edited element name and type |
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1743
diff
changeset
|
1728 |
def GetEditedElementType(self, tagname, debug=False): |
814 | 1729 |
words = tagname.split("::") |
1740
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
1730 |
if words[0] in ["P", "T", "A"]: |
814 | 1731 |
return words[1], self.GetPouType(words[1], debug) |
1732 |
return None, None |
|
1733 |
||
1734 |
# Return language in which edited element is written |
|
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1743
diff
changeset
|
1735 |
def GetEditedElementBodyType(self, tagname, debug=False): |
814 | 1736 |
words = tagname.split("::") |
1737 |
if words[0] == "P": |
|
1738 |
return self.GetPouBodyType(words[1], debug) |
|
1739 |
elif words[0] == 'T': |
|
1740 |
return self.GetTransitionBodyType(words[1], words[2], debug) |
|
1741 |
elif words[0] == 'A': |
|
1742 |
return self.GetActionBodyType(words[1], words[2], debug) |
|
1743 |
return None |
|
1744 |
||
1745 |
# Return the edited element variables |
|
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1743
diff
changeset
|
1746 |
def GetEditedElementInterfaceVars(self, tagname, tree=False, debug=False): |
814 | 1747 |
words = tagname.split("::") |
1740
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
1748 |
if words[0] in ["P", "T", "A"]: |
814 | 1749 |
project = self.GetProject(debug) |
1750 |
if project is not None: |
|
1751 |
pou = project.getpou(words[1]) |
|
1752 |
if pou is not None: |
|
1347
533741e5075c
Fixed pou variables information loading stylesheet
Laurent Bessard
parents:
1341
diff
changeset
|
1753 |
return self.GetPouInterfaceVars(pou, tree, debug) |
814 | 1754 |
return [] |
1755 |
||
1756 |
# Return the edited element return type |
|
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1743
diff
changeset
|
1757 |
def GetEditedElementInterfaceReturnType(self, tagname, tree=False, debug=False): |
814 | 1758 |
words = tagname.split("::") |
1759 |
if words[0] == "P": |
|
1760 |
project = self.GetProject(debug) |
|
1761 |
if project is not None: |
|
1762 |
pou = self.Project.getpou(words[1]) |
|
1763 |
if pou is not None: |
|
1347
533741e5075c
Fixed pou variables information loading stylesheet
Laurent Bessard
parents:
1341
diff
changeset
|
1764 |
return self.GetPouInterfaceReturnType(pou, tree, debug) |
814 | 1765 |
elif words[0] == 'T': |
1616
3638463d6e02
fix issue with creating SFC transitions using ST and IL
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1581
diff
changeset
|
1766 |
return ["BOOL", ([], [])] |
814 | 1767 |
return None |
1411 | 1768 |
|
814 | 1769 |
# Change the edited element text |
1770 |
def SetEditedElementText(self, tagname, text): |
|
1771 |
if self.Project is not None: |
|
1772 |
element = self.GetEditedElement(tagname) |
|
1773 |
if element is not None: |
|
1774 |
element.settext(text) |
|
1411 | 1775 |
|
814 | 1776 |
# Return the edited element text |
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1743
diff
changeset
|
1777 |
def GetEditedElementText(self, tagname, debug=False): |
814 | 1778 |
element = self.GetEditedElement(tagname, debug) |
1779 |
if element is not None: |
|
1780 |
return element.gettext() |
|
1781 |
return "" |
|
1782 |
||
1783 |
# Return the edited element transitions |
|
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1743
diff
changeset
|
1784 |
def GetEditedElementTransitions(self, tagname, debug=False): |
814 | 1785 |
pou = self.GetEditedElement(tagname, debug) |
1786 |
if pou is not None and pou.getbodyType() == "SFC": |
|
1787 |
transitions = [] |
|
1788 |
for transition in pou.gettransitionList(): |
|
1789 |
transitions.append(transition.getname()) |
|
1790 |
return transitions |
|
1791 |
return [] |
|
1792 |
||
1793 |
# Return edited element transitions |
|
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1743
diff
changeset
|
1794 |
def GetEditedElementActions(self, tagname, debug=False): |
814 | 1795 |
pou = self.GetEditedElement(tagname, debug) |
1796 |
if pou is not None and pou.getbodyType() == "SFC": |
|
1797 |
actions = [] |
|
1798 |
for action in pou.getactionList(): |
|
1799 |
actions.append(action.getname()) |
|
1800 |
return actions |
|
1801 |
return [] |
|
1802 |
||
1803 |
# Return the names of the pou elements |
|
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1743
diff
changeset
|
1804 |
def GetEditedElementVariables(self, tagname, debug=False): |
814 | 1805 |
words = tagname.split("::") |
1740
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
1806 |
if words[0] in ["P", "T", "A"]: |
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
|
1807 |
return self.GetProjectPouVariableNames(words[1], 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
|
1808 |
elif words[0] in ["C", "R"]: |
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
|
1809 |
names = self.GetConfigurationVariableNames(words[1], 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
|
1810 |
if words[0] == "R": |
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
|
1811 |
names.extend(self.GetConfigurationResourceVariableNames( |
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
|
1812 |
words[1], words[2], 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
|
1813 |
return names |
814 | 1814 |
return [] |
1815 |
||
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1743
diff
changeset
|
1816 |
def GetEditedElementCopy(self, tagname, debug=False): |
814 | 1817 |
element = self.GetEditedElement(tagname, debug) |
1818 |
if element is not None: |
|
1299
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
1819 |
return element.tostring() |
814 | 1820 |
return "" |
1411 | 1821 |
|
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1743
diff
changeset
|
1822 |
def GetEditedElementInstancesCopy(self, tagname, blocks_id=None, wires=None, debug=False): |
814 | 1823 |
element = self.GetEditedElement(tagname, debug) |
1824 |
text = "" |
|
1825 |
if element is not None: |
|
1411 | 1826 |
wires = dict([(wire, True) |
1827 |
for wire in wires |
|
1299
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
1828 |
if wire[0] in blocks_id and wire[1] in blocks_id]) |
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
1829 |
copy_body = PLCOpenParser.CreateElement("body", "pou") |
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
1830 |
element.append(copy_body) |
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
1831 |
copy_body.setcontent( |
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
1832 |
PLCOpenParser.CreateElement(element.getbodyType(), "body")) |
814 | 1833 |
for id in blocks_id: |
1834 |
instance = element.getinstance(id) |
|
1835 |
if instance is not None: |
|
1299
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
1836 |
copy_body.appendcontentInstance(self.Copy(instance)) |
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
1837 |
instance_copy = copy_body.getcontentInstance(id) |
814 | 1838 |
instance_copy.filterConnections(wires) |
1299
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
1839 |
text += instance_copy.tostring() |
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
1840 |
element.remove(copy_body) |
814 | 1841 |
return text |
1411 | 1842 |
|
1852
70c1cc354a8f
fix pylint warning '(dangerous-default-value) Dangerous default value {} as argument'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1850
diff
changeset
|
1843 |
def GenerateNewName(self, tagname, name, format, start_idx=0, exclude=None, debug=False): |
1968
64827679f3f1
add fields autocomplete when adding task or instance in resources
Surkov Sergey <surkovsv93@gmail.com>
parents:
1881
diff
changeset
|
1844 |
if name is not None: |
64827679f3f1
add fields autocomplete when adding task or instance in resources
Surkov Sergey <surkovsv93@gmail.com>
parents:
1881
diff
changeset
|
1845 |
result = re.search(VARIABLE_NAME_SUFFIX_MODEL, name) |
64827679f3f1
add fields autocomplete when adding task or instance in resources
Surkov Sergey <surkovsv93@gmail.com>
parents:
1881
diff
changeset
|
1846 |
if result is not None: |
64827679f3f1
add fields autocomplete when adding task or instance in resources
Surkov Sergey <surkovsv93@gmail.com>
parents:
1881
diff
changeset
|
1847 |
format = name[:result.start(1)] + '%d' |
64827679f3f1
add fields autocomplete when adding task or instance in resources
Surkov Sergey <surkovsv93@gmail.com>
parents:
1881
diff
changeset
|
1848 |
start_idx = int(result.group(1)) |
64827679f3f1
add fields autocomplete when adding task or instance in resources
Surkov Sergey <surkovsv93@gmail.com>
parents:
1881
diff
changeset
|
1849 |
else: |
64827679f3f1
add fields autocomplete when adding task or instance in resources
Surkov Sergey <surkovsv93@gmail.com>
parents:
1881
diff
changeset
|
1850 |
format = name + '%d' |
64827679f3f1
add fields autocomplete when adding task or instance in resources
Surkov Sergey <surkovsv93@gmail.com>
parents:
1881
diff
changeset
|
1851 |
|
1852
70c1cc354a8f
fix pylint warning '(dangerous-default-value) Dangerous default value {} as argument'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1850
diff
changeset
|
1852 |
names = {} if exclude is None else exclude.copy() |
814 | 1853 |
if tagname is not None: |
1411 | 1854 |
names.update(dict([(varname.upper(), True) |
1122
84de51ab40d2
Adding support for using current selected variable for generate newly added variable informations in VariablePanel
Laurent Bessard
parents:
1096
diff
changeset
|
1855 |
for varname in self.GetEditedElementVariables(tagname, debug)])) |
1127
5315f26642e0
Fixed bug when generating new name for configuration and resource variable in VariablePanel
Laurent Bessard
parents:
1122
diff
changeset
|
1856 |
words = tagname.split("::") |
1740
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
1857 |
if words[0] in ["P", "T", "A"]: |
1127
5315f26642e0
Fixed bug when generating new name for configuration and resource variable in VariablePanel
Laurent Bessard
parents:
1122
diff
changeset
|
1858 |
element = self.GetEditedElement(tagname, debug) |
5315f26642e0
Fixed bug when generating new name for configuration and resource variable in VariablePanel
Laurent Bessard
parents:
1122
diff
changeset
|
1859 |
if element is not None and element.getbodyType() not in ["ST", "IL"]: |
5315f26642e0
Fixed bug when generating new name for configuration and resource variable in VariablePanel
Laurent Bessard
parents:
1122
diff
changeset
|
1860 |
for instance in element.getinstances(): |
1768
691083b5682a
clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1767
diff
changeset
|
1861 |
if isinstance( |
691083b5682a
clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1767
diff
changeset
|
1862 |
instance, |
691083b5682a
clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1767
diff
changeset
|
1863 |
(PLCOpenParser.GetElementClass("step", "sfcObjects"), |
691083b5682a
clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1767
diff
changeset
|
1864 |
PLCOpenParser.GetElementClass("connector", "commonObjects"), |
691083b5682a
clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1767
diff
changeset
|
1865 |
PLCOpenParser.GetElementClass("continuation", "commonObjects"))): |
1127
5315f26642e0
Fixed bug when generating new name for configuration and resource variable in VariablePanel
Laurent Bessard
parents:
1122
diff
changeset
|
1866 |
names[instance.getname().upper()] = True |
1968
64827679f3f1
add fields autocomplete when adding task or instance in resources
Surkov Sergey <surkovsv93@gmail.com>
parents:
1881
diff
changeset
|
1867 |
elif words[0] == 'R': |
64827679f3f1
add fields autocomplete when adding task or instance in resources
Surkov Sergey <surkovsv93@gmail.com>
parents:
1881
diff
changeset
|
1868 |
element = self.GetEditedElement(tagname, debug) |
64827679f3f1
add fields autocomplete when adding task or instance in resources
Surkov Sergey <surkovsv93@gmail.com>
parents:
1881
diff
changeset
|
1869 |
for task in element.gettask(): |
64827679f3f1
add fields autocomplete when adding task or instance in resources
Surkov Sergey <surkovsv93@gmail.com>
parents:
1881
diff
changeset
|
1870 |
names[task.getname().upper()] = True |
64827679f3f1
add fields autocomplete when adding task or instance in resources
Surkov Sergey <surkovsv93@gmail.com>
parents:
1881
diff
changeset
|
1871 |
for instance in task.getpouInstance(): |
64827679f3f1
add fields autocomplete when adding task or instance in resources
Surkov Sergey <surkovsv93@gmail.com>
parents:
1881
diff
changeset
|
1872 |
names[instance.getname().upper()] = True |
64827679f3f1
add fields autocomplete when adding task or instance in resources
Surkov Sergey <surkovsv93@gmail.com>
parents:
1881
diff
changeset
|
1873 |
for instance in element.getpouInstance(): |
64827679f3f1
add fields autocomplete when adding task or instance in resources
Surkov Sergey <surkovsv93@gmail.com>
parents:
1881
diff
changeset
|
1874 |
names[instance.getname().upper()] = True |
814 | 1875 |
else: |
1876 |
project = self.GetProject(debug) |
|
1877 |
if project is not None: |
|
1878 |
for datatype in project.getdataTypes(): |
|
1879 |
names[datatype.getname().upper()] = True |
|
1880 |
for pou in project.getpous(): |
|
1881 |
names[pou.getname().upper()] = True |
|
1347
533741e5075c
Fixed pou variables information loading stylesheet
Laurent Bessard
parents:
1341
diff
changeset
|
1882 |
for var in self.GetPouInterfaceVars(pou, debug=debug): |
533741e5075c
Fixed pou variables information loading stylesheet
Laurent Bessard
parents:
1341
diff
changeset
|
1883 |
names[var.Name.upper()] = True |
814 | 1884 |
for transition in pou.gettransitionList(): |
1885 |
names[transition.getname().upper()] = True |
|
1886 |
for action in pou.getactionList(): |
|
1887 |
names[action.getname().upper()] = True |
|
1888 |
for config in project.getconfigurations(): |
|
1889 |
names[config.getname().upper()] = True |
|
1890 |
for resource in config.getresource(): |
|
1891 |
names[resource.getname().upper()] = True |
|
1411 | 1892 |
|
1122
84de51ab40d2
Adding support for using current selected variable for generate newly added variable informations in VariablePanel
Laurent Bessard
parents:
1096
diff
changeset
|
1893 |
i = start_idx |
814 | 1894 |
while name is None or names.get(name.upper(), False): |
1734
750eeb7230a1
clean-up: fix some PEP8 E228 missing whitespace around modulo operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1732
diff
changeset
|
1895 |
name = (format % i) |
814 | 1896 |
i += 1 |
1897 |
return name |
|
1411 | 1898 |
|
814 | 1899 |
def PasteEditedElementInstances(self, tagname, text, new_pos, middle=False, debug=False): |
1900 |
element = self.GetEditedElement(tagname, debug) |
|
1847
6198190bc121
explicitly mark unused variables found by pylint with _ or dummy
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1846
diff
changeset
|
1901 |
_element_name, element_type = self.GetEditedElementType(tagname, debug) |
814 | 1902 |
if element is not None: |
1903 |
bodytype = element.getbodyType() |
|
1411 | 1904 |
|
814 | 1905 |
# Get edited element type scaling |
1906 |
scaling = None |
|
1907 |
project = self.GetProject(debug) |
|
1908 |
if project is not None: |
|
1909 |
properties = project.getcontentHeader() |
|
1910 |
scaling = properties["scaling"][bodytype] |
|
1411 | 1911 |
|
814 | 1912 |
# Get ids already by all the instances in edited element |
1913 |
used_id = dict([(instance.getlocalId(), True) for instance in element.getinstances()]) |
|
1914 |
new_id = {} |
|
1411 | 1915 |
|
814 | 1916 |
try: |
1505
5ecb16be9a3c
fix copying elements with non-latin content like comment element, or
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1502
diff
changeset
|
1917 |
instances, error = LoadPouInstances(text, bodytype) |
1780
c52d1460cea8
clean-up: fix PEP8 E722 do not use bare except'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1779
diff
changeset
|
1918 |
except Exception: |
1330
96b242e4c59d
Added support for loading XML file even if not following XSD schema (but still following XML syntax), warning user of errors in XML file
Laurent Bessard
parents:
1328
diff
changeset
|
1919 |
instances, error = [], "" |
96b242e4c59d
Added support for loading XML file even if not following XSD schema (but still following XML syntax), warning user of errors in XML file
Laurent Bessard
parents:
1328
diff
changeset
|
1920 |
if error is not None or len(instances) == 0: |
814 | 1921 |
return _("Invalid plcopen element(s)!!!") |
1411 | 1922 |
|
814 | 1923 |
exclude = {} |
1299
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
1924 |
for instance in instances: |
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
1925 |
element.addinstance(instance) |
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
1926 |
instance_type = instance.getLocalTag() |
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
1927 |
if instance_type == "block": |
1337
204ef2daa33c
Fixed bug with Copy/Paste function instance block when previously edited
Laurent Bessard
parents:
1331
diff
changeset
|
1928 |
blocktype = instance.gettypeName() |
204ef2daa33c
Fixed bug with Copy/Paste function instance block when previously edited
Laurent Bessard
parents:
1331
diff
changeset
|
1929 |
blocktype_infos = self.GetBlockType(blocktype) |
1299
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
1930 |
blockname = instance.getinstanceName() |
1337
204ef2daa33c
Fixed bug with Copy/Paste function instance block when previously edited
Laurent Bessard
parents:
1331
diff
changeset
|
1931 |
if blocktype_infos["type"] != "function" and blockname is not None: |
1299
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
1932 |
if element_type == "function": |
1734
750eeb7230a1
clean-up: fix some PEP8 E228 missing whitespace around modulo operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1732
diff
changeset
|
1933 |
return _("FunctionBlock \"%s\" can't be pasted in a Function!!!") % blocktype |
1411 | 1934 |
blockname = self.GenerateNewName(tagname, |
1935 |
blockname, |
|
1734
750eeb7230a1
clean-up: fix some PEP8 E228 missing whitespace around modulo operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1732
diff
changeset
|
1936 |
"%s%%d" % blocktype, |
1299
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
1937 |
debug=debug) |
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
1938 |
exclude[blockname] = True |
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
1939 |
instance.setinstanceName(blockname) |
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
1940 |
self.AddEditedElementPouVar(tagname, blocktype, blockname) |
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
1941 |
elif instance_type == "step": |
1411 | 1942 |
stepname = self.GenerateNewName(tagname, |
1943 |
instance.getname(), |
|
1944 |
"Step%d", |
|
1945 |
exclude=exclude, |
|
1299
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
1946 |
debug=debug) |
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
1947 |
exclude[stepname] = True |
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
1948 |
instance.setname(stepname) |
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
1949 |
localid = instance.getlocalId() |
1775
b45f2768fab1
clean-up: fix PEP8 E713 test for membership should be 'not in'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1774
diff
changeset
|
1950 |
if localid not in used_id: |
1299
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
1951 |
new_id[localid] = True |
1411 | 1952 |
|
814 | 1953 |
idx = 1 |
1954 |
translate_id = {} |
|
1299
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
1955 |
bbox = rect() |
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
1956 |
for instance in instances: |
814 | 1957 |
localId = instance.getlocalId() |
1958 |
bbox.union(instance.getBoundingBox()) |
|
1763
bcc07ff2362c
clean-up: fix PEP8 W601 .has_key() is deprecated, use 'in'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1762
diff
changeset
|
1959 |
if localId in used_id: |
bcc07ff2362c
clean-up: fix PEP8 W601 .has_key() is deprecated, use 'in'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1762
diff
changeset
|
1960 |
while (idx in used_id) or (idx in new_id): |
814 | 1961 |
idx += 1 |
1962 |
new_id[idx] = True |
|
1963 |
instance.setlocalId(idx) |
|
1964 |
translate_id[localId] = idx |
|
1411 | 1965 |
|
814 | 1966 |
x, y, width, height = bbox.bounding_box() |
1967 |
if middle: |
|
2437
105c20fdeb19
python3 support: pylint, W1619 #(old-division) division w/o __future__ statement
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2418
diff
changeset
|
1968 |
new_pos[0] -= width // 2 |
105c20fdeb19
python3 support: pylint, W1619 #(old-division) division w/o __future__ statement
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2418
diff
changeset
|
1969 |
new_pos[1] -= height // 2 |
814 | 1970 |
else: |
3750
f62625418bff
automated conversion using 2to3-3.9 tool
GP Orcullo <kinsamanka@gmail.com>
parents:
3704
diff
changeset
|
1971 |
new_pos = [x + 30 for x in new_pos] |
814 | 1972 |
if scaling[0] != 0 and scaling[1] != 0: |
3750
f62625418bff
automated conversion using 2to3-3.9 tool
GP Orcullo <kinsamanka@gmail.com>
parents:
3704
diff
changeset
|
1973 |
min_pos = [30 / x for x in scaling] |
814 | 1974 |
minx = round(min_pos[0]) |
1975 |
if int(min_pos[0]) == round(min_pos[0]): |
|
1976 |
minx += 1 |
|
1977 |
miny = round(min_pos[1]) |
|
1978 |
if int(min_pos[1]) == round(min_pos[1]): |
|
1979 |
miny += 1 |
|
1980 |
minx *= scaling[0] |
|
1981 |
miny *= scaling[1] |
|
1982 |
new_pos = (max(minx, round(new_pos[0] / scaling[0]) * scaling[0]), |
|
1983 |
max(miny, round(new_pos[1] / scaling[1]) * scaling[1])) |
|
1984 |
else: |
|
1985 |
new_pos = (max(30, new_pos[0]), max(30, new_pos[1])) |
|
1367
324767a092dc
Fixed bug when pasting element with an odd width or height
Laurent Bessard
parents:
1361
diff
changeset
|
1986 |
diff = (int(new_pos[0] - x), int(new_pos[1] - y)) |
1411 | 1987 |
|
814 | 1988 |
connections = {} |
1299
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
1989 |
for instance in instances: |
814 | 1990 |
connections.update(instance.updateConnectionsId(translate_id)) |
1991 |
if getattr(instance, "setexecutionOrderId", None) is not None: |
|
1992 |
instance.setexecutionOrderId(0) |
|
1993 |
instance.translate(*diff) |
|
1411 | 1994 |
|
814 | 1995 |
return new_id, connections |
1411 | 1996 |
|
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1743
diff
changeset
|
1997 |
def GetEditedElementInstancesInfos(self, tagname, debug=False): |
1331
38c5de794e62
Added support for speed-up loading of graphic POU tabs
Laurent Bessard
parents:
1330
diff
changeset
|
1998 |
element = self.GetEditedElement(tagname, debug) |
38c5de794e62
Added support for speed-up loading of graphic POU tabs
Laurent Bessard
parents:
1330
diff
changeset
|
1999 |
if element is not None: |
1957
2d1cc4f5e4ef
GetEditedElementInstancesInfos now optimized as well. Forgotten because not using [R.I.P]LibraryResolver, but still XSLT compiling was hapenning on each call.
Edouard Tisserant
parents:
1954
diff
changeset
|
2000 |
return self.BlockInstanceCollector.Collect(element, debug) |
2d1cc4f5e4ef
GetEditedElementInstancesInfos now optimized as well. Forgotten because not using [R.I.P]LibraryResolver, but still XSLT compiling was hapenning on each call.
Edouard Tisserant
parents:
1954
diff
changeset
|
2001 |
return {} |
1411 | 2002 |
|
814 | 2003 |
def ClearEditedElementExecutionOrder(self, tagname): |
2004 |
element = self.GetEditedElement(tagname) |
|
2005 |
if element is not None: |
|
2006 |
element.resetexecutionOrder() |
|
1411 | 2007 |
|
814 | 2008 |
def ResetEditedElementExecutionOrder(self, tagname): |
2009 |
element = self.GetEditedElement(tagname) |
|
2010 |
if element is not None: |
|
2011 |
element.compileexecutionOrder() |
|
1411 | 2012 |
|
814 | 2013 |
def SetConnectionWires(self, connection, connector): |
2014 |
wires = connector.GetWires() |
|
2015 |
idx = 0 |
|
2016 |
for wire, handle in wires: |
|
2017 |
points = wire.GetPoints(handle != 0) |
|
2018 |
if handle == 0: |
|
2019 |
result = wire.GetConnectedInfos(-1) |
|
2020 |
else: |
|
2021 |
result = wire.GetConnectedInfos(0) |
|
1743
c3c3d1318130
clean-up: fix PEP8 E711 comparison to None should be 'if cond is not None:'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1741
diff
changeset
|
2022 |
if result is not None: |
814 | 2023 |
refLocalId, formalParameter = result |
2024 |
connections = connection.getconnections() |
|
2025 |
if connections is None or len(connection.getconnections()) <= idx: |
|
2026 |
connection.addconnection() |
|
2027 |
connection.setconnectionId(idx, refLocalId) |
|
2028 |
connection.setconnectionPoints(idx, points) |
|
2029 |
if formalParameter != "": |
|
2030 |
connection.setconnectionParameter(idx, formalParameter) |
|
2031 |
else: |
|
2032 |
connection.setconnectionParameter(idx, None) |
|
2033 |
idx += 1 |
|
1411 | 2034 |
|
1313
85c167bfff93
Replaced standard function blocks library definition from dictionary to plcopen xml files
Laurent Bessard
parents:
1311
diff
changeset
|
2035 |
def GetVarTypeObject(self, var_type): |
85c167bfff93
Replaced standard function blocks library definition from dictionary to plcopen xml files
Laurent Bessard
parents:
1311
diff
changeset
|
2036 |
var_type_obj = PLCOpenParser.CreateElement("type", "variable") |
85c167bfff93
Replaced standard function blocks library definition from dictionary to plcopen xml files
Laurent Bessard
parents:
1311
diff
changeset
|
2037 |
if not var_type.startswith("ANY") and TypeHierarchy.get(var_type): |
85c167bfff93
Replaced standard function blocks library definition from dictionary to plcopen xml files
Laurent Bessard
parents:
1311
diff
changeset
|
2038 |
var_type_obj.setcontent(PLCOpenParser.CreateElement( |
85c167bfff93
Replaced standard function blocks library definition from dictionary to plcopen xml files
Laurent Bessard
parents:
1311
diff
changeset
|
2039 |
var_type.lower() if var_type in ["STRING", "WSTRING"] |
85c167bfff93
Replaced standard function blocks library definition from dictionary to plcopen xml files
Laurent Bessard
parents:
1311
diff
changeset
|
2040 |
else var_type, "dataType")) |
85c167bfff93
Replaced standard function blocks library definition from dictionary to plcopen xml files
Laurent Bessard
parents:
1311
diff
changeset
|
2041 |
else: |
85c167bfff93
Replaced standard function blocks library definition from dictionary to plcopen xml files
Laurent Bessard
parents:
1311
diff
changeset
|
2042 |
derived_type = PLCOpenParser.CreateElement("derived", "dataType") |
85c167bfff93
Replaced standard function blocks library definition from dictionary to plcopen xml files
Laurent Bessard
parents:
1311
diff
changeset
|
2043 |
derived_type.setname(var_type) |
85c167bfff93
Replaced standard function blocks library definition from dictionary to plcopen xml files
Laurent Bessard
parents:
1311
diff
changeset
|
2044 |
var_type_obj.setcontent(derived_type) |
85c167bfff93
Replaced standard function blocks library definition from dictionary to plcopen xml files
Laurent Bessard
parents:
1311
diff
changeset
|
2045 |
return var_type_obj |
1411 | 2046 |
|
1740
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
2047 |
def AddEditedElementPouVar(self, tagname, var_type, name, **args): |
814 | 2048 |
if self.Project is not None: |
2049 |
words = tagname.split("::") |
|
2050 |
if words[0] in ['P', 'T', 'A']: |
|
2051 |
pou = self.Project.getpou(words[1]) |
|
2052 |
if pou is not None: |
|
1313
85c167bfff93
Replaced standard function blocks library definition from dictionary to plcopen xml files
Laurent Bessard
parents:
1311
diff
changeset
|
2053 |
pou.addpouLocalVar( |
1411 | 2054 |
self.GetVarTypeObject(var_type), |
1406
82db84fe88ea
Added 'NamedConstant' drag'n'drop in programs. It does create a simple variable with initial value and is usefull for drag'n'drop constants from extensions while keeping a name associated with constant
Edouard Tisserant
parents:
1390
diff
changeset
|
2055 |
name, **args) |
1411 | 2056 |
|
2739
7278186a2083
Copy description when DnD variables from CodeFile CTN to POUs
Edouard Tisserant
parents:
2625
diff
changeset
|
2057 |
def AddEditedElementPouExternalVar(self, tagname, var_type, name, **args): |
814 | 2058 |
if self.Project is not None: |
2059 |
words = tagname.split("::") |
|
2060 |
if words[0] in ['P', 'T', 'A']: |
|
2061 |
pou = self.Project.getpou(words[1]) |
|
2062 |
if pou is not None: |
|
1313
85c167bfff93
Replaced standard function blocks library definition from dictionary to plcopen xml files
Laurent Bessard
parents:
1311
diff
changeset
|
2063 |
pou.addpouExternalVar( |
2739
7278186a2083
Copy description when DnD variables from CodeFile CTN to POUs
Edouard Tisserant
parents:
2625
diff
changeset
|
2064 |
self.GetVarTypeObject(var_type), |
7278186a2083
Copy description when DnD variables from CodeFile CTN to POUs
Edouard Tisserant
parents:
2625
diff
changeset
|
2065 |
name, **args) |
1411 | 2066 |
|
814 | 2067 |
def ChangeEditedElementPouVar(self, tagname, old_type, old_name, new_type, new_name): |
2068 |
if self.Project is not None: |
|
2069 |
words = tagname.split("::") |
|
2070 |
if words[0] in ['P', 'T', 'A']: |
|
2071 |
pou = self.Project.getpou(words[1]) |
|
2072 |
if pou is not None: |
|
2073 |
pou.changepouVar(old_type, old_name, new_type, new_name) |
|
1411 | 2074 |
|
814 | 2075 |
def RemoveEditedElementPouVar(self, tagname, type, name): |
2076 |
if self.Project is not None: |
|
2077 |
words = tagname.split("::") |
|
2078 |
if words[0] in ['P', 'T', 'A']: |
|
2079 |
pou = self.Project.getpou(words[1]) |
|
2080 |
if pou is not None: |
|
2081 |
pou.removepouVar(type, name) |
|
1411 | 2082 |
|
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1743
diff
changeset
|
2083 |
def AddEditedElementBlock(self, tagname, id, blocktype, blockname=None): |
814 | 2084 |
element = self.GetEditedElement(tagname) |
2085 |
if element is not None: |
|
1291
42ea51d083ce
Second stage of xmlclass refactoring using lxml , project are loaded and displayed successfully
Laurent Bessard
parents:
1290
diff
changeset
|
2086 |
block = PLCOpenParser.CreateElement("block", "fbdObjects") |
814 | 2087 |
block.setlocalId(id) |
2088 |
block.settypeName(blocktype) |
|
2089 |
blocktype_infos = self.GetBlockType(blocktype) |
|
2090 |
if blocktype_infos["type"] != "function" and blockname is not None: |
|
2091 |
block.setinstanceName(blockname) |
|
2092 |
self.AddEditedElementPouVar(tagname, blocktype, blockname) |
|
1293
40117d02601b
Fixed diagram editing in xmlclass refactoring
Laurent Bessard
parents:
1291
diff
changeset
|
2093 |
element.addinstance(block) |
1411 | 2094 |
|
814 | 2095 |
def SetEditedElementBlockInfos(self, tagname, id, infos): |
2096 |
element = self.GetEditedElement(tagname) |
|
2097 |
if element is not None: |
|
2098 |
block = element.getinstance(id) |
|
2099 |
if block is None: |
|
1411 | 2100 |
return |
814 | 2101 |
old_name = block.getinstanceName() |
2102 |
old_type = block.gettypeName() |
|
2103 |
new_name = infos.get("name", old_name) |
|
2104 |
new_type = infos.get("type", old_type) |
|
2105 |
if new_type != old_type: |
|
2106 |
old_typeinfos = self.GetBlockType(old_type) |
|
2107 |
new_typeinfos = self.GetBlockType(new_type) |
|
2108 |
if old_typeinfos is None or new_typeinfos is None: |
|
2109 |
self.ChangeEditedElementPouVar(tagname, old_type, old_name, new_type, new_name) |
|
2110 |
elif new_typeinfos["type"] != old_typeinfos["type"]: |
|
2111 |
if new_typeinfos["type"] == "function": |
|
2112 |
self.RemoveEditedElementPouVar(tagname, old_type, old_name) |
|
2113 |
else: |
|
2114 |
self.AddEditedElementPouVar(tagname, new_type, new_name) |
|
2115 |
elif new_typeinfos["type"] != "function": |
|
2116 |
self.ChangeEditedElementPouVar(tagname, old_type, old_name, new_type, new_name) |
|
2117 |
elif new_name != old_name: |
|
2118 |
self.ChangeEditedElementPouVar(tagname, old_type, old_name, new_type, new_name) |
|
3750
f62625418bff
automated conversion using 2to3-3.9 tool
GP Orcullo <kinsamanka@gmail.com>
parents:
3704
diff
changeset
|
2119 |
for param, value in list(infos.items()): |
814 | 2120 |
if param == "name": |
1337
204ef2daa33c
Fixed bug with Copy/Paste function instance block when previously edited
Laurent Bessard
parents:
1331
diff
changeset
|
2121 |
if value != "": |
204ef2daa33c
Fixed bug with Copy/Paste function instance block when previously edited
Laurent Bessard
parents:
1331
diff
changeset
|
2122 |
block.setinstanceName(value) |
204ef2daa33c
Fixed bug with Copy/Paste function instance block when previously edited
Laurent Bessard
parents:
1331
diff
changeset
|
2123 |
else: |
204ef2daa33c
Fixed bug with Copy/Paste function instance block when previously edited
Laurent Bessard
parents:
1331
diff
changeset
|
2124 |
block.attrib.pop("instanceName", None) |
814 | 2125 |
elif param == "type": |
2126 |
block.settypeName(value) |
|
2127 |
elif param == "executionOrder" and block.getexecutionOrderId() != value: |
|
2128 |
element.setelementExecutionOrder(block, value) |
|
2129 |
elif param == "height": |
|
2130 |
block.setheight(value) |
|
2131 |
elif param == "width": |
|
2132 |
block.setwidth(value) |
|
2133 |
elif param == "x": |
|
2134 |
block.setx(value) |
|
2135 |
elif param == "y": |
|
2136 |
block.sety(value) |
|
2137 |
elif param == "connectors": |
|
2138 |
block.inputVariables.setvariable([]) |
|
2139 |
block.outputVariables.setvariable([]) |
|
2140 |
for connector in value["inputs"]: |
|
1293
40117d02601b
Fixed diagram editing in xmlclass refactoring
Laurent Bessard
parents:
1291
diff
changeset
|
2141 |
variable = PLCOpenParser.CreateElement("variable", "inputVariables") |
40117d02601b
Fixed diagram editing in xmlclass refactoring
Laurent Bessard
parents:
1291
diff
changeset
|
2142 |
block.inputVariables.appendvariable(variable) |
814 | 2143 |
variable.setformalParameter(connector.GetName()) |
2144 |
if connector.IsNegated(): |
|
2145 |
variable.setnegated(True) |
|
2146 |
if connector.GetEdge() != "none": |
|
2147 |
variable.setedge(connector.GetEdge()) |
|
2148 |
position = connector.GetRelPosition() |
|
2149 |
variable.connectionPointIn.setrelPositionXY(position.x, position.y) |
|
2150 |
self.SetConnectionWires(variable.connectionPointIn, connector) |
|
2151 |
for connector in value["outputs"]: |
|
1293
40117d02601b
Fixed diagram editing in xmlclass refactoring
Laurent Bessard
parents:
1291
diff
changeset
|
2152 |
variable = PLCOpenParser.CreateElement("variable", "outputVariables") |
40117d02601b
Fixed diagram editing in xmlclass refactoring
Laurent Bessard
parents:
1291
diff
changeset
|
2153 |
block.outputVariables.appendvariable(variable) |
814 | 2154 |
variable.setformalParameter(connector.GetName()) |
2155 |
if connector.IsNegated(): |
|
2156 |
variable.setnegated(True) |
|
2157 |
if connector.GetEdge() != "none": |
|
2158 |
variable.setedge(connector.GetEdge()) |
|
2159 |
position = connector.GetRelPosition() |
|
2160 |
variable.addconnectionPointOut() |
|
2161 |
variable.connectionPointOut.setrelPositionXY(position.x, position.y) |
|
1293
40117d02601b
Fixed diagram editing in xmlclass refactoring
Laurent Bessard
parents:
1291
diff
changeset
|
2162 |
block.tostring() |
1411 | 2163 |
|
1293
40117d02601b
Fixed diagram editing in xmlclass refactoring
Laurent Bessard
parents:
1291
diff
changeset
|
2164 |
def AddEditedElementVariable(self, tagname, id, var_type): |
814 | 2165 |
element = self.GetEditedElement(tagname) |
1293
40117d02601b
Fixed diagram editing in xmlclass refactoring
Laurent Bessard
parents:
1291
diff
changeset
|
2166 |
if element is not None: |
40117d02601b
Fixed diagram editing in xmlclass refactoring
Laurent Bessard
parents:
1291
diff
changeset
|
2167 |
variable = PLCOpenParser.CreateElement( |
40117d02601b
Fixed diagram editing in xmlclass refactoring
Laurent Bessard
parents:
1291
diff
changeset
|
2168 |
{INPUT: "inVariable", |
40117d02601b
Fixed diagram editing in xmlclass refactoring
Laurent Bessard
parents:
1291
diff
changeset
|
2169 |
OUTPUT: "outVariable", |
40117d02601b
Fixed diagram editing in xmlclass refactoring
Laurent Bessard
parents:
1291
diff
changeset
|
2170 |
INOUT: "inOutVariable"}[var_type], "fbdObjects") |
814 | 2171 |
variable.setlocalId(id) |
1293
40117d02601b
Fixed diagram editing in xmlclass refactoring
Laurent Bessard
parents:
1291
diff
changeset
|
2172 |
element.addinstance(variable) |
1411 | 2173 |
|
814 | 2174 |
def SetEditedElementVariableInfos(self, tagname, id, infos): |
2175 |
element = self.GetEditedElement(tagname) |
|
2176 |
if element is not None: |
|
2177 |
variable = element.getinstance(id) |
|
2178 |
if variable is None: |
|
1411 | 2179 |
return |
3750
f62625418bff
automated conversion using 2to3-3.9 tool
GP Orcullo <kinsamanka@gmail.com>
parents:
3704
diff
changeset
|
2180 |
for param, value in list(infos.items()): |
814 | 2181 |
if param == "name": |
1322
0a9227f743b3
Fixed xmlclass for working with included files, adding support for SimpleType elements and solving ambiguity in extension class when different elements share the same name and parent name
Laurent Bessard
parents:
1321
diff
changeset
|
2182 |
variable.setexpression(value) |
814 | 2183 |
elif param == "executionOrder" and variable.getexecutionOrderId() != value: |
2184 |
element.setelementExecutionOrder(variable, value) |
|
2185 |
elif param == "height": |
|
2186 |
variable.setheight(value) |
|
2187 |
elif param == "width": |
|
2188 |
variable.setwidth(value) |
|
2189 |
elif param == "x": |
|
2190 |
variable.setx(value) |
|
2191 |
elif param == "y": |
|
2192 |
variable.sety(value) |
|
2193 |
elif param == "connectors": |
|
2194 |
if len(value["outputs"]) > 0: |
|
2195 |
output = value["outputs"][0] |
|
2196 |
if len(value["inputs"]) > 0: |
|
2197 |
variable.setnegatedOut(output.IsNegated()) |
|
2198 |
variable.setedgeOut(output.GetEdge()) |
|
2199 |
else: |
|
2200 |
variable.setnegated(output.IsNegated()) |
|
2201 |
variable.setedge(output.GetEdge()) |
|
2202 |
position = output.GetRelPosition() |
|
2203 |
variable.addconnectionPointOut() |
|
2204 |
variable.connectionPointOut.setrelPositionXY(position.x, position.y) |
|
2205 |
if len(value["inputs"]) > 0: |
|
2206 |
input = value["inputs"][0] |
|
2207 |
if len(value["outputs"]) > 0: |
|
2208 |
variable.setnegatedIn(input.IsNegated()) |
|
2209 |
variable.setedgeIn(input.GetEdge()) |
|
2210 |
else: |
|
2211 |
variable.setnegated(input.IsNegated()) |
|
2212 |
variable.setedge(input.GetEdge()) |
|
2213 |
position = input.GetRelPosition() |
|
2214 |
variable.addconnectionPointIn() |
|
2215 |
variable.connectionPointIn.setrelPositionXY(position.x, position.y) |
|
2216 |
self.SetConnectionWires(variable.connectionPointIn, input) |
|
2217 |
||
1293
40117d02601b
Fixed diagram editing in xmlclass refactoring
Laurent Bessard
parents:
1291
diff
changeset
|
2218 |
def AddEditedElementConnection(self, tagname, id, connection_type): |
814 | 2219 |
element = self.GetEditedElement(tagname) |
2220 |
if element is not None: |
|
1293
40117d02601b
Fixed diagram editing in xmlclass refactoring
Laurent Bessard
parents:
1291
diff
changeset
|
2221 |
connection = PLCOpenParser.CreateElement( |
40117d02601b
Fixed diagram editing in xmlclass refactoring
Laurent Bessard
parents:
1291
diff
changeset
|
2222 |
{CONNECTOR: "connector", |
40117d02601b
Fixed diagram editing in xmlclass refactoring
Laurent Bessard
parents:
1291
diff
changeset
|
2223 |
CONTINUATION: "continuation"}[connection_type], "commonObjects") |
814 | 2224 |
connection.setlocalId(id) |
1293
40117d02601b
Fixed diagram editing in xmlclass refactoring
Laurent Bessard
parents:
1291
diff
changeset
|
2225 |
element.addinstance(connection) |
1411 | 2226 |
|
814 | 2227 |
def SetEditedElementConnectionInfos(self, tagname, id, infos): |
2228 |
element = self.GetEditedElement(tagname) |
|
2229 |
if element is not None: |
|
2230 |
connection = element.getinstance(id) |
|
2231 |
if connection is None: |
|
2232 |
return |
|
3750
f62625418bff
automated conversion using 2to3-3.9 tool
GP Orcullo <kinsamanka@gmail.com>
parents:
3704
diff
changeset
|
2233 |
for param, value in list(infos.items()): |
814 | 2234 |
if param == "name": |
1411 | 2235 |
connection.setname(value) |
814 | 2236 |
elif param == "height": |
2237 |
connection.setheight(value) |
|
2238 |
elif param == "width": |
|
2239 |
connection.setwidth(value) |
|
2240 |
elif param == "x": |
|
2241 |
connection.setx(value) |
|
2242 |
elif param == "y": |
|
2243 |
connection.sety(value) |
|
2244 |
elif param == "connector": |
|
2245 |
position = value.GetRelPosition() |
|
1293
40117d02601b
Fixed diagram editing in xmlclass refactoring
Laurent Bessard
parents:
1291
diff
changeset
|
2246 |
if isinstance(connection, PLCOpenParser.GetElementClass("continuation", "commonObjects")): |
814 | 2247 |
connection.addconnectionPointOut() |
2248 |
connection.connectionPointOut.setrelPositionXY(position.x, position.y) |
|
1293
40117d02601b
Fixed diagram editing in xmlclass refactoring
Laurent Bessard
parents:
1291
diff
changeset
|
2249 |
elif isinstance(connection, PLCOpenParser.GetElementClass("connector", "commonObjects")): |
814 | 2250 |
connection.addconnectionPointIn() |
2251 |
connection.connectionPointIn.setrelPositionXY(position.x, position.y) |
|
2252 |
self.SetConnectionWires(connection.connectionPointIn, value) |
|
2253 |
||
2254 |
def AddEditedElementComment(self, tagname, id): |
|
2255 |
element = self.GetEditedElement(tagname) |
|
2256 |
if element is not None: |
|
1293
40117d02601b
Fixed diagram editing in xmlclass refactoring
Laurent Bessard
parents:
1291
diff
changeset
|
2257 |
comment = PLCOpenParser.CreateElement("comment", "commonObjects") |
814 | 2258 |
comment.setlocalId(id) |
1293
40117d02601b
Fixed diagram editing in xmlclass refactoring
Laurent Bessard
parents:
1291
diff
changeset
|
2259 |
element.addinstance(comment) |
1411 | 2260 |
|
814 | 2261 |
def SetEditedElementCommentInfos(self, tagname, id, infos): |
2262 |
element = self.GetEditedElement(tagname) |
|
2263 |
if element is not None: |
|
2264 |
comment = element.getinstance(id) |
|
3750
f62625418bff
automated conversion using 2to3-3.9 tool
GP Orcullo <kinsamanka@gmail.com>
parents:
3704
diff
changeset
|
2265 |
for param, value in list(infos.items()): |
814 | 2266 |
if param == "content": |
2267 |
comment.setcontentText(value) |
|
2268 |
elif param == "height": |
|
2269 |
comment.setheight(value) |
|
2270 |
elif param == "width": |
|
2271 |
comment.setwidth(value) |
|
2272 |
elif param == "x": |
|
2273 |
comment.setx(value) |
|
2274 |
elif param == "y": |
|
2275 |
comment.sety(value) |
|
2276 |
||
1293
40117d02601b
Fixed diagram editing in xmlclass refactoring
Laurent Bessard
parents:
1291
diff
changeset
|
2277 |
def AddEditedElementPowerRail(self, tagname, id, powerrail_type): |
814 | 2278 |
element = self.GetEditedElement(tagname) |
2279 |
if element is not None: |
|
1293
40117d02601b
Fixed diagram editing in xmlclass refactoring
Laurent Bessard
parents:
1291
diff
changeset
|
2280 |
powerrail = PLCOpenParser.CreateElement( |
40117d02601b
Fixed diagram editing in xmlclass refactoring
Laurent Bessard
parents:
1291
diff
changeset
|
2281 |
{LEFTRAIL: "leftPowerRail", |
40117d02601b
Fixed diagram editing in xmlclass refactoring
Laurent Bessard
parents:
1291
diff
changeset
|
2282 |
RIGHTRAIL: "rightPowerRail"}[powerrail_type], "ldObjects") |
814 | 2283 |
powerrail.setlocalId(id) |
1293
40117d02601b
Fixed diagram editing in xmlclass refactoring
Laurent Bessard
parents:
1291
diff
changeset
|
2284 |
element.addinstance(powerrail) |
1411 | 2285 |
|
814 | 2286 |
def SetEditedElementPowerRailInfos(self, tagname, id, infos): |
2287 |
element = self.GetEditedElement(tagname) |
|
2288 |
if element is not None: |
|
2289 |
powerrail = element.getinstance(id) |
|
2290 |
if powerrail is None: |
|
2291 |
return |
|
3750
f62625418bff
automated conversion using 2to3-3.9 tool
GP Orcullo <kinsamanka@gmail.com>
parents:
3704
diff
changeset
|
2292 |
for param, value in list(infos.items()): |
814 | 2293 |
if param == "height": |
2294 |
powerrail.setheight(value) |
|
2295 |
elif param == "width": |
|
2296 |
powerrail.setwidth(value) |
|
2297 |
elif param == "x": |
|
2298 |
powerrail.setx(value) |
|
2299 |
elif param == "y": |
|
2300 |
powerrail.sety(value) |
|
2301 |
elif param == "connectors": |
|
1293
40117d02601b
Fixed diagram editing in xmlclass refactoring
Laurent Bessard
parents:
1291
diff
changeset
|
2302 |
if isinstance(powerrail, PLCOpenParser.GetElementClass("leftPowerRail", "ldObjects")): |
814 | 2303 |
powerrail.setconnectionPointOut([]) |
2304 |
for connector in value["outputs"]: |
|
2305 |
position = connector.GetRelPosition() |
|
1293
40117d02601b
Fixed diagram editing in xmlclass refactoring
Laurent Bessard
parents:
1291
diff
changeset
|
2306 |
connection = PLCOpenParser.CreateElement("connectionPointOut", "leftPowerRail") |
40117d02601b
Fixed diagram editing in xmlclass refactoring
Laurent Bessard
parents:
1291
diff
changeset
|
2307 |
powerrail.appendconnectionPointOut(connection) |
814 | 2308 |
connection.setrelPositionXY(position.x, position.y) |
1293
40117d02601b
Fixed diagram editing in xmlclass refactoring
Laurent Bessard
parents:
1291
diff
changeset
|
2309 |
elif isinstance(powerrail, PLCOpenParser.GetElementClass("rightPowerRail", "ldObjects")): |
814 | 2310 |
powerrail.setconnectionPointIn([]) |
2311 |
for connector in value["inputs"]: |
|
2312 |
position = connector.GetRelPosition() |
|
1293
40117d02601b
Fixed diagram editing in xmlclass refactoring
Laurent Bessard
parents:
1291
diff
changeset
|
2313 |
connection = PLCOpenParser.CreateElement("connectionPointIn", "rightPowerRail") |
40117d02601b
Fixed diagram editing in xmlclass refactoring
Laurent Bessard
parents:
1291
diff
changeset
|
2314 |
powerrail.appendconnectionPointIn(connection) |
814 | 2315 |
connection.setrelPositionXY(position.x, position.y) |
2316 |
self.SetConnectionWires(connection, connector) |
|
1411 | 2317 |
|
814 | 2318 |
def AddEditedElementContact(self, tagname, id): |
2319 |
element = self.GetEditedElement(tagname) |
|
2320 |
if element is not None: |
|
1293
40117d02601b
Fixed diagram editing in xmlclass refactoring
Laurent Bessard
parents:
1291
diff
changeset
|
2321 |
contact = PLCOpenParser.CreateElement("contact", "ldObjects") |
814 | 2322 |
contact.setlocalId(id) |
1293
40117d02601b
Fixed diagram editing in xmlclass refactoring
Laurent Bessard
parents:
1291
diff
changeset
|
2323 |
element.addinstance(contact) |
814 | 2324 |
|
2325 |
def SetEditedElementContactInfos(self, tagname, id, infos): |
|
2326 |
element = self.GetEditedElement(tagname) |
|
2327 |
if element is not None: |
|
2328 |
contact = element.getinstance(id) |
|
2329 |
if contact is None: |
|
2330 |
return |
|
3750
f62625418bff
automated conversion using 2to3-3.9 tool
GP Orcullo <kinsamanka@gmail.com>
parents:
3704
diff
changeset
|
2331 |
for param, value in list(infos.items()): |
814 | 2332 |
if param == "name": |
1322
0a9227f743b3
Fixed xmlclass for working with included files, adding support for SimpleType elements and solving ambiguity in extension class when different elements share the same name and parent name
Laurent Bessard
parents:
1321
diff
changeset
|
2333 |
contact.setvariable(value) |
814 | 2334 |
elif param == "type": |
1294
f02ba5b83811
Fixed datatype and configuration editing in xmlclass refactoring
Laurent Bessard
parents:
1293
diff
changeset
|
2335 |
negated, edge = { |
f02ba5b83811
Fixed datatype and configuration editing in xmlclass refactoring
Laurent Bessard
parents:
1293
diff
changeset
|
2336 |
CONTACT_NORMAL: (False, "none"), |
f02ba5b83811
Fixed datatype and configuration editing in xmlclass refactoring
Laurent Bessard
parents:
1293
diff
changeset
|
2337 |
CONTACT_REVERSE: (True, "none"), |
f02ba5b83811
Fixed datatype and configuration editing in xmlclass refactoring
Laurent Bessard
parents:
1293
diff
changeset
|
2338 |
CONTACT_RISING: (False, "rising"), |
f02ba5b83811
Fixed datatype and configuration editing in xmlclass refactoring
Laurent Bessard
parents:
1293
diff
changeset
|
2339 |
CONTACT_FALLING: (False, "falling")}[value] |
f02ba5b83811
Fixed datatype and configuration editing in xmlclass refactoring
Laurent Bessard
parents:
1293
diff
changeset
|
2340 |
contact.setnegated(negated) |
f02ba5b83811
Fixed datatype and configuration editing in xmlclass refactoring
Laurent Bessard
parents:
1293
diff
changeset
|
2341 |
contact.setedge(edge) |
814 | 2342 |
elif param == "height": |
2343 |
contact.setheight(value) |
|
2344 |
elif param == "width": |
|
2345 |
contact.setwidth(value) |
|
2346 |
elif param == "x": |
|
2347 |
contact.setx(value) |
|
2348 |
elif param == "y": |
|
2349 |
contact.sety(value) |
|
2350 |
elif param == "connectors": |
|
2351 |
input_connector = value["inputs"][0] |
|
2352 |
position = input_connector.GetRelPosition() |
|
2353 |
contact.addconnectionPointIn() |
|
2354 |
contact.connectionPointIn.setrelPositionXY(position.x, position.y) |
|
2355 |
self.SetConnectionWires(contact.connectionPointIn, input_connector) |
|
2356 |
output_connector = value["outputs"][0] |
|
2357 |
position = output_connector.GetRelPosition() |
|
2358 |
contact.addconnectionPointOut() |
|
2359 |
contact.connectionPointOut.setrelPositionXY(position.x, position.y) |
|
2360 |
||
2361 |
def AddEditedElementCoil(self, tagname, id): |
|
2362 |
element = self.GetEditedElement(tagname) |
|
2363 |
if element is not None: |
|
1293
40117d02601b
Fixed diagram editing in xmlclass refactoring
Laurent Bessard
parents:
1291
diff
changeset
|
2364 |
coil = PLCOpenParser.CreateElement("coil", "ldObjects") |
814 | 2365 |
coil.setlocalId(id) |
1293
40117d02601b
Fixed diagram editing in xmlclass refactoring
Laurent Bessard
parents:
1291
diff
changeset
|
2366 |
element.addinstance(coil) |
814 | 2367 |
|
2368 |
def SetEditedElementCoilInfos(self, tagname, id, infos): |
|
2369 |
element = self.GetEditedElement(tagname) |
|
2370 |
if element is not None: |
|
2371 |
coil = element.getinstance(id) |
|
2372 |
if coil is None: |
|
2373 |
return |
|
3750
f62625418bff
automated conversion using 2to3-3.9 tool
GP Orcullo <kinsamanka@gmail.com>
parents:
3704
diff
changeset
|
2374 |
for param, value in list(infos.items()): |
814 | 2375 |
if param == "name": |
1322
0a9227f743b3
Fixed xmlclass for working with included files, adding support for SimpleType elements and solving ambiguity in extension class when different elements share the same name and parent name
Laurent Bessard
parents:
1321
diff
changeset
|
2376 |
coil.setvariable(value) |
814 | 2377 |
elif param == "type": |
1294
f02ba5b83811
Fixed datatype and configuration editing in xmlclass refactoring
Laurent Bessard
parents:
1293
diff
changeset
|
2378 |
negated, storage, edge = { |
f02ba5b83811
Fixed datatype and configuration editing in xmlclass refactoring
Laurent Bessard
parents:
1293
diff
changeset
|
2379 |
COIL_NORMAL: (False, "none", "none"), |
f02ba5b83811
Fixed datatype and configuration editing in xmlclass refactoring
Laurent Bessard
parents:
1293
diff
changeset
|
2380 |
COIL_REVERSE: (True, "none", "none"), |
f02ba5b83811
Fixed datatype and configuration editing in xmlclass refactoring
Laurent Bessard
parents:
1293
diff
changeset
|
2381 |
COIL_SET: (False, "set", "none"), |
f02ba5b83811
Fixed datatype and configuration editing in xmlclass refactoring
Laurent Bessard
parents:
1293
diff
changeset
|
2382 |
COIL_RESET: (False, "reset", "none"), |
f02ba5b83811
Fixed datatype and configuration editing in xmlclass refactoring
Laurent Bessard
parents:
1293
diff
changeset
|
2383 |
COIL_RISING: (False, "none", "rising"), |
f02ba5b83811
Fixed datatype and configuration editing in xmlclass refactoring
Laurent Bessard
parents:
1293
diff
changeset
|
2384 |
COIL_FALLING: (False, "none", "falling")}[value] |
f02ba5b83811
Fixed datatype and configuration editing in xmlclass refactoring
Laurent Bessard
parents:
1293
diff
changeset
|
2385 |
coil.setnegated(negated) |
f02ba5b83811
Fixed datatype and configuration editing in xmlclass refactoring
Laurent Bessard
parents:
1293
diff
changeset
|
2386 |
coil.setstorage(storage) |
f02ba5b83811
Fixed datatype and configuration editing in xmlclass refactoring
Laurent Bessard
parents:
1293
diff
changeset
|
2387 |
coil.setedge(edge) |
814 | 2388 |
elif param == "height": |
2389 |
coil.setheight(value) |
|
2390 |
elif param == "width": |
|
2391 |
coil.setwidth(value) |
|
2392 |
elif param == "x": |
|
2393 |
coil.setx(value) |
|
2394 |
elif param == "y": |
|
2395 |
coil.sety(value) |
|
2396 |
elif param == "connectors": |
|
2397 |
input_connector = value["inputs"][0] |
|
2398 |
position = input_connector.GetRelPosition() |
|
2399 |
coil.addconnectionPointIn() |
|
2400 |
coil.connectionPointIn.setrelPositionXY(position.x, position.y) |
|
2401 |
self.SetConnectionWires(coil.connectionPointIn, input_connector) |
|
2402 |
output_connector = value["outputs"][0] |
|
2403 |
position = output_connector.GetRelPosition() |
|
2404 |
coil.addconnectionPointOut() |
|
2405 |
coil.connectionPointOut.setrelPositionXY(position.x, position.y) |
|
2406 |
||
2407 |
def AddEditedElementStep(self, tagname, id): |
|
2408 |
element = self.GetEditedElement(tagname) |
|
2409 |
if element is not None: |
|
1293
40117d02601b
Fixed diagram editing in xmlclass refactoring
Laurent Bessard
parents:
1291
diff
changeset
|
2410 |
step = PLCOpenParser.CreateElement("step", "sfcObjects") |
814 | 2411 |
step.setlocalId(id) |
1293
40117d02601b
Fixed diagram editing in xmlclass refactoring
Laurent Bessard
parents:
1291
diff
changeset
|
2412 |
element.addinstance(step) |
1411 | 2413 |
|
814 | 2414 |
def SetEditedElementStepInfos(self, tagname, id, infos): |
2415 |
element = self.GetEditedElement(tagname) |
|
2416 |
if element is not None: |
|
2417 |
step = element.getinstance(id) |
|
2418 |
if step is None: |
|
2419 |
return |
|
3750
f62625418bff
automated conversion using 2to3-3.9 tool
GP Orcullo <kinsamanka@gmail.com>
parents:
3704
diff
changeset
|
2420 |
for param, value in list(infos.items()): |
814 | 2421 |
if param == "name": |
2422 |
step.setname(value) |
|
2423 |
elif param == "initial": |
|
2424 |
step.setinitialStep(value) |
|
2425 |
elif param == "height": |
|
2426 |
step.setheight(value) |
|
2427 |
elif param == "width": |
|
2428 |
step.setwidth(value) |
|
2429 |
elif param == "x": |
|
2430 |
step.setx(value) |
|
2431 |
elif param == "y": |
|
2432 |
step.sety(value) |
|
2433 |
elif param == "connectors": |
|
2434 |
if len(value["inputs"]) > 0: |
|
2435 |
input_connector = value["inputs"][0] |
|
2436 |
position = input_connector.GetRelPosition() |
|
2437 |
step.addconnectionPointIn() |
|
2438 |
step.connectionPointIn.setrelPositionXY(position.x, position.y) |
|
2439 |
self.SetConnectionWires(step.connectionPointIn, input_connector) |
|
2440 |
else: |
|
2441 |
step.deleteconnectionPointIn() |
|
2442 |
if len(value["outputs"]) > 0: |
|
2443 |
output_connector = value["outputs"][0] |
|
2444 |
position = output_connector.GetRelPosition() |
|
2445 |
step.addconnectionPointOut() |
|
2446 |
step.connectionPointOut.setrelPositionXY(position.x, position.y) |
|
2447 |
else: |
|
2448 |
step.deleteconnectionPointOut() |
|
2449 |
elif param == "action": |
|
2450 |
if value: |
|
2451 |
position = value.GetRelPosition() |
|
2452 |
step.addconnectionPointOutAction() |
|
2453 |
step.connectionPointOutAction.setrelPositionXY(position.x, position.y) |
|
2454 |
else: |
|
2455 |
step.deleteconnectionPointOutAction() |
|
1411 | 2456 |
|
814 | 2457 |
def AddEditedElementTransition(self, tagname, id): |
2458 |
element = self.GetEditedElement(tagname) |
|
2459 |
if element is not None: |
|
1293
40117d02601b
Fixed diagram editing in xmlclass refactoring
Laurent Bessard
parents:
1291
diff
changeset
|
2460 |
transition = PLCOpenParser.CreateElement("transition", "sfcObjects") |
814 | 2461 |
transition.setlocalId(id) |
1293
40117d02601b
Fixed diagram editing in xmlclass refactoring
Laurent Bessard
parents:
1291
diff
changeset
|
2462 |
element.addinstance(transition) |
1411 | 2463 |
|
814 | 2464 |
def SetEditedElementTransitionInfos(self, tagname, id, infos): |
2465 |
element = self.GetEditedElement(tagname) |
|
2466 |
if element is not None: |
|
2467 |
transition = element.getinstance(id) |
|
2468 |
if transition is None: |
|
2469 |
return |
|
3750
f62625418bff
automated conversion using 2to3-3.9 tool
GP Orcullo <kinsamanka@gmail.com>
parents:
3704
diff
changeset
|
2470 |
for param, value in list(infos.items()): |
814 | 2471 |
if param == "type" and value != "connection": |
2472 |
transition.setconditionContent(value, infos["condition"]) |
|
2473 |
elif param == "height": |
|
2474 |
transition.setheight(value) |
|
2475 |
elif param == "width": |
|
2476 |
transition.setwidth(value) |
|
2477 |
elif param == "x": |
|
2478 |
transition.setx(value) |
|
2479 |
elif param == "y": |
|
2480 |
transition.sety(value) |
|
2481 |
elif param == "priority": |
|
2482 |
if value != 0: |
|
2483 |
transition.setpriority(value) |
|
2484 |
else: |
|
2485 |
transition.setpriority(None) |
|
2486 |
elif param == "connectors": |
|
2487 |
input_connector = value["inputs"][0] |
|
2488 |
position = input_connector.GetRelPosition() |
|
2489 |
transition.addconnectionPointIn() |
|
2490 |
transition.connectionPointIn.setrelPositionXY(position.x, position.y) |
|
2491 |
self.SetConnectionWires(transition.connectionPointIn, input_connector) |
|
2492 |
output_connector = value["outputs"][0] |
|
2493 |
position = output_connector.GetRelPosition() |
|
2494 |
transition.addconnectionPointOut() |
|
2495 |
transition.connectionPointOut.setrelPositionXY(position.x, position.y) |
|
2496 |
elif infos.get("type", None) == "connection" and param == "connection" and value: |
|
2497 |
transition.setconditionContent("connection", None) |
|
1293
40117d02601b
Fixed diagram editing in xmlclass refactoring
Laurent Bessard
parents:
1291
diff
changeset
|
2498 |
self.SetConnectionWires(transition.condition.content, value) |
1411 | 2499 |
|
1293
40117d02601b
Fixed diagram editing in xmlclass refactoring
Laurent Bessard
parents:
1291
diff
changeset
|
2500 |
def AddEditedElementDivergence(self, tagname, id, divergence_type): |
814 | 2501 |
element = self.GetEditedElement(tagname) |
2502 |
if element is not None: |
|
1293
40117d02601b
Fixed diagram editing in xmlclass refactoring
Laurent Bessard
parents:
1291
diff
changeset
|
2503 |
divergence = PLCOpenParser.CreateElement( |
40117d02601b
Fixed diagram editing in xmlclass refactoring
Laurent Bessard
parents:
1291
diff
changeset
|
2504 |
{SELECTION_DIVERGENCE: "selectionDivergence", |
40117d02601b
Fixed diagram editing in xmlclass refactoring
Laurent Bessard
parents:
1291
diff
changeset
|
2505 |
SELECTION_CONVERGENCE: "selectionConvergence", |
40117d02601b
Fixed diagram editing in xmlclass refactoring
Laurent Bessard
parents:
1291
diff
changeset
|
2506 |
SIMULTANEOUS_DIVERGENCE: "simultaneousDivergence", |
40117d02601b
Fixed diagram editing in xmlclass refactoring
Laurent Bessard
parents:
1291
diff
changeset
|
2507 |
SIMULTANEOUS_CONVERGENCE: "simultaneousConvergence"}.get( |
1878
fb73a6b6622d
fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1875
diff
changeset
|
2508 |
divergence_type), "sfcObjects") |
814 | 2509 |
divergence.setlocalId(id) |
1293
40117d02601b
Fixed diagram editing in xmlclass refactoring
Laurent Bessard
parents:
1291
diff
changeset
|
2510 |
element.addinstance(divergence) |
1411 | 2511 |
|
1293
40117d02601b
Fixed diagram editing in xmlclass refactoring
Laurent Bessard
parents:
1291
diff
changeset
|
2512 |
DivergenceTypes = [ |
1411 | 2513 |
(divergence_type, |
1293
40117d02601b
Fixed diagram editing in xmlclass refactoring
Laurent Bessard
parents:
1291
diff
changeset
|
2514 |
PLCOpenParser.GetElementClass(divergence_type, "sfcObjects")) |
40117d02601b
Fixed diagram editing in xmlclass refactoring
Laurent Bessard
parents:
1291
diff
changeset
|
2515 |
for divergence_type in ["selectionDivergence", "simultaneousDivergence", |
40117d02601b
Fixed diagram editing in xmlclass refactoring
Laurent Bessard
parents:
1291
diff
changeset
|
2516 |
"selectionConvergence", "simultaneousConvergence"]] |
1411 | 2517 |
|
1293
40117d02601b
Fixed diagram editing in xmlclass refactoring
Laurent Bessard
parents:
1291
diff
changeset
|
2518 |
def GetDivergenceType(self, divergence): |
40117d02601b
Fixed diagram editing in xmlclass refactoring
Laurent Bessard
parents:
1291
diff
changeset
|
2519 |
for divergence_type, divergence_class in self.DivergenceTypes: |
40117d02601b
Fixed diagram editing in xmlclass refactoring
Laurent Bessard
parents:
1291
diff
changeset
|
2520 |
if isinstance(divergence, divergence_class): |
40117d02601b
Fixed diagram editing in xmlclass refactoring
Laurent Bessard
parents:
1291
diff
changeset
|
2521 |
return divergence_type |
40117d02601b
Fixed diagram editing in xmlclass refactoring
Laurent Bessard
parents:
1291
diff
changeset
|
2522 |
return None |
1411 | 2523 |
|
814 | 2524 |
def SetEditedElementDivergenceInfos(self, tagname, id, infos): |
2525 |
element = self.GetEditedElement(tagname) |
|
2526 |
if element is not None: |
|
2527 |
divergence = element.getinstance(id) |
|
2528 |
if divergence is None: |
|
2529 |
return |
|
3750
f62625418bff
automated conversion using 2to3-3.9 tool
GP Orcullo <kinsamanka@gmail.com>
parents:
3704
diff
changeset
|
2530 |
for param, value in list(infos.items()): |
814 | 2531 |
if param == "height": |
2532 |
divergence.setheight(value) |
|
2533 |
elif param == "width": |
|
2534 |
divergence.setwidth(value) |
|
2535 |
elif param == "x": |
|
2536 |
divergence.setx(value) |
|
2537 |
elif param == "y": |
|
2538 |
divergence.sety(value) |
|
2539 |
elif param == "connectors": |
|
2540 |
input_connectors = value["inputs"] |
|
1293
40117d02601b
Fixed diagram editing in xmlclass refactoring
Laurent Bessard
parents:
1291
diff
changeset
|
2541 |
divergence_type = self.GetDivergenceType(divergence) |
40117d02601b
Fixed diagram editing in xmlclass refactoring
Laurent Bessard
parents:
1291
diff
changeset
|
2542 |
if divergence_type in ["selectionDivergence", "simultaneousDivergence"]: |
814 | 2543 |
position = input_connectors[0].GetRelPosition() |
2544 |
divergence.addconnectionPointIn() |
|
2545 |
divergence.connectionPointIn.setrelPositionXY(position.x, position.y) |
|
2546 |
self.SetConnectionWires(divergence.connectionPointIn, input_connectors[0]) |
|
2547 |
else: |
|
2548 |
divergence.setconnectionPointIn([]) |
|
2549 |
for input_connector in input_connectors: |
|
2550 |
position = input_connector.GetRelPosition() |
|
1293
40117d02601b
Fixed diagram editing in xmlclass refactoring
Laurent Bessard
parents:
1291
diff
changeset
|
2551 |
connection = PLCOpenParser.CreateElement("connectionPointIn", divergence_type) |
40117d02601b
Fixed diagram editing in xmlclass refactoring
Laurent Bessard
parents:
1291
diff
changeset
|
2552 |
divergence.appendconnectionPointIn(connection) |
814 | 2553 |
connection.setrelPositionXY(position.x, position.y) |
2554 |
self.SetConnectionWires(connection, input_connector) |
|
2555 |
output_connectors = value["outputs"] |
|
1293
40117d02601b
Fixed diagram editing in xmlclass refactoring
Laurent Bessard
parents:
1291
diff
changeset
|
2556 |
if divergence_type in ["selectionConvergence", "simultaneousConvergence"]: |
814 | 2557 |
position = output_connectors[0].GetRelPosition() |
2558 |
divergence.addconnectionPointOut() |
|
2559 |
divergence.connectionPointOut.setrelPositionXY(position.x, position.y) |
|
2560 |
else: |
|
2561 |
divergence.setconnectionPointOut([]) |
|
2562 |
for output_connector in output_connectors: |
|
2563 |
position = output_connector.GetRelPosition() |
|
1293
40117d02601b
Fixed diagram editing in xmlclass refactoring
Laurent Bessard
parents:
1291
diff
changeset
|
2564 |
connection = PLCOpenParser.CreateElement("connectionPointOut", divergence_type) |
40117d02601b
Fixed diagram editing in xmlclass refactoring
Laurent Bessard
parents:
1291
diff
changeset
|
2565 |
divergence.appendconnectionPointOut(connection) |
814 | 2566 |
connection.setrelPositionXY(position.x, position.y) |
1411 | 2567 |
|
814 | 2568 |
def AddEditedElementJump(self, tagname, id): |
2569 |
element = self.GetEditedElement(tagname) |
|
2570 |
if element is not None: |
|
1293
40117d02601b
Fixed diagram editing in xmlclass refactoring
Laurent Bessard
parents:
1291
diff
changeset
|
2571 |
jump = PLCOpenParser.CreateElement("jumpStep", "sfcObjects") |
814 | 2572 |
jump.setlocalId(id) |
1293
40117d02601b
Fixed diagram editing in xmlclass refactoring
Laurent Bessard
parents:
1291
diff
changeset
|
2573 |
element.addinstance(jump) |
1411 | 2574 |
|
814 | 2575 |
def SetEditedElementJumpInfos(self, tagname, id, infos): |
2576 |
element = self.GetEditedElement(tagname) |
|
2577 |
if element is not None: |
|
2578 |
jump = element.getinstance(id) |
|
2579 |
if jump is None: |
|
2580 |
return |
|
3750
f62625418bff
automated conversion using 2to3-3.9 tool
GP Orcullo <kinsamanka@gmail.com>
parents:
3704
diff
changeset
|
2581 |
for param, value in list(infos.items()): |
814 | 2582 |
if param == "target": |
2583 |
jump.settargetName(value) |
|
2584 |
elif param == "height": |
|
2585 |
jump.setheight(value) |
|
2586 |
elif param == "width": |
|
2587 |
jump.setwidth(value) |
|
2588 |
elif param == "x": |
|
2589 |
jump.setx(value) |
|
2590 |
elif param == "y": |
|
2591 |
jump.sety(value) |
|
2592 |
elif param == "connector": |
|
2593 |
position = value.GetRelPosition() |
|
2594 |
jump.addconnectionPointIn() |
|
2595 |
jump.connectionPointIn.setrelPositionXY(position.x, position.y) |
|
2596 |
self.SetConnectionWires(jump.connectionPointIn, value) |
|
1411 | 2597 |
|
814 | 2598 |
def AddEditedElementActionBlock(self, tagname, id): |
2599 |
element = self.GetEditedElement(tagname) |
|
2600 |
if element is not None: |
|
1293
40117d02601b
Fixed diagram editing in xmlclass refactoring
Laurent Bessard
parents:
1291
diff
changeset
|
2601 |
actionBlock = PLCOpenParser.CreateElement("actionBlock", "commonObjects") |
814 | 2602 |
actionBlock.setlocalId(id) |
1293
40117d02601b
Fixed diagram editing in xmlclass refactoring
Laurent Bessard
parents:
1291
diff
changeset
|
2603 |
element.addinstance(actionBlock) |
1411 | 2604 |
|
814 | 2605 |
def SetEditedElementActionBlockInfos(self, tagname, id, infos): |
2606 |
element = self.GetEditedElement(tagname) |
|
2607 |
if element is not None: |
|
2608 |
actionBlock = element.getinstance(id) |
|
2609 |
if actionBlock is None: |
|
2610 |
return |
|
3750
f62625418bff
automated conversion using 2to3-3.9 tool
GP Orcullo <kinsamanka@gmail.com>
parents:
3704
diff
changeset
|
2611 |
for param, value in list(infos.items()): |
814 | 2612 |
if param == "actions": |
2613 |
actionBlock.setactions(value) |
|
2614 |
elif param == "height": |
|
2615 |
actionBlock.setheight(value) |
|
2616 |
elif param == "width": |
|
2617 |
actionBlock.setwidth(value) |
|
2618 |
elif param == "x": |
|
2619 |
actionBlock.setx(value) |
|
2620 |
elif param == "y": |
|
2621 |
actionBlock.sety(value) |
|
2622 |
elif param == "connector": |
|
2623 |
position = value.GetRelPosition() |
|
2624 |
actionBlock.addconnectionPointIn() |
|
2625 |
actionBlock.connectionPointIn.setrelPositionXY(position.x, position.y) |
|
2626 |
self.SetConnectionWires(actionBlock.connectionPointIn, value) |
|
1411 | 2627 |
|
814 | 2628 |
def RemoveEditedElementInstance(self, tagname, id): |
2629 |
element = self.GetEditedElement(tagname) |
|
2630 |
if element is not None: |
|
2631 |
instance = element.getinstance(id) |
|
1293
40117d02601b
Fixed diagram editing in xmlclass refactoring
Laurent Bessard
parents:
1291
diff
changeset
|
2632 |
if isinstance(instance, PLCOpenParser.GetElementClass("block", "fbdObjects")): |
814 | 2633 |
self.RemoveEditedElementPouVar(tagname, instance.gettypeName(), instance.getinstanceName()) |
2634 |
element.removeinstance(id) |
|
2635 |
||
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1743
diff
changeset
|
2636 |
def GetEditedResourceVariables(self, tagname, debug=False): |
814 | 2637 |
varlist = [] |
2638 |
words = tagname.split("::") |
|
2639 |
for var in self.GetConfigurationGlobalVars(words[1], debug): |
|
1361
7158aa054226
Fixed bugs when editing resource variables and tasks
Laurent Bessard
parents:
1360
diff
changeset
|
2640 |
if var.Type == "BOOL": |
7158aa054226
Fixed bugs when editing resource variables and tasks
Laurent Bessard
parents:
1360
diff
changeset
|
2641 |
varlist.append(var.Name) |
814 | 2642 |
for var in self.GetConfigurationResourceGlobalVars(words[1], words[2], debug): |
1361
7158aa054226
Fixed bugs when editing resource variables and tasks
Laurent Bessard
parents:
1360
diff
changeset
|
2643 |
if var.Type == "BOOL": |
7158aa054226
Fixed bugs when editing resource variables and tasks
Laurent Bessard
parents:
1360
diff
changeset
|
2644 |
varlist.append(var.Name) |
814 | 2645 |
return varlist |
2646 |
||
2647 |
def SetEditedResourceInfos(self, tagname, tasks, instances): |
|
2648 |
resource = self.GetEditedElement(tagname) |
|
2649 |
if resource is not None: |
|
2650 |
resource.settask([]) |
|
2651 |
resource.setpouInstance([]) |
|
2652 |
task_list = {} |
|
2653 |
for task in tasks: |
|
1294
f02ba5b83811
Fixed datatype and configuration editing in xmlclass refactoring
Laurent Bessard
parents:
1293
diff
changeset
|
2654 |
new_task = PLCOpenParser.CreateElement("task", "resource") |
f02ba5b83811
Fixed datatype and configuration editing in xmlclass refactoring
Laurent Bessard
parents:
1293
diff
changeset
|
2655 |
resource.appendtask(new_task) |
814 | 2656 |
new_task.setname(task["Name"]) |
2657 |
if task["Triggering"] == "Interrupt": |
|
2658 |
new_task.setsingle(task["Single"]) |
|
1753
19f19c66b67e
clean-up: fix most PEP8 E266 too many leading '#' for block comment
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1751
diff
changeset
|
2659 |
# result = duration_model.match(task["Interval"]).groups() |
19f19c66b67e
clean-up: fix most PEP8 E266 too many leading '#' for block comment
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1751
diff
changeset
|
2660 |
# if reduce(lambda x, y: x or y != None, result): |
19f19c66b67e
clean-up: fix most PEP8 E266 too many leading '#' for block comment
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1751
diff
changeset
|
2661 |
# values = [] |
19f19c66b67e
clean-up: fix most PEP8 E266 too many leading '#' for block comment
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1751
diff
changeset
|
2662 |
# for value in result[:-1]: |
19f19c66b67e
clean-up: fix most PEP8 E266 too many leading '#' for block comment
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1751
diff
changeset
|
2663 |
# if value != None: |
19f19c66b67e
clean-up: fix most PEP8 E266 too many leading '#' for block comment
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1751
diff
changeset
|
2664 |
# values.append(int(value)) |
19f19c66b67e
clean-up: fix most PEP8 E266 too many leading '#' for block comment
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1751
diff
changeset
|
2665 |
# else: |
19f19c66b67e
clean-up: fix most PEP8 E266 too many leading '#' for block comment
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1751
diff
changeset
|
2666 |
# values.append(0) |
19f19c66b67e
clean-up: fix most PEP8 E266 too many leading '#' for block comment
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1751
diff
changeset
|
2667 |
# if result[-1] is not None: |
19f19c66b67e
clean-up: fix most PEP8 E266 too many leading '#' for block comment
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1751
diff
changeset
|
2668 |
# values.append(int(float(result[-1]) * 1000)) |
19f19c66b67e
clean-up: fix most PEP8 E266 too many leading '#' for block comment
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1751
diff
changeset
|
2669 |
# new_task.setinterval(datetime.time(*values)) |
814 | 2670 |
if task["Triggering"] == "Cyclic": |
2671 |
new_task.setinterval(task["Interval"]) |
|
2672 |
new_task.setpriority(int(task["Priority"])) |
|
2673 |
if task["Name"] != "": |
|
2674 |
task_list[task["Name"]] = new_task |
|
2675 |
for instance in instances: |
|
1294
f02ba5b83811
Fixed datatype and configuration editing in xmlclass refactoring
Laurent Bessard
parents:
1293
diff
changeset
|
2676 |
task = task_list.get(instance["Task"]) |
f02ba5b83811
Fixed datatype and configuration editing in xmlclass refactoring
Laurent Bessard
parents:
1293
diff
changeset
|
2677 |
if task is not None: |
f02ba5b83811
Fixed datatype and configuration editing in xmlclass refactoring
Laurent Bessard
parents:
1293
diff
changeset
|
2678 |
new_instance = PLCOpenParser.CreateElement("pouInstance", "task") |
f02ba5b83811
Fixed datatype and configuration editing in xmlclass refactoring
Laurent Bessard
parents:
1293
diff
changeset
|
2679 |
task.appendpouInstance(new_instance) |
f02ba5b83811
Fixed datatype and configuration editing in xmlclass refactoring
Laurent Bessard
parents:
1293
diff
changeset
|
2680 |
else: |
f02ba5b83811
Fixed datatype and configuration editing in xmlclass refactoring
Laurent Bessard
parents:
1293
diff
changeset
|
2681 |
new_instance = PLCOpenParser.CreateElement("pouInstance", "resource") |
f02ba5b83811
Fixed datatype and configuration editing in xmlclass refactoring
Laurent Bessard
parents:
1293
diff
changeset
|
2682 |
resource.appendpouInstance(new_instance) |
814 | 2683 |
new_instance.setname(instance["Name"]) |
2684 |
new_instance.settypeName(instance["Type"]) |
|
2685 |
||
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1743
diff
changeset
|
2686 |
def GetEditedResourceInfos(self, tagname, debug=False): |
814 | 2687 |
resource = self.GetEditedElement(tagname, debug) |
2688 |
if resource is not None: |
|
2689 |
tasks = resource.gettask() |
|
2690 |
instances = resource.getpouInstance() |
|
2691 |
tasks_data = [] |
|
2692 |
instances_data = [] |
|
2693 |
for task in tasks: |
|
2694 |
new_task = {} |
|
2695 |
new_task["Name"] = task.getname() |
|
2696 |
single = task.getsingle() |
|
2697 |
if single is not None: |
|
2698 |
new_task["Single"] = single |
|
2699 |
else: |
|
2700 |
new_task["Single"] = "" |
|
2701 |
interval = task.getinterval() |
|
2702 |
if interval is not None: |
|
1779
6cf16e5bfbf9
clean-up: fix PEP8 E115 expected an indented block (comment)
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1777
diff
changeset
|
2703 |
# text = "" |
6cf16e5bfbf9
clean-up: fix PEP8 E115 expected an indented block (comment)
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1777
diff
changeset
|
2704 |
# if interval.hour != 0: |
6cf16e5bfbf9
clean-up: fix PEP8 E115 expected an indented block (comment)
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1777
diff
changeset
|
2705 |
# text += "%dh"%interval.hour |
6cf16e5bfbf9
clean-up: fix PEP8 E115 expected an indented block (comment)
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1777
diff
changeset
|
2706 |
# if interval.minute != 0: |
6cf16e5bfbf9
clean-up: fix PEP8 E115 expected an indented block (comment)
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1777
diff
changeset
|
2707 |
# text += "%dm"%interval.minute |
6cf16e5bfbf9
clean-up: fix PEP8 E115 expected an indented block (comment)
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1777
diff
changeset
|
2708 |
# if interval.second != 0: |
6cf16e5bfbf9
clean-up: fix PEP8 E115 expected an indented block (comment)
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1777
diff
changeset
|
2709 |
# text += "%ds"%interval.second |
6cf16e5bfbf9
clean-up: fix PEP8 E115 expected an indented block (comment)
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1777
diff
changeset
|
2710 |
# if interval.microsecond != 0: |
6cf16e5bfbf9
clean-up: fix PEP8 E115 expected an indented block (comment)
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1777
diff
changeset
|
2711 |
# if interval.microsecond % 1000 != 0: |
6cf16e5bfbf9
clean-up: fix PEP8 E115 expected an indented block (comment)
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1777
diff
changeset
|
2712 |
# text += "%.3fms"%(float(interval.microsecond) / 1000) |
6cf16e5bfbf9
clean-up: fix PEP8 E115 expected an indented block (comment)
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1777
diff
changeset
|
2713 |
# else: |
6cf16e5bfbf9
clean-up: fix PEP8 E115 expected an indented block (comment)
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1777
diff
changeset
|
2714 |
# text += "%dms"%(interval.microsecond / 1000) |
6cf16e5bfbf9
clean-up: fix PEP8 E115 expected an indented block (comment)
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1777
diff
changeset
|
2715 |
# new_task["Interval"] = text |
814 | 2716 |
new_task["Interval"] = interval |
2717 |
else: |
|
2718 |
new_task["Interval"] = "" |
|
2719 |
if single is not None and interval is None: |
|
2720 |
new_task["Triggering"] = "Interrupt" |
|
2721 |
elif interval is not None and single is None: |
|
2722 |
new_task["Triggering"] = "Cyclic" |
|
2723 |
else: |
|
2724 |
new_task["Triggering"] = "" |
|
2725 |
new_task["Priority"] = str(task.getpriority()) |
|
2726 |
tasks_data.append(new_task) |
|
2727 |
for instance in task.getpouInstance(): |
|
2728 |
new_instance = {} |
|
2729 |
new_instance["Name"] = instance.getname() |
|
2730 |
new_instance["Type"] = instance.gettypeName() |
|
2731 |
new_instance["Task"] = task.getname() |
|
2732 |
instances_data.append(new_instance) |
|
2733 |
for instance in instances: |
|
2734 |
new_instance = {} |
|
2735 |
new_instance["Name"] = instance.getname() |
|
2736 |
new_instance["Type"] = instance.gettypeName() |
|
2737 |
new_instance["Task"] = "" |
|
2738 |
instances_data.append(new_instance) |
|
2739 |
return tasks_data, instances_data |
|
2740 |
||
2741 |
def OpenXMLFile(self, filepath): |
|
1330
96b242e4c59d
Added support for loading XML file even if not following XSD schema (but still following XML syntax), warning user of errors in XML file
Laurent Bessard
parents:
1328
diff
changeset
|
2742 |
self.Project, error = LoadProject(filepath) |
96b242e4c59d
Added support for loading XML file even if not following XSD schema (but still following XML syntax), warning user of errors in XML file
Laurent Bessard
parents:
1328
diff
changeset
|
2743 |
if self.Project is None: |
96b242e4c59d
Added support for loading XML file even if not following XSD schema (but still following XML syntax), warning user of errors in XML file
Laurent Bessard
parents:
1328
diff
changeset
|
2744 |
return _("Project file syntax error:\n\n") + error |
1290
13ee5f4ab612
First stage of xmlclass refactoring using lxml
Laurent Bessard
parents:
1284
diff
changeset
|
2745 |
self.SetFilePath(filepath) |
13ee5f4ab612
First stage of xmlclass refactoring using lxml
Laurent Bessard
parents:
1284
diff
changeset
|
2746 |
self.CreateProjectBuffer(True) |
13ee5f4ab612
First stage of xmlclass refactoring using lxml
Laurent Bessard
parents:
1284
diff
changeset
|
2747 |
self.ProgramChunks = [] |
13ee5f4ab612
First stage of xmlclass refactoring using lxml
Laurent Bessard
parents:
1284
diff
changeset
|
2748 |
self.ProgramOffset = 0 |
1299
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
2749 |
self.NextCompiledProject = self.Copy(self.Project) |
1290
13ee5f4ab612
First stage of xmlclass refactoring using lxml
Laurent Bessard
parents:
1284
diff
changeset
|
2750 |
self.CurrentCompiledProject = None |
13ee5f4ab612
First stage of xmlclass refactoring using lxml
Laurent Bessard
parents:
1284
diff
changeset
|
2751 |
self.Buffering = False |
13ee5f4ab612
First stage of xmlclass refactoring using lxml
Laurent Bessard
parents:
1284
diff
changeset
|
2752 |
self.CurrentElementEditing = None |
1330
96b242e4c59d
Added support for loading XML file even if not following XSD schema (but still following XML syntax), warning user of errors in XML file
Laurent Bessard
parents:
1328
diff
changeset
|
2753 |
return error |
1411 | 2754 |
|
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1743
diff
changeset
|
2755 |
def SaveXMLFile(self, filepath=None): |
814 | 2756 |
if not filepath and self.FilePath == "": |
2757 |
return False |
|
2758 |
else: |
|
2759 |
contentheader = {"modificationDateTime": datetime.datetime(*localtime()[:6])} |
|
2760 |
self.Project.setcontentHeader(contentheader) |
|
1411 | 2761 |
|
1290
13ee5f4ab612
First stage of xmlclass refactoring using lxml
Laurent Bessard
parents:
1284
diff
changeset
|
2762 |
if filepath: |
13ee5f4ab612
First stage of xmlclass refactoring using lxml
Laurent Bessard
parents:
1284
diff
changeset
|
2763 |
SaveProject(self.Project, filepath) |
13ee5f4ab612
First stage of xmlclass refactoring using lxml
Laurent Bessard
parents:
1284
diff
changeset
|
2764 |
else: |
13ee5f4ab612
First stage of xmlclass refactoring using lxml
Laurent Bessard
parents:
1284
diff
changeset
|
2765 |
SaveProject(self.Project, self.FilePath) |
1411 | 2766 |
|
814 | 2767 |
self.MarkProjectAsSaved() |
2768 |
if filepath: |
|
2769 |
self.SetFilePath(filepath) |
|
2770 |
return True |
|
2771 |
||
1782
5b6ad7a7fd9d
clean-up: fix PEP8 E265 block comment should start with '# '
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1780
diff
changeset
|
2772 |
# ------------------------------------------------------------------------------- |
5b6ad7a7fd9d
clean-up: fix PEP8 E265 block comment should start with '# '
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1780
diff
changeset
|
2773 |
# Search in Current Project Functions |
5b6ad7a7fd9d
clean-up: fix PEP8 E265 block comment should start with '# '
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1780
diff
changeset
|
2774 |
# ------------------------------------------------------------------------------- |
814 | 2775 |
|
2776 |
def SearchInProject(self, criteria): |
|
2551
245644bfcd24
Make spaghetti-code-quality great again.
Edouard Tisserant
parents:
2529
diff
changeset
|
2777 |
project_matches = self.Project.Search(criteria) |
245644bfcd24
Make spaghetti-code-quality great again.
Edouard Tisserant
parents:
2529
diff
changeset
|
2778 |
ctn_matches = self.CTNSearch(criteria) |
2523
aa7f138648f3
WIP adding searching capabilities in python files:
Edouard Tisserant
parents:
2520
diff
changeset
|
2779 |
return project_matches + ctn_matches |
814 | 2780 |
|
2781 |
def SearchInPou(self, tagname, criteria, debug=False): |
|
2782 |
pou = self.GetEditedElement(tagname, debug) |
|
2783 |
if pou is not None: |
|
1619
163d3a883575
fix local search in actions and transitions
Surkov Sergey <surkovsv93@gmail.com>
parents:
1616
diff
changeset
|
2784 |
search_results = pou.Search(criteria, [tagname]) |
163d3a883575
fix local search in actions and transitions
Surkov Sergey <surkovsv93@gmail.com>
parents:
1616
diff
changeset
|
2785 |
if tagname.split("::")[0] in ['A', 'T']: |
163d3a883575
fix local search in actions and transitions
Surkov Sergey <surkovsv93@gmail.com>
parents:
1616
diff
changeset
|
2786 |
parent_pou_tagname = "P::%s" % (tagname.split("::")[-2]) |
163d3a883575
fix local search in actions and transitions
Surkov Sergey <surkovsv93@gmail.com>
parents:
1616
diff
changeset
|
2787 |
parent_pou = self.GetEditedElement(parent_pou_tagname, debug) |
163d3a883575
fix local search in actions and transitions
Surkov Sergey <surkovsv93@gmail.com>
parents:
1616
diff
changeset
|
2788 |
for infos, start, end, text in parent_pou.Search(criteria): |
163d3a883575
fix local search in actions and transitions
Surkov Sergey <surkovsv93@gmail.com>
parents:
1616
diff
changeset
|
2789 |
if infos[1] in ["var_local", "var_input", "var_output", "var_inout"]: |
163d3a883575
fix local search in actions and transitions
Surkov Sergey <surkovsv93@gmail.com>
parents:
1616
diff
changeset
|
2790 |
search_results.append((infos, start, end, text)) |
163d3a883575
fix local search in actions and transitions
Surkov Sergey <surkovsv93@gmail.com>
parents:
1616
diff
changeset
|
2791 |
return search_results |
814 | 2792 |
return [] |
2793 |
||
1782
5b6ad7a7fd9d
clean-up: fix PEP8 E265 block comment should start with '# '
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1780
diff
changeset
|
2794 |
# ------------------------------------------------------------------------------- |
5b6ad7a7fd9d
clean-up: fix PEP8 E265 block comment should start with '# '
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1780
diff
changeset
|
2795 |
# Current Buffering Management Functions |
5b6ad7a7fd9d
clean-up: fix PEP8 E265 block comment should start with '# '
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1780
diff
changeset
|
2796 |
# ------------------------------------------------------------------------------- |
5b6ad7a7fd9d
clean-up: fix PEP8 E265 block comment should start with '# '
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1780
diff
changeset
|
2797 |
|
814 | 2798 |
def Copy(self, model): |
1782
5b6ad7a7fd9d
clean-up: fix PEP8 E265 block comment should start with '# '
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1780
diff
changeset
|
2799 |
"""Return a copy of the project""" |
1299
9ffc49bfdf9d
Fixed copy/paste with xmlclass refactoring
Laurent Bessard
parents:
1298
diff
changeset
|
2800 |
return deepcopy(model) |
814 | 2801 |
|
2802 |
def CreateProjectBuffer(self, saved): |
|
2803 |
if self.ProjectBufferEnabled: |
|
1304 | 2804 |
self.ProjectBuffer = UndoBuffer(PLCOpenParser.Dumps(self.Project), saved) |
814 | 2805 |
else: |
2806 |
self.ProjectBuffer = None |
|
2807 |
self.ProjectSaved = saved |
|
2808 |
||
2809 |
def IsProjectBufferEnabled(self): |
|
2810 |
return self.ProjectBufferEnabled |
|
2811 |
||
2812 |
def EnableProjectBuffer(self, enable): |
|
2813 |
self.ProjectBufferEnabled = enable |
|
2814 |
if self.Project is not None: |
|
2815 |
if enable: |
|
2816 |
current_saved = self.ProjectSaved |
|
2817 |
else: |
|
2818 |
current_saved = self.ProjectBuffer.IsCurrentSaved() |
|
2819 |
self.CreateProjectBuffer(current_saved) |
|
2820 |
||
2821 |
def BufferProject(self): |
|
2822 |
if self.ProjectBuffer is not None: |
|
1304 | 2823 |
self.ProjectBuffer.Buffering(PLCOpenParser.Dumps(self.Project)) |
814 | 2824 |
else: |
2825 |
self.ProjectSaved = False |
|
2826 |
||
2827 |
def StartBuffering(self): |
|
2828 |
if self.ProjectBuffer is not None: |
|
2829 |
self.Buffering = True |
|
2830 |
else: |
|
2831 |
self.ProjectSaved = False |
|
1411 | 2832 |
|
814 | 2833 |
def EndBuffering(self): |
2834 |
if self.ProjectBuffer is not None and self.Buffering: |
|
1304 | 2835 |
self.ProjectBuffer.Buffering(PLCOpenParser.Dumps(self.Project)) |
814 | 2836 |
self.Buffering = False |
2837 |
||
2838 |
def MarkProjectAsSaved(self): |
|
2839 |
self.EndBuffering() |
|
2840 |
if self.ProjectBuffer is not None: |
|
2841 |
self.ProjectBuffer.CurrentSaved() |
|
2842 |
else: |
|
2843 |
self.ProjectSaved = True |
|
1411 | 2844 |
|
814 | 2845 |
# Return if project is saved |
2846 |
def ProjectIsSaved(self): |
|
2847 |
if self.ProjectBuffer is not None: |
|
2848 |
return self.ProjectBuffer.IsCurrentSaved() and not self.Buffering |
|
2849 |
else: |
|
2850 |
return self.ProjectSaved |
|
2851 |
||
2852 |
def LoadPrevious(self): |
|
2853 |
self.EndBuffering() |
|
2854 |
if self.ProjectBuffer is not None: |
|
1304 | 2855 |
self.Project = PLCOpenParser.Loads(self.ProjectBuffer.Previous()) |
1411 | 2856 |
|
814 | 2857 |
def LoadNext(self): |
2858 |
if self.ProjectBuffer is not None: |
|
1304 | 2859 |
self.Project = PLCOpenParser.Loads(self.ProjectBuffer.Next()) |
1411 | 2860 |
|
814 | 2861 |
def GetBufferState(self): |
2862 |
if self.ProjectBuffer is not None: |
|
2863 |
first = self.ProjectBuffer.IsFirst() and not self.Buffering |
|
2864 |
last = self.ProjectBuffer.IsLast() |
|
2865 |
return not first, not last |
|
2866 |
return False, False |