ProjectController.py
author Edouard Tisserant
Thu, 22 Jul 2021 12:03:34 +0200
branchsvghmi
changeset 3287 70a76083c59c
parent 3266 aff5cedb35ba
child 3302 c89fc366bebd
permissions -rw-r--r--
SVGHMI: detect watchdog abuse (more than one HMI instance with watchdog) at build time
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
20
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
    39
from datetime import datetime
725
31dade089db5 refactoring
Edouard Tisserant
parents: 722
diff changeset
    40
from weakref import WeakKeyDictionary
2456
7373e3048167 python3 support: pylint,W1610 # (reduce-builtin) reduce built-in referenced
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 2450
diff changeset
    41
from functools import reduce
3257
095c73591b7e IDE: Cleaned up some useless tests in variable trace data handling code, changed from bare numpy arrays to RingBuffers inorder to avoid RAM outage and crash after long tracing session.
Edouard Tisserant
parents: 3239
diff changeset
    42
from itertools import izip
2506
8dbdf20f795b fix 'SaveAs' in case of overwriting existing project
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 2505
diff changeset
    43
from distutils.dir_util import copy_tree
2432
dbc065a2f7a5 python3 support: pylint, W1613 # (xrange-builtin) xrange built-in referenced
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 2418
diff changeset
    44
from six.moves import xrange
725
31dade089db5 refactoring
Edouard Tisserant
parents: 722
diff changeset
    45
1832
0f1081928d65 fix wrong-import-order. first standard modules are imported, then others
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1831
diff changeset
    46
import wx
0f1081928d65 fix wrong-import-order. first standard modules are imported, then others
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1831
diff changeset
    47
0f1081928d65 fix wrong-import-order. first standard modules are imported, then others
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1831
diff changeset
    48
import features
725
31dade089db5 refactoring
Edouard Tisserant
parents: 722
diff changeset
    49
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
    50
import util.paths as paths
815
e4f24593a758 Adding support for extending internationalization to extensions
laurent
parents: 814
diff changeset
    51
from util.misc import CheckPathPerm, GetClassImporter
742
41a4a560406c Fixed runtime problems with python 2.6 without wx installed
Edouard Tisserant
parents: 740
diff changeset
    52
from util.MiniTextControler import MiniTextControler
726
ae63ccc29444 refactoring
Edouard Tisserant
parents: 725
diff changeset
    53
from util.ProcessLogger import ProcessLogger
814
5743cbdff669 Integration of PLCOpenEditor into Beremiz
Laurent Bessard
parents: 813
diff changeset
    54
from util.BitmapLibrary import GetBitmap
5743cbdff669 Integration of PLCOpenEditor into Beremiz
Laurent Bessard
parents: 813
diff changeset
    55
from editors.FileManagementPanel import FileManagementPanel
5743cbdff669 Integration of PLCOpenEditor into Beremiz
Laurent Bessard
parents: 813
diff changeset
    56
from editors.ProjectNodeEditor import ProjectNodeEditor
815
e4f24593a758 Adding support for extending internationalization to extensions
laurent
parents: 814
diff changeset
    57
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
    58
from editors.DebugViewer import DebugViewer, REFRESH_PERIOD
2337
8689ce77076f Added toolbar button to launch ID Manager dialog.
Edouard Tisserant
parents: 2334
diff changeset
    59
from dialogs import UriEditor, IDManager
738
413946c04c87 refactoring
laurent
parents: 737
diff changeset
    60
from PLCControler import PLCControler
725
31dade089db5 refactoring
Edouard Tisserant
parents: 722
diff changeset
    61
from plcopen.structures import IEC_KEYWORDS
1948
b9a3f771aaab Moved some definitions away from controller class, and adaped references them through all code.
Edouard Tisserant
parents: 1928
diff changeset
    62
from plcopen.types_enums import ComputeConfigurationResourceName, ITEM_CONFNODE
1834
cd42b426028b fix ungrouped imports from package X
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1832
diff changeset
    63
import targets
1902
2b7e2db31d81 Clarify licensing, and packaging of runtime only files :
Edouard Tisserant
parents: 1881
diff changeset
    64
from runtime.typemapping import DebugTypesSize, UnpackDebugBuffer
2416
1ca207782dde Use predefined constants for PlcStatus instead of string literals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 2415
diff changeset
    65
from runtime import PlcStatus
2645
d15a997859b1 Solve import order problem when POULibrary imports ConfigTreeNode because of UserAddressedException. Now UserAddressedException is declared in POULibrary.py, as a quick and dirty fix, but some independant module should be created for beremiz exceptions in general.
Edouard Tisserant
parents: 2640
diff changeset
    66
from ConfigTreeNode import ConfigTreeNode, XSDSchemaErrorMessage
d15a997859b1 Solve import order problem when POULibrary imports ConfigTreeNode because of UserAddressedException. Now UserAddressedException is declared in POULibrary.py, as a quick and dirty fix, but some independant module should be created for beremiz exceptions in general.
Edouard Tisserant
parents: 2640
diff changeset
    67
from POULibrary import UserAddressedException
725
31dade089db5 refactoring
Edouard Tisserant
parents: 722
diff changeset
    68
1680
6db967480b7d make run Beremiz and PLCOpen Editor, if full path contain non-lating
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1672
diff changeset
    69
base_folder = paths.AbsParentDir(__file__)
20
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
    70
2248
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
    71
MATIEC_ERROR_MODEL = re.compile(
2439
f0a040f1de1b Fix pep8 warning: W605 invalid escape sequence ?x?
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 2432
diff changeset
    72
    r".*\.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
    73
738
413946c04c87 refactoring
laurent
parents: 737
diff changeset
    74
1282
f427352f9727 Added support for left panel add menu with multiple levels
laurent
parents: 1262
diff changeset
    75
def ExtractChildrenTypesFromCatalog(catalog):
f427352f9727 Added support for left panel add menu with multiple levels
laurent
parents: 1262
diff changeset
    76
    children_types = []
1847
6198190bc121 explicitly mark unused variables found by pylint with _ or dummy
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1846
diff changeset
    77
    for n, d, _h, c in catalog:
2450
5024c19ca8f0 python3 support: pylint, W1652 # (deprecated-types-field) Accessing a deprecated fields on the types module
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 2449
diff changeset
    78
        if isinstance(c, list):
1282
f427352f9727 Added support for left panel add menu with multiple levels
laurent
parents: 1262
diff changeset
    79
            children_types.extend(ExtractChildrenTypesFromCatalog(c))
f427352f9727 Added support for left panel add menu with multiple levels
laurent
parents: 1262
diff changeset
    80
        else:
f427352f9727 Added support for left panel add menu with multiple levels
laurent
parents: 1262
diff changeset
    81
            children_types.append((n, GetClassImporter(c), d))
f427352f9727 Added support for left panel add menu with multiple levels
laurent
parents: 1262
diff changeset
    82
    return children_types
f427352f9727 Added support for left panel add menu with multiple levels
laurent
parents: 1262
diff changeset
    83
1736
7e61baa047f0 clean-up: fix PEP8 E302 expected 2 blank lines, found 1
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1734
diff changeset
    84
1282
f427352f9727 Added support for left panel add menu with multiple levels
laurent
parents: 1262
diff changeset
    85
def ExtractMenuItemsFromCatalog(catalog):
f427352f9727 Added support for left panel add menu with multiple levels
laurent
parents: 1262
diff changeset
    86
    menu_items = []
1740
b789b695b5c6 clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1739
diff changeset
    87
    for n, d, h, c in catalog:
2450
5024c19ca8f0 python3 support: pylint, W1652 # (deprecated-types-field) Accessing a deprecated fields on the types module
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 2449
diff changeset
    88
        if isinstance(c, list):
1282
f427352f9727 Added support for left panel add menu with multiple levels
laurent
parents: 1262
diff changeset
    89
            children = ExtractMenuItemsFromCatalog(c)
f427352f9727 Added support for left panel add menu with multiple levels
laurent
parents: 1262
diff changeset
    90
        else:
f427352f9727 Added support for left panel add menu with multiple levels
laurent
parents: 1262
diff changeset
    91
            children = []
f427352f9727 Added support for left panel add menu with multiple levels
laurent
parents: 1262
diff changeset
    92
        menu_items.append((n, d, h, children))
f427352f9727 Added support for left panel add menu with multiple levels
laurent
parents: 1262
diff changeset
    93
    return menu_items
f427352f9727 Added support for left panel add menu with multiple levels
laurent
parents: 1262
diff changeset
    94
1736
7e61baa047f0 clean-up: fix PEP8 E302 expected 2 blank lines, found 1
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1734
diff changeset
    95
1282
f427352f9727 Added support for left panel add menu with multiple levels
laurent
parents: 1262
diff changeset
    96
def GetAddMenuItems():
f427352f9727 Added support for left panel add menu with multiple levels
laurent
parents: 1262
diff changeset
    97
    return ExtractMenuItemsFromCatalog(features.catalog)
f427352f9727 Added support for left panel add menu with multiple levels
laurent
parents: 1262
diff changeset
    98
1736
7e61baa047f0 clean-up: fix PEP8 E302 expected 2 blank lines, found 1
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1734
diff changeset
    99
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
   100
class Iec2CSettings(object):
2248
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   101
2729
4e0cd7806776 IDE: Iec2CSettings: Log wasn't available in case of exception when launching iec2c.
Edouard Tisserant <edouard.tisserant@gmail.com>
parents: 2712
diff changeset
   102
    def __init__(self, controler):
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
   103
        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
   104
        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
   105
        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
   106
        self.ieclib_c_path = self.findLibCPath()
2729
4e0cd7806776 IDE: Iec2CSettings: Log wasn't available in case of exception when launching iec2c.
Edouard Tisserant <edouard.tisserant@gmail.com>
parents: 2712
diff changeset
   107
        self.controler = controler
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
   108
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
   109
    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
   110
        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
   111
        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
   112
            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
   113
                path = p
1730
64d8f52bc8c8 clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1722
diff changeset
   114
                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
   115
        return path
1730
64d8f52bc8c8 clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1722
diff changeset
   116
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
   117
    def findCmd(self):
2248
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   118
        cmd = "iec2c" + (".exe" if wx.Platform == '__WXMSW__' else "")
1742
92932cd370a4 clean-up: fix PEP8 E225 missing whitespace around operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1741
diff changeset
   119
        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
   120
            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
   121
        ]
2248
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   122
        path = self.findObject(
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   123
            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
   124
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
        # 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
   126
        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
   127
            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
   128
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
        return cmd
1730
64d8f52bc8c8 clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1722
diff changeset
   130
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
    def findLibPath(self):
1742
92932cd370a4 clean-up: fix PEP8 E225 missing whitespace around operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1741
diff changeset
   132
        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
   133
            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
   134
            "/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
   135
        ]
2248
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   136
        path = self.findObject(
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   137
            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
   138
        return path
1730
64d8f52bc8c8 clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1722
diff changeset
   139
1630
f0030c3cd6ab detect iec2c options and ieclib path only once during the first build
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1606
diff changeset
   140
    def findLibCPath(self):
1742
92932cd370a4 clean-up: fix PEP8 E225 missing whitespace around operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1741
diff changeset
   141
        path = None
1789
492e2cd6157e fix problem when Beremiz is running without matiec installed
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1782
diff changeset
   142
        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
   143
            paths = [
492e2cd6157e fix problem when Beremiz is running without matiec installed
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1782
diff changeset
   144
                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
   145
                self.ieclib_path]
492e2cd6157e fix problem when Beremiz is running without matiec installed
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1782
diff changeset
   146
            path = self.findObject(
492e2cd6157e fix problem when Beremiz is running without matiec installed
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1782
diff changeset
   147
                paths,
492e2cd6157e fix problem when Beremiz is running without matiec installed
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1782
diff changeset
   148
                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
   149
        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
   150
f0030c3cd6ab detect iec2c options and ieclib path only once during the first build
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1606
diff changeset
   151
    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
   152
        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
   153
        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
   154
f0030c3cd6ab detect iec2c options and ieclib path only once during the first build
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1606
diff changeset
   155
        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
        try:
2248
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   157
            # Invoke compiler.
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   158
            # Output files are listed to stdout, errors to stderr
2729
4e0cd7806776 IDE: Iec2CSettings: Log wasn't available in case of exception when launching iec2c.
Edouard Tisserant <edouard.tisserant@gmail.com>
parents: 2712
diff changeset
   159
            _status, result, _err_result = ProcessLogger(self.controler.logger, buildcmd,
1847
6198190bc121 explicitly mark unused variables found by pylint with _ or dummy
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1846
diff changeset
   160
                                                         no_stdout=True,
6198190bc121 explicitly mark unused variables found by pylint with _ or dummy
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1846
diff changeset
   161
                                                         no_stderr=True).spin()
1846
14b40afccd69 remove unused variables found by pylint
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1836
diff changeset
   162
        except Exception:
2729
4e0cd7806776 IDE: Iec2CSettings: Log wasn't available in case of exception when launching iec2c.
Edouard Tisserant <edouard.tisserant@gmail.com>
parents: 2712
diff changeset
   163
            self.controler.logger.write_error(_("Couldn't launch IEC compiler to determine compatible options.\n"))
1630
f0030c3cd6ab detect iec2c options and ieclib path only once during the first build
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1606
diff changeset
   164
            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
   165
f0030c3cd6ab detect iec2c options and ieclib path only once during the first build
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1606
diff changeset
   166
        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
   167
            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
   168
                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
   169
        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
   170
f0030c3cd6ab detect iec2c options and ieclib path only once during the first build
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1606
diff changeset
   171
    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
   172
        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
   173
            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
   174
        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
   175
f0030c3cd6ab detect iec2c options and ieclib path only once during the first build
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1606
diff changeset
   176
    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
   177
        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
   178
            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
   179
        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
   180
f0030c3cd6ab detect iec2c options and ieclib path only once during the first build
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1606
diff changeset
   181
    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
   182
        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
   183
f0030c3cd6ab detect iec2c options and ieclib path only once during the first build
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1606
diff changeset
   184
    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
   185
        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
   186
            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
   187
        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
   188
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
   189
1824
5765bea3dbd1 make it possible to update XSD schema in project controller after new
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1793
diff changeset
   190
def GetProjectControllerXSD():
13
f1f0edbeb313 More precise design for plugins.... to be continued...
etisserant
parents:
diff changeset
   191
    XSD = """<?xml version="1.0" encoding="ISO-8859-1" ?>
f1f0edbeb313 More precise design for plugins.... to be continued...
etisserant
parents:
diff changeset
   192
    <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
f1f0edbeb313 More precise design for plugins.... to be continued...
etisserant
parents:
diff changeset
   193
      <xsd:element name="BeremizRoot">
f1f0edbeb313 More precise design for plugins.... to be continued...
etisserant
parents:
diff changeset
   194
        <xsd:complexType>
86
f0a9d74e3b26 Adding support for the new version of xmlclass
lbessard
parents: 82
diff changeset
   195
          <xsd:sequence>
f0a9d74e3b26 Adding support for the new version of xmlclass
lbessard
parents: 82
diff changeset
   196
            <xsd:element name="TargetType">
f0a9d74e3b26 Adding support for the new version of xmlclass
lbessard
parents: 82
diff changeset
   197
              <xsd:complexType>
411
8261c8f1e365 Bug on Debug trying to start (and stop) before PLC started fixed.
laurent
parents: 403
diff changeset
   198
                <xsd:choice minOccurs="0">
2248
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   199
                """ + 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
   200
                </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
   201
              </xsd:complexType>
2248
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   202
            </xsd:element>""" + (("""
1413
dd89016a5028 Fixed crash at project load when features.libraries is empty (i.e. no libraries are provided).
Edouard Tisserant
parents: 1407
diff changeset
   203
            <xsd:element name="Libraries" minOccurs="0">
730
4480b7da6bea refactoring
laurent
parents: 728
diff changeset
   204
              <xsd:complexType>
2248
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   205
              """ + "\n".join(['<xsd:attribute name=' +
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   206
                               '"Enable_' + libname + '_Library" ' +
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   207
                               'type="xsd:boolean" use="optional" default="' +
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   208
                               ('true' if default else 'false') + '"/>'
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   209
                               for libname, _lib, default 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
   210
              </xsd:complexType>
1742
92932cd370a4 clean-up: fix PEP8 E225 missing whitespace around operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1741
diff changeset
   211
            </xsd:element>""") if len(features.libraries) > 0 else '') + """
86
f0a9d74e3b26 Adding support for the new version of xmlclass
lbessard
parents: 82
diff changeset
   212
          </xsd:sequence>
204
f572ab819769 remove URI_location from XSD targets and add to pluginroot XSD
greg
parents: 203
diff changeset
   213
          <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
   214
          <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
   215
        </xsd:complexType>
f1f0edbeb313 More precise design for plugins.... to be continued...
etisserant
parents:
diff changeset
   216
      </xsd:element>
f1f0edbeb313 More precise design for plugins.... to be continued...
etisserant
parents:
diff changeset
   217
    </xsd:schema>
f1f0edbeb313 More precise design for plugins.... to be continued...
etisserant
parents:
diff changeset
   218
    """
1824
5765bea3dbd1 make it possible to update XSD schema in project controller after new
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1793
diff changeset
   219
    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
   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
class ProjectController(ConfigTreeNode, PLCControler):
2248
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   223
1824
5765bea3dbd1 make it possible to update XSD schema in project controller after new
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1793
diff changeset
   224
    """
5765bea3dbd1 make it possible to update XSD schema in project controller after new
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1793
diff changeset
   225
    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
   226
    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
   227
    - 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
   228
    - 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
   229
    - 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
   230
    - 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
   231
    - ...
5765bea3dbd1 make it possible to update XSD schema in project controller after new
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1793
diff changeset
   232
5765bea3dbd1 make it possible to update XSD schema in project controller after new
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1793
diff changeset
   233
    """
2248
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   234
    # For root object, available Children Types are modules of the confnode
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   235
    # packages.
1824
5765bea3dbd1 make it possible to update XSD schema in project controller after new
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1793
diff changeset
   236
    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
   237
    XSD = GetProjectControllerXSD()
738
413946c04c87 refactoring
laurent
parents: 737
diff changeset
   238
    EditorType = ProjectNodeEditor
1789
492e2cd6157e fix problem when Beremiz is running without matiec installed
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1782
diff changeset
   239
    iec2c_cfg = None
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
   240
290
3bd617ae7a05 Local Runtime (LOCAL://) now launched "on demand"
etisserant
parents: 288
diff changeset
   241
    def __init__(self, frame, logger):
41
1608a434fb8c Adding support for refreshing PLCOpenEditor block list
lbessard
parents: 40
diff changeset
   242
        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
   243
        ConfigTreeNode.__init__(self)
227
48c13b84505c - Some improovements in debug data feedback data
etisserant
parents: 222
diff changeset
   244
1789
492e2cd6157e fix problem when Beremiz is running without matiec installed
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1782
diff changeset
   245
        if ProjectController.iec2c_cfg is None:
2729
4e0cd7806776 IDE: Iec2CSettings: Log wasn't available in case of exception when launching iec2c.
Edouard Tisserant <edouard.tisserant@gmail.com>
parents: 2712
diff changeset
   246
            ProjectController.iec2c_cfg = Iec2CSettings(self)
1789
492e2cd6157e fix problem when Beremiz is running without matiec installed
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1782
diff changeset
   247
20
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
   248
        self.MandatoryParams = None
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   249
        self._builder = None
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   250
        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
   251
        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
   252
        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
   253
        self.DebugTicks = []
978
3290eff761f1 Added LogViewer panel in bottom notebook
Laurent Bessard
parents: 923
diff changeset
   254
        self.SetAppFrame(frame, logger)
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
   255
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   256
        # Setup debug information
227
48c13b84505c - Some improovements in debug data feedback data
etisserant
parents: 222
diff changeset
   257
        self.IECdebug_datas = {}
222
d0f7d36bf241 Added lock to avoid variable subsciption concurrent to transmission to PLC
etisserant
parents: 217
diff changeset
   258
2708
ea2aaeaaac4e DEBUG: (IDE side) fixed wrong implementation of anti-rapid-fire leading to systematic delay in subscribing
Edouard Tisserant
parents: 2652
diff changeset
   259
        self.DebugUpdatePending = False
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   260
        self.ResetIECProgramsAndVariables()
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   261
118
185d0d371ea4 Refuse close if PLC running.
etisserant
parents: 115
diff changeset
   262
        # 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
   263
        self.ChangesToSave = False
23
e007d9d466d7 minor fixes
etisserant
parents: 22
diff changeset
   264
        # root have no parent
718
5d4dc150b956 refactoring
Edouard Tisserant
parents: 717
diff changeset
   265
        self.CTNParent = None
717
1c23952dbde1 refactoring
Edouard Tisserant
parents: 716
diff changeset
   266
        # Keep track of the confnode type name
718
5d4dc150b956 refactoring
Edouard Tisserant
parents: 717
diff changeset
   267
        self.CTNType = "Beremiz"
5d4dc150b956 refactoring
Edouard Tisserant
parents: 717
diff changeset
   268
        self.Children = {}
738
413946c04c87 refactoring
laurent
parents: 737
diff changeset
   269
        self._View = None
717
1c23952dbde1 refactoring
Edouard Tisserant
parents: 716
diff changeset
   270
        # After __init__ root confnode is not valid
20
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
   271
        self.ProjectPath = None
427
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   272
        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
   273
        self.debug_break = False
350
a3a5561bde1d - now call load, start, free PLC from the python Thread
greg
parents: 348
diff changeset
   274
        self.previous_plcstate = None
2263
5227f54f6369 fixed documentation bug
Edouard Tisserant
parents: 2248
diff changeset
   275
        # copy StatusMethods 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
   276
        self.StatusMethods = [dic.copy() for dic in self.StatusMethods]
2485
ef327451d067 Add a debugger token to SetTraceVariables and GetTraceVariables to prevent crash an inconsistant data in case of multiple connections. Last connection now takes over existing connections's debug, and first connected IDE gets a wrning.
Edouard Tisserant
parents: 2481
diff changeset
   277
        self.DebugToken = None
ef327451d067 Add a debugger token to SetTraceVariables and GetTraceVariables to prevent crash an inconsistant data in case of multiple connections. Last connection now takes over existing connections's debug, and first connected IDE gets a wrning.
Edouard Tisserant
parents: 2481
diff changeset
   278
        self.debug_status = PlcStatus.Stopped
728
e0424e96e3fd refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents: 726
diff changeset
   279
1282
f427352f9727 Added support for left panel add menu with multiple levels
laurent
parents: 1262
diff changeset
   280
    def __del__(self):
f427352f9727 Added support for left panel add menu with multiple levels
laurent
parents: 1262
diff changeset
   281
        self.KillDebugThread()
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
   282
728
e0424e96e3fd refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents: 726
diff changeset
   283
    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
   284
        self.Libraries = []
1742
92932cd370a4 clean-up: fix PEP8 E225 missing whitespace around operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1741
diff changeset
   285
        TypeStack = []
2462
ed6b0e905fcb Fix failing PLC build when building freshly created project that use default libraries blocks. When controller loads libraries according to attibutes in project files (BeremizRoot/Enable_{libname}_Library), use known default if attribute is missing.
Edouard Tisserant
parents: 2459
diff changeset
   286
        for libname, clsname, lib_enabled in features.libraries:
ed6b0e905fcb Fix failing PLC build when building freshly created project that use default libraries blocks. When controller loads libraries according to attibutes in project files (BeremizRoot/Enable_{libname}_Library), use known default if attribute is missing.
Edouard Tisserant
parents: 2459
diff changeset
   287
            if self.BeremizRoot.Libraries is not None:
ed6b0e905fcb Fix failing PLC build when building freshly created project that use default libraries blocks. When controller loads libraries according to attibutes in project files (BeremizRoot/Enable_{libname}_Library), use known default if attribute is missing.
Edouard Tisserant
parents: 2459
diff changeset
   288
                enable_attr = getattr(self.BeremizRoot.Libraries,
ed6b0e905fcb Fix failing PLC build when building freshly created project that use default libraries blocks. When controller loads libraries according to attibutes in project files (BeremizRoot/Enable_{libname}_Library), use known default if attribute is missing.
Edouard Tisserant
parents: 2459
diff changeset
   289
                                      "Enable_" + libname + "_Library")
ed6b0e905fcb Fix failing PLC build when building freshly created project that use default libraries blocks. When controller loads libraries according to attibutes in project files (BeremizRoot/Enable_{libname}_Library), use known default if attribute is missing.
Edouard Tisserant
parents: 2459
diff changeset
   290
                if enable_attr is not None:
ed6b0e905fcb Fix failing PLC build when building freshly created project that use default libraries blocks. When controller loads libraries according to attibutes in project files (BeremizRoot/Enable_{libname}_Library), use known default if attribute is missing.
Edouard Tisserant
parents: 2459
diff changeset
   291
                    lib_enabled = enable_attr
ed6b0e905fcb Fix failing PLC build when building freshly created project that use default libraries blocks. When controller loads libraries according to attibutes in project files (BeremizRoot/Enable_{libname}_Library), use known default if attribute is missing.
Edouard Tisserant
parents: 2459
diff changeset
   292
ed6b0e905fcb Fix failing PLC build when building freshly created project that use default libraries blocks. When controller loads libraries according to attibutes in project files (BeremizRoot/Enable_{libname}_Library), use known default if attribute is missing.
Edouard Tisserant
parents: 2459
diff changeset
   293
            if lib_enabled:
732
c4b0f117e106 Added reference to CTR in libraries
Edouard Tisserant
parents: 731
diff changeset
   294
                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
   295
                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
   296
                self.Libraries.append(Lib)
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
   297
417
a895ae50b737 Adding support for declaring PluginRoot outside of Beremiz
laurent
parents: 415
diff changeset
   298
    def SetAppFrame(self, frame, logger):
a895ae50b737 Adding support for declaring PluginRoot outside of Beremiz
laurent
parents: 415
diff changeset
   299
        self.AppFrame = frame
a895ae50b737 Adding support for declaring PluginRoot outside of Beremiz
laurent
parents: 415
diff changeset
   300
        self.logger = logger
a895ae50b737 Adding support for declaring PluginRoot outside of Beremiz
laurent
parents: 415
diff changeset
   301
        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
   302
        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
   303
            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
   304
        self.DispatchDebugValuesTimer = None
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
   305
417
a895ae50b737 Adding support for declaring PluginRoot outside of Beremiz
laurent
parents: 415
diff changeset
   306
        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
   307
417
a895ae50b737 Adding support for declaring PluginRoot outside of Beremiz
laurent
parents: 415
diff changeset
   308
            # 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
   309
            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
   310
            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
   311
                               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
   312
                               self.StatusTimer)
1395
bcd1e909076c Fixed non initialized timer causing exception in some rare cases
Edouard Tisserant
parents: 1387
diff changeset
   313
bcd1e909076c Fixed non initialized timer causing exception in some rare cases
Edouard Tisserant
parents: 1387
diff changeset
   314
            if self._connector is not None:
bcd1e909076c Fixed non initialized timer causing exception in some rare cases
Edouard Tisserant
parents: 1387
diff changeset
   315
                frame.LogViewer.SetLogSource(self._connector)
bcd1e909076c Fixed non initialized timer causing exception in some rare cases
Edouard Tisserant
parents: 1387
diff changeset
   316
                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
   317
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
   318
            # 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
   319
            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
   320
            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
   321
                               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
   322
                               self.DispatchDebugValuesTimer)
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
   323
717
1c23952dbde1 refactoring
Edouard Tisserant
parents: 716
diff changeset
   324
            self.RefreshConfNodesBlockLists()
417
a895ae50b737 Adding support for declaring PluginRoot outside of Beremiz
laurent
parents: 415
diff changeset
   325
a895ae50b737 Adding support for declaring PluginRoot outside of Beremiz
laurent
parents: 415
diff changeset
   326
    def ResetAppFrame(self, logger):
a895ae50b737 Adding support for declaring PluginRoot outside of Beremiz
laurent
parents: 415
diff changeset
   327
        if self.AppFrame is not None:
a895ae50b737 Adding support for declaring PluginRoot outside of Beremiz
laurent
parents: 415
diff changeset
   328
            self.AppFrame.Unbind(wx.EVT_TIMER, self.StatusTimer)
a895ae50b737 Adding support for declaring PluginRoot outside of Beremiz
laurent
parents: 415
diff changeset
   329
            self.StatusTimer = None
a895ae50b737 Adding support for declaring PluginRoot outside of Beremiz
laurent
parents: 415
diff changeset
   330
            self.AppFrame = None
1793
c2f48d791d9f fix bug with unfinished debug thread
Surkov Sergey <surkovsv93@gmail.com>
parents: 1789
diff changeset
   331
            self.KillDebugThread()
417
a895ae50b737 Adding support for declaring PluginRoot outside of Beremiz
laurent
parents: 415
diff changeset
   332
        self.logger = logger
a895ae50b737 Adding support for declaring PluginRoot outside of Beremiz
laurent
parents: 415
diff changeset
   333
738
413946c04c87 refactoring
laurent
parents: 737
diff changeset
   334
    def CTNName(self):
413946c04c87 refactoring
laurent
parents: 737
diff changeset
   335
        return "Project"
413946c04c87 refactoring
laurent
parents: 737
diff changeset
   336
718
5d4dc150b956 refactoring
Edouard Tisserant
parents: 717
diff changeset
   337
    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
   338
        return self.ChangesToSave or not self.ProjectIsSaved()
118
185d0d371ea4 Refuse close if PLC running.
etisserant
parents: 115
diff changeset
   339
718
5d4dc150b956 refactoring
Edouard Tisserant
parents: 717
diff changeset
   340
    def CTNFullName(self):
656
c1792dfc8c7e Fixing bug integrated plugin editors not closed when removing corresponding plugin
laurent
parents: 655
diff changeset
   341
        return ""
c1792dfc8c7e Fixing bug integrated plugin editors not closed when removing corresponding plugin
laurent
parents: 655
diff changeset
   342
718
5d4dc150b956 refactoring
Edouard Tisserant
parents: 717
diff changeset
   343
    def GetCTRoot(self):
23
e007d9d466d7 minor fixes
etisserant
parents: 22
diff changeset
   344
        return self
e007d9d466d7 minor fixes
etisserant
parents: 22
diff changeset
   345
418
01f6bfc01251 Fix relative matiec path problem
greg
parents: 415
diff changeset
   346
    def GetIECLibPath(self):
1789
492e2cd6157e fix problem when Beremiz is running without matiec installed
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1782
diff changeset
   347
        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
   348
418
01f6bfc01251 Fix relative matiec path problem
greg
parents: 415
diff changeset
   349
    def GetIEC2cPath(self):
1789
492e2cd6157e fix problem when Beremiz is running without matiec installed
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1782
diff changeset
   350
        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
   351
23
e007d9d466d7 minor fixes
etisserant
parents: 22
diff changeset
   352
    def GetCurrentLocation(self):
e007d9d466d7 minor fixes
etisserant
parents: 22
diff changeset
   353
        return ()
47
fd45c291fed0 PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents: 41
diff changeset
   354
fd45c291fed0 PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents: 41
diff changeset
   355
    def GetCurrentName(self):
fd45c291fed0 PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents: 41
diff changeset
   356
        return ""
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
   357
47
fd45c291fed0 PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents: 41
diff changeset
   358
    def _GetCurrentName(self):
fd45c291fed0 PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents: 41
diff changeset
   359
        return ""
fd45c291fed0 PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents: 41
diff changeset
   360
17
ee8cb104dbe0 First commit of Beremiz new version with plugin support
lbessard
parents: 16
diff changeset
   361
    def GetProjectPath(self):
ee8cb104dbe0 First commit of Beremiz new version with plugin support
lbessard
parents: 16
diff changeset
   362
        return self.ProjectPath
51
c31c55601556 Added project linking, and plugin init,cleanup,retrive and publish method calls in main
etisserant
parents: 49
diff changeset
   363
c31c55601556 Added project linking, and plugin init,cleanup,retrive and publish method calls in main
etisserant
parents: 49
diff changeset
   364
    def GetProjectName(self):
c31c55601556 Added project linking, and plugin init,cleanup,retrive and publish method calls in main
etisserant
parents: 49
diff changeset
   365
        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
   366
781
cdc6393705ce Adding support using plcopeneditor bitmap library for icon request
laurent
parents: 774
diff changeset
   367
    def GetIconName(self):
cdc6393705ce Adding support using plcopeneditor bitmap library for icon request
laurent
parents: 774
diff changeset
   368
        return "PROJECT"
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
   369
510
8038c08b9874 Getting default target when no target defined fixed
laurent
parents: 506
diff changeset
   370
    def GetDefaultTargetName(self):
411
8261c8f1e365 Bug on Debug trying to start (and stop) before PLC started fixed.
laurent
parents: 403
diff changeset
   371
        if wx.Platform == '__WXMSW__':
510
8038c08b9874 Getting default target when no target defined fixed
laurent
parents: 506
diff changeset
   372
            return "Win32"
411
8261c8f1e365 Bug on Debug trying to start (and stop) before PLC started fixed.
laurent
parents: 403
diff changeset
   373
        else:
510
8038c08b9874 Getting default target when no target defined fixed
laurent
parents: 506
diff changeset
   374
            return "Linux"
8038c08b9874 Getting default target when no target defined fixed
laurent
parents: 506
diff changeset
   375
8038c08b9874 Getting default target when no target defined fixed
laurent
parents: 506
diff changeset
   376
    def GetTarget(self):
8038c08b9874 Getting default target when no target defined fixed
laurent
parents: 506
diff changeset
   377
        target = self.BeremizRoot.getTargetType()
8038c08b9874 Getting default target when no target defined fixed
laurent
parents: 506
diff changeset
   378
        if target.getcontent() is None:
1315
ff14a66bbd12 Fixed Beremiz for working with new xmlclass support using lxml
Laurent Bessard
parents: 1282
diff changeset
   379
            temp_root = self.Parser.CreateRoot()
ff14a66bbd12 Fixed Beremiz for working with new xmlclass support using lxml
Laurent Bessard
parents: 1282
diff changeset
   380
            target = self.Parser.CreateElement("TargetType", "BeremizRoot")
ff14a66bbd12 Fixed Beremiz for working with new xmlclass support using lxml
Laurent Bessard
parents: 1282
diff changeset
   381
            temp_root.setTargetType(target)
510
8038c08b9874 Getting default target when no target defined fixed
laurent
parents: 506
diff changeset
   382
            target_name = self.GetDefaultTargetName()
2248
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   383
            target.setcontent(
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   384
                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
   385
        return target
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
   386
1744
69dfdb26f600 clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1742
diff changeset
   387
    def GetParamsAttributes(self, path=None):
717
1c23952dbde1 refactoring
Edouard Tisserant
parents: 716
diff changeset
   388
        params = ConfigTreeNode.GetParamsAttributes(self, path)
411
8261c8f1e365 Bug on Debug trying to start (and stop) before PLC started fixed.
laurent
parents: 403
diff changeset
   389
        if params[0]["name"] == "BeremizRoot":
8261c8f1e365 Bug on Debug trying to start (and stop) before PLC started fixed.
laurent
parents: 403
diff changeset
   390
            for child in params[0]["children"]:
8261c8f1e365 Bug on Debug trying to start (and stop) before PLC started fixed.
laurent
parents: 403
diff changeset
   391
                if child["name"] == "TargetType" and child["value"] == '':
2248
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   392
                    child.update(
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   393
                        self.GetTarget().getElementInfos("TargetType"))
411
8261c8f1e365 Bug on Debug trying to start (and stop) before PLC started fixed.
laurent
parents: 403
diff changeset
   394
        return params
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
   395
411
8261c8f1e365 Bug on Debug trying to start (and stop) before PLC started fixed.
laurent
parents: 403
diff changeset
   396
    def SetParamsAttribute(self, path, value):
8261c8f1e365 Bug on Debug trying to start (and stop) before PLC started fixed.
laurent
parents: 403
diff changeset
   397
        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
   398
            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
   399
        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
   400
        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
   401
            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
   402
        return res
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
   403
427
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   404
    # helper func to check project path write permission
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   405
    def CheckProjectPathPerm(self, dosave=True):
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   406
        if CheckPathPerm(self.ProjectPath):
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   407
            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
   408
        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
   409
            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
   410
                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
   411
                _('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
   412
                _('Error'),
691083b5682a clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1767
diff changeset
   413
                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
   414
            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
   415
            dialog.Destroy()
5ec20f56b1d2 Fixed bug list of ConfNodes blocks not refreshed when a library was enable or disable
Laurent Bessard
parents: 1072
diff changeset
   416
            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
   417
                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
   418
                    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
   419
                    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
   420
                    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
   421
                    return True
427
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   422
        return False
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
   423
1061
02f371f3e063 Fixed Save As... function in Beremiz
Laurent Bessard
parents: 1006
diff changeset
   424
    def _getProjectFilesPath(self, project_path=None):
02f371f3e063 Fixed Save As... function in Beremiz
Laurent Bessard
parents: 1006
diff changeset
   425
        if project_path is not None:
02f371f3e063 Fixed Save As... function in Beremiz
Laurent Bessard
parents: 1006
diff changeset
   426
            return os.path.join(project_path, "project_files")
2248
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   427
        projectfiles_path = os.path.join(
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   428
            self.GetProjectPath(), "project_files")
757
3151495ae5bb Adding support for importing into project some files to be transfered with PLC
laurent
parents: 754
diff changeset
   429
        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
   430
            os.mkdir(projectfiles_path)
3151495ae5bb Adding support for importing into project some files to be transfered with PLC
laurent
parents: 754
diff changeset
   431
        return projectfiles_path
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
   432
839
25ba9d74afb1 Adding support for adding default configuration on opened project without any
Laurent Bessard
parents: 815
diff changeset
   433
    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
   434
        self.ProjectAddConfiguration(config_name)
25ba9d74afb1 Adding support for adding default configuration on opened project without any
Laurent Bessard
parents: 815
diff changeset
   435
        self.ProjectAddConfigurationResource(config_name, res_name)
25ba9d74afb1 Adding support for adding default configuration on opened project without any
Laurent Bessard
parents: 815
diff changeset
   436
1708
24416137cda7 add dialog "add program", that appears after creating new project
Surkov Sergey <surkovsv93@gmail.com>
parents: 1685
diff changeset
   437
    def SetProjectDefaultConfiguration(self):
24416137cda7 add dialog "add program", that appears after creating new project
Surkov Sergey <surkovsv93@gmail.com>
parents: 1685
diff changeset
   438
        # Sets default task and instance for new project
2248
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   439
        config = self.Project.getconfiguration(
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   440
            self.GetProjectMainConfigurationName())
1708
24416137cda7 add dialog "add program", that appears after creating new project
Surkov Sergey <surkovsv93@gmail.com>
parents: 1685
diff changeset
   441
        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
   442
        config = config.getname()
1948
b9a3f771aaab Moved some definitions away from controller class, and adaped references them through all code.
Edouard Tisserant
parents: 1928
diff changeset
   443
        resource_tagname = ComputeConfigurationResourceName(config, resource)
1708
24416137cda7 add dialog "add program", that appears after creating new project
Surkov Sergey <surkovsv93@gmail.com>
parents: 1685
diff changeset
   444
        def_task = [
24416137cda7 add dialog "add program", that appears after creating new project
Surkov Sergey <surkovsv93@gmail.com>
parents: 1685
diff changeset
   445
            {'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
   446
        def_instance = [
24416137cda7 add dialog "add program", that appears after creating new project
Surkov Sergey <surkovsv93@gmail.com>
parents: 1685
diff changeset
   447
            {'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
   448
        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
   449
256
1da137b99948 add buildpath parameter for beremiz
greg
parents: 253
diff changeset
   450
    def NewProject(self, ProjectPath, BuildPath=None):
17
ee8cb104dbe0 First commit of Beremiz new version with plugin support
lbessard
parents: 16
diff changeset
   451
        """
ee8cb104dbe0 First commit of Beremiz new version with plugin support
lbessard
parents: 16
diff changeset
   452
        Create a new project in an empty folder
ee8cb104dbe0 First commit of Beremiz new version with plugin support
lbessard
parents: 16
diff changeset
   453
        @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
   454
        @param PLCParams: properties of the PLCOpen program created
ee8cb104dbe0 First commit of Beremiz new version with plugin support
lbessard
parents: 16
diff changeset
   455
        """
415
339fa2542481 improved english spelling and grammar and internationalization updated
laurent
parents: 414
diff changeset
   456
        # Verify that chosen folder is empty
17
ee8cb104dbe0 First commit of Beremiz new version with plugin support
lbessard
parents: 16
diff changeset
   457
        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
   458
            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
   459
41
1608a434fb8c Adding support for refreshing PLCOpenEditor block list
lbessard
parents: 40
diff changeset
   460
        # Create PLCOpen program
738
413946c04c87 refactoring
laurent
parents: 737
diff changeset
   461
        self.CreateNewProject(
413946c04c87 refactoring
laurent
parents: 737
diff changeset
   462
            {"projectName": _("Unnamed"),
413946c04c87 refactoring
laurent
parents: 737
diff changeset
   463
             "productName": _("Unnamed"),
801
435e49e80832 Update list of messages to be translated for internationalization and french translations
laurent
parents: 796
diff changeset
   464
             "productVersion": "1",
738
413946c04c87 refactoring
laurent
parents: 737
diff changeset
   465
             "companyName": _("Unknown"),
413946c04c87 refactoring
laurent
parents: 737
diff changeset
   466
             "creationDateTime": datetime(*localtime()[:6])})
839
25ba9d74afb1 Adding support for adding default configuration on opened project without any
Laurent Bessard
parents: 815
diff changeset
   467
        self.AddProjectDefaultConfiguration()
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
   468
13
f1f0edbeb313 More precise design for plugins.... to be continued...
etisserant
parents:
diff changeset
   469
        # Change XSD into class members
f1f0edbeb313 More precise design for plugins.... to be continued...
etisserant
parents:
diff changeset
   470
        self._AddParamsMembers()
718
5d4dc150b956 refactoring
Edouard Tisserant
parents: 717
diff changeset
   471
        self.Children = {}
717
1c23952dbde1 refactoring
Edouard Tisserant
parents: 716
diff changeset
   472
        # 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
   473
        self.ProjectPath = ProjectPath
427
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   474
        self._setBuildPath(BuildPath)
717
1c23952dbde1 refactoring
Edouard Tisserant
parents: 716
diff changeset
   475
        # get confnodes bloclist (is that usefull at project creation?)
1c23952dbde1 refactoring
Edouard Tisserant
parents: 716
diff changeset
   476
        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
   477
        # 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
   478
        self.SaveProject()
17
ee8cb104dbe0 First commit of Beremiz new version with plugin support
lbessard
parents: 16
diff changeset
   479
        return None
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
   480
256
1da137b99948 add buildpath parameter for beremiz
greg
parents: 253
diff changeset
   481
    def LoadProject(self, ProjectPath, BuildPath=None):
17
ee8cb104dbe0 First commit of Beremiz new version with plugin support
lbessard
parents: 16
diff changeset
   482
        """
ee8cb104dbe0 First commit of Beremiz new version with plugin support
lbessard
parents: 16
diff changeset
   483
        Load a project contained in a folder
ee8cb104dbe0 First commit of Beremiz new version with plugin support
lbessard
parents: 16
diff changeset
   484
        @param ProjectPath: path of the project folder
ee8cb104dbe0 First commit of Beremiz new version with plugin support
lbessard
parents: 16
diff changeset
   485
        """
190
be969d4694c7 Bug with folder path ending by '/' or '\' fixed
lbessard
parents: 178
diff changeset
   486
        if os.path.basename(ProjectPath) == "":
be969d4694c7 Bug with folder path ending by '/' or '\' fixed
lbessard
parents: 178
diff changeset
   487
            ProjectPath = os.path.dirname(ProjectPath)
978
3290eff761f1 Added LogViewer panel in bottom notebook
Laurent Bessard
parents: 923
diff changeset
   488
        # Verify that project contains a PLCOpen program
17
ee8cb104dbe0 First commit of Beremiz new version with plugin support
lbessard
parents: 16
diff changeset
   489
        plc_file = os.path.join(ProjectPath, "plc.xml")
ee8cb104dbe0 First commit of Beremiz new version with plugin support
lbessard
parents: 16
diff changeset
   490
        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
   491
            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
   492
        # 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
   493
        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
   494
        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
   495
            if self.Project is not None:
1581
2295fdc5c271 fix translation strings with multiple parameters
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1579
diff changeset
   496
                (fname_err, lnum, src) = (("PLC",) + error)
2248
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   497
                self.logger.write_warning(
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   498
                    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
   499
            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
   500
                return error, False
839
25ba9d74afb1 Adding support for adding default configuration on opened project without any
Laurent Bessard
parents: 815
diff changeset
   501
        if len(self.GetProjectConfigNames()) == 0:
25ba9d74afb1 Adding support for adding default configuration on opened project without any
Laurent Bessard
parents: 815
diff changeset
   502
            self.AddProjectDefaultConfiguration()
17
ee8cb104dbe0 First commit of Beremiz new version with plugin support
lbessard
parents: 16
diff changeset
   503
        # Change XSD into class members
ee8cb104dbe0 First commit of Beremiz new version with plugin support
lbessard
parents: 16
diff changeset
   504
        self._AddParamsMembers()
718
5d4dc150b956 refactoring
Edouard Tisserant
parents: 717
diff changeset
   505
        self.Children = {}
717
1c23952dbde1 refactoring
Edouard Tisserant
parents: 716
diff changeset
   506
        # 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
   507
        self.ProjectPath = ProjectPath
427
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   508
        self._setBuildPath(BuildPath)
13
f1f0edbeb313 More precise design for plugins.... to be continued...
etisserant
parents:
diff changeset
   509
        # If dir have already be made, and file exist
718
5d4dc150b956 refactoring
Edouard Tisserant
parents: 717
diff changeset
   510
        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
   511
            # Load the confnode.xml file into parameters members
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   512
            result = self.LoadXMLParams()
17
ee8cb104dbe0 First commit of Beremiz new version with plugin support
lbessard
parents: 16
diff changeset
   513
            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
   514
                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
   515
            # Load and init all the children
718
5d4dc150b956 refactoring
Edouard Tisserant
parents: 717
diff changeset
   516
            self.LoadChildren()
717
1c23952dbde1 refactoring
Edouard Tisserant
parents: 716
diff changeset
   517
        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
   518
        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
   519
        return None, False
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
   520
738
413946c04c87 refactoring
laurent
parents: 737
diff changeset
   521
    def RecursiveConfNodeInfos(self, confnode):
413946c04c87 refactoring
laurent
parents: 737
diff changeset
   522
        values = []
413946c04c87 refactoring
laurent
parents: 737
diff changeset
   523
        for CTNChild in confnode.IECSortedChildren():
413946c04c87 refactoring
laurent
parents: 737
diff changeset
   524
            values.append(
413946c04c87 refactoring
laurent
parents: 737
diff changeset
   525
                {"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
   526
                                     CTNChild.CTNName()),
1105
f0e5b475a074 Fixed bug when modifying ConfTreeNode IEC Channel
Laurent Bessard
parents: 1089
diff changeset
   527
                 "tagname": CTNChild.CTNFullName(),
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
   528
                 "type": ITEM_CONFNODE,
738
413946c04c87 refactoring
laurent
parents: 737
diff changeset
   529
                 "confnode": CTNChild,
781
cdc6393705ce Adding support using plcopeneditor bitmap library for icon request
laurent
parents: 774
diff changeset
   530
                 "icon": CTNChild.GetIconName(),
738
413946c04c87 refactoring
laurent
parents: 737
diff changeset
   531
                 "values": self.RecursiveConfNodeInfos(CTNChild)})
413946c04c87 refactoring
laurent
parents: 737
diff changeset
   532
        return values
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
   533
738
413946c04c87 refactoring
laurent
parents: 737
diff changeset
   534
    def GetProjectInfos(self):
413946c04c87 refactoring
laurent
parents: 737
diff changeset
   535
        infos = PLCControler.GetProjectInfos(self)
413946c04c87 refactoring
laurent
parents: 737
diff changeset
   536
        configurations = infos["values"].pop(-1)
413946c04c87 refactoring
laurent
parents: 737
diff changeset
   537
        resources = None
413946c04c87 refactoring
laurent
parents: 737
diff changeset
   538
        for config_infos in configurations["values"]:
413946c04c87 refactoring
laurent
parents: 737
diff changeset
   539
            if resources is None:
413946c04c87 refactoring
laurent
parents: 737
diff changeset
   540
                resources = config_infos["values"][0]
413946c04c87 refactoring
laurent
parents: 737
diff changeset
   541
            else:
413946c04c87 refactoring
laurent
parents: 737
diff changeset
   542
                resources["values"].extend(config_infos["values"][0]["values"])
413946c04c87 refactoring
laurent
parents: 737
diff changeset
   543
        if resources is not None:
413946c04c87 refactoring
laurent
parents: 737
diff changeset
   544
            infos["values"].append(resources)
413946c04c87 refactoring
laurent
parents: 737
diff changeset
   545
        infos["values"].extend(self.RecursiveConfNodeInfos(self))
413946c04c87 refactoring
laurent
parents: 737
diff changeset
   546
        return infos
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
   547
403
ae4a85291441 Removing memory leak while closing PluginsRoot
laurent
parents: 402
diff changeset
   548
    def CloseProject(self):
718
5d4dc150b956 refactoring
Edouard Tisserant
parents: 717
diff changeset
   549
        self.ClearChildren()
417
a895ae50b737 Adding support for declaring PluginRoot outside of Beremiz
laurent
parents: 415
diff changeset
   550
        self.ResetAppFrame(None)
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
   551
1606
99a02c6161b6 add check of new project path in Save As
Sergey Surkov <surkovsv93@gmail.com>
parents: 1602
diff changeset
   552
    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
   553
        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
   554
            message = (_("Save path is the same as path of a project! \n"))
2248
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   555
            dialog = wx.MessageDialog(
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   556
                self.AppFrame, message, _("Error"), wx.OK | wx.ICON_ERROR)
1606
99a02c6161b6 add check of new project path in Save As
Sergey Surkov <surkovsv93@gmail.com>
parents: 1602
diff changeset
   557
            dialog.ShowModal()
99a02c6161b6 add check of new project path in Save As
Sergey Surkov <surkovsv93@gmail.com>
parents: 1602
diff changeset
   558
            return False
99a02c6161b6 add check of new project path in Save As
Sergey Surkov <surkovsv93@gmail.com>
parents: 1602
diff changeset
   559
        else:
2505
3487fd4fb9bf fix 'SaveAs' to non-empty directory and directory without write permissions
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 2456
diff changeset
   560
            if not CheckPathPerm(new_project_path):
3487fd4fb9bf fix 'SaveAs' to non-empty directory and directory without write permissions
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 2456
diff changeset
   561
                dialog = wx.MessageDialog(
3487fd4fb9bf fix 'SaveAs' to non-empty directory and directory without write permissions
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 2456
diff changeset
   562
                    self.AppFrame,
3487fd4fb9bf fix 'SaveAs' to non-empty directory and directory without write permissions
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 2456
diff changeset
   563
                    _('No write permissions in selected directory! \n'),
3487fd4fb9bf fix 'SaveAs' to non-empty directory and directory without write permissions
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 2456
diff changeset
   564
                    _("Error"), wx.OK | wx.ICON_ERROR)
3487fd4fb9bf fix 'SaveAs' to non-empty directory and directory without write permissions
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 2456
diff changeset
   565
                dialog.ShowModal()
3487fd4fb9bf fix 'SaveAs' to non-empty directory and directory without write permissions
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 2456
diff changeset
   566
                return False
3487fd4fb9bf fix 'SaveAs' to non-empty directory and directory without write permissions
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 2456
diff changeset
   567
            if not os.path.isdir(new_project_path) or len(os.listdir(new_project_path)) > 0:
3487fd4fb9bf fix 'SaveAs' to non-empty directory and directory without write permissions
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 2456
diff changeset
   568
                plc_file = os.path.join(new_project_path, "plc.xml")
3487fd4fb9bf fix 'SaveAs' to non-empty directory and directory without write permissions
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 2456
diff changeset
   569
                if os.path.isfile(plc_file):
3487fd4fb9bf fix 'SaveAs' to non-empty directory and directory without write permissions
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 2456
diff changeset
   570
                    message = _("Selected directory already contains another project. Overwrite? \n")
3487fd4fb9bf fix 'SaveAs' to non-empty directory and directory without write permissions
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 2456
diff changeset
   571
                else:
3487fd4fb9bf fix 'SaveAs' to non-empty directory and directory without write permissions
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 2456
diff changeset
   572
                    message = _("Selected directory isn't empty. Continue? \n")
2248
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   573
                dialog = wx.MessageDialog(
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   574
                    self.AppFrame, message, _("Error"), wx.YES_NO | wx.ICON_ERROR)
1606
99a02c6161b6 add check of new project path in Save As
Sergey Surkov <surkovsv93@gmail.com>
parents: 1602
diff changeset
   575
                answer = dialog.ShowModal()
99a02c6161b6 add check of new project path in Save As
Sergey Surkov <surkovsv93@gmail.com>
parents: 1602
diff changeset
   576
                return answer == wx.ID_YES
99a02c6161b6 add check of new project path in Save As
Sergey Surkov <surkovsv93@gmail.com>
parents: 1602
diff changeset
   577
        return True
99a02c6161b6 add check of new project path in Save As
Sergey Surkov <surkovsv93@gmail.com>
parents: 1602
diff changeset
   578
1061
02f371f3e063 Fixed Save As... function in Beremiz
Laurent Bessard
parents: 1006
diff changeset
   579
    def SaveProject(self, from_project_path=None):
427
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   580
        if self.CheckProjectPathPerm(False):
1061
02f371f3e063 Fixed Save As... function in Beremiz
Laurent Bessard
parents: 1006
diff changeset
   581
            if from_project_path is not None:
2248
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   582
                old_projectfiles_path = self._getProjectFilesPath(
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   583
                    from_project_path)
1061
02f371f3e063 Fixed Save As... function in Beremiz
Laurent Bessard
parents: 1006
diff changeset
   584
                if os.path.isdir(old_projectfiles_path):
2506
8dbdf20f795b fix 'SaveAs' in case of overwriting existing project
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 2505
diff changeset
   585
                    copy_tree(old_projectfiles_path,
8dbdf20f795b fix 'SaveAs' in case of overwriting existing project
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 2505
diff changeset
   586
                              self._getProjectFilesPath(self.ProjectPath))
41
1608a434fb8c Adding support for refreshing PLCOpenEditor block list
lbessard
parents: 40
diff changeset
   587
            self.SaveXMLFile(os.path.join(self.ProjectPath, 'plc.xml'))
1061
02f371f3e063 Fixed Save As... function in Beremiz
Laurent Bessard
parents: 1006
diff changeset
   588
            result = self.CTNRequestSave(from_project_path)
427
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   589
            if result:
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   590
                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
   591
1061
02f371f3e063 Fixed Save As... function in Beremiz
Laurent Bessard
parents: 1006
diff changeset
   592
    def SaveProjectAs(self):
427
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   593
        # Ask user to choose a path with write permissions
529
ffe0fba7e427 Bug when try to SaveAs on Windows fixed
laurent
parents: 516
diff changeset
   594
        if wx.Platform == '__WXMSW__':
ffe0fba7e427 Bug when try to SaveAs on Windows fixed
laurent
parents: 516
diff changeset
   595
            path = os.getenv("USERPROFILE")
ffe0fba7e427 Bug when try to SaveAs on Windows fixed
laurent
parents: 516
diff changeset
   596
        else:
ffe0fba7e427 Bug when try to SaveAs on Windows fixed
laurent
parents: 516
diff changeset
   597
            path = os.getenv("HOME")
2248
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   598
        dirdialog = wx.DirDialog(
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   599
            self.AppFrame, _("Choose a directory to save project"), path, wx.DD_NEW_DIR_BUTTON)
427
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   600
        answer = dirdialog.ShowModal()
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   601
        dirdialog.Destroy()
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   602
        if answer == wx.ID_OK:
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   603
            newprojectpath = dirdialog.GetPath()
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   604
            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
   605
                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
   606
                    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
   607
                    self.SaveProject(old_project_path)
99a02c6161b6 add check of new project path in Save As
Sergey Surkov <surkovsv93@gmail.com>
parents: 1602
diff changeset
   608
                    self._setBuildPath(self.BuildPath)
427
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   609
                return True
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   610
        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
   611
e0424e96e3fd refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents: 726
diff changeset
   612
    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
   613
        self.LoadLibraries()
1746
45d6f5fba016 clean-up: fix PEP8 E202 whitespace before ')'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1745
diff changeset
   614
        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
   615
e0424e96e3fd refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents: 726
diff changeset
   616
    def GetLibrariesSTCode(self):
1746
45d6f5fba016 clean-up: fix PEP8 E202 whitespace before ')'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1745
diff changeset
   617
        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
   618
e0424e96e3fd refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents: 726
diff changeset
   619
    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
   620
        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
   621
            return [], [], ()
728
e0424e96e3fd refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents: 726
diff changeset
   622
        self.GetIECProgramsAndVariables()
2248
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   623
        LibIECCflags = '"-I%s" -Wno-unused-function' % os.path.abspath(
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   624
            self.GetIECLibPath())
1742
92932cd370a4 clean-up: fix PEP8 E225 missing whitespace around operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1741
diff changeset
   625
        LocatedCCodeAndFlags = []
92932cd370a4 clean-up: fix PEP8 E225 missing whitespace around operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1741
diff changeset
   626
        Extras = []
728
e0424e96e3fd refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents: 726
diff changeset
   627
        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
   628
            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
   629
            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
   630
            if len(res) > 2:
869
abf90a44c265 Fix bug when more than one block library add extra python file
Laurent Bessard
parents: 842
diff changeset
   631
                Extras.extend(res[2:])
2248
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   632
        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
   633
717
1c23952dbde1 refactoring
Edouard Tisserant
parents: 716
diff changeset
   634
    # Update PLCOpenEditor ConfNode Block types from loaded confnodes
1c23952dbde1 refactoring
Edouard Tisserant
parents: 716
diff changeset
   635
    def RefreshConfNodesBlockLists(self):
718
5d4dc150b956 refactoring
Edouard Tisserant
parents: 717
diff changeset
   636
        if getattr(self, "Children", None) is not None:
717
1c23952dbde1 refactoring
Edouard Tisserant
parents: 716
diff changeset
   637
            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
   638
            self.AddConfNodeTypesList(self.GetLibrariesTypes())
395
433fd448dd31 Integrate PLCOpenEditor into Beremiz frame
laurent
parents: 392
diff changeset
   639
        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
   640
            self.AppFrame.RefreshLibraryPanel()
395
433fd448dd31 Integrate PLCOpenEditor into Beremiz frame
laurent
parents: 392
diff changeset
   641
            self.AppFrame.RefreshEditor()
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
   642
443
34c9788bd933 Adding support for updating located variables when changing plugin IEC_Channel
laurent
parents: 440
diff changeset
   643
    # Update a PLCOpenEditor Pou variable location
34c9788bd933 Adding support for updating located variables when changing plugin IEC_Channel
laurent
parents: 440
diff changeset
   644
    def UpdateProjectVariableLocation(self, old_leading, new_leading):
34c9788bd933 Adding support for updating located variables when changing plugin IEC_Channel
laurent
parents: 440
diff changeset
   645
        self.Project.updateElementAddress(old_leading, new_leading)
34c9788bd933 Adding support for updating located variables when changing plugin IEC_Channel
laurent
parents: 440
diff changeset
   646
        self.BufferProject()
34c9788bd933 Adding support for updating located variables when changing plugin IEC_Channel
laurent
parents: 440
diff changeset
   647
        if self.AppFrame is not None:
468
d750151bd6ae Bug when updating Variable locations fixed
laurent
parents: 466
diff changeset
   648
            self.AppFrame.RefreshTitle()
730
4480b7da6bea refactoring
laurent
parents: 728
diff changeset
   649
            self.AppFrame.RefreshPouInstanceVariablesPanel()
468
d750151bd6ae Bug when updating Variable locations fixed
laurent
parents: 466
diff changeset
   650
            self.AppFrame.RefreshFileMenu()
d750151bd6ae Bug when updating Variable locations fixed
laurent
parents: 466
diff changeset
   651
            self.AppFrame.RefreshEditMenu()
842
3c4c1e076a34 Fix bug when modifying IEC_Channel
Laurent Bessard
parents: 839
diff changeset
   652
            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
   653
401
8106a853a7c7 Adding support for displaying plugins available variable into Beremiz plugin tree
laurent
parents: 396
diff changeset
   654
    def GetVariableLocationTree(self):
411
8261c8f1e365 Bug on Debug trying to start (and stop) before PLC started fixed.
laurent
parents: 403
diff changeset
   655
        '''
717
1c23952dbde1 refactoring
Edouard Tisserant
parents: 716
diff changeset
   656
        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
   657
8261c8f1e365 Bug on Debug trying to start (and stop) before PLC started fixed.
laurent
parents: 403
diff changeset
   658
        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
   659
411
8261c8f1e365 Bug on Debug trying to start (and stop) before PLC started fixed.
laurent
parents: 403
diff changeset
   660
        - 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
   661
        - 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
   662
        '''
8261c8f1e365 Bug on Debug trying to start (and stop) before PLC started fixed.
laurent
parents: 403
diff changeset
   663
        children = []
718
5d4dc150b956 refactoring
Edouard Tisserant
parents: 717
diff changeset
   664
        for child in self.IECSortedChildren():
411
8261c8f1e365 Bug on Debug trying to start (and stop) before PLC started fixed.
laurent
parents: 403
diff changeset
   665
            children.append(child.GetVariableLocationTree())
8261c8f1e365 Bug on Debug trying to start (and stop) before PLC started fixed.
laurent
parents: 403
diff changeset
   666
        return children
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
   667
718
5d4dc150b956 refactoring
Edouard Tisserant
parents: 717
diff changeset
   668
    def CTNPath(self, CTNName=None):
13
f1f0edbeb313 More precise design for plugins.... to be continued...
etisserant
parents:
diff changeset
   669
        return self.ProjectPath
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
   670
718
5d4dc150b956 refactoring
Edouard Tisserant
parents: 717
diff changeset
   671
    def ConfNodeXmlFilePath(self, CTNName=None):
5d4dc150b956 refactoring
Edouard Tisserant
parents: 717
diff changeset
   672
        return os.path.join(self.CTNPath(CTNName), "beremiz.xml")
18
0fac6d621a24 Base build mechanism layout.
etisserant
parents: 17
diff changeset
   673
669
472469f4d5ad Adding support for loading datatypes defined in plugins to allow to use them in PLC program
laurent
parents: 661
diff changeset
   674
    def ParentsTypesFactory(self):
717
1c23952dbde1 refactoring
Edouard Tisserant
parents: 716
diff changeset
   675
        return self.ConfNodeTypesFactory()
363
e0c4d3549369 Adding support for recursively generate STLibrary and BlockLibrary according to plugin tree
laurent
parents: 361
diff changeset
   676
427
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   677
    def _setBuildPath(self, buildpath):
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   678
        self.BuildPath = buildpath
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   679
        self.DefaultBuildPath = None
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   680
        if self._builder is not None:
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   681
            self._builder.SetBuildPath(self._getBuildPath())
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   682
20
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
   683
    def _getBuildPath(self):
427
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   684
        # BuildPath is defined by user
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   685
        if self.BuildPath is not None:
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   686
            return self.BuildPath
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   687
        # BuildPath isn't defined by user but already created by default
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   688
        if self.DefaultBuildPath is not None:
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   689
            return self.DefaultBuildPath
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   690
        # Create a build path in project folder if user has permissions
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   691
        if CheckPathPerm(self.ProjectPath):
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   692
            self.DefaultBuildPath = os.path.join(self.ProjectPath, "build")
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   693
        # Create a build path in temp folder
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   694
        else:
2248
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   695
            self.DefaultBuildPath = os.path.join(
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   696
                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
   697
427
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   698
        if not os.path.exists(self.DefaultBuildPath):
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   699
            os.makedirs(self.DefaultBuildPath)
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   700
        return self.DefaultBuildPath
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
   701
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   702
    def _getExtraFilesPath(self):
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   703
        return os.path.join(self._getBuildPath(), "extra_files")
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   704
20
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
   705
    def _getIECcodepath(self):
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
   706
        # define name for IEC code file
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
   707
        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
   708
65
e55d6faee9d1 Adding icons in Beremiz GUI
lbessard
parents: 64
diff changeset
   709
    def _getIECgeneratedcodepath(self):
e55d6faee9d1 Adding icons in Beremiz GUI
lbessard
parents: 64
diff changeset
   710
        # define name for IEC generated code file
e55d6faee9d1 Adding icons in Beremiz GUI
lbessard
parents: 64
diff changeset
   711
        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
   712
65
e55d6faee9d1 Adding icons in Beremiz GUI
lbessard
parents: 64
diff changeset
   713
    def _getIECrawcodepath(self):
e55d6faee9d1 Adding icons in Beremiz GUI
lbessard
parents: 64
diff changeset
   714
        # define name for IEC raw code file
718
5d4dc150b956 refactoring
Edouard Tisserant
parents: 717
diff changeset
   715
        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
   716
97
9c6fdf60ad2e Beremiz layout changed
lbessard
parents: 96
diff changeset
   717
    def GetLocations(self):
9c6fdf60ad2e Beremiz layout changed
lbessard
parents: 96
diff changeset
   718
        locations = []
1740
b789b695b5c6 clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1739
diff changeset
   719
        filepath = os.path.join(self._getBuildPath(), "LOCATED_VARIABLES.h")
97
9c6fdf60ad2e Beremiz layout changed
lbessard
parents: 96
diff changeset
   720
        if os.path.isfile(filepath):
2248
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   721
            # IEC2C compiler generate a list of located variables :
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   722
            # LOCATED_VARIABLES.h
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   723
            location_file = open(
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   724
                os.path.join(self._getBuildPath(), "LOCATED_VARIABLES.h"))
97
9c6fdf60ad2e Beremiz layout changed
lbessard
parents: 96
diff changeset
   725
            # each line of LOCATED_VARIABLES.h declares a located variable
9c6fdf60ad2e Beremiz layout changed
lbessard
parents: 96
diff changeset
   726
            lines = [line.strip() for line in location_file.readlines()]
9c6fdf60ad2e Beremiz layout changed
lbessard
parents: 96
diff changeset
   727
            # This regular expression parses the lines genereated by IEC2C
2248
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   728
            LOCATED_MODEL = re.compile(
2439
f0a040f1de1b Fix pep8 warning: W605 invalid escape sequence ?x?
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 2432
diff changeset
   729
                r"__LOCATED_VAR\((?P<IEC_TYPE>[A-Z]*),(?P<NAME>[_A-Za-z0-9]*),(?P<DIR>[QMI])(?:,(?P<SIZE>[XBWDL]))?,(?P<LOC>[,0-9]*)\)")
97
9c6fdf60ad2e Beremiz layout changed
lbessard
parents: 96
diff changeset
   730
            for line in lines:
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
   731
                # If line match RE,
97
9c6fdf60ad2e Beremiz layout changed
lbessard
parents: 96
diff changeset
   732
                result = LOCATED_MODEL.match(line)
9c6fdf60ad2e Beremiz layout changed
lbessard
parents: 96
diff changeset
   733
                if result:
9c6fdf60ad2e Beremiz layout changed
lbessard
parents: 96
diff changeset
   734
                    # Get the resulting dict
9c6fdf60ad2e Beremiz layout changed
lbessard
parents: 96
diff changeset
   735
                    resdict = result.groupdict()
2248
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   736
                    # rewrite string for variadic location as a tuple of
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   737
                    # integers
1740
b789b695b5c6 clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1739
diff changeset
   738
                    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
   739
                    # set located size to 'X' if not given
97
9c6fdf60ad2e Beremiz layout changed
lbessard
parents: 96
diff changeset
   740
                    if not resdict['SIZE']:
9c6fdf60ad2e Beremiz layout changed
lbessard
parents: 96
diff changeset
   741
                        resdict['SIZE'] = 'X'
9c6fdf60ad2e Beremiz layout changed
lbessard
parents: 96
diff changeset
   742
                    # finally store into located variable list
9c6fdf60ad2e Beremiz layout changed
lbessard
parents: 96
diff changeset
   743
                    locations.append(resdict)
9c6fdf60ad2e Beremiz layout changed
lbessard
parents: 96
diff changeset
   744
        return locations
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
   745
883
235a9ec83b95 Adding support for defining specific global variables for ConfTreeNodes
Laurent Bessard
parents: 869
diff changeset
   746
    def GetConfNodeGlobalInstances(self):
3266
aff5cedb35ba IDE: Allow POU Libraries to inject PLC Configurations globals during build.
Edouard Tisserant <edouard.tisserant@gmail.com>
parents: 3262
diff changeset
   747
        LibGlobals = []
aff5cedb35ba IDE: Allow POU Libraries to inject PLC Configurations globals during build.
Edouard Tisserant <edouard.tisserant@gmail.com>
parents: 3262
diff changeset
   748
        for lib in self.Libraries:
aff5cedb35ba IDE: Allow POU Libraries to inject PLC Configurations globals during build.
Edouard Tisserant <edouard.tisserant@gmail.com>
parents: 3262
diff changeset
   749
            LibGlobals += lib.GlobalInstances()
aff5cedb35ba IDE: Allow POU Libraries to inject PLC Configurations globals during build.
Edouard Tisserant <edouard.tisserant@gmail.com>
parents: 3262
diff changeset
   750
        CTNGlobals = self._GlobalInstances()
aff5cedb35ba IDE: Allow POU Libraries to inject PLC Configurations globals during build.
Edouard Tisserant <edouard.tisserant@gmail.com>
parents: 3262
diff changeset
   751
        return LibGlobals + CTNGlobals
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
   752
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   753
    def _Generate_SoftPLC(self):
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
   754
        if self._Generate_PLC_ST():
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
   755
            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
   756
        return False
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
   757
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
   758
    def _Generate_PLC_ST(self):
20
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
   759
        """
64
531e6a834d7e Change generate_cc to generate_c
lbessard
parents: 62
diff changeset
   760
        Generate SoftPLC ST/IL/SFC code out of PLCOpenEditor controller, and compile it with IEC2C
20
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
   761
        @param buildpath: path where files should be created
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
   762
        """
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
   763
717
1c23952dbde1 refactoring
Edouard Tisserant
parents: 716
diff changeset
   764
        # Update PLCOpenEditor ConfNode Block types before generate ST code
1c23952dbde1 refactoring
Edouard Tisserant
parents: 716
diff changeset
   765
        self.RefreshConfNodesBlockLists()
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
   766
2248
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   767
        self.logger.write(
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   768
            _("Generating SoftPLC IEC-61131 ST/IL/SFC code...\n"))
20
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
   769
        # ask PLCOpenEditor controller to write ST/IL/SFC code file
2248
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   770
        _program, errors, warnings = self.GenerateProgram(
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   771
            self._getIECgeneratedcodepath())
309
6eb074f0dae9 Adding support for cancelling code generation of function with no input connected
lbessard
parents: 304
diff changeset
   772
        if len(warnings) > 0:
2248
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   773
            self.logger.write_warning(
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   774
                _("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
   775
            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
   776
                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
   777
        if len(errors) > 0:
20
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
   778
            # Failed !
2248
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   779
            self.logger.write_error(
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   780
                _("Error in ST/IL/SFC code generator :\n%s\n") % errors[0])
20
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
   781
            return False
65
e55d6faee9d1 Adding icons in Beremiz GUI
lbessard
parents: 64
diff changeset
   782
        plc_file = open(self._getIECcodepath(), "w")
717
1c23952dbde1 refactoring
Edouard Tisserant
parents: 716
diff changeset
   783
        # 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
   784
        plc_file.write(self.GetLibrariesSTCode())
65
e55d6faee9d1 Adding icons in Beremiz GUI
lbessard
parents: 64
diff changeset
   785
        if os.path.isfile(self._getIECrawcodepath()):
e55d6faee9d1 Adding icons in Beremiz GUI
lbessard
parents: 64
diff changeset
   786
            plc_file.write(open(self._getIECrawcodepath(), "r").read())
e55d6faee9d1 Adding icons in Beremiz GUI
lbessard
parents: 64
diff changeset
   787
            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
   788
        plc_file.close()
e9698d0ee5f3 Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents: 355
diff changeset
   789
        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
   790
        self.ProgramOffset = 0
2441
c553769a65af python3 support: pylint, W1659 # (xreadlines-attribute) Accessing a removed xreadlines attribute
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 2439
diff changeset
   791
        for dummy in plc_file.readlines():
356
e9698d0ee5f3 Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents: 355
diff changeset
   792
            self.ProgramOffset += 1
e9698d0ee5f3 Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents: 355
diff changeset
   793
        plc_file.close()
e9698d0ee5f3 Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents: 355
diff changeset
   794
        plc_file = open(self._getIECcodepath(), "a")
65
e55d6faee9d1 Adding icons in Beremiz GUI
lbessard
parents: 64
diff changeset
   795
        plc_file.write(open(self._getIECgeneratedcodepath(), "r").read())
e55d6faee9d1 Adding icons in Beremiz GUI
lbessard
parents: 64
diff changeset
   796
        plc_file.close()
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
   797
        return True
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
   798
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
   799
    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
   800
        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
   801
        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
   802
            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
   803
            return False
492e2cd6157e fix problem when Beremiz is running without matiec installed
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1782
diff changeset
   804
415
339fa2542481 improved english spelling and grammar and internationalization updated
laurent
parents: 414
diff changeset
   805
        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
   806
        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
   807
        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
   808
            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
   809
            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
   810
            iec2c_libpath,
fb73a6b6622d fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1861
diff changeset
   811
            buildpath,
fb73a6b6622d fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1861
diff changeset
   812
            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
   813
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
   814
        try:
2248
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   815
            # Invoke compiler.
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   816
            # Output files are listed to stdout, errors to stderr
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
   817
            status, result, err_result = ProcessLogger(self.logger, buildcmd,
2248
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   818
                                                       no_stdout=True,
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   819
                                                       no_stderr=True).spin()
2418
5587c490a070 Use python 3 compatible exception syntax everywhere
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 2416
diff changeset
   820
        except Exception as 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
   821
            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
   822
            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
   823
            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
   824
20
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
   825
        if status:
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
   826
            # Failed !
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
   827
356
e9698d0ee5f3 Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents: 355
diff changeset
   828
            # 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
   829
            # 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
   830
            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
   831
                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
   832
e9698d0ee5f3 Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents: 355
diff changeset
   833
                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
   834
                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
   835
                    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
   836
                    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
   837
356
e9698d0ee5f3 Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents: 355
diff changeset
   838
                    last_section = None
e9698d0ee5f3 Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents: 355
diff changeset
   839
                    f = open(self._getIECcodepath())
e9698d0ee5f3 Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents: 355
diff changeset
   840
e9698d0ee5f3 Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents: 355
diff changeset
   841
                    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
   842
                        i = i + 1
356
e9698d0ee5f3 Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents: 355
diff changeset
   843
                        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
   844
                            last_section = line
e9698d0ee5f3 Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents: 355
diff changeset
   845
e9698d0ee5f3 Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents: 355
diff changeset
   846
                        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
   847
                            if last_section is not None:
2248
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   848
                                self.logger.write_warning(
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   849
                                    "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
   850
                                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
   851
                            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
   852
e9698d0ee5f3 Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents: 355
diff changeset
   853
                    f.close()
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
   854
2248
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   855
            self.logger.write_error(
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   856
                _("Error : IEC to C compiler returned %d\n") % status)
20
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
   857
            return False
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
   858
20
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
   859
        # Now extract C files of stdout
2248
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   860
        C_files = [fname for fname in result.splitlines() if fname[
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   861
            -2:] == ".c" or fname[-2:] == ".C"]
20
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
   862
        # remove those that are not to be compiled because included by others
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
   863
        C_files.remove("POUS.c")
115
9ffdac9cf609 Fixed empty build exception.
etisserant
parents: 114
diff changeset
   864
        if not C_files:
2248
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   865
            self.logger.write_error(
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   866
                _("Error : At least one configuration and one resource must be declared in PLC !\n"))
115
9ffdac9cf609 Fixed empty build exception.
etisserant
parents: 114
diff changeset
   867
            return False
20
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
   868
        # transform those base names to full names with path
2248
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   869
        C_files = map(
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   870
            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
   871
56bef276055e Made declaration from beremiz.h available to C pragmas in POUs. Added AtomicCompareExchange to beremiz.h
Edouard Tisserant
parents: 1006
diff changeset
   872
        # prepend beremiz include to configuration header
2248
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   873
        H_files = [fname for fname in result.splitlines() if fname[
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   874
            -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
   875
        H_files.remove("LOCATED_VARIABLES.h")
2248
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   876
        H_files = map(
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   877
            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
   878
        for H_file in H_files:
2442
b13f021c68a5 python3 support: pylint, W1607 # (file-builtin) file built-in referenced
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 2441
diff changeset
   879
            with open(H_file, 'r') as original:
1756
08e4394ff4fb clean-up: fix PEP8 E701 multiple statements on one line (colon)
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1754
diff changeset
   880
                data = original.read()
2442
b13f021c68a5 python3 support: pylint, W1607 # (file-builtin) file built-in referenced
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 2441
diff changeset
   881
            with open(H_file, 'w') as modified:
1756
08e4394ff4fb clean-up: fix PEP8 E701 multiple statements on one line (colon)
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1754
diff changeset
   882
                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
   883
361
331d698e1118 Adding support for internationalization
laurent
parents: 356
diff changeset
   884
        self.logger.write(_("Extracting Located Variables...\n"))
2248
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   885
        # Keep track of generated located variables for later use by
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   886
        # self._Generate_C
97
9c6fdf60ad2e Beremiz layout changed
lbessard
parents: 96
diff changeset
   887
        self.PLCGeneratedLocatedVars = self.GetLocations()
718
5d4dc150b956 refactoring
Edouard Tisserant
parents: 717
diff changeset
   888
        # Keep track of generated C files for later use by self.CTNGenerate_C
18
0fac6d621a24 Base build mechanism layout.
etisserant
parents: 17
diff changeset
   889
        self.PLCGeneratedCFiles = C_files
49
45dc6a944ab6 On the long wat towards generated code comilation...
etisserant
parents: 47
diff changeset
   890
        # 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
   891
        self.plcCFLAGS = '"-I%s" -Wno-unused-function' % self.iec2c_cfg.getLibCPath()
18
0fac6d621a24 Base build mechanism layout.
etisserant
parents: 17
diff changeset
   892
        return True
0fac6d621a24 Base build mechanism layout.
etisserant
parents: 17
diff changeset
   893
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   894
    def GetBuilder(self):
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   895
        """
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   896
        Return a Builder (compile C code into machine code)
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   897
        """
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   898
        # Get target, module and class name
1315
ff14a66bbd12 Fixed Beremiz for working with new xmlclass support using lxml
Laurent Bessard
parents: 1282
diff changeset
   899
        targetname = self.GetTarget().getcontent().getLocalTag()
733
915be999f3f0 targets and connectors are nor extensible
Edouard Tisserant
parents: 732
diff changeset
   900
        targetclass = targets.GetBuilder(targetname)
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   901
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
   902
        # if target already
1740
b789b695b5c6 clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1739
diff changeset
   903
        if self._builder is None or not isinstance(self._builder, targetclass):
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   904
            # Get classname instance
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   905
            self._builder = targetclass(self)
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   906
        return self._builder
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   907
2248
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   908
    #
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   909
    #
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   910
    #                C CODE GENERATION METHODS
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   911
    #
2248
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   912
    #
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
   913
718
5d4dc150b956 refactoring
Edouard Tisserant
parents: 717
diff changeset
   914
    def CTNGenerate_C(self, buildpath, locations):
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   915
        """
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
   916
        Return C code generated by iec2c compiler
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   917
        when _generate_softPLC have been called
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   918
        @param locations: ignored
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   919
        @return: [(C_file_name, CFLAGS),...] , LDFLAGS_TO_APPEND
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   920
        """
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
   921
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
   922
        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
   923
                 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
   924
                "",  # 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
   925
                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
   926
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   927
    def ResetIECProgramsAndVariables(self):
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   928
        """
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   929
        Reset variable and program list that are parsed from
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   930
        CSV file generated by IEC2C compiler.
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   931
        """
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   932
        self._ProgramList = None
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   933
        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
   934
        self._DbgVariablesList = None
532
a822b0b64252 Fixed startin debugger with non empty debug variable list
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents: 529
diff changeset
   935
        self._IECPathToIdx = {}
670
fb03cb6da95c Adding support for extracting Common_Ticktime from VARIABLES.csv
laurent
parents: 669
diff changeset
   936
        self._Ticktime = 0
235
a66e150f2888 Improved debug data feedback.
etisserant
parents: 228
diff changeset
   937
        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
   938
        self.TracedIECTypes = []
235
a66e150f2888 Improved debug data feedback.
etisserant
parents: 228
diff changeset
   939
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   940
    def GetIECProgramsAndVariables(self):
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   941
        """
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   942
        Parse CSV-like file  VARIABLES.csv resulting from IEC2C compiler.
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   943
        Each section is marked with a line staring with '//'
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   944
        list of all variables used in various POUs
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   945
        """
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   946
        if self._ProgramList is None or self._VariablesList is None:
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   947
            try:
1740
b789b695b5c6 clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1739
diff changeset
   948
                csvfile = os.path.join(self._getBuildPath(), "VARIABLES.csv")
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   949
                # describes CSV columns
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   950
                ProgramsListAttributeName = ["num", "C_path", "type"]
2248
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   951
                VariablesListAttributeName = [
2619
b1ebe2803285 Now expects 1 more columns in VARIABLE.CSV file generated by MatIEC. Pair with MatIEC commit 9cb7c8bf7dbc :
Edouard Tisserant
parents: 2602
diff changeset
   952
                    "num", "vartype", "IEC_path", "C_path", "type", "derived"]
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   953
                self._ProgramList = []
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   954
                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
   955
                self._DbgVariablesList = []
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   956
                self._IECPathToIdx = {}
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
   957
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   958
                # Separate sections
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   959
                ListGroup = []
2441
c553769a65af python3 support: pylint, W1659 # (xreadlines-attribute) Accessing a removed xreadlines attribute
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 2439
diff changeset
   960
                for line in open(csvfile, 'r').readlines():
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   961
                    strippedline = line.strip()
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   962
                    if strippedline.startswith("//"):
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   963
                        # Start new section
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   964
                        ListGroup.append([])
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   965
                    elif len(strippedline) > 0 and len(ListGroup) > 0:
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   966
                        # append to this section
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   967
                        ListGroup[-1].append(strippedline)
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
   968
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   969
                # first section contains programs
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   970
                for line in ListGroup[0]:
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   971
                    # Split and Maps each field to dictionnary entries
2248
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   972
                    attrs = dict(
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   973
                        zip(ProgramsListAttributeName, line.strip().split(';')))
1722
89824afffef2 fix some typos
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1708
diff changeset
   974
                    # Truncate "C_path" to remove conf an resources names
2248
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   975
                    attrs["C_path"] = '__'.join(
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   976
                        attrs["C_path"].split(".", 2)[1:])
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   977
                    # Push this dictionnary into result.
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   978
                    self._ProgramList.append(attrs)
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
   979
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   980
                # second section contains all variables
883
235a9ec83b95 Adding support for defining specific global variables for ConfTreeNodes
Laurent Bessard
parents: 869
diff changeset
   981
                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
   982
                Idx = 0
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   983
                for line in ListGroup[1]:
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   984
                    # Split and Maps each field to dictionnary entries
2248
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   985
                    attrs = dict(
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
   986
                        zip(VariablesListAttributeName, line.strip().split(';')))
1722
89824afffef2 fix some typos
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1708
diff changeset
   987
                    # 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
   988
                    parts = attrs["C_path"].split(".", 2)
639
85dad46ae0f6 Fixing bug that prevent to use global variables in configuration
laurent
parents: 630
diff changeset
   989
                    if len(parts) > 2:
883
235a9ec83b95 Adding support for defining specific global variables for ConfTreeNodes
Laurent Bessard
parents: 869
diff changeset
   990
                        config_FB = config_FBs.get(tuple(parts[:2]))
235a9ec83b95 Adding support for defining specific global variables for ConfTreeNodes
Laurent Bessard
parents: 869
diff changeset
   991
                        if config_FB:
235a9ec83b95 Adding support for defining specific global variables for ConfTreeNodes
Laurent Bessard
parents: 869
diff changeset
   992
                            parts = [config_FB] + parts[2:]
235a9ec83b95 Adding support for defining specific global variables for ConfTreeNodes
Laurent Bessard
parents: 869
diff changeset
   993
                            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
   994
                        else:
883
235a9ec83b95 Adding support for defining specific global variables for ConfTreeNodes
Laurent Bessard
parents: 869
diff changeset
   995
                            attrs["C_path"] = '__'.join(parts[1:])
639
85dad46ae0f6 Fixing bug that prevent to use global variables in configuration
laurent
parents: 630
diff changeset
   996
                    else:
85dad46ae0f6 Fixing bug that prevent to use global variables in configuration
laurent
parents: 630
diff changeset
   997
                        attrs["C_path"] = '__'.join(parts)
883
235a9ec83b95 Adding support for defining specific global variables for ConfTreeNodes
Laurent Bessard
parents: 869
diff changeset
   998
                        if attrs["vartype"] == "FB":
235a9ec83b95 Adding support for defining specific global variables for ConfTreeNodes
Laurent Bessard
parents: 869
diff changeset
   999
                            config_FBs[tuple(parts)] = attrs["C_path"]
1517
30692ab8b5c7 This fixes issue #5
Paul Beltyukov
parents: 1515
diff changeset
  1000
                    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
  1001
                        # 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
  1002
                        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
  1003
                        # 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
  1004
                        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
  1005
                        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
  1006
                        # 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
  1007
                        # 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
  1008
                        # 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
  1009
                        Idx += 1
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1010
                    self._VariablesList.append(attrs)
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
  1011
670
fb03cb6da95c Adding support for extracting Common_Ticktime from VARIABLES.csv
laurent
parents: 669
diff changeset
  1012
                # third section contains ticktime
fb03cb6da95c Adding support for extracting Common_Ticktime from VARIABLES.csv
laurent
parents: 669
diff changeset
  1013
                if len(ListGroup) > 2:
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
  1014
                    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
  1015
1846
14b40afccd69 remove unused variables found by pylint
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1836
diff changeset
  1016
            except Exception:
2248
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
  1017
                self.logger.write_error(
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
  1018
                    _("Cannot open/parse VARIABLES.csv!\n"))
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1019
                self.logger.write_error(traceback.format_exc())
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1020
                self.ResetIECProgramsAndVariables()
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1021
                return False
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1022
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1023
        return True
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1024
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1025
    def Generate_plc_debugger(self):
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1026
        """
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1027
        Generate trace/debug code out of PLC variable list
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1028
        """
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1029
        self.GetIECProgramsAndVariables()
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1030
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1031
        # 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
  1032
        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
  1033
        bofs = 0
1739
ec153828ded2 clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1737
diff changeset
  1034
        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
  1035
            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
  1036
            variable_decl_array += [
1742
92932cd370a4 clean-up: fix PEP8 E225 missing whitespace around operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1741
diff changeset
  1037
                "{&(%(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
  1038
                {
b789b695b5c6 clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1739
diff changeset
  1039
                    "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
  1040
                    "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
  1041
                    "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
  1042
                    "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
  1043
                    "VAR": "%(type)s_ENUM"
b789b695b5c6 clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1739
diff changeset
  1044
                }[v["vartype"]] % v +
b789b695b5c6 clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1739
diff changeset
  1045
                "}"]
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
  1046
            bofs += sz
1430
754fa90c8b27 minor cleanup
Edouard Tisserant
parents: 1427
diff changeset
  1047
        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
  1048
            "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
  1049
            "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
  1050
                                                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
  1051
            "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
  1052
                {
c46ec818bdd7 clean-up: fix PEP8 E131 continuation line unaligned for hanging indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1776
diff changeset
  1053
                    "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
  1054
                    "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
  1055
                    "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
  1056
                    "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
  1057
                    "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
  1058
                    "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
  1059
                }[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
  1060
                for v in self._VariablesList if v["C_path"].find('.') < 0]),
2632
534387caf43d variable access code moved from plc_debug.c to targets/var_access.c for easiewr re-use in ext.
Edouard Tisserant
parents: 2631
diff changeset
  1061
            "variable_decl_array": ",\n".join(variable_decl_array),
534387caf43d variable access code moved from plc_debug.c to targets/var_access.c for easiewr re-use in ext.
Edouard Tisserant
parents: 2631
diff changeset
  1062
            "var_access_code": targets.GetCode("var_access.c")
1777
c46ec818bdd7 clean-up: fix PEP8 E131 continuation line unaligned for hanging indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1776
diff changeset
  1063
        }
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
  1064
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1065
        return debug_code
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
  1066
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
  1067
    def Generate_plc_main(self):
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1068
        """
717
1c23952dbde1 refactoring
Edouard Tisserant
parents: 716
diff changeset
  1069
        Use confnodes layout given in LocationCFilesAndCFLAGS to
1c23952dbde1 refactoring
Edouard Tisserant
parents: 716
diff changeset
  1070
        generate glue code that dispatch calls to all confnodes
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1071
        """
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1072
        # filter location that are related to code that will be called
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1073
        # 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
  1074
        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
  1075
                      [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
  1076
                       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
  1077
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1078
        # 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
  1079
        if not self.BeremizRoot.getDisable_Extensions():
1430
754fa90c8b27 minor cleanup
Edouard Tisserant
parents: 1427
diff changeset
  1080
            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
  1081
                "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
  1082
                    "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
  1083
                    "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
  1084
                    "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
  1085
                    "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
  1086
                "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
  1087
                    "__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
  1088
                "publish_calls": "\n    ".join([  # Call publish in reverse order
2248
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
  1089
                    "__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
  1090
                "init_calls": "\n    ".join([
2248
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
  1091
                    "init_level=%d; " % (i + 1) +
1878
fb73a6b6622d fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1861
diff changeset
  1092
                    "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
  1093
                    # "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
  1094
                    "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
  1095
                "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
  1096
                    "if(init_level >= %d) " % i +
2248
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
  1097
                    "__cleanup_%s();" % locstrs[i - 1] for i in xrange(len(locstrs), 0, -1)])
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
  1098
            }
338
e19c78831d41 Adding support for enable/Disable plugins
greg
parents: 335
diff changeset
  1099
        else:
1430
754fa90c8b27 minor cleanup
Edouard Tisserant
parents: 1427
diff changeset
  1100
            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
  1101
                "calls_prototypes": "\n",
b789b695b5c6 clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1739
diff changeset
  1102
                "retrieve_calls":   "\n",
b789b695b5c6 clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1739
diff changeset
  1103
                "publish_calls":    "\n",
b789b695b5c6 clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1739
diff changeset
  1104
                "init_calls":       "\n",
b789b695b5c6 clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1739
diff changeset
  1105
                "cleanup_calls":    "\n"
b789b695b5c6 clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1739
diff changeset
  1106
            }
2248
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
  1107
        plc_main_code += targets.GetTargetCode(
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
  1108
            self.GetTarget().getcontent().getLocalTag())
1430
754fa90c8b27 minor cleanup
Edouard Tisserant
parents: 1427
diff changeset
  1109
        plc_main_code += targets.GetCode("plc_main_tail.c")
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1110
        return plc_main_code
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1111
623
8cdb533c3c7a A few new keyboard shortcuts : F4=stop, F5=run, F5=transfer, F7=connect
Edouard Tisserant
parents: 619
diff changeset
  1112
    def _Build(self):
20
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
  1113
        """
717
1c23952dbde1 refactoring
Edouard Tisserant
parents: 716
diff changeset
  1114
        Method called by user to (re)build SoftPLC and confnode tree
20
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
  1115
        """
395
433fd448dd31 Integrate PLCOpenEditor into Beremiz frame
laurent
parents: 392
diff changeset
  1116
        if self.AppFrame is not None:
433fd448dd31 Integrate PLCOpenEditor into Beremiz frame
laurent
parents: 392
diff changeset
  1117
            self.AppFrame.ClearErrors()
774
78b5fa92dd1c Fix bug when opening and closing confnode extra viewers
laurent
parents: 770
diff changeset
  1118
        self._CloseView(self._IECCodeView)
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
  1119
20
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
  1120
        buildpath = self._getBuildPath()
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
  1121
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
  1122
        # Eventually create build dir
18
0fac6d621a24 Base build mechanism layout.
etisserant
parents: 17
diff changeset
  1123
        if not os.path.exists(buildpath):
0fac6d621a24 Base build mechanism layout.
etisserant
parents: 17
diff changeset
  1124
            os.mkdir(buildpath)
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1125
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1126
        self.logger.flush()
361
331d698e1118 Adding support for internationalization
laurent
parents: 356
diff changeset
  1127
        self.logger.write(_("Start build in %s\n") % buildpath)
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1128
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1129
        # Generate SoftPLC IEC code
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1130
        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
  1131
        self.UpdateButtons()
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1132
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1133
        # If IEC code gen fail, bail out.
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1134
        if not IECGenRes:
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
  1135
            self.logger.write_error(_("PLC code generation failed !\n"))
20
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
  1136
            return False
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
  1137
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1138
        # Reset variable and program list that are parsed from
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1139
        # CSV file generated by IEC2C compiler.
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1140
        self.ResetIECProgramsAndVariables()
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
  1141
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
  1142
        # Collect platform specific C code
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
  1143
        # 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
  1144
        if not self._Generate_runtime():
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
  1145
            return False
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
  1146
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
  1147
        # Get current or fresh builder
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
  1148
        builder = self.GetBuilder()
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
  1149
        if builder is None:
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
  1150
            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
  1151
            return False
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
  1152
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
  1153
        # Build
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
  1154
        try:
1739
ec153828ded2 clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1737
diff changeset
  1155
            if not builder.build():
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
  1156
                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
  1157
                return False
1846
14b40afccd69 remove unused variables found by pylint
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1836
diff changeset
  1158
        except Exception:
2463
8742337a9fe3 Chunk based transfer for PLC binary and extra files, and some collateral code refactoring.
Edouard Tisserant
parents: 2462
diff changeset
  1159
            builder.ResetBinaryMD5()
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
  1160
            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
  1161
            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
  1162
            return False
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
  1163
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
  1164
        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
  1165
        # 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
  1166
        self.CompareLocalAndRemotePLC()
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
  1167
        return True
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
  1168
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
  1169
    def _Generate_runtime(self):
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
  1170
        buildpath = self._getBuildPath()
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
  1171
2631
b5402859dfad Swap CTN code gen and Libraries code generation order. In general library part of an extension needs to be computed before CTN part.
Edouard Tisserant
parents: 2621
diff changeset
  1172
        # CTN code gen is expected AFTER Libraries code gen,
b5402859dfad Swap CTN code gen and Libraries code generation order. In general library part of an extension needs to be computed before CTN part.
Edouard Tisserant
parents: 2621
diff changeset
  1173
        # at least SVGHMI relies on it.
b5402859dfad Swap CTN code gen and Libraries code generation order. In general library part of an extension needs to be computed before CTN part.
Edouard Tisserant
parents: 2621
diff changeset
  1174
b5402859dfad Swap CTN code gen and Libraries code generation order. In general library part of an extension needs to be computed before CTN part.
Edouard Tisserant
parents: 2621
diff changeset
  1175
        # Generate C code and compilation params from liraries
b5402859dfad Swap CTN code gen and Libraries code generation order. In general library part of an extension needs to be computed before CTN part.
Edouard Tisserant
parents: 2621
diff changeset
  1176
        try:
b5402859dfad Swap CTN code gen and Libraries code generation order. In general library part of an extension needs to be computed before CTN part.
Edouard Tisserant
parents: 2621
diff changeset
  1177
            LibCFilesAndCFLAGS, LibLDFLAGS, LibExtraFiles = self.GetLibrariesCCode(
b5402859dfad Swap CTN code gen and Libraries code generation order. In general library part of an extension needs to be computed before CTN part.
Edouard Tisserant
parents: 2621
diff changeset
  1178
                buildpath)
2640
1b4b335e19ea Add FatalError() method to ConfigTreeNode.
Edouard Tisserant
parents: 2632
diff changeset
  1179
        except UserAddressedException as e:
1b4b335e19ea Add FatalError() method to ConfigTreeNode.
Edouard Tisserant
parents: 2632
diff changeset
  1180
            self.logger.write_error(e.message)
1b4b335e19ea Add FatalError() method to ConfigTreeNode.
Edouard Tisserant
parents: 2632
diff changeset
  1181
            return False
1b4b335e19ea Add FatalError() method to ConfigTreeNode.
Edouard Tisserant
parents: 2632
diff changeset
  1182
        except Exception as e:
2631
b5402859dfad Swap CTN code gen and Libraries code generation order. In general library part of an extension needs to be computed before CTN part.
Edouard Tisserant
parents: 2621
diff changeset
  1183
            self.logger.write_error(
b5402859dfad Swap CTN code gen and Libraries code generation order. In general library part of an extension needs to be computed before CTN part.
Edouard Tisserant
parents: 2621
diff changeset
  1184
                _("Runtime library extensions C code generation failed !\n"))
b5402859dfad Swap CTN code gen and Libraries code generation order. In general library part of an extension needs to be computed before CTN part.
Edouard Tisserant
parents: 2621
diff changeset
  1185
            self.logger.write_error(traceback.format_exc())
b5402859dfad Swap CTN code gen and Libraries code generation order. In general library part of an extension needs to be computed before CTN part.
Edouard Tisserant
parents: 2621
diff changeset
  1186
            return False
b5402859dfad Swap CTN code gen and Libraries code generation order. In general library part of an extension needs to be computed before CTN part.
Edouard Tisserant
parents: 2621
diff changeset
  1187
717
1c23952dbde1 refactoring
Edouard Tisserant
parents: 716
diff changeset
  1188
        # Generate C code and compilation params from confnode hierarchy
24
585d5b387b6a Working CanOpen OD generation
etisserant
parents: 23
diff changeset
  1189
        try:
728
e0424e96e3fd refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents: 726
diff changeset
  1190
            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
  1191
                buildpath,
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1192
                self.PLCGeneratedLocatedVars)
2640
1b4b335e19ea Add FatalError() method to ConfigTreeNode.
Edouard Tisserant
parents: 2632
diff changeset
  1193
        except UserAddressedException as e:
1b4b335e19ea Add FatalError() method to ConfigTreeNode.
Edouard Tisserant
parents: 2632
diff changeset
  1194
            self.logger.write_error(e.message)
1b4b335e19ea Add FatalError() method to ConfigTreeNode.
Edouard Tisserant
parents: 2632
diff changeset
  1195
            return False
1846
14b40afccd69 remove unused variables found by pylint
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1836
diff changeset
  1196
        except Exception:
2248
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
  1197
            self.logger.write_error(
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
  1198
                _("Runtime IO extensions C code generation failed !\n"))
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1199
            self.logger.write_error(traceback.format_exc())
24
585d5b387b6a Working CanOpen OD generation
etisserant
parents: 23
diff changeset
  1200
            return False
18
0fac6d621a24 Base build mechanism layout.
etisserant
parents: 17
diff changeset
  1201
2248
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
  1202
        self.LocationCFilesAndCFLAGS = LibCFilesAndCFLAGS + \
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
  1203
            CTNLocationCFilesAndCFLAGS
728
e0424e96e3fd refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents: 726
diff changeset
  1204
        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
  1205
        ExtraFiles = CTNExtraFiles + LibExtraFiles
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
  1206
361
331d698e1118 Adding support for internationalization
laurent
parents: 356
diff changeset
  1207
        # Get temporary directory path
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1208
        extrafilespath = self._getExtraFilesPath()
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1209
        # Remove old directory
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1210
        if os.path.exists(extrafilespath):
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1211
            shutil.rmtree(extrafilespath)
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1212
        # Recreate directory
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1213
        os.mkdir(extrafilespath)
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1214
        # 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
  1215
        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
  1216
            fpath = os.path.join(extrafilespath, fname)
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1217
            open(fpath, "wb").write(fobject.read())
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1218
        # Now we can forget ExtraFiles (will close files object)
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1219
        del ExtraFiles
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
  1220
1001
3f966bbb3fba Added beremiz.h header file for extensions
Edouard Tisserant
parents: 1000
diff changeset
  1221
        # Header file for extensions
2248
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
  1222
        open(os.path.join(buildpath, "beremiz.h"), "w").write(
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
  1223
            targets.GetHeader())
1001
3f966bbb3fba Added beremiz.h header file for extensions
Edouard Tisserant
parents: 1000
diff changeset
  1224
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1225
        # Template based part of C code generation
717
1c23952dbde1 refactoring
Edouard Tisserant
parents: 716
diff changeset
  1226
        # 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
  1227
        c_source = [
fb73a6b6622d fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1861
diff changeset
  1228
            #  debugger code
fb73a6b6622d fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1861
diff changeset
  1229
            (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
  1230
            # 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
  1231
            (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
  1232
        ]
fb73a6b6622d fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1861
diff changeset
  1233
fb73a6b6622d fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1861
diff changeset
  1234
        for generator, filename, name in c_source:
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1235
            try:
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1236
                # Do generate
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1237
                code = generator()
335
c5f3f71e7260 fixed bug : buffer overflow when debugging PLC with python blocks
greg
parents: 334
diff changeset
  1238
                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
  1239
                    raise Exception
1740
b789b695b5c6 clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1739
diff changeset
  1240
                code_path = os.path.join(buildpath, filename)
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1241
                open(code_path, "w").write(code)
2248
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
  1242
                # Insert this file as first file to be compiled at root
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
  1243
                # confnode
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
  1244
                self.LocationCFilesAndCFLAGS[0][1].insert(
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
  1245
                    0, (code_path, self.plcCFLAGS))
1846
14b40afccd69 remove unused variables found by pylint
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1836
diff changeset
  1246
            except Exception:
2248
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
  1247
                self.logger.write_error(name + _(" generation failed !\n"))
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1248
                self.logger.write_error(traceback.format_exc())
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1249
                return False
361
331d698e1118 Adding support for internationalization
laurent
parents: 356
diff changeset
  1250
        self.logger.write(_("C code generated successfully.\n"))
49
45dc6a944ab6 On the long wat towards generated code comilation...
etisserant
parents: 47
diff changeset
  1251
        return True
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
  1252
202
cd81a7a6e55c Adding support for highlighing compiling errors into PLCOpenEditor
lbessard
parents: 199
diff changeset
  1253
    def ShowError(self, logger, from_location, to_location):
cd81a7a6e55c Adding support for highlighing compiling errors into PLCOpenEditor
lbessard
parents: 199
diff changeset
  1254
        chunk_infos = self.GetChunkInfos(from_location, to_location)
cd81a7a6e55c Adding support for highlighing compiling errors into PLCOpenEditor
lbessard
parents: 199
diff changeset
  1255
        for infos, (start_row, start_col) in chunk_infos:
2248
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
  1256
            row = 1 if from_location[0] < start_row else (
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
  1257
                from_location[0] - start_row)
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
  1258
            col = 1 if (start_row != from_location[0]) else (
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
  1259
                from_location[1] - start_col)
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
  1260
            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
  1261
2248
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
  1262
            row = 1 if to_location[0] < start_row else (
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
  1263
                to_location[0] - start_row)
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
  1264
            col = 1 if (start_row != to_location[0]) else (
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
  1265
                to_location[1] - start_col)
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
  1266
            end = (row, col)
1730
64d8f52bc8c8 clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1722
diff changeset
  1267
396
d1083f580ca1 Many bugs on PLCOpenEditor integration fixed
laurent
parents: 395
diff changeset
  1268
            if self.AppFrame is not None:
d1083f580ca1 Many bugs on PLCOpenEditor integration fixed
laurent
parents: 395
diff changeset
  1269
                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
  1270
774
78b5fa92dd1c Fix bug when opening and closing confnode extra viewers
laurent
parents: 770
diff changeset
  1271
    _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
  1272
2337
8689ce77076f Added toolbar button to launch ID Manager dialog.
Edouard Tisserant
parents: 2334
diff changeset
  1273
    def _showIDManager(self):
8689ce77076f Added toolbar button to launch ID Manager dialog.
Edouard Tisserant
parents: 2334
diff changeset
  1274
        dlg = IDManager(self.AppFrame, self)
8689ce77076f Added toolbar button to launch ID Manager dialog.
Edouard Tisserant
parents: 2334
diff changeset
  1275
        dlg.ShowModal()
8689ce77076f Added toolbar button to launch ID Manager dialog.
Edouard Tisserant
parents: 2334
diff changeset
  1276
        dlg.Destroy()
8689ce77076f Added toolbar button to launch ID Manager dialog.
Edouard Tisserant
parents: 2334
diff changeset
  1277
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1278
    def _showIECcode(self):
716
180e4a7d945c Adding search field for finding function or function block in library tree
laurent
parents: 715
diff changeset
  1279
        self._OpenView("IEC code")
180e4a7d945c Adding search field for finding function or function block in library tree
laurent
parents: 715
diff changeset
  1280
774
78b5fa92dd1c Fix bug when opening and closing confnode extra viewers
laurent
parents: 770
diff changeset
  1281
    _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
  1282
716
180e4a7d945c Adding search field for finding function or function block in library tree
laurent
parents: 715
diff changeset
  1283
    def _editIECrawcode(self):
180e4a7d945c Adding search field for finding function or function block in library tree
laurent
parents: 715
diff changeset
  1284
        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
  1285
782
6f0e10085df9 Adding support for file explorer for project files
laurent
parents: 781
diff changeset
  1286
    _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
  1287
782
6f0e10085df9 Adding support for file explorer for project files
laurent
parents: 781
diff changeset
  1288
    def _OpenProjectFiles(self):
815
e4f24593a758 Adding support for extending internationalization to extensions
laurent
parents: 814
diff changeset
  1289
        self._OpenView("Project Files")
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
  1290
784
a1d970365e41 Adding support for beremiz extensions to define custom file editors for project files
laurent
parents: 782
diff changeset
  1291
    _FileEditors = {}
1751
c28db6f7616b clean-up: fix PEP8 E301 expected 1 blank line, found 0
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1749
diff changeset
  1292
784
a1d970365e41 Adding support for beremiz extensions to define custom file editors for project files
laurent
parents: 782
diff changeset
  1293
    def _OpenFileEditor(self, filepath):
a1d970365e41 Adding support for beremiz extensions to define custom file editors for project files
laurent
parents: 782
diff changeset
  1294
        self._OpenView(filepath)
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
  1295
782
6f0e10085df9 Adding support for file explorer for project files
laurent
parents: 781
diff changeset
  1296
    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
  1297
        if name == "IEC code":
782
6f0e10085df9 Adding support for file explorer for project files
laurent
parents: 781
diff changeset
  1298
            if self._IECCodeView is None:
774
78b5fa92dd1c Fix bug when opening and closing confnode extra viewers
laurent
parents: 770
diff changeset
  1299
                plc_file = self._getIECcodepath()
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
  1300
2248
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
  1301
                self._IECCodeView = IECCodeViewer(
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
  1302
                    self.AppFrame.TabsOpened, "", self.AppFrame, None, instancepath=name)
774
78b5fa92dd1c Fix bug when opening and closing confnode extra viewers
laurent
parents: 770
diff changeset
  1303
                self._IECCodeView.SetTextSyntax("ALL")
78b5fa92dd1c Fix bug when opening and closing confnode extra viewers
laurent
parents: 770
diff changeset
  1304
                self._IECCodeView.SetKeywords(IEC_KEYWORDS)
78b5fa92dd1c Fix bug when opening and closing confnode extra viewers
laurent
parents: 770
diff changeset
  1305
                try:
2442
b13f021c68a5 python3 support: pylint, W1607 # (file-builtin) file built-in referenced
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 2441
diff changeset
  1306
                    text = open(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
  1307
                except Exception:
774
78b5fa92dd1c Fix bug when opening and closing confnode extra viewers
laurent
parents: 770
diff changeset
  1308
                    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
  1309
                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
  1310
                self._IECCodeView.Editor.SetReadOnly(True)
782
6f0e10085df9 Adding support for file explorer for project files
laurent
parents: 781
diff changeset
  1311
                self._IECCodeView.SetIcon(GetBitmap("ST"))
806
abf1afc1f04d Fix bug when closing IECCodeView and IECRawCodeView, reopening them was impossible
laurent
parents: 801
diff changeset
  1312
                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
  1313
784
a1d970365e41 Adding support for beremiz extensions to define custom file editors for project files
laurent
parents: 782
diff changeset
  1314
            if self._IECCodeView is not None:
774
78b5fa92dd1c Fix bug when opening and closing confnode extra viewers
laurent
parents: 770
diff changeset
  1315
                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
  1316
774
78b5fa92dd1c Fix bug when opening and closing confnode extra viewers
laurent
parents: 770
diff changeset
  1317
            return self._IECCodeView
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
  1318
716
180e4a7d945c Adding search field for finding function or function block in library tree
laurent
parents: 715
diff changeset
  1319
        elif name == "IEC raw code":
782
6f0e10085df9 Adding support for file explorer for project files
laurent
parents: 781
diff changeset
  1320
            if self._IECRawCodeView is None:
806
abf1afc1f04d Fix bug when closing IECCodeView and IECRawCodeView, reopening them was impossible
laurent
parents: 801
diff changeset
  1321
                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
  1322
2248
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
  1323
                self._IECRawCodeView = IECCodeViewer(
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
  1324
                    self.AppFrame.TabsOpened, "", self.AppFrame, controler, instancepath=name)
782
6f0e10085df9 Adding support for file explorer for project files
laurent
parents: 781
diff changeset
  1325
                self._IECRawCodeView.SetTextSyntax("ALL")
6f0e10085df9 Adding support for file explorer for project files
laurent
parents: 781
diff changeset
  1326
                self._IECRawCodeView.SetKeywords(IEC_KEYWORDS)
6f0e10085df9 Adding support for file explorer for project files
laurent
parents: 781
diff changeset
  1327
                self._IECRawCodeView.RefreshView()
6f0e10085df9 Adding support for file explorer for project files
laurent
parents: 781
diff changeset
  1328
                self._IECRawCodeView.SetIcon(GetBitmap("ST"))
806
abf1afc1f04d Fix bug when closing IECCodeView and IECRawCodeView, reopening them was impossible
laurent
parents: 801
diff changeset
  1329
                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
  1330
784
a1d970365e41 Adding support for beremiz extensions to define custom file editors for project files
laurent
parents: 782
diff changeset
  1331
            if self._IECRawCodeView is not None:
782
6f0e10085df9 Adding support for file explorer for project files
laurent
parents: 781
diff changeset
  1332
                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
  1333
782
6f0e10085df9 Adding support for file explorer for project files
laurent
parents: 781
diff changeset
  1334
            return self._IECRawCodeView
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
  1335
815
e4f24593a758 Adding support for extending internationalization to extensions
laurent
parents: 814
diff changeset
  1336
        elif name == "Project Files":
782
6f0e10085df9 Adding support for file explorer for project files
laurent
parents: 781
diff changeset
  1337
            if self._ProjectFilesView is None:
2248
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
  1338
                self._ProjectFilesView = FileManagementPanel(
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
  1339
                    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
  1340
784
a1d970365e41 Adding support for beremiz extensions to define custom file editors for project files
laurent
parents: 782
diff changeset
  1341
                extensions = []
2415
f7d8891fe708 cleanup: pylint, R1704 # (redefined-argument-from-local) Redefining argument with the local name 'Y'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 2248
diff changeset
  1342
                for extension, _name, _editor in features.file_editors:
784
a1d970365e41 Adding support for beremiz extensions to define custom file editors for project files
laurent
parents: 782
diff changeset
  1343
                    if extension not in extensions:
a1d970365e41 Adding support for beremiz extensions to define custom file editors for project files
laurent
parents: 782
diff changeset
  1344
                        extensions.append(extension)
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
  1345
                self._ProjectFilesView.SetEditableFileExtensions(extensions)
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
  1346
784
a1d970365e41 Adding support for beremiz extensions to define custom file editors for project files
laurent
parents: 782
diff changeset
  1347
            if self._ProjectFilesView is not None:
782
6f0e10085df9 Adding support for file explorer for project files
laurent
parents: 781
diff changeset
  1348
                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
  1349
784
a1d970365e41 Adding support for beremiz extensions to define custom file editors for project files
laurent
parents: 782
diff changeset
  1350
            return self._ProjectFilesView
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
  1351
789
b1b1a8f85e2f Adding support for saving editor choosen when editing project file for reloading project layout
laurent
parents: 786
diff changeset
  1352
        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
  1353
            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
  1354
            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
  1355
                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
  1356
                    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
  1357
796
92071c4b85e9 Fix bug when opening File Editor
laurent
parents: 792
diff changeset
  1358
                    editors = dict([(edit_name, edit_class)
92071c4b85e9 Fix bug when opening File Editor
laurent
parents: 792
diff changeset
  1359
                                    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
  1360
                                    if extension == file_extension])
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
  1361
789
b1b1a8f85e2f Adding support for saving editor choosen when editing project file for reloading project layout
laurent
parents: 786
diff changeset
  1362
                    if editor_name == "":
b1b1a8f85e2f Adding support for saving editor choosen when editing project file for reloading project layout
laurent
parents: 786
diff changeset
  1363
                        if len(editors) == 1:
b1b1a8f85e2f Adding support for saving editor choosen when editing project file for reloading project layout
laurent
parents: 786
diff changeset
  1364
                            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
  1365
                        elif len(editors) > 0:
b1b1a8f85e2f Adding support for saving editor choosen when editing project file for reloading project layout
laurent
parents: 786
diff changeset
  1366
                            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
  1367
                            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
  1368
                                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
  1369
                                _("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
  1370
                                _("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
  1371
                                names,
691083b5682a clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1767
diff changeset
  1372
                                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
  1373
                            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
  1374
                                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
  1375
                            dialog.Destroy()
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
  1376
789
b1b1a8f85e2f Adding support for saving editor choosen when editing project file for reloading project layout
laurent
parents: 786
diff changeset
  1377
                    if editor_name != "":
b1b1a8f85e2f Adding support for saving editor choosen when editing project file for reloading project layout
laurent
parents: 786
diff changeset
  1378
                        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
  1379
789
b1b1a8f85e2f Adding support for saving editor choosen when editing project file for reloading project layout
laurent
parents: 786
diff changeset
  1380
                        editor = editors[editor_name]()
2248
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
  1381
                        self._FileEditors[filepath] = editor(
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
  1382
                            self.AppFrame.TabsOpened, self, name, self.AppFrame)
789
b1b1a8f85e2f Adding support for saving editor choosen when editing project file for reloading project layout
laurent
parents: 786
diff changeset
  1383
                        self._FileEditors[filepath].SetIcon(GetBitmap("FILE"))
897
3cd39bc7dbad Added support for defining extension file editor as DebugViewer
Laurent Bessard
parents: 883
diff changeset
  1384
                        if isinstance(self._FileEditors[filepath], DebugViewer):
3cd39bc7dbad Added support for defining extension file editor as DebugViewer
Laurent Bessard
parents: 883
diff changeset
  1385
                            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
  1386
1763
bcc07ff2362c clean-up: fix PEP8 W601 .has_key() is deprecated, use 'in'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1760
diff changeset
  1387
            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
  1388
                editor = self._FileEditors[filepath]
b1b1a8f85e2f Adding support for saving editor choosen when editing project file for reloading project layout
laurent
parents: 786
diff changeset
  1389
                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
  1390
789
b1b1a8f85e2f Adding support for saving editor choosen when editing project file for reloading project layout
laurent
parents: 786
diff changeset
  1391
            return self._FileEditors.get(filepath)
738
413946c04c87 refactoring
laurent
parents: 737
diff changeset
  1392
        else:
786
aaacf208beb9 Fix bug while opening project panel
laurent
parents: 784
diff changeset
  1393
            return ConfigTreeNode._OpenView(self, self.CTNName(), onlyopened)
20
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
  1394
774
78b5fa92dd1c Fix bug when opening and closing confnode extra viewers
laurent
parents: 770
diff changeset
  1395
    def OnCloseEditor(self, view):
78b5fa92dd1c Fix bug when opening and closing confnode extra viewers
laurent
parents: 770
diff changeset
  1396
        ConfigTreeNode.OnCloseEditor(self, view)
78b5fa92dd1c Fix bug when opening and closing confnode extra viewers
laurent
parents: 770
diff changeset
  1397
        if self._IECCodeView == view:
78b5fa92dd1c Fix bug when opening and closing confnode extra viewers
laurent
parents: 770
diff changeset
  1398
            self._IECCodeView = None
78b5fa92dd1c Fix bug when opening and closing confnode extra viewers
laurent
parents: 770
diff changeset
  1399
        if self._IECRawCodeView == view:
78b5fa92dd1c Fix bug when opening and closing confnode extra viewers
laurent
parents: 770
diff changeset
  1400
            self._IECRawCodeView = None
782
6f0e10085df9 Adding support for file explorer for project files
laurent
parents: 781
diff changeset
  1401
        if self._ProjectFilesView == view:
6f0e10085df9 Adding support for file explorer for project files
laurent
parents: 781
diff changeset
  1402
            self._ProjectFilesView = None
784
a1d970365e41 Adding support for beremiz extensions to define custom file editors for project files
laurent
parents: 782
diff changeset
  1403
        if view in self._FileEditors.values():
792
fd113777d1ae Fix bug while closing specific file editors
laurent
parents: 789
diff changeset
  1404
            self._FileEditors.pop(view.GetFilePath())
774
78b5fa92dd1c Fix bug when opening and closing confnode extra viewers
laurent
parents: 770
diff changeset
  1405
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1406
    def _Clean(self):
774
78b5fa92dd1c Fix bug when opening and closing confnode extra viewers
laurent
parents: 770
diff changeset
  1407
        self._CloseView(self._IECCodeView)
108
280b458e42e5 add clean implementation
greg
parents: 107
diff changeset
  1408
        if os.path.isdir(os.path.join(self._getBuildPath())):
361
331d698e1118 Adding support for internationalization
laurent
parents: 356
diff changeset
  1409
            self.logger.write(_("Cleaning the build directory\n"))
108
280b458e42e5 add clean implementation
greg
parents: 107
diff changeset
  1410
            shutil.rmtree(os.path.join(self._getBuildPath()))
280b458e42e5 add clean implementation
greg
parents: 107
diff changeset
  1411
        else:
361
331d698e1118 Adding support for internationalization
laurent
parents: 356
diff changeset
  1412
            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
  1413
        # 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
  1414
        self._builder = None
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1415
        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
  1416
        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
  1417
dac6002ff58e fix issue with non-updated button 'generated IECCode' after Build and Clean
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1551
diff changeset
  1418
    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
  1419
        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
  1420
        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
  1421
        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
  1422
            self.AppFrame.RefreshStatusToolBar()
1730
64d8f52bc8c8 clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1722
diff changeset
  1423
1555
dac6002ff58e fix issue with non-updated button 'generated IECCode' after Build and Clean
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1551
diff changeset
  1424
    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
  1425
        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
  1426
911
ffa24427396a Log redirected to console, dump of all available log to console when connecting to PLC
Edouard Tisserant
parents: 906
diff changeset
  1427
    def UpdatePLCLog(self, log_count):
978
3290eff761f1 Added LogViewer panel in bottom notebook
Laurent Bessard
parents: 923
diff changeset
  1428
        if log_count:
3290eff761f1 Added LogViewer panel in bottom notebook
Laurent Bessard
parents: 923
diff changeset
  1429
            if self.AppFrame is not None:
3290eff761f1 Added LogViewer panel in bottom notebook
Laurent Bessard
parents: 923
diff changeset
  1430
                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
  1431
2224
ebd83ec387f9 Customizable update of toolbar buttons (i.e. 'methods') according to PLCStatus
Edouard Tisserant
parents: 1997
diff changeset
  1432
    DefaultMethods = {
ebd83ec387f9 Customizable update of toolbar buttons (i.e. 'methods') according to PLCStatus
Edouard Tisserant
parents: 1997
diff changeset
  1433
        "_Run": False,
ebd83ec387f9 Customizable update of toolbar buttons (i.e. 'methods') according to PLCStatus
Edouard Tisserant
parents: 1997
diff changeset
  1434
        "_Stop": False,
ebd83ec387f9 Customizable update of toolbar buttons (i.e. 'methods') according to PLCStatus
Edouard Tisserant
parents: 1997
diff changeset
  1435
        "_Transfer": False,
ebd83ec387f9 Customizable update of toolbar buttons (i.e. 'methods') according to PLCStatus
Edouard Tisserant
parents: 1997
diff changeset
  1436
        "_Connect": True,
2594
f1e182818434 Added PurgePLC() method to PLCObject, to be invoked when PLC Status is broken. It clears PLC shared object an extra files and force status to Empty. Added correponding Repair button to toolbar, visible only when PLC status is broken.
Edouard Tisserant
parents: 2521
diff changeset
  1437
        "_Repair": False,
2224
ebd83ec387f9 Customizable update of toolbar buttons (i.e. 'methods') according to PLCStatus
Edouard Tisserant
parents: 1997
diff changeset
  1438
        "_Disconnect": False
ebd83ec387f9 Customizable update of toolbar buttons (i.e. 'methods') according to PLCStatus
Edouard Tisserant
parents: 1997
diff changeset
  1439
    }
ebd83ec387f9 Customizable update of toolbar buttons (i.e. 'methods') according to PLCStatus
Edouard Tisserant
parents: 1997
diff changeset
  1440
ebd83ec387f9 Customizable update of toolbar buttons (i.e. 'methods') according to PLCStatus
Edouard Tisserant
parents: 1997
diff changeset
  1441
    MethodsFromStatus = {
2416
1ca207782dde Use predefined constants for PlcStatus instead of string literals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 2415
diff changeset
  1442
        PlcStatus.Started:      {"_Stop": True,
1ca207782dde Use predefined constants for PlcStatus instead of string literals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 2415
diff changeset
  1443
                                 "_Transfer": True,
1ca207782dde Use predefined constants for PlcStatus instead of string literals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 2415
diff changeset
  1444
                                 "_Connect": False,
1ca207782dde Use predefined constants for PlcStatus instead of string literals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 2415
diff changeset
  1445
                                 "_Disconnect": True},
1ca207782dde Use predefined constants for PlcStatus instead of string literals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 2415
diff changeset
  1446
        PlcStatus.Stopped:      {"_Run": True,
1ca207782dde Use predefined constants for PlcStatus instead of string literals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 2415
diff changeset
  1447
                                 "_Transfer": True,
1ca207782dde Use predefined constants for PlcStatus instead of string literals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 2415
diff changeset
  1448
                                 "_Connect": False,
2652
269149e78302 IDE: Main toolbar : Show repair button also in stop mode. Move repair button after disconnect button.
Edouard Tisserant
parents: 2645
diff changeset
  1449
                                 "_Disconnect": True,
269149e78302 IDE: Main toolbar : Show repair button also in stop mode. Move repair button after disconnect button.
Edouard Tisserant
parents: 2645
diff changeset
  1450
                                 "_Repair": True},
2416
1ca207782dde Use predefined constants for PlcStatus instead of string literals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 2415
diff changeset
  1451
        PlcStatus.Empty:        {"_Transfer": True,
1ca207782dde Use predefined constants for PlcStatus instead of string literals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 2415
diff changeset
  1452
                                 "_Connect": False,
1ca207782dde Use predefined constants for PlcStatus instead of string literals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 2415
diff changeset
  1453
                                 "_Disconnect": True},
1ca207782dde Use predefined constants for PlcStatus instead of string literals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 2415
diff changeset
  1454
        PlcStatus.Broken:       {"_Connect": False,
2594
f1e182818434 Added PurgePLC() method to PLCObject, to be invoked when PLC Status is broken. It clears PLC shared object an extra files and force status to Empty. Added correponding Repair button to toolbar, visible only when PLC status is broken.
Edouard Tisserant
parents: 2521
diff changeset
  1455
                                 "_Repair": True,
2416
1ca207782dde Use predefined constants for PlcStatus instead of string literals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 2415
diff changeset
  1456
                                 "_Disconnect": True},
1ca207782dde Use predefined constants for PlcStatus instead of string literals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 2415
diff changeset
  1457
        PlcStatus.Disconnected: {},
2224
ebd83ec387f9 Customizable update of toolbar buttons (i.e. 'methods') according to PLCStatus
Edouard Tisserant
parents: 1997
diff changeset
  1458
    }
ebd83ec387f9 Customizable update of toolbar buttons (i.e. 'methods') according to PLCStatus
Edouard Tisserant
parents: 1997
diff changeset
  1459
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1460
    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
  1461
        updated = False
2602
19dc6b830e7d If call to GetPLCstatus can't be executed in PLC, then obtained status is disconnected. Status on "None" is not relevant anymore, and is replaced by Disconnected.
Edouard Tisserant
parents: 2596
diff changeset
  1462
        status = PlcStatus.Disconnected
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1463
        if self._connector is not None:
923
6ef6e0b3a908 Fixed crash (segfault) when logging debug messages
Edouard Tisserant
parents: 922
diff changeset
  1464
            PLCstatus = self._connector.GetPLCstatus()
6ef6e0b3a908 Fixed crash (segfault) when logging debug messages
Edouard Tisserant
parents: 922
diff changeset
  1465
            if PLCstatus is not None:
6ef6e0b3a908 Fixed crash (segfault) when logging debug messages
Edouard Tisserant
parents: 922
diff changeset
  1466
                status, log_count = PLCstatus
6ef6e0b3a908 Fixed crash (segfault) when logging debug messages
Edouard Tisserant
parents: 922
diff changeset
  1467
                self.UpdatePLCLog(log_count)
2602
19dc6b830e7d If call to GetPLCstatus can't be executed in PLC, then obtained status is disconnected. Status on "None" is not relevant anymore, and is replaced by Disconnected.
Edouard Tisserant
parents: 2596
diff changeset
  1468
        if status == PlcStatus.Disconnected:
1116
300f98a8d4c6 Fixed bug connector not resetted when connection is lost
Laurent Bessard
parents: 1105
diff changeset
  1469
            self._SetConnector(None, False)
2416
1ca207782dde Use predefined constants for PlcStatus instead of string literals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 2415
diff changeset
  1470
            status = PlcStatus.Disconnected
1828
396da88d7b5c fix unnecessary parens after keyword
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1824
diff changeset
  1471
        if self.previous_plcstate != status:
2224
ebd83ec387f9 Customizable update of toolbar buttons (i.e. 'methods') according to PLCStatus
Edouard Tisserant
parents: 1997
diff changeset
  1472
            allmethods = self.DefaultMethods.copy()
ebd83ec387f9 Customizable update of toolbar buttons (i.e. 'methods') according to PLCStatus
Edouard Tisserant
parents: 1997
diff changeset
  1473
            allmethods.update(
ebd83ec387f9 Customizable update of toolbar buttons (i.e. 'methods') according to PLCStatus
Edouard Tisserant
parents: 1997
diff changeset
  1474
                self.MethodsFromStatus.get(status, {}))
ebd83ec387f9 Customizable update of toolbar buttons (i.e. 'methods') according to PLCStatus
Edouard Tisserant
parents: 1997
diff changeset
  1475
            for method, active in allmethods.items():
2248
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
  1476
                self.ShowMethod(method, active)
922
60fafd828a30 Better PLC log message time stamp display. Better console information when connecting.
Edouard Tisserant
parents: 921
diff changeset
  1477
            self.previous_plcstate = status
918
aa136ef12506 Fix bug with refresh PLC status tool bar
Laurent Bessard
parents: 917
diff changeset
  1478
            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
  1479
                updated = True
918
aa136ef12506 Fix bug with refresh PLC status tool bar
Laurent Bessard
parents: 917
diff changeset
  1480
                self.AppFrame.RefreshStatusToolBar()
2416
1ca207782dde Use predefined constants for PlcStatus instead of string literals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 2415
diff changeset
  1481
                if status == PlcStatus.Disconnected:
2248
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
  1482
                    self.AppFrame.ConnectionStatusBar.SetStatusText(
2416
1ca207782dde Use predefined constants for PlcStatus instead of string literals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 2415
diff changeset
  1483
                        _(status), 1)
1000
d19af9341d28 Added support for StatusBar
Laurent Bessard
parents: 992
diff changeset
  1484
                    self.AppFrame.ConnectionStatusBar.SetStatusText('', 2)
d19af9341d28 Added support for StatusBar
Laurent Bessard
parents: 992
diff changeset
  1485
                else:
d19af9341d28 Added support for StatusBar
Laurent Bessard
parents: 992
diff changeset
  1486
                    self.AppFrame.ConnectionStatusBar.SetStatusText(
d19af9341d28 Added support for StatusBar
Laurent Bessard
parents: 992
diff changeset
  1487
                        _("Connected to URI: %s") % self.BeremizRoot.getURI_location().strip(), 1)
2248
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
  1488
                    self.AppFrame.ConnectionStatusBar.SetStatusText(
2416
1ca207782dde Use predefined constants for PlcStatus instead of string literals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 2415
diff changeset
  1489
                        _(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
  1490
        return updated
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
  1491
1744
69dfdb26f600 clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1742
diff changeset
  1492
    def ShowPLCProgress(self, status="", progress=0):
1574
ce9c0e68389c add progress bar to status bar
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1555
diff changeset
  1493
        self.AppFrame.ProgressStatusBar.Show()
2248
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
  1494
        self.AppFrame.ConnectionStatusBar.SetStatusText(
2416
1ca207782dde Use predefined constants for PlcStatus instead of string literals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 2415
diff changeset
  1495
            _(status), 1)
1574
ce9c0e68389c add progress bar to status bar
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1555
diff changeset
  1496
        self.AppFrame.ProgressStatusBar.SetValue(progress)
ce9c0e68389c add progress bar to status bar
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1555
diff changeset
  1497
ce9c0e68389c add progress bar to status bar
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1555
diff changeset
  1498
    def HidePLCProgress(self):
ce9c0e68389c add progress bar to status bar
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1555
diff changeset
  1499
        # clear previous_plcstate to restore status
ce9c0e68389c add progress bar to status bar
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1555
diff changeset
  1500
        # in UpdateMethodsFromPLCStatus()
ce9c0e68389c add progress bar to status bar
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1555
diff changeset
  1501
        self.previous_plcstate = ""
ce9c0e68389c add progress bar to status bar
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1555
diff changeset
  1502
        self.AppFrame.ProgressStatusBar.Hide()
ce9c0e68389c add progress bar to status bar
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1555
diff changeset
  1503
        self.UpdateMethodsFromPLCStatus()
1730
64d8f52bc8c8 clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1722
diff changeset
  1504
446
1edde533db19 Some cleanup in PLC status - removed that \"Starting\" state ...
ed
parents: 440
diff changeset
  1505
    def PullPLCStatusProc(self, event):
918
aa136ef12506 Fix bug with refresh PLC status tool bar
Laurent Bessard
parents: 917
diff changeset
  1506
        self.UpdateMethodsFromPLCStatus()
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
  1507
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
  1508
    def SnapshotAndResetDebugValuesBuffers(self):
2485
ef327451d067 Add a debugger token to SetTraceVariables and GetTraceVariables to prevent crash an inconsistant data in case of multiple connections. Last connection now takes over existing connections's debug, and first connected IDE gets a wrning.
Edouard Tisserant
parents: 2481
diff changeset
  1509
        debug_status = PlcStatus.Disconnected
ef327451d067 Add a debugger token to SetTraceVariables and GetTraceVariables to prevent crash an inconsistant data in case of multiple connections. Last connection now takes over existing connections's debug, and first connected IDE gets a wrning.
Edouard Tisserant
parents: 2481
diff changeset
  1510
        if self._connector is not None and self.DebugToken is not None:
ef327451d067 Add a debugger token to SetTraceVariables and GetTraceVariables to prevent crash an inconsistant data in case of multiple connections. Last connection now takes over existing connections's debug, and first connected IDE gets a wrning.
Edouard Tisserant
parents: 2481
diff changeset
  1511
            debug_status, Traces = self._connector.GetTraceVariables(self.DebugToken)
2248
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
  1512
            # print [dict.keys() for IECPath, (dict, log, status, fvalue) in
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
  1513
            # self.IECdebug_datas.items()]
2485
ef327451d067 Add a debugger token to SetTraceVariables and GetTraceVariables to prevent crash an inconsistant data in case of multiple connections. Last connection now takes over existing connections's debug, and first connected IDE gets a wrning.
Edouard Tisserant
parents: 2481
diff changeset
  1514
            if debug_status == PlcStatus.Started:
1996
4ae9c4447947 Add safety check to prevent exception when disconnecting while debugging
Edouard Tisserant
parents: 1995
diff changeset
  1515
                if len(Traces) > 0:
4ae9c4447947 Add safety check to prevent exception when disconnecting while debugging
Edouard Tisserant
parents: 1995
diff changeset
  1516
                    for debug_tick, debug_buff in Traces:
2248
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
  1517
                        debug_vars = UnpackDebugBuffer(
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
  1518
                            debug_buff, self.TracedIECTypes)
3257
095c73591b7e IDE: Cleaned up some useless tests in variable trace data handling code, changed from bare numpy arrays to RingBuffers inorder to avoid RAM outage and crash after long tracing session.
Edouard Tisserant
parents: 3239
diff changeset
  1519
                        if debug_vars is not None:
095c73591b7e IDE: Cleaned up some useless tests in variable trace data handling code, changed from bare numpy arrays to RingBuffers inorder to avoid RAM outage and crash after long tracing session.
Edouard Tisserant
parents: 3239
diff changeset
  1520
                            for IECPath, values_buffer, value in izip(
1996
4ae9c4447947 Add safety check to prevent exception when disconnecting while debugging
Edouard Tisserant
parents: 1995
diff changeset
  1521
                                    self.TracedIECPath,
4ae9c4447947 Add safety check to prevent exception when disconnecting while debugging
Edouard Tisserant
parents: 1995
diff changeset
  1522
                                    self.DebugValuesBuffers,
4ae9c4447947 Add safety check to prevent exception when disconnecting while debugging
Edouard Tisserant
parents: 1995
diff changeset
  1523
                                    debug_vars):
2248
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
  1524
                                IECdebug_data = self.IECdebug_datas.get(
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
  1525
                                    IECPath, None)
1996
4ae9c4447947 Add safety check to prevent exception when disconnecting while debugging
Edouard Tisserant
parents: 1995
diff changeset
  1526
                                if IECdebug_data is not None and value is not None:
2512
69cef4e37ef9 Fix non-marking as manually forced floating point variable if the value isn't integer
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 2506
diff changeset
  1527
                                    forced = (IECdebug_data[2] == "Forced") \
69cef4e37ef9 Fix non-marking as manually forced floating point variable if the value isn't integer
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 2506
diff changeset
  1528
                                        and (value is not None) and \
69cef4e37ef9 Fix non-marking as manually forced floating point variable if the value isn't integer
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 2506
diff changeset
  1529
                                        (IECdebug_data[3] is not None)
69cef4e37ef9 Fix non-marking as manually forced floating point variable if the value isn't integer
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 2506
diff changeset
  1530
1996
4ae9c4447947 Add safety check to prevent exception when disconnecting while debugging
Edouard Tisserant
parents: 1995
diff changeset
  1531
                                    if not IECdebug_data[4] and len(values_buffer) > 0:
4ae9c4447947 Add safety check to prevent exception when disconnecting while debugging
Edouard Tisserant
parents: 1995
diff changeset
  1532
                                        values_buffer[-1] = (value, forced)
4ae9c4447947 Add safety check to prevent exception when disconnecting while debugging
Edouard Tisserant
parents: 1995
diff changeset
  1533
                                    else:
4ae9c4447947 Add safety check to prevent exception when disconnecting while debugging
Edouard Tisserant
parents: 1995
diff changeset
  1534
                                        values_buffer.append((value, forced))
4ae9c4447947 Add safety check to prevent exception when disconnecting while debugging
Edouard Tisserant
parents: 1995
diff changeset
  1535
                            self.DebugTicks.append(debug_tick)
1995
691d119ba20f Removed DebugThread. Take advantage of the fact that buffering is done in runtime. No need to poll for traces more than ten per second, then use simple wxTimer for that. Also removed Debug Lock since now everything happens in wx' mainloop.
Edouard Tisserant
parents: 1953
diff changeset
  1536
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
  1537
        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
  1538
                                            [list() for dummy in xrange(len(self.TracedIECPath))])
1995
691d119ba20f Removed DebugThread. Take advantage of the fact that buffering is done in runtime. No need to poll for traces more than ten per second, then use simple wxTimer for that. Also removed Debug Lock since now everything happens in wx' mainloop.
Edouard Tisserant
parents: 1953
diff changeset
  1539
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
  1540
        ticks, self.DebugTicks = self.DebugTicks, []
1995
691d119ba20f Removed DebugThread. Take advantage of the fact that buffering is done in runtime. No need to poll for traces more than ten per second, then use simple wxTimer for that. Also removed Debug Lock since now everything happens in wx' mainloop.
Edouard Tisserant
parents: 1953
diff changeset
  1541
2485
ef327451d067 Add a debugger token to SetTraceVariables and GetTraceVariables to prevent crash an inconsistant data in case of multiple connections. Last connection now takes over existing connections's debug, and first connected IDE gets a wrning.
Edouard Tisserant
parents: 2481
diff changeset
  1542
        return debug_status, ticks, buffers
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
  1543
239
112b4bc523b3 Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents: 236
diff changeset
  1544
    def RegisterDebugVarToConnector(self):
112b4bc523b3 Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents: 236
diff changeset
  1545
        Idxs = []
112b4bc523b3 Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents: 236
diff changeset
  1546
        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
  1547
        self.TracedIECTypes = []
2485
ef327451d067 Add a debugger token to SetTraceVariables and GetTraceVariables to prevent crash an inconsistant data in case of multiple connections. Last connection now takes over existing connections's debug, and first connected IDE gets a wrning.
Edouard Tisserant
parents: 2481
diff changeset
  1548
        if self._connector is not None and self.debug_status != PlcStatus.Broken:
239
112b4bc523b3 Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents: 236
diff changeset
  1549
            IECPathsToPop = []
1740
b789b695b5c6 clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1739
diff changeset
  1550
            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
  1551
                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
  1552
                if len(WeakCallableDict) == 0:
112b4bc523b3 Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents: 236
diff changeset
  1553
                    # Callable Dict is empty.
112b4bc523b3 Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents: 236
diff changeset
  1554
                    # This variable is not needed anymore!
112b4bc523b3 Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents: 236
diff changeset
  1555
                    IECPathsToPop.append(IECPath)
355
e257fe074a90 Fix refresh of Beremiz button when connection lost
greg
parents: 351
diff changeset
  1556
                elif IECPath != "__tick__":
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
  1557
                    # Convert
2248
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
  1558
                    Idx, IEC_Type = self._IECPathToIdx.get(
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
  1559
                        IECPath, (None, None))
239
112b4bc523b3 Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents: 236
diff changeset
  1560
                    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
  1561
                        if IEC_Type in DebugTypesSize:
592
c6408f92da0a Initial TIME support in debugger
Edouard Tisserant
parents: 579
diff changeset
  1562
                            Idxs.append((Idx, IEC_Type, fvalue, IECPath))
c6408f92da0a Initial TIME support in debugger
Edouard Tisserant
parents: 579
diff changeset
  1563
                        else:
2248
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
  1564
                            self.logger.write_warning(
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
  1565
                                _("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
  1566
                    else:
2248
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
  1567
                        self.logger.write_warning(
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
  1568
                            _("Debug: Unknown variable '%s'\n") % IECPath)
239
112b4bc523b3 Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents: 236
diff changeset
  1569
            for IECPathToPop in IECPathsToPop:
112b4bc523b3 Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents: 236
diff changeset
  1570
                self.IECdebug_datas.pop(IECPathToPop)
112b4bc523b3 Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents: 236
diff changeset
  1571
457
ed
parents: 450
diff changeset
  1572
            if Idxs:
ed
parents: 450
diff changeset
  1573
                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
  1574
                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
  1575
                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
  1576
                self.TracedIECTypes = IdxsT[1]
2485
ef327451d067 Add a debugger token to SetTraceVariables and GetTraceVariables to prevent crash an inconsistant data in case of multiple connections. Last connection now takes over existing connections's debug, and first connected IDE gets a wrning.
Edouard Tisserant
parents: 2481
diff changeset
  1577
                self.DebugToken = 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
  1578
            else:
67d32a91d70b Fixes in debug + reconnect to running PLC
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents: 464
diff changeset
  1579
                self.TracedIECPath = []
67d32a91d70b Fixes in debug + reconnect to running PLC
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents: 464
diff changeset
  1580
                self._connector.SetTraceVariablesList([])
2485
ef327451d067 Add a debugger token to SetTraceVariables and GetTraceVariables to prevent crash an inconsistant data in case of multiple connections. Last connection now takes over existing connections's debug, and first connected IDE gets a wrning.
Edouard Tisserant
parents: 2481
diff changeset
  1581
                self.DebugToken = None
ef327451d067 Add a debugger token to SetTraceVariables and GetTraceVariables to prevent crash an inconsistant data in case of multiple connections. Last connection now takes over existing connections's debug, and first connected IDE gets a wrning.
Edouard Tisserant
parents: 2481
diff changeset
  1582
            self.debug_status, _debug_ticks, _buffers = self.SnapshotAndResetDebugValuesBuffers()
2708
ea2aaeaaac4e DEBUG: (IDE side) fixed wrong implementation of anti-rapid-fire leading to systematic delay in subscribing
Edouard Tisserant
parents: 2652
diff changeset
  1583
        self.DebugUpdatePending = False
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
  1584
1146
510d1ea1f6c1 Fixed variable panel in CodeFileEditor
Laurent Bessard
parents: 1116
diff changeset
  1585
    def IsPLCStarted(self):
2416
1ca207782dde Use predefined constants for PlcStatus instead of string literals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 2415
diff changeset
  1586
        return self.previous_plcstate == PlcStatus.Started
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
  1587
2708
ea2aaeaaac4e DEBUG: (IDE side) fixed wrong implementation of anti-rapid-fire leading to systematic delay in subscribing
Edouard Tisserant
parents: 2652
diff changeset
  1588
    def AppendDebugUpdate(self):
ea2aaeaaac4e DEBUG: (IDE side) fixed wrong implementation of anti-rapid-fire leading to systematic delay in subscribing
Edouard Tisserant
parents: 2652
diff changeset
  1589
        if not self.DebugUpdatePending :
ea2aaeaaac4e DEBUG: (IDE side) fixed wrong implementation of anti-rapid-fire leading to systematic delay in subscribing
Edouard Tisserant
parents: 2652
diff changeset
  1590
            wx.CallAfter(self.RegisterDebugVarToConnector)
ea2aaeaaac4e DEBUG: (IDE side) fixed wrong implementation of anti-rapid-fire leading to systematic delay in subscribing
Edouard Tisserant
parents: 2652
diff changeset
  1591
            self.DebugUpdatePending = True
243
90db933fe956 Adding support for Debugging with PLCOpenEditor
lbessard
parents: 239
diff changeset
  1592
463
961bddcfc913 Adding support for forcing PLC variable (still command to PLC to implement)
laurent
parents: 462
diff changeset
  1593
    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
  1594
        _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
  1595
        return IEC_Type
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
  1596
1430
754fa90c8b27 minor cleanup
Edouard Tisserant
parents: 1427
diff changeset
  1597
    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
  1598
        """
112b4bc523b3 Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents: 236
diff changeset
  1599
        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
  1600
        to a WeakKeyDictionary linking
1430
754fa90c8b27 minor cleanup
Edouard Tisserant
parents: 1427
diff changeset
  1601
        weakly referenced callables
239
112b4bc523b3 Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents: 236
diff changeset
  1602
        """
1775
b45f2768fab1 clean-up: fix PEP8 E713 test for membership should be 'not in'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1768
diff changeset
  1603
        if IECPath != "__tick__" and IECPath not in self._IECPathToIdx:
246
3613c6ee9e0e Adding support for Debugging in PLCOpenEditor
lbessard
parents: 244
diff changeset
  1604
            return None
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
  1605
239
112b4bc523b3 Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents: 236
diff changeset
  1606
        # 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
  1607
        IECdebug_data = self.IECdebug_datas.get(IECPath, None)
112b4bc523b3 Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents: 236
diff changeset
  1608
        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
  1609
            IECdebug_data = [
1878
fb73a6b6622d fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1861
diff changeset
  1610
                WeakKeyDictionary(),  # Callables
fb73a6b6622d fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1861
diff changeset
  1611
                [],                   # 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
  1612
                "Registered",         # Variable status
3257
095c73591b7e IDE: Cleaned up some useless tests in variable trace data handling code, changed from bare numpy arrays to RingBuffers inorder to avoid RAM outage and crash after long tracing session.
Edouard Tisserant
parents: 3239
diff changeset
  1613
                None,                 # Forced value
095c73591b7e IDE: Cleaned up some useless tests in variable trace data handling code, changed from bare numpy arrays to RingBuffers inorder to avoid RAM outage and crash after long tracing session.
Edouard Tisserant
parents: 3239
diff changeset
  1614
                buffer_list]
239
112b4bc523b3 Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents: 236
diff changeset
  1615
            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
  1616
        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
  1617
            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
  1618
1742
92932cd370a4 clean-up: fix PEP8 E225 missing whitespace around operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1741
diff changeset
  1619
        IECdebug_data[0][callableobj] = buffer_list
239
112b4bc523b3 Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents: 236
diff changeset
  1620
2708
ea2aaeaaac4e DEBUG: (IDE side) fixed wrong implementation of anti-rapid-fire leading to systematic delay in subscribing
Edouard Tisserant
parents: 2652
diff changeset
  1621
        self.AppendDebugUpdate()
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
  1622
239
112b4bc523b3 Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents: 236
diff changeset
  1623
        return IECdebug_data[1]
112b4bc523b3 Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents: 236
diff changeset
  1624
112b4bc523b3 Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents: 236
diff changeset
  1625
    def UnsubscribeDebugIECVariable(self, IECPath, callableobj):
112b4bc523b3 Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents: 236
diff changeset
  1626
        IECdebug_data = self.IECdebug_datas.get(IECPath, None)
243
90db933fe956 Adding support for Debugging with PLCOpenEditor
lbessard
parents: 239
diff changeset
  1627
        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
  1628
            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
  1629
            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
  1630
                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
  1631
            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
  1632
                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
  1633
                    lambda x, y: x | y,
1430
754fa90c8b27 minor cleanup
Edouard Tisserant
parents: 1427
diff changeset
  1634
                    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
  1635
                    False)
243
90db933fe956 Adding support for Debugging with PLCOpenEditor
lbessard
parents: 239
diff changeset
  1636
2708
ea2aaeaaac4e DEBUG: (IDE side) fixed wrong implementation of anti-rapid-fire leading to systematic delay in subscribing
Edouard Tisserant
parents: 2652
diff changeset
  1637
        self.AppendDebugUpdate()
239
112b4bc523b3 Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents: 236
diff changeset
  1638
334
b4131e5d10a4 Adding support for unsubscribe all variables while transferring
lbessard
parents: 328
diff changeset
  1639
    def UnsubscribeAllDebugIECVariable(self):
1089
5cd1f8df71aa Fixed bug when transferring program and a output located variable is forced
Laurent Bessard
parents: 1080
diff changeset
  1640
        self.IECdebug_datas = {}
334
b4131e5d10a4 Adding support for unsubscribe all variables while transferring
lbessard
parents: 328
diff changeset
  1641
2708
ea2aaeaaac4e DEBUG: (IDE side) fixed wrong implementation of anti-rapid-fire leading to systematic delay in subscribing
Edouard Tisserant
parents: 2652
diff changeset
  1642
        self.AppendDebugUpdate()
355
e257fe074a90 Fix refresh of Beremiz button when connection lost
greg
parents: 351
diff changeset
  1643
474
6dc5505d79ce Adding command to PLC for forcing PLC variable
laurent
parents: 468
diff changeset
  1644
    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
  1645
        if IECPath not in self.IECdebug_datas:
474
6dc5505d79ce Adding command to PLC for forcing PLC variable
laurent
parents: 468
diff changeset
  1646
            return
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
  1647
474
6dc5505d79ce Adding command to PLC for forcing PLC variable
laurent
parents: 468
diff changeset
  1648
        # If no entry exist, create a new one with a fresh WeakKeyDictionary
6dc5505d79ce Adding command to PLC for forcing PLC variable
laurent
parents: 468
diff changeset
  1649
        IECdebug_data = self.IECdebug_datas.get(IECPath, None)
6dc5505d79ce Adding command to PLC for forcing PLC variable
laurent
parents: 468
diff changeset
  1650
        IECdebug_data[2] = "Forced"
6dc5505d79ce Adding command to PLC for forcing PLC variable
laurent
parents: 468
diff changeset
  1651
        IECdebug_data[3] = fvalue
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
  1652
2708
ea2aaeaaac4e DEBUG: (IDE side) fixed wrong implementation of anti-rapid-fire leading to systematic delay in subscribing
Edouard Tisserant
parents: 2652
diff changeset
  1653
        self.AppendDebugUpdate()
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
  1654
463
961bddcfc913 Adding support for forcing PLC variable (still command to PLC to implement)
laurent
parents: 462
diff changeset
  1655
    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
  1656
        if IECPath not in self.IECdebug_datas:
474
6dc5505d79ce Adding command to PLC for forcing PLC variable
laurent
parents: 468
diff changeset
  1657
            return
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
  1658
474
6dc5505d79ce Adding command to PLC for forcing PLC variable
laurent
parents: 468
diff changeset
  1659
        # If no entry exist, create a new one with a fresh WeakKeyDictionary
6dc5505d79ce Adding command to PLC for forcing PLC variable
laurent
parents: 468
diff changeset
  1660
        IECdebug_data = self.IECdebug_datas.get(IECPath, None)
6dc5505d79ce Adding command to PLC for forcing PLC variable
laurent
parents: 468
diff changeset
  1661
        IECdebug_data[2] = "Registered"
6dc5505d79ce Adding command to PLC for forcing PLC variable
laurent
parents: 468
diff changeset
  1662
        IECdebug_data[3] = None
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
  1663
2708
ea2aaeaaac4e DEBUG: (IDE side) fixed wrong implementation of anti-rapid-fire leading to systematic delay in subscribing
Edouard Tisserant
parents: 2652
diff changeset
  1664
        self.AppendDebugUpdate()
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
  1665
355
e257fe074a90 Fix refresh of Beremiz button when connection lost
greg
parents: 351
diff changeset
  1666
    def CallWeakcallables(self, IECPath, function_name, *cargs):
e257fe074a90 Fix refresh of Beremiz button when connection lost
greg
parents: 351
diff changeset
  1667
        data_tuple = self.IECdebug_datas.get(IECPath, None)
e257fe074a90 Fix refresh of Beremiz button when connection lost
greg
parents: 351
diff changeset
  1668
        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
  1669
            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
  1670
            # 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
  1671
            for weakcallable, buffer_list in WeakCallableDict.iteritems():
355
e257fe074a90 Fix refresh of Beremiz button when connection lost
greg
parents: 351
diff changeset
  1672
                function = getattr(weakcallable, function_name, None)
e257fe074a90 Fix refresh of Beremiz button when connection lost
greg
parents: 351
diff changeset
  1673
                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
  1674
                    if buffer_list:
1430
754fa90c8b27 minor cleanup
Edouard Tisserant
parents: 1427
diff changeset
  1675
                        function(*cargs)
474
6dc5505d79ce Adding command to PLC for forcing PLC variable
laurent
parents: 468
diff changeset
  1676
                    else:
1430
754fa90c8b27 minor cleanup
Edouard Tisserant
parents: 1427
diff changeset
  1677
                        function(*tuple([lst[-1] for lst in cargs]))
334
b4131e5d10a4 Adding support for unsubscribe all variables while transferring
lbessard
parents: 328
diff changeset
  1678
670
fb03cb6da95c Adding support for extracting Common_Ticktime from VARIABLES.csv
laurent
parents: 669
diff changeset
  1679
    def GetTicktime(self):
fb03cb6da95c Adding support for extracting Common_Ticktime from VARIABLES.csv
laurent
parents: 669
diff changeset
  1680
        return self._Ticktime
fb03cb6da95c Adding support for extracting Common_Ticktime from VARIABLES.csv
laurent
parents: 669
diff changeset
  1681
699
6ff64cadb1ff Adding support for executing python scripts on remote runtime
laurent
parents: 696
diff changeset
  1682
    def RemoteExec(self, script, **kwargs):
6ff64cadb1ff Adding support for executing python scripts on remote runtime
laurent
parents: 696
diff changeset
  1683
        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
  1684
            return -1, "No runtime connected!"
699
6ff64cadb1ff Adding support for executing python scripts on remote runtime
laurent
parents: 696
diff changeset
  1685
        return self._connector.RemoteExec(script, **kwargs)
6ff64cadb1ff Adding support for executing python scripts on remote runtime
laurent
parents: 696
diff changeset
  1686
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
  1687
    def DispatchDebugValuesProc(self, event):
3257
095c73591b7e IDE: Cleaned up some useless tests in variable trace data handling code, changed from bare numpy arrays to RingBuffers inorder to avoid RAM outage and crash after long tracing session.
Edouard Tisserant
parents: 3239
diff changeset
  1688
        event.Skip()
095c73591b7e IDE: Cleaned up some useless tests in variable trace data handling code, changed from bare numpy arrays to RingBuffers inorder to avoid RAM outage and crash after long tracing session.
Edouard Tisserant
parents: 3239
diff changeset
  1689
        start_time = time.time()
2485
ef327451d067 Add a debugger token to SetTraceVariables and GetTraceVariables to prevent crash an inconsistant data in case of multiple connections. Last connection now takes over existing connections's debug, and first connected IDE gets a wrning.
Edouard Tisserant
parents: 2481
diff changeset
  1690
        self.debug_status, debug_ticks, buffers = self.SnapshotAndResetDebugValuesBuffers()
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
  1691
2485
ef327451d067 Add a debugger token to SetTraceVariables and GetTraceVariables to prevent crash an inconsistant data in case of multiple connections. Last connection now takes over existing connections's debug, and first connected IDE gets a wrning.
Edouard Tisserant
parents: 2481
diff changeset
  1692
        if self.debug_status == PlcStatus.Broken:
ef327451d067 Add a debugger token to SetTraceVariables and GetTraceVariables to prevent crash an inconsistant data in case of multiple connections. Last connection now takes over existing connections's debug, and first connected IDE gets a wrning.
Edouard Tisserant
parents: 2481
diff changeset
  1693
            self.logger.write_warning(
ef327451d067 Add a debugger token to SetTraceVariables and GetTraceVariables to prevent crash an inconsistant data in case of multiple connections. Last connection now takes over existing connections's debug, and first connected IDE gets a wrning.
Edouard Tisserant
parents: 2481
diff changeset
  1694
                _("Debug: token rejected - other debug took over - reconnect to recover\n"))
3257
095c73591b7e IDE: Cleaned up some useless tests in variable trace data handling code, changed from bare numpy arrays to RingBuffers inorder to avoid RAM outage and crash after long tracing session.
Edouard Tisserant
parents: 3239
diff changeset
  1695
            return
095c73591b7e IDE: Cleaned up some useless tests in variable trace data handling code, changed from bare numpy arrays to RingBuffers inorder to avoid RAM outage and crash after long tracing session.
Edouard Tisserant
parents: 3239
diff changeset
  1696
095c73591b7e IDE: Cleaned up some useless tests in variable trace data handling code, changed from bare numpy arrays to RingBuffers inorder to avoid RAM outage and crash after long tracing session.
Edouard Tisserant
parents: 3239
diff changeset
  1697
        for IECPath, values in zip(self.TracedIECPath, buffers):
095c73591b7e IDE: Cleaned up some useless tests in variable trace data handling code, changed from bare numpy arrays to RingBuffers inorder to avoid RAM outage and crash after long tracing session.
Edouard Tisserant
parents: 3239
diff changeset
  1698
            if len(values) > 0:
095c73591b7e IDE: Cleaned up some useless tests in variable trace data handling code, changed from bare numpy arrays to RingBuffers inorder to avoid RAM outage and crash after long tracing session.
Edouard Tisserant
parents: 3239
diff changeset
  1699
                self.CallWeakcallables(
095c73591b7e IDE: Cleaned up some useless tests in variable trace data handling code, changed from bare numpy arrays to RingBuffers inorder to avoid RAM outage and crash after long tracing session.
Edouard Tisserant
parents: 3239
diff changeset
  1700
                    IECPath, "NewValues", debug_ticks, values)
095c73591b7e IDE: Cleaned up some useless tests in variable trace data handling code, changed from bare numpy arrays to RingBuffers inorder to avoid RAM outage and crash after long tracing session.
Edouard Tisserant
parents: 3239
diff changeset
  1701
        if len(debug_ticks) > 0:
095c73591b7e IDE: Cleaned up some useless tests in variable trace data handling code, changed from bare numpy arrays to RingBuffers inorder to avoid RAM outage and crash after long tracing session.
Edouard Tisserant
parents: 3239
diff changeset
  1702
            self.CallWeakcallables(
095c73591b7e IDE: Cleaned up some useless tests in variable trace data handling code, changed from bare numpy arrays to RingBuffers inorder to avoid RAM outage and crash after long tracing session.
Edouard Tisserant
parents: 3239
diff changeset
  1703
                "__tick__", "NewDataAvailable", debug_ticks)
095c73591b7e IDE: Cleaned up some useless tests in variable trace data handling code, changed from bare numpy arrays to RingBuffers inorder to avoid RAM outage and crash after long tracing session.
Edouard Tisserant
parents: 3239
diff changeset
  1704
095c73591b7e IDE: Cleaned up some useless tests in variable trace data handling code, changed from bare numpy arrays to RingBuffers inorder to avoid RAM outage and crash after long tracing session.
Edouard Tisserant
parents: 3239
diff changeset
  1705
        delay = time.time() - start_time
095c73591b7e IDE: Cleaned up some useless tests in variable trace data handling code, changed from bare numpy arrays to RingBuffers inorder to avoid RAM outage and crash after long tracing session.
Edouard Tisserant
parents: 3239
diff changeset
  1706
        next_refresh = max(REFRESH_PERIOD - delay, 0.2 * delay)
095c73591b7e IDE: Cleaned up some useless tests in variable trace data handling code, changed from bare numpy arrays to RingBuffers inorder to avoid RAM outage and crash after long tracing session.
Edouard Tisserant
parents: 3239
diff changeset
  1707
        if self.DispatchDebugValuesTimer is not None:
095c73591b7e IDE: Cleaned up some useless tests in variable trace data handling code, changed from bare numpy arrays to RingBuffers inorder to avoid RAM outage and crash after long tracing session.
Edouard Tisserant
parents: 3239
diff changeset
  1708
            res = self.DispatchDebugValuesTimer.Start(
095c73591b7e IDE: Cleaned up some useless tests in variable trace data handling code, changed from bare numpy arrays to RingBuffers inorder to avoid RAM outage and crash after long tracing session.
Edouard Tisserant
parents: 3239
diff changeset
  1709
                int(next_refresh * 1000), oneShot=True)
235
a66e150f2888 Improved debug data feedback.
etisserant
parents: 228
diff changeset
  1710
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
  1711
    def KillDebugThread(self):
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
  1712
        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
  1713
            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
  1714
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
  1715
    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
  1716
        self.previous_plcstate = None
465
67d32a91d70b Fixes in debug + reconnect to running PLC
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents: 464
diff changeset
  1717
        if self.AppFrame:
67d32a91d70b Fixes in debug + reconnect to running PLC
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents: 464
diff changeset
  1718
            self.AppFrame.ResetGraphicViewers()
2485
ef327451d067 Add a debugger token to SetTraceVariables and GetTraceVariables to prevent crash an inconsistant data in case of multiple connections. Last connection now takes over existing connections's debug, and first connected IDE gets a wrning.
Edouard Tisserant
parents: 2481
diff changeset
  1719
ef327451d067 Add a debugger token to SetTraceVariables and GetTraceVariables to prevent crash an inconsistant data in case of multiple connections. Last connection now takes over existing connections's debug, and first connected IDE gets a wrning.
Edouard Tisserant
parents: 2481
diff changeset
  1720
        self.debug_status = PlcStatus.Started
ef327451d067 Add a debugger token to SetTraceVariables and GetTraceVariables to prevent crash an inconsistant data in case of multiple connections. Last connection now takes over existing connections's debug, and first connected IDE gets a wrning.
Edouard Tisserant
parents: 2481
diff changeset
  1721
465
67d32a91d70b Fixes in debug + reconnect to running PLC
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents: 464
diff changeset
  1722
        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
  1723
        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
  1724
            self.DispatchDebugValuesTimer.Start(
3756ae754713 Fixed refresh speed so that interface is not blocked when debugging
Laurent Bessard
parents: 1365
diff changeset
  1725
                int(REFRESH_PERIOD * 1000), oneShot=True)
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
  1726
462
274e83a5534e Now debug is not a button anymore
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents: 461
diff changeset
  1727
    def _Run(self):
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1728
        """
464
46dd4358e8a8 Fixes in run : messages and refresh
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents: 463
diff changeset
  1729
        Start PLC
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1730
        """
350
a3a5561bde1d - now call load, start, free PLC from the python Thread
greg
parents: 348
diff changeset
  1731
        if self.GetIECProgramsAndVariables():
462
274e83a5534e Now debug is not a button anymore
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents: 461
diff changeset
  1732
            self._connector.StartPLC()
464
46dd4358e8a8 Fixes in run : messages and refresh
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents: 463
diff changeset
  1733
            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
  1734
            self._connect_debug()
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1735
        else:
464
46dd4358e8a8 Fixes in run : messages and refresh
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents: 463
diff changeset
  1736
            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
  1737
        wx.CallAfter(self.UpdateMethodsFromPLCStatus)
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
  1738
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1739
    def _Stop(self):
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1740
        """
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1741
        Stop PLC
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1742
        """
483
bc26c42d2eec fixed greg's crap in win32, enhanced debug stability, implemented preliminary retain
edouard
parents: 481
diff changeset
  1743
        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
  1744
            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
  1745
689
dac752b613bb Updated logger calls in debugthread.
Edouard Tisserant
parents: 686
diff changeset
  1746
        # 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
  1747
        # self.KillDebugThread()
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
  1748
675
44b35c27e9ff Adding support for quickly open recent projects in file menu
laurent
parents: 674
diff changeset
  1749
        wx.CallAfter(self.UpdateMethodsFromPLCStatus)
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1750
1116
300f98a8d4c6 Fixed bug connector not resetted when connection is lost
Laurent Bessard
parents: 1105
diff changeset
  1751
    def _SetConnector(self, connector, update_status=True):
978
3290eff761f1 Added LogViewer panel in bottom notebook
Laurent Bessard
parents: 923
diff changeset
  1752
        self._connector = connector
3290eff761f1 Added LogViewer panel in bottom notebook
Laurent Bessard
parents: 923
diff changeset
  1753
        if self.AppFrame is not None:
3290eff761f1 Added LogViewer panel in bottom notebook
Laurent Bessard
parents: 923
diff changeset
  1754
            self.AppFrame.LogViewer.SetLogSource(connector)
992
72ee7f3e3cf3 Fixed pulling of PLC status and log count
Laurent Bessard
parents: 985
diff changeset
  1755
        if connector is not None:
1396
bc14b43bd27f Fixed non initialized timer causing exception in some rare cases (continued)
Edouard Tisserant
parents: 1395
diff changeset
  1756
            if self.StatusTimer is not None:
bc14b43bd27f Fixed non initialized timer causing exception in some rare cases (continued)
Edouard Tisserant
parents: 1395
diff changeset
  1757
                # 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
  1758
                self.StatusTimer.Start(milliseconds=500, oneShot=False)
992
72ee7f3e3cf3 Fixed pulling of PLC status and log count
Laurent Bessard
parents: 985
diff changeset
  1759
        else:
1395
bcd1e909076c Fixed non initialized timer causing exception in some rare cases
Edouard Tisserant
parents: 1387
diff changeset
  1760
            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
  1761
                # Stop the status Timer
1395
bcd1e909076c Fixed non initialized timer causing exception in some rare cases
Edouard Tisserant
parents: 1387
diff changeset
  1762
                self.StatusTimer.Stop()
1116
300f98a8d4c6 Fixed bug connector not resetted when connection is lost
Laurent Bessard
parents: 1105
diff changeset
  1763
            if update_status:
300f98a8d4c6 Fixed bug connector not resetted when connection is lost
Laurent Bessard
parents: 1105
diff changeset
  1764
                wx.CallAfter(self.UpdateMethodsFromPLCStatus)
992
72ee7f3e3cf3 Fixed pulling of PLC status and log count
Laurent Bessard
parents: 985
diff changeset
  1765
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1766
    def _Connect(self):
922
60fafd828a30 Better PLC log message time stamp display. Better console information when connecting.
Edouard Tisserant
parents: 921
diff changeset
  1767
        # don't accept re-connetion if already connected
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1768
        if self._connector is not None:
2248
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
  1769
            self.logger.write_error(
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
  1770
                _("Already connected. Please disconnect\n"))
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1771
            return
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
  1772
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1773
        # 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
  1774
        uri = self.BeremizRoot.getURI_location().strip()
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1775
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1776
        # if uri is empty launch discovery dialog
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1777
        if uri == "":
740
cee825fbe9b3 fixed exception when launching discovery dialog without network
Edouard Tisserant
parents: 738
diff changeset
  1778
            try:
cee825fbe9b3 fixed exception when launching discovery dialog without network
Edouard Tisserant
parents: 738
diff changeset
  1779
                # Launch Service Discovery dialog
2334
d1470c052662 Added early implementation of IDManager.py. For now only used to select ID in URIEditor
Edouard Tisserant
parents: 2332
diff changeset
  1780
                dialog = UriEditor(self.AppFrame, self)
740
cee825fbe9b3 fixed exception when launching discovery dialog without network
Edouard Tisserant
parents: 738
diff changeset
  1781
                answer = dialog.ShowModal()
2481
6cd7dae360d4 fixed exception happening when connecting to empty URI, and set URI through URI Editor Dialog popping up becaue empty.
Edouard Tisserant
parents: 2469
diff changeset
  1782
                uri = str(dialog.GetURI())
740
cee825fbe9b3 fixed exception when launching discovery dialog without network
Edouard Tisserant
parents: 738
diff changeset
  1783
                dialog.Destroy()
1780
c52d1460cea8 clean-up: fix PEP8 E722 do not use bare except'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1779
diff changeset
  1784
            except Exception:
801
435e49e80832 Update list of messages to be translated for internationalization and french translations
laurent
parents: 796
diff changeset
  1785
                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
  1786
                self.logger.write_error(traceback.format_exc())
740
cee825fbe9b3 fixed exception when launching discovery dialog without network
Edouard Tisserant
parents: 738
diff changeset
  1787
                uri = None
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
  1788
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1789
            # Nothing choosed or cancel button
392
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 382
diff changeset
  1790
            if uri is None or answer == wx.ID_CANCEL:
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 382
diff changeset
  1791
                self.logger.write_error(_("Connection canceled!\n"))
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1792
                return
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1793
            else:
1776
81aa8aaccdd4 clean-up: fix PEP8 E122 continuation line missing indentation or outdented
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1775
diff changeset
  1794
                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
  1795
                self.ChangesToSave = True
746
2e09777a40d3 Fix refresh of ConfTreeNodeEditors content when values change
laurent
parents: 742
diff changeset
  1796
                if self._View is not None:
2e09777a40d3 Fix refresh of ConfTreeNodeEditors content when values change
laurent
parents: 742
diff changeset
  1797
                    self._View.RefreshView()
789
b1b1a8f85e2f Adding support for saving editor choosen when editing project file for reloading project layout
laurent
parents: 786
diff changeset
  1798
                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
  1799
                    self.AppFrame.RefreshTitle()
f338651eca36 Fix bug project not marked as modified when changing URI_Location using discovery dialog
laurent
parents: 758
diff changeset
  1800
                    self.AppFrame.RefreshFileMenu()
f338651eca36 Fix bug project not marked as modified when changing URI_Location using discovery dialog
laurent
parents: 758
diff changeset
  1801
                    self.AppFrame.RefreshEditMenu()
f338651eca36 Fix bug project not marked as modified when changing URI_Location using discovery dialog
laurent
parents: 758
diff changeset
  1802
                    self.AppFrame.RefreshPageTitles()
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
  1803
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1804
        # Get connector from uri
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1805
        try:
978
3290eff761f1 Added LogViewer panel in bottom notebook
Laurent Bessard
parents: 923
diff changeset
  1806
            self._SetConnector(connectors.ConnectorFactory(uri, self))
2469
e8760be772d5 Make easier to read console error message in case of connection problem.
Edouard Tisserant
parents: 2464
diff changeset
  1807
        except Exception as e:
2248
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
  1808
            self.logger.write_error(
2492
7dd551ac2fa0 check_sources.sh makes me become even less productive
Edouard Tisserant <edouard.tisserant@gmail.com>
parents: 2487
diff changeset
  1809
                _("Exception while connecting to '{uri}': {ex}\n").format(
7dd551ac2fa0 check_sources.sh makes me become even less productive
Edouard Tisserant <edouard.tisserant@gmail.com>
parents: 2487
diff changeset
  1810
                    uri=uri, ex=e))
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1811
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1812
        # Did connection success ?
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1813
        if self._connector is None:
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1814
            # Oups.
1734
750eeb7230a1 clean-up: fix some PEP8 E228 missing whitespace around modulo operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1733
diff changeset
  1815
            self.logger.write_error(_("Connection failed to %s!\n") % uri)
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1816
        else:
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1817
            self.CompareLocalAndRemotePLC()
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
  1818
350
a3a5561bde1d - now call load, start, free PLC from the python Thread
greg
parents: 348
diff changeset
  1819
            # Init with actual PLC status and print it
446
1edde533db19 Some cleanup in PLC status - removed that \"Starting\" state ...
ed
parents: 440
diff changeset
  1820
            self.UpdateMethodsFromPLCStatus()
2416
1ca207782dde Use predefined constants for PlcStatus instead of string literals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 2415
diff changeset
  1821
            if self.previous_plcstate in [PlcStatus.Started, PlcStatus.Stopped]:
465
67d32a91d70b Fixes in debug + reconnect to running PLC
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents: 464
diff changeset
  1822
                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
  1823
                    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
  1824
                    self._connect_debug()
67d32a91d70b Fixes in debug + reconnect to running PLC
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents: 464
diff changeset
  1825
                else:
2248
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
  1826
                    self.logger.write_warning(
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
  1827
                        _("Debug does not match PLC - stop/transfert/start to re-enable\n"))
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1828
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1829
    def CompareLocalAndRemotePLC(self):
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1830
        if self._connector is None:
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1831
            return
2463
8742337a9fe3 Chunk based transfer for PLC binary and extra files, and some collateral code refactoring.
Edouard Tisserant
parents: 2462
diff changeset
  1832
        builder = self.GetBuilder()
2492
7dd551ac2fa0 check_sources.sh makes me become even less productive
Edouard Tisserant <edouard.tisserant@gmail.com>
parents: 2487
diff changeset
  1833
        if builder is None:
2463
8742337a9fe3 Chunk based transfer for PLC binary and extra files, and some collateral code refactoring.
Edouard Tisserant
parents: 2462
diff changeset
  1834
            return
8742337a9fe3 Chunk based transfer for PLC binary and extra files, and some collateral code refactoring.
Edouard Tisserant
parents: 2462
diff changeset
  1835
        MD5 = builder.GetBinaryMD5()
8742337a9fe3 Chunk based transfer for PLC binary and extra files, and some collateral code refactoring.
Edouard Tisserant
parents: 2462
diff changeset
  1836
        if MD5 is None:
8742337a9fe3 Chunk based transfer for PLC binary and extra files, and some collateral code refactoring.
Edouard Tisserant
parents: 2462
diff changeset
  1837
            return
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1838
        # Check remote target PLC correspondance to that md5
2463
8742337a9fe3 Chunk based transfer for PLC binary and extra files, and some collateral code refactoring.
Edouard Tisserant
parents: 2462
diff changeset
  1839
        if self._connector.MatchMD5(MD5):
2464
10437c6c294e Empirically reverted calls done just after NewPLC back to the order as it was before chunked transfer. Apparently I broke something... To be continued
Edouard Tisserant
parents: 2463
diff changeset
  1840
            self.logger.write(
10437c6c294e Empirically reverted calls done just after NewPLC back to the order as it was before chunked transfer. Apparently I broke something... To be continued
Edouard Tisserant
parents: 2463
diff changeset
  1841
                _("Latest build matches with connected target.\n"))
2463
8742337a9fe3 Chunk based transfer for PLC binary and extra files, and some collateral code refactoring.
Edouard Tisserant
parents: 2462
diff changeset
  1842
            self.ProgramTransferred()
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1843
        else:
2463
8742337a9fe3 Chunk based transfer for PLC binary and extra files, and some collateral code refactoring.
Edouard Tisserant
parents: 2462
diff changeset
  1844
            self.logger.write(
8742337a9fe3 Chunk based transfer for PLC binary and extra files, and some collateral code refactoring.
Edouard Tisserant
parents: 2462
diff changeset
  1845
                _("Latest build does not match with connected target.\n"))
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1846
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1847
    def _Disconnect(self):
978
3290eff761f1 Added LogViewer panel in bottom notebook
Laurent Bessard
parents: 923
diff changeset
  1848
        self._SetConnector(None)
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
  1849
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1850
    def _Transfer(self):
1928
ef6902c824f2 Ask to stop PLC before transfer if it is running
Edouard Tisserant
parents: 1902
diff changeset
  1851
        if self.IsPLCStarted():
ef6902c824f2 Ask to stop PLC before transfer if it is running
Edouard Tisserant
parents: 1902
diff changeset
  1852
            dialog = wx.MessageDialog(
1953
5736d25bb393 PEP8 and PyLint conformance: whitespaces and stuff
Edouard Tisserant
parents: 1948
diff changeset
  1853
                self.AppFrame,
5736d25bb393 PEP8 and PyLint conformance: whitespaces and stuff
Edouard Tisserant
parents: 1948
diff changeset
  1854
                _("Cannot transfer while PLC is running. Stop it now?"),
5736d25bb393 PEP8 and PyLint conformance: whitespaces and stuff
Edouard Tisserant
parents: 1948
diff changeset
  1855
                style=wx.YES_NO | wx.CENTRE)
1928
ef6902c824f2 Ask to stop PLC before transfer if it is running
Edouard Tisserant
parents: 1902
diff changeset
  1856
            if dialog.ShowModal() == wx.ID_YES:
ef6902c824f2 Ask to stop PLC before transfer if it is running
Edouard Tisserant
parents: 1902
diff changeset
  1857
                self._Stop()
ef6902c824f2 Ask to stop PLC before transfer if it is running
Edouard Tisserant
parents: 1902
diff changeset
  1858
            else:
ef6902c824f2 Ask to stop PLC before transfer if it is running
Edouard Tisserant
parents: 1902
diff changeset
  1859
                return
ef6902c824f2 Ask to stop PLC before transfer if it is running
Edouard Tisserant
parents: 1902
diff changeset
  1860
2463
8742337a9fe3 Chunk based transfer for PLC binary and extra files, and some collateral code refactoring.
Edouard Tisserant
parents: 2462
diff changeset
  1861
        builder = self.GetBuilder()
8742337a9fe3 Chunk based transfer for PLC binary and extra files, and some collateral code refactoring.
Edouard Tisserant
parents: 2462
diff changeset
  1862
        if builder is None:
8742337a9fe3 Chunk based transfer for PLC binary and extra files, and some collateral code refactoring.
Edouard Tisserant
parents: 2462
diff changeset
  1863
            self.logger.write_error(_("Fatal : cannot get builder.\n"))
8742337a9fe3 Chunk based transfer for PLC binary and extra files, and some collateral code refactoring.
Edouard Tisserant
parents: 2462
diff changeset
  1864
            return False
8742337a9fe3 Chunk based transfer for PLC binary and extra files, and some collateral code refactoring.
Edouard Tisserant
parents: 2462
diff changeset
  1865
2492
7dd551ac2fa0 check_sources.sh makes me become even less productive
Edouard Tisserant <edouard.tisserant@gmail.com>
parents: 2487
diff changeset
  1866
        # recover md5 from last build
2463
8742337a9fe3 Chunk based transfer for PLC binary and extra files, and some collateral code refactoring.
Edouard Tisserant
parents: 2462
diff changeset
  1867
        MD5 = builder.GetBinaryMD5()
1407
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
  1868
cf3d2b53dd68 Organized controller's _Build sub-methods layout. Many (unwanted) white space changes.
Edouard Tisserant
parents: 1401
diff changeset
  1869
        # 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
  1870
        if MD5 is None:
2248
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
  1871
            self.logger.write_error(
d9353e440887 autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py
Edouard Tisserant
parents: 2245
diff changeset
  1872
                _("Failed : Must build before transfer.\n"))
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1873
            return False
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1874
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1875
        # Compare PLC project with PLC on target
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1876
        if self._connector.MatchMD5(MD5):
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1877
            self.logger.write(
415
339fa2542481 improved english spelling and grammar and internationalization updated
laurent
parents: 414
diff changeset
  1878
                _("Latest build already matches current target. Transfering anyway...\n"))
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1879
2463
8742337a9fe3 Chunk based transfer for PLC binary and extra files, and some collateral code refactoring.
Edouard Tisserant
parents: 2462
diff changeset
  1880
        # purge any non-finished transfer
8742337a9fe3 Chunk based transfer for PLC binary and extra files, and some collateral code refactoring.
Edouard Tisserant
parents: 2462
diff changeset
  1881
        # note: this would abord any runing transfer with error
8742337a9fe3 Chunk based transfer for PLC binary and extra files, and some collateral code refactoring.
Edouard Tisserant
parents: 2462
diff changeset
  1882
        self._connector.PurgeBlobs()
8742337a9fe3 Chunk based transfer for PLC binary and extra files, and some collateral code refactoring.
Edouard Tisserant
parents: 2462
diff changeset
  1883
2621
af09744a468e Better error handling when blob transfer fail
Edouard Tisserant
parents: 2620
diff changeset
  1884
        try:
af09744a468e Better error handling when blob transfer fail
Edouard Tisserant
parents: 2620
diff changeset
  1885
            # transfer extra files
af09744a468e Better error handling when blob transfer fail
Edouard Tisserant
parents: 2620
diff changeset
  1886
            extrafiles = []
af09744a468e Better error handling when blob transfer fail
Edouard Tisserant
parents: 2620
diff changeset
  1887
            for extrafilespath in [self._getExtraFilesPath(),
af09744a468e Better error handling when blob transfer fail
Edouard Tisserant
parents: 2620
diff changeset
  1888
                                   self._getProjectFilesPath()]:
af09744a468e Better error handling when blob transfer fail
Edouard Tisserant
parents: 2620
diff changeset
  1889
af09744a468e Better error handling when blob transfer fail
Edouard Tisserant
parents: 2620
diff changeset
  1890
                for name in os.listdir(extrafilespath):
af09744a468e Better error handling when blob transfer fail
Edouard Tisserant
parents: 2620
diff changeset
  1891
                    extrafiles.append((
af09744a468e Better error handling when blob transfer fail
Edouard Tisserant
parents: 2620
diff changeset
  1892
                        name,
af09744a468e Better error handling when blob transfer fail
Edouard Tisserant
parents: 2620
diff changeset
  1893
                        self._connector.BlobFromFile(
af09744a468e Better error handling when blob transfer fail
Edouard Tisserant
parents: 2620
diff changeset
  1894
                            # use file name as a seed to avoid collisions
af09744a468e Better error handling when blob transfer fail
Edouard Tisserant
parents: 2620
diff changeset
  1895
                            # with files having same content
af09744a468e Better error handling when blob transfer fail
Edouard Tisserant
parents: 2620
diff changeset
  1896
                            os.path.join(extrafilespath, name), name)))
af09744a468e Better error handling when blob transfer fail
Edouard Tisserant
parents: 2620
diff changeset
  1897
af09744a468e Better error handling when blob transfer fail
Edouard Tisserant
parents: 2620
diff changeset
  1898
            # Send PLC on target
af09744a468e Better error handling when blob transfer fail
Edouard Tisserant
parents: 2620
diff changeset
  1899
            object_path = builder.GetBinaryPath()
af09744a468e Better error handling when blob transfer fail
Edouard Tisserant
parents: 2620
diff changeset
  1900
            # arbitrarily use MD5 as a seed, could be any string
af09744a468e Better error handling when blob transfer fail
Edouard Tisserant
parents: 2620
diff changeset
  1901
            object_blob = self._connector.BlobFromFile(object_path, MD5)
af09744a468e Better error handling when blob transfer fail
Edouard Tisserant
parents: 2620
diff changeset
  1902
        except IOError as e:
af09744a468e Better error handling when blob transfer fail
Edouard Tisserant
parents: 2620
diff changeset
  1903
            self.HidePLCProgress()
af09744a468e Better error handling when blob transfer fail
Edouard Tisserant
parents: 2620
diff changeset
  1904
            self.logger.write_error(repr(e))
af09744a468e Better error handling when blob transfer fail
Edouard Tisserant
parents: 2620
diff changeset
  1905
        else:
af09744a468e Better error handling when blob transfer fail
Edouard Tisserant
parents: 2620
diff changeset
  1906
            self.HidePLCProgress()
af09744a468e Better error handling when blob transfer fail
Edouard Tisserant
parents: 2620
diff changeset
  1907
            self.logger.write(_("PLC data transfered successfully.\n"))
af09744a468e Better error handling when blob transfer fail
Edouard Tisserant
parents: 2620
diff changeset
  1908
af09744a468e Better error handling when blob transfer fail
Edouard Tisserant
parents: 2620
diff changeset
  1909
            if self._connector.NewPLC(MD5, object_blob, extrafiles):
af09744a468e Better error handling when blob transfer fail
Edouard Tisserant
parents: 2620
diff changeset
  1910
                if self.GetIECProgramsAndVariables():
af09744a468e Better error handling when blob transfer fail
Edouard Tisserant
parents: 2620
diff changeset
  1911
                    self.UnsubscribeAllDebugIECVariable()
af09744a468e Better error handling when blob transfer fail
Edouard Tisserant
parents: 2620
diff changeset
  1912
                    self.ProgramTransferred()
af09744a468e Better error handling when blob transfer fail
Edouard Tisserant
parents: 2620
diff changeset
  1913
                    self.AppFrame.CloseObsoleteDebugTabs()
af09744a468e Better error handling when blob transfer fail
Edouard Tisserant
parents: 2620
diff changeset
  1914
                    self.AppFrame.RefreshPouInstanceVariablesPanel()
af09744a468e Better error handling when blob transfer fail
Edouard Tisserant
parents: 2620
diff changeset
  1915
                    self.AppFrame.LogViewer.ResetLogCounters()
af09744a468e Better error handling when blob transfer fail
Edouard Tisserant
parents: 2620
diff changeset
  1916
                    self.logger.write(_("PLC installed successfully.\n"))
af09744a468e Better error handling when blob transfer fail
Edouard Tisserant
parents: 2620
diff changeset
  1917
                else:
af09744a468e Better error handling when blob transfer fail
Edouard Tisserant
parents: 2620
diff changeset
  1918
                    self.logger.write_error(_("Missing debug data\n"))
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1919
            else:
2621
af09744a468e Better error handling when blob transfer fail
Edouard Tisserant
parents: 2620
diff changeset
  1920
                self.logger.write_error(_("PLC couldn't be installed\n"))
415
339fa2542481 improved english spelling and grammar and internationalization updated
laurent
parents: 414
diff changeset
  1921
675
44b35c27e9ff Adding support for quickly open recent projects in file menu
laurent
parents: 674
diff changeset
  1922
        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
  1923
2594
f1e182818434 Added PurgePLC() method to PLCObject, to be invoked when PLC Status is broken. It clears PLC shared object an extra files and force status to Empty. Added correponding Repair button to toolbar, visible only when PLC status is broken.
Edouard Tisserant
parents: 2521
diff changeset
  1924
    def _Repair(self):
f1e182818434 Added PurgePLC() method to PLCObject, to be invoked when PLC Status is broken. It clears PLC shared object an extra files and force status to Empty. Added correponding Repair button to toolbar, visible only when PLC status is broken.
Edouard Tisserant
parents: 2521
diff changeset
  1925
        dialog = wx.MessageDialog(
f1e182818434 Added PurgePLC() method to PLCObject, to be invoked when PLC Status is broken. It clears PLC shared object an extra files and force status to Empty. Added correponding Repair button to toolbar, visible only when PLC status is broken.
Edouard Tisserant
parents: 2521
diff changeset
  1926
            self.AppFrame,
f1e182818434 Added PurgePLC() method to PLCObject, to be invoked when PLC Status is broken. It clears PLC shared object an extra files and force status to Empty. Added correponding Repair button to toolbar, visible only when PLC status is broken.
Edouard Tisserant
parents: 2521
diff changeset
  1927
            _('Delete target PLC application?'),
f1e182818434 Added PurgePLC() method to PLCObject, to be invoked when PLC Status is broken. It clears PLC shared object an extra files and force status to Empty. Added correponding Repair button to toolbar, visible only when PLC status is broken.
Edouard Tisserant
parents: 2521
diff changeset
  1928
            _('Repair'),
f1e182818434 Added PurgePLC() method to PLCObject, to be invoked when PLC Status is broken. It clears PLC shared object an extra files and force status to Empty. Added correponding Repair button to toolbar, visible only when PLC status is broken.
Edouard Tisserant
parents: 2521
diff changeset
  1929
            wx.YES_NO | wx.NO_DEFAULT | wx.ICON_QUESTION)
f1e182818434 Added PurgePLC() method to PLCObject, to be invoked when PLC Status is broken. It clears PLC shared object an extra files and force status to Empty. Added correponding Repair button to toolbar, visible only when PLC status is broken.
Edouard Tisserant
parents: 2521
diff changeset
  1930
        answer = dialog.ShowModal()
f1e182818434 Added PurgePLC() method to PLCObject, to be invoked when PLC Status is broken. It clears PLC shared object an extra files and force status to Empty. Added correponding Repair button to toolbar, visible only when PLC status is broken.
Edouard Tisserant
parents: 2521
diff changeset
  1931
        dialog.Destroy()
f1e182818434 Added PurgePLC() method to PLCObject, to be invoked when PLC Status is broken. It clears PLC shared object an extra files and force status to Empty. Added correponding Repair button to toolbar, visible only when PLC status is broken.
Edouard Tisserant
parents: 2521
diff changeset
  1932
        if answer == wx.ID_YES:
2596
779e8dbf1ee1 Added RepairPLC() to PLCObject. For now just calling PurgePLC and quit PLC runtime.
Edouard Tisserant
parents: 2594
diff changeset
  1933
            self._connector.RepairPLC()
2594
f1e182818434 Added PurgePLC() method to PLCObject, to be invoked when PLC Status is broken. It clears PLC shared object an extra files and force status to Empty. Added correponding Repair button to toolbar, visible only when PLC status is broken.
Edouard Tisserant
parents: 2521
diff changeset
  1934
738
413946c04c87 refactoring
laurent
parents: 737
diff changeset
  1935
    StatusMethods = [
1739
ec153828ded2 clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1737
diff changeset
  1936
        {
ec153828ded2 clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1737
diff changeset
  1937
            "bitmap":    "Build",
ec153828ded2 clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1737
diff changeset
  1938
            "name":    _("Build"),
ec153828ded2 clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1737
diff changeset
  1939
            "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
  1940
            "method":   "_Build"
ec153828ded2 clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1737
diff changeset
  1941
        },
ec153828ded2 clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1737
diff changeset
  1942
        {
ec153828ded2 clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1737
diff changeset
  1943
            "bitmap":    "Clean",
ec153828ded2 clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1737
diff changeset
  1944
            "name":    _("Clean"),
ec153828ded2 clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1737
diff changeset
  1945
            "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
  1946
            "method":   "_Clean",
ec153828ded2 clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1737
diff changeset
  1947
            "enabled":    False,
ec153828ded2 clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1737
diff changeset
  1948
        },
ec153828ded2 clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1737
diff changeset
  1949
        {
ec153828ded2 clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1737
diff changeset
  1950
            "bitmap":    "Run",
ec153828ded2 clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1737
diff changeset
  1951
            "name":    _("Run"),
ec153828ded2 clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1737
diff changeset
  1952
            "tooltip": _("Start PLC"),
ec153828ded2 clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1737
diff changeset
  1953
            "method":   "_Run",
ec153828ded2 clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1737
diff changeset
  1954
            "shown":      False,
ec153828ded2 clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1737
diff changeset
  1955
        },
ec153828ded2 clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1737
diff changeset
  1956
        {
ec153828ded2 clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1737
diff changeset
  1957
            "bitmap":    "Stop",
ec153828ded2 clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1737
diff changeset
  1958
            "name":    _("Stop"),
ec153828ded2 clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1737
diff changeset
  1959
            "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
  1960
            "method":   "_Stop",
ec153828ded2 clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1737
diff changeset
  1961
            "shown":      False,
ec153828ded2 clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1737
diff changeset
  1962
        },
ec153828ded2 clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1737
diff changeset
  1963
        {
ec153828ded2 clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1737
diff changeset
  1964
            "bitmap":    "Connect",
ec153828ded2 clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1737
diff changeset
  1965
            "name":    _("Connect"),
ec153828ded2 clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1737
diff changeset
  1966
            "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
  1967
            "method":   "_Connect"
ec153828ded2 clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1737
diff changeset
  1968
        },
ec153828ded2 clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1737
diff changeset
  1969
        {
ec153828ded2 clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1737
diff changeset
  1970
            "bitmap":    "Transfer",
ec153828ded2 clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1737
diff changeset
  1971
            "name":    _("Transfer"),
ec153828ded2 clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1737
diff changeset
  1972
            "tooltip": _("Transfer PLC"),
ec153828ded2 clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1737
diff changeset
  1973
            "method":   "_Transfer",
ec153828ded2 clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1737
diff changeset
  1974
            "shown":      False,
ec153828ded2 clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1737
diff changeset
  1975
        },
ec153828ded2 clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1737
diff changeset
  1976
        {
2652
269149e78302 IDE: Main toolbar : Show repair button also in stop mode. Move repair button after disconnect button.
Edouard Tisserant
parents: 2645
diff changeset
  1977
            "bitmap":    "Disconnect",
269149e78302 IDE: Main toolbar : Show repair button also in stop mode. Move repair button after disconnect button.
Edouard Tisserant
parents: 2645
diff changeset
  1978
            "name":    _("Disconnect"),
269149e78302 IDE: Main toolbar : Show repair button also in stop mode. Move repair button after disconnect button.
Edouard Tisserant
parents: 2645
diff changeset
  1979
            "tooltip": _("Disconnect from PLC"),
269149e78302 IDE: Main toolbar : Show repair button also in stop mode. Move repair button after disconnect button.
Edouard Tisserant
parents: 2645
diff changeset
  1980
            "method":   "_Disconnect",
269149e78302 IDE: Main toolbar : Show repair button also in stop mode. Move repair button after disconnect button.
Edouard Tisserant
parents: 2645
diff changeset
  1981
            "shown":      False,
269149e78302 IDE: Main toolbar : Show repair button also in stop mode. Move repair button after disconnect button.
Edouard Tisserant
parents: 2645
diff changeset
  1982
        },
269149e78302 IDE: Main toolbar : Show repair button also in stop mode. Move repair button after disconnect button.
Edouard Tisserant
parents: 2645
diff changeset
  1983
        {
2594
f1e182818434 Added PurgePLC() method to PLCObject, to be invoked when PLC Status is broken. It clears PLC shared object an extra files and force status to Empty. Added correponding Repair button to toolbar, visible only when PLC status is broken.
Edouard Tisserant
parents: 2521
diff changeset
  1984
            "bitmap":    "Repair",
f1e182818434 Added PurgePLC() method to PLCObject, to be invoked when PLC Status is broken. It clears PLC shared object an extra files and force status to Empty. Added correponding Repair button to toolbar, visible only when PLC status is broken.
Edouard Tisserant
parents: 2521
diff changeset
  1985
            "name":    _("Repair"),
f1e182818434 Added PurgePLC() method to PLCObject, to be invoked when PLC Status is broken. It clears PLC shared object an extra files and force status to Empty. Added correponding Repair button to toolbar, visible only when PLC status is broken.
Edouard Tisserant
parents: 2521
diff changeset
  1986
            "tooltip": _("Repair broken PLC"),
f1e182818434 Added PurgePLC() method to PLCObject, to be invoked when PLC Status is broken. It clears PLC shared object an extra files and force status to Empty. Added correponding Repair button to toolbar, visible only when PLC status is broken.
Edouard Tisserant
parents: 2521
diff changeset
  1987
            "method":   "_Repair",
f1e182818434 Added PurgePLC() method to PLCObject, to be invoked when PLC Status is broken. It clears PLC shared object an extra files and force status to Empty. Added correponding Repair button to toolbar, visible only when PLC status is broken.
Edouard Tisserant
parents: 2521
diff changeset
  1988
            "shown":      False,
f1e182818434 Added PurgePLC() method to PLCObject, to be invoked when PLC Status is broken. It clears PLC shared object an extra files and force status to Empty. Added correponding Repair button to toolbar, visible only when PLC status is broken.
Edouard Tisserant
parents: 2521
diff changeset
  1989
        },
f1e182818434 Added PurgePLC() method to PLCObject, to be invoked when PLC Status is broken. It clears PLC shared object an extra files and force status to Empty. Added correponding Repair button to toolbar, visible only when PLC status is broken.
Edouard Tisserant
parents: 2521
diff changeset
  1990
        {
2337
8689ce77076f Added toolbar button to launch ID Manager dialog.
Edouard Tisserant
parents: 2334
diff changeset
  1991
            "bitmap":    "IDManager",
8689ce77076f Added toolbar button to launch ID Manager dialog.
Edouard Tisserant
parents: 2334
diff changeset
  1992
            "name":    _("ID Manager"),
8689ce77076f Added toolbar button to launch ID Manager dialog.
Edouard Tisserant
parents: 2334
diff changeset
  1993
            "tooltip": _("Manage secure connection identities"),
8689ce77076f Added toolbar button to launch ID Manager dialog.
Edouard Tisserant
parents: 2334
diff changeset
  1994
            "method":   "_showIDManager",
8689ce77076f Added toolbar button to launch ID Manager dialog.
Edouard Tisserant
parents: 2334
diff changeset
  1995
        },
8689ce77076f Added toolbar button to launch ID Manager dialog.
Edouard Tisserant
parents: 2334
diff changeset
  1996
        {
1739
ec153828ded2 clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1737
diff changeset
  1997
            "bitmap":    "ShowIECcode",
ec153828ded2 clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1737
diff changeset
  1998
            "name":    _("Show code"),
ec153828ded2 clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1737
diff changeset
  1999
            "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
  2000
            "method":   "_showIECcode",
ec153828ded2 clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1737
diff changeset
  2001
            "shown":      False,
ec153828ded2 clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1737
diff changeset
  2002
        },
738
413946c04c87 refactoring
laurent
parents: 737
diff changeset
  2003
    ]
413946c04c87 refactoring
laurent
parents: 737
diff changeset
  2004
413946c04c87 refactoring
laurent
parents: 737
diff changeset
  2005
    ConfNodeMethods = [
1739
ec153828ded2 clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1737
diff changeset
  2006
        {
ec153828ded2 clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1737
diff changeset
  2007
            "bitmap":    "editIECrawcode",
ec153828ded2 clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1737
diff changeset
  2008
            "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
  2009
            "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
  2010
            "method":   "_editIECrawcode"
ec153828ded2 clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1737
diff changeset
  2011
        },
ec153828ded2 clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1737
diff changeset
  2012
        {
ec153828ded2 clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1737
diff changeset
  2013
            "bitmap":    "ManageFolder",
ec153828ded2 clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1737
diff changeset
  2014
            "name":    _("Project Files"),
ec153828ded2 clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1737
diff changeset
  2015
            "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
  2016
            "method":   "_OpenProjectFiles"
ec153828ded2 clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1737
diff changeset
  2017
        },
65
e55d6faee9d1 Adding icons in Beremiz GUI
lbessard
parents: 64
diff changeset
  2018
    ]
738
413946c04c87 refactoring
laurent
parents: 737
diff changeset
  2019
413946c04c87 refactoring
laurent
parents: 737
diff changeset
  2020
    def EnableMethod(self, method, value):
413946c04c87 refactoring
laurent
parents: 737
diff changeset
  2021
        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
  2022
            if d["method"] == method:
92932cd370a4 clean-up: fix PEP8 E225 missing whitespace around operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1741
diff changeset
  2023
                d["enabled"] = value
738
413946c04c87 refactoring
laurent
parents: 737
diff changeset
  2024
                return True
413946c04c87 refactoring
laurent
parents: 737
diff changeset
  2025
        return False
413946c04c87 refactoring
laurent
parents: 737
diff changeset
  2026
413946c04c87 refactoring
laurent
parents: 737
diff changeset
  2027
    def ShowMethod(self, method, value):
413946c04c87 refactoring
laurent
parents: 737
diff changeset
  2028
        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
  2029
            if d["method"] == method:
92932cd370a4 clean-up: fix PEP8 E225 missing whitespace around operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1741
diff changeset
  2030
                d["shown"] = value
738
413946c04c87 refactoring
laurent
parents: 737
diff changeset
  2031
                return True
413946c04c87 refactoring
laurent
parents: 737
diff changeset
  2032
        return False
413946c04c87 refactoring
laurent
parents: 737
diff changeset
  2033
413946c04c87 refactoring
laurent
parents: 737
diff changeset
  2034
    def CallMethod(self, method):
413946c04c87 refactoring
laurent
parents: 737
diff changeset
  2035
        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
  2036
            if d["method"] == method and d.get("enabled", True) and d.get("shown", True):
738
413946c04c87 refactoring
laurent
parents: 737
diff changeset
  2037
                getattr(self, method)()