author | Edouard Tisserant |
Wed, 31 Jan 2018 15:22:43 +0100 | |
changeset 1917 | d51d14719392 |
parent 1902 | 2b7e2db31d81 |
child 1928 | ef6902c824f2 |
permissions | -rw-r--r-- |
1511
91538d0c242c
add copyright notices to python files where there were missing, that
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1484
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:
1484
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:
1484
diff
changeset
|
3 |
|
91538d0c242c
add copyright notices to python files where there were missing, that
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1484
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:
1484
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:
1484
diff
changeset
|
6 |
# |
91538d0c242c
add copyright notices to python files where there were missing, that
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1484
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:
1672
diff
changeset
|
8 |
# Copyright (C) 2017: Andrey Skvortsov |
1511
91538d0c242c
add copyright notices to python files where there were missing, that
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1484
diff
changeset
|
9 |
# |
91538d0c242c
add copyright notices to python files where there were missing, that
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1484
diff
changeset
|
10 |
# 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:
1484
diff
changeset
|
11 |
# |
91538d0c242c
add copyright notices to python files where there were missing, that
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1484
diff
changeset
|
12 |
# 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:
1484
diff
changeset
|
13 |
# 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:
1484
diff
changeset
|
14 |
# 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:
1484
diff
changeset
|
15 |
# 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:
1484
diff
changeset
|
16 |
# |
91538d0c242c
add copyright notices to python files where there were missing, that
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1484
diff
changeset
|
17 |
# 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:
1484
diff
changeset
|
18 |
# 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:
1484
diff
changeset
|
19 |
# 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:
1484
diff
changeset
|
20 |
# 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:
1484
diff
changeset
|
21 |
# |
91538d0c242c
add copyright notices to python files where there were missing, that
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1484
diff
changeset
|
22 |
# 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:
1484
diff
changeset
|
23 |
# 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:
1484
diff
changeset
|
24 |
# 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:
1484
diff
changeset
|
25 |
|
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
26 |
""" |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
27 |
Beremiz Project Controller |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
28 |
""" |
1881
091005ec69c4
fix pylint py3k conversion warning: "(no-absolute-import) import missing `from __future__ import absolute_import`"
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1878
diff
changeset
|
29 |
|
091005ec69c4
fix pylint py3k conversion warning: "(no-absolute-import) import missing `from __future__ import absolute_import`"
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1878
diff
changeset
|
30 |
|
091005ec69c4
fix pylint py3k conversion warning: "(no-absolute-import) import missing `from __future__ import absolute_import`"
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1878
diff
changeset
|
31 |
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
|
32 |
import os |
94ffe74e6895
clean-up: fix PEP8 E401 multiple imports on one line
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1730
diff
changeset
|
33 |
import traceback |
411
8261c8f1e365
Bug on Debug trying to start (and stop) before PLC started fixed.
laurent
parents:
403
diff
changeset
|
34 |
import time |
1834
cd42b426028b
fix ungrouped imports from package X
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1832
diff
changeset
|
35 |
from time import localtime |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
36 |
import shutil |
1732
94ffe74e6895
clean-up: fix PEP8 E401 multiple imports on one line
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1730
diff
changeset
|
37 |
import re |
94ffe74e6895
clean-up: fix PEP8 E401 multiple imports on one line
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1730
diff
changeset
|
38 |
import tempfile |
1282
f427352f9727
Added support for left panel add menu with multiple levels
laurent
parents:
1262
diff
changeset
|
39 |
from types import ListType |
725 | 40 |
from threading import Timer, Lock, Thread |
20 | 41 |
from datetime import datetime |
725 | 42 |
from weakref import WeakKeyDictionary |
1433
4a45f6642523
Moved trace buffer unpacking in the IDE. Latest traced variable samples are now passed as a single string
Edouard Tisserant
parents:
1432
diff
changeset
|
43 |
from itertools import izip |
725 | 44 |
|
1832
0f1081928d65
fix wrong-import-order. first standard modules are imported, then others
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1831
diff
changeset
|
45 |
import wx |
0f1081928d65
fix wrong-import-order. first standard modules are imported, then others
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1831
diff
changeset
|
46 |
|
0f1081928d65
fix wrong-import-order. first standard modules are imported, then others
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1831
diff
changeset
|
47 |
import features |
725 | 48 |
import connectors |
1680
6db967480b7d
make run Beremiz and PLCOpen Editor, if full path contain non-lating
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1672
diff
changeset
|
49 |
import util.paths as paths |
815
e4f24593a758
Adding support for extending internationalization to extensions
laurent
parents:
814
diff
changeset
|
50 |
from util.misc import CheckPathPerm, GetClassImporter |
742
41a4a560406c
Fixed runtime problems with python 2.6 without wx installed
Edouard Tisserant
parents:
740
diff
changeset
|
51 |
from util.MiniTextControler import MiniTextControler |
726 | 52 |
from util.ProcessLogger import ProcessLogger |
814 | 53 |
from util.BitmapLibrary import GetBitmap |
54 |
from editors.FileManagementPanel import FileManagementPanel |
|
55 |
from editors.ProjectNodeEditor import ProjectNodeEditor |
|
815
e4f24593a758
Adding support for extending internationalization to extensions
laurent
parents:
814
diff
changeset
|
56 |
from editors.IECCodeViewer import IECCodeViewer |
1363
e87e0166d0a7
Added new debug process separating non-wx thread extracting debug values from connector and 10 Hz wx timer refreshing Beremiz debug Viewers and communicating throw double-buffering, to avoid segmentation faults and optimize CPU usage
Laurent Bessard
parents:
1330
diff
changeset
|
57 |
from editors.DebugViewer import DebugViewer, REFRESH_PERIOD |
814 | 58 |
from dialogs import DiscoveryDialog |
738 | 59 |
from PLCControler import PLCControler |
725 | 60 |
from plcopen.structures import IEC_KEYWORDS |
1834
cd42b426028b
fix ungrouped imports from package X
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1832
diff
changeset
|
61 |
import targets |
1902
2b7e2db31d81
Clarify licensing, and packaging of runtime only files :
Edouard Tisserant
parents:
1881
diff
changeset
|
62 |
from runtime.typemapping import DebugTypesSize, UnpackDebugBuffer |
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
|
63 |
from ConfigTreeNode import ConfigTreeNode, XSDSchemaErrorMessage |
725 | 64 |
|
1680
6db967480b7d
make run Beremiz and PLCOpen Editor, if full path contain non-lating
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1672
diff
changeset
|
65 |
base_folder = paths.AbsParentDir(__file__) |
20 | 66 |
|
813
1460273f40ed
Adding support for printing matiec warnings report in log console
laurent
parents:
806
diff
changeset
|
67 |
MATIEC_ERROR_MODEL = re.compile(".*\.st:(\d+)-(\d+)\.\.(\d+)-(\d+): (?:error)|(?:warning) : (.*)$") |
356
e9698d0ee5f3
Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents:
355
diff
changeset
|
68 |
|
738 | 69 |
ITEM_CONFNODE = 25 |
70 |
||
1736
7e61baa047f0
clean-up: fix PEP8 E302 expected 2 blank lines, found 1
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1734
diff
changeset
|
71 |
|
1282
f427352f9727
Added support for left panel add menu with multiple levels
laurent
parents:
1262
diff
changeset
|
72 |
def ExtractChildrenTypesFromCatalog(catalog): |
f427352f9727
Added support for left panel add menu with multiple levels
laurent
parents:
1262
diff
changeset
|
73 |
children_types = [] |
1847
6198190bc121
explicitly mark unused variables found by pylint with _ or dummy
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1846
diff
changeset
|
74 |
for n, d, _h, c in catalog: |
1282
f427352f9727
Added support for left panel add menu with multiple levels
laurent
parents:
1262
diff
changeset
|
75 |
if isinstance(c, ListType): |
f427352f9727
Added support for left panel add menu with multiple levels
laurent
parents:
1262
diff
changeset
|
76 |
children_types.extend(ExtractChildrenTypesFromCatalog(c)) |
f427352f9727
Added support for left panel add menu with multiple levels
laurent
parents:
1262
diff
changeset
|
77 |
else: |
f427352f9727
Added support for left panel add menu with multiple levels
laurent
parents:
1262
diff
changeset
|
78 |
children_types.append((n, GetClassImporter(c), d)) |
f427352f9727
Added support for left panel add menu with multiple levels
laurent
parents:
1262
diff
changeset
|
79 |
return children_types |
f427352f9727
Added support for left panel add menu with multiple levels
laurent
parents:
1262
diff
changeset
|
80 |
|
1736
7e61baa047f0
clean-up: fix PEP8 E302 expected 2 blank lines, found 1
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1734
diff
changeset
|
81 |
|
1282
f427352f9727
Added support for left panel add menu with multiple levels
laurent
parents:
1262
diff
changeset
|
82 |
def ExtractMenuItemsFromCatalog(catalog): |
f427352f9727
Added support for left panel add menu with multiple levels
laurent
parents:
1262
diff
changeset
|
83 |
menu_items = [] |
1740
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
84 |
for n, d, h, c in catalog: |
1282
f427352f9727
Added support for left panel add menu with multiple levels
laurent
parents:
1262
diff
changeset
|
85 |
if isinstance(c, ListType): |
f427352f9727
Added support for left panel add menu with multiple levels
laurent
parents:
1262
diff
changeset
|
86 |
children = ExtractMenuItemsFromCatalog(c) |
f427352f9727
Added support for left panel add menu with multiple levels
laurent
parents:
1262
diff
changeset
|
87 |
else: |
f427352f9727
Added support for left panel add menu with multiple levels
laurent
parents:
1262
diff
changeset
|
88 |
children = [] |
f427352f9727
Added support for left panel add menu with multiple levels
laurent
parents:
1262
diff
changeset
|
89 |
menu_items.append((n, d, h, children)) |
f427352f9727
Added support for left panel add menu with multiple levels
laurent
parents:
1262
diff
changeset
|
90 |
return menu_items |
f427352f9727
Added support for left panel add menu with multiple levels
laurent
parents:
1262
diff
changeset
|
91 |
|
1736
7e61baa047f0
clean-up: fix PEP8 E302 expected 2 blank lines, found 1
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1734
diff
changeset
|
92 |
|
1282
f427352f9727
Added support for left panel add menu with multiple levels
laurent
parents:
1262
diff
changeset
|
93 |
def GetAddMenuItems(): |
f427352f9727
Added support for left panel add menu with multiple levels
laurent
parents:
1262
diff
changeset
|
94 |
return ExtractMenuItemsFromCatalog(features.catalog) |
f427352f9727
Added support for left panel add menu with multiple levels
laurent
parents:
1262
diff
changeset
|
95 |
|
1736
7e61baa047f0
clean-up: fix PEP8 E302 expected 2 blank lines, found 1
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1734
diff
changeset
|
96 |
|
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
|
97 |
class Iec2CSettings(object): |
1630
f0030c3cd6ab
detect iec2c options and ieclib path only once during the first build
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1606
diff
changeset
|
98 |
def __init__(self): |
1685
578a46fb6b30
if there is no users matiec installation, then use system path to run iec2c
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1680
diff
changeset
|
99 |
self.iec2c = None |
1630
f0030c3cd6ab
detect iec2c options and ieclib path only once during the first build
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1606
diff
changeset
|
100 |
self.iec2c_buildopts = None |
1754
63f4af6bf6d9
clean-up: fix most PEP8 E221 multiple spaces before operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1752
diff
changeset
|
101 |
self.ieclib_path = self.findLibPath() |
1685
578a46fb6b30
if there is no users matiec installation, then use system path to run iec2c
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1680
diff
changeset
|
102 |
self.ieclib_c_path = self.findLibCPath() |
578a46fb6b30
if there is no users matiec installation, then use system path to run iec2c
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1680
diff
changeset
|
103 |
|
578a46fb6b30
if there is no users matiec installation, then use system path to run iec2c
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1680
diff
changeset
|
104 |
def findObject(self, paths, test): |
1742
92932cd370a4
clean-up: fix PEP8 E225 missing whitespace around operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1741
diff
changeset
|
105 |
path = None |
1685
578a46fb6b30
if there is no users matiec installation, then use system path to run iec2c
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1680
diff
changeset
|
106 |
for p in paths: |
578a46fb6b30
if there is no users matiec installation, then use system path to run iec2c
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1680
diff
changeset
|
107 |
if test(p): |
578a46fb6b30
if there is no users matiec installation, then use system path to run iec2c
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1680
diff
changeset
|
108 |
path = p |
1730
64d8f52bc8c8
clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1722
diff
changeset
|
109 |
break |
1685
578a46fb6b30
if there is no users matiec installation, then use system path to run iec2c
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1680
diff
changeset
|
110 |
return path |
1730
64d8f52bc8c8
clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1722
diff
changeset
|
111 |
|
1685
578a46fb6b30
if there is no users matiec installation, then use system path to run iec2c
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1680
diff
changeset
|
112 |
def findCmd(self): |
1742
92932cd370a4
clean-up: fix PEP8 E225 missing whitespace around operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1741
diff
changeset
|
113 |
cmd = "iec2c"+(".exe" if wx.Platform == '__WXMSW__' else "") |
92932cd370a4
clean-up: fix PEP8 E225 missing whitespace around operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1741
diff
changeset
|
114 |
paths = [ |
1685
578a46fb6b30
if there is no users matiec installation, then use system path to run iec2c
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1680
diff
changeset
|
115 |
os.path.join(base_folder, "matiec") |
578a46fb6b30
if there is no users matiec installation, then use system path to run iec2c
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1680
diff
changeset
|
116 |
] |
1740
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
117 |
path = self.findObject(paths, lambda p: os.path.isfile(os.path.join(p, cmd))) |
1685
578a46fb6b30
if there is no users matiec installation, then use system path to run iec2c
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1680
diff
changeset
|
118 |
|
578a46fb6b30
if there is no users matiec installation, then use system path to run iec2c
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1680
diff
changeset
|
119 |
# otherwise use iec2c from PATH |
578a46fb6b30
if there is no users matiec installation, then use system path to run iec2c
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1680
diff
changeset
|
120 |
if path is not None: |
1742
92932cd370a4
clean-up: fix PEP8 E225 missing whitespace around operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1741
diff
changeset
|
121 |
cmd = os.path.join(path, cmd) |
1685
578a46fb6b30
if there is no users matiec installation, then use system path to run iec2c
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1680
diff
changeset
|
122 |
|
578a46fb6b30
if there is no users matiec installation, then use system path to run iec2c
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1680
diff
changeset
|
123 |
return cmd |
1730
64d8f52bc8c8
clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1722
diff
changeset
|
124 |
|
1685
578a46fb6b30
if there is no users matiec installation, then use system path to run iec2c
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1680
diff
changeset
|
125 |
def findLibPath(self): |
1742
92932cd370a4
clean-up: fix PEP8 E225 missing whitespace around operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1741
diff
changeset
|
126 |
paths = [ |
1685
578a46fb6b30
if there is no users matiec installation, then use system path to run iec2c
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1680
diff
changeset
|
127 |
os.path.join(base_folder, "matiec", "lib"), |
578a46fb6b30
if there is no users matiec installation, then use system path to run iec2c
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1680
diff
changeset
|
128 |
"/usr/lib/matiec" |
578a46fb6b30
if there is no users matiec installation, then use system path to run iec2c
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1680
diff
changeset
|
129 |
] |
1740
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
130 |
path = self.findObject(paths, lambda p: os.path.isfile(os.path.join(p, "ieclib.txt"))) |
1685
578a46fb6b30
if there is no users matiec installation, then use system path to run iec2c
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1680
diff
changeset
|
131 |
return path |
1730
64d8f52bc8c8
clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1722
diff
changeset
|
132 |
|
1630
f0030c3cd6ab
detect iec2c options and ieclib path only once during the first build
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1606
diff
changeset
|
133 |
def findLibCPath(self): |
1742
92932cd370a4
clean-up: fix PEP8 E225 missing whitespace around operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1741
diff
changeset
|
134 |
path = None |
1789
492e2cd6157e
fix problem when Beremiz is running without matiec installed
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1782
diff
changeset
|
135 |
if self.ieclib_path is not None: |
492e2cd6157e
fix problem when Beremiz is running without matiec installed
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1782
diff
changeset
|
136 |
paths = [ |
492e2cd6157e
fix problem when Beremiz is running without matiec installed
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1782
diff
changeset
|
137 |
os.path.join(self.ieclib_path, "C"), |
492e2cd6157e
fix problem when Beremiz is running without matiec installed
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1782
diff
changeset
|
138 |
self.ieclib_path] |
492e2cd6157e
fix problem when Beremiz is running without matiec installed
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1782
diff
changeset
|
139 |
path = self.findObject( |
492e2cd6157e
fix problem when Beremiz is running without matiec installed
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1782
diff
changeset
|
140 |
paths, |
492e2cd6157e
fix problem when Beremiz is running without matiec installed
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1782
diff
changeset
|
141 |
lambda p: os.path.isfile(os.path.join(p, "iec_types.h"))) |
1630
f0030c3cd6ab
detect iec2c options and ieclib path only once during the first build
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1606
diff
changeset
|
142 |
return path |
f0030c3cd6ab
detect iec2c options and ieclib path only once during the first build
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1606
diff
changeset
|
143 |
|
f0030c3cd6ab
detect iec2c options and ieclib path only once during the first build
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1606
diff
changeset
|
144 |
def findSupportedOptions(self): |
1734
750eeb7230a1
clean-up: fix some PEP8 E228 missing whitespace around modulo operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1733
diff
changeset
|
145 |
buildcmd = "\"%s\" -h" % (self.getCmd()) |
1742
92932cd370a4
clean-up: fix PEP8 E225 missing whitespace around operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1741
diff
changeset
|
146 |
options = ["-f", "-l", "-p"] |
1630
f0030c3cd6ab
detect iec2c options and ieclib path only once during the first build
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1606
diff
changeset
|
147 |
|
f0030c3cd6ab
detect iec2c options and ieclib path only once during the first build
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1606
diff
changeset
|
148 |
buildopt = "" |
f0030c3cd6ab
detect iec2c options and ieclib path only once during the first build
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1606
diff
changeset
|
149 |
try: |
f0030c3cd6ab
detect iec2c options and ieclib path only once during the first build
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1606
diff
changeset
|
150 |
# Invoke compiler. Output files are listed to stdout, errors to stderr |
1847
6198190bc121
explicitly mark unused variables found by pylint with _ or dummy
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1846
diff
changeset
|
151 |
_status, result, _err_result = ProcessLogger(None, buildcmd, |
6198190bc121
explicitly mark unused variables found by pylint with _ or dummy
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1846
diff
changeset
|
152 |
no_stdout=True, |
6198190bc121
explicitly mark unused variables found by pylint with _ or dummy
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1846
diff
changeset
|
153 |
no_stderr=True).spin() |
1846
14b40afccd69
remove unused variables found by pylint
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1836
diff
changeset
|
154 |
except Exception: |
1630
f0030c3cd6ab
detect iec2c options and ieclib path only once during the first build
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1606
diff
changeset
|
155 |
return buildopt |
f0030c3cd6ab
detect iec2c options and ieclib path only once during the first build
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1606
diff
changeset
|
156 |
|
f0030c3cd6ab
detect iec2c options and ieclib path only once during the first build
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1606
diff
changeset
|
157 |
for opt in options: |
f0030c3cd6ab
detect iec2c options and ieclib path only once during the first build
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1606
diff
changeset
|
158 |
if opt in result: |
f0030c3cd6ab
detect iec2c options and ieclib path only once during the first build
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1606
diff
changeset
|
159 |
buildopt = buildopt + " " + opt |
f0030c3cd6ab
detect iec2c options and ieclib path only once during the first build
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1606
diff
changeset
|
160 |
return buildopt |
f0030c3cd6ab
detect iec2c options and ieclib path only once during the first build
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1606
diff
changeset
|
161 |
|
f0030c3cd6ab
detect iec2c options and ieclib path only once during the first build
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1606
diff
changeset
|
162 |
def getCmd(self): |
1685
578a46fb6b30
if there is no users matiec installation, then use system path to run iec2c
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1680
diff
changeset
|
163 |
if self.iec2c is None: |
578a46fb6b30
if there is no users matiec installation, then use system path to run iec2c
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1680
diff
changeset
|
164 |
self.iec2c = self.findCmd() |
1630
f0030c3cd6ab
detect iec2c options and ieclib path only once during the first build
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1606
diff
changeset
|
165 |
return self.iec2c |
f0030c3cd6ab
detect iec2c options and ieclib path only once during the first build
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1606
diff
changeset
|
166 |
|
f0030c3cd6ab
detect iec2c options and ieclib path only once during the first build
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1606
diff
changeset
|
167 |
def getOptions(self): |
f0030c3cd6ab
detect iec2c options and ieclib path only once during the first build
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1606
diff
changeset
|
168 |
if self.iec2c_buildopts is None: |
f0030c3cd6ab
detect iec2c options and ieclib path only once during the first build
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1606
diff
changeset
|
169 |
self.iec2c_buildopts = self.findSupportedOptions() |
f0030c3cd6ab
detect iec2c options and ieclib path only once during the first build
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1606
diff
changeset
|
170 |
return self.iec2c_buildopts |
f0030c3cd6ab
detect iec2c options and ieclib path only once during the first build
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1606
diff
changeset
|
171 |
|
f0030c3cd6ab
detect iec2c options and ieclib path only once during the first build
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1606
diff
changeset
|
172 |
def getLibPath(self): |
f0030c3cd6ab
detect iec2c options and ieclib path only once during the first build
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1606
diff
changeset
|
173 |
return self.ieclib_path |
f0030c3cd6ab
detect iec2c options and ieclib path only once during the first build
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1606
diff
changeset
|
174 |
|
f0030c3cd6ab
detect iec2c options and ieclib path only once during the first build
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1606
diff
changeset
|
175 |
def getLibCPath(self): |
f0030c3cd6ab
detect iec2c options and ieclib path only once during the first build
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1606
diff
changeset
|
176 |
if self.ieclib_c_path is None: |
f0030c3cd6ab
detect iec2c options and ieclib path only once during the first build
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1606
diff
changeset
|
177 |
self.ieclib_c_path = self.findLibCPath() |
f0030c3cd6ab
detect iec2c options and ieclib path only once during the first build
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1606
diff
changeset
|
178 |
return self.ieclib_c_path |
f0030c3cd6ab
detect iec2c options and ieclib path only once during the first build
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1606
diff
changeset
|
179 |
|
1749
d73b64672238
clean-up: fix PEP8 E305 expected 2 blank lines after class or function definition
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1746
diff
changeset
|
180 |
|
1824
5765bea3dbd1
make it possible to update XSD schema in project controller after new
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1793
diff
changeset
|
181 |
def GetProjectControllerXSD(): |
13
f1f0edbeb313
More precise design for plugins.... to be continued...
etisserant
parents:
diff
changeset
|
182 |
XSD = """<?xml version="1.0" encoding="ISO-8859-1" ?> |
f1f0edbeb313
More precise design for plugins.... to be continued...
etisserant
parents:
diff
changeset
|
183 |
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"> |
f1f0edbeb313
More precise design for plugins.... to be continued...
etisserant
parents:
diff
changeset
|
184 |
<xsd:element name="BeremizRoot"> |
f1f0edbeb313
More precise design for plugins.... to be continued...
etisserant
parents:
diff
changeset
|
185 |
<xsd:complexType> |
86 | 186 |
<xsd:sequence> |
187 |
<xsd:element name="TargetType"> |
|
188 |
<xsd:complexType> |
|
411
8261c8f1e365
Bug on Debug trying to start (and stop) before PLC started fixed.
laurent
parents:
403
diff
changeset
|
189 |
<xsd:choice minOccurs="0"> |
733
915be999f3f0
targets and connectors are nor extensible
Edouard Tisserant
parents:
732
diff
changeset
|
190 |
"""+targets.GetTargetChoices()+""" |
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
|
191 |
</xsd:choice> |
9810689febb0
Added plugins creation helpstrings, changed GUI layout (more compact), solved staticbitmap issues on win32, re-designed some icons...
etisserant
parents:
105
diff
changeset
|
192 |
</xsd:complexType> |
1413
dd89016a5028
Fixed crash at project load when features.libraries is empty (i.e. no libraries are provided).
Edouard Tisserant
parents:
1407
diff
changeset
|
193 |
</xsd:element>"""+((""" |
dd89016a5028
Fixed crash at project load when features.libraries is empty (i.e. no libraries are provided).
Edouard Tisserant
parents:
1407
diff
changeset
|
194 |
<xsd:element name="Libraries" minOccurs="0"> |
730 | 195 |
<xsd:complexType> |
1742
92932cd370a4
clean-up: fix PEP8 E225 missing whitespace around operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1741
diff
changeset
|
196 |
"""+"\n".join(['<xsd:attribute name=' + |
92932cd370a4
clean-up: fix PEP8 E225 missing whitespace around operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1741
diff
changeset
|
197 |
'"Enable_' + libname + '_Library" ' + |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
198 |
'type="xsd:boolean" use="optional" default="true"/>' |
1847
6198190bc121
explicitly mark unused variables found by pylint with _ or dummy
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1846
diff
changeset
|
199 |
for libname, _lib in features.libraries])+""" |
1413
dd89016a5028
Fixed crash at project load when features.libraries is empty (i.e. no libraries are provided).
Edouard Tisserant
parents:
1407
diff
changeset
|
200 |
</xsd:complexType> |
1742
92932cd370a4
clean-up: fix PEP8 E225 missing whitespace around operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1741
diff
changeset
|
201 |
</xsd:element>""") if len(features.libraries) > 0 else '') + """ |
86 | 202 |
</xsd:sequence> |
204
f572ab819769
remove URI_location from XSD targets and add to pluginroot XSD
greg
parents:
203
diff
changeset
|
203 |
<xsd:attribute name="URI_location" type="xsd:string" use="optional" default=""/> |
728
e0424e96e3fd
refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents:
726
diff
changeset
|
204 |
<xsd:attribute name="Disable_Extensions" type="xsd:boolean" use="optional" default="false"/> |
13
f1f0edbeb313
More precise design for plugins.... to be continued...
etisserant
parents:
diff
changeset
|
205 |
</xsd:complexType> |
f1f0edbeb313
More precise design for plugins.... to be continued...
etisserant
parents:
diff
changeset
|
206 |
</xsd:element> |
f1f0edbeb313
More precise design for plugins.... to be continued...
etisserant
parents:
diff
changeset
|
207 |
</xsd:schema> |
f1f0edbeb313
More precise design for plugins.... to be continued...
etisserant
parents:
diff
changeset
|
208 |
""" |
1824
5765bea3dbd1
make it possible to update XSD schema in project controller after new
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1793
diff
changeset
|
209 |
return XSD |
5765bea3dbd1
make it possible to update XSD schema in project controller after new
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1793
diff
changeset
|
210 |
|
5765bea3dbd1
make it possible to update XSD schema in project controller after new
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1793
diff
changeset
|
211 |
|
5765bea3dbd1
make it possible to update XSD schema in project controller after new
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1793
diff
changeset
|
212 |
class ProjectController(ConfigTreeNode, PLCControler): |
5765bea3dbd1
make it possible to update XSD schema in project controller after new
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1793
diff
changeset
|
213 |
""" |
5765bea3dbd1
make it possible to update XSD schema in project controller after new
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1793
diff
changeset
|
214 |
This class define Root object of the confnode tree. |
5765bea3dbd1
make it possible to update XSD schema in project controller after new
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1793
diff
changeset
|
215 |
It is responsible of : |
5765bea3dbd1
make it possible to update XSD schema in project controller after new
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1793
diff
changeset
|
216 |
- Managing project directory |
5765bea3dbd1
make it possible to update XSD schema in project controller after new
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1793
diff
changeset
|
217 |
- Building project |
5765bea3dbd1
make it possible to update XSD schema in project controller after new
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1793
diff
changeset
|
218 |
- Handling PLCOpenEditor controler and view |
5765bea3dbd1
make it possible to update XSD schema in project controller after new
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1793
diff
changeset
|
219 |
- Loading user confnodes and instanciante them as children |
5765bea3dbd1
make it possible to update XSD schema in project controller after new
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1793
diff
changeset
|
220 |
- ... |
5765bea3dbd1
make it possible to update XSD schema in project controller after new
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1793
diff
changeset
|
221 |
|
5765bea3dbd1
make it possible to update XSD schema in project controller after new
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1793
diff
changeset
|
222 |
""" |
5765bea3dbd1
make it possible to update XSD schema in project controller after new
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1793
diff
changeset
|
223 |
# For root object, available Children Types are modules of the confnode packages. |
5765bea3dbd1
make it possible to update XSD schema in project controller after new
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1793
diff
changeset
|
224 |
CTNChildrenTypes = ExtractChildrenTypesFromCatalog(features.catalog) |
5765bea3dbd1
make it possible to update XSD schema in project controller after new
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1793
diff
changeset
|
225 |
XSD = GetProjectControllerXSD() |
738 | 226 |
EditorType = ProjectNodeEditor |
1789
492e2cd6157e
fix problem when Beremiz is running without matiec installed
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1782
diff
changeset
|
227 |
iec2c_cfg = None |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
228 |
|
290
3bd617ae7a05
Local Runtime (LOCAL://) now launched "on demand"
etisserant
parents:
288
diff
changeset
|
229 |
def __init__(self, frame, logger): |
41
1608a434fb8c
Adding support for refreshing PLCOpenEditor block list
lbessard
parents:
40
diff
changeset
|
230 |
PLCControler.__init__(self) |
1836
d42b6cf00fa6
fix error __init__ method from base class is not called
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1834
diff
changeset
|
231 |
ConfigTreeNode.__init__(self) |
227
48c13b84505c
- Some improovements in debug data feedback data
etisserant
parents:
222
diff
changeset
|
232 |
|
1789
492e2cd6157e
fix problem when Beremiz is running without matiec installed
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1782
diff
changeset
|
233 |
if ProjectController.iec2c_cfg is None: |
492e2cd6157e
fix problem when Beremiz is running without matiec installed
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1782
diff
changeset
|
234 |
ProjectController.iec2c_cfg = Iec2CSettings() |
492e2cd6157e
fix problem when Beremiz is running without matiec installed
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1782
diff
changeset
|
235 |
|
20 | 236 |
self.MandatoryParams = None |
203 | 237 |
self._builder = None |
238 |
self._connector = None |
|
1363
e87e0166d0a7
Added new debug process separating non-wx thread extracting debug values from connector and 10 Hz wx timer refreshing Beremiz debug Viewers and communicating throw double-buffering, to avoid segmentation faults and optimize CPU usage
Laurent Bessard
parents:
1330
diff
changeset
|
239 |
self.DispatchDebugValuesTimer = None |
e87e0166d0a7
Added new debug process separating non-wx thread extracting debug values from connector and 10 Hz wx timer refreshing Beremiz debug Viewers and communicating throw double-buffering, to avoid segmentation faults and optimize CPU usage
Laurent Bessard
parents:
1330
diff
changeset
|
240 |
self.DebugValuesBuffers = [] |
e87e0166d0a7
Added new debug process separating non-wx thread extracting debug values from connector and 10 Hz wx timer refreshing Beremiz debug Viewers and communicating throw double-buffering, to avoid segmentation faults and optimize CPU usage
Laurent Bessard
parents:
1330
diff
changeset
|
241 |
self.DebugTicks = [] |
978 | 242 |
self.SetAppFrame(frame, logger) |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
243 |
|
203 | 244 |
# Setup debug information |
227
48c13b84505c
- Some improovements in debug data feedback data
etisserant
parents:
222
diff
changeset
|
245 |
self.IECdebug_datas = {} |
48c13b84505c
- Some improovements in debug data feedback data
etisserant
parents:
222
diff
changeset
|
246 |
self.IECdebug_lock = Lock() |
222
d0f7d36bf241
Added lock to avoid variable subsciption concurrent to transmission to PLC
etisserant
parents:
217
diff
changeset
|
247 |
|
1742
92932cd370a4
clean-up: fix PEP8 E225 missing whitespace around operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1741
diff
changeset
|
248 |
self.DebugTimer = None |
203 | 249 |
self.ResetIECProgramsAndVariables() |
250 |
||
118 | 251 |
# In both new or load scenario, no need to save |
350
a3a5561bde1d
- now call load, start, free PLC from the python Thread
greg
parents:
348
diff
changeset
|
252 |
self.ChangesToSave = False |
23 | 253 |
# root have no parent |
718 | 254 |
self.CTNParent = None |
717 | 255 |
# Keep track of the confnode type name |
718 | 256 |
self.CTNType = "Beremiz" |
257 |
self.Children = {} |
|
738 | 258 |
self._View = None |
717 | 259 |
# After __init__ root confnode is not valid |
20 | 260 |
self.ProjectPath = None |
427 | 261 |
self._setBuildPath(None) |
286
a2a8a52b0d4f
Minor changes to get better cleanup of debug and python_eval threads, accross multiple debug sessions and PLC runs.
etisserant
parents:
283
diff
changeset
|
262 |
self.DebugThread = None |
a2a8a52b0d4f
Minor changes to get better cleanup of debug and python_eval threads, accross multiple debug sessions and PLC runs.
etisserant
parents:
283
diff
changeset
|
263 |
self.debug_break = False |
350
a3a5561bde1d
- now call load, start, free PLC from the python Thread
greg
parents:
348
diff
changeset
|
264 |
self.previous_plcstate = None |
717 | 265 |
# copy ConfNodeMethods so that it can be later customized |
754
a8c258f7bdcf
Fix bug in StatusToolBar items state when close and opening another project
laurent
parents:
746
diff
changeset
|
266 |
self.StatusMethods = [dic.copy() for dic in self.StatusMethods] |
728
e0424e96e3fd
refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents:
726
diff
changeset
|
267 |
|
1282
f427352f9727
Added support for left panel add menu with multiple levels
laurent
parents:
1262
diff
changeset
|
268 |
def __del__(self): |
f427352f9727
Added support for left panel add menu with multiple levels
laurent
parents:
1262
diff
changeset
|
269 |
if self.DebugTimer: |
f427352f9727
Added support for left panel add menu with multiple levels
laurent
parents:
1262
diff
changeset
|
270 |
self.DebugTimer.cancel() |
f427352f9727
Added support for left panel add menu with multiple levels
laurent
parents:
1262
diff
changeset
|
271 |
self.KillDebugThread() |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
272 |
|
728
e0424e96e3fd
refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents:
726
diff
changeset
|
273 |
def LoadLibraries(self): |
e0424e96e3fd
refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents:
726
diff
changeset
|
274 |
self.Libraries = [] |
1742
92932cd370a4
clean-up: fix PEP8 E225 missing whitespace around operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1741
diff
changeset
|
275 |
TypeStack = [] |
1740
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
276 |
for libname, clsname in features.libraries: |
731 | 277 |
if self.BeremizRoot.Libraries is None or getattr(self.BeremizRoot.Libraries, "Enable_"+libname+"_Library"): |
732 | 278 |
Lib = GetClassImporter(clsname)()(self, libname, TypeStack) |
728
e0424e96e3fd
refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents:
726
diff
changeset
|
279 |
TypeStack.append(Lib.GetTypes()) |
e0424e96e3fd
refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents:
726
diff
changeset
|
280 |
self.Libraries.append(Lib) |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
281 |
|
417
a895ae50b737
Adding support for declaring PluginRoot outside of Beremiz
laurent
parents:
415
diff
changeset
|
282 |
def SetAppFrame(self, frame, logger): |
a895ae50b737
Adding support for declaring PluginRoot outside of Beremiz
laurent
parents:
415
diff
changeset
|
283 |
self.AppFrame = frame |
a895ae50b737
Adding support for declaring PluginRoot outside of Beremiz
laurent
parents:
415
diff
changeset
|
284 |
self.logger = logger |
a895ae50b737
Adding support for declaring PluginRoot outside of Beremiz
laurent
parents:
415
diff
changeset
|
285 |
self.StatusTimer = None |
1363
e87e0166d0a7
Added new debug process separating non-wx thread extracting debug values from connector and 10 Hz wx timer refreshing Beremiz debug Viewers and communicating throw double-buffering, to avoid segmentation faults and optimize CPU usage
Laurent Bessard
parents:
1330
diff
changeset
|
286 |
if self.DispatchDebugValuesTimer is not None: |
e87e0166d0a7
Added new debug process separating non-wx thread extracting debug values from connector and 10 Hz wx timer refreshing Beremiz debug Viewers and communicating throw double-buffering, to avoid segmentation faults and optimize CPU usage
Laurent Bessard
parents:
1330
diff
changeset
|
287 |
self.DispatchDebugValuesTimer.Stop() |
e87e0166d0a7
Added new debug process separating non-wx thread extracting debug values from connector and 10 Hz wx timer refreshing Beremiz debug Viewers and communicating throw double-buffering, to avoid segmentation faults and optimize CPU usage
Laurent Bessard
parents:
1330
diff
changeset
|
288 |
self.DispatchDebugValuesTimer = None |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
289 |
|
417
a895ae50b737
Adding support for declaring PluginRoot outside of Beremiz
laurent
parents:
415
diff
changeset
|
290 |
if frame is not None: |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
291 |
|
417
a895ae50b737
Adding support for declaring PluginRoot outside of Beremiz
laurent
parents:
415
diff
changeset
|
292 |
# Timer to pull PLC status |
1363
e87e0166d0a7
Added new debug process separating non-wx thread extracting debug values from connector and 10 Hz wx timer refreshing Beremiz debug Viewers and communicating throw double-buffering, to avoid segmentation faults and optimize CPU usage
Laurent Bessard
parents:
1330
diff
changeset
|
293 |
self.StatusTimer = wx.Timer(self.AppFrame, -1) |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
294 |
self.AppFrame.Bind(wx.EVT_TIMER, |
1768
691083b5682a
clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1767
diff
changeset
|
295 |
self.PullPLCStatusProc, |
691083b5682a
clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1767
diff
changeset
|
296 |
self.StatusTimer) |
1395
bcd1e909076c
Fixed non initialized timer causing exception in some rare cases
Edouard Tisserant
parents:
1387
diff
changeset
|
297 |
|
bcd1e909076c
Fixed non initialized timer causing exception in some rare cases
Edouard Tisserant
parents:
1387
diff
changeset
|
298 |
if self._connector is not None: |
bcd1e909076c
Fixed non initialized timer causing exception in some rare cases
Edouard Tisserant
parents:
1387
diff
changeset
|
299 |
frame.LogViewer.SetLogSource(self._connector) |
bcd1e909076c
Fixed non initialized timer causing exception in some rare cases
Edouard Tisserant
parents:
1387
diff
changeset
|
300 |
self.StatusTimer.Start(milliseconds=500, oneShot=False) |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
301 |
|
1363
e87e0166d0a7
Added new debug process separating non-wx thread extracting debug values from connector and 10 Hz wx timer refreshing Beremiz debug Viewers and communicating throw double-buffering, to avoid segmentation faults and optimize CPU usage
Laurent Bessard
parents:
1330
diff
changeset
|
302 |
# Timer to dispatch debug values to consumers |
e87e0166d0a7
Added new debug process separating non-wx thread extracting debug values from connector and 10 Hz wx timer refreshing Beremiz debug Viewers and communicating throw double-buffering, to avoid segmentation faults and optimize CPU usage
Laurent Bessard
parents:
1330
diff
changeset
|
303 |
self.DispatchDebugValuesTimer = wx.Timer(self.AppFrame, -1) |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
304 |
self.AppFrame.Bind(wx.EVT_TIMER, |
1768
691083b5682a
clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1767
diff
changeset
|
305 |
self.DispatchDebugValuesProc, |
691083b5682a
clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1767
diff
changeset
|
306 |
self.DispatchDebugValuesTimer) |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
307 |
|
717 | 308 |
self.RefreshConfNodesBlockLists() |
417
a895ae50b737
Adding support for declaring PluginRoot outside of Beremiz
laurent
parents:
415
diff
changeset
|
309 |
|
a895ae50b737
Adding support for declaring PluginRoot outside of Beremiz
laurent
parents:
415
diff
changeset
|
310 |
def ResetAppFrame(self, logger): |
a895ae50b737
Adding support for declaring PluginRoot outside of Beremiz
laurent
parents:
415
diff
changeset
|
311 |
if self.AppFrame is not None: |
a895ae50b737
Adding support for declaring PluginRoot outside of Beremiz
laurent
parents:
415
diff
changeset
|
312 |
self.AppFrame.Unbind(wx.EVT_TIMER, self.StatusTimer) |
a895ae50b737
Adding support for declaring PluginRoot outside of Beremiz
laurent
parents:
415
diff
changeset
|
313 |
self.StatusTimer = None |
a895ae50b737
Adding support for declaring PluginRoot outside of Beremiz
laurent
parents:
415
diff
changeset
|
314 |
self.AppFrame = None |
1793
c2f48d791d9f
fix bug with unfinished debug thread
Surkov Sergey <surkovsv93@gmail.com>
parents:
1789
diff
changeset
|
315 |
self.KillDebugThread() |
417
a895ae50b737
Adding support for declaring PluginRoot outside of Beremiz
laurent
parents:
415
diff
changeset
|
316 |
self.logger = logger |
a895ae50b737
Adding support for declaring PluginRoot outside of Beremiz
laurent
parents:
415
diff
changeset
|
317 |
|
738 | 318 |
def CTNName(self): |
319 |
return "Project" |
|
320 |
||
718 | 321 |
def CTNTestModified(self): |
1757
0de89da92ee0
clean-up: fix PEP8 E111 indentation is not a multiple of four
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1756
diff
changeset
|
322 |
return self.ChangesToSave or not self.ProjectIsSaved() |
118 | 323 |
|
718 | 324 |
def CTNFullName(self): |
656
c1792dfc8c7e
Fixing bug integrated plugin editors not closed when removing corresponding plugin
laurent
parents:
655
diff
changeset
|
325 |
return "" |
c1792dfc8c7e
Fixing bug integrated plugin editors not closed when removing corresponding plugin
laurent
parents:
655
diff
changeset
|
326 |
|
718 | 327 |
def GetCTRoot(self): |
23 | 328 |
return self |
329 |
||
418 | 330 |
def GetIECLibPath(self): |
1789
492e2cd6157e
fix problem when Beremiz is running without matiec installed
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1782
diff
changeset
|
331 |
return self.iec2c_cfg.getLibCPath() |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
332 |
|
418 | 333 |
def GetIEC2cPath(self): |
1789
492e2cd6157e
fix problem when Beremiz is running without matiec installed
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1782
diff
changeset
|
334 |
return self.iec2c_cfg.getCmd() |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
335 |
|
23 | 336 |
def GetCurrentLocation(self): |
337 |
return () |
|
47
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
338 |
|
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
339 |
def GetCurrentName(self): |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
340 |
return "" |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
341 |
|
47
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
342 |
def _GetCurrentName(self): |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
343 |
return "" |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
344 |
|
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
345 |
def GetProjectPath(self): |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
346 |
return self.ProjectPath |
51
c31c55601556
Added project linking, and plugin init,cleanup,retrive and publish method calls in main
etisserant
parents:
49
diff
changeset
|
347 |
|
c31c55601556
Added project linking, and plugin init,cleanup,retrive and publish method calls in main
etisserant
parents:
49
diff
changeset
|
348 |
def GetProjectName(self): |
c31c55601556
Added project linking, and plugin init,cleanup,retrive and publish method calls in main
etisserant
parents:
49
diff
changeset
|
349 |
return os.path.split(self.ProjectPath)[1] |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
350 |
|
781
cdc6393705ce
Adding support using plcopeneditor bitmap library for icon request
laurent
parents:
774
diff
changeset
|
351 |
def GetIconName(self): |
cdc6393705ce
Adding support using plcopeneditor bitmap library for icon request
laurent
parents:
774
diff
changeset
|
352 |
return "PROJECT" |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
353 |
|
510
8038c08b9874
Getting default target when no target defined fixed
laurent
parents:
506
diff
changeset
|
354 |
def GetDefaultTargetName(self): |
411
8261c8f1e365
Bug on Debug trying to start (and stop) before PLC started fixed.
laurent
parents:
403
diff
changeset
|
355 |
if wx.Platform == '__WXMSW__': |
510
8038c08b9874
Getting default target when no target defined fixed
laurent
parents:
506
diff
changeset
|
356 |
return "Win32" |
411
8261c8f1e365
Bug on Debug trying to start (and stop) before PLC started fixed.
laurent
parents:
403
diff
changeset
|
357 |
else: |
510
8038c08b9874
Getting default target when no target defined fixed
laurent
parents:
506
diff
changeset
|
358 |
return "Linux" |
8038c08b9874
Getting default target when no target defined fixed
laurent
parents:
506
diff
changeset
|
359 |
|
8038c08b9874
Getting default target when no target defined fixed
laurent
parents:
506
diff
changeset
|
360 |
def GetTarget(self): |
8038c08b9874
Getting default target when no target defined fixed
laurent
parents:
506
diff
changeset
|
361 |
target = self.BeremizRoot.getTargetType() |
8038c08b9874
Getting default target when no target defined fixed
laurent
parents:
506
diff
changeset
|
362 |
if target.getcontent() is None: |
1315
ff14a66bbd12
Fixed Beremiz for working with new xmlclass support using lxml
Laurent Bessard
parents:
1282
diff
changeset
|
363 |
temp_root = self.Parser.CreateRoot() |
ff14a66bbd12
Fixed Beremiz for working with new xmlclass support using lxml
Laurent Bessard
parents:
1282
diff
changeset
|
364 |
target = self.Parser.CreateElement("TargetType", "BeremizRoot") |
ff14a66bbd12
Fixed Beremiz for working with new xmlclass support using lxml
Laurent Bessard
parents:
1282
diff
changeset
|
365 |
temp_root.setTargetType(target) |
510
8038c08b9874
Getting default target when no target defined fixed
laurent
parents:
506
diff
changeset
|
366 |
target_name = self.GetDefaultTargetName() |
1315
ff14a66bbd12
Fixed Beremiz for working with new xmlclass support using lxml
Laurent Bessard
parents:
1282
diff
changeset
|
367 |
target.setcontent(self.Parser.CreateElement(target_name, "TargetType")) |
411
8261c8f1e365
Bug on Debug trying to start (and stop) before PLC started fixed.
laurent
parents:
403
diff
changeset
|
368 |
return target |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
369 |
|
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1742
diff
changeset
|
370 |
def GetParamsAttributes(self, path=None): |
717 | 371 |
params = ConfigTreeNode.GetParamsAttributes(self, path) |
411
8261c8f1e365
Bug on Debug trying to start (and stop) before PLC started fixed.
laurent
parents:
403
diff
changeset
|
372 |
if params[0]["name"] == "BeremizRoot": |
8261c8f1e365
Bug on Debug trying to start (and stop) before PLC started fixed.
laurent
parents:
403
diff
changeset
|
373 |
for child in params[0]["children"]: |
8261c8f1e365
Bug on Debug trying to start (and stop) before PLC started fixed.
laurent
parents:
403
diff
changeset
|
374 |
if child["name"] == "TargetType" and child["value"] == '': |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
375 |
child.update(self.GetTarget().getElementInfos("TargetType")) |
411
8261c8f1e365
Bug on Debug trying to start (and stop) before PLC started fixed.
laurent
parents:
403
diff
changeset
|
376 |
return params |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
377 |
|
411
8261c8f1e365
Bug on Debug trying to start (and stop) before PLC started fixed.
laurent
parents:
403
diff
changeset
|
378 |
def SetParamsAttribute(self, path, value): |
8261c8f1e365
Bug on Debug trying to start (and stop) before PLC started fixed.
laurent
parents:
403
diff
changeset
|
379 |
if path.startswith("BeremizRoot.TargetType.") and self.BeremizRoot.getTargetType().getcontent() is None: |
607
c68b662e0c2a
Bug when changing parameters in TargetType section in Beremiz project configuration fixed
laurent
parents:
604
diff
changeset
|
380 |
self.BeremizRoot.setTargetType(self.GetTarget()) |
1080
5ec20f56b1d2
Fixed bug list of ConfNodes blocks not refreshed when a library was enable or disable
Laurent Bessard
parents:
1072
diff
changeset
|
381 |
res = ConfigTreeNode.SetParamsAttribute(self, path, value) |
5ec20f56b1d2
Fixed bug list of ConfNodes blocks not refreshed when a library was enable or disable
Laurent Bessard
parents:
1072
diff
changeset
|
382 |
if path.startswith("BeremizRoot.Libraries."): |
5ec20f56b1d2
Fixed bug list of ConfNodes blocks not refreshed when a library was enable or disable
Laurent Bessard
parents:
1072
diff
changeset
|
383 |
wx.CallAfter(self.RefreshConfNodesBlockLists) |
5ec20f56b1d2
Fixed bug list of ConfNodes blocks not refreshed when a library was enable or disable
Laurent Bessard
parents:
1072
diff
changeset
|
384 |
return res |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
385 |
|
427 | 386 |
# helper func to check project path write permission |
387 |
def CheckProjectPathPerm(self, dosave=True): |
|
388 |
if CheckPathPerm(self.ProjectPath): |
|
389 |
return True |
|
1080
5ec20f56b1d2
Fixed bug list of ConfNodes blocks not refreshed when a library was enable or disable
Laurent Bessard
parents:
1072
diff
changeset
|
390 |
if self.AppFrame 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
|
391 |
dialog = wx.MessageDialog( |
691083b5682a
clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1767
diff
changeset
|
392 |
self.AppFrame, |
691083b5682a
clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1767
diff
changeset
|
393 |
_('You must have permission to work on the project\nWork on a project copy ?'), |
691083b5682a
clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1767
diff
changeset
|
394 |
_('Error'), |
691083b5682a
clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1767
diff
changeset
|
395 |
wx.YES_NO | wx.NO_DEFAULT | wx.ICON_QUESTION) |
1080
5ec20f56b1d2
Fixed bug list of ConfNodes blocks not refreshed when a library was enable or disable
Laurent Bessard
parents:
1072
diff
changeset
|
396 |
answer = dialog.ShowModal() |
5ec20f56b1d2
Fixed bug list of ConfNodes blocks not refreshed when a library was enable or disable
Laurent Bessard
parents:
1072
diff
changeset
|
397 |
dialog.Destroy() |
5ec20f56b1d2
Fixed bug list of ConfNodes blocks not refreshed when a library was enable or disable
Laurent Bessard
parents:
1072
diff
changeset
|
398 |
if answer == wx.ID_YES: |
5ec20f56b1d2
Fixed bug list of ConfNodes blocks not refreshed when a library was enable or disable
Laurent Bessard
parents:
1072
diff
changeset
|
399 |
if self.SaveProjectAs(): |
5ec20f56b1d2
Fixed bug list of ConfNodes blocks not refreshed when a library was enable or disable
Laurent Bessard
parents:
1072
diff
changeset
|
400 |
self.AppFrame.RefreshTitle() |
5ec20f56b1d2
Fixed bug list of ConfNodes blocks not refreshed when a library was enable or disable
Laurent Bessard
parents:
1072
diff
changeset
|
401 |
self.AppFrame.RefreshFileMenu() |
5ec20f56b1d2
Fixed bug list of ConfNodes blocks not refreshed when a library was enable or disable
Laurent Bessard
parents:
1072
diff
changeset
|
402 |
self.AppFrame.RefreshPageTitles() |
5ec20f56b1d2
Fixed bug list of ConfNodes blocks not refreshed when a library was enable or disable
Laurent Bessard
parents:
1072
diff
changeset
|
403 |
return True |
427 | 404 |
return False |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
405 |
|
1061 | 406 |
def _getProjectFilesPath(self, project_path=None): |
407 |
if project_path is not None: |
|
408 |
return os.path.join(project_path, "project_files") |
|
757
3151495ae5bb
Adding support for importing into project some files to be transfered with PLC
laurent
parents:
754
diff
changeset
|
409 |
projectfiles_path = os.path.join(self.GetProjectPath(), "project_files") |
3151495ae5bb
Adding support for importing into project some files to be transfered with PLC
laurent
parents:
754
diff
changeset
|
410 |
if not os.path.exists(projectfiles_path): |
3151495ae5bb
Adding support for importing into project some files to be transfered with PLC
laurent
parents:
754
diff
changeset
|
411 |
os.mkdir(projectfiles_path) |
3151495ae5bb
Adding support for importing into project some files to be transfered with PLC
laurent
parents:
754
diff
changeset
|
412 |
return projectfiles_path |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
413 |
|
839
25ba9d74afb1
Adding support for adding default configuration on opened project without any
Laurent Bessard
parents:
815
diff
changeset
|
414 |
def AddProjectDefaultConfiguration(self, config_name="config", res_name="resource1"): |
25ba9d74afb1
Adding support for adding default configuration on opened project without any
Laurent Bessard
parents:
815
diff
changeset
|
415 |
self.ProjectAddConfiguration(config_name) |
25ba9d74afb1
Adding support for adding default configuration on opened project without any
Laurent Bessard
parents:
815
diff
changeset
|
416 |
self.ProjectAddConfigurationResource(config_name, res_name) |
25ba9d74afb1
Adding support for adding default configuration on opened project without any
Laurent Bessard
parents:
815
diff
changeset
|
417 |
|
1708
24416137cda7
add dialog "add program", that appears after creating new project
Surkov Sergey <surkovsv93@gmail.com>
parents:
1685
diff
changeset
|
418 |
def SetProjectDefaultConfiguration(self): |
24416137cda7
add dialog "add program", that appears after creating new project
Surkov Sergey <surkovsv93@gmail.com>
parents:
1685
diff
changeset
|
419 |
# Sets default task and instance for new project |
24416137cda7
add dialog "add program", that appears after creating new project
Surkov Sergey <surkovsv93@gmail.com>
parents:
1685
diff
changeset
|
420 |
config = self.Project.getconfiguration(self.GetProjectMainConfigurationName()) |
24416137cda7
add dialog "add program", that appears after creating new project
Surkov Sergey <surkovsv93@gmail.com>
parents:
1685
diff
changeset
|
421 |
resource = config.getresource()[0].getname() |
24416137cda7
add dialog "add program", that appears after creating new project
Surkov Sergey <surkovsv93@gmail.com>
parents:
1685
diff
changeset
|
422 |
config = config.getname() |
24416137cda7
add dialog "add program", that appears after creating new project
Surkov Sergey <surkovsv93@gmail.com>
parents:
1685
diff
changeset
|
423 |
resource_tagname = self.ComputeConfigurationResourceName(config, resource) |
24416137cda7
add dialog "add program", that appears after creating new project
Surkov Sergey <surkovsv93@gmail.com>
parents:
1685
diff
changeset
|
424 |
def_task = [ |
24416137cda7
add dialog "add program", that appears after creating new project
Surkov Sergey <surkovsv93@gmail.com>
parents:
1685
diff
changeset
|
425 |
{'Priority': '0', 'Single': '', 'Interval': 'T#20ms', 'Name': 'task0', 'Triggering': 'Cyclic'}] |
24416137cda7
add dialog "add program", that appears after creating new project
Surkov Sergey <surkovsv93@gmail.com>
parents:
1685
diff
changeset
|
426 |
def_instance = [ |
24416137cda7
add dialog "add program", that appears after creating new project
Surkov Sergey <surkovsv93@gmail.com>
parents:
1685
diff
changeset
|
427 |
{'Task': def_task[0].get('Name'), 'Type': self.GetProjectPouNames()[0], 'Name': 'instance0'}] |
24416137cda7
add dialog "add program", that appears after creating new project
Surkov Sergey <surkovsv93@gmail.com>
parents:
1685
diff
changeset
|
428 |
self.SetEditedResourceInfos(resource_tagname, def_task, def_instance) |
24416137cda7
add dialog "add program", that appears after creating new project
Surkov Sergey <surkovsv93@gmail.com>
parents:
1685
diff
changeset
|
429 |
|
256 | 430 |
def NewProject(self, ProjectPath, BuildPath=None): |
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
431 |
""" |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
432 |
Create a new project in an empty folder |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
433 |
@param ProjectPath: path of the folder where project have to be created |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
434 |
@param PLCParams: properties of the PLCOpen program created |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
435 |
""" |
415
339fa2542481
improved english spelling and grammar and internationalization updated
laurent
parents:
414
diff
changeset
|
436 |
# Verify that chosen folder is empty |
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
437 |
if not os.path.isdir(ProjectPath) or len(os.listdir(ProjectPath)) > 0: |
415
339fa2542481
improved english spelling and grammar and internationalization updated
laurent
parents:
414
diff
changeset
|
438 |
return _("Chosen folder isn't empty. You can't use it for a new project!") |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
439 |
|
41
1608a434fb8c
Adding support for refreshing PLCOpenEditor block list
lbessard
parents:
40
diff
changeset
|
440 |
# Create PLCOpen program |
738 | 441 |
self.CreateNewProject( |
442 |
{"projectName": _("Unnamed"), |
|
443 |
"productName": _("Unnamed"), |
|
801
435e49e80832
Update list of messages to be translated for internationalization and french translations
laurent
parents:
796
diff
changeset
|
444 |
"productVersion": "1", |
738 | 445 |
"companyName": _("Unknown"), |
446 |
"creationDateTime": datetime(*localtime()[:6])}) |
|
839
25ba9d74afb1
Adding support for adding default configuration on opened project without any
Laurent Bessard
parents:
815
diff
changeset
|
447 |
self.AddProjectDefaultConfiguration() |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
448 |
|
13
f1f0edbeb313
More precise design for plugins.... to be continued...
etisserant
parents:
diff
changeset
|
449 |
# Change XSD into class members |
f1f0edbeb313
More precise design for plugins.... to be continued...
etisserant
parents:
diff
changeset
|
450 |
self._AddParamsMembers() |
718 | 451 |
self.Children = {} |
717 | 452 |
# Keep track of the root confnode (i.e. project path) |
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
453 |
self.ProjectPath = ProjectPath |
427 | 454 |
self._setBuildPath(BuildPath) |
717 | 455 |
# get confnodes bloclist (is that usefull at project creation?) |
456 |
self.RefreshConfNodesBlockLists() |
|
114
2e3d8d4480e7
Now .xml files are automatically created when creating a new project no need to save explicitely.
etisserant
parents:
113
diff
changeset
|
457 |
# this will create files base XML files |
2e3d8d4480e7
Now .xml files are automatically created when creating a new project no need to save explicitely.
etisserant
parents:
113
diff
changeset
|
458 |
self.SaveProject() |
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
459 |
return None |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
460 |
|
256 | 461 |
def LoadProject(self, ProjectPath, BuildPath=None): |
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
462 |
""" |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
463 |
Load a project contained in a folder |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
464 |
@param ProjectPath: path of the project folder |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
465 |
""" |
190 | 466 |
if os.path.basename(ProjectPath) == "": |
467 |
ProjectPath = os.path.dirname(ProjectPath) |
|
978 | 468 |
# Verify that project contains a PLCOpen program |
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
469 |
plc_file = os.path.join(ProjectPath, "plc.xml") |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
470 |
if not os.path.isfile(plc_file): |
1602
95ecb26fdc4e
fix bug with recent projects menu, remove path to the project from menu, if project directory doesn't exist
Sergey Surkov <surkovsv93@gmail.com>
parents:
1587
diff
changeset
|
471 |
return _("Chosen folder doesn't contain a program. It's not a valid project!"), True |
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
472 |
# Load PLCOpen file |
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
|
473 |
error = self.OpenXMLFile(plc_file) |
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
|
474 |
if error is not 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:
1315
diff
changeset
|
475 |
if self.Project is not None: |
1581
2295fdc5c271
fix translation strings with multiple parameters
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1579
diff
changeset
|
476 |
(fname_err, lnum, src) = (("PLC",) + error) |
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1742
diff
changeset
|
477 |
self.logger.write_warning(XSDSchemaErrorMessage.format(a1=fname_err, a2=lnum, a3=src)) |
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
|
478 |
else: |
1602
95ecb26fdc4e
fix bug with recent projects menu, remove path to the project from menu, if project directory doesn't exist
Sergey Surkov <surkovsv93@gmail.com>
parents:
1587
diff
changeset
|
479 |
return error, False |
839
25ba9d74afb1
Adding support for adding default configuration on opened project without any
Laurent Bessard
parents:
815
diff
changeset
|
480 |
if len(self.GetProjectConfigNames()) == 0: |
25ba9d74afb1
Adding support for adding default configuration on opened project without any
Laurent Bessard
parents:
815
diff
changeset
|
481 |
self.AddProjectDefaultConfiguration() |
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
482 |
# Change XSD into class members |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
483 |
self._AddParamsMembers() |
718 | 484 |
self.Children = {} |
717 | 485 |
# Keep track of the root confnode (i.e. project path) |
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
486 |
self.ProjectPath = ProjectPath |
427 | 487 |
self._setBuildPath(BuildPath) |
13
f1f0edbeb313
More precise design for plugins.... to be continued...
etisserant
parents:
diff
changeset
|
488 |
# If dir have already be made, and file exist |
718 | 489 |
if os.path.isdir(self.CTNPath()) and os.path.isfile(self.ConfNodeXmlFilePath()): |
1733
dea107dce0c4
clean-up: fix some PEP8 E265 block comment should start with '# '
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1732
diff
changeset
|
490 |
# Load the confnode.xml file into parameters members |
203 | 491 |
result = self.LoadXMLParams() |
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
492 |
if result: |
1602
95ecb26fdc4e
fix bug with recent projects menu, remove path to the project from menu, if project directory doesn't exist
Sergey Surkov <surkovsv93@gmail.com>
parents:
1587
diff
changeset
|
493 |
return result, False |
1733
dea107dce0c4
clean-up: fix some PEP8 E265 block comment should start with '# '
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1732
diff
changeset
|
494 |
# Load and init all the children |
718 | 495 |
self.LoadChildren() |
717 | 496 |
self.RefreshConfNodesBlockLists() |
1555
dac6002ff58e
fix issue with non-updated button 'generated IECCode' after Build and Clean
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1551
diff
changeset
|
497 |
self.UpdateButtons() |
1602
95ecb26fdc4e
fix bug with recent projects menu, remove path to the project from menu, if project directory doesn't exist
Sergey Surkov <surkovsv93@gmail.com>
parents:
1587
diff
changeset
|
498 |
return None, False |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
499 |
|
738 | 500 |
def RecursiveConfNodeInfos(self, confnode): |
501 |
values = [] |
|
502 |
for CTNChild in confnode.IECSortedChildren(): |
|
503 |
values.append( |
|
504 |
{"name": "%s: %s" % (CTNChild.GetFullIEC_Channel(), |
|
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
505 |
CTNChild.CTNName()), |
1105
f0e5b475a074
Fixed bug when modifying ConfTreeNode IEC Channel
Laurent Bessard
parents:
1089
diff
changeset
|
506 |
"tagname": CTNChild.CTNFullName(), |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
507 |
"type": ITEM_CONFNODE, |
738 | 508 |
"confnode": CTNChild, |
781
cdc6393705ce
Adding support using plcopeneditor bitmap library for icon request
laurent
parents:
774
diff
changeset
|
509 |
"icon": CTNChild.GetIconName(), |
738 | 510 |
"values": self.RecursiveConfNodeInfos(CTNChild)}) |
511 |
return values |
|
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
512 |
|
738 | 513 |
def GetProjectInfos(self): |
514 |
infos = PLCControler.GetProjectInfos(self) |
|
515 |
configurations = infos["values"].pop(-1) |
|
516 |
resources = None |
|
517 |
for config_infos in configurations["values"]: |
|
518 |
if resources is None: |
|
519 |
resources = config_infos["values"][0] |
|
520 |
else: |
|
521 |
resources["values"].extend(config_infos["values"][0]["values"]) |
|
522 |
if resources is not None: |
|
523 |
infos["values"].append(resources) |
|
524 |
infos["values"].extend(self.RecursiveConfNodeInfos(self)) |
|
525 |
return infos |
|
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
526 |
|
403 | 527 |
def CloseProject(self): |
718 | 528 |
self.ClearChildren() |
417
a895ae50b737
Adding support for declaring PluginRoot outside of Beremiz
laurent
parents:
415
diff
changeset
|
529 |
self.ResetAppFrame(None) |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
530 |
|
1606
99a02c6161b6
add check of new project path in Save As
Sergey Surkov <surkovsv93@gmail.com>
parents:
1602
diff
changeset
|
531 |
def CheckNewProjectPath(self, old_project_path, new_project_path): |
99a02c6161b6
add check of new project path in Save As
Sergey Surkov <surkovsv93@gmail.com>
parents:
1602
diff
changeset
|
532 |
if old_project_path == new_project_path: |
99a02c6161b6
add check of new project path in Save As
Sergey Surkov <surkovsv93@gmail.com>
parents:
1602
diff
changeset
|
533 |
message = (_("Save path is the same as path of a project! \n")) |
99a02c6161b6
add check of new project path in Save As
Sergey Surkov <surkovsv93@gmail.com>
parents:
1602
diff
changeset
|
534 |
dialog = wx.MessageDialog(self.AppFrame, message, _("Error"), wx.OK | wx.ICON_ERROR) |
99a02c6161b6
add check of new project path in Save As
Sergey Surkov <surkovsv93@gmail.com>
parents:
1602
diff
changeset
|
535 |
dialog.ShowModal() |
99a02c6161b6
add check of new project path in Save As
Sergey Surkov <surkovsv93@gmail.com>
parents:
1602
diff
changeset
|
536 |
return False |
99a02c6161b6
add check of new project path in Save As
Sergey Surkov <surkovsv93@gmail.com>
parents:
1602
diff
changeset
|
537 |
else: |
99a02c6161b6
add check of new project path in Save As
Sergey Surkov <surkovsv93@gmail.com>
parents:
1602
diff
changeset
|
538 |
plc_file = os.path.join(new_project_path, "plc.xml") |
99a02c6161b6
add check of new project path in Save As
Sergey Surkov <surkovsv93@gmail.com>
parents:
1602
diff
changeset
|
539 |
if os.path.isfile(plc_file): |
99a02c6161b6
add check of new project path in Save As
Sergey Surkov <surkovsv93@gmail.com>
parents:
1602
diff
changeset
|
540 |
message = (_("Selected directory already contains another project. Overwrite? \n")) |
99a02c6161b6
add check of new project path in Save As
Sergey Surkov <surkovsv93@gmail.com>
parents:
1602
diff
changeset
|
541 |
dialog = wx.MessageDialog(self.AppFrame, message, _("Error"), wx.YES_NO | wx.ICON_ERROR) |
99a02c6161b6
add check of new project path in Save As
Sergey Surkov <surkovsv93@gmail.com>
parents:
1602
diff
changeset
|
542 |
answer = dialog.ShowModal() |
99a02c6161b6
add check of new project path in Save As
Sergey Surkov <surkovsv93@gmail.com>
parents:
1602
diff
changeset
|
543 |
return answer == wx.ID_YES |
99a02c6161b6
add check of new project path in Save As
Sergey Surkov <surkovsv93@gmail.com>
parents:
1602
diff
changeset
|
544 |
return True |
99a02c6161b6
add check of new project path in Save As
Sergey Surkov <surkovsv93@gmail.com>
parents:
1602
diff
changeset
|
545 |
|
1061 | 546 |
def SaveProject(self, from_project_path=None): |
427 | 547 |
if self.CheckProjectPathPerm(False): |
1061 | 548 |
if from_project_path is not None: |
549 |
old_projectfiles_path = self._getProjectFilesPath(from_project_path) |
|
550 |
if os.path.isdir(old_projectfiles_path): |
|
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
551 |
shutil.copytree(old_projectfiles_path, |
1061 | 552 |
self._getProjectFilesPath(self.ProjectPath)) |
41
1608a434fb8c
Adding support for refreshing PLCOpenEditor block list
lbessard
parents:
40
diff
changeset
|
553 |
self.SaveXMLFile(os.path.join(self.ProjectPath, 'plc.xml')) |
1061 | 554 |
result = self.CTNRequestSave(from_project_path) |
427 | 555 |
if result: |
556 |
self.logger.write_error(result) |
|
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
557 |
|
1061 | 558 |
def SaveProjectAs(self): |
427 | 559 |
# Ask user to choose a path with write permissions |
529 | 560 |
if wx.Platform == '__WXMSW__': |
561 |
path = os.getenv("USERPROFILE") |
|
562 |
else: |
|
563 |
path = os.getenv("HOME") |
|
1739
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
564 |
dirdialog = wx.DirDialog(self.AppFrame, _("Choose a directory to save project"), path, wx.DD_NEW_DIR_BUTTON) |
427 | 565 |
answer = dirdialog.ShowModal() |
566 |
dirdialog.Destroy() |
|
567 |
if answer == wx.ID_OK: |
|
568 |
newprojectpath = dirdialog.GetPath() |
|
569 |
if os.path.isdir(newprojectpath): |
|
1606
99a02c6161b6
add check of new project path in Save As
Sergey Surkov <surkovsv93@gmail.com>
parents:
1602
diff
changeset
|
570 |
if self.CheckNewProjectPath(self.ProjectPath, newprojectpath): |
99a02c6161b6
add check of new project path in Save As
Sergey Surkov <surkovsv93@gmail.com>
parents:
1602
diff
changeset
|
571 |
self.ProjectPath, old_project_path = newprojectpath, self.ProjectPath |
99a02c6161b6
add check of new project path in Save As
Sergey Surkov <surkovsv93@gmail.com>
parents:
1602
diff
changeset
|
572 |
self.SaveProject(old_project_path) |
99a02c6161b6
add check of new project path in Save As
Sergey Surkov <surkovsv93@gmail.com>
parents:
1602
diff
changeset
|
573 |
self._setBuildPath(self.BuildPath) |
427 | 574 |
return True |
575 |
return False |
|
728
e0424e96e3fd
refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents:
726
diff
changeset
|
576 |
|
e0424e96e3fd
refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents:
726
diff
changeset
|
577 |
def GetLibrariesTypes(self): |
e0424e96e3fd
refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents:
726
diff
changeset
|
578 |
self.LoadLibraries() |
1746
45d6f5fba016
clean-up: fix PEP8 E202 whitespace before ')'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1745
diff
changeset
|
579 |
return [lib.GetTypes() for lib in self.Libraries] |
728
e0424e96e3fd
refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents:
726
diff
changeset
|
580 |
|
e0424e96e3fd
refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents:
726
diff
changeset
|
581 |
def GetLibrariesSTCode(self): |
1746
45d6f5fba016
clean-up: fix PEP8 E202 whitespace before ')'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1745
diff
changeset
|
582 |
return "\n".join([lib.GetSTCode() for lib in self.Libraries]) |
728
e0424e96e3fd
refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents:
726
diff
changeset
|
583 |
|
e0424e96e3fd
refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents:
726
diff
changeset
|
584 |
def GetLibrariesCCode(self, buildpath): |
1742
92932cd370a4
clean-up: fix PEP8 E225 missing whitespace around operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1741
diff
changeset
|
585 |
if len(self.Libraries) == 0: |
1740
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
586 |
return [], [], () |
728
e0424e96e3fd
refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents:
726
diff
changeset
|
587 |
self.GetIECProgramsAndVariables() |
1734
750eeb7230a1
clean-up: fix some PEP8 E228 missing whitespace around modulo operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1733
diff
changeset
|
588 |
LibIECCflags = '"-I%s" -Wno-unused-function' % os.path.abspath(self.GetIECLibPath()) |
1742
92932cd370a4
clean-up: fix PEP8 E225 missing whitespace around operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1741
diff
changeset
|
589 |
LocatedCCodeAndFlags = [] |
92932cd370a4
clean-up: fix PEP8 E225 missing whitespace around operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1741
diff
changeset
|
590 |
Extras = [] |
728
e0424e96e3fd
refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents:
726
diff
changeset
|
591 |
for lib in self.Libraries: |
1742
92932cd370a4
clean-up: fix PEP8 E225 missing whitespace around operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1741
diff
changeset
|
592 |
res = lib.Generate_C(buildpath, self._VariablesList, LibIECCflags) |
728
e0424e96e3fd
refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents:
726
diff
changeset
|
593 |
LocatedCCodeAndFlags.append(res[:2]) |
1742
92932cd370a4
clean-up: fix PEP8 E225 missing whitespace around operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1741
diff
changeset
|
594 |
if len(res) > 2: |
869
abf90a44c265
Fix bug when more than one block library add extra python file
Laurent Bessard
parents:
842
diff
changeset
|
595 |
Extras.extend(res[2:]) |
1740
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
596 |
return map(list, zip(*LocatedCCodeAndFlags))+[tuple(Extras)] |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
597 |
|
717 | 598 |
# Update PLCOpenEditor ConfNode Block types from loaded confnodes |
599 |
def RefreshConfNodesBlockLists(self): |
|
718 | 600 |
if getattr(self, "Children", None) is not None: |
717 | 601 |
self.ClearConfNodeTypes() |
728
e0424e96e3fd
refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents:
726
diff
changeset
|
602 |
self.AddConfNodeTypesList(self.GetLibrariesTypes()) |
395 | 603 |
if self.AppFrame is not None: |
716
180e4a7d945c
Adding search field for finding function or function block in library tree
laurent
parents:
715
diff
changeset
|
604 |
self.AppFrame.RefreshLibraryPanel() |
395 | 605 |
self.AppFrame.RefreshEditor() |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
606 |
|
443
34c9788bd933
Adding support for updating located variables when changing plugin IEC_Channel
laurent
parents:
440
diff
changeset
|
607 |
# Update a PLCOpenEditor Pou variable location |
34c9788bd933
Adding support for updating located variables when changing plugin IEC_Channel
laurent
parents:
440
diff
changeset
|
608 |
def UpdateProjectVariableLocation(self, old_leading, new_leading): |
34c9788bd933
Adding support for updating located variables when changing plugin IEC_Channel
laurent
parents:
440
diff
changeset
|
609 |
self.Project.updateElementAddress(old_leading, new_leading) |
34c9788bd933
Adding support for updating located variables when changing plugin IEC_Channel
laurent
parents:
440
diff
changeset
|
610 |
self.BufferProject() |
34c9788bd933
Adding support for updating located variables when changing plugin IEC_Channel
laurent
parents:
440
diff
changeset
|
611 |
if self.AppFrame is not None: |
468 | 612 |
self.AppFrame.RefreshTitle() |
730 | 613 |
self.AppFrame.RefreshPouInstanceVariablesPanel() |
468 | 614 |
self.AppFrame.RefreshFileMenu() |
615 |
self.AppFrame.RefreshEditMenu() |
|
842 | 616 |
wx.CallAfter(self.AppFrame.RefreshEditor) |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
617 |
|
401
8106a853a7c7
Adding support for displaying plugins available variable into Beremiz plugin tree
laurent
parents:
396
diff
changeset
|
618 |
def GetVariableLocationTree(self): |
411
8261c8f1e365
Bug on Debug trying to start (and stop) before PLC started fixed.
laurent
parents:
403
diff
changeset
|
619 |
''' |
717 | 620 |
This function is meant to be overridden by confnodes. |
411
8261c8f1e365
Bug on Debug trying to start (and stop) before PLC started fixed.
laurent
parents:
403
diff
changeset
|
621 |
|
8261c8f1e365
Bug on Debug trying to start (and stop) before PLC started fixed.
laurent
parents:
403
diff
changeset
|
622 |
It should returns an list of dictionaries |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
623 |
|
411
8261c8f1e365
Bug on Debug trying to start (and stop) before PLC started fixed.
laurent
parents:
403
diff
changeset
|
624 |
- IEC_type is an IEC type like BOOL/BYTE/SINT/... |
8261c8f1e365
Bug on Debug trying to start (and stop) before PLC started fixed.
laurent
parents:
403
diff
changeset
|
625 |
- location is a string of this variable's location, like "%IX0.0.0" |
8261c8f1e365
Bug on Debug trying to start (and stop) before PLC started fixed.
laurent
parents:
403
diff
changeset
|
626 |
''' |
8261c8f1e365
Bug on Debug trying to start (and stop) before PLC started fixed.
laurent
parents:
403
diff
changeset
|
627 |
children = [] |
718 | 628 |
for child in self.IECSortedChildren(): |
411
8261c8f1e365
Bug on Debug trying to start (and stop) before PLC started fixed.
laurent
parents:
403
diff
changeset
|
629 |
children.append(child.GetVariableLocationTree()) |
8261c8f1e365
Bug on Debug trying to start (and stop) before PLC started fixed.
laurent
parents:
403
diff
changeset
|
630 |
return children |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
631 |
|
717 | 632 |
def ConfNodePath(self): |
1680
6db967480b7d
make run Beremiz and PLCOpen Editor, if full path contain non-lating
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1672
diff
changeset
|
633 |
return paths.AbsDir(__file__) |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
634 |
|
718 | 635 |
def CTNPath(self, CTNName=None): |
13
f1f0edbeb313
More precise design for plugins.... to be continued...
etisserant
parents:
diff
changeset
|
636 |
return self.ProjectPath |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
637 |
|
718 | 638 |
def ConfNodeXmlFilePath(self, CTNName=None): |
639 |
return os.path.join(self.CTNPath(CTNName), "beremiz.xml") |
|
18 | 640 |
|
669
472469f4d5ad
Adding support for loading datatypes defined in plugins to allow to use them in PLC program
laurent
parents:
661
diff
changeset
|
641 |
def ParentsTypesFactory(self): |
717 | 642 |
return self.ConfNodeTypesFactory() |
363
e0c4d3549369
Adding support for recursively generate STLibrary and BlockLibrary according to plugin tree
laurent
parents:
361
diff
changeset
|
643 |
|
427 | 644 |
def _setBuildPath(self, buildpath): |
645 |
self.BuildPath = buildpath |
|
646 |
self.DefaultBuildPath = None |
|
647 |
if self._builder is not None: |
|
648 |
self._builder.SetBuildPath(self._getBuildPath()) |
|
649 |
||
20 | 650 |
def _getBuildPath(self): |
427 | 651 |
# BuildPath is defined by user |
652 |
if self.BuildPath is not None: |
|
653 |
return self.BuildPath |
|
654 |
# BuildPath isn't defined by user but already created by default |
|
655 |
if self.DefaultBuildPath is not None: |
|
656 |
return self.DefaultBuildPath |
|
657 |
# Create a build path in project folder if user has permissions |
|
658 |
if CheckPathPerm(self.ProjectPath): |
|
659 |
self.DefaultBuildPath = os.path.join(self.ProjectPath, "build") |
|
660 |
# Create a build path in temp folder |
|
661 |
else: |
|
662 |
self.DefaultBuildPath = os.path.join(tempfile.mkdtemp(), os.path.basename(self.ProjectPath), "build") |
|
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
663 |
|
427 | 664 |
if not os.path.exists(self.DefaultBuildPath): |
665 |
os.makedirs(self.DefaultBuildPath) |
|
666 |
return self.DefaultBuildPath |
|
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
667 |
|
203 | 668 |
def _getExtraFilesPath(self): |
669 |
return os.path.join(self._getBuildPath(), "extra_files") |
|
670 |
||
20 | 671 |
def _getIECcodepath(self): |
672 |
# define name for IEC code file |
|
673 |
return os.path.join(self._getBuildPath(), "plc.st") |
|
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
674 |
|
65 | 675 |
def _getIECgeneratedcodepath(self): |
676 |
# define name for IEC generated code file |
|
677 |
return os.path.join(self._getBuildPath(), "generated_plc.st") |
|
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
678 |
|
65 | 679 |
def _getIECrawcodepath(self): |
680 |
# define name for IEC raw code file |
|
718 | 681 |
return os.path.join(self.CTNPath(), "raw_plc.st") |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
682 |
|
97 | 683 |
def GetLocations(self): |
684 |
locations = [] |
|
1740
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
685 |
filepath = os.path.join(self._getBuildPath(), "LOCATED_VARIABLES.h") |
97 | 686 |
if os.path.isfile(filepath): |
687 |
# IEC2C compiler generate a list of located variables : LOCATED_VARIABLES.h |
|
1740
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
688 |
location_file = open(os.path.join(self._getBuildPath(), "LOCATED_VARIABLES.h")) |
97 | 689 |
# each line of LOCATED_VARIABLES.h declares a located variable |
690 |
lines = [line.strip() for line in location_file.readlines()] |
|
691 |
# This regular expression parses the lines genereated by IEC2C |
|
348
054fbf1ae0f8
Bug while parsing long located variables in GetLocations fixed
lbessard
parents:
338
diff
changeset
|
692 |
LOCATED_MODEL = re.compile("__LOCATED_VAR\((?P<IEC_TYPE>[A-Z]*),(?P<NAME>[_A-Za-z0-9]*),(?P<DIR>[QMI])(?:,(?P<SIZE>[XBWDL]))?,(?P<LOC>[,0-9]*)\)") |
97 | 693 |
for line in lines: |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
694 |
# If line match RE, |
97 | 695 |
result = LOCATED_MODEL.match(line) |
696 |
if result: |
|
697 |
# Get the resulting dict |
|
698 |
resdict = result.groupdict() |
|
699 |
# rewrite string for variadic location as a tuple of integers |
|
1740
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
700 |
resdict['LOC'] = tuple(map(int, resdict['LOC'].split(','))) |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
701 |
# set located size to 'X' if not given |
97 | 702 |
if not resdict['SIZE']: |
703 |
resdict['SIZE'] = 'X' |
|
704 |
# finally store into located variable list |
|
705 |
locations.append(resdict) |
|
706 |
return locations |
|
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
707 |
|
883
235a9ec83b95
Adding support for defining specific global variables for ConfTreeNodes
Laurent Bessard
parents:
869
diff
changeset
|
708 |
def GetConfNodeGlobalInstances(self): |
235a9ec83b95
Adding support for defining specific global variables for ConfTreeNodes
Laurent Bessard
parents:
869
diff
changeset
|
709 |
return self._GlobalInstances() |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
710 |
|
203 | 711 |
def _Generate_SoftPLC(self): |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
712 |
if self._Generate_PLC_ST(): |
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
713 |
return self._Compile_ST_to_SoftPLC() |
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
714 |
return False |
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
715 |
|
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
716 |
def _Generate_PLC_ST(self): |
20 | 717 |
""" |
64 | 718 |
Generate SoftPLC ST/IL/SFC code out of PLCOpenEditor controller, and compile it with IEC2C |
20 | 719 |
@param buildpath: path where files should be created |
720 |
""" |
|
721 |
||
717 | 722 |
# Update PLCOpenEditor ConfNode Block types before generate ST code |
723 |
self.RefreshConfNodesBlockLists() |
|
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
724 |
|
361 | 725 |
self.logger.write(_("Generating SoftPLC IEC-61131 ST/IL/SFC code...\n")) |
20 | 726 |
# ask PLCOpenEditor controller to write ST/IL/SFC code file |
1847
6198190bc121
explicitly mark unused variables found by pylint with _ or dummy
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1846
diff
changeset
|
727 |
_program, errors, warnings = self.GenerateProgram(self._getIECgeneratedcodepath()) |
309
6eb074f0dae9
Adding support for cancelling code generation of function with no input connected
lbessard
parents:
304
diff
changeset
|
728 |
if len(warnings) > 0: |
361 | 729 |
self.logger.write_warning(_("Warnings in ST/IL/SFC code generator :\n")) |
309
6eb074f0dae9
Adding support for cancelling code generation of function with no input connected
lbessard
parents:
304
diff
changeset
|
730 |
for warning in warnings: |
1734
750eeb7230a1
clean-up: fix some PEP8 E228 missing whitespace around modulo operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1733
diff
changeset
|
731 |
self.logger.write_warning("%s\n" % warning) |
309
6eb074f0dae9
Adding support for cancelling code generation of function with no input connected
lbessard
parents:
304
diff
changeset
|
732 |
if len(errors) > 0: |
20 | 733 |
# Failed ! |
1734
750eeb7230a1
clean-up: fix some PEP8 E228 missing whitespace around modulo operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1733
diff
changeset
|
734 |
self.logger.write_error(_("Error in ST/IL/SFC code generator :\n%s\n") % errors[0]) |
20 | 735 |
return False |
65 | 736 |
plc_file = open(self._getIECcodepath(), "w") |
717 | 737 |
# Add ST Library from confnodes |
728
e0424e96e3fd
refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents:
726
diff
changeset
|
738 |
plc_file.write(self.GetLibrariesSTCode()) |
65 | 739 |
if os.path.isfile(self._getIECrawcodepath()): |
740 |
plc_file.write(open(self._getIECrawcodepath(), "r").read()) |
|
741 |
plc_file.write("\n") |
|
356
e9698d0ee5f3
Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents:
355
diff
changeset
|
742 |
plc_file.close() |
e9698d0ee5f3
Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents:
355
diff
changeset
|
743 |
plc_file = open(self._getIECcodepath(), "r") |
e9698d0ee5f3
Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents:
355
diff
changeset
|
744 |
self.ProgramOffset = 0 |
1847
6198190bc121
explicitly mark unused variables found by pylint with _ or dummy
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1846
diff
changeset
|
745 |
for dummy in plc_file.xreadlines(): |
356
e9698d0ee5f3
Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents:
355
diff
changeset
|
746 |
self.ProgramOffset += 1 |
e9698d0ee5f3
Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents:
355
diff
changeset
|
747 |
plc_file.close() |
e9698d0ee5f3
Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents:
355
diff
changeset
|
748 |
plc_file = open(self._getIECcodepath(), "a") |
65 | 749 |
plc_file.write(open(self._getIECgeneratedcodepath(), "r").read()) |
750 |
plc_file.close() |
|
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
751 |
return True |
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
752 |
|
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
753 |
def _Compile_ST_to_SoftPLC(self): |
1789
492e2cd6157e
fix problem when Beremiz is running without matiec installed
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1782
diff
changeset
|
754 |
iec2c_libpath = self.iec2c_cfg.getLibPath() |
492e2cd6157e
fix problem when Beremiz is running without matiec installed
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1782
diff
changeset
|
755 |
if iec2c_libpath is None: |
492e2cd6157e
fix problem when Beremiz is running without matiec installed
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1782
diff
changeset
|
756 |
self.logger.write_error(_("matiec installation is not found\n")) |
492e2cd6157e
fix problem when Beremiz is running without matiec installed
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1782
diff
changeset
|
757 |
return False |
492e2cd6157e
fix problem when Beremiz is running without matiec installed
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1782
diff
changeset
|
758 |
|
415
339fa2542481
improved english spelling and grammar and internationalization updated
laurent
parents:
414
diff
changeset
|
759 |
self.logger.write(_("Compiling IEC Program into C code...\n")) |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
760 |
buildpath = self._getBuildPath() |
1734
750eeb7230a1
clean-up: fix some PEP8 E228 missing whitespace around modulo operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1733
diff
changeset
|
761 |
buildcmd = "\"%s\" %s -I \"%s\" -T \"%s\" \"%s\"" % ( |
1878
fb73a6b6622d
fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1861
diff
changeset
|
762 |
self.iec2c_cfg.getCmd(), |
fb73a6b6622d
fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1861
diff
changeset
|
763 |
self.iec2c_cfg.getOptions(), |
fb73a6b6622d
fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1861
diff
changeset
|
764 |
iec2c_libpath, |
fb73a6b6622d
fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1861
diff
changeset
|
765 |
buildpath, |
fb73a6b6622d
fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1861
diff
changeset
|
766 |
self._getIECcodepath()) |
1451
94e620cbd9de
Added Ronan Bignaux (genesis) patch to use wxversion. Fixed side effects with sys.path. Other cosmetic fixes about path included.
Edouard Tisserant
parents:
1448
diff
changeset
|
767 |
|
94e620cbd9de
Added Ronan Bignaux (genesis) patch to use wxversion. Fixed side effects with sys.path. Other cosmetic fixes about path included.
Edouard Tisserant
parents:
1448
diff
changeset
|
768 |
try: |
94e620cbd9de
Added Ronan Bignaux (genesis) patch to use wxversion. Fixed side effects with sys.path. Other cosmetic fixes about path included.
Edouard Tisserant
parents:
1448
diff
changeset
|
769 |
# Invoke compiler. Output files are listed to stdout, errors to stderr |
94e620cbd9de
Added Ronan Bignaux (genesis) patch to use wxversion. Fixed side effects with sys.path. Other cosmetic fixes about path included.
Edouard Tisserant
parents:
1448
diff
changeset
|
770 |
status, result, err_result = ProcessLogger(self.logger, buildcmd, |
1768
691083b5682a
clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1767
diff
changeset
|
771 |
no_stdout=True, no_stderr=True).spin() |
1740
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
772 |
except Exception, e: |
1451
94e620cbd9de
Added Ronan Bignaux (genesis) patch to use wxversion. Fixed side effects with sys.path. Other cosmetic fixes about path included.
Edouard Tisserant
parents:
1448
diff
changeset
|
773 |
self.logger.write_error(buildcmd + "\n") |
94e620cbd9de
Added Ronan Bignaux (genesis) patch to use wxversion. Fixed side effects with sys.path. Other cosmetic fixes about path included.
Edouard Tisserant
parents:
1448
diff
changeset
|
774 |
self.logger.write_error(repr(e) + "\n") |
94e620cbd9de
Added Ronan Bignaux (genesis) patch to use wxversion. Fixed side effects with sys.path. Other cosmetic fixes about path included.
Edouard Tisserant
parents:
1448
diff
changeset
|
775 |
return False |
94e620cbd9de
Added Ronan Bignaux (genesis) patch to use wxversion. Fixed side effects with sys.path. Other cosmetic fixes about path included.
Edouard Tisserant
parents:
1448
diff
changeset
|
776 |
|
20 | 777 |
if status: |
778 |
# Failed ! |
|
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
779 |
|
356
e9698d0ee5f3
Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents:
355
diff
changeset
|
780 |
# parse iec2c's error message. if it contains a line number, |
e9698d0ee5f3
Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents:
355
diff
changeset
|
781 |
# then print those lines from the generated IEC file. |
e9698d0ee5f3
Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents:
355
diff
changeset
|
782 |
for err_line in err_result.split('\n'): |
e9698d0ee5f3
Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents:
355
diff
changeset
|
783 |
self.logger.write_warning(err_line + "\n") |
e9698d0ee5f3
Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents:
355
diff
changeset
|
784 |
|
e9698d0ee5f3
Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents:
355
diff
changeset
|
785 |
m_result = MATIEC_ERROR_MODEL.match(err_line) |
e9698d0ee5f3
Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents:
355
diff
changeset
|
786 |
if m_result 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
|
787 |
first_line, _first_column, last_line, _last_column, _error = m_result.groups() |
356
e9698d0ee5f3
Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents:
355
diff
changeset
|
788 |
first_line, last_line = int(first_line), int(last_line) |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
789 |
|
356
e9698d0ee5f3
Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents:
355
diff
changeset
|
790 |
last_section = None |
e9698d0ee5f3
Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents:
355
diff
changeset
|
791 |
f = open(self._getIECcodepath()) |
e9698d0ee5f3
Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents:
355
diff
changeset
|
792 |
|
e9698d0ee5f3
Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents:
355
diff
changeset
|
793 |
for i, line in enumerate(f.readlines()): |
661
5d3da49e8029
Fixing bug in displaying lines of code at the origin of matiec errors
laurent
parents:
656
diff
changeset
|
794 |
i = i + 1 |
356
e9698d0ee5f3
Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents:
355
diff
changeset
|
795 |
if line[0] not in '\t \r\n': |
e9698d0ee5f3
Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents:
355
diff
changeset
|
796 |
last_section = line |
e9698d0ee5f3
Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents:
355
diff
changeset
|
797 |
|
e9698d0ee5f3
Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents:
355
diff
changeset
|
798 |
if first_line <= i <= last_line: |
e9698d0ee5f3
Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents:
355
diff
changeset
|
799 |
if last_section is not None: |
e9698d0ee5f3
Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents:
355
diff
changeset
|
800 |
self.logger.write_warning("In section: " + last_section) |
1737
a39c2918c015
clean-up: fix PEP8 E261 at least two spaces before inline comment
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1736
diff
changeset
|
801 |
last_section = None # only write section once |
356
e9698d0ee5f3
Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents:
355
diff
changeset
|
802 |
self.logger.write_warning("%04d: %s" % (i, line)) |
e9698d0ee5f3
Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents:
355
diff
changeset
|
803 |
|
e9698d0ee5f3
Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents:
355
diff
changeset
|
804 |
f.close() |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
805 |
|
1734
750eeb7230a1
clean-up: fix some PEP8 E228 missing whitespace around modulo operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1733
diff
changeset
|
806 |
self.logger.write_error(_("Error : IEC to C compiler returned %d\n") % status) |
20 | 807 |
return False |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
808 |
|
20 | 809 |
# Now extract C files of stdout |
1746
45d6f5fba016
clean-up: fix PEP8 E202 whitespace before ')'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1745
diff
changeset
|
810 |
C_files = [fname for fname in result.splitlines() if fname[-2:] == ".c" or fname[-2:] == ".C"] |
20 | 811 |
# remove those that are not to be compiled because included by others |
812 |
C_files.remove("POUS.c") |
|
115 | 813 |
if not C_files: |
415
339fa2542481
improved english spelling and grammar and internationalization updated
laurent
parents:
414
diff
changeset
|
814 |
self.logger.write_error(_("Error : At least one configuration and one resource must be declared in PLC !\n")) |
115 | 815 |
return False |
20 | 816 |
# transform those base names to full names with path |
1740
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
817 |
C_files = map(lambda filename: os.path.join(buildpath, filename), C_files) |
1050
56bef276055e
Made declaration from beremiz.h available to C pragmas in POUs. Added AtomicCompareExchange to beremiz.h
Edouard Tisserant
parents:
1006
diff
changeset
|
818 |
|
56bef276055e
Made declaration from beremiz.h available to C pragmas in POUs. Added AtomicCompareExchange to beremiz.h
Edouard Tisserant
parents:
1006
diff
changeset
|
819 |
# prepend beremiz include to configuration header |
1746
45d6f5fba016
clean-up: fix PEP8 E202 whitespace before ')'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1745
diff
changeset
|
820 |
H_files = [fname for fname in result.splitlines() if fname[-2:] == ".h" or fname[-2:] == ".H"] |
1050
56bef276055e
Made declaration from beremiz.h available to C pragmas in POUs. Added AtomicCompareExchange to beremiz.h
Edouard Tisserant
parents:
1006
diff
changeset
|
821 |
H_files.remove("LOCATED_VARIABLES.h") |
1740
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
822 |
H_files = map(lambda filename: os.path.join(buildpath, filename), H_files) |
1050
56bef276055e
Made declaration from beremiz.h available to C pragmas in POUs. Added AtomicCompareExchange to beremiz.h
Edouard Tisserant
parents:
1006
diff
changeset
|
823 |
for H_file in H_files: |
1756
08e4394ff4fb
clean-up: fix PEP8 E701 multiple statements on one line (colon)
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1754
diff
changeset
|
824 |
with file(H_file, 'r') as original: |
08e4394ff4fb
clean-up: fix PEP8 E701 multiple statements on one line (colon)
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1754
diff
changeset
|
825 |
data = original.read() |
08e4394ff4fb
clean-up: fix PEP8 E701 multiple statements on one line (colon)
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1754
diff
changeset
|
826 |
with file(H_file, 'w') as modified: |
08e4394ff4fb
clean-up: fix PEP8 E701 multiple statements on one line (colon)
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1754
diff
changeset
|
827 |
modified.write('#include "beremiz.h"\n' + data) |
1050
56bef276055e
Made declaration from beremiz.h available to C pragmas in POUs. Added AtomicCompareExchange to beremiz.h
Edouard Tisserant
parents:
1006
diff
changeset
|
828 |
|
361 | 829 |
self.logger.write(_("Extracting Located Variables...\n")) |
97 | 830 |
# Keep track of generated located variables for later use by self._Generate_C |
831 |
self.PLCGeneratedLocatedVars = self.GetLocations() |
|
718 | 832 |
# Keep track of generated C files for later use by self.CTNGenerate_C |
18 | 833 |
self.PLCGeneratedCFiles = C_files |
49
45dc6a944ab6
On the long wat towards generated code comilation...
etisserant
parents:
47
diff
changeset
|
834 |
# compute CFLAGS for plc |
1789
492e2cd6157e
fix problem when Beremiz is running without matiec installed
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1782
diff
changeset
|
835 |
self.plcCFLAGS = '"-I%s" -Wno-unused-function' % self.iec2c_cfg.getLibCPath() |
18 | 836 |
return True |
837 |
||
203 | 838 |
def GetBuilder(self): |
839 |
""" |
|
840 |
Return a Builder (compile C code into machine code) |
|
841 |
""" |
|
842 |
# Get target, module and class name |
|
1315
ff14a66bbd12
Fixed Beremiz for working with new xmlclass support using lxml
Laurent Bessard
parents:
1282
diff
changeset
|
843 |
targetname = self.GetTarget().getcontent().getLocalTag() |
733
915be999f3f0
targets and connectors are nor extensible
Edouard Tisserant
parents:
732
diff
changeset
|
844 |
targetclass = targets.GetBuilder(targetname) |
203 | 845 |
|
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
846 |
# if target already |
1740
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
847 |
if self._builder is None or not isinstance(self._builder, targetclass): |
203 | 848 |
# Get classname instance |
849 |
self._builder = targetclass(self) |
|
850 |
return self._builder |
|
851 |
||
677
607731b33026
Fix 'Transfer" button state according to last build result
laurent
parents:
676
diff
changeset
|
852 |
def ResetBuildMD5(self): |
1742
92932cd370a4
clean-up: fix PEP8 E225 missing whitespace around operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1741
diff
changeset
|
853 |
builder = self.GetBuilder() |
677
607731b33026
Fix 'Transfer" button state according to last build result
laurent
parents:
676
diff
changeset
|
854 |
if builder is not None: |
607731b33026
Fix 'Transfer" button state according to last build result
laurent
parents:
676
diff
changeset
|
855 |
builder.ResetBinaryCodeMD5() |
607731b33026
Fix 'Transfer" button state according to last build result
laurent
parents:
676
diff
changeset
|
856 |
self.EnableMethod("_Transfer", False) |
607731b33026
Fix 'Transfer" button state according to last build result
laurent
parents:
676
diff
changeset
|
857 |
|
203 | 858 |
def GetLastBuildMD5(self): |
1742
92932cd370a4
clean-up: fix PEP8 E225 missing whitespace around operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1741
diff
changeset
|
859 |
builder = self.GetBuilder() |
203 | 860 |
if builder is not None: |
861 |
return builder.GetBinaryCodeMD5() |
|
862 |
else: |
|
863 |
return None |
|
864 |
||
865 |
####################################################################### |
|
866 |
# |
|
867 |
# C CODE GENERATION METHODS |
|
868 |
# |
|
869 |
####################################################################### |
|
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
870 |
|
718 | 871 |
def CTNGenerate_C(self, buildpath, locations): |
203 | 872 |
""" |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
873 |
Return C code generated by iec2c compiler |
203 | 874 |
when _generate_softPLC have been called |
875 |
@param locations: ignored |
|
876 |
@return: [(C_file_name, CFLAGS),...] , LDFLAGS_TO_APPEND |
|
877 |
""" |
|
283
d0e6fc0701fb
Added "runtime.py", a file that is executed in python thread in runtime, before handling python_eval FBs requests. Added small python editor taken from wxPython demo, and appropriate icon and button to launch it.
etisserant
parents:
280
diff
changeset
|
878 |
|
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
879 |
return ([(C_file_name, self.plcCFLAGS) |
1878
fb73a6b6622d
fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1861
diff
changeset
|
880 |
for C_file_name in self.PLCGeneratedCFiles], |
1768
691083b5682a
clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1767
diff
changeset
|
881 |
"", # no ldflags |
691083b5682a
clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1767
diff
changeset
|
882 |
False) # do not expose retreive/publish calls |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
883 |
|
203 | 884 |
def ResetIECProgramsAndVariables(self): |
885 |
""" |
|
886 |
Reset variable and program list that are parsed from |
|
887 |
CSV file generated by IEC2C compiler. |
|
888 |
""" |
|
889 |
self._ProgramList = None |
|
890 |
self._VariablesList = None |
|
1432
8872223a675b
Optimized plc_debug.c generated code. Should produce smaller code size. Added statically initialized array for PLC tracable variable description.
Edouard Tisserant
parents:
1430
diff
changeset
|
891 |
self._DbgVariablesList = None |
532
a822b0b64252
Fixed startin debugger with non empty debug variable list
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents:
529
diff
changeset
|
892 |
self._IECPathToIdx = {} |
670
fb03cb6da95c
Adding support for extracting Common_Ticktime from VARIABLES.csv
laurent
parents:
669
diff
changeset
|
893 |
self._Ticktime = 0 |
235 | 894 |
self.TracedIECPath = [] |
1433
4a45f6642523
Moved trace buffer unpacking in the IDE. Latest traced variable samples are now passed as a single string
Edouard Tisserant
parents:
1432
diff
changeset
|
895 |
self.TracedIECTypes = [] |
235 | 896 |
|
203 | 897 |
def GetIECProgramsAndVariables(self): |
898 |
""" |
|
899 |
Parse CSV-like file VARIABLES.csv resulting from IEC2C compiler. |
|
900 |
Each section is marked with a line staring with '//' |
|
901 |
list of all variables used in various POUs |
|
902 |
""" |
|
903 |
if self._ProgramList is None or self._VariablesList is None: |
|
904 |
try: |
|
1740
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
905 |
csvfile = os.path.join(self._getBuildPath(), "VARIABLES.csv") |
203 | 906 |
# describes CSV columns |
907 |
ProgramsListAttributeName = ["num", "C_path", "type"] |
|
908 |
VariablesListAttributeName = ["num", "vartype", "IEC_path", "C_path", "type"] |
|
909 |
self._ProgramList = [] |
|
910 |
self._VariablesList = [] |
|
1432
8872223a675b
Optimized plc_debug.c generated code. Should produce smaller code size. Added statically initialized array for PLC tracable variable description.
Edouard Tisserant
parents:
1430
diff
changeset
|
911 |
self._DbgVariablesList = [] |
203 | 912 |
self._IECPathToIdx = {} |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
913 |
|
203 | 914 |
# Separate sections |
915 |
ListGroup = [] |
|
1740
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
916 |
for line in open(csvfile, 'r').xreadlines(): |
203 | 917 |
strippedline = line.strip() |
918 |
if strippedline.startswith("//"): |
|
919 |
# Start new section |
|
920 |
ListGroup.append([]) |
|
921 |
elif len(strippedline) > 0 and len(ListGroup) > 0: |
|
922 |
# append to this section |
|
923 |
ListGroup[-1].append(strippedline) |
|
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
924 |
|
203 | 925 |
# first section contains programs |
926 |
for line in ListGroup[0]: |
|
927 |
# Split and Maps each field to dictionnary entries |
|
1740
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
928 |
attrs = dict(zip(ProgramsListAttributeName, line.strip().split(';'))) |
1722
89824afffef2
fix some typos
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1708
diff
changeset
|
929 |
# Truncate "C_path" to remove conf an resources names |
1740
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
930 |
attrs["C_path"] = '__'.join(attrs["C_path"].split(".", 2)[1:]) |
203 | 931 |
# Push this dictionnary into result. |
932 |
self._ProgramList.append(attrs) |
|
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
933 |
|
203 | 934 |
# second section contains all variables |
883
235a9ec83b95
Adding support for defining specific global variables for ConfTreeNodes
Laurent Bessard
parents:
869
diff
changeset
|
935 |
config_FBs = {} |
1432
8872223a675b
Optimized plc_debug.c generated code. Should produce smaller code size. Added statically initialized array for PLC tracable variable description.
Edouard Tisserant
parents:
1430
diff
changeset
|
936 |
Idx = 0 |
203 | 937 |
for line in ListGroup[1]: |
938 |
# Split and Maps each field to dictionnary entries |
|
1740
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
939 |
attrs = dict(zip(VariablesListAttributeName, line.strip().split(';'))) |
1722
89824afffef2
fix some typos
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1708
diff
changeset
|
940 |
# Truncate "C_path" to remove conf an resources names |
1740
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
941 |
parts = attrs["C_path"].split(".", 2) |
639
85dad46ae0f6
Fixing bug that prevent to use global variables in configuration
laurent
parents:
630
diff
changeset
|
942 |
if len(parts) > 2: |
883
235a9ec83b95
Adding support for defining specific global variables for ConfTreeNodes
Laurent Bessard
parents:
869
diff
changeset
|
943 |
config_FB = config_FBs.get(tuple(parts[:2])) |
235a9ec83b95
Adding support for defining specific global variables for ConfTreeNodes
Laurent Bessard
parents:
869
diff
changeset
|
944 |
if config_FB: |
235a9ec83b95
Adding support for defining specific global variables for ConfTreeNodes
Laurent Bessard
parents:
869
diff
changeset
|
945 |
parts = [config_FB] + parts[2:] |
235a9ec83b95
Adding support for defining specific global variables for ConfTreeNodes
Laurent Bessard
parents:
869
diff
changeset
|
946 |
attrs["C_path"] = '.'.join(parts) |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
947 |
else: |
883
235a9ec83b95
Adding support for defining specific global variables for ConfTreeNodes
Laurent Bessard
parents:
869
diff
changeset
|
948 |
attrs["C_path"] = '__'.join(parts[1:]) |
639
85dad46ae0f6
Fixing bug that prevent to use global variables in configuration
laurent
parents:
630
diff
changeset
|
949 |
else: |
85dad46ae0f6
Fixing bug that prevent to use global variables in configuration
laurent
parents:
630
diff
changeset
|
950 |
attrs["C_path"] = '__'.join(parts) |
883
235a9ec83b95
Adding support for defining specific global variables for ConfTreeNodes
Laurent Bessard
parents:
869
diff
changeset
|
951 |
if attrs["vartype"] == "FB": |
235a9ec83b95
Adding support for defining specific global variables for ConfTreeNodes
Laurent Bessard
parents:
869
diff
changeset
|
952 |
config_FBs[tuple(parts)] = attrs["C_path"] |
1517 | 953 |
if attrs["vartype"] != "FB" and attrs["type"] in DebugTypesSize: |
1432
8872223a675b
Optimized plc_debug.c generated code. Should produce smaller code size. Added statically initialized array for PLC tracable variable description.
Edouard Tisserant
parents:
1430
diff
changeset
|
954 |
# Push this dictionnary into result. |
8872223a675b
Optimized plc_debug.c generated code. Should produce smaller code size. Added statically initialized array for PLC tracable variable description.
Edouard Tisserant
parents:
1430
diff
changeset
|
955 |
self._DbgVariablesList.append(attrs) |
8872223a675b
Optimized plc_debug.c generated code. Should produce smaller code size. Added statically initialized array for PLC tracable variable description.
Edouard Tisserant
parents:
1430
diff
changeset
|
956 |
# Fill in IEC<->C translation dicts |
1742
92932cd370a4
clean-up: fix PEP8 E225 missing whitespace around operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1741
diff
changeset
|
957 |
IEC_path = attrs["IEC_path"] |
92932cd370a4
clean-up: fix PEP8 E225 missing whitespace around operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1741
diff
changeset
|
958 |
self._IECPathToIdx[IEC_path] = (Idx, attrs["type"]) |
1432
8872223a675b
Optimized plc_debug.c generated code. Should produce smaller code size. Added statically initialized array for PLC tracable variable description.
Edouard Tisserant
parents:
1430
diff
changeset
|
959 |
# Ignores numbers given in CSV file |
8872223a675b
Optimized plc_debug.c generated code. Should produce smaller code size. Added statically initialized array for PLC tracable variable description.
Edouard Tisserant
parents:
1430
diff
changeset
|
960 |
# Idx=int(attrs["num"]) |
8872223a675b
Optimized plc_debug.c generated code. Should produce smaller code size. Added statically initialized array for PLC tracable variable description.
Edouard Tisserant
parents:
1430
diff
changeset
|
961 |
# Count variables only, ignore FBs |
1742
92932cd370a4
clean-up: fix PEP8 E225 missing whitespace around operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1741
diff
changeset
|
962 |
Idx += 1 |
203 | 963 |
self._VariablesList.append(attrs) |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
964 |
|
670
fb03cb6da95c
Adding support for extracting Common_Ticktime from VARIABLES.csv
laurent
parents:
669
diff
changeset
|
965 |
# third section contains ticktime |
fb03cb6da95c
Adding support for extracting Common_Ticktime from VARIABLES.csv
laurent
parents:
669
diff
changeset
|
966 |
if len(ListGroup) > 2: |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
967 |
self._Ticktime = int(ListGroup[2][0]) |
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
968 |
|
1846
14b40afccd69
remove unused variables found by pylint
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1836
diff
changeset
|
969 |
except Exception: |
361 | 970 |
self.logger.write_error(_("Cannot open/parse VARIABLES.csv!\n")) |
203 | 971 |
self.logger.write_error(traceback.format_exc()) |
972 |
self.ResetIECProgramsAndVariables() |
|
973 |
return False |
|
974 |
||
975 |
return True |
|
976 |
||
977 |
def Generate_plc_debugger(self): |
|
978 |
""" |
|
979 |
Generate trace/debug code out of PLC variable list |
|
980 |
""" |
|
981 |
self.GetIECProgramsAndVariables() |
|
982 |
||
983 |
# prepare debug code |
|
1432
8872223a675b
Optimized plc_debug.c generated code. Should produce smaller code size. Added statically initialized array for PLC tracable variable description.
Edouard Tisserant
parents:
1430
diff
changeset
|
984 |
variable_decl_array = [] |
8872223a675b
Optimized plc_debug.c generated code. Should produce smaller code size. Added statically initialized array for PLC tracable variable description.
Edouard Tisserant
parents:
1430
diff
changeset
|
985 |
bofs = 0 |
1739
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
986 |
for v in self._DbgVariablesList: |
1432
8872223a675b
Optimized plc_debug.c generated code. Should produce smaller code size. Added statically initialized array for PLC tracable variable description.
Edouard Tisserant
parents:
1430
diff
changeset
|
987 |
sz = DebugTypesSize.get(v["type"], 0) |
8872223a675b
Optimized plc_debug.c generated code. Should produce smaller code size. Added statically initialized array for PLC tracable variable description.
Edouard Tisserant
parents:
1430
diff
changeset
|
988 |
variable_decl_array += [ |
1742
92932cd370a4
clean-up: fix PEP8 E225 missing whitespace around operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1741
diff
changeset
|
989 |
"{&(%(C_path)s), " % v + |
1740
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
990 |
{ |
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
991 |
"EXT": "%(type)s_P_ENUM", |
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
992 |
"IN": "%(type)s_P_ENUM", |
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
993 |
"MEM": "%(type)s_O_ENUM", |
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
994 |
"OUT": "%(type)s_O_ENUM", |
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
995 |
"VAR": "%(type)s_ENUM" |
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
996 |
}[v["vartype"]] % v + |
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
997 |
"}"] |
1432
8872223a675b
Optimized plc_debug.c generated code. Should produce smaller code size. Added statically initialized array for PLC tracable variable description.
Edouard Tisserant
parents:
1430
diff
changeset
|
998 |
bofs += sz |
1430 | 999 |
debug_code = targets.GetCode("plc_debug.c") % { |
1777
c46ec818bdd7
clean-up: fix PEP8 E131 continuation line unaligned for hanging indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1776
diff
changeset
|
1000 |
"buffer_size": bofs, |
c46ec818bdd7
clean-up: fix PEP8 E131 continuation line unaligned for hanging indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1776
diff
changeset
|
1001 |
"programs_declarations": "\n".join(["extern %(type)s %(C_path)s;" % |
c46ec818bdd7
clean-up: fix PEP8 E131 continuation line unaligned for hanging indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1776
diff
changeset
|
1002 |
p for p in self._ProgramList]), |
c46ec818bdd7
clean-up: fix PEP8 E131 continuation line unaligned for hanging indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1776
diff
changeset
|
1003 |
"extern_variables_declarations": "\n".join([ |
c46ec818bdd7
clean-up: fix PEP8 E131 continuation line unaligned for hanging indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1776
diff
changeset
|
1004 |
{ |
c46ec818bdd7
clean-up: fix PEP8 E131 continuation line unaligned for hanging indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1776
diff
changeset
|
1005 |
"EXT": "extern __IEC_%(type)s_p %(C_path)s;", |
c46ec818bdd7
clean-up: fix PEP8 E131 continuation line unaligned for hanging indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1776
diff
changeset
|
1006 |
"IN": "extern __IEC_%(type)s_p %(C_path)s;", |
c46ec818bdd7
clean-up: fix PEP8 E131 continuation line unaligned for hanging indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1776
diff
changeset
|
1007 |
"MEM": "extern __IEC_%(type)s_p %(C_path)s;", |
c46ec818bdd7
clean-up: fix PEP8 E131 continuation line unaligned for hanging indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1776
diff
changeset
|
1008 |
"OUT": "extern __IEC_%(type)s_p %(C_path)s;", |
c46ec818bdd7
clean-up: fix PEP8 E131 continuation line unaligned for hanging indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1776
diff
changeset
|
1009 |
"VAR": "extern __IEC_%(type)s_t %(C_path)s;", |
c46ec818bdd7
clean-up: fix PEP8 E131 continuation line unaligned for hanging indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1776
diff
changeset
|
1010 |
"FB": "extern %(type)s %(C_path)s;" |
c46ec818bdd7
clean-up: fix PEP8 E131 continuation line unaligned for hanging indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1776
diff
changeset
|
1011 |
}[v["vartype"]] % v |
c46ec818bdd7
clean-up: fix PEP8 E131 continuation line unaligned for hanging indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1776
diff
changeset
|
1012 |
for v in self._VariablesList if v["C_path"].find('.') < 0]), |
c46ec818bdd7
clean-up: fix PEP8 E131 continuation line unaligned for hanging indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1776
diff
changeset
|
1013 |
"variable_decl_array": ",\n".join(variable_decl_array) |
c46ec818bdd7
clean-up: fix PEP8 E131 continuation line unaligned for hanging indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1776
diff
changeset
|
1014 |
} |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1015 |
|
203 | 1016 |
return debug_code |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1017 |
|
985
cd8dadcef426
Re-organized C code templates for plc_main. Moved logging out of plc_debug. Factorized redundant _common_ticktime external declaration
Edouard Tisserant
parents:
978
diff
changeset
|
1018 |
def Generate_plc_main(self): |
203 | 1019 |
""" |
717 | 1020 |
Use confnodes layout given in LocationCFilesAndCFLAGS to |
1021 |
generate glue code that dispatch calls to all confnodes |
|
203 | 1022 |
""" |
1023 |
# filter location that are related to code that will be called |
|
1024 |
# in retreive, publish, init, cleanup |
|
1740
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
1025 |
locstrs = map(lambda x: "_".join(map(str, x)), |
1847
6198190bc121
explicitly mark unused variables found by pylint with _ or dummy
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1846
diff
changeset
|
1026 |
[loc for loc, _Cfiles, DoCalls in |
1768
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.LocationCFilesAndCFLAGS if loc and DoCalls]) |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1028 |
|
203 | 1029 |
# Generate main, based on template |
728
e0424e96e3fd
refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents:
726
diff
changeset
|
1030 |
if not self.BeremizRoot.getDisable_Extensions(): |
1430 | 1031 |
plc_main_code = targets.GetCode("plc_main_head.c") % { |
1740
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
1032 |
"calls_prototypes": "\n".join([( |
1878
fb73a6b6622d
fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1861
diff
changeset
|
1033 |
"int __init_%(s)s(int argc,char **argv);\n" + |
fb73a6b6622d
fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1861
diff
changeset
|
1034 |
"void __cleanup_%(s)s(void);\n" + |
fb73a6b6622d
fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1861
diff
changeset
|
1035 |
"void __retrieve_%(s)s(void);\n" + |
fb73a6b6622d
fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1861
diff
changeset
|
1036 |
"void __publish_%(s)s(void);") % {'s': locstr} for locstr in locstrs]), |
1740
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
1037 |
"retrieve_calls": "\n ".join([ |
1878
fb73a6b6622d
fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1861
diff
changeset
|
1038 |
"__retrieve_%s();" % locstr for locstr in locstrs]), |
1740
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
1039 |
"publish_calls": "\n ".join([ # Call publish in reverse order |
1878
fb73a6b6622d
fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1861
diff
changeset
|
1040 |
"__publish_%s();" % locstrs[i-1] for i in xrange(len(locstrs), 0, -1)]), |
1740
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
1041 |
"init_calls": "\n ".join([ |
1878
fb73a6b6622d
fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1861
diff
changeset
|
1042 |
"init_level=%d; " % (i+1) + |
fb73a6b6622d
fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1861
diff
changeset
|
1043 |
"if((res = __init_%s(argc,argv))){" % locstr + |
fb73a6b6622d
fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1861
diff
changeset
|
1044 |
# "printf(\"%s\"); "%locstr + #for debug |
fb73a6b6622d
fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1861
diff
changeset
|
1045 |
"return res;}" for i, locstr in enumerate(locstrs)]), |
1740
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
1046 |
"cleanup_calls": "\n ".join([ |
1878
fb73a6b6622d
fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1861
diff
changeset
|
1047 |
"if(init_level >= %d) " % i + |
fb73a6b6622d
fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1861
diff
changeset
|
1048 |
"__cleanup_%s();" % locstrs[i-1] for i in xrange(len(locstrs), 0, -1)]) |
338 | 1049 |
} |
1050 |
else: |
|
1430 | 1051 |
plc_main_code = targets.GetCode("plc_main_head.c") % { |
1740
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
1052 |
"calls_prototypes": "\n", |
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
1053 |
"retrieve_calls": "\n", |
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
1054 |
"publish_calls": "\n", |
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
1055 |
"init_calls": "\n", |
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
1056 |
"cleanup_calls": "\n" |
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
1057 |
} |
1315
ff14a66bbd12
Fixed Beremiz for working with new xmlclass support using lxml
Laurent Bessard
parents:
1282
diff
changeset
|
1058 |
plc_main_code += targets.GetTargetCode(self.GetTarget().getcontent().getLocalTag()) |
1430 | 1059 |
plc_main_code += targets.GetCode("plc_main_tail.c") |
203 | 1060 |
return plc_main_code |
1061 |
||
623
8cdb533c3c7a
A few new keyboard shortcuts : F4=stop, F5=run, F5=transfer, F7=connect
Edouard Tisserant
parents:
619
diff
changeset
|
1062 |
def _Build(self): |
20 | 1063 |
""" |
717 | 1064 |
Method called by user to (re)build SoftPLC and confnode tree |
20 | 1065 |
""" |
395 | 1066 |
if self.AppFrame is not None: |
1067 |
self.AppFrame.ClearErrors() |
|
774
78b5fa92dd1c
Fix bug when opening and closing confnode extra viewers
laurent
parents:
770
diff
changeset
|
1068 |
self._CloseView(self._IECCodeView) |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1069 |
|
20 | 1070 |
buildpath = self._getBuildPath() |
1071 |
||
1072 |
# Eventually create build dir |
|
18 | 1073 |
if not os.path.exists(buildpath): |
1074 |
os.mkdir(buildpath) |
|
203 | 1075 |
|
1076 |
self.logger.flush() |
|
361 | 1077 |
self.logger.write(_("Start build in %s\n") % buildpath) |
203 | 1078 |
|
1079 |
# Generate SoftPLC IEC code |
|
1080 |
IECGenRes = self._Generate_SoftPLC() |
|
1555
dac6002ff58e
fix issue with non-updated button 'generated IECCode' after Build and Clean
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1551
diff
changeset
|
1081 |
self.UpdateButtons() |
203 | 1082 |
|
1083 |
# If IEC code gen fail, bail out. |
|
1084 |
if not IECGenRes: |
|
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1085 |
self.logger.write_error(_("PLC code generation failed !\n")) |
677
607731b33026
Fix 'Transfer" button state according to last build result
laurent
parents:
676
diff
changeset
|
1086 |
self.ResetBuildMD5() |
20 | 1087 |
return False |
1088 |
||
203 | 1089 |
# Reset variable and program list that are parsed from |
1090 |
# CSV file generated by IEC2C compiler. |
|
1091 |
self.ResetIECProgramsAndVariables() |
|
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1092 |
|
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1093 |
# Collect platform specific C code |
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1094 |
# Code and other files from extension |
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1095 |
if not self._Generate_runtime(): |
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1096 |
return False |
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1097 |
|
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1098 |
# Get current or fresh builder |
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1099 |
builder = self.GetBuilder() |
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1100 |
if builder is None: |
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1101 |
self.logger.write_error(_("Fatal : cannot get builder.\n")) |
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1102 |
self.ResetBuildMD5() |
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1103 |
return False |
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1104 |
|
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1105 |
# Build |
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1106 |
try: |
1739
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1107 |
if not builder.build(): |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1108 |
self.logger.write_error(_("C Build failed.\n")) |
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1109 |
return False |
1846
14b40afccd69
remove unused variables found by pylint
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1836
diff
changeset
|
1110 |
except Exception: |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1111 |
self.logger.write_error(_("C Build crashed !\n")) |
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1112 |
self.logger.write_error(traceback.format_exc()) |
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1113 |
self.ResetBuildMD5() |
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1114 |
return False |
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1115 |
|
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1116 |
self.logger.write(_("Successfully built.\n")) |
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1117 |
# Update GUI status about need for transfer |
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1118 |
self.CompareLocalAndRemotePLC() |
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1119 |
return True |
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1120 |
|
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1121 |
def _Generate_runtime(self): |
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1122 |
buildpath = self._getBuildPath() |
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1123 |
|
717 | 1124 |
# Generate C code and compilation params from confnode hierarchy |
24 | 1125 |
try: |
728
e0424e96e3fd
refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents:
726
diff
changeset
|
1126 |
CTNLocationCFilesAndCFLAGS, CTNLDFLAGS, CTNExtraFiles = self._Generate_C( |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1127 |
buildpath, |
203 | 1128 |
self.PLCGeneratedLocatedVars) |
1846
14b40afccd69
remove unused variables found by pylint
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1836
diff
changeset
|
1129 |
except Exception: |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1130 |
self.logger.write_error(_("Runtime IO extensions C code generation failed !\n")) |
203 | 1131 |
self.logger.write_error(traceback.format_exc()) |
677
607731b33026
Fix 'Transfer" button state according to last build result
laurent
parents:
676
diff
changeset
|
1132 |
self.ResetBuildMD5() |
24 | 1133 |
return False |
18 | 1134 |
|
728
e0424e96e3fd
refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents:
726
diff
changeset
|
1135 |
# Generate C code and compilation params from liraries |
e0424e96e3fd
refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents:
726
diff
changeset
|
1136 |
try: |
e0424e96e3fd
refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents:
726
diff
changeset
|
1137 |
LibCFilesAndCFLAGS, LibLDFLAGS, LibExtraFiles = self.GetLibrariesCCode(buildpath) |
1846
14b40afccd69
remove unused variables found by pylint
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1836
diff
changeset
|
1138 |
except Exception: |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1139 |
self.logger.write_error(_("Runtime library extensions C code generation failed !\n")) |
728
e0424e96e3fd
refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents:
726
diff
changeset
|
1140 |
self.logger.write_error(traceback.format_exc()) |
e0424e96e3fd
refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents:
726
diff
changeset
|
1141 |
self.ResetBuildMD5() |
e0424e96e3fd
refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents:
726
diff
changeset
|
1142 |
return False |
e0424e96e3fd
refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents:
726
diff
changeset
|
1143 |
|
1758
845ca626db09
clean-up: fix PEP8 E222 multiple spaces after operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1757
diff
changeset
|
1144 |
self.LocationCFilesAndCFLAGS = LibCFilesAndCFLAGS + CTNLocationCFilesAndCFLAGS |
728
e0424e96e3fd
refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents:
726
diff
changeset
|
1145 |
self.LDFLAGS = CTNLDFLAGS + LibLDFLAGS |
e0424e96e3fd
refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents:
726
diff
changeset
|
1146 |
ExtraFiles = CTNExtraFiles + LibExtraFiles |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1147 |
|
361 | 1148 |
# Get temporary directory path |
203 | 1149 |
extrafilespath = self._getExtraFilesPath() |
1150 |
# Remove old directory |
|
1151 |
if os.path.exists(extrafilespath): |
|
1152 |
shutil.rmtree(extrafilespath) |
|
1153 |
# Recreate directory |
|
1154 |
os.mkdir(extrafilespath) |
|
1155 |
# Then write the files |
|
1740
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
1156 |
for fname, fobject in ExtraFiles: |
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
1157 |
fpath = os.path.join(extrafilespath, fname) |
203 | 1158 |
open(fpath, "wb").write(fobject.read()) |
1159 |
# Now we can forget ExtraFiles (will close files object) |
|
1160 |
del ExtraFiles |
|
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1161 |
|
1001
3f966bbb3fba
Added beremiz.h header file for extensions
Edouard Tisserant
parents:
1000
diff
changeset
|
1162 |
# Header file for extensions |
1740
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
1163 |
open(os.path.join(buildpath, "beremiz.h"), "w").write(targets.GetHeader()) |
1001
3f966bbb3fba
Added beremiz.h header file for extensions
Edouard Tisserant
parents:
1000
diff
changeset
|
1164 |
|
203 | 1165 |
# Template based part of C code generation |
717 | 1166 |
# files are stacked at the beginning, as files of confnode tree root |
1878
fb73a6b6622d
fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1861
diff
changeset
|
1167 |
c_source = [ |
fb73a6b6622d
fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1861
diff
changeset
|
1168 |
# debugger code |
fb73a6b6622d
fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1861
diff
changeset
|
1169 |
(self.Generate_plc_debugger, "plc_debugger.c", "Debugger"), |
fb73a6b6622d
fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1861
diff
changeset
|
1170 |
# init/cleanup/retrieve/publish, run and align code |
fb73a6b6622d
fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1861
diff
changeset
|
1171 |
(self.Generate_plc_main, "plc_main.c", "Common runtime") |
fb73a6b6622d
fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1861
diff
changeset
|
1172 |
] |
fb73a6b6622d
fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1861
diff
changeset
|
1173 |
|
fb73a6b6622d
fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1861
diff
changeset
|
1174 |
for generator, filename, name in c_source: |
203 | 1175 |
try: |
1176 |
# Do generate |
|
1177 |
code = generator() |
|
335
c5f3f71e7260
fixed bug : buffer overflow when debugging PLC with python blocks
greg
parents:
334
diff
changeset
|
1178 |
if code is None: |
1861
410a3bcbeb29
fix pylint warning '(misplaced-bare-raise) The raise statement is not inside an except clause'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1850
diff
changeset
|
1179 |
raise Exception |
1740
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
1180 |
code_path = os.path.join(buildpath, filename) |
203 | 1181 |
open(code_path, "w").write(code) |
717 | 1182 |
# Insert this file as first file to be compiled at root confnode |
1740
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
1183 |
self.LocationCFilesAndCFLAGS[0][1].insert(0, (code_path, self.plcCFLAGS)) |
1846
14b40afccd69
remove unused variables found by pylint
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1836
diff
changeset
|
1184 |
except Exception: |
361 | 1185 |
self.logger.write_error(name+_(" generation failed !\n")) |
203 | 1186 |
self.logger.write_error(traceback.format_exc()) |
677
607731b33026
Fix 'Transfer" button state according to last build result
laurent
parents:
676
diff
changeset
|
1187 |
self.ResetBuildMD5() |
203 | 1188 |
return False |
361 | 1189 |
self.logger.write(_("C code generated successfully.\n")) |
49
45dc6a944ab6
On the long wat towards generated code comilation...
etisserant
parents:
47
diff
changeset
|
1190 |
return True |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1191 |
|
202
cd81a7a6e55c
Adding support for highlighing compiling errors into PLCOpenEditor
lbessard
parents:
199
diff
changeset
|
1192 |
def ShowError(self, logger, from_location, to_location): |
cd81a7a6e55c
Adding support for highlighing compiling errors into PLCOpenEditor
lbessard
parents:
199
diff
changeset
|
1193 |
chunk_infos = self.GetChunkInfos(from_location, to_location) |
cd81a7a6e55c
Adding support for highlighing compiling errors into PLCOpenEditor
lbessard
parents:
199
diff
changeset
|
1194 |
for infos, (start_row, start_col) in chunk_infos: |
1730
64d8f52bc8c8
clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1722
diff
changeset
|
1195 |
row = 1 if from_location[0] < start_row else (from_location[0] - start_row) |
1579
418e6bac22e8
fix segmentation fault on clicking red point in compilation console if that compilation error coverts several units in plcopen file
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1574
diff
changeset
|
1196 |
col = 1 if (start_row != from_location[0]) else (from_location[1] - start_col) |
418e6bac22e8
fix segmentation fault on clicking red point in compilation console if that compilation error coverts several units in plcopen file
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1574
diff
changeset
|
1197 |
start = (row, col) |
418e6bac22e8
fix segmentation fault on clicking red point in compilation console if that compilation error coverts several units in plcopen file
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1574
diff
changeset
|
1198 |
|
1730
64d8f52bc8c8
clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1722
diff
changeset
|
1199 |
row = 1 if to_location[0] < start_row else (to_location[0] - start_row) |
1579
418e6bac22e8
fix segmentation fault on clicking red point in compilation console if that compilation error coverts several units in plcopen file
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1574
diff
changeset
|
1200 |
col = 1 if (start_row != to_location[0]) else (to_location[1] - start_col) |
418e6bac22e8
fix segmentation fault on clicking red point in compilation console if that compilation error coverts several units in plcopen file
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1574
diff
changeset
|
1201 |
end = (row, col) |
1730
64d8f52bc8c8
clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1722
diff
changeset
|
1202 |
|
396 | 1203 |
if self.AppFrame is not None: |
1204 |
self.AppFrame.ShowError(infos, start, end) |
|
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1205 |
|
774
78b5fa92dd1c
Fix bug when opening and closing confnode extra viewers
laurent
parents:
770
diff
changeset
|
1206 |
_IECCodeView = None |
1751
c28db6f7616b
clean-up: fix PEP8 E301 expected 1 blank line, found 0
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1749
diff
changeset
|
1207 |
|
203 | 1208 |
def _showIECcode(self): |
716
180e4a7d945c
Adding search field for finding function or function block in library tree
laurent
parents:
715
diff
changeset
|
1209 |
self._OpenView("IEC code") |
180e4a7d945c
Adding search field for finding function or function block in library tree
laurent
parents:
715
diff
changeset
|
1210 |
|
774
78b5fa92dd1c
Fix bug when opening and closing confnode extra viewers
laurent
parents:
770
diff
changeset
|
1211 |
_IECRawCodeView = None |
1751
c28db6f7616b
clean-up: fix PEP8 E301 expected 1 blank line, found 0
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1749
diff
changeset
|
1212 |
|
716
180e4a7d945c
Adding search field for finding function or function block in library tree
laurent
parents:
715
diff
changeset
|
1213 |
def _editIECrawcode(self): |
180e4a7d945c
Adding search field for finding function or function block in library tree
laurent
parents:
715
diff
changeset
|
1214 |
self._OpenView("IEC raw code") |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1215 |
|
782 | 1216 |
_ProjectFilesView = None |
1751
c28db6f7616b
clean-up: fix PEP8 E301 expected 1 blank line, found 0
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1749
diff
changeset
|
1217 |
|
782 | 1218 |
def _OpenProjectFiles(self): |
815
e4f24593a758
Adding support for extending internationalization to extensions
laurent
parents:
814
diff
changeset
|
1219 |
self._OpenView("Project Files") |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1220 |
|
784
a1d970365e41
Adding support for beremiz extensions to define custom file editors for project files
laurent
parents:
782
diff
changeset
|
1221 |
_FileEditors = {} |
1751
c28db6f7616b
clean-up: fix PEP8 E301 expected 1 blank line, found 0
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1749
diff
changeset
|
1222 |
|
784
a1d970365e41
Adding support for beremiz extensions to define custom file editors for project files
laurent
parents:
782
diff
changeset
|
1223 |
def _OpenFileEditor(self, filepath): |
a1d970365e41
Adding support for beremiz extensions to define custom file editors for project files
laurent
parents:
782
diff
changeset
|
1224 |
self._OpenView(filepath) |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1225 |
|
782 | 1226 |
def _OpenView(self, name=None, onlyopened=False): |
716
180e4a7d945c
Adding search field for finding function or function block in library tree
laurent
parents:
715
diff
changeset
|
1227 |
if name == "IEC code": |
782 | 1228 |
if self._IECCodeView is None: |
774
78b5fa92dd1c
Fix bug when opening and closing confnode extra viewers
laurent
parents:
770
diff
changeset
|
1229 |
plc_file = self._getIECcodepath() |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1230 |
|
1262
7b9259945453
Fixed bug with Copy/Paste in generated ST code Viewer
Laurent Bessard
parents:
1255
diff
changeset
|
1231 |
self._IECCodeView = IECCodeViewer(self.AppFrame.TabsOpened, "", self.AppFrame, None, instancepath=name) |
774
78b5fa92dd1c
Fix bug when opening and closing confnode extra viewers
laurent
parents:
770
diff
changeset
|
1232 |
self._IECCodeView.SetTextSyntax("ALL") |
78b5fa92dd1c
Fix bug when opening and closing confnode extra viewers
laurent
parents:
770
diff
changeset
|
1233 |
self._IECCodeView.SetKeywords(IEC_KEYWORDS) |
78b5fa92dd1c
Fix bug when opening and closing confnode extra viewers
laurent
parents:
770
diff
changeset
|
1234 |
try: |
78b5fa92dd1c
Fix bug when opening and closing confnode extra viewers
laurent
parents:
770
diff
changeset
|
1235 |
text = file(plc_file).read() |
1780
c52d1460cea8
clean-up: fix PEP8 E722 do not use bare except'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1779
diff
changeset
|
1236 |
except Exception: |
774
78b5fa92dd1c
Fix bug when opening and closing confnode extra viewers
laurent
parents:
770
diff
changeset
|
1237 |
text = '(* No IEC code have been generated at that time ! *)' |
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1742
diff
changeset
|
1238 |
self._IECCodeView.SetText(text=text) |
1730
64d8f52bc8c8
clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1722
diff
changeset
|
1239 |
self._IECCodeView.Editor.SetReadOnly(True) |
782 | 1240 |
self._IECCodeView.SetIcon(GetBitmap("ST")) |
806
abf1afc1f04d
Fix bug when closing IECCodeView and IECRawCodeView, reopening them was impossible
laurent
parents:
801
diff
changeset
|
1241 |
setattr(self._IECCodeView, "_OnClose", self.OnCloseEditor) |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1242 |
|
784
a1d970365e41
Adding support for beremiz extensions to define custom file editors for project files
laurent
parents:
782
diff
changeset
|
1243 |
if self._IECCodeView is not None: |
774
78b5fa92dd1c
Fix bug when opening and closing confnode extra viewers
laurent
parents:
770
diff
changeset
|
1244 |
self.AppFrame.EditProjectElement(self._IECCodeView, name) |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1245 |
|
774
78b5fa92dd1c
Fix bug when opening and closing confnode extra viewers
laurent
parents:
770
diff
changeset
|
1246 |
return self._IECCodeView |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1247 |
|
716
180e4a7d945c
Adding search field for finding function or function block in library tree
laurent
parents:
715
diff
changeset
|
1248 |
elif name == "IEC raw code": |
782 | 1249 |
if self._IECRawCodeView is None: |
806
abf1afc1f04d
Fix bug when closing IECCodeView and IECRawCodeView, reopening them was impossible
laurent
parents:
801
diff
changeset
|
1250 |
controler = MiniTextControler(self._getIECrawcodepath(), self) |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1251 |
|
1262
7b9259945453
Fixed bug with Copy/Paste in generated ST code Viewer
Laurent Bessard
parents:
1255
diff
changeset
|
1252 |
self._IECRawCodeView = IECCodeViewer(self.AppFrame.TabsOpened, "", self.AppFrame, controler, instancepath=name) |
782 | 1253 |
self._IECRawCodeView.SetTextSyntax("ALL") |
1254 |
self._IECRawCodeView.SetKeywords(IEC_KEYWORDS) |
|
1255 |
self._IECRawCodeView.RefreshView() |
|
1256 |
self._IECRawCodeView.SetIcon(GetBitmap("ST")) |
|
806
abf1afc1f04d
Fix bug when closing IECCodeView and IECRawCodeView, reopening them was impossible
laurent
parents:
801
diff
changeset
|
1257 |
setattr(self._IECRawCodeView, "_OnClose", self.OnCloseEditor) |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1258 |
|
784
a1d970365e41
Adding support for beremiz extensions to define custom file editors for project files
laurent
parents:
782
diff
changeset
|
1259 |
if self._IECRawCodeView is not None: |
782 | 1260 |
self.AppFrame.EditProjectElement(self._IECRawCodeView, name) |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1261 |
|
782 | 1262 |
return self._IECRawCodeView |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1263 |
|
815
e4f24593a758
Adding support for extending internationalization to extensions
laurent
parents:
814
diff
changeset
|
1264 |
elif name == "Project Files": |
782 | 1265 |
if self._ProjectFilesView is None: |
1266 |
self._ProjectFilesView = FileManagementPanel(self.AppFrame.TabsOpened, self, name, self._getProjectFilesPath(), True) |
|
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1267 |
|
784
a1d970365e41
Adding support for beremiz extensions to define custom file editors for project files
laurent
parents:
782
diff
changeset
|
1268 |
extensions = [] |
a1d970365e41
Adding support for beremiz extensions to define custom file editors for project files
laurent
parents:
782
diff
changeset
|
1269 |
for extension, name, editor in features.file_editors: |
a1d970365e41
Adding support for beremiz extensions to define custom file editors for project files
laurent
parents:
782
diff
changeset
|
1270 |
if extension not in extensions: |
a1d970365e41
Adding support for beremiz extensions to define custom file editors for project files
laurent
parents:
782
diff
changeset
|
1271 |
extensions.append(extension) |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1272 |
self._ProjectFilesView.SetEditableFileExtensions(extensions) |
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1273 |
|
784
a1d970365e41
Adding support for beremiz extensions to define custom file editors for project files
laurent
parents:
782
diff
changeset
|
1274 |
if self._ProjectFilesView is not None: |
782 | 1275 |
self.AppFrame.EditProjectElement(self._ProjectFilesView, name) |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1276 |
|
784
a1d970365e41
Adding support for beremiz extensions to define custom file editors for project files
laurent
parents:
782
diff
changeset
|
1277 |
return self._ProjectFilesView |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1278 |
|
789
b1b1a8f85e2f
Adding support for saving editor choosen when editing project file for reloading project layout
laurent
parents:
786
diff
changeset
|
1279 |
elif name is not None and name.find("::") != -1: |
b1b1a8f85e2f
Adding support for saving editor choosen when editing project file for reloading project layout
laurent
parents:
786
diff
changeset
|
1280 |
filepath, editor_name = name.split("::") |
1775
b45f2768fab1
clean-up: fix PEP8 E713 test for membership should be 'not in'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1768
diff
changeset
|
1281 |
if filepath not in self._FileEditors: |
789
b1b1a8f85e2f
Adding support for saving editor choosen when editing project file for reloading project layout
laurent
parents:
786
diff
changeset
|
1282 |
if os.path.isfile(filepath): |
b1b1a8f85e2f
Adding support for saving editor choosen when editing project file for reloading project layout
laurent
parents:
786
diff
changeset
|
1283 |
file_extension = os.path.splitext(filepath)[1] |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1284 |
|
796 | 1285 |
editors = dict([(edit_name, edit_class) |
1286 |
for extension, edit_name, edit_class in features.file_editors |
|
789
b1b1a8f85e2f
Adding support for saving editor choosen when editing project file for reloading project layout
laurent
parents:
786
diff
changeset
|
1287 |
if extension == file_extension]) |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1288 |
|
789
b1b1a8f85e2f
Adding support for saving editor choosen when editing project file for reloading project layout
laurent
parents:
786
diff
changeset
|
1289 |
if editor_name == "": |
b1b1a8f85e2f
Adding support for saving editor choosen when editing project file for reloading project layout
laurent
parents:
786
diff
changeset
|
1290 |
if len(editors) == 1: |
b1b1a8f85e2f
Adding support for saving editor choosen when editing project file for reloading project layout
laurent
parents:
786
diff
changeset
|
1291 |
editor_name = editors.keys()[0] |
b1b1a8f85e2f
Adding support for saving editor choosen when editing project file for reloading project layout
laurent
parents:
786
diff
changeset
|
1292 |
elif len(editors) > 0: |
b1b1a8f85e2f
Adding support for saving editor choosen when editing project file for reloading project layout
laurent
parents:
786
diff
changeset
|
1293 |
names = editors.keys() |
1768
691083b5682a
clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1767
diff
changeset
|
1294 |
dialog = wx.SingleChoiceDialog( |
691083b5682a
clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1767
diff
changeset
|
1295 |
self.AppFrame, |
691083b5682a
clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1767
diff
changeset
|
1296 |
_("Select an editor:"), |
691083b5682a
clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1767
diff
changeset
|
1297 |
_("Editor selection"), |
691083b5682a
clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1767
diff
changeset
|
1298 |
names, |
691083b5682a
clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1767
diff
changeset
|
1299 |
wx.DEFAULT_DIALOG_STYLE | wx.OK | wx.CANCEL) |
789
b1b1a8f85e2f
Adding support for saving editor choosen when editing project file for reloading project layout
laurent
parents:
786
diff
changeset
|
1300 |
if dialog.ShowModal() == wx.ID_OK: |
b1b1a8f85e2f
Adding support for saving editor choosen when editing project file for reloading project layout
laurent
parents:
786
diff
changeset
|
1301 |
editor_name = names[dialog.GetSelection()] |
b1b1a8f85e2f
Adding support for saving editor choosen when editing project file for reloading project layout
laurent
parents:
786
diff
changeset
|
1302 |
dialog.Destroy() |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1303 |
|
789
b1b1a8f85e2f
Adding support for saving editor choosen when editing project file for reloading project layout
laurent
parents:
786
diff
changeset
|
1304 |
if editor_name != "": |
b1b1a8f85e2f
Adding support for saving editor choosen when editing project file for reloading project layout
laurent
parents:
786
diff
changeset
|
1305 |
name = "::".join([filepath, editor_name]) |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1306 |
|
789
b1b1a8f85e2f
Adding support for saving editor choosen when editing project file for reloading project layout
laurent
parents:
786
diff
changeset
|
1307 |
editor = editors[editor_name]() |
b1b1a8f85e2f
Adding support for saving editor choosen when editing project file for reloading project layout
laurent
parents:
786
diff
changeset
|
1308 |
self._FileEditors[filepath] = editor(self.AppFrame.TabsOpened, self, name, self.AppFrame) |
b1b1a8f85e2f
Adding support for saving editor choosen when editing project file for reloading project layout
laurent
parents:
786
diff
changeset
|
1309 |
self._FileEditors[filepath].SetIcon(GetBitmap("FILE")) |
897
3cd39bc7dbad
Added support for defining extension file editor as DebugViewer
Laurent Bessard
parents:
883
diff
changeset
|
1310 |
if isinstance(self._FileEditors[filepath], DebugViewer): |
3cd39bc7dbad
Added support for defining extension file editor as DebugViewer
Laurent Bessard
parents:
883
diff
changeset
|
1311 |
self._FileEditors[filepath].SetDataProducer(self) |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1312 |
|
1763
bcc07ff2362c
clean-up: fix PEP8 W601 .has_key() is deprecated, use 'in'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1760
diff
changeset
|
1313 |
if filepath in self._FileEditors: |
789
b1b1a8f85e2f
Adding support for saving editor choosen when editing project file for reloading project layout
laurent
parents:
786
diff
changeset
|
1314 |
editor = self._FileEditors[filepath] |
b1b1a8f85e2f
Adding support for saving editor choosen when editing project file for reloading project layout
laurent
parents:
786
diff
changeset
|
1315 |
self.AppFrame.EditProjectElement(editor, editor.GetTagName()) |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1316 |
|
789
b1b1a8f85e2f
Adding support for saving editor choosen when editing project file for reloading project layout
laurent
parents:
786
diff
changeset
|
1317 |
return self._FileEditors.get(filepath) |
738 | 1318 |
else: |
786 | 1319 |
return ConfigTreeNode._OpenView(self, self.CTNName(), onlyopened) |
20 | 1320 |
|
774
78b5fa92dd1c
Fix bug when opening and closing confnode extra viewers
laurent
parents:
770
diff
changeset
|
1321 |
def OnCloseEditor(self, view): |
78b5fa92dd1c
Fix bug when opening and closing confnode extra viewers
laurent
parents:
770
diff
changeset
|
1322 |
ConfigTreeNode.OnCloseEditor(self, view) |
78b5fa92dd1c
Fix bug when opening and closing confnode extra viewers
laurent
parents:
770
diff
changeset
|
1323 |
if self._IECCodeView == view: |
78b5fa92dd1c
Fix bug when opening and closing confnode extra viewers
laurent
parents:
770
diff
changeset
|
1324 |
self._IECCodeView = None |
78b5fa92dd1c
Fix bug when opening and closing confnode extra viewers
laurent
parents:
770
diff
changeset
|
1325 |
if self._IECRawCodeView == view: |
78b5fa92dd1c
Fix bug when opening and closing confnode extra viewers
laurent
parents:
770
diff
changeset
|
1326 |
self._IECRawCodeView = None |
782 | 1327 |
if self._ProjectFilesView == view: |
1328 |
self._ProjectFilesView = None |
|
784
a1d970365e41
Adding support for beremiz extensions to define custom file editors for project files
laurent
parents:
782
diff
changeset
|
1329 |
if view in self._FileEditors.values(): |
792 | 1330 |
self._FileEditors.pop(view.GetFilePath()) |
774
78b5fa92dd1c
Fix bug when opening and closing confnode extra viewers
laurent
parents:
770
diff
changeset
|
1331 |
|
203 | 1332 |
def _Clean(self): |
774
78b5fa92dd1c
Fix bug when opening and closing confnode extra viewers
laurent
parents:
770
diff
changeset
|
1333 |
self._CloseView(self._IECCodeView) |
108 | 1334 |
if os.path.isdir(os.path.join(self._getBuildPath())): |
361 | 1335 |
self.logger.write(_("Cleaning the build directory\n")) |
108 | 1336 |
shutil.rmtree(os.path.join(self._getBuildPath())) |
1337 |
else: |
|
361 | 1338 |
self.logger.write_error(_("Build directory already clean\n")) |
286
a2a8a52b0d4f
Minor changes to get better cleanup of debug and python_eval threads, accross multiple debug sessions and PLC runs.
etisserant
parents:
283
diff
changeset
|
1339 |
# kill the builder |
a2a8a52b0d4f
Minor changes to get better cleanup of debug and python_eval threads, accross multiple debug sessions and PLC runs.
etisserant
parents:
283
diff
changeset
|
1340 |
self._builder = None |
203 | 1341 |
self.CompareLocalAndRemotePLC() |
1555
dac6002ff58e
fix issue with non-updated button 'generated IECCode' after Build and Clean
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1551
diff
changeset
|
1342 |
self.UpdateButtons() |
dac6002ff58e
fix issue with non-updated button 'generated IECCode' after Build and Clean
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1551
diff
changeset
|
1343 |
|
dac6002ff58e
fix issue with non-updated button 'generated IECCode' after Build and Clean
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1551
diff
changeset
|
1344 |
def _UpdateButtons(self): |
dac6002ff58e
fix issue with non-updated button 'generated IECCode' after Build and Clean
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1551
diff
changeset
|
1345 |
self.EnableMethod("_Clean", os.path.exists(self._getBuildPath())) |
dac6002ff58e
fix issue with non-updated button 'generated IECCode' after Build and Clean
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1551
diff
changeset
|
1346 |
self.ShowMethod("_showIECcode", os.path.isfile(self._getIECcodepath())) |
1634
299a1dde6baa
fix second error message in case of error appearing too early to have a wx frame
Edouard Tisserant 7BB06627 <edouard.tisserant@gmail.com>
parents:
1630
diff
changeset
|
1347 |
if self.AppFrame is not None and not self.UpdateMethodsFromPLCStatus(): |
1555
dac6002ff58e
fix issue with non-updated button 'generated IECCode' after Build and Clean
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1551
diff
changeset
|
1348 |
self.AppFrame.RefreshStatusToolBar() |
1730
64d8f52bc8c8
clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1722
diff
changeset
|
1349 |
|
1555
dac6002ff58e
fix issue with non-updated button 'generated IECCode' after Build and Clean
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1551
diff
changeset
|
1350 |
def UpdateButtons(self): |
dac6002ff58e
fix issue with non-updated button 'generated IECCode' after Build and Clean
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1551
diff
changeset
|
1351 |
wx.CallAfter(self._UpdateButtons) |
dac6002ff58e
fix issue with non-updated button 'generated IECCode' after Build and Clean
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1551
diff
changeset
|
1352 |
|
911
ffa24427396a
Log redirected to console, dump of all available log to console when connecting to PLC
Edouard Tisserant
parents:
906
diff
changeset
|
1353 |
def UpdatePLCLog(self, log_count): |
978 | 1354 |
if log_count: |
1355 |
if self.AppFrame is not None: |
|
1356 |
self.AppFrame.LogViewer.SetLogCounters(log_count) |
|
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1357 |
|
203 | 1358 |
def UpdateMethodsFromPLCStatus(self): |
1555
dac6002ff58e
fix issue with non-updated button 'generated IECCode' after Build and Clean
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1551
diff
changeset
|
1359 |
updated = False |
486
2e0fe44044b3
Catch Pyro exception when connection closed and print message
laurent
parents:
483
diff
changeset
|
1360 |
status = None |
203 | 1361 |
if self._connector is not None: |
923
6ef6e0b3a908
Fixed crash (segfault) when logging debug messages
Edouard Tisserant
parents:
922
diff
changeset
|
1362 |
PLCstatus = self._connector.GetPLCstatus() |
6ef6e0b3a908
Fixed crash (segfault) when logging debug messages
Edouard Tisserant
parents:
922
diff
changeset
|
1363 |
if PLCstatus is not None: |
6ef6e0b3a908
Fixed crash (segfault) when logging debug messages
Edouard Tisserant
parents:
922
diff
changeset
|
1364 |
status, log_count = PLCstatus |
6ef6e0b3a908
Fixed crash (segfault) when logging debug messages
Edouard Tisserant
parents:
922
diff
changeset
|
1365 |
self.UpdatePLCLog(log_count) |
486
2e0fe44044b3
Catch Pyro exception when connection closed and print message
laurent
parents:
483
diff
changeset
|
1366 |
if status is None: |
1116
300f98a8d4c6
Fixed bug connector not resetted when connection is lost
Laurent Bessard
parents:
1105
diff
changeset
|
1367 |
self._SetConnector(None, False) |
203 | 1368 |
status = "Disconnected" |
1828
396da88d7b5c
fix unnecessary parens after keyword
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1824
diff
changeset
|
1369 |
if self.previous_plcstate != status: |
446
1edde533db19
Some cleanup in PLC status - removed that \"Starting\" state ...
ed
parents:
440
diff
changeset
|
1370 |
for args in { |
1740
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
1371 |
"Started": [("_Run", False), |
1739
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1372 |
("_Stop", True)], |
1740
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
1373 |
"Stopped": [("_Run", True), |
1739
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1374 |
("_Stop", False)], |
1740
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
1375 |
"Empty": [("_Run", False), |
1739
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1376 |
("_Stop", False)], |
1740
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
1377 |
"Broken": [], |
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
1378 |
"Disconnected": [("_Run", False), |
1739
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1379 |
("_Stop", False), |
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1380 |
("_Transfer", False), |
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1381 |
("_Connect", True), |
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1382 |
("_Disconnect", False)], |
1740
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
1383 |
}.get(status, []): |
446
1edde533db19
Some cleanup in PLC status - removed that \"Starting\" state ...
ed
parents:
440
diff
changeset
|
1384 |
self.ShowMethod(*args) |
922
60fafd828a30
Better PLC log message time stamp display. Better console information when connecting.
Edouard Tisserant
parents:
921
diff
changeset
|
1385 |
self.previous_plcstate = status |
918 | 1386 |
if self.AppFrame is not None: |
1555
dac6002ff58e
fix issue with non-updated button 'generated IECCode' after Build and Clean
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1551
diff
changeset
|
1387 |
updated = True |
918 | 1388 |
self.AppFrame.RefreshStatusToolBar() |
1000 | 1389 |
if status == "Disconnected": |
1587
b1be42401522
add i18n to PLC status
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1581
diff
changeset
|
1390 |
self.AppFrame.ConnectionStatusBar.SetStatusText(self.GetTextStatus(status), 1) |
1000 | 1391 |
self.AppFrame.ConnectionStatusBar.SetStatusText('', 2) |
1392 |
else: |
|
1393 |
self.AppFrame.ConnectionStatusBar.SetStatusText( |
|
1394 |
_("Connected to URI: %s") % self.BeremizRoot.getURI_location().strip(), 1) |
|
1587
b1be42401522
add i18n to PLC status
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1581
diff
changeset
|
1395 |
self.AppFrame.ConnectionStatusBar.SetStatusText(self.GetTextStatus(status), 2) |
1555
dac6002ff58e
fix issue with non-updated button 'generated IECCode' after Build and Clean
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1551
diff
changeset
|
1396 |
return updated |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1397 |
|
1587
b1be42401522
add i18n to PLC status
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1581
diff
changeset
|
1398 |
def GetTextStatus(self, status): |
b1be42401522
add i18n to PLC status
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1581
diff
changeset
|
1399 |
msgs = { |
b1be42401522
add i18n to PLC status
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1581
diff
changeset
|
1400 |
"Started": _("Started"), |
b1be42401522
add i18n to PLC status
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1581
diff
changeset
|
1401 |
"Stopped": _("Stopped"), |
b1be42401522
add i18n to PLC status
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1581
diff
changeset
|
1402 |
"Empty": _("Empty"), |
b1be42401522
add i18n to PLC status
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1581
diff
changeset
|
1403 |
"Broken": _("Broken"), |
b1be42401522
add i18n to PLC status
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1581
diff
changeset
|
1404 |
"Disconnected": _("Disconnected") |
b1be42401522
add i18n to PLC status
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1581
diff
changeset
|
1405 |
} |
b1be42401522
add i18n to PLC status
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1581
diff
changeset
|
1406 |
return msgs.get(status, status) |
1730
64d8f52bc8c8
clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1722
diff
changeset
|
1407 |
|
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1742
diff
changeset
|
1408 |
def ShowPLCProgress(self, status="", progress=0): |
1574
ce9c0e68389c
add progress bar to status bar
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1555
diff
changeset
|
1409 |
self.AppFrame.ProgressStatusBar.Show() |
1587
b1be42401522
add i18n to PLC status
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1581
diff
changeset
|
1410 |
self.AppFrame.ConnectionStatusBar.SetStatusText(self.GetTextStatus(status), 1) |
1574
ce9c0e68389c
add progress bar to status bar
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1555
diff
changeset
|
1411 |
self.AppFrame.ProgressStatusBar.SetValue(progress) |
ce9c0e68389c
add progress bar to status bar
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1555
diff
changeset
|
1412 |
|
ce9c0e68389c
add progress bar to status bar
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1555
diff
changeset
|
1413 |
def HidePLCProgress(self): |
ce9c0e68389c
add progress bar to status bar
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1555
diff
changeset
|
1414 |
# clear previous_plcstate to restore status |
ce9c0e68389c
add progress bar to status bar
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1555
diff
changeset
|
1415 |
# in UpdateMethodsFromPLCStatus() |
ce9c0e68389c
add progress bar to status bar
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1555
diff
changeset
|
1416 |
self.previous_plcstate = "" |
ce9c0e68389c
add progress bar to status bar
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1555
diff
changeset
|
1417 |
self.AppFrame.ProgressStatusBar.Hide() |
ce9c0e68389c
add progress bar to status bar
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1555
diff
changeset
|
1418 |
self.UpdateMethodsFromPLCStatus() |
1730
64d8f52bc8c8
clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1722
diff
changeset
|
1419 |
|
446
1edde533db19
Some cleanup in PLC status - removed that \"Starting\" state ...
ed
parents:
440
diff
changeset
|
1420 |
def PullPLCStatusProc(self, event): |
918 | 1421 |
self.UpdateMethodsFromPLCStatus() |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1422 |
|
1363
e87e0166d0a7
Added new debug process separating non-wx thread extracting debug values from connector and 10 Hz wx timer refreshing Beremiz debug Viewers and communicating throw double-buffering, to avoid segmentation faults and optimize CPU usage
Laurent Bessard
parents:
1330
diff
changeset
|
1423 |
def SnapshotAndResetDebugValuesBuffers(self): |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1424 |
buffers, self.DebugValuesBuffers = (self.DebugValuesBuffers, |
1847
6198190bc121
explicitly mark unused variables found by pylint with _ or dummy
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1846
diff
changeset
|
1425 |
[list() for dummy in xrange(len(self.TracedIECPath))]) |
1363
e87e0166d0a7
Added new debug process separating non-wx thread extracting debug values from connector and 10 Hz wx timer refreshing Beremiz debug Viewers and communicating throw double-buffering, to avoid segmentation faults and optimize CPU usage
Laurent Bessard
parents:
1330
diff
changeset
|
1426 |
ticks, self.DebugTicks = self.DebugTicks, [] |
e87e0166d0a7
Added new debug process separating non-wx thread extracting debug values from connector and 10 Hz wx timer refreshing Beremiz debug Viewers and communicating throw double-buffering, to avoid segmentation faults and optimize CPU usage
Laurent Bessard
parents:
1330
diff
changeset
|
1427 |
return ticks, buffers |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1428 |
|
239
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1429 |
def RegisterDebugVarToConnector(self): |
1742
92932cd370a4
clean-up: fix PEP8 E225 missing whitespace around operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1741
diff
changeset
|
1430 |
self.DebugTimer = None |
239
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1431 |
Idxs = [] |
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1432 |
self.TracedIECPath = [] |
1433
4a45f6642523
Moved trace buffer unpacking in the IDE. Latest traced variable samples are now passed as a single string
Edouard Tisserant
parents:
1432
diff
changeset
|
1433 |
self.TracedIECTypes = [] |
239
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1434 |
if self._connector is not None: |
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1435 |
self.IECdebug_lock.acquire() |
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1436 |
IECPathsToPop = [] |
1740
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
1437 |
for IECPath, data_tuple in self.IECdebug_datas.iteritems(): |
1847
6198190bc121
explicitly mark unused variables found by pylint with _ or dummy
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1846
diff
changeset
|
1438 |
WeakCallableDict, _data_log, _status, fvalue, _buffer_list = data_tuple |
239
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1439 |
if len(WeakCallableDict) == 0: |
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1440 |
# Callable Dict is empty. |
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1441 |
# This variable is not needed anymore! |
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1442 |
IECPathsToPop.append(IECPath) |
355 | 1443 |
elif IECPath != "__tick__": |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1444 |
# Convert |
1740
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
1445 |
Idx, IEC_Type = self._IECPathToIdx.get(IECPath, (None, None)) |
239
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1446 |
if Idx is not None: |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1447 |
if IEC_Type in DebugTypesSize: |
592 | 1448 |
Idxs.append((Idx, IEC_Type, fvalue, IECPath)) |
1449 |
else: |
|
1734
750eeb7230a1
clean-up: fix some PEP8 E228 missing whitespace around modulo operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1733
diff
changeset
|
1450 |
self.logger.write_warning(_("Debug: Unsupported type to debug '%s'\n") % IEC_Type) |
239
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1451 |
else: |
1734
750eeb7230a1
clean-up: fix some PEP8 E228 missing whitespace around modulo operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1733
diff
changeset
|
1452 |
self.logger.write_warning(_("Debug: Unknown variable '%s'\n") % IECPath) |
239
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1453 |
for IECPathToPop in IECPathsToPop: |
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1454 |
self.IECdebug_datas.pop(IECPathToPop) |
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1455 |
|
457 | 1456 |
if Idxs: |
1457 |
Idxs.sort() |
|
1433
4a45f6642523
Moved trace buffer unpacking in the IDE. Latest traced variable samples are now passed as a single string
Edouard Tisserant
parents:
1432
diff
changeset
|
1458 |
IdxsT = zip(*Idxs) |
4a45f6642523
Moved trace buffer unpacking in the IDE. Latest traced variable samples are now passed as a single string
Edouard Tisserant
parents:
1432
diff
changeset
|
1459 |
self.TracedIECPath = IdxsT[3] |
4a45f6642523
Moved trace buffer unpacking in the IDE. Latest traced variable samples are now passed as a single string
Edouard Tisserant
parents:
1432
diff
changeset
|
1460 |
self.TracedIECTypes = IdxsT[1] |
4a45f6642523
Moved trace buffer unpacking in the IDE. Latest traced variable samples are now passed as a single string
Edouard Tisserant
parents:
1432
diff
changeset
|
1461 |
self._connector.SetTraceVariablesList(zip(*IdxsT[0:3])) |
465
67d32a91d70b
Fixes in debug + reconnect to running PLC
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents:
464
diff
changeset
|
1462 |
else: |
67d32a91d70b
Fixes in debug + reconnect to running PLC
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents:
464
diff
changeset
|
1463 |
self.TracedIECPath = [] |
67d32a91d70b
Fixes in debug + reconnect to running PLC
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents:
464
diff
changeset
|
1464 |
self._connector.SetTraceVariablesList([]) |
1363
e87e0166d0a7
Added new debug process separating non-wx thread extracting debug values from connector and 10 Hz wx timer refreshing Beremiz debug Viewers and communicating throw double-buffering, to avoid segmentation faults and optimize CPU usage
Laurent Bessard
parents:
1330
diff
changeset
|
1465 |
self.SnapshotAndResetDebugValuesBuffers() |
239
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1466 |
self.IECdebug_lock.release() |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1467 |
|
1146 | 1468 |
def IsPLCStarted(self): |
1469 |
return self.previous_plcstate == "Started" |
|
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1470 |
|
243 | 1471 |
def ReArmDebugRegisterTimer(self): |
1472 |
if self.DebugTimer is not None: |
|
1473 |
self.DebugTimer.cancel() |
|
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1474 |
|
1089
5cd1f8df71aa
Fixed bug when transferring program and a output located variable is forced
Laurent Bessard
parents:
1080
diff
changeset
|
1475 |
# Prevent to call RegisterDebugVarToConnector when PLC is not started |
5cd1f8df71aa
Fixed bug when transferring program and a output located variable is forced
Laurent Bessard
parents:
1080
diff
changeset
|
1476 |
# If an output location var is forced it's leads to segmentation fault in runtime |
5cd1f8df71aa
Fixed bug when transferring program and a output located variable is forced
Laurent Bessard
parents:
1080
diff
changeset
|
1477 |
# Links between PLC located variables and real variables are not ready |
1146 | 1478 |
if self.IsPLCStarted(): |
1089
5cd1f8df71aa
Fixed bug when transferring program and a output located variable is forced
Laurent Bessard
parents:
1080
diff
changeset
|
1479 |
# Timer to prevent rapid-fire when registering many variables |
5cd1f8df71aa
Fixed bug when transferring program and a output located variable is forced
Laurent Bessard
parents:
1080
diff
changeset
|
1480 |
# use wx.CallAfter use keep using same thread. TODO : use wx.Timer instead |
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1742
diff
changeset
|
1481 |
self.DebugTimer = Timer(0.5, wx.CallAfter, args=[self.RegisterDebugVarToConnector]) |
1089
5cd1f8df71aa
Fixed bug when transferring program and a output located variable is forced
Laurent Bessard
parents:
1080
diff
changeset
|
1482 |
# Rearm anti-rapid-fire timer |
5cd1f8df71aa
Fixed bug when transferring program and a output located variable is forced
Laurent Bessard
parents:
1080
diff
changeset
|
1483 |
self.DebugTimer.start() |
243 | 1484 |
|
463
961bddcfc913
Adding support for forcing PLC variable (still command to PLC to implement)
laurent
parents:
462
diff
changeset
|
1485 |
def GetDebugIECVariableType(self, IECPath): |
1847
6198190bc121
explicitly mark unused variables found by pylint with _ or dummy
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1846
diff
changeset
|
1486 |
_Idx, IEC_Type = self._IECPathToIdx.get(IECPath, (None, None)) |
463
961bddcfc913
Adding support for forcing PLC variable (still command to PLC to implement)
laurent
parents:
462
diff
changeset
|
1487 |
return IEC_Type |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1488 |
|
1430 | 1489 |
def SubscribeDebugIECVariable(self, IECPath, callableobj, buffer_list=False): |
239
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1490 |
""" |
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1491 |
Dispatching use a dictionnary linking IEC variable paths |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1492 |
to a WeakKeyDictionary linking |
1430 | 1493 |
weakly referenced callables |
239
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1494 |
""" |
1775
b45f2768fab1
clean-up: fix PEP8 E713 test for membership should be 'not in'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1768
diff
changeset
|
1495 |
if IECPath != "__tick__" and IECPath not in self._IECPathToIdx: |
246 | 1496 |
return None |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1497 |
|
239
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1498 |
self.IECdebug_lock.acquire() |
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1499 |
# If no entry exist, create a new one with a fresh WeakKeyDictionary |
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1500 |
IECdebug_data = self.IECdebug_datas.get(IECPath, None) |
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1501 |
if IECdebug_data is None: |
1754
63f4af6bf6d9
clean-up: fix most PEP8 E221 multiple spaces before operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1752
diff
changeset
|
1502 |
IECdebug_data = [ |
1878
fb73a6b6622d
fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1861
diff
changeset
|
1503 |
WeakKeyDictionary(), # Callables |
fb73a6b6622d
fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1861
diff
changeset
|
1504 |
[], # Data storage [(tick, data),...] |
fb73a6b6622d
fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1861
diff
changeset
|
1505 |
"Registered", # Variable status |
fb73a6b6622d
fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1861
diff
changeset
|
1506 |
None, |
fb73a6b6622d
fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1861
diff
changeset
|
1507 |
buffer_list] # Forced value |
239
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1508 |
self.IECdebug_datas[IECPath] = IECdebug_data |
1365
debc97102b23
Added support for optimizing debug, preventing to filling buffers with only the last value for debug data consumers that only show the current state
Laurent Bessard
parents:
1364
diff
changeset
|
1509 |
else: |
debc97102b23
Added support for optimizing debug, preventing to filling buffers with only the last value for debug data consumers that only show the current state
Laurent Bessard
parents:
1364
diff
changeset
|
1510 |
IECdebug_data[4] |= buffer_list |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1511 |
|
1742
92932cd370a4
clean-up: fix PEP8 E225 missing whitespace around operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1741
diff
changeset
|
1512 |
IECdebug_data[0][callableobj] = buffer_list |
239
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1513 |
|
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1514 |
self.IECdebug_lock.release() |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1515 |
|
243 | 1516 |
self.ReArmDebugRegisterTimer() |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1517 |
|
239
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1518 |
return IECdebug_data[1] |
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1519 |
|
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1520 |
def UnsubscribeDebugIECVariable(self, IECPath, callableobj): |
243 | 1521 |
self.IECdebug_lock.acquire() |
239
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1522 |
IECdebug_data = self.IECdebug_datas.get(IECPath, None) |
243 | 1523 |
if IECdebug_data is not None: |
1740
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
1524 |
IECdebug_data[0].pop(callableobj, None) |
1255
ff59c6a8b793
Fixed bug forced debug variable not released when unsubscribed and re-subscribed while PLC is stopped
Laurent Bessard
parents:
1176
diff
changeset
|
1525 |
if len(IECdebug_data[0]) == 0: |
ff59c6a8b793
Fixed bug forced debug variable not released when unsubscribed and re-subscribed while PLC is stopped
Laurent Bessard
parents:
1176
diff
changeset
|
1526 |
self.IECdebug_datas.pop(IECPath) |
1365
debc97102b23
Added support for optimizing debug, preventing to filling buffers with only the last value for debug data consumers that only show the current state
Laurent Bessard
parents:
1364
diff
changeset
|
1527 |
else: |
debc97102b23
Added support for optimizing debug, preventing to filling buffers with only the last value for debug data consumers that only show the current state
Laurent Bessard
parents:
1364
diff
changeset
|
1528 |
IECdebug_data[4] = reduce( |
1745
f9d32913bad4
clean-up: fix PEP8 E227 missing whitespace around bitwise or shift operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1744
diff
changeset
|
1529 |
lambda x, y: x | y, |
1430 | 1530 |
IECdebug_data[0].itervalues(), |
1365
debc97102b23
Added support for optimizing debug, preventing to filling buffers with only the last value for debug data consumers that only show the current state
Laurent Bessard
parents:
1364
diff
changeset
|
1531 |
False) |
243 | 1532 |
self.IECdebug_lock.release() |
1533 |
||
1534 |
self.ReArmDebugRegisterTimer() |
|
239
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1535 |
|
334
b4131e5d10a4
Adding support for unsubscribe all variables while transferring
lbessard
parents:
328
diff
changeset
|
1536 |
def UnsubscribeAllDebugIECVariable(self): |
b4131e5d10a4
Adding support for unsubscribe all variables while transferring
lbessard
parents:
328
diff
changeset
|
1537 |
self.IECdebug_lock.acquire() |
1089
5cd1f8df71aa
Fixed bug when transferring program and a output located variable is forced
Laurent Bessard
parents:
1080
diff
changeset
|
1538 |
self.IECdebug_datas = {} |
334
b4131e5d10a4
Adding support for unsubscribe all variables while transferring
lbessard
parents:
328
diff
changeset
|
1539 |
self.IECdebug_lock.release() |
b4131e5d10a4
Adding support for unsubscribe all variables while transferring
lbessard
parents:
328
diff
changeset
|
1540 |
|
355 | 1541 |
self.ReArmDebugRegisterTimer() |
1542 |
||
474 | 1543 |
def ForceDebugIECVariable(self, IECPath, fvalue): |
1775
b45f2768fab1
clean-up: fix PEP8 E713 test for membership should be 'not in'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1768
diff
changeset
|
1544 |
if IECPath not in self.IECdebug_datas: |
474 | 1545 |
return |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1546 |
|
474 | 1547 |
self.IECdebug_lock.acquire() |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1548 |
|
474 | 1549 |
# If no entry exist, create a new one with a fresh WeakKeyDictionary |
1550 |
IECdebug_data = self.IECdebug_datas.get(IECPath, None) |
|
1551 |
IECdebug_data[2] = "Forced" |
|
1552 |
IECdebug_data[3] = fvalue |
|
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1553 |
|
474 | 1554 |
self.IECdebug_lock.release() |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1555 |
|
474 | 1556 |
self.ReArmDebugRegisterTimer() |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1557 |
|
463
961bddcfc913
Adding support for forcing PLC variable (still command to PLC to implement)
laurent
parents:
462
diff
changeset
|
1558 |
def ReleaseDebugIECVariable(self, IECPath): |
1775
b45f2768fab1
clean-up: fix PEP8 E713 test for membership should be 'not in'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1768
diff
changeset
|
1559 |
if IECPath not in self.IECdebug_datas: |
474 | 1560 |
return |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1561 |
|
474 | 1562 |
self.IECdebug_lock.acquire() |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1563 |
|
474 | 1564 |
# If no entry exist, create a new one with a fresh WeakKeyDictionary |
1565 |
IECdebug_data = self.IECdebug_datas.get(IECPath, None) |
|
1566 |
IECdebug_data[2] = "Registered" |
|
1567 |
IECdebug_data[3] = None |
|
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1568 |
|
474 | 1569 |
self.IECdebug_lock.release() |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1570 |
|
474 | 1571 |
self.ReArmDebugRegisterTimer() |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1572 |
|
355 | 1573 |
def CallWeakcallables(self, IECPath, function_name, *cargs): |
1574 |
data_tuple = self.IECdebug_datas.get(IECPath, None) |
|
1575 |
if data_tuple 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
|
1576 |
WeakCallableDict, _data_log, _status, _fvalue, buffer_list = data_tuple |
1782
5b6ad7a7fd9d
clean-up: fix PEP8 E265 block comment should start with '# '
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1780
diff
changeset
|
1577 |
# data_log.append((debug_tick, value)) |
1740
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
1578 |
for weakcallable, buffer_list in WeakCallableDict.iteritems(): |
355 | 1579 |
function = getattr(weakcallable, function_name, None) |
1580 |
if function is not None: |
|
1365
debc97102b23
Added support for optimizing debug, preventing to filling buffers with only the last value for debug data consumers that only show the current state
Laurent Bessard
parents:
1364
diff
changeset
|
1581 |
if buffer_list: |
1430 | 1582 |
function(*cargs) |
474 | 1583 |
else: |
1430 | 1584 |
function(*tuple([lst[-1] for lst in cargs])) |
334
b4131e5d10a4
Adding support for unsubscribe all variables while transferring
lbessard
parents:
328
diff
changeset
|
1585 |
|
670
fb03cb6da95c
Adding support for extracting Common_Ticktime from VARIABLES.csv
laurent
parents:
669
diff
changeset
|
1586 |
def GetTicktime(self): |
fb03cb6da95c
Adding support for extracting Common_Ticktime from VARIABLES.csv
laurent
parents:
669
diff
changeset
|
1587 |
return self._Ticktime |
fb03cb6da95c
Adding support for extracting Common_Ticktime from VARIABLES.csv
laurent
parents:
669
diff
changeset
|
1588 |
|
699
6ff64cadb1ff
Adding support for executing python scripts on remote runtime
laurent
parents:
696
diff
changeset
|
1589 |
def RemoteExec(self, script, **kwargs): |
6ff64cadb1ff
Adding support for executing python scripts on remote runtime
laurent
parents:
696
diff
changeset
|
1590 |
if self._connector is None: |
703
2f7b3d1de278
Adding support for selecting plugin parameter value from a tree of available values
laurent
parents:
699
diff
changeset
|
1591 |
return -1, "No runtime connected!" |
699
6ff64cadb1ff
Adding support for executing python scripts on remote runtime
laurent
parents:
696
diff
changeset
|
1592 |
return self._connector.RemoteExec(script, **kwargs) |
6ff64cadb1ff
Adding support for executing python scripts on remote runtime
laurent
parents:
696
diff
changeset
|
1593 |
|
235 | 1594 |
def DebugThreadProc(self): |
239
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1595 |
""" |
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1596 |
This thread waid PLC debug data, and dispatch them to subscribers |
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1597 |
""" |
286
a2a8a52b0d4f
Minor changes to get better cleanup of debug and python_eval threads, accross multiple debug sessions and PLC runs.
etisserant
parents:
283
diff
changeset
|
1598 |
self.debug_break = False |
461
bcbc472c0ba8
Safer debug
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents:
460
diff
changeset
|
1599 |
debug_getvar_retry = 0 |
286
a2a8a52b0d4f
Minor changes to get better cleanup of debug and python_eval threads, accross multiple debug sessions and PLC runs.
etisserant
parents:
283
diff
changeset
|
1600 |
while (not self.debug_break) and (self._connector is not None): |
1434
6e0cd0ceabb7
Added runtime side trace buffer, handled in a separate thread, limited to 1MB, and dropped after 3 seconds if not used by IDE. GetTraceVariables is not anymore blocking on next PLC cycle
Edouard Tisserant
parents:
1433
diff
changeset
|
1601 |
plc_status, Traces = self._connector.GetTraceVariables() |
578 | 1602 |
debug_getvar_retry += 1 |
1782
5b6ad7a7fd9d
clean-up: fix PEP8 E265 block comment should start with '# '
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1780
diff
changeset
|
1603 |
# print [dict.keys() for IECPath, (dict, log, status, fvalue) in self.IECdebug_datas.items()] |
1739
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1604 |
if plc_status == "Started": |
1434
6e0cd0ceabb7
Added runtime side trace buffer, handled in a separate thread, limited to 1MB, and dropped after 3 seconds if not used by IDE. GetTraceVariables is not anymore blocking on next PLC cycle
Edouard Tisserant
parents:
1433
diff
changeset
|
1605 |
if len(Traces) > 0: |
6e0cd0ceabb7
Added runtime side trace buffer, handled in a separate thread, limited to 1MB, and dropped after 3 seconds if not used by IDE. GetTraceVariables is not anymore blocking on next PLC cycle
Edouard Tisserant
parents:
1433
diff
changeset
|
1606 |
self.IECdebug_lock.acquire() |
1739
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1607 |
for debug_tick, debug_buff in Traces: |
1434
6e0cd0ceabb7
Added runtime side trace buffer, handled in a separate thread, limited to 1MB, and dropped after 3 seconds if not used by IDE. GetTraceVariables is not anymore blocking on next PLC cycle
Edouard Tisserant
parents:
1433
diff
changeset
|
1608 |
debug_vars = UnpackDebugBuffer(debug_buff, self.TracedIECTypes) |
1766
c1e5b9f19483
clean-up: fix PEP8 E129 visually indented line with same indent as next logical line
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1764
diff
changeset
|
1609 |
if debug_vars is not None and len(debug_vars) == len(self.TracedIECPath): |
1434
6e0cd0ceabb7
Added runtime side trace buffer, handled in a separate thread, limited to 1MB, and dropped after 3 seconds if not used by IDE. GetTraceVariables is not anymore blocking on next PLC cycle
Edouard Tisserant
parents:
1433
diff
changeset
|
1610 |
for IECPath, values_buffer, value in izip( |
6e0cd0ceabb7
Added runtime side trace buffer, handled in a separate thread, limited to 1MB, and dropped after 3 seconds if not used by IDE. GetTraceVariables is not anymore blocking on next PLC cycle
Edouard Tisserant
parents:
1433
diff
changeset
|
1611 |
self.TracedIECPath, |
6e0cd0ceabb7
Added runtime side trace buffer, handled in a separate thread, limited to 1MB, and dropped after 3 seconds if not used by IDE. GetTraceVariables is not anymore blocking on next PLC cycle
Edouard Tisserant
parents:
1433
diff
changeset
|
1612 |
self.DebugValuesBuffers, |
6e0cd0ceabb7
Added runtime side trace buffer, handled in a separate thread, limited to 1MB, and dropped after 3 seconds if not used by IDE. GetTraceVariables is not anymore blocking on next PLC cycle
Edouard Tisserant
parents:
1433
diff
changeset
|
1613 |
debug_vars): |
1760
ed2e2afb9573
clean-up: fix PEP8 E262 inline comment should start with '# '
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1758
diff
changeset
|
1614 |
IECdebug_data = self.IECdebug_datas.get(IECPath, None) # FIXME get |
1434
6e0cd0ceabb7
Added runtime side trace buffer, handled in a separate thread, limited to 1MB, and dropped after 3 seconds if not used by IDE. GetTraceVariables is not anymore blocking on next PLC cycle
Edouard Tisserant
parents:
1433
diff
changeset
|
1615 |
if IECdebug_data is not None and value is not None: |
6e0cd0ceabb7
Added runtime side trace buffer, handled in a separate thread, limited to 1MB, and dropped after 3 seconds if not used by IDE. GetTraceVariables is not anymore blocking on next PLC cycle
Edouard Tisserant
parents:
1433
diff
changeset
|
1616 |
forced = IECdebug_data[2:4] == ["Forced", value] |
6e0cd0ceabb7
Added runtime side trace buffer, handled in a separate thread, limited to 1MB, and dropped after 3 seconds if not used by IDE. GetTraceVariables is not anymore blocking on next PLC cycle
Edouard Tisserant
parents:
1433
diff
changeset
|
1617 |
if not IECdebug_data[4] and len(values_buffer) > 0: |
6e0cd0ceabb7
Added runtime side trace buffer, handled in a separate thread, limited to 1MB, and dropped after 3 seconds if not used by IDE. GetTraceVariables is not anymore blocking on next PLC cycle
Edouard Tisserant
parents:
1433
diff
changeset
|
1618 |
values_buffer[-1] = (value, forced) |
6e0cd0ceabb7
Added runtime side trace buffer, handled in a separate thread, limited to 1MB, and dropped after 3 seconds if not used by IDE. GetTraceVariables is not anymore blocking on next PLC cycle
Edouard Tisserant
parents:
1433
diff
changeset
|
1619 |
else: |
6e0cd0ceabb7
Added runtime side trace buffer, handled in a separate thread, limited to 1MB, and dropped after 3 seconds if not used by IDE. GetTraceVariables is not anymore blocking on next PLC cycle
Edouard Tisserant
parents:
1433
diff
changeset
|
1620 |
values_buffer.append((value, forced)) |
6e0cd0ceabb7
Added runtime side trace buffer, handled in a separate thread, limited to 1MB, and dropped after 3 seconds if not used by IDE. GetTraceVariables is not anymore blocking on next PLC cycle
Edouard Tisserant
parents:
1433
diff
changeset
|
1621 |
self.DebugTicks.append(debug_tick) |
6e0cd0ceabb7
Added runtime side trace buffer, handled in a separate thread, limited to 1MB, and dropped after 3 seconds if not used by IDE. GetTraceVariables is not anymore blocking on next PLC cycle
Edouard Tisserant
parents:
1433
diff
changeset
|
1622 |
debug_getvar_retry = 0 |
6e0cd0ceabb7
Added runtime side trace buffer, handled in a separate thread, limited to 1MB, and dropped after 3 seconds if not used by IDE. GetTraceVariables is not anymore blocking on next PLC cycle
Edouard Tisserant
parents:
1433
diff
changeset
|
1623 |
self.IECdebug_lock.release() |
6e0cd0ceabb7
Added runtime side trace buffer, handled in a separate thread, limited to 1MB, and dropped after 3 seconds if not used by IDE. GetTraceVariables is not anymore blocking on next PLC cycle
Edouard Tisserant
parents:
1433
diff
changeset
|
1624 |
|
578 | 1625 |
if debug_getvar_retry != 0: |
1434
6e0cd0ceabb7
Added runtime side trace buffer, handled in a separate thread, limited to 1MB, and dropped after 3 seconds if not used by IDE. GetTraceVariables is not anymore blocking on next PLC cycle
Edouard Tisserant
parents:
1433
diff
changeset
|
1626 |
# Be patient, tollerate PLC to come with fresh samples |
460
73a53278833b
Safer debug unpack result checking, more verbose error message, slower retry when waiting PLC startup
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents:
459
diff
changeset
|
1627 |
time.sleep(0.1) |
578 | 1628 |
else: |
1629 |
self.debug_break = True |
|
689 | 1630 |
self.logger.write(_("Debugger disabled\n")) |
1631 |
self.DebugThread = None |
|
1363
e87e0166d0a7
Added new debug process separating non-wx thread extracting debug values from connector and 10 Hz wx timer refreshing Beremiz debug Viewers and communicating throw double-buffering, to avoid segmentation faults and optimize CPU usage
Laurent Bessard
parents:
1330
diff
changeset
|
1632 |
if self.DispatchDebugValuesTimer is not None: |
e87e0166d0a7
Added new debug process separating non-wx thread extracting debug values from connector and 10 Hz wx timer refreshing Beremiz debug Viewers and communicating throw double-buffering, to avoid segmentation faults and optimize CPU usage
Laurent Bessard
parents:
1330
diff
changeset
|
1633 |
self.DispatchDebugValuesTimer.Stop() |
e87e0166d0a7
Added new debug process separating non-wx thread extracting debug values from connector and 10 Hz wx timer refreshing Beremiz debug Viewers and communicating throw double-buffering, to avoid segmentation faults and optimize CPU usage
Laurent Bessard
parents:
1330
diff
changeset
|
1634 |
|
e87e0166d0a7
Added new debug process separating non-wx thread extracting debug values from connector and 10 Hz wx timer refreshing Beremiz debug Viewers and communicating throw double-buffering, to avoid segmentation faults and optimize CPU usage
Laurent Bessard
parents:
1330
diff
changeset
|
1635 |
def DispatchDebugValuesProc(self, event): |
e87e0166d0a7
Added new debug process separating non-wx thread extracting debug values from connector and 10 Hz wx timer refreshing Beremiz debug Viewers and communicating throw double-buffering, to avoid segmentation faults and optimize CPU usage
Laurent Bessard
parents:
1330
diff
changeset
|
1636 |
self.IECdebug_lock.acquire() |
e87e0166d0a7
Added new debug process separating non-wx thread extracting debug values from connector and 10 Hz wx timer refreshing Beremiz debug Viewers and communicating throw double-buffering, to avoid segmentation faults and optimize CPU usage
Laurent Bessard
parents:
1330
diff
changeset
|
1637 |
debug_ticks, buffers = self.SnapshotAndResetDebugValuesBuffers() |
e87e0166d0a7
Added new debug process separating non-wx thread extracting debug values from connector and 10 Hz wx timer refreshing Beremiz debug Viewers and communicating throw double-buffering, to avoid segmentation faults and optimize CPU usage
Laurent Bessard
parents:
1330
diff
changeset
|
1638 |
self.IECdebug_lock.release() |
1366
3756ae754713
Fixed refresh speed so that interface is not blocked when debugging
Laurent Bessard
parents:
1365
diff
changeset
|
1639 |
start_time = time.time() |
1363
e87e0166d0a7
Added new debug process separating non-wx thread extracting debug values from connector and 10 Hz wx timer refreshing Beremiz debug Viewers and communicating throw double-buffering, to avoid segmentation faults and optimize CPU usage
Laurent Bessard
parents:
1330
diff
changeset
|
1640 |
if len(self.TracedIECPath) == len(buffers): |
1433
4a45f6642523
Moved trace buffer unpacking in the IDE. Latest traced variable samples are now passed as a single string
Edouard Tisserant
parents:
1432
diff
changeset
|
1641 |
for IECPath, values in izip(self.TracedIECPath, buffers): |
1363
e87e0166d0a7
Added new debug process separating non-wx thread extracting debug values from connector and 10 Hz wx timer refreshing Beremiz debug Viewers and communicating throw double-buffering, to avoid segmentation faults and optimize CPU usage
Laurent Bessard
parents:
1330
diff
changeset
|
1642 |
if len(values) > 0: |
e87e0166d0a7
Added new debug process separating non-wx thread extracting debug values from connector and 10 Hz wx timer refreshing Beremiz debug Viewers and communicating throw double-buffering, to avoid segmentation faults and optimize CPU usage
Laurent Bessard
parents:
1330
diff
changeset
|
1643 |
self.CallWeakcallables(IECPath, "NewValues", debug_ticks, values) |
e87e0166d0a7
Added new debug process separating non-wx thread extracting debug values from connector and 10 Hz wx timer refreshing Beremiz debug Viewers and communicating throw double-buffering, to avoid segmentation faults and optimize CPU usage
Laurent Bessard
parents:
1330
diff
changeset
|
1644 |
if len(debug_ticks) > 0: |
e87e0166d0a7
Added new debug process separating non-wx thread extracting debug values from connector and 10 Hz wx timer refreshing Beremiz debug Viewers and communicating throw double-buffering, to avoid segmentation faults and optimize CPU usage
Laurent Bessard
parents:
1330
diff
changeset
|
1645 |
self.CallWeakcallables("__tick__", "NewDataAvailable", debug_ticks) |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1646 |
|
1366
3756ae754713
Fixed refresh speed so that interface is not blocked when debugging
Laurent Bessard
parents:
1365
diff
changeset
|
1647 |
delay = time.time() - start_time |
3756ae754713
Fixed refresh speed so that interface is not blocked when debugging
Laurent Bessard
parents:
1365
diff
changeset
|
1648 |
next_refresh = max(REFRESH_PERIOD - delay, 0.2 * delay) |
3756ae754713
Fixed refresh speed so that interface is not blocked when debugging
Laurent Bessard
parents:
1365
diff
changeset
|
1649 |
if self.DispatchDebugValuesTimer is not None and self.DebugThread is not None: |
3756ae754713
Fixed refresh speed so that interface is not blocked when debugging
Laurent Bessard
parents:
1365
diff
changeset
|
1650 |
self.DispatchDebugValuesTimer.Start( |
3756ae754713
Fixed refresh speed so that interface is not blocked when debugging
Laurent Bessard
parents:
1365
diff
changeset
|
1651 |
int(next_refresh * 1000), oneShot=True) |
1363
e87e0166d0a7
Added new debug process separating non-wx thread extracting debug values from connector and 10 Hz wx timer refreshing Beremiz debug Viewers and communicating throw double-buffering, to avoid segmentation faults and optimize CPU usage
Laurent Bessard
parents:
1330
diff
changeset
|
1652 |
event.Skip() |
235 | 1653 |
|
286
a2a8a52b0d4f
Minor changes to get better cleanup of debug and python_eval threads, accross multiple debug sessions and PLC runs.
etisserant
parents:
283
diff
changeset
|
1654 |
def KillDebugThread(self): |
703
2f7b3d1de278
Adding support for selecting plugin parameter value from a tree of available values
laurent
parents:
699
diff
changeset
|
1655 |
tmp_debugthread = self.DebugThread |
286
a2a8a52b0d4f
Minor changes to get better cleanup of debug and python_eval threads, accross multiple debug sessions and PLC runs.
etisserant
parents:
283
diff
changeset
|
1656 |
self.debug_break = True |
703
2f7b3d1de278
Adding support for selecting plugin parameter value from a tree of available values
laurent
parents:
699
diff
changeset
|
1657 |
if tmp_debugthread is not None: |
624
8e74266033f8
Updated console messages for build and stop
Edouard Tisserant
parents:
623
diff
changeset
|
1658 |
self.logger.writeyield(_("Stopping debugger...\n")) |
703
2f7b3d1de278
Adding support for selecting plugin parameter value from a tree of available values
laurent
parents:
699
diff
changeset
|
1659 |
tmp_debugthread.join(timeout=5) |
2f7b3d1de278
Adding support for selecting plugin parameter value from a tree of available values
laurent
parents:
699
diff
changeset
|
1660 |
if tmp_debugthread.isAlive() and self.logger: |
624
8e74266033f8
Updated console messages for build and stop
Edouard Tisserant
parents:
623
diff
changeset
|
1661 |
self.logger.write_warning(_("Couldn't stop debugger.\n")) |
578 | 1662 |
else: |
624
8e74266033f8
Updated console messages for build and stop
Edouard Tisserant
parents:
623
diff
changeset
|
1663 |
self.logger.write(_("Debugger stopped.\n")) |
286
a2a8a52b0d4f
Minor changes to get better cleanup of debug and python_eval threads, accross multiple debug sessions and PLC runs.
etisserant
parents:
283
diff
changeset
|
1664 |
self.DebugThread = None |
1363
e87e0166d0a7
Added new debug process separating non-wx thread extracting debug values from connector and 10 Hz wx timer refreshing Beremiz debug Viewers and communicating throw double-buffering, to avoid segmentation faults and optimize CPU usage
Laurent Bessard
parents:
1330
diff
changeset
|
1665 |
if self.DispatchDebugValuesTimer is not None: |
e87e0166d0a7
Added new debug process separating non-wx thread extracting debug values from connector and 10 Hz wx timer refreshing Beremiz debug Viewers and communicating throw double-buffering, to avoid segmentation faults and optimize CPU usage
Laurent Bessard
parents:
1330
diff
changeset
|
1666 |
self.DispatchDebugValuesTimer.Stop() |
286
a2a8a52b0d4f
Minor changes to get better cleanup of debug and python_eval threads, accross multiple debug sessions and PLC runs.
etisserant
parents:
283
diff
changeset
|
1667 |
|
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1668 |
def _connect_debug(self): |
914
94436558f0ce
More stable logging. Added small one-entry log for loading errors. Test now include python side concurrent logging
Edouard Tisserant
parents:
911
diff
changeset
|
1669 |
self.previous_plcstate = None |
465
67d32a91d70b
Fixes in debug + reconnect to running PLC
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents:
464
diff
changeset
|
1670 |
if self.AppFrame: |
67d32a91d70b
Fixes in debug + reconnect to running PLC
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents:
464
diff
changeset
|
1671 |
self.AppFrame.ResetGraphicViewers() |
67d32a91d70b
Fixes in debug + reconnect to running PLC
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents:
464
diff
changeset
|
1672 |
self.RegisterDebugVarToConnector() |
1363
e87e0166d0a7
Added new debug process separating non-wx thread extracting debug values from connector and 10 Hz wx timer refreshing Beremiz debug Viewers and communicating throw double-buffering, to avoid segmentation faults and optimize CPU usage
Laurent Bessard
parents:
1330
diff
changeset
|
1673 |
if self.DispatchDebugValuesTimer is not None: |
1366
3756ae754713
Fixed refresh speed so that interface is not blocked when debugging
Laurent Bessard
parents:
1365
diff
changeset
|
1674 |
self.DispatchDebugValuesTimer.Start( |
3756ae754713
Fixed refresh speed so that interface is not blocked when debugging
Laurent Bessard
parents:
1365
diff
changeset
|
1675 |
int(REFRESH_PERIOD * 1000), oneShot=True) |
578 | 1676 |
if self.DebugThread is None: |
1677 |
self.DebugThread = Thread(target=self.DebugThreadProc) |
|
1678 |
self.DebugThread.start() |
|
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1679 |
|
462
274e83a5534e
Now debug is not a button anymore
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents:
461
diff
changeset
|
1680 |
def _Run(self): |
203 | 1681 |
""" |
464
46dd4358e8a8
Fixes in run : messages and refresh
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents:
463
diff
changeset
|
1682 |
Start PLC |
203 | 1683 |
""" |
350
a3a5561bde1d
- now call load, start, free PLC from the python Thread
greg
parents:
348
diff
changeset
|
1684 |
if self.GetIECProgramsAndVariables(): |
462
274e83a5534e
Now debug is not a button anymore
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents:
461
diff
changeset
|
1685 |
self._connector.StartPLC() |
464
46dd4358e8a8
Fixes in run : messages and refresh
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents:
463
diff
changeset
|
1686 |
self.logger.write(_("Starting PLC\n")) |
465
67d32a91d70b
Fixes in debug + reconnect to running PLC
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents:
464
diff
changeset
|
1687 |
self._connect_debug() |
203 | 1688 |
else: |
464
46dd4358e8a8
Fixes in run : messages and refresh
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents:
463
diff
changeset
|
1689 |
self.logger.write_error(_("Couldn't start PLC !\n")) |
675
44b35c27e9ff
Adding support for quickly open recent projects in file menu
laurent
parents:
674
diff
changeset
|
1690 |
wx.CallAfter(self.UpdateMethodsFromPLCStatus) |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1691 |
|
203 | 1692 |
def _Stop(self): |
1693 |
""" |
|
1694 |
Stop PLC |
|
1695 |
""" |
|
483
bc26c42d2eec
fixed greg's crap in win32, enhanced debug stability, implemented preliminary retain
edouard
parents:
481
diff
changeset
|
1696 |
if self._connector is not None and not self._connector.StopPLC(): |
bc26c42d2eec
fixed greg's crap in win32, enhanced debug stability, implemented preliminary retain
edouard
parents:
481
diff
changeset
|
1697 |
self.logger.write_error(_("Couldn't stop PLC !\n")) |
bc26c42d2eec
fixed greg's crap in win32, enhanced debug stability, implemented preliminary retain
edouard
parents:
481
diff
changeset
|
1698 |
|
689 | 1699 |
# debugthread should die on his own |
1782
5b6ad7a7fd9d
clean-up: fix PEP8 E265 block comment should start with '# '
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1780
diff
changeset
|
1700 |
# self.KillDebugThread() |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1701 |
|
675
44b35c27e9ff
Adding support for quickly open recent projects in file menu
laurent
parents:
674
diff
changeset
|
1702 |
wx.CallAfter(self.UpdateMethodsFromPLCStatus) |
203 | 1703 |
|
1116
300f98a8d4c6
Fixed bug connector not resetted when connection is lost
Laurent Bessard
parents:
1105
diff
changeset
|
1704 |
def _SetConnector(self, connector, update_status=True): |
978 | 1705 |
self._connector = connector |
1706 |
if self.AppFrame is not None: |
|
1707 |
self.AppFrame.LogViewer.SetLogSource(connector) |
|
992 | 1708 |
if connector is not None: |
1396
bc14b43bd27f
Fixed non initialized timer causing exception in some rare cases (continued)
Edouard Tisserant
parents:
1395
diff
changeset
|
1709 |
if self.StatusTimer is not None: |
bc14b43bd27f
Fixed non initialized timer causing exception in some rare cases (continued)
Edouard Tisserant
parents:
1395
diff
changeset
|
1710 |
# Start the status Timer |
1524
70fc5688741e
fix non-working logging at first connection to PLC after Beremiz launch
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1517
diff
changeset
|
1711 |
wx.Yield() |
70fc5688741e
fix non-working logging at first connection to PLC after Beremiz launch
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1517
diff
changeset
|
1712 |
self.StatusTimer.Start(milliseconds=500, oneShot=False) |
992 | 1713 |
else: |
1395
bcd1e909076c
Fixed non initialized timer causing exception in some rare cases
Edouard Tisserant
parents:
1387
diff
changeset
|
1714 |
if self.StatusTimer is not None: |
1396
bc14b43bd27f
Fixed non initialized timer causing exception in some rare cases (continued)
Edouard Tisserant
parents:
1395
diff
changeset
|
1715 |
# Stop the status Timer |
1395
bcd1e909076c
Fixed non initialized timer causing exception in some rare cases
Edouard Tisserant
parents:
1387
diff
changeset
|
1716 |
self.StatusTimer.Stop() |
1116
300f98a8d4c6
Fixed bug connector not resetted when connection is lost
Laurent Bessard
parents:
1105
diff
changeset
|
1717 |
if update_status: |
300f98a8d4c6
Fixed bug connector not resetted when connection is lost
Laurent Bessard
parents:
1105
diff
changeset
|
1718 |
wx.CallAfter(self.UpdateMethodsFromPLCStatus) |
992 | 1719 |
|
203 | 1720 |
def _Connect(self): |
922
60fafd828a30
Better PLC log message time stamp display. Better console information when connecting.
Edouard Tisserant
parents:
921
diff
changeset
|
1721 |
# don't accept re-connetion if already connected |
203 | 1722 |
if self._connector is not None: |
361 | 1723 |
self.logger.write_error(_("Already connected. Please disconnect\n")) |
203 | 1724 |
return |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1725 |
|
203 | 1726 |
# Get connector uri |
1767
c74815729afd
clean-up: fix PEP8 E127 continuation line over-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1766
diff
changeset
|
1727 |
uri = self.BeremizRoot.getURI_location().strip() |
203 | 1728 |
|
1729 |
# if uri is empty launch discovery dialog |
|
1730 |
if uri == "": |
|
740
cee825fbe9b3
fixed exception when launching discovery dialog without network
Edouard Tisserant
parents:
738
diff
changeset
|
1731 |
try: |
cee825fbe9b3
fixed exception when launching discovery dialog without network
Edouard Tisserant
parents:
738
diff
changeset
|
1732 |
# Launch Service Discovery dialog |
cee825fbe9b3
fixed exception when launching discovery dialog without network
Edouard Tisserant
parents:
738
diff
changeset
|
1733 |
dialog = DiscoveryDialog(self.AppFrame) |
cee825fbe9b3
fixed exception when launching discovery dialog without network
Edouard Tisserant
parents:
738
diff
changeset
|
1734 |
answer = dialog.ShowModal() |
cee825fbe9b3
fixed exception when launching discovery dialog without network
Edouard Tisserant
parents:
738
diff
changeset
|
1735 |
uri = dialog.GetURI() |
cee825fbe9b3
fixed exception when launching discovery dialog without network
Edouard Tisserant
parents:
738
diff
changeset
|
1736 |
dialog.Destroy() |
1780
c52d1460cea8
clean-up: fix PEP8 E722 do not use bare except'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1779
diff
changeset
|
1737 |
except Exception: |
801
435e49e80832
Update list of messages to be translated for internationalization and french translations
laurent
parents:
796
diff
changeset
|
1738 |
self.logger.write_error(_("Local service discovery failed!\n")) |
763
c1104099c151
Now, PYRO:// locations also accept MDNS service names
Edouard Tisserant
parents:
758
diff
changeset
|
1739 |
self.logger.write_error(traceback.format_exc()) |
740
cee825fbe9b3
fixed exception when launching discovery dialog without network
Edouard Tisserant
parents:
738
diff
changeset
|
1740 |
uri = None |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1741 |
|
203 | 1742 |
# Nothing choosed or cancel button |
392
6617d3fb43e2
Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents:
382
diff
changeset
|
1743 |
if uri is None or answer == wx.ID_CANCEL: |
6617d3fb43e2
Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents:
382
diff
changeset
|
1744 |
self.logger.write_error(_("Connection canceled!\n")) |
203 | 1745 |
return |
1746 |
else: |
|
1776
81aa8aaccdd4
clean-up: fix PEP8 E122 continuation line missing indentation or outdented
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1775
diff
changeset
|
1747 |
self.BeremizRoot.setURI_location(uri) |
764
f338651eca36
Fix bug project not marked as modified when changing URI_Location using discovery dialog
laurent
parents:
758
diff
changeset
|
1748 |
self.ChangesToSave = True |
746
2e09777a40d3
Fix refresh of ConfTreeNodeEditors content when values change
laurent
parents:
742
diff
changeset
|
1749 |
if self._View is not None: |
2e09777a40d3
Fix refresh of ConfTreeNodeEditors content when values change
laurent
parents:
742
diff
changeset
|
1750 |
self._View.RefreshView() |
789
b1b1a8f85e2f
Adding support for saving editor choosen when editing project file for reloading project layout
laurent
parents:
786
diff
changeset
|
1751 |
if self.AppFrame is not None: |
764
f338651eca36
Fix bug project not marked as modified when changing URI_Location using discovery dialog
laurent
parents:
758
diff
changeset
|
1752 |
self.AppFrame.RefreshTitle() |
f338651eca36
Fix bug project not marked as modified when changing URI_Location using discovery dialog
laurent
parents:
758
diff
changeset
|
1753 |
self.AppFrame.RefreshFileMenu() |
f338651eca36
Fix bug project not marked as modified when changing URI_Location using discovery dialog
laurent
parents:
758
diff
changeset
|
1754 |
self.AppFrame.RefreshEditMenu() |
f338651eca36
Fix bug project not marked as modified when changing URI_Location using discovery dialog
laurent
parents:
758
diff
changeset
|
1755 |
self.AppFrame.RefreshPageTitles() |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1756 |
|
203 | 1757 |
# Get connector from uri |
1758 |
try: |
|
978 | 1759 |
self._SetConnector(connectors.ConnectorFactory(uri, self)) |
1846
14b40afccd69
remove unused variables found by pylint
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1836
diff
changeset
|
1760 |
except Exception: |
1734
750eeb7230a1
clean-up: fix some PEP8 E228 missing whitespace around modulo operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1733
diff
changeset
|
1761 |
self.logger.write_error(_("Exception while connecting %s!\n") % uri) |
203 | 1762 |
self.logger.write_error(traceback.format_exc()) |
1763 |
||
1764 |
# Did connection success ? |
|
1765 |
if self._connector is None: |
|
1766 |
# Oups. |
|
1734
750eeb7230a1
clean-up: fix some PEP8 E228 missing whitespace around modulo operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1733
diff
changeset
|
1767 |
self.logger.write_error(_("Connection failed to %s!\n") % uri) |
203 | 1768 |
else: |
1769 |
self.ShowMethod("_Connect", False) |
|
1770 |
self.ShowMethod("_Disconnect", True) |
|
1771 |
self.ShowMethod("_Transfer", True) |
|
1772 |
||
1773 |
self.CompareLocalAndRemotePLC() |
|
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1774 |
|
350
a3a5561bde1d
- now call load, start, free PLC from the python Thread
greg
parents:
348
diff
changeset
|
1775 |
# Init with actual PLC status and print it |
446
1edde533db19
Some cleanup in PLC status - removed that \"Starting\" state ...
ed
parents:
440
diff
changeset
|
1776 |
self.UpdateMethodsFromPLCStatus() |
1740
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
1777 |
if self.previous_plcstate in ["Started", "Stopped"]: |
465
67d32a91d70b
Fixes in debug + reconnect to running PLC
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents:
464
diff
changeset
|
1778 |
if self.DebugAvailable() and self.GetIECProgramsAndVariables(): |
922
60fafd828a30
Better PLC log message time stamp display. Better console information when connecting.
Edouard Tisserant
parents:
921
diff
changeset
|
1779 |
self.logger.write(_("Debugger ready\n")) |
465
67d32a91d70b
Fixes in debug + reconnect to running PLC
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents:
464
diff
changeset
|
1780 |
self._connect_debug() |
67d32a91d70b
Fixes in debug + reconnect to running PLC
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents:
464
diff
changeset
|
1781 |
else: |
922
60fafd828a30
Better PLC log message time stamp display. Better console information when connecting.
Edouard Tisserant
parents:
921
diff
changeset
|
1782 |
self.logger.write_warning(_("Debug does not match PLC - stop/transfert/start to re-enable\n")) |
203 | 1783 |
|
1784 |
def CompareLocalAndRemotePLC(self): |
|
1785 |
if self._connector is None: |
|
1786 |
return |
|
1787 |
# We are now connected. Update button status |
|
1788 |
MD5 = self.GetLastBuildMD5() |
|
1789 |
# Check remote target PLC correspondance to that md5 |
|
1790 |
if MD5 is not None: |
|
1791 |
if not self._connector.MatchMD5(MD5): |
|
1779
6cf16e5bfbf9
clean-up: fix PEP8 E115 expected an indented block (comment)
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1777
diff
changeset
|
1792 |
# self.logger.write_warning( |
6cf16e5bfbf9
clean-up: fix PEP8 E115 expected an indented block (comment)
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1777
diff
changeset
|
1793 |
# _("Latest build does not match with target, please transfer.\n")) |
203 | 1794 |
self.EnableMethod("_Transfer", True) |
1795 |
else: |
|
1779
6cf16e5bfbf9
clean-up: fix PEP8 E115 expected an indented block (comment)
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1777
diff
changeset
|
1796 |
# self.logger.write( |
6cf16e5bfbf9
clean-up: fix PEP8 E115 expected an indented block (comment)
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1777
diff
changeset
|
1797 |
# _("Latest build matches target, no transfer needed.\n")) |
203 | 1798 |
self.EnableMethod("_Transfer", True) |
465
67d32a91d70b
Fixes in debug + reconnect to running PLC
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents:
464
diff
changeset
|
1799 |
# warns controller that program match |
67d32a91d70b
Fixes in debug + reconnect to running PLC
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents:
464
diff
changeset
|
1800 |
self.ProgramTransferred() |
1782
5b6ad7a7fd9d
clean-up: fix PEP8 E265 block comment should start with '# '
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1780
diff
changeset
|
1801 |
# self.EnableMethod("_Transfer", False) |
203 | 1802 |
else: |
1779
6cf16e5bfbf9
clean-up: fix PEP8 E115 expected an indented block (comment)
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1777
diff
changeset
|
1803 |
# self.logger.write_warning( |
6cf16e5bfbf9
clean-up: fix PEP8 E115 expected an indented block (comment)
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1777
diff
changeset
|
1804 |
# _("Cannot compare latest build to target. Please build.\n")) |
203 | 1805 |
self.EnableMethod("_Transfer", False) |
1806 |
||
1807 |
def _Disconnect(self): |
|
978 | 1808 |
self._SetConnector(None) |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1809 |
|
203 | 1810 |
def _Transfer(self): |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1811 |
# Get the last build PLC's |
203 | 1812 |
MD5 = self.GetLastBuildMD5() |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1813 |
|
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1814 |
# Check if md5 file is empty : ask user to build PLC |
1739
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1815 |
if MD5 is None: |
361 | 1816 |
self.logger.write_error(_("Failed : Must build before transfer.\n")) |
203 | 1817 |
return False |
1818 |
||
1819 |
# Compare PLC project with PLC on target |
|
1820 |
if self._connector.MatchMD5(MD5): |
|
1821 |
self.logger.write( |
|
415
339fa2542481
improved english spelling and grammar and internationalization updated
laurent
parents:
414
diff
changeset
|
1822 |
_("Latest build already matches current target. Transfering anyway...\n")) |
203 | 1823 |
|
1824 |
# Get temprary directory path |
|
757
3151495ae5bb
Adding support for importing into project some files to be transfered with PLC
laurent
parents:
754
diff
changeset
|
1825 |
extrafiles = [] |
3151495ae5bb
Adding support for importing into project some files to be transfered with PLC
laurent
parents:
754
diff
changeset
|
1826 |
for extrafilespath in [self._getExtraFilesPath(), |
3151495ae5bb
Adding support for importing into project some files to be transfered with PLC
laurent
parents:
754
diff
changeset
|
1827 |
self._getProjectFilesPath()]: |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1828 |
|
757
3151495ae5bb
Adding support for importing into project some files to be transfered with PLC
laurent
parents:
754
diff
changeset
|
1829 |
extrafiles.extend( |
1878
fb73a6b6622d
fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1861
diff
changeset
|
1830 |
[(name, open(os.path.join(extrafilespath, name), |
fb73a6b6622d
fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1861
diff
changeset
|
1831 |
'rb').read()) |
fb73a6b6622d
fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1861
diff
changeset
|
1832 |
for name in os.listdir(extrafilespath)]) |
1407
cf3d2b53dd68
Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents:
1401
diff
changeset
|
1833 |
|
203 | 1834 |
# Send PLC on target |
1835 |
builder = self.GetBuilder() |
|
1836 |
if builder is not None: |
|
1837 |
data = builder.GetBinaryCode() |
|
1739
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1838 |
if data is not None: |
707
6880c88e499e
Fix bug in debugger when transfer without having build before and and opening debug view before running PLC
laurent
parents:
703
diff
changeset
|
1839 |
if self._connector.NewPLC(MD5, data, extrafiles) and self.GetIECProgramsAndVariables(): |
334
b4131e5d10a4
Adding support for unsubscribe all variables while transferring
lbessard
parents:
328
diff
changeset
|
1840 |
self.UnsubscribeAllDebugIECVariable() |
246 | 1841 |
self.ProgramTransferred() |
692
8b1ed486f374
Adding support for not closing debug tabs and remove variable in variable debug panel if instance still exist in newly transfered program
laurent
parents:
689
diff
changeset
|
1842 |
if self.AppFrame is not None: |
8b1ed486f374
Adding support for not closing debug tabs and remove variable in variable debug panel if instance still exist in newly transfered program
laurent
parents:
689
diff
changeset
|
1843 |
self.AppFrame.CloseObsoleteDebugTabs() |
746
2e09777a40d3
Fix refresh of ConfTreeNodeEditors content when values change
laurent
parents:
742
diff
changeset
|
1844 |
self.AppFrame.RefreshPouInstanceVariablesPanel() |
361 | 1845 |
self.logger.write(_("Transfer completed successfully.\n")) |
1752
d14ff9d7eb76
clean-up: fix PEP8 E703 statement ends with a semicolon
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1751
diff
changeset
|
1846 |
self.AppFrame.LogViewer.ResetLogCounters() |
203 | 1847 |
else: |
361 | 1848 |
self.logger.write_error(_("Transfer failed\n")) |
1730
64d8f52bc8c8
clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1722
diff
changeset
|
1849 |
self.HidePLCProgress() |
203 | 1850 |
else: |
415
339fa2542481
improved english spelling and grammar and internationalization updated
laurent
parents:
414
diff
changeset
|
1851 |
self.logger.write_error(_("No PLC to transfer (did build succeed ?)\n")) |
339fa2542481
improved english spelling and grammar and internationalization updated
laurent
parents:
414
diff
changeset
|
1852 |
|
675
44b35c27e9ff
Adding support for quickly open recent projects in file menu
laurent
parents:
674
diff
changeset
|
1853 |
wx.CallAfter(self.UpdateMethodsFromPLCStatus) |
105
434aed8dc58d
Added ability to override plugin methods with arbitrary python code (methods.py) when loading plugins
etisserant
parents:
97
diff
changeset
|
1854 |
|
738 | 1855 |
StatusMethods = [ |
1739
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1856 |
{ |
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1857 |
"bitmap": "Build", |
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1858 |
"name": _("Build"), |
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1859 |
"tooltip": _("Build project into build folder"), |
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1860 |
"method": "_Build" |
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1861 |
}, |
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1862 |
{ |
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1863 |
"bitmap": "Clean", |
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1864 |
"name": _("Clean"), |
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1865 |
"tooltip": _("Clean project build folder"), |
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1866 |
"method": "_Clean", |
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1867 |
"enabled": False, |
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1868 |
}, |
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1869 |
{ |
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1870 |
"bitmap": "Run", |
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1871 |
"name": _("Run"), |
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1872 |
"tooltip": _("Start PLC"), |
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1873 |
"method": "_Run", |
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1874 |
"shown": False, |
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1875 |
}, |
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1876 |
{ |
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1877 |
"bitmap": "Stop", |
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1878 |
"name": _("Stop"), |
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1879 |
"tooltip": _("Stop Running PLC"), |
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1880 |
"method": "_Stop", |
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1881 |
"shown": False, |
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1882 |
}, |
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1883 |
{ |
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1884 |
"bitmap": "Connect", |
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1885 |
"name": _("Connect"), |
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1886 |
"tooltip": _("Connect to the target PLC"), |
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1887 |
"method": "_Connect" |
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1888 |
}, |
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1889 |
{ |
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1890 |
"bitmap": "Transfer", |
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1891 |
"name": _("Transfer"), |
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1892 |
"tooltip": _("Transfer PLC"), |
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1893 |
"method": "_Transfer", |
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1894 |
"shown": False, |
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1895 |
}, |
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1896 |
{ |
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1897 |
"bitmap": "Disconnect", |
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1898 |
"name": _("Disconnect"), |
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1899 |
"tooltip": _("Disconnect from PLC"), |
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1900 |
"method": "_Disconnect", |
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1901 |
"shown": False, |
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1902 |
}, |
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1903 |
{ |
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1904 |
"bitmap": "ShowIECcode", |
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1905 |
"name": _("Show code"), |
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1906 |
"tooltip": _("Show IEC code generated by PLCGenerator"), |
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1907 |
"method": "_showIECcode", |
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1908 |
"shown": False, |
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1909 |
}, |
738 | 1910 |
] |
1911 |
||
1912 |
ConfNodeMethods = [ |
|
1739
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1913 |
{ |
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1914 |
"bitmap": "editIECrawcode", |
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1915 |
"name": _("Raw IEC code"), |
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1916 |
"tooltip": _("Edit raw IEC code added to code generated by PLCGenerator"), |
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1917 |
"method": "_editIECrawcode" |
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1918 |
}, |
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1919 |
{ |
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1920 |
"bitmap": "ManageFolder", |
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1921 |
"name": _("Project Files"), |
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1922 |
"tooltip": _("Open a file explorer to manage project files"), |
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1923 |
"method": "_OpenProjectFiles" |
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1737
diff
changeset
|
1924 |
}, |
65 | 1925 |
] |
738 | 1926 |
|
1927 |
def EnableMethod(self, method, value): |
|
1928 |
for d in self.StatusMethods: |
|
1742
92932cd370a4
clean-up: fix PEP8 E225 missing whitespace around operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1741
diff
changeset
|
1929 |
if d["method"] == method: |
92932cd370a4
clean-up: fix PEP8 E225 missing whitespace around operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1741
diff
changeset
|
1930 |
d["enabled"] = value |
738 | 1931 |
return True |
1932 |
return False |
|
1933 |
||
1934 |
def ShowMethod(self, method, value): |
|
1935 |
for d in self.StatusMethods: |
|
1742
92932cd370a4
clean-up: fix PEP8 E225 missing whitespace around operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1741
diff
changeset
|
1936 |
if d["method"] == method: |
92932cd370a4
clean-up: fix PEP8 E225 missing whitespace around operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1741
diff
changeset
|
1937 |
d["shown"] = value |
738 | 1938 |
return True |
1939 |
return False |
|
1940 |
||
1941 |
def CallMethod(self, method): |
|
1942 |
for d in self.StatusMethods: |
|
1742
92932cd370a4
clean-up: fix PEP8 E225 missing whitespace around operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1741
diff
changeset
|
1943 |
if d["method"] == method and d.get("enabled", True) and d.get("shown", True): |
738 | 1944 |
getattr(self, method)() |