author | Edouard Tisserant |
Wed, 19 Dec 2018 10:48:53 +0100 | |
changeset 2473 | 1d64d283d0bd |
parent 2443 | 75a274023970 |
child 2523 | aa7f138648f3 |
permissions | -rw-r--r-- |
1511
91538d0c242c
add copyright notices to python files where there were missing, that
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1332
diff
changeset
|
1 |
#!/usr/bin/env python |
91538d0c242c
add copyright notices to python files where there were missing, that
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1332
diff
changeset
|
2 |
# -*- coding: utf-8 -*- |
91538d0c242c
add copyright notices to python files where there were missing, that
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1332
diff
changeset
|
3 |
|
91538d0c242c
add copyright notices to python files where there were missing, that
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1332
diff
changeset
|
4 |
# This file is part of Beremiz, a Integrated Development Environment for |
91538d0c242c
add copyright notices to python files where there were missing, that
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1332
diff
changeset
|
5 |
# programming IEC 61131-3 automates supporting plcopen standard and CanFestival. |
91538d0c242c
add copyright notices to python files where there were missing, that
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1332
diff
changeset
|
6 |
# |
91538d0c242c
add copyright notices to python files where there were missing, that
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1332
diff
changeset
|
7 |
# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD |
91538d0c242c
add copyright notices to python files where there were missing, that
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1332
diff
changeset
|
8 |
# |
91538d0c242c
add copyright notices to python files where there were missing, that
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1332
diff
changeset
|
9 |
# See COPYING file for copyrights details. |
91538d0c242c
add copyright notices to python files where there were missing, that
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1332
diff
changeset
|
10 |
# |
91538d0c242c
add copyright notices to python files where there were missing, that
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1332
diff
changeset
|
11 |
# This program is free software; you can redistribute it and/or |
91538d0c242c
add copyright notices to python files where there were missing, that
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1332
diff
changeset
|
12 |
# modify it under the terms of the GNU General Public License |
91538d0c242c
add copyright notices to python files where there were missing, that
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1332
diff
changeset
|
13 |
# as published by the Free Software Foundation; either version 2 |
91538d0c242c
add copyright notices to python files where there were missing, that
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1332
diff
changeset
|
14 |
# of the License, or (at your option) any later version. |
91538d0c242c
add copyright notices to python files where there were missing, that
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1332
diff
changeset
|
15 |
# |
91538d0c242c
add copyright notices to python files where there were missing, that
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1332
diff
changeset
|
16 |
# This program is distributed in the hope that it will be useful, |
91538d0c242c
add copyright notices to python files where there were missing, that
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1332
diff
changeset
|
17 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of |
91538d0c242c
add copyright notices to python files where there were missing, that
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1332
diff
changeset
|
18 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
91538d0c242c
add copyright notices to python files where there were missing, that
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1332
diff
changeset
|
19 |
# GNU General Public License for more details. |
91538d0c242c
add copyright notices to python files where there were missing, that
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1332
diff
changeset
|
20 |
# |
91538d0c242c
add copyright notices to python files where there were missing, that
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1332
diff
changeset
|
21 |
# You should have received a copy of the GNU General Public License |
91538d0c242c
add copyright notices to python files where there were missing, that
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1332
diff
changeset
|
22 |
# along with this program; if not, write to the Free Software |
91538d0c242c
add copyright notices to python files where there were missing, that
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1332
diff
changeset
|
23 |
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
91538d0c242c
add copyright notices to python files where there were missing, that
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1332
diff
changeset
|
24 |
|
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
25 |
""" |
725 | 26 |
Config Tree Node base class. |
27 |
||
28 |
- A Beremiz project is organized in a tree each node derivate from ConfigTreeNode |
|
29 |
- Project tree organization match filesystem organization of project directory. |
|
30 |
- Each node of the tree have its own xml configuration, whose grammar is defined for each node type, as XSD |
|
31 |
- ... TODO : document |
|
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
32 |
""" |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
33 |
|
1881
091005ec69c4
fix pylint py3k conversion warning: "(no-absolute-import) import missing `from __future__ import absolute_import`"
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1868
diff
changeset
|
34 |
from __future__ import absolute_import |
1732
94ffe74e6895
clean-up: fix PEP8 E401 multiple imports on one line
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1730
diff
changeset
|
35 |
import os |
94ffe74e6895
clean-up: fix PEP8 E401 multiple imports on one line
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1730
diff
changeset
|
36 |
import traceback |
94ffe74e6895
clean-up: fix PEP8 E401 multiple imports on one line
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1730
diff
changeset
|
37 |
import types |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
38 |
import shutil |
2434
07f48018b6f5
python3 support: pylint, W1612 # (unicode-builtin) unicode built-in referenced
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2418
diff
changeset
|
39 |
from builtins import str as text |
2443
75a274023970
python3 support: pylint, W1606 # (execfile-builtin) execfile built-in referenced
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2434
diff
changeset
|
40 |
from past.builtins import execfile |
2434
07f48018b6f5
python3 support: pylint, W1612 # (unicode-builtin) unicode built-in referenced
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2418
diff
changeset
|
41 |
|
1315
ff14a66bbd12
Fixed Beremiz for working with new xmlclass support using lxml
Laurent Bessard
parents:
1179
diff
changeset
|
42 |
from lxml import etree |
ff14a66bbd12
Fixed Beremiz for working with new xmlclass support using lxml
Laurent Bessard
parents:
1179
diff
changeset
|
43 |
|
ff14a66bbd12
Fixed Beremiz for working with new xmlclass support using lxml
Laurent Bessard
parents:
1179
diff
changeset
|
44 |
from xmlclass import GenerateParserFromXSDstring |
1850
614396cbffbf
fix pylint warning '(unused-import), Unused import connectors'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1847
diff
changeset
|
45 |
from PLCControler import LOCATION_CONFNODE |
814 | 46 |
from editors.ConfTreeNodeEditor import ConfTreeNodeEditor |
274
8628f3dd0979
Adding support for defining plugin library as a plcopen xml file in plugin folder
greg
parents:
273
diff
changeset
|
47 |
|
1315
ff14a66bbd12
Fixed Beremiz for working with new xmlclass support using lxml
Laurent Bessard
parents:
1179
diff
changeset
|
48 |
_BaseParamsParser = GenerateParserFromXSDstring("""<?xml version="1.0" encoding="ISO-8859-1" ?> |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
49 |
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"> |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
50 |
<xsd:element name="BaseParams"> |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
51 |
<xsd:complexType> |
86 | 52 |
<xsd:attribute name="Name" type="xsd:string" use="optional" default="__unnamed__"/> |
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
53 |
<xsd:attribute name="IEC_Channel" type="xsd:integer" use="required"/> |
86 | 54 |
<xsd:attribute name="Enabled" type="xsd:boolean" use="optional" default="true"/> |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
55 |
</xsd:complexType> |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
56 |
</xsd:element> |
1315
ff14a66bbd12
Fixed Beremiz for working with new xmlclass support using lxml
Laurent Bessard
parents:
1179
diff
changeset
|
57 |
</xsd:schema>""") |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
58 |
|
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
59 |
NameTypeSeparator = '@' |
1722
89824afffef2
fix some typos
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1581
diff
changeset
|
60 |
XSDSchemaErrorMessage = _("{a1} XML file doesn't follow XSD schema at line {a2}:\n{a3}") |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
61 |
|
1736
7e61baa047f0
clean-up: fix PEP8 E302 expected 2 blank lines, found 1
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1734
diff
changeset
|
62 |
|
1831
56b48961cc68
fix (old-style-class) Old-style class defined error for most parts of
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1828
diff
changeset
|
63 |
class ConfigTreeNode(object): |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
64 |
""" |
717 | 65 |
This class is the one that define confnodes. |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
66 |
""" |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
67 |
|
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
68 |
XSD = None |
718 | 69 |
CTNChildrenTypes = [] |
70 |
CTNMaxCount = None |
|
717 | 71 |
ConfNodeMethods = [] |
274
8628f3dd0979
Adding support for defining plugin library as a plcopen xml file in plugin folder
greg
parents:
273
diff
changeset
|
72 |
LibraryControler = None |
743 | 73 |
EditorType = ConfTreeNodeEditor |
738 | 74 |
IconPath = None |
1730
64d8f52bc8c8
clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1722
diff
changeset
|
75 |
|
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
76 |
def _AddParamsMembers(self): |
718 | 77 |
self.CTNParams = None |
29
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
78 |
if self.XSD: |
1315
ff14a66bbd12
Fixed Beremiz for working with new xmlclass support using lxml
Laurent Bessard
parents:
1179
diff
changeset
|
79 |
self.Parser = GenerateParserFromXSDstring(self.XSD) |
ff14a66bbd12
Fixed Beremiz for working with new xmlclass support using lxml
Laurent Bessard
parents:
1179
diff
changeset
|
80 |
obj = self.Parser.CreateRoot() |
ff14a66bbd12
Fixed Beremiz for working with new xmlclass support using lxml
Laurent Bessard
parents:
1179
diff
changeset
|
81 |
name = obj.getLocalTag() |
ff14a66bbd12
Fixed Beremiz for working with new xmlclass support using lxml
Laurent Bessard
parents:
1179
diff
changeset
|
82 |
self.CTNParams = (name, obj) |
ff14a66bbd12
Fixed Beremiz for working with new xmlclass support using lxml
Laurent Bessard
parents:
1179
diff
changeset
|
83 |
setattr(self, name, obj) |
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
84 |
|
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
85 |
def __init__(self): |
1730
64d8f52bc8c8
clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1722
diff
changeset
|
86 |
# Create BaseParam |
1315
ff14a66bbd12
Fixed Beremiz for working with new xmlclass support using lxml
Laurent Bessard
parents:
1179
diff
changeset
|
87 |
self.BaseParams = _BaseParamsParser.CreateRoot() |
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
88 |
self.MandatoryParams = ("BaseParams", self.BaseParams) |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
89 |
self._AddParamsMembers() |
718 | 90 |
self.Children = {} |
656
c1792dfc8c7e
Fixing bug integrated plugin editors not closed when removing corresponding plugin
laurent
parents:
655
diff
changeset
|
91 |
self._View = None |
717 | 92 |
# copy ConfNodeMethods so that it can be later customized |
93 |
self.ConfNodeMethods = [dic.copy() for dic in self.ConfNodeMethods] |
|
1730
64d8f52bc8c8
clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1722
diff
changeset
|
94 |
|
718 | 95 |
def ConfNodeBaseXmlFilePath(self, CTNName=None): |
96 |
return os.path.join(self.CTNPath(CTNName), "baseconfnode.xml") |
|
1730
64d8f52bc8c8
clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1722
diff
changeset
|
97 |
|
718 | 98 |
def ConfNodeXmlFilePath(self, CTNName=None): |
99 |
return os.path.join(self.CTNPath(CTNName), "confnode.xml") |
|
717 | 100 |
|
101 |
def ConfNodePath(self): |
|
718 | 102 |
return os.path.join(self.CTNParent.ConfNodePath(), self.CTNType) |
103 |
||
1740
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
104 |
def CTNPath(self, CTNName=None, project_path=None): |
718 | 105 |
if not CTNName: |
106 |
CTNName = self.CTNName() |
|
1061 | 107 |
if not project_path: |
108 |
project_path = self.CTNParent.CTNPath() |
|
109 |
return os.path.join(project_path, |
|
718 | 110 |
CTNName + NameTypeSeparator + self.CTNType) |
1730
64d8f52bc8c8
clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1722
diff
changeset
|
111 |
|
718 | 112 |
def CTNName(self): |
675
44b35c27e9ff
Adding support for quickly open recent projects in file menu
laurent
parents:
674
diff
changeset
|
113 |
return self.BaseParams.getName() |
1730
64d8f52bc8c8
clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1722
diff
changeset
|
114 |
|
718 | 115 |
def CTNEnabled(self): |
675
44b35c27e9ff
Adding support for quickly open recent projects in file menu
laurent
parents:
674
diff
changeset
|
116 |
return self.BaseParams.getEnabled() |
1730
64d8f52bc8c8
clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1722
diff
changeset
|
117 |
|
718 | 118 |
def CTNFullName(self): |
119 |
parent = self.CTNParent.CTNFullName() |
|
656
c1792dfc8c7e
Fixing bug integrated plugin editors not closed when removing corresponding plugin
laurent
parents:
655
diff
changeset
|
120 |
if parent != "": |
718 | 121 |
return parent + "." + self.CTNName() |
656
c1792dfc8c7e
Fixing bug integrated plugin editors not closed when removing corresponding plugin
laurent
parents:
655
diff
changeset
|
122 |
return self.BaseParams.getName() |
1730
64d8f52bc8c8
clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1722
diff
changeset
|
123 |
|
781
cdc6393705ce
Adding support using plcopeneditor bitmap library for icon request
laurent
parents:
780
diff
changeset
|
124 |
def GetIconName(self): |
734 | 125 |
return None |
1730
64d8f52bc8c8
clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1722
diff
changeset
|
126 |
|
718 | 127 |
def CTNTestModified(self): |
118 | 128 |
return self.ChangesToSave |
129 |
||
130 |
def ProjectTestModified(self): |
|
131 |
""" |
|
132 |
recursively check modified status |
|
133 |
""" |
|
718 | 134 |
if self.CTNTestModified(): |
118 | 135 |
return True |
136 |
||
718 | 137 |
for CTNChild in self.IterChildren(): |
138 |
if CTNChild.ProjectTestModified(): |
|
118 | 139 |
return True |
140 |
||
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
141 |
return False |
1730
64d8f52bc8c8
clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1722
diff
changeset
|
142 |
|
699
6ff64cadb1ff
Adding support for executing python scripts on remote runtime
laurent
parents:
696
diff
changeset
|
143 |
def RemoteExec(self, script, **kwargs): |
718 | 144 |
return self.CTNParent.RemoteExec(script, **kwargs) |
1730
64d8f52bc8c8
clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1722
diff
changeset
|
145 |
|
1061 | 146 |
def OnCTNSave(self, from_project_path=None): |
1782
5b6ad7a7fd9d
clean-up: fix PEP8 E265 block comment should start with '# '
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1778
diff
changeset
|
147 |
"""Default, do nothing and return success""" |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
148 |
return True |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
149 |
|
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1742
diff
changeset
|
150 |
def GetParamsAttributes(self, path=None): |
19
73257cea38bd
Adding Plugin params visualization with basic controls
lbessard
parents:
18
diff
changeset
|
151 |
if path: |
73257cea38bd
Adding Plugin params visualization with basic controls
lbessard
parents:
18
diff
changeset
|
152 |
parts = path.split(".", 1) |
73257cea38bd
Adding Plugin params visualization with basic controls
lbessard
parents:
18
diff
changeset
|
153 |
if self.MandatoryParams and parts[0] == self.MandatoryParams[0]: |
73257cea38bd
Adding Plugin params visualization with basic controls
lbessard
parents:
18
diff
changeset
|
154 |
return self.MandatoryParams[1].getElementInfos(parts[0], parts[1]) |
718 | 155 |
elif self.CTNParams and parts[0] == self.CTNParams[0]: |
156 |
return self.CTNParams[1].getElementInfos(parts[0], parts[1]) |
|
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
157 |
else: |
19
73257cea38bd
Adding Plugin params visualization with basic controls
lbessard
parents:
18
diff
changeset
|
158 |
params = [] |
718 | 159 |
if self.CTNParams: |
160 |
params.append(self.CTNParams[1].getElementInfos(self.CTNParams[0])) |
|
19
73257cea38bd
Adding Plugin params visualization with basic controls
lbessard
parents:
18
diff
changeset
|
161 |
return params |
1730
64d8f52bc8c8
clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1722
diff
changeset
|
162 |
|
203 | 163 |
def SetParamsAttribute(self, path, value): |
118 | 164 |
self.ChangesToSave = True |
29
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
165 |
# Filter IEC_Channel and Name, that have specific behavior |
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
166 |
if path == "BaseParams.IEC_Channel": |
443
34c9788bd933
Adding support for updating located variables when changing plugin IEC_Channel
laurent
parents:
440
diff
changeset
|
167 |
old_leading = ".".join(map(str, self.GetCurrentLocation())) |
34c9788bd933
Adding support for updating located variables when changing plugin IEC_Channel
laurent
parents:
440
diff
changeset
|
168 |
new_value = self.FindNewIEC_Channel(value) |
842 | 169 |
if new_value != value: |
170 |
new_leading = ".".join(map(str, self.CTNParent.GetCurrentLocation() + (new_value,))) |
|
171 |
self.GetCTRoot().UpdateProjectVariableLocation(old_leading, new_leading) |
|
443
34c9788bd933
Adding support for updating located variables when changing plugin IEC_Channel
laurent
parents:
440
diff
changeset
|
172 |
return new_value, True |
29
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
173 |
elif path == "BaseParams.Name": |
203 | 174 |
res = self.FindNewName(value) |
718 | 175 |
self.CTNRequestSave() |
118 | 176 |
return res, True |
1730
64d8f52bc8c8
clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1722
diff
changeset
|
177 |
|
19
73257cea38bd
Adding Plugin params visualization with basic controls
lbessard
parents:
18
diff
changeset
|
178 |
parts = path.split(".", 1) |
73257cea38bd
Adding Plugin params visualization with basic controls
lbessard
parents:
18
diff
changeset
|
179 |
if self.MandatoryParams and parts[0] == self.MandatoryParams[0]: |
73257cea38bd
Adding Plugin params visualization with basic controls
lbessard
parents:
18
diff
changeset
|
180 |
self.MandatoryParams[1].setElementValue(parts[1], value) |
1179
3e7bd88fcff7
Fixed inconsistency in value display when setting integer value for float parameter
Laurent Bessard
parents:
1063
diff
changeset
|
181 |
value = self.MandatoryParams[1].getElementInfos(parts[0], parts[1])["value"] |
718 | 182 |
elif self.CTNParams and parts[0] == self.CTNParams[0]: |
183 |
self.CTNParams[1].setElementValue(parts[1], value) |
|
1179
3e7bd88fcff7
Fixed inconsistency in value display when setting integer value for float parameter
Laurent Bessard
parents:
1063
diff
changeset
|
184 |
value = self.CTNParams[1].getElementInfos(parts[0], parts[1])["value"] |
29
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
185 |
return value, False |
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
186 |
|
718 | 187 |
def CTNMakeDir(self): |
188 |
os.mkdir(self.CTNPath()) |
|
189 |
||
1061 | 190 |
def CTNRequestSave(self, from_project_path=None): |
718 | 191 |
if self.GetCTRoot().CheckProjectPathPerm(False): |
717 | 192 |
# If confnode do not have corresponding directory |
718 | 193 |
ctnpath = self.CTNPath() |
194 |
if not os.path.isdir(ctnpath): |
|
427 | 195 |
# Create it |
718 | 196 |
os.mkdir(ctnpath) |
1730
64d8f52bc8c8
clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1722
diff
changeset
|
197 |
|
717 | 198 |
# generate XML for base XML parameters controller of the confnode |
427 | 199 |
if self.MandatoryParams: |
1740
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
200 |
BaseXMLFile = open(self.ConfNodeBaseXmlFilePath(), 'w') |
1315
ff14a66bbd12
Fixed Beremiz for working with new xmlclass support using lxml
Laurent Bessard
parents:
1179
diff
changeset
|
201 |
BaseXMLFile.write(etree.tostring( |
1730
64d8f52bc8c8
clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1722
diff
changeset
|
202 |
self.MandatoryParams[1], |
64d8f52bc8c8
clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1722
diff
changeset
|
203 |
pretty_print=True, |
64d8f52bc8c8
clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1722
diff
changeset
|
204 |
xml_declaration=True, |
1315
ff14a66bbd12
Fixed Beremiz for working with new xmlclass support using lxml
Laurent Bessard
parents:
1179
diff
changeset
|
205 |
encoding='utf-8')) |
427 | 206 |
BaseXMLFile.close() |
1730
64d8f52bc8c8
clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1722
diff
changeset
|
207 |
|
717 | 208 |
# generate XML for XML parameters controller of the confnode |
718 | 209 |
if self.CTNParams: |
1740
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
210 |
XMLFile = open(self.ConfNodeXmlFilePath(), 'w') |
1315
ff14a66bbd12
Fixed Beremiz for working with new xmlclass support using lxml
Laurent Bessard
parents:
1179
diff
changeset
|
211 |
XMLFile.write(etree.tostring( |
1730
64d8f52bc8c8
clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1722
diff
changeset
|
212 |
self.CTNParams[1], |
64d8f52bc8c8
clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1722
diff
changeset
|
213 |
pretty_print=True, |
64d8f52bc8c8
clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1722
diff
changeset
|
214 |
xml_declaration=True, |
1315
ff14a66bbd12
Fixed Beremiz for working with new xmlclass support using lxml
Laurent Bessard
parents:
1179
diff
changeset
|
215 |
encoding='utf-8')) |
427 | 216 |
XMLFile.close() |
1730
64d8f52bc8c8
clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1722
diff
changeset
|
217 |
|
718 | 218 |
# Call the confnode specific OnCTNSave method |
1061 | 219 |
result = self.OnCTNSave(from_project_path) |
427 | 220 |
if not result: |
1734
750eeb7230a1
clean-up: fix some PEP8 E228 missing whitespace around modulo operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1733
diff
changeset
|
221 |
return _("Error while saving \"%s\"\n") % self.CTNPath() |
1730
64d8f52bc8c8
clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1722
diff
changeset
|
222 |
|
717 | 223 |
# mark confnode as saved |
427 | 224 |
self.ChangesToSave = False |
718 | 225 |
# go through all children and do the same |
226 |
for CTNChild in self.IterChildren(): |
|
1063 | 227 |
CTNChildPath = None |
228 |
if from_project_path is not None: |
|
229 |
CTNChildPath = CTNChild.CTNPath(project_path=from_project_path) |
|
230 |
result = CTNChild.CTNRequestSave(CTNChildPath) |
|
427 | 231 |
if result: |
232 |
return result |
|
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
233 |
return None |
1730
64d8f52bc8c8
clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1722
diff
changeset
|
234 |
|
718 | 235 |
def CTNImport(self, src_CTNPath): |
236 |
shutil.copytree(src_CTNPath, self.CTNPath) |
|
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
237 |
return True |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
238 |
|
883
235a9ec83b95
Adding support for defining specific global variables for ConfTreeNodes
Laurent Bessard
parents:
842
diff
changeset
|
239 |
def CTNGlobalInstances(self): |
235a9ec83b95
Adding support for defining specific global variables for ConfTreeNodes
Laurent Bessard
parents:
842
diff
changeset
|
240 |
""" |
235a9ec83b95
Adding support for defining specific global variables for ConfTreeNodes
Laurent Bessard
parents:
842
diff
changeset
|
241 |
@return: [(instance_name, instance_type),...] |
235a9ec83b95
Adding support for defining specific global variables for ConfTreeNodes
Laurent Bessard
parents:
842
diff
changeset
|
242 |
""" |
235a9ec83b95
Adding support for defining specific global variables for ConfTreeNodes
Laurent Bessard
parents:
842
diff
changeset
|
243 |
return [] |
1730
64d8f52bc8c8
clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1722
diff
changeset
|
244 |
|
883
235a9ec83b95
Adding support for defining specific global variables for ConfTreeNodes
Laurent Bessard
parents:
842
diff
changeset
|
245 |
def _GlobalInstances(self): |
235a9ec83b95
Adding support for defining specific global variables for ConfTreeNodes
Laurent Bessard
parents:
842
diff
changeset
|
246 |
instances = self.CTNGlobalInstances() |
235a9ec83b95
Adding support for defining specific global variables for ConfTreeNodes
Laurent Bessard
parents:
842
diff
changeset
|
247 |
for CTNChild in self.IECSortedChildren(): |
235a9ec83b95
Adding support for defining specific global variables for ConfTreeNodes
Laurent Bessard
parents:
842
diff
changeset
|
248 |
instances.extend(CTNChild._GlobalInstances()) |
235a9ec83b95
Adding support for defining specific global variables for ConfTreeNodes
Laurent Bessard
parents:
842
diff
changeset
|
249 |
return instances |
1730
64d8f52bc8c8
clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1722
diff
changeset
|
250 |
|
718 | 251 |
def CTNGenerate_C(self, buildpath, locations): |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
252 |
""" |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
253 |
Generate C code |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
254 |
@param locations: List of complete variables locations \ |
22 | 255 |
[{"IEC_TYPE" : the IEC type (i.e. "INT", "STRING", ...) |
256 |
"NAME" : name of the variable (generally "__IW0_1_2" style) |
|
257 |
"DIR" : direction "Q","I" or "M" |
|
258 |
"SIZE" : size "X", "B", "W", "D", "L" |
|
259 |
"LOC" : tuple of interger for IEC location (0,1,2,...) |
|
260 |
}, ...] |
|
18 | 261 |
@return: [(C_file_name, CFLAGS),...] , LDFLAGS_TO_APPEND |
262 |
""" |
|
1833
2269739dd098
fix unnecessary lambda and enable corresponding pylint check
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1831
diff
changeset
|
263 |
self.GetCTRoot().logger.write_warning(".".join(map(str, self.GetCurrentLocation())) + " -> Nothing to do\n") |
1740
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
264 |
return [], "", False |
1730
64d8f52bc8c8
clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1722
diff
changeset
|
265 |
|
203 | 266 |
def _Generate_C(self, buildpath, locations): |
717 | 267 |
# Generate confnodes [(Cfiles, CFLAGS)], LDFLAGS, DoCalls, extra_files |
203 | 268 |
# extra_files = [(fname,fobject), ...] |
718 | 269 |
gen_result = self.CTNGenerate_C(buildpath, locations) |
270 |
CTNCFilesAndCFLAGS, CTNLDFLAGS, DoCalls = gen_result[:3] |
|
203 | 271 |
extra_files = gen_result[3:] |
361 | 272 |
# if some files have been generated put them in the list with their location |
718 | 273 |
if CTNCFilesAndCFLAGS: |
274 |
LocationCFilesAndCFLAGS = [(self.GetCurrentLocation(), CTNCFilesAndCFLAGS, DoCalls)] |
|
47
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
275 |
else: |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
276 |
LocationCFilesAndCFLAGS = [] |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
277 |
|
717 | 278 |
# confnode asks for some LDFLAGS |
2003
2076df8743b5
Support unicode in LDFLAGS returned by extensions
Edouard Tisserant
parents:
1932
diff
changeset
|
279 |
LDFLAGS = [] |
2076df8743b5
Support unicode in LDFLAGS returned by extensions
Edouard Tisserant
parents:
1932
diff
changeset
|
280 |
if CTNLDFLAGS is not None: |
47
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
281 |
# LDFLAGS can be either string |
2434
07f48018b6f5
python3 support: pylint, W1612 # (unicode-builtin) unicode built-in referenced
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2418
diff
changeset
|
282 |
if isinstance(CTNLDFLAGS, (str, text)): |
2003
2076df8743b5
Support unicode in LDFLAGS returned by extensions
Edouard Tisserant
parents:
1932
diff
changeset
|
283 |
LDFLAGS += [CTNLDFLAGS] |
1733
dea107dce0c4
clean-up: fix some PEP8 E265 block comment should start with '# '
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1732
diff
changeset
|
284 |
# or list of strings |
1778
1c6a704bd39c
clean-up: fix PEP8 E721 do not compare types, use 'isinstance()'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1767
diff
changeset
|
285 |
elif isinstance(CTNLDFLAGS, list): |
2003
2076df8743b5
Support unicode in LDFLAGS returned by extensions
Edouard Tisserant
parents:
1932
diff
changeset
|
286 |
LDFLAGS += CTNLDFLAGS |
1730
64d8f52bc8c8
clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1722
diff
changeset
|
287 |
|
718 | 288 |
# recurse through all children, and stack their results |
289 |
for CTNChild in self.IECSortedChildren(): |
|
290 |
new_location = CTNChild.GetCurrentLocation() |
|
24 | 291 |
# How deep are we in the tree ? |
1742
92932cd370a4
clean-up: fix PEP8 E225 missing whitespace around operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1740
diff
changeset
|
292 |
depth = len(new_location) |
203 | 293 |
_LocationCFilesAndCFLAGS, _LDFLAGS, _extra_files = \ |
718 | 294 |
CTNChild._Generate_C( |
1733
dea107dce0c4
clean-up: fix some PEP8 E265 block comment should start with '# '
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1732
diff
changeset
|
295 |
# keep the same path |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
296 |
buildpath, |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
297 |
# filter locations that start with current IEC location |
1746
45d6f5fba016
clean-up: fix PEP8 E202 whitespace before ')'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1744
diff
changeset
|
298 |
[loc for loc in locations if loc["LOC"][0:depth] == new_location]) |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
299 |
# stack the result |
47
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
300 |
LocationCFilesAndCFLAGS += _LocationCFilesAndCFLAGS |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
301 |
LDFLAGS += _LDFLAGS |
203 | 302 |
extra_files += _extra_files |
1730
64d8f52bc8c8
clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1722
diff
changeset
|
303 |
|
203 | 304 |
return LocationCFilesAndCFLAGS, LDFLAGS, extra_files |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
305 |
|
718 | 306 |
def IterChildren(self): |
1847
6198190bc121
explicitly mark unused variables found by pylint with _ or dummy
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1846
diff
changeset
|
307 |
for _CTNType, Children in self.Children.items(): |
718 | 308 |
for CTNInstance in Children: |
309 |
yield CTNInstance |
|
1730
64d8f52bc8c8
clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1722
diff
changeset
|
310 |
|
718 | 311 |
def IECSortedChildren(self): |
312 |
# reorder children by IEC_channels |
|
1740
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
313 |
ordered = [(chld.BaseParams.getIEC_Channel(), chld) for chld in self.IterChildren()] |
47
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
314 |
if ordered: |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
315 |
ordered.sort() |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
316 |
return zip(*ordered)[1] |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
317 |
else: |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
318 |
return [] |
1730
64d8f52bc8c8
clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1722
diff
changeset
|
319 |
|
47
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
320 |
def _GetChildBySomething(self, something, toks): |
718 | 321 |
for CTNInstance in self.IterChildren(): |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
322 |
# if match component of the name |
718 | 323 |
if getattr(CTNInstance.BaseParams, something) == toks[0]: |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
324 |
# if Name have other components |
47
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
325 |
if len(toks) >= 2: |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
326 |
# Recurse in order to find the latest object |
1747
6046ffa2280f
clean-up: fix PEP8 E201 whitespace after '{'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1746
diff
changeset
|
327 |
return CTNInstance._GetChildBySomething(something, toks[1:]) |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
328 |
# No sub name -> found |
718 | 329 |
return CTNInstance |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
330 |
# Not found |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
331 |
return None |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
332 |
|
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
333 |
def GetChildByName(self, Name): |
47
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
334 |
if Name: |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
335 |
toks = Name.split('.') |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
336 |
return self._GetChildBySomething("Name", toks) |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
337 |
else: |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
338 |
return self |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
339 |
|
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
340 |
def GetChildByIECLocation(self, Location): |
47
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
341 |
if Location: |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
342 |
return self._GetChildBySomething("IEC_Channel", Location) |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
343 |
else: |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
344 |
return self |
1730
64d8f52bc8c8
clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1722
diff
changeset
|
345 |
|
23 | 346 |
def GetCurrentLocation(self): |
24 | 347 |
""" |
717 | 348 |
@return: Tupple containing confnode IEC location of current confnode : %I0.0.4.5 => (0,0,4,5) |
24 | 349 |
""" |
718 | 350 |
return self.CTNParent.GetCurrentLocation() + (self.BaseParams.getIEC_Channel(),) |
23 | 351 |
|
47
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
352 |
def GetCurrentName(self): |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
353 |
""" |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
354 |
@return: String "ParentParentName.ParentName.Name" |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
355 |
""" |
1738
d2e979738700
clean-up: fix PEP8 E271 multiple spaces after keyword
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
356 |
return self.CTNParent._GetCurrentName() + self.BaseParams.getName() |
47
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
357 |
|
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
358 |
def _GetCurrentName(self): |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
359 |
""" |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
360 |
@return: String "ParentParentName.ParentName.Name." |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
361 |
""" |
1738
d2e979738700
clean-up: fix PEP8 E271 multiple spaces after keyword
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
362 |
return self.CTNParent._GetCurrentName() + self.BaseParams.getName() + "." |
718 | 363 |
|
364 |
def GetCTRoot(self): |
|
365 |
return self.CTNParent.GetCTRoot() |
|
23 | 366 |
|
97 | 367 |
def GetFullIEC_Channel(self): |
368 |
return ".".join([str(i) for i in self.GetCurrentLocation()]) + ".x" |
|
369 |
||
370 |
def GetLocations(self): |
|
371 |
location = self.GetCurrentLocation() |
|
718 | 372 |
return [loc for loc in self.CTNParent.GetLocations() if loc["LOC"][0:len(location)] == location] |
97 | 373 |
|
401
8106a853a7c7
Adding support for displaying plugins available variable into Beremiz plugin tree
laurent
parents:
396
diff
changeset
|
374 |
def GetVariableLocationTree(self): |
8106a853a7c7
Adding support for displaying plugins available variable into Beremiz plugin tree
laurent
parents:
396
diff
changeset
|
375 |
''' |
717 | 376 |
This function is meant to be overridden by confnodes. |
401
8106a853a7c7
Adding support for displaying plugins available variable into Beremiz plugin tree
laurent
parents:
396
diff
changeset
|
377 |
|
8106a853a7c7
Adding support for displaying plugins available variable into Beremiz plugin tree
laurent
parents:
396
diff
changeset
|
378 |
It should returns an list of dictionaries |
1730
64d8f52bc8c8
clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1722
diff
changeset
|
379 |
|
401
8106a853a7c7
Adding support for displaying plugins available variable into Beremiz plugin tree
laurent
parents:
396
diff
changeset
|
380 |
- IEC_type is an IEC type like BOOL/BYTE/SINT/... |
8106a853a7c7
Adding support for displaying plugins available variable into Beremiz plugin tree
laurent
parents:
396
diff
changeset
|
381 |
- location is a string of this variable's location, like "%IX0.0.0" |
8106a853a7c7
Adding support for displaying plugins available variable into Beremiz plugin tree
laurent
parents:
396
diff
changeset
|
382 |
''' |
8106a853a7c7
Adding support for displaying plugins available variable into Beremiz plugin tree
laurent
parents:
396
diff
changeset
|
383 |
children = [] |
718 | 384 |
for child in self.IECSortedChildren(): |
402
984e238e63d0
Bugs on displaying plugin available variables in PluginTree fixed
laurent
parents:
401
diff
changeset
|
385 |
children.append(child.GetVariableLocationTree()) |
984e238e63d0
Bugs on displaying plugin available variables in PluginTree fixed
laurent
parents:
401
diff
changeset
|
386 |
return {"name": self.BaseParams.getName(), |
717 | 387 |
"type": LOCATION_CONFNODE, |
402
984e238e63d0
Bugs on displaying plugin available variables in PluginTree fixed
laurent
parents:
401
diff
changeset
|
388 |
"location": self.GetFullIEC_Channel(), |
984e238e63d0
Bugs on displaying plugin available variables in PluginTree fixed
laurent
parents:
401
diff
changeset
|
389 |
"children": children} |
401
8106a853a7c7
Adding support for displaying plugins available variable into Beremiz plugin tree
laurent
parents:
396
diff
changeset
|
390 |
|
203 | 391 |
def FindNewName(self, DesiredName): |
29
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
392 |
""" |
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
393 |
Changes Name to DesiredName if available, Name-N if not. |
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
394 |
@param DesiredName: The desired Name (string) |
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
395 |
""" |
1846
14b40afccd69
remove unused variables found by pylint
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1833
diff
changeset
|
396 |
|
718 | 397 |
# Build a list of used Name out of parent's Children |
1742
92932cd370a4
clean-up: fix PEP8 E225 missing whitespace around operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1740
diff
changeset
|
398 |
AllNames = [] |
718 | 399 |
for CTNInstance in self.CTNParent.IterChildren(): |
400 |
if CTNInstance != self: |
|
401 |
AllNames.append(CTNInstance.BaseParams.getName()) |
|
29
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
402 |
|
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
403 |
# Find a free name, eventually appending digit |
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
404 |
res = DesiredName |
833
3f997fb22928
Fix confnode new name format that generates an error with frame class name in wxGlade extension
laurent
parents:
814
diff
changeset
|
405 |
if DesiredName.endswith("_0"): |
841
8e19df12b596
Fix unexpected warning message when adding extension to project
Laurent Bessard
parents:
833
diff
changeset
|
406 |
BaseDesiredName = DesiredName[:-2] |
8e19df12b596
Fix unexpected warning message when adding extension to project
Laurent Bessard
parents:
833
diff
changeset
|
407 |
else: |
8e19df12b596
Fix unexpected warning message when adding extension to project
Laurent Bessard
parents:
833
diff
changeset
|
408 |
BaseDesiredName = DesiredName |
29
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
409 |
suffix = 1 |
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
410 |
while res in AllNames: |
1734
750eeb7230a1
clean-up: fix some PEP8 E228 missing whitespace around modulo operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1733
diff
changeset
|
411 |
res = "%s_%d" % (BaseDesiredName, suffix) |
29
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
412 |
suffix += 1 |
1730
64d8f52bc8c8
clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1722
diff
changeset
|
413 |
|
717 | 414 |
# Check previous confnode existance |
29
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
415 |
dontexist = self.BaseParams.getName() == "__unnamed__" |
1932
65d2dbbf7022
Better variable naming, and small optimization.
Edouard Tisserant
parents:
1881
diff
changeset
|
416 |
if not dontexist: |
65d2dbbf7022
Better variable naming, and small optimization.
Edouard Tisserant
parents:
1881
diff
changeset
|
417 |
# Get old path |
65d2dbbf7022
Better variable naming, and small optimization.
Edouard Tisserant
parents:
1881
diff
changeset
|
418 |
oldpath = self.CTNPath() |
29
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
419 |
# Set the new name |
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
420 |
self.BaseParams.setName(res) |
717 | 421 |
# Rename confnode dir if exist |
29
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
422 |
if not dontexist: |
1932
65d2dbbf7022
Better variable naming, and small optimization.
Edouard Tisserant
parents:
1881
diff
changeset
|
423 |
shutil.move(oldpath, self.CTNPath()) |
29
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
424 |
# warn user he has two left hands |
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
425 |
if DesiredName != res: |
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1742
diff
changeset
|
426 |
msg = _("A child named \"{a1}\" already exists -> \"{a2}\"\n").format(a1=DesiredName, a2=res) |
1581
2295fdc5c271
fix translation strings with multiple parameters
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1511
diff
changeset
|
427 |
self.GetCTRoot().logger.write_warning(msg) |
29
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
428 |
return res |
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
429 |
|
683
57aa9da845d5
Fix wrong panel size making strange background in topology plugin element
laurent
parents:
677
diff
changeset
|
430 |
def GetAllChannels(self): |
1742
92932cd370a4
clean-up: fix PEP8 E225 missing whitespace around operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1740
diff
changeset
|
431 |
AllChannels = [] |
718 | 432 |
for CTNInstance in self.CTNParent.IterChildren(): |
433 |
if CTNInstance != self: |
|
434 |
AllChannels.append(CTNInstance.BaseParams.getIEC_Channel()) |
|
683
57aa9da845d5
Fix wrong panel size making strange background in topology plugin element
laurent
parents:
677
diff
changeset
|
435 |
AllChannels.sort() |
57aa9da845d5
Fix wrong panel size making strange background in topology plugin element
laurent
parents:
677
diff
changeset
|
436 |
return AllChannels |
57aa9da845d5
Fix wrong panel size making strange background in topology plugin element
laurent
parents:
677
diff
changeset
|
437 |
|
203 | 438 |
def FindNewIEC_Channel(self, DesiredChannel): |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
439 |
""" |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
440 |
Changes IEC Channel number to DesiredChannel if available, nearest available if not. |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
441 |
@param DesiredChannel: The desired IEC channel (int) |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
442 |
""" |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
443 |
# Get Current IEC channel |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
444 |
CurrentChannel = self.BaseParams.getIEC_Channel() |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
445 |
# Do nothing if no change |
1782
5b6ad7a7fd9d
clean-up: fix PEP8 E265 block comment should start with '# '
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1778
diff
changeset
|
446 |
# if CurrentChannel == DesiredChannel: return CurrentChannel |
718 | 447 |
# Build a list of used Channels out of parent's Children |
683
57aa9da845d5
Fix wrong panel size making strange background in topology plugin element
laurent
parents:
677
diff
changeset
|
448 |
AllChannels = self.GetAllChannels() |
1730
64d8f52bc8c8
clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1722
diff
changeset
|
449 |
|
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
450 |
# Now, try to guess the nearest available channel |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
451 |
res = DesiredChannel |
1737
a39c2918c015
clean-up: fix PEP8 E261 at least two spaces before inline comment
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1736
diff
changeset
|
452 |
while res in AllChannels: # While channel not free |
a39c2918c015
clean-up: fix PEP8 E261 at least two spaces before inline comment
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1736
diff
changeset
|
453 |
if res < CurrentChannel: # Want to go down ? |
1758
845ca626db09
clean-up: fix PEP8 E222 multiple spaces after operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1747
diff
changeset
|
454 |
res -= 1 # Test for n-1 |
1739
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1738
diff
changeset
|
455 |
if res < 0: |
1734
750eeb7230a1
clean-up: fix some PEP8 E228 missing whitespace around modulo operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1733
diff
changeset
|
456 |
self.GetCTRoot().logger.write_warning(_("Cannot find lower free IEC channel than %d\n") % CurrentChannel) |
1737
a39c2918c015
clean-up: fix PEP8 E261 at least two spaces before inline comment
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1736
diff
changeset
|
457 |
return CurrentChannel # Can't go bellow 0, do nothing |
1739
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1738
diff
changeset
|
458 |
else: # Want to go up ? |
1758
845ca626db09
clean-up: fix PEP8 E222 multiple spaces after operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1747
diff
changeset
|
459 |
res += 1 # Test for n-1 |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
460 |
# Finally set IEC Channel |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
461 |
self.BaseParams.setIEC_Channel(res) |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
462 |
return res |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
463 |
|
967
8a339cd61cb4
Added support for extension custom contextual add menu
Laurent Bessard
parents:
883
diff
changeset
|
464 |
def GetContextualMenuItems(self): |
8a339cd61cb4
Added support for extension custom contextual add menu
Laurent Bessard
parents:
883
diff
changeset
|
465 |
return None |
8a339cd61cb4
Added support for extension custom contextual add menu
Laurent Bessard
parents:
883
diff
changeset
|
466 |
|
782 | 467 |
def _OpenView(self, name=None, onlyopened=False): |
774
78b5fa92dd1c
Fix bug when opening and closing confnode extra viewers
laurent
parents:
744
diff
changeset
|
468 |
if self.EditorType is not None: |
782 | 469 |
app_frame = self.GetCTRoot().AppFrame |
784
a1d970365e41
Adding support for beremiz extensions to define custom file editors for project files
laurent
parents:
782
diff
changeset
|
470 |
if self._View is None and not onlyopened: |
1730
64d8f52bc8c8
clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1722
diff
changeset
|
471 |
|
774
78b5fa92dd1c
Fix bug when opening and closing confnode extra viewers
laurent
parents:
744
diff
changeset
|
472 |
self._View = self.EditorType(app_frame.TabsOpened, self, app_frame) |
1730
64d8f52bc8c8
clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1722
diff
changeset
|
473 |
|
784
a1d970365e41
Adding support for beremiz extensions to define custom file editors for project files
laurent
parents:
782
diff
changeset
|
474 |
if self._View is not None: |
786 | 475 |
if name is None: |
476 |
name = self.CTNFullName() |
|
477 |
app_frame.EditProjectElement(self._View, name) |
|
1730
64d8f52bc8c8
clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1722
diff
changeset
|
478 |
|
715
135566ab0807
Adding support for automatically saving and restoring state of frame or project perspective
laurent
parents:
707
diff
changeset
|
479 |
return self._View |
135566ab0807
Adding support for automatically saving and restoring state of frame or project perspective
laurent
parents:
707
diff
changeset
|
480 |
return None |
675
44b35c27e9ff
Adding support for quickly open recent projects in file menu
laurent
parents:
674
diff
changeset
|
481 |
|
774
78b5fa92dd1c
Fix bug when opening and closing confnode extra viewers
laurent
parents:
744
diff
changeset
|
482 |
def _CloseView(self, view): |
78b5fa92dd1c
Fix bug when opening and closing confnode extra viewers
laurent
parents:
744
diff
changeset
|
483 |
app_frame = self.GetCTRoot().AppFrame |
78b5fa92dd1c
Fix bug when opening and closing confnode extra viewers
laurent
parents:
744
diff
changeset
|
484 |
if app_frame is not None: |
78b5fa92dd1c
Fix bug when opening and closing confnode extra viewers
laurent
parents:
744
diff
changeset
|
485 |
app_frame.DeletePage(view) |
78b5fa92dd1c
Fix bug when opening and closing confnode extra viewers
laurent
parents:
744
diff
changeset
|
486 |
|
675
44b35c27e9ff
Adding support for quickly open recent projects in file menu
laurent
parents:
674
diff
changeset
|
487 |
def OnCloseEditor(self, view): |
44b35c27e9ff
Adding support for quickly open recent projects in file menu
laurent
parents:
674
diff
changeset
|
488 |
if self._View == view: |
44b35c27e9ff
Adding support for quickly open recent projects in file menu
laurent
parents:
674
diff
changeset
|
489 |
self._View = None |
656
c1792dfc8c7e
Fixing bug integrated plugin editors not closed when removing corresponding plugin
laurent
parents:
655
diff
changeset
|
490 |
|
718 | 491 |
def OnCTNClose(self): |
656
c1792dfc8c7e
Fixing bug integrated plugin editors not closed when removing corresponding plugin
laurent
parents:
655
diff
changeset
|
492 |
if self._View is not None: |
780
70632f4612a1
Fix bug when deleting conf tree node and conf tree node editor opened for this same node
laurent
parents:
774
diff
changeset
|
493 |
self._CloseView(self._View) |
774
78b5fa92dd1c
Fix bug when opening and closing confnode extra viewers
laurent
parents:
744
diff
changeset
|
494 |
self._View = None |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
495 |
return True |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
496 |
|
718 | 497 |
def _doRemoveChild(self, CTNInstance): |
498 |
# Remove all children of child |
|
499 |
for SubCTNInstance in CTNInstance.IterChildren(): |
|
500 |
CTNInstance._doRemoveChild(SubCTNInstance) |
|
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
501 |
# Call the OnCloseMethod |
718 | 502 |
CTNInstance.OnCTNClose() |
717 | 503 |
# Delete confnode dir |
2004
28af541d776b
Allow deleting configuration tree node with no corresponding directory in project tree
Edouard Tisserant
parents:
2003
diff
changeset
|
504 |
try: |
28af541d776b
Allow deleting configuration tree node with no corresponding directory in project tree
Edouard Tisserant
parents:
2003
diff
changeset
|
505 |
shutil.rmtree(CTNInstance.CTNPath()) |
2182
eeca1aff0691
Fix linter errors
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2004
diff
changeset
|
506 |
except Exception: |
2004
28af541d776b
Allow deleting configuration tree node with no corresponding directory in project tree
Edouard Tisserant
parents:
2003
diff
changeset
|
507 |
pass |
718 | 508 |
# Remove child of Children |
509 |
self.Children[CTNInstance.CTNType].remove(CTNInstance) |
|
1033
1eec9b855e47
Clean Config Tree Node children list by type after removing one child
Laurent Bessard
parents:
967
diff
changeset
|
510 |
if len(self.Children[CTNInstance.CTNType]) == 0: |
1eec9b855e47
Clean Config Tree Node children list by type after removing one child
Laurent Bessard
parents:
967
diff
changeset
|
511 |
self.Children.pop(CTNInstance.CTNType) |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
512 |
# Forget it... (View have to refresh) |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
513 |
|
718 | 514 |
def CTNRemove(self): |
717 | 515 |
# Fetch the confnode |
1782
5b6ad7a7fd9d
clean-up: fix PEP8 E265 block comment should start with '# '
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1778
diff
changeset
|
516 |
# CTNInstance = self.GetChildByName(CTNName) |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
517 |
# Ask to his parent to remove it |
718 | 518 |
self.CTNParent._doRemoveChild(self) |
519 |
||
520 |
def CTNAddChild(self, CTNName, CTNType, IEC_Channel=0): |
|
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
521 |
""" |
717 | 522 |
Create the confnodes that may be added as child to this node self |
718 | 523 |
@param CTNType: string desining the confnode class name (get name from CTNChildrenTypes) |
524 |
@param CTNName: string for the name of the confnode instance |
|
525 |
""" |
|
720 | 526 |
# reorganize self.CTNChildrenTypes tuples from (name, CTNClass, Help) |
718 | 527 |
# to ( name, (CTNClass, Help)), an make a dict |
528 |
transpose = zip(*self.CTNChildrenTypes) |
|
1740
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
529 |
CTNChildrenTypes = dict(zip(transpose[0], zip(transpose[1], transpose[2]))) |
717 | 530 |
# Check that adding this confnode is allowed |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
531 |
try: |
718 | 532 |
CTNClass, CTNHelp = CTNChildrenTypes[CTNType] |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
533 |
except KeyError: |
1765
ccf59c1f0b45
clean-up: fix PEP8 W602 deprecated form of raising exception
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1760
diff
changeset
|
534 |
raise Exception(_("Cannot create child {a1} of type {a2} "). |
1767
c74815729afd
clean-up: fix PEP8 E127 continuation line over-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1765
diff
changeset
|
535 |
format(a1=CTNName, a2=CTNType)) |
1730
64d8f52bc8c8
clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1722
diff
changeset
|
536 |
|
718 | 537 |
# if CTNClass is a class factory, call it. (prevent unneeded imports) |
1778
1c6a704bd39c
clean-up: fix PEP8 E721 do not compare types, use 'isinstance()'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1767
diff
changeset
|
538 |
if isinstance(CTNClass, types.FunctionType): |
718 | 539 |
CTNClass = CTNClass() |
1730
64d8f52bc8c8
clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1722
diff
changeset
|
540 |
|
717 | 541 |
# Eventualy Initialize child instance list for this class of confnode |
718 | 542 |
ChildrenWithSameClass = self.Children.setdefault(CTNType, list()) |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
543 |
# Check count |
718 | 544 |
if getattr(CTNClass, "CTNMaxCount", None) and len(ChildrenWithSameClass) >= CTNClass.CTNMaxCount: |
1765
ccf59c1f0b45
clean-up: fix PEP8 W602 deprecated form of raising exception
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1760
diff
changeset
|
545 |
raise Exception( |
ccf59c1f0b45
clean-up: fix PEP8 W602 deprecated form of raising exception
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1760
diff
changeset
|
546 |
_("Max count ({a1}) reached for this confnode of type {a2} "). |
ccf59c1f0b45
clean-up: fix PEP8 W602 deprecated form of raising exception
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1760
diff
changeset
|
547 |
format(a1=CTNClass.CTNMaxCount, a2=CTNType)) |
1730
64d8f52bc8c8
clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1722
diff
changeset
|
548 |
|
717 | 549 |
# create the final class, derived of provided confnode and template |
718 | 550 |
class FinalCTNClass(CTNClass, ConfigTreeNode): |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
551 |
""" |
718 | 552 |
ConfNode class is derivated into FinalCTNClass before being instanciated |
1730
64d8f52bc8c8
clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1722
diff
changeset
|
553 |
This way __init__ is overloaded to ensure ConfigTreeNode.__init__ is called |
718 | 554 |
before CTNClass.__init__, and to do the file related stuff. |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
555 |
""" |
1868
616c3f4bcbcb
fix pylint error '(no-self-argument) Method should have "self" as first argument'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1850
diff
changeset
|
556 |
def __init__(self, parent): |
616c3f4bcbcb
fix pylint error '(no-self-argument) Method should have "self" as first argument'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1850
diff
changeset
|
557 |
self.CTNParent = parent |
717 | 558 |
# Keep track of the confnode type name |
1868
616c3f4bcbcb
fix pylint error '(no-self-argument) Method should have "self" as first argument'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1850
diff
changeset
|
559 |
self.CTNType = CTNType |
106
9810689febb0
Added plugins creation helpstrings, changed GUI layout (more compact), solved staticbitmap issues on win32, re-designed some icons...
etisserant
parents:
105
diff
changeset
|
560 |
# remind the help string, for more fancy display |
1868
616c3f4bcbcb
fix pylint error '(no-self-argument) Method should have "self" as first argument'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1850
diff
changeset
|
561 |
self.CTNHelp = CTNHelp |
717 | 562 |
# Call the base confnode template init - change XSD into class members |
1868
616c3f4bcbcb
fix pylint error '(no-self-argument) Method should have "self" as first argument'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1850
diff
changeset
|
563 |
ConfigTreeNode.__init__(self) |
29
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
564 |
# check name is unique |
1868
616c3f4bcbcb
fix pylint error '(no-self-argument) Method should have "self" as first argument'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1850
diff
changeset
|
565 |
NewCTNName = self.FindNewName(CTNName) |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
566 |
# If dir have already be made, and file exist |
1868
616c3f4bcbcb
fix pylint error '(no-self-argument) Method should have "self" as first argument'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1850
diff
changeset
|
567 |
if os.path.isdir(self.CTNPath(NewCTNName)): # and os.path.isfile(self.ConfNodeXmlFilePath(CTNName)): |
1733
dea107dce0c4
clean-up: fix some PEP8 E265 block comment should start with '# '
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1732
diff
changeset
|
568 |
# Load the confnode.xml file into parameters members |
1868
616c3f4bcbcb
fix pylint error '(no-self-argument) Method should have "self" as first argument'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1850
diff
changeset
|
569 |
self.LoadXMLParams(NewCTNName) |
20 | 570 |
# Basic check. Better to fail immediately. |
1868
616c3f4bcbcb
fix pylint error '(no-self-argument) Method should have "self" as first argument'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1850
diff
changeset
|
571 |
if self.BaseParams.getName() != NewCTNName: |
1765
ccf59c1f0b45
clean-up: fix PEP8 W602 deprecated form of raising exception
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1760
diff
changeset
|
572 |
raise Exception( |
ccf59c1f0b45
clean-up: fix PEP8 W602 deprecated form of raising exception
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1760
diff
changeset
|
573 |
_("Project tree layout do not match confnode.xml {a1}!={a2} "). |
1868
616c3f4bcbcb
fix pylint error '(no-self-argument) Method should have "self" as first argument'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1850
diff
changeset
|
574 |
format(a1=NewCTNName, a2=self.BaseParams.getName())) |
718 | 575 |
|
576 |
# Now, self.CTNPath() should be OK |
|
1730
64d8f52bc8c8
clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1722
diff
changeset
|
577 |
|
15
7a473efc4530
More precise design for plugins.... to be continued...
etisserant
parents:
14
diff
changeset
|
578 |
# Check that IEC_Channel is not already in use. |
1868
616c3f4bcbcb
fix pylint error '(no-self-argument) Method should have "self" as first argument'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1850
diff
changeset
|
579 |
self.FindNewIEC_Channel(self.BaseParams.getIEC_Channel()) |
717 | 580 |
# Call the confnode real __init__ |
718 | 581 |
if getattr(CTNClass, "__init__", None): |
1868
616c3f4bcbcb
fix pylint error '(no-self-argument) Method should have "self" as first argument'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1850
diff
changeset
|
582 |
CTNClass.__init__(self) |
1733
dea107dce0c4
clean-up: fix some PEP8 E265 block comment should start with '# '
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1732
diff
changeset
|
583 |
# Load and init all the children |
1868
616c3f4bcbcb
fix pylint error '(no-self-argument) Method should have "self" as first argument'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1850
diff
changeset
|
584 |
self.LoadChildren() |
1733
dea107dce0c4
clean-up: fix some PEP8 E265 block comment should start with '# '
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1732
diff
changeset
|
585 |
# just loaded, nothing to saved |
1868
616c3f4bcbcb
fix pylint error '(no-self-argument) Method should have "self" as first argument'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1850
diff
changeset
|
586 |
self.ChangesToSave = False |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
587 |
else: |
717 | 588 |
# If confnode do not have corresponding file/dirs - they will be created on Save |
1868
616c3f4bcbcb
fix pylint error '(no-self-argument) Method should have "self" as first argument'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1850
diff
changeset
|
589 |
self.CTNMakeDir() |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
590 |
# Find an IEC number |
1868
616c3f4bcbcb
fix pylint error '(no-self-argument) Method should have "self" as first argument'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1850
diff
changeset
|
591 |
self.FindNewIEC_Channel(IEC_Channel) |
717 | 592 |
# Call the confnode real __init__ |
718 | 593 |
if getattr(CTNClass, "__init__", None): |
1868
616c3f4bcbcb
fix pylint error '(no-self-argument) Method should have "self" as first argument'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1850
diff
changeset
|
594 |
CTNClass.__init__(self) |
616c3f4bcbcb
fix pylint error '(no-self-argument) Method should have "self" as first argument'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1850
diff
changeset
|
595 |
self.CTNRequestSave() |
1733
dea107dce0c4
clean-up: fix some PEP8 E265 block comment should start with '# '
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1732
diff
changeset
|
596 |
# just created, must be saved |
1868
616c3f4bcbcb
fix pylint error '(no-self-argument) Method should have "self" as first argument'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1850
diff
changeset
|
597 |
self.ChangesToSave = True |
616c3f4bcbcb
fix pylint error '(no-self-argument) Method should have "self" as first argument'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1850
diff
changeset
|
598 |
|
616c3f4bcbcb
fix pylint error '(no-self-argument) Method should have "self" as first argument'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1850
diff
changeset
|
599 |
def _getBuildPath(self): |
616c3f4bcbcb
fix pylint error '(no-self-argument) Method should have "self" as first argument'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1850
diff
changeset
|
600 |
return self.CTNParent._getBuildPath() |
1730
64d8f52bc8c8
clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1722
diff
changeset
|
601 |
|
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
602 |
# Create the object out of the resulting class |
1868
616c3f4bcbcb
fix pylint error '(no-self-argument) Method should have "self" as first argument'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1850
diff
changeset
|
603 |
newConfNodeOpj = FinalCTNClass(self) |
718 | 604 |
# Store it in CTNgedChils |
605 |
ChildrenWithSameClass.append(newConfNodeOpj) |
|
1730
64d8f52bc8c8
clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1722
diff
changeset
|
606 |
|
717 | 607 |
return newConfNodeOpj |
1730
64d8f52bc8c8
clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1722
diff
changeset
|
608 |
|
718 | 609 |
def ClearChildren(self): |
610 |
for child in self.IterChildren(): |
|
611 |
child.ClearChildren() |
|
612 |
self.Children = {} |
|
1730
64d8f52bc8c8
clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1722
diff
changeset
|
613 |
|
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1742
diff
changeset
|
614 |
def LoadXMLParams(self, CTNName=None): |
718 | 615 |
methode_name = os.path.join(self.CTNPath(CTNName), "methods.py") |
105
434aed8dc58d
Added ability to override plugin methods with arbitrary python code (methods.py) when loading plugins
etisserant
parents:
97
diff
changeset
|
616 |
if os.path.isfile(methode_name): |
434aed8dc58d
Added ability to override plugin methods with arbitrary python code (methods.py) when loading plugins
etisserant
parents:
97
diff
changeset
|
617 |
execfile(methode_name) |
1730
64d8f52bc8c8
clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1722
diff
changeset
|
618 |
|
1332
ac7d39f4e376
Fixed error message printed when error in XML files is detected
Laurent Bessard
parents:
1330
diff
changeset
|
619 |
ConfNodeName = CTNName if CTNName is not None else self.CTNName() |
1730
64d8f52bc8c8
clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1722
diff
changeset
|
620 |
|
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
621 |
# Get the base xml tree |
20 | 622 |
if self.MandatoryParams: |
203 | 623 |
try: |
718 | 624 |
basexmlfile = open(self.ConfNodeBaseXmlFilePath(CTNName), 'r') |
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:
1315
diff
changeset
|
625 |
self.BaseParams, error = _BaseParamsParser.LoadXMLString(basexmlfile.read()) |
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:
1315
diff
changeset
|
626 |
if error is not None: |
1581
2295fdc5c271
fix translation strings with multiple parameters
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1511
diff
changeset
|
627 |
(fname, lnum, src) = ((ConfNodeName + " BaseParams",) + error) |
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1742
diff
changeset
|
628 |
self.GetCTRoot().logger.write_warning(XSDSchemaErrorMessage.format(a1=fname, a2=lnum, a3=src)) |
1315
ff14a66bbd12
Fixed Beremiz for working with new xmlclass support using lxml
Laurent Bessard
parents:
1179
diff
changeset
|
629 |
self.MandatoryParams = ("BaseParams", self.BaseParams) |
106
9810689febb0
Added plugins creation helpstrings, changed GUI layout (more compact), solved staticbitmap issues on win32, re-designed some icons...
etisserant
parents:
105
diff
changeset
|
630 |
basexmlfile.close() |
2418
5587c490a070
Use python 3 compatible exception syntax everywhere
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2414
diff
changeset
|
631 |
except Exception as exc: |
2434
07f48018b6f5
python3 support: pylint, W1612 # (unicode-builtin) unicode built-in referenced
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2418
diff
changeset
|
632 |
msg = _("Couldn't load confnode base parameters {a1} :\n {a2}").format(a1=ConfNodeName, a2=text(exc)) |
1581
2295fdc5c271
fix translation strings with multiple parameters
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1511
diff
changeset
|
633 |
self.GetCTRoot().logger.write_error(msg) |
718 | 634 |
self.GetCTRoot().logger.write_error(traceback.format_exc()) |
1730
64d8f52bc8c8
clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1722
diff
changeset
|
635 |
|
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
636 |
# Get the xml tree |
718 | 637 |
if self.CTNParams: |
203 | 638 |
try: |
718 | 639 |
xmlfile = open(self.ConfNodeXmlFilePath(CTNName), 'r') |
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:
1315
diff
changeset
|
640 |
obj, error = self.Parser.LoadXMLString(xmlfile.read()) |
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:
1315
diff
changeset
|
641 |
if error is not None: |
1581
2295fdc5c271
fix translation strings with multiple parameters
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1511
diff
changeset
|
642 |
(fname, lnum, src) = ((ConfNodeName,) + error) |
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1742
diff
changeset
|
643 |
self.GetCTRoot().logger.write_warning(XSDSchemaErrorMessage.format(a1=fname, a2=lnum, a3=src)) |
1315
ff14a66bbd12
Fixed Beremiz for working with new xmlclass support using lxml
Laurent Bessard
parents:
1179
diff
changeset
|
644 |
name = obj.getLocalTag() |
ff14a66bbd12
Fixed Beremiz for working with new xmlclass support using lxml
Laurent Bessard
parents:
1179
diff
changeset
|
645 |
setattr(self, name, obj) |
ff14a66bbd12
Fixed Beremiz for working with new xmlclass support using lxml
Laurent Bessard
parents:
1179
diff
changeset
|
646 |
self.CTNParams = (name, obj) |
106
9810689febb0
Added plugins creation helpstrings, changed GUI layout (more compact), solved staticbitmap issues on win32, re-designed some icons...
etisserant
parents:
105
diff
changeset
|
647 |
xmlfile.close() |
2418
5587c490a070
Use python 3 compatible exception syntax everywhere
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2414
diff
changeset
|
648 |
except Exception as exc: |
2434
07f48018b6f5
python3 support: pylint, W1612 # (unicode-builtin) unicode built-in referenced
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2418
diff
changeset
|
649 |
msg = _("Couldn't load confnode parameters {a1} :\n {a2}").format(a1=ConfNodeName, a2=text(exc)) |
1581
2295fdc5c271
fix translation strings with multiple parameters
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1511
diff
changeset
|
650 |
self.GetCTRoot().logger.write_error(msg) |
718 | 651 |
self.GetCTRoot().logger.write_error(traceback.format_exc()) |
1730
64d8f52bc8c8
clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1722
diff
changeset
|
652 |
|
718 | 653 |
def LoadChildren(self): |
654 |
# Iterate over all CTNName@CTNType in confnode directory, and try to open them |
|
655 |
for CTNDir in os.listdir(self.CTNPath()): |
|
656 |
if os.path.isdir(os.path.join(self.CTNPath(), CTNDir)) and \ |
|
657 |
CTNDir.count(NameTypeSeparator) == 1: |
|
658 |
pname, ptype = CTNDir.split(NameTypeSeparator) |
|
203 | 659 |
try: |
718 | 660 |
self.CTNAddChild(pname, ptype) |
2418
5587c490a070
Use python 3 compatible exception syntax everywhere
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2414
diff
changeset
|
661 |
except Exception as exc: |
2434
07f48018b6f5
python3 support: pylint, W1612 # (unicode-builtin) unicode built-in referenced
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2418
diff
changeset
|
662 |
msg = _("Could not add child \"{a1}\", type {a2} :\n{a3}\n").format(a1=pname, a2=ptype, a3=text(exc)) |
1581
2295fdc5c271
fix translation strings with multiple parameters
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1511
diff
changeset
|
663 |
self.GetCTRoot().logger.write_error(msg) |
718 | 664 |
self.GetCTRoot().logger.write_error(traceback.format_exc()) |