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