ProjectController.py
author Andrey Skvortsov <andrej.skvortzov@gmail.com>
Thu, 09 Mar 2017 15:35:19 +0300
changeset 1657 3a98027ff372
parent 1643 fc39d658bd2f
child 1672 9298ba0cd70a
permissions -rw-r--r--
apply constraints to names for tasks and task instances in resource configuration

The same rules as for IEC identifiers are applied.
- no non-lating characters, ...
- no IEC keywords
- check for duplicate names in resource configuration

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