author | Laurent Bessard |
Wed, 16 Oct 2013 23:54:44 +0200 | |
changeset 1368 | e567e4bee11f |
parent 1364 | e9e17d3b2849 |
child 1388 | 67c9a9482d24 |
permissions | -rwxr-xr-x |
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1 |
#!/usr/bin/env python |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
2 |
# -*- coding: utf-8 -*- |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
3 |
|
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
4 |
#This file is part of Beremiz, a Integrated Development Environment for |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
5 |
#programming IEC 61131-3 automates supporting plcopen standard and CanFestival. |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
6 |
# |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
7 |
#Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
8 |
# |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
9 |
#See COPYING file for copyrights details. |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
10 |
# |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
11 |
#This library is free software; you can redistribute it and/or |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
12 |
#modify it under the terms of the GNU General Public |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
13 |
#License as published by the Free Software Foundation; either |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
14 |
#version 2.1 of the License, or (at your option) any later version. |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
15 |
# |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
16 |
#This library is distributed in the hope that it will be useful, |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
17 |
#but WITHOUT ANY WARRANTY; without even the implied warranty of |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
18 |
#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
19 |
#General Public License for more details. |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
20 |
# |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
21 |
#You should have received a copy of the GNU General Public |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
22 |
#License along with this library; if not, write to the Free Software |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
23 |
#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
24 |
|
588 | 25 |
|
26 |
updateinfo_url = None |
|
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
27 |
|
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
28 |
import os, sys, getopt, wx |
650
26236e691330
Replacing sizers structure for locations tree by a treectrl in Topology panel in order to make refreshing of this panel faster
laurent
parents:
636
diff
changeset
|
29 |
import __builtin__ |
588 | 30 |
from wx.lib.agw.advancedsplash import AdvancedSplash |
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
31 |
import tempfile |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
32 |
import shutil |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
33 |
import random |
446
1edde533db19
Some cleanup in PLC status - removed that \"Starting\" state ...
ed
parents:
439
diff
changeset
|
34 |
import time |
675
44b35c27e9ff
Adding support for quickly open recent projects in file menu
laurent
parents:
666
diff
changeset
|
35 |
from types import ListType |
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
36 |
|
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
37 |
CWD = os.path.split(os.path.realpath(__file__))[0] |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
38 |
|
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
39 |
def Bpath(*args): |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
40 |
return os.path.join(CWD,*args) |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
41 |
|
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
42 |
if __name__ == '__main__': |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
43 |
def usage(): |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
44 |
print "\nUsage of Beremiz.py :" |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
45 |
print "\n %s [Projectpath] [Buildpath]\n"%sys.argv[0] |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
46 |
|
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
47 |
try: |
736 | 48 |
opts, args = getopt.getopt(sys.argv[1:], "hu:e:", ["help", "updatecheck=", "extend="]) |
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
49 |
except getopt.GetoptError: |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
50 |
# print help information and exit: |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
51 |
usage() |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
52 |
sys.exit(2) |
731 | 53 |
|
54 |
extensions=[] |
|
55 |
||
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
56 |
for o, a in opts: |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
57 |
if o in ("-h", "--help"): |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
58 |
usage() |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
59 |
sys.exit() |
588 | 60 |
if o in ("-u", "--updatecheck"): |
61 |
updateinfo_url = a |
|
731 | 62 |
if o in ("-e", "--extend"): |
63 |
extensions.append(a) |
|
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
64 |
|
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
65 |
if len(args) > 2: |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
66 |
usage() |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
67 |
sys.exit() |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
68 |
elif len(args) == 1: |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
69 |
projectOpen = args[0] |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
70 |
buildpath = None |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
71 |
elif len(args) == 2: |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
72 |
projectOpen = args[0] |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
73 |
buildpath = args[1] |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
74 |
else: |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
75 |
projectOpen = None |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
76 |
buildpath = None |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
77 |
|
571
427bf9130d12
Debug switch (file in CWD). LPC : better MD5 handling, Run button in boot mode, handling data feedback in boot protocol
edouard
parents:
569
diff
changeset
|
78 |
if os.path.exists("BEREMIZ_DEBUG"): |
650
26236e691330
Replacing sizers structure for locations tree by a treectrl in Topology panel in order to make refreshing of this panel faster
laurent
parents:
636
diff
changeset
|
79 |
__builtin__.__dict__["BMZ_DBG"] = True |
571
427bf9130d12
Debug switch (file in CWD). LPC : better MD5 handling, Run button in boot mode, handling data feedback in boot protocol
edouard
parents:
569
diff
changeset
|
80 |
else : |
650
26236e691330
Replacing sizers structure for locations tree by a treectrl in Topology panel in order to make refreshing of this panel faster
laurent
parents:
636
diff
changeset
|
81 |
__builtin__.__dict__["BMZ_DBG"] = False |
571
427bf9130d12
Debug switch (file in CWD). LPC : better MD5 handling, Run button in boot mode, handling data feedback in boot protocol
edouard
parents:
569
diff
changeset
|
82 |
|
427bf9130d12
Debug switch (file in CWD). LPC : better MD5 handling, Run button in boot mode, handling data feedback in boot protocol
edouard
parents:
569
diff
changeset
|
83 |
app = wx.PySimpleApp(redirect=BMZ_DBG) |
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
84 |
app.SetAppName('beremiz') |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
85 |
wx.InitAllImageHandlers() |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
86 |
|
588 | 87 |
# popup splash |
781
cdc6393705ce
Adding support using plcopeneditor bitmap library for icon request
laurent
parents:
771
diff
changeset
|
88 |
bmp = wx.Image(Bpath("images", "splash.png")).ConvertToBitmap() |
588 | 89 |
#splash=AdvancedSplash(None, bitmap=bmp, style=wx.SPLASH_CENTRE_ON_SCREEN, timeout=4000) |
90 |
splash=AdvancedSplash(None, bitmap=bmp) |
|
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
91 |
wx.Yield() |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
92 |
|
588 | 93 |
if updateinfo_url is not None: |
94 |
updateinfo = "Fetching %s" % updateinfo_url |
|
95 |
# warn for possible updates |
|
96 |
def updateinfoproc(): |
|
97 |
global updateinfo |
|
98 |
try : |
|
99 |
import urllib2 |
|
100 |
updateinfo = urllib2.urlopen(updateinfo_url,None).read() |
|
101 |
except : |
|
102 |
updateinfo = "update info unavailable." |
|
103 |
||
104 |
from threading import Thread |
|
105 |
splash.SetText(text=updateinfo) |
|
106 |
wx.Yield() |
|
107 |
updateinfoThread = Thread(target=updateinfoproc) |
|
108 |
updateinfoThread.start() |
|
109 |
updateinfoThread.join(2) |
|
110 |
splash.SetText(text=updateinfo) |
|
111 |
wx.Yield() |
|
112 |
||
967
8a339cd61cb4
Added support for extension custom contextual add menu
Laurent Bessard
parents:
958
diff
changeset
|
113 |
from util.TranslationCatalogs import AddCatalog |
815
e4f24593a758
Adding support for extending internationalization to extensions
laurent
parents:
814
diff
changeset
|
114 |
from util.BitmapLibrary import AddBitmapFolder, GetBitmap |
e4f24593a758
Adding support for extending internationalization to extensions
laurent
parents:
814
diff
changeset
|
115 |
|
e4f24593a758
Adding support for extending internationalization to extensions
laurent
parents:
814
diff
changeset
|
116 |
AddCatalog(os.path.join(CWD, "locale")) |
e4f24593a758
Adding support for extending internationalization to extensions
laurent
parents:
814
diff
changeset
|
117 |
AddBitmapFolder(os.path.join(CWD, "images")) |
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
118 |
|
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
119 |
if __name__ == '__main__': |
815
e4f24593a758
Adding support for extending internationalization to extensions
laurent
parents:
814
diff
changeset
|
120 |
# Import module for internationalization |
e4f24593a758
Adding support for extending internationalization to extensions
laurent
parents:
814
diff
changeset
|
121 |
import gettext |
e4f24593a758
Adding support for extending internationalization to extensions
laurent
parents:
814
diff
changeset
|
122 |
|
e4f24593a758
Adding support for extending internationalization to extensions
laurent
parents:
814
diff
changeset
|
123 |
__builtin__.__dict__['_'] = wx.GetTranslation |
e4f24593a758
Adding support for extending internationalization to extensions
laurent
parents:
814
diff
changeset
|
124 |
|
735
d9f4ecee761d
Fixed extension loading too late causing features to be ignored
Edouard Tisserant
parents:
734
diff
changeset
|
125 |
# Load extensions |
d9f4ecee761d
Fixed extension loading too late causing features to be ignored
Edouard Tisserant
parents:
734
diff
changeset
|
126 |
for extfilename in extensions: |
781
cdc6393705ce
Adding support using plcopeneditor bitmap library for icon request
laurent
parents:
771
diff
changeset
|
127 |
extension_folder = os.path.split(os.path.realpath(extfilename))[0] |
cdc6393705ce
Adding support using plcopeneditor bitmap library for icon request
laurent
parents:
771
diff
changeset
|
128 |
sys.path.append(extension_folder) |
815
e4f24593a758
Adding support for extending internationalization to extensions
laurent
parents:
814
diff
changeset
|
129 |
AddCatalog(os.path.join(extension_folder, "locale")) |
781
cdc6393705ce
Adding support using plcopeneditor bitmap library for icon request
laurent
parents:
771
diff
changeset
|
130 |
AddBitmapFolder(os.path.join(extension_folder, "images")) |
737 | 131 |
execfile(extfilename, locals()) |
735
d9f4ecee761d
Fixed extension loading too late causing features to be ignored
Edouard Tisserant
parents:
734
diff
changeset
|
132 |
|
999
cbab4c1635bd
Replaced LogConsole TextCtrl by StyledTextCtrl
Laurent Bessard
parents:
994
diff
changeset
|
133 |
import wx.lib.buttons, wx.lib.statbmp, wx.stc |
724 | 134 |
import cPickle |
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
135 |
import types, time, re, platform, time, traceback, commands |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
136 |
|
727 | 137 |
from docutil import OpenHtmlFrame |
814 | 138 |
from IDEFrame import IDEFrame, AppendMenu |
139 |
from IDEFrame import TITLE, EDITORTOOLBAR, FILEMENU, EDITMENU, DISPLAYMENU, PROJECTTREE, POUINSTANCEVARIABLESPANEL, LIBRARYTREE, SCALING, PAGETITLES |
|
140 |
from IDEFrame import EncodeFileSystemPath, DecodeFileSystemPath |
|
141 |
from editors.EditorPanel import EditorPanel |
|
142 |
from editors.Viewer import Viewer |
|
143 |
from editors.TextViewer import TextViewer |
|
144 |
from editors.ResourceEditor import ConfigurationEditor, ResourceEditor |
|
145 |
from editors.DataTypeEditor import DataTypeEditor |
|
807
17c97fec1164
Fix import order in Beremiz.py to prevent wrong translations in internationalization
laurent
parents:
801
diff
changeset
|
146 |
from util.MiniTextControler import MiniTextControler |
17c97fec1164
Fix import order in Beremiz.py to prevent wrong translations in internationalization
laurent
parents:
801
diff
changeset
|
147 |
from util.ProcessLogger import ProcessLogger |
978 | 148 |
from controls.LogViewer import LogViewer |
1091
5f612651d227
Fixed bug with margin cursor in StyledTextCtrl on Windows
Laurent Bessard
parents:
1090
diff
changeset
|
149 |
from controls.CustomStyledTextCtrl import CustomStyledTextCtrl |
814 | 150 |
|
151 |
from PLCControler import LOCATION_CONFNODE, LOCATION_MODULE, LOCATION_GROUP, LOCATION_VAR_INPUT, LOCATION_VAR_OUTPUT, LOCATION_VAR_MEMORY, ITEM_PROJECT, ITEM_RESOURCE |
|
1282
f427352f9727
Added support for left panel add menu with multiple levels
laurent
parents:
1281
diff
changeset
|
152 |
from ProjectController import ProjectController, GetAddMenuItems, MATIEC_ERROR_MODEL, ITEM_CONFNODE |
807
17c97fec1164
Fix import order in Beremiz.py to prevent wrong translations in internationalization
laurent
parents:
801
diff
changeset
|
153 |
|
814 | 154 |
|
675
44b35c27e9ff
Adding support for quickly open recent projects in file menu
laurent
parents:
666
diff
changeset
|
155 |
MAX_RECENT_PROJECTS = 10 |
44b35c27e9ff
Adding support for quickly open recent projects in file menu
laurent
parents:
666
diff
changeset
|
156 |
|
999
cbab4c1635bd
Replaced LogConsole TextCtrl by StyledTextCtrl
Laurent Bessard
parents:
994
diff
changeset
|
157 |
if wx.Platform == '__WXMSW__': |
cbab4c1635bd
Replaced LogConsole TextCtrl by StyledTextCtrl
Laurent Bessard
parents:
994
diff
changeset
|
158 |
faces = { |
cbab4c1635bd
Replaced LogConsole TextCtrl by StyledTextCtrl
Laurent Bessard
parents:
994
diff
changeset
|
159 |
'mono' : 'Courier New', |
cbab4c1635bd
Replaced LogConsole TextCtrl by StyledTextCtrl
Laurent Bessard
parents:
994
diff
changeset
|
160 |
'size' : 8, |
cbab4c1635bd
Replaced LogConsole TextCtrl by StyledTextCtrl
Laurent Bessard
parents:
994
diff
changeset
|
161 |
} |
cbab4c1635bd
Replaced LogConsole TextCtrl by StyledTextCtrl
Laurent Bessard
parents:
994
diff
changeset
|
162 |
else: |
cbab4c1635bd
Replaced LogConsole TextCtrl by StyledTextCtrl
Laurent Bessard
parents:
994
diff
changeset
|
163 |
faces = { |
cbab4c1635bd
Replaced LogConsole TextCtrl by StyledTextCtrl
Laurent Bessard
parents:
994
diff
changeset
|
164 |
'mono' : 'Courier', |
cbab4c1635bd
Replaced LogConsole TextCtrl by StyledTextCtrl
Laurent Bessard
parents:
994
diff
changeset
|
165 |
'size' : 10, |
cbab4c1635bd
Replaced LogConsole TextCtrl by StyledTextCtrl
Laurent Bessard
parents:
994
diff
changeset
|
166 |
} |
cbab4c1635bd
Replaced LogConsole TextCtrl by StyledTextCtrl
Laurent Bessard
parents:
994
diff
changeset
|
167 |
|
705
a5977f64d4d9
More gentle use of app.Yield in ProcessLogger
Edouard Tisserant
parents:
704
diff
changeset
|
168 |
from threading import Lock,Timer,currentThread |
a5977f64d4d9
More gentle use of app.Yield in ProcessLogger
Edouard Tisserant
parents:
704
diff
changeset
|
169 |
MainThread = currentThread().ident |
686
e4e1da75d411
More robust Logger, now resist to flooding.
Edouard Tisserant
parents:
683
diff
changeset
|
170 |
REFRESH_PERIOD = 0.1 |
e4e1da75d411
More robust Logger, now resist to flooding.
Edouard Tisserant
parents:
683
diff
changeset
|
171 |
from time import time as gettime |
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
172 |
class LogPseudoFile: |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
173 |
""" Base class for file like objects to facilitate StdOut for the Shell.""" |
451 | 174 |
def __init__(self, output, risecall): |
999
cbab4c1635bd
Replaced LogConsole TextCtrl by StyledTextCtrl
Laurent Bessard
parents:
994
diff
changeset
|
175 |
self.red_white = 1 |
cbab4c1635bd
Replaced LogConsole TextCtrl by StyledTextCtrl
Laurent Bessard
parents:
994
diff
changeset
|
176 |
self.red_yellow = 2 |
cbab4c1635bd
Replaced LogConsole TextCtrl by StyledTextCtrl
Laurent Bessard
parents:
994
diff
changeset
|
177 |
self.black_white = wx.stc.STC_STYLE_DEFAULT |
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
178 |
self.output = output |
451 | 179 |
self.risecall = risecall |
446
1edde533db19
Some cleanup in PLC status - removed that \"Starting\" state ...
ed
parents:
439
diff
changeset
|
180 |
# to prevent rapid fire on rising log panel |
1edde533db19
Some cleanup in PLC status - removed that \"Starting\" state ...
ed
parents:
439
diff
changeset
|
181 |
self.rising_timer = 0 |
686
e4e1da75d411
More robust Logger, now resist to flooding.
Edouard Tisserant
parents:
683
diff
changeset
|
182 |
self.lock = Lock() |
705
a5977f64d4d9
More gentle use of app.Yield in ProcessLogger
Edouard Tisserant
parents:
704
diff
changeset
|
183 |
self.YieldLock = Lock() |
686
e4e1da75d411
More robust Logger, now resist to flooding.
Edouard Tisserant
parents:
683
diff
changeset
|
184 |
self.RefreshLock = Lock() |
881
68ac754a5a72
Fix bug with concurrent access to LastRefreshTimer in LogPseudoFile for Log Console
Laurent Bessard
parents:
875
diff
changeset
|
185 |
self.TimerAccessLock = Lock() |
686
e4e1da75d411
More robust Logger, now resist to flooding.
Edouard Tisserant
parents:
683
diff
changeset
|
186 |
self.stack = [] |
e4e1da75d411
More robust Logger, now resist to flooding.
Edouard Tisserant
parents:
683
diff
changeset
|
187 |
self.LastRefreshTime = gettime() |
688
6324b40d82a5
Even more robust logger, up to the really last line that comes after the rush
Edouard Tisserant
parents:
687
diff
changeset
|
188 |
self.LastRefreshTimer = None |
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
189 |
|
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
190 |
def write(self, s, style = None): |
686
e4e1da75d411
More robust Logger, now resist to flooding.
Edouard Tisserant
parents:
683
diff
changeset
|
191 |
if self.lock.acquire(): |
e4e1da75d411
More robust Logger, now resist to flooding.
Edouard Tisserant
parents:
683
diff
changeset
|
192 |
self.stack.append((s,style)) |
e4e1da75d411
More robust Logger, now resist to flooding.
Edouard Tisserant
parents:
683
diff
changeset
|
193 |
self.lock.release() |
e4e1da75d411
More robust Logger, now resist to flooding.
Edouard Tisserant
parents:
683
diff
changeset
|
194 |
current_time = gettime() |
881
68ac754a5a72
Fix bug with concurrent access to LastRefreshTimer in LogPseudoFile for Log Console
Laurent Bessard
parents:
875
diff
changeset
|
195 |
self.TimerAccessLock.acquire() |
688
6324b40d82a5
Even more robust logger, up to the really last line that comes after the rush
Edouard Tisserant
parents:
687
diff
changeset
|
196 |
if self.LastRefreshTimer: |
6324b40d82a5
Even more robust logger, up to the really last line that comes after the rush
Edouard Tisserant
parents:
687
diff
changeset
|
197 |
self.LastRefreshTimer.cancel() |
6324b40d82a5
Even more robust logger, up to the really last line that comes after the rush
Edouard Tisserant
parents:
687
diff
changeset
|
198 |
self.LastRefreshTimer=None |
881
68ac754a5a72
Fix bug with concurrent access to LastRefreshTimer in LogPseudoFile for Log Console
Laurent Bessard
parents:
875
diff
changeset
|
199 |
self.TimerAccessLock.release() |
686
e4e1da75d411
More robust Logger, now resist to flooding.
Edouard Tisserant
parents:
683
diff
changeset
|
200 |
if current_time - self.LastRefreshTime > REFRESH_PERIOD and self.RefreshLock.acquire(False): |
705
a5977f64d4d9
More gentle use of app.Yield in ProcessLogger
Edouard Tisserant
parents:
704
diff
changeset
|
201 |
self._should_write() |
688
6324b40d82a5
Even more robust logger, up to the really last line that comes after the rush
Edouard Tisserant
parents:
687
diff
changeset
|
202 |
else: |
881
68ac754a5a72
Fix bug with concurrent access to LastRefreshTimer in LogPseudoFile for Log Console
Laurent Bessard
parents:
875
diff
changeset
|
203 |
self.TimerAccessLock.acquire() |
875
a8952b79caec
Fix bug in Debug refresh lock that, with too much data to debug, flooded GUI and blocked it
Laurent Bessard
parents:
843
diff
changeset
|
204 |
self.LastRefreshTimer = Timer(REFRESH_PERIOD, self._timer_expired) |
688
6324b40d82a5
Even more robust logger, up to the really last line that comes after the rush
Edouard Tisserant
parents:
687
diff
changeset
|
205 |
self.LastRefreshTimer.start() |
881
68ac754a5a72
Fix bug with concurrent access to LastRefreshTimer in LogPseudoFile for Log Console
Laurent Bessard
parents:
875
diff
changeset
|
206 |
self.TimerAccessLock.release() |
686
e4e1da75d411
More robust Logger, now resist to flooding.
Edouard Tisserant
parents:
683
diff
changeset
|
207 |
|
875
a8952b79caec
Fix bug in Debug refresh lock that, with too much data to debug, flooded GUI and blocked it
Laurent Bessard
parents:
843
diff
changeset
|
208 |
def _timer_expired(self): |
a8952b79caec
Fix bug in Debug refresh lock that, with too much data to debug, flooded GUI and blocked it
Laurent Bessard
parents:
843
diff
changeset
|
209 |
if self.RefreshLock.acquire(False): |
a8952b79caec
Fix bug in Debug refresh lock that, with too much data to debug, flooded GUI and blocked it
Laurent Bessard
parents:
843
diff
changeset
|
210 |
self._should_write() |
a8952b79caec
Fix bug in Debug refresh lock that, with too much data to debug, flooded GUI and blocked it
Laurent Bessard
parents:
843
diff
changeset
|
211 |
else: |
881
68ac754a5a72
Fix bug with concurrent access to LastRefreshTimer in LogPseudoFile for Log Console
Laurent Bessard
parents:
875
diff
changeset
|
212 |
self.TimerAccessLock.acquire() |
875
a8952b79caec
Fix bug in Debug refresh lock that, with too much data to debug, flooded GUI and blocked it
Laurent Bessard
parents:
843
diff
changeset
|
213 |
self.LastRefreshTimer = Timer(REFRESH_PERIOD, self._timer_expired) |
a8952b79caec
Fix bug in Debug refresh lock that, with too much data to debug, flooded GUI and blocked it
Laurent Bessard
parents:
843
diff
changeset
|
214 |
self.LastRefreshTimer.start() |
881
68ac754a5a72
Fix bug with concurrent access to LastRefreshTimer in LogPseudoFile for Log Console
Laurent Bessard
parents:
875
diff
changeset
|
215 |
self.TimerAccessLock.release() |
875
a8952b79caec
Fix bug in Debug refresh lock that, with too much data to debug, flooded GUI and blocked it
Laurent Bessard
parents:
843
diff
changeset
|
216 |
|
705
a5977f64d4d9
More gentle use of app.Yield in ProcessLogger
Edouard Tisserant
parents:
704
diff
changeset
|
217 |
def _should_write(self): |
a5977f64d4d9
More gentle use of app.Yield in ProcessLogger
Edouard Tisserant
parents:
704
diff
changeset
|
218 |
wx.CallAfter(self._write) |
a5977f64d4d9
More gentle use of app.Yield in ProcessLogger
Edouard Tisserant
parents:
704
diff
changeset
|
219 |
if MainThread == currentThread().ident: |
a5977f64d4d9
More gentle use of app.Yield in ProcessLogger
Edouard Tisserant
parents:
704
diff
changeset
|
220 |
app = wx.GetApp() |
a5977f64d4d9
More gentle use of app.Yield in ProcessLogger
Edouard Tisserant
parents:
704
diff
changeset
|
221 |
if app is not None: |
a5977f64d4d9
More gentle use of app.Yield in ProcessLogger
Edouard Tisserant
parents:
704
diff
changeset
|
222 |
if self.YieldLock.acquire(0): |
a5977f64d4d9
More gentle use of app.Yield in ProcessLogger
Edouard Tisserant
parents:
704
diff
changeset
|
223 |
app.Yield() |
a5977f64d4d9
More gentle use of app.Yield in ProcessLogger
Edouard Tisserant
parents:
704
diff
changeset
|
224 |
self.YieldLock.release() |
a5977f64d4d9
More gentle use of app.Yield in ProcessLogger
Edouard Tisserant
parents:
704
diff
changeset
|
225 |
|
686
e4e1da75d411
More robust Logger, now resist to flooding.
Edouard Tisserant
parents:
683
diff
changeset
|
226 |
def _write(self): |
701
166db2cb630b
Stripped dead code in bug report dialog.\nFixed error when log flooded while quitting
Edouard Tisserant
parents:
692
diff
changeset
|
227 |
if self.output : |
875
a8952b79caec
Fix bug in Debug refresh lock that, with too much data to debug, flooded GUI and blocked it
Laurent Bessard
parents:
843
diff
changeset
|
228 |
self.output.Freeze() |
701
166db2cb630b
Stripped dead code in bug report dialog.\nFixed error when log flooded while quitting
Edouard Tisserant
parents:
692
diff
changeset
|
229 |
self.lock.acquire() |
166db2cb630b
Stripped dead code in bug report dialog.\nFixed error when log flooded while quitting
Edouard Tisserant
parents:
692
diff
changeset
|
230 |
for s, style in self.stack: |
166db2cb630b
Stripped dead code in bug report dialog.\nFixed error when log flooded while quitting
Edouard Tisserant
parents:
692
diff
changeset
|
231 |
if style is None : style=self.black_white |
999
cbab4c1635bd
Replaced LogConsole TextCtrl by StyledTextCtrl
Laurent Bessard
parents:
994
diff
changeset
|
232 |
if style != self.black_white: |
cbab4c1635bd
Replaced LogConsole TextCtrl by StyledTextCtrl
Laurent Bessard
parents:
994
diff
changeset
|
233 |
self.output.StartStyling(self.output.GetLength(), 0xff) |
1025
36e38d3c28b2
Fixed LogConsole not cleared when building several times
Laurent Bessard
parents:
1024
diff
changeset
|
234 |
|
1091
5f612651d227
Fixed bug with margin cursor in StyledTextCtrl on Windows
Laurent Bessard
parents:
1090
diff
changeset
|
235 |
# Temporary deactivate read only mode on StyledTextCtrl for |
5f612651d227
Fixed bug with margin cursor in StyledTextCtrl on Windows
Laurent Bessard
parents:
1090
diff
changeset
|
236 |
# adding text. It seems that text modifications, even |
5f612651d227
Fixed bug with margin cursor in StyledTextCtrl on Windows
Laurent Bessard
parents:
1090
diff
changeset
|
237 |
# programmatically, are disabled in StyledTextCtrl when read |
5f612651d227
Fixed bug with margin cursor in StyledTextCtrl on Windows
Laurent Bessard
parents:
1090
diff
changeset
|
238 |
# only is active |
1015
50bb7cc12a84
Fixed LogConsole: set read only, enabled copy selected text with CTRL+C and primary selection
Laurent Bessard
parents:
1007
diff
changeset
|
239 |
self.output.SetReadOnly(False) |
1091
5f612651d227
Fixed bug with margin cursor in StyledTextCtrl on Windows
Laurent Bessard
parents:
1090
diff
changeset
|
240 |
self.output.AppendText(s) |
1015
50bb7cc12a84
Fixed LogConsole: set read only, enabled copy selected text with CTRL+C and primary selection
Laurent Bessard
parents:
1007
diff
changeset
|
241 |
self.output.SetReadOnly(True) |
1025
36e38d3c28b2
Fixed LogConsole not cleared when building several times
Laurent Bessard
parents:
1024
diff
changeset
|
242 |
|
999
cbab4c1635bd
Replaced LogConsole TextCtrl by StyledTextCtrl
Laurent Bessard
parents:
994
diff
changeset
|
243 |
if style != self.black_white: |
cbab4c1635bd
Replaced LogConsole TextCtrl by StyledTextCtrl
Laurent Bessard
parents:
994
diff
changeset
|
244 |
self.output.SetStyling(len(s), style) |
701
166db2cb630b
Stripped dead code in bug report dialog.\nFixed error when log flooded while quitting
Edouard Tisserant
parents:
692
diff
changeset
|
245 |
self.stack = [] |
166db2cb630b
Stripped dead code in bug report dialog.\nFixed error when log flooded while quitting
Edouard Tisserant
parents:
692
diff
changeset
|
246 |
self.lock.release() |
166db2cb630b
Stripped dead code in bug report dialog.\nFixed error when log flooded while quitting
Edouard Tisserant
parents:
692
diff
changeset
|
247 |
self.output.Thaw() |
166db2cb630b
Stripped dead code in bug report dialog.\nFixed error when log flooded while quitting
Edouard Tisserant
parents:
692
diff
changeset
|
248 |
self.LastRefreshTime = gettime() |
166db2cb630b
Stripped dead code in bug report dialog.\nFixed error when log flooded while quitting
Edouard Tisserant
parents:
692
diff
changeset
|
249 |
try: |
166db2cb630b
Stripped dead code in bug report dialog.\nFixed error when log flooded while quitting
Edouard Tisserant
parents:
692
diff
changeset
|
250 |
self.RefreshLock.release() |
166db2cb630b
Stripped dead code in bug report dialog.\nFixed error when log flooded while quitting
Edouard Tisserant
parents:
692
diff
changeset
|
251 |
except: |
166db2cb630b
Stripped dead code in bug report dialog.\nFixed error when log flooded while quitting
Edouard Tisserant
parents:
692
diff
changeset
|
252 |
pass |
166db2cb630b
Stripped dead code in bug report dialog.\nFixed error when log flooded while quitting
Edouard Tisserant
parents:
692
diff
changeset
|
253 |
newtime = time.time() |
166db2cb630b
Stripped dead code in bug report dialog.\nFixed error when log flooded while quitting
Edouard Tisserant
parents:
692
diff
changeset
|
254 |
if newtime - self.rising_timer > 1: |
999
cbab4c1635bd
Replaced LogConsole TextCtrl by StyledTextCtrl
Laurent Bessard
parents:
994
diff
changeset
|
255 |
self.risecall(self.output) |
701
166db2cb630b
Stripped dead code in bug report dialog.\nFixed error when log flooded while quitting
Edouard Tisserant
parents:
692
diff
changeset
|
256 |
self.rising_timer = newtime |
875
a8952b79caec
Fix bug in Debug refresh lock that, with too much data to debug, flooded GUI and blocked it
Laurent Bessard
parents:
843
diff
changeset
|
257 |
|
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
258 |
def write_warning(self, s): |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
259 |
self.write(s,self.red_white) |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
260 |
|
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
261 |
def write_error(self, s): |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
262 |
self.write(s,self.red_yellow) |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
263 |
|
569
37af7286dd65
LPC program transfer more verbose, test code added in __main__ of LPCBootProto
Edouqrd Tisserant <edouard.tisserant@gmail.com>
parents:
550
diff
changeset
|
264 |
def writeyield(self, s): |
37af7286dd65
LPC program transfer more verbose, test code added in __main__ of LPCBootProto
Edouqrd Tisserant <edouard.tisserant@gmail.com>
parents:
550
diff
changeset
|
265 |
self.write(s) |
37af7286dd65
LPC program transfer more verbose, test code added in __main__ of LPCBootProto
Edouqrd Tisserant <edouard.tisserant@gmail.com>
parents:
550
diff
changeset
|
266 |
wx.GetApp().Yield() |
37af7286dd65
LPC program transfer more verbose, test code added in __main__ of LPCBootProto
Edouqrd Tisserant <edouard.tisserant@gmail.com>
parents:
550
diff
changeset
|
267 |
|
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
268 |
def flush(self): |
1091
5f612651d227
Fixed bug with margin cursor in StyledTextCtrl on Windows
Laurent Bessard
parents:
1090
diff
changeset
|
269 |
# Temporary deactivate read only mode on StyledTextCtrl for clearing |
5f612651d227
Fixed bug with margin cursor in StyledTextCtrl on Windows
Laurent Bessard
parents:
1090
diff
changeset
|
270 |
# text. It seems that text modifications, even programmatically, are |
5f612651d227
Fixed bug with margin cursor in StyledTextCtrl on Windows
Laurent Bessard
parents:
1090
diff
changeset
|
271 |
# disabled in StyledTextCtrl when read only is active |
1025
36e38d3c28b2
Fixed LogConsole not cleared when building several times
Laurent Bessard
parents:
1024
diff
changeset
|
272 |
self.output.SetReadOnly(False) |
999
cbab4c1635bd
Replaced LogConsole TextCtrl by StyledTextCtrl
Laurent Bessard
parents:
994
diff
changeset
|
273 |
self.output.SetText("") |
1025
36e38d3c28b2
Fixed LogConsole not cleared when building several times
Laurent Bessard
parents:
1024
diff
changeset
|
274 |
self.output.SetReadOnly(True) |
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
275 |
|
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
276 |
def isatty(self): |
1269 | 277 |
return False |
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
278 |
|
1281 | 279 |
ID_FILEMENURECENTPROJECTS = wx.NewId() |
675
44b35c27e9ff
Adding support for quickly open recent projects in file menu
laurent
parents:
666
diff
changeset
|
280 |
|
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
281 |
class Beremiz(IDEFrame): |
978 | 282 |
|
675
44b35c27e9ff
Adding support for quickly open recent projects in file menu
laurent
parents:
666
diff
changeset
|
283 |
def _init_utils(self): |
717 | 284 |
self.ConfNodeMenu = wx.Menu(title='') |
675
44b35c27e9ff
Adding support for quickly open recent projects in file menu
laurent
parents:
666
diff
changeset
|
285 |
self.RecentProjectsMenu = wx.Menu(title='') |
44b35c27e9ff
Adding support for quickly open recent projects in file menu
laurent
parents:
666
diff
changeset
|
286 |
|
44b35c27e9ff
Adding support for quickly open recent projects in file menu
laurent
parents:
666
diff
changeset
|
287 |
IDEFrame._init_utils(self) |
44b35c27e9ff
Adding support for quickly open recent projects in file menu
laurent
parents:
666
diff
changeset
|
288 |
|
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
289 |
def _init_coll_FileMenu_Items(self, parent): |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
290 |
AppendMenu(parent, help='', id=wx.ID_NEW, |
814 | 291 |
kind=wx.ITEM_NORMAL, text=_(u'New') + '\tCTRL+N') |
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
292 |
AppendMenu(parent, help='', id=wx.ID_OPEN, |
814 | 293 |
kind=wx.ITEM_NORMAL, text=_(u'Open') + '\tCTRL+O') |
702 | 294 |
parent.AppendMenu(ID_FILEMENURECENTPROJECTS, _("&Recent Projects"), self.RecentProjectsMenu) |
675
44b35c27e9ff
Adding support for quickly open recent projects in file menu
laurent
parents:
666
diff
changeset
|
295 |
parent.AppendSeparator() |
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
296 |
AppendMenu(parent, help='', id=wx.ID_SAVE, |
814 | 297 |
kind=wx.ITEM_NORMAL, text=_(u'Save') + '\tCTRL+S') |
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
298 |
AppendMenu(parent, help='', id=wx.ID_SAVEAS, |
814 | 299 |
kind=wx.ITEM_NORMAL, text=_(u'Save as') + '\tCTRL+SHIFT+S') |
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
300 |
AppendMenu(parent, help='', id=wx.ID_CLOSE, |
814 | 301 |
kind=wx.ITEM_NORMAL, text=_(u'Close Tab') + '\tCTRL+W') |
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
302 |
AppendMenu(parent, help='', id=wx.ID_CLOSE_ALL, |
814 | 303 |
kind=wx.ITEM_NORMAL, text=_(u'Close Project') + '\tCTRL+SHIFT+W') |
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
304 |
parent.AppendSeparator() |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
305 |
AppendMenu(parent, help='', id=wx.ID_PAGE_SETUP, |
814 | 306 |
kind=wx.ITEM_NORMAL, text=_(u'Page Setup') + '\tCTRL+ALT+P') |
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
307 |
AppendMenu(parent, help='', id=wx.ID_PREVIEW, |
814 | 308 |
kind=wx.ITEM_NORMAL, text=_(u'Preview') + '\tCTRL+SHIFT+P') |
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
309 |
AppendMenu(parent, help='', id=wx.ID_PRINT, |
814 | 310 |
kind=wx.ITEM_NORMAL, text=_(u'Print') + '\tCTRL+P') |
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
311 |
parent.AppendSeparator() |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
312 |
AppendMenu(parent, help='', id=wx.ID_EXIT, |
814 | 313 |
kind=wx.ITEM_NORMAL, text=_(u'Quit') + '\tCTRL+Q') |
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
314 |
|
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
315 |
self.Bind(wx.EVT_MENU, self.OnNewProjectMenu, id=wx.ID_NEW) |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
316 |
self.Bind(wx.EVT_MENU, self.OnOpenProjectMenu, id=wx.ID_OPEN) |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
317 |
self.Bind(wx.EVT_MENU, self.OnSaveProjectMenu, id=wx.ID_SAVE) |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
318 |
self.Bind(wx.EVT_MENU, self.OnSaveProjectAsMenu, id=wx.ID_SAVEAS) |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
319 |
self.Bind(wx.EVT_MENU, self.OnCloseTabMenu, id=wx.ID_CLOSE) |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
320 |
self.Bind(wx.EVT_MENU, self.OnCloseProjectMenu, id=wx.ID_CLOSE_ALL) |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
321 |
self.Bind(wx.EVT_MENU, self.OnPageSetupMenu, id=wx.ID_PAGE_SETUP) |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
322 |
self.Bind(wx.EVT_MENU, self.OnPreviewMenu, id=wx.ID_PREVIEW) |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
323 |
self.Bind(wx.EVT_MENU, self.OnPrintMenu, id=wx.ID_PRINT) |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
324 |
self.Bind(wx.EVT_MENU, self.OnQuitMenu, id=wx.ID_EXIT) |
799 | 325 |
|
781
cdc6393705ce
Adding support using plcopeneditor bitmap library for icon request
laurent
parents:
771
diff
changeset
|
326 |
self.AddToMenuToolBar([(wx.ID_NEW, "new", _(u'New'), None), |
cdc6393705ce
Adding support using plcopeneditor bitmap library for icon request
laurent
parents:
771
diff
changeset
|
327 |
(wx.ID_OPEN, "open", _(u'Open'), None), |
cdc6393705ce
Adding support using plcopeneditor bitmap library for icon request
laurent
parents:
771
diff
changeset
|
328 |
(wx.ID_SAVE, "save", _(u'Save'), None), |
cdc6393705ce
Adding support using plcopeneditor bitmap library for icon request
laurent
parents:
771
diff
changeset
|
329 |
(wx.ID_SAVEAS, "saveas", _(u'Save As...'), None), |
cdc6393705ce
Adding support using plcopeneditor bitmap library for icon request
laurent
parents:
771
diff
changeset
|
330 |
(wx.ID_PRINT, "print", _(u'Print'), None)]) |
706 | 331 |
|
1282
f427352f9727
Added support for left panel add menu with multiple levels
laurent
parents:
1281
diff
changeset
|
332 |
def _RecursiveAddMenuItems(self, menu, items): |
f427352f9727
Added support for left panel add menu with multiple levels
laurent
parents:
1281
diff
changeset
|
333 |
for name, text, help, children in items: |
f427352f9727
Added support for left panel add menu with multiple levels
laurent
parents:
1281
diff
changeset
|
334 |
new_id = wx.NewId() |
f427352f9727
Added support for left panel add menu with multiple levels
laurent
parents:
1281
diff
changeset
|
335 |
if len(children) > 0: |
f427352f9727
Added support for left panel add menu with multiple levels
laurent
parents:
1281
diff
changeset
|
336 |
new_menu = wx.Menu(title='') |
f427352f9727
Added support for left panel add menu with multiple levels
laurent
parents:
1281
diff
changeset
|
337 |
menu.AppendMenu(new_id, text, new_menu) |
f427352f9727
Added support for left panel add menu with multiple levels
laurent
parents:
1281
diff
changeset
|
338 |
self._RecursiveAddMenuItems(new_menu, children) |
f427352f9727
Added support for left panel add menu with multiple levels
laurent
parents:
1281
diff
changeset
|
339 |
else: |
f427352f9727
Added support for left panel add menu with multiple levels
laurent
parents:
1281
diff
changeset
|
340 |
AppendMenu(menu, help=help, id=new_id, |
f427352f9727
Added support for left panel add menu with multiple levels
laurent
parents:
1281
diff
changeset
|
341 |
kind=wx.ITEM_NORMAL, text=text) |
f427352f9727
Added support for left panel add menu with multiple levels
laurent
parents:
1281
diff
changeset
|
342 |
self.Bind(wx.EVT_MENU, self.GetAddConfNodeFunction(name), |
f427352f9727
Added support for left panel add menu with multiple levels
laurent
parents:
1281
diff
changeset
|
343 |
id=new_id) |
f427352f9727
Added support for left panel add menu with multiple levels
laurent
parents:
1281
diff
changeset
|
344 |
|
738 | 345 |
def _init_coll_AddMenu_Items(self, parent): |
346 |
IDEFrame._init_coll_AddMenu_Items(self, parent, False) |
|
1024
626de4ff4bdc
Fixed resource editing, removing definition of more than one resource and deletion of last resource defined
Laurent Bessard
parents:
1019
diff
changeset
|
347 |
|
626de4ff4bdc
Fixed resource editing, removing definition of more than one resource and deletion of last resource defined
Laurent Bessard
parents:
1019
diff
changeset
|
348 |
# Disable add resource until matiec is able to handle multiple ressource definition |
626de4ff4bdc
Fixed resource editing, removing definition of more than one resource and deletion of last resource defined
Laurent Bessard
parents:
1019
diff
changeset
|
349 |
#new_id = wx.NewId() |
626de4ff4bdc
Fixed resource editing, removing definition of more than one resource and deletion of last resource defined
Laurent Bessard
parents:
1019
diff
changeset
|
350 |
#AppendMenu(parent, help='', id=new_id, |
626de4ff4bdc
Fixed resource editing, removing definition of more than one resource and deletion of last resource defined
Laurent Bessard
parents:
1019
diff
changeset
|
351 |
# kind=wx.ITEM_NORMAL, text=_(u'&Resource')) |
626de4ff4bdc
Fixed resource editing, removing definition of more than one resource and deletion of last resource defined
Laurent Bessard
parents:
1019
diff
changeset
|
352 |
#self.Bind(wx.EVT_MENU, self.AddResourceMenu, id=new_id) |
626de4ff4bdc
Fixed resource editing, removing definition of more than one resource and deletion of last resource defined
Laurent Bessard
parents:
1019
diff
changeset
|
353 |
|
1282
f427352f9727
Added support for left panel add menu with multiple levels
laurent
parents:
1281
diff
changeset
|
354 |
self._RecursiveAddMenuItems(parent, GetAddMenuItems()) |
738 | 355 |
|
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
356 |
def _init_coll_HelpMenu_Items(self, parent): |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
357 |
parent.Append(help='', id=wx.ID_ABOUT, |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
358 |
kind=wx.ITEM_NORMAL, text=_(u'About')) |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
359 |
self.Bind(wx.EVT_MENU, self.OnAboutMenu, id=wx.ID_ABOUT) |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
360 |
|
1000 | 361 |
def _init_coll_ConnectionStatusBar_Fields(self, parent): |
362 |
parent.SetFieldsCount(3) |
|
363 |
||
364 |
parent.SetStatusText(number=0, text='') |
|
365 |
parent.SetStatusText(number=1, text='') |
|
366 |
parent.SetStatusText(number=2, text='') |
|
367 |
||
368 |
parent.SetStatusWidths([-1, 300, 200]) |
|
369 |
||
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
370 |
def _init_ctrls(self, prnt): |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
371 |
IDEFrame._init_ctrls(self, prnt) |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
372 |
|
771 | 373 |
self.EditMenuSize = self.EditMenu.GetMenuItemCount() |
374 |
||
1281 | 375 |
inspectorID = wx.NewId() |
376 |
self.Bind(wx.EVT_MENU, self.OnOpenWidgetInspector, id=inspectorID) |
|
377 |
accels = [wx.AcceleratorEntry(wx.ACCEL_CTRL|wx.ACCEL_ALT, ord('I'), inspectorID)] |
|
623
8cdb533c3c7a
A few new keyboard shortcuts : F4=stop, F5=run, F5=transfer, F7=connect
Edouard Tisserant
parents:
619
diff
changeset
|
378 |
for method,shortcut in [("Stop", wx.WXK_F4), |
8cdb533c3c7a
A few new keyboard shortcuts : F4=stop, F5=run, F5=transfer, F7=connect
Edouard Tisserant
parents:
619
diff
changeset
|
379 |
("Run", wx.WXK_F5), |
8cdb533c3c7a
A few new keyboard shortcuts : F4=stop, F5=run, F5=transfer, F7=connect
Edouard Tisserant
parents:
619
diff
changeset
|
380 |
("Transfer", wx.WXK_F6), |
8cdb533c3c7a
A few new keyboard shortcuts : F4=stop, F5=run, F5=transfer, F7=connect
Edouard Tisserant
parents:
619
diff
changeset
|
381 |
("Connect", wx.WXK_F7), |
8cdb533c3c7a
A few new keyboard shortcuts : F4=stop, F5=run, F5=transfer, F7=connect
Edouard Tisserant
parents:
619
diff
changeset
|
382 |
("Build", wx.WXK_F11)]: |
8cdb533c3c7a
A few new keyboard shortcuts : F4=stop, F5=run, F5=transfer, F7=connect
Edouard Tisserant
parents:
619
diff
changeset
|
383 |
def OnMethodGen(obj,meth): |
8cdb533c3c7a
A few new keyboard shortcuts : F4=stop, F5=run, F5=transfer, F7=connect
Edouard Tisserant
parents:
619
diff
changeset
|
384 |
def OnMethod(evt): |
717 | 385 |
if obj.CTR is not None: |
386 |
obj.CTR.CallMethod('_'+meth) |
|
738 | 387 |
wx.CallAfter(self.RefreshStatusToolBar) |
623
8cdb533c3c7a
A few new keyboard shortcuts : F4=stop, F5=run, F5=transfer, F7=connect
Edouard Tisserant
parents:
619
diff
changeset
|
388 |
return OnMethod |
8cdb533c3c7a
A few new keyboard shortcuts : F4=stop, F5=run, F5=transfer, F7=connect
Edouard Tisserant
parents:
619
diff
changeset
|
389 |
newid = wx.NewId() |
8cdb533c3c7a
A few new keyboard shortcuts : F4=stop, F5=run, F5=transfer, F7=connect
Edouard Tisserant
parents:
619
diff
changeset
|
390 |
self.Bind(wx.EVT_MENU, OnMethodGen(self,method), id=newid) |
8cdb533c3c7a
A few new keyboard shortcuts : F4=stop, F5=run, F5=transfer, F7=connect
Edouard Tisserant
parents:
619
diff
changeset
|
391 |
accels += [wx.AcceleratorEntry(wx.ACCEL_NORMAL, shortcut,newid)] |
8cdb533c3c7a
A few new keyboard shortcuts : F4=stop, F5=run, F5=transfer, F7=connect
Edouard Tisserant
parents:
619
diff
changeset
|
392 |
|
8cdb533c3c7a
A few new keyboard shortcuts : F4=stop, F5=run, F5=transfer, F7=connect
Edouard Tisserant
parents:
619
diff
changeset
|
393 |
self.SetAcceleratorTable(wx.AcceleratorTable(accels)) |
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
394 |
|
1281 | 395 |
self.LogConsole = CustomStyledTextCtrl( |
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
396 |
name='LogConsole', parent=self.BottomNoteBook, pos=wx.Point(0, 0), |
999
cbab4c1635bd
Replaced LogConsole TextCtrl by StyledTextCtrl
Laurent Bessard
parents:
994
diff
changeset
|
397 |
size=wx.Size(0, 0)) |
1015
50bb7cc12a84
Fixed LogConsole: set read only, enabled copy selected text with CTRL+C and primary selection
Laurent Bessard
parents:
1007
diff
changeset
|
398 |
self.LogConsole.Bind(wx.EVT_SET_FOCUS, self.OnLogConsoleFocusChanged) |
50bb7cc12a84
Fixed LogConsole: set read only, enabled copy selected text with CTRL+C and primary selection
Laurent Bessard
parents:
1007
diff
changeset
|
399 |
self.LogConsole.Bind(wx.EVT_KILL_FOCUS, self.OnLogConsoleFocusChanged) |
50bb7cc12a84
Fixed LogConsole: set read only, enabled copy selected text with CTRL+C and primary selection
Laurent Bessard
parents:
1007
diff
changeset
|
400 |
self.LogConsole.Bind(wx.stc.EVT_STC_UPDATEUI, self.OnLogConsoleUpdateUI) |
50bb7cc12a84
Fixed LogConsole: set read only, enabled copy selected text with CTRL+C and primary selection
Laurent Bessard
parents:
1007
diff
changeset
|
401 |
self.LogConsole.SetReadOnly(True) |
1007
025ac12cd0d2
Added automatic line wrapping to log console
Laurent Bessard
parents:
1000
diff
changeset
|
402 |
self.LogConsole.SetWrapMode(wx.stc.STC_WRAP_CHAR) |
999
cbab4c1635bd
Replaced LogConsole TextCtrl by StyledTextCtrl
Laurent Bessard
parents:
994
diff
changeset
|
403 |
|
cbab4c1635bd
Replaced LogConsole TextCtrl by StyledTextCtrl
Laurent Bessard
parents:
994
diff
changeset
|
404 |
# Define Log Console styles |
cbab4c1635bd
Replaced LogConsole TextCtrl by StyledTextCtrl
Laurent Bessard
parents:
994
diff
changeset
|
405 |
self.LogConsole.StyleSetSpec(wx.stc.STC_STYLE_DEFAULT, "face:%(mono)s,size:%(size)d" % faces) |
cbab4c1635bd
Replaced LogConsole TextCtrl by StyledTextCtrl
Laurent Bessard
parents:
994
diff
changeset
|
406 |
self.LogConsole.StyleClearAll() |
cbab4c1635bd
Replaced LogConsole TextCtrl by StyledTextCtrl
Laurent Bessard
parents:
994
diff
changeset
|
407 |
self.LogConsole.StyleSetSpec(1, "face:%(mono)s,fore:#FF0000,size:%(size)d" % faces) |
cbab4c1635bd
Replaced LogConsole TextCtrl by StyledTextCtrl
Laurent Bessard
parents:
994
diff
changeset
|
408 |
self.LogConsole.StyleSetSpec(2, "face:%(mono)s,fore:#FF0000,back:#FFFF00,size:%(size)d" % faces) |
cbab4c1635bd
Replaced LogConsole TextCtrl by StyledTextCtrl
Laurent Bessard
parents:
994
diff
changeset
|
409 |
|
cbab4c1635bd
Replaced LogConsole TextCtrl by StyledTextCtrl
Laurent Bessard
parents:
994
diff
changeset
|
410 |
# Define Log Console markers |
cbab4c1635bd
Replaced LogConsole TextCtrl by StyledTextCtrl
Laurent Bessard
parents:
994
diff
changeset
|
411 |
self.LogConsole.SetMarginSensitive(1, True) |
cbab4c1635bd
Replaced LogConsole TextCtrl by StyledTextCtrl
Laurent Bessard
parents:
994
diff
changeset
|
412 |
self.LogConsole.SetMarginType(1, wx.stc.STC_MARGIN_SYMBOL) |
cbab4c1635bd
Replaced LogConsole TextCtrl by StyledTextCtrl
Laurent Bessard
parents:
994
diff
changeset
|
413 |
self.LogConsole.MarkerDefine(0, wx.stc.STC_MARK_CIRCLE, "BLACK", "RED") |
cbab4c1635bd
Replaced LogConsole TextCtrl by StyledTextCtrl
Laurent Bessard
parents:
994
diff
changeset
|
414 |
|
cbab4c1635bd
Replaced LogConsole TextCtrl by StyledTextCtrl
Laurent Bessard
parents:
994
diff
changeset
|
415 |
self.LogConsole.SetModEventMask(wx.stc.STC_MOD_INSERTTEXT) |
cbab4c1635bd
Replaced LogConsole TextCtrl by StyledTextCtrl
Laurent Bessard
parents:
994
diff
changeset
|
416 |
|
cbab4c1635bd
Replaced LogConsole TextCtrl by StyledTextCtrl
Laurent Bessard
parents:
994
diff
changeset
|
417 |
self.LogConsole.Bind(wx.stc.EVT_STC_MARGINCLICK, self.OnLogConsoleMarginClick) |
cbab4c1635bd
Replaced LogConsole TextCtrl by StyledTextCtrl
Laurent Bessard
parents:
994
diff
changeset
|
418 |
self.LogConsole.Bind(wx.stc.EVT_STC_MODIFIED, self.OnLogConsoleModified) |
cbab4c1635bd
Replaced LogConsole TextCtrl by StyledTextCtrl
Laurent Bessard
parents:
994
diff
changeset
|
419 |
|
986 | 420 |
self.MainTabs["LogConsole"] = (self.LogConsole, _("Console")) |
715
135566ab0807
Adding support for automatically saving and restoring state of frame or project perspective
laurent
parents:
714
diff
changeset
|
421 |
self.BottomNoteBook.AddPage(*self.MainTabs["LogConsole"]) |
999
cbab4c1635bd
Replaced LogConsole TextCtrl by StyledTextCtrl
Laurent Bessard
parents:
994
diff
changeset
|
422 |
#self.BottomNoteBook.Split(self.BottomNoteBook.GetPageIndex(self.LogConsole), wx.RIGHT) |
978 | 423 |
|
424 |
self.LogViewer = LogViewer(self.BottomNoteBook, self) |
|
986 | 425 |
self.MainTabs["LogViewer"] = (self.LogViewer, _("PLC Log")) |
978 | 426 |
self.BottomNoteBook.AddPage(*self.MainTabs["LogViewer"]) |
994
0401295d9804
Inverted Console and LogViewer tabs in bottom Notebook
Laurent Bessard
parents:
986
diff
changeset
|
427 |
#self.BottomNoteBook.Split(self.BottomNoteBook.GetPageIndex(self.LogViewer), wx.RIGHT) |
978 | 428 |
|
738 | 429 |
StatusToolBar = wx.ToolBar(self, -1, wx.DefaultPosition, wx.DefaultSize, |
430 |
wx.TB_FLAT | wx.TB_NODIVIDER | wx.NO_BORDER) |
|
431 |
StatusToolBar.SetToolBitmapSize(wx.Size(25, 25)) |
|
432 |
StatusToolBar.Realize() |
|
433 |
self.Panes["StatusToolBar"] = StatusToolBar |
|
434 |
self.AUIManager.AddPane(StatusToolBar, wx.aui.AuiPaneInfo(). |
|
435 |
Name("StatusToolBar").Caption(_("Status ToolBar")). |
|
765
ef221ba41dec
Add support for reorganizing toolbars when their size changed
laurent
parents:
762
diff
changeset
|
436 |
ToolbarPane().Top().Position(1). |
738 | 437 |
LeftDockable(False).RightDockable(False)) |
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
438 |
|
738 | 439 |
self.AUIManager.Update() |
440 |
||
1000 | 441 |
self.ConnectionStatusBar = wx.StatusBar(self, style=wx.ST_SIZEGRIP) |
442 |
self._init_coll_ConnectionStatusBar_Fields(self.ConnectionStatusBar) |
|
443 |
self.SetStatusBar(self.ConnectionStatusBar) |
|
444 |
||
717 | 445 |
def __init__(self, parent, projectOpen=None, buildpath=None, ctr=None, debug=True): |
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
446 |
IDEFrame.__init__(self, parent, debug) |
999
cbab4c1635bd
Replaced LogConsole TextCtrl by StyledTextCtrl
Laurent Bessard
parents:
994
diff
changeset
|
447 |
self.Log = LogPseudoFile(self.LogConsole,self.SelectTab) |
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
448 |
|
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
449 |
self.local_runtime = None |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
450 |
self.runtime_port = None |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
451 |
self.local_runtime_tmpdir = None |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
452 |
|
675
44b35c27e9ff
Adding support for quickly open recent projects in file menu
laurent
parents:
666
diff
changeset
|
453 |
self.LastPanelSelected = None |
44b35c27e9ff
Adding support for quickly open recent projects in file menu
laurent
parents:
666
diff
changeset
|
454 |
|
650
26236e691330
Replacing sizers structure for locations tree by a treectrl in Topology panel in order to make refreshing of this panel faster
laurent
parents:
636
diff
changeset
|
455 |
# Define Tree item icon list |
26236e691330
Replacing sizers structure for locations tree by a treectrl in Topology panel in order to make refreshing of this panel faster
laurent
parents:
636
diff
changeset
|
456 |
self.LocationImageList = wx.ImageList(16, 16) |
26236e691330
Replacing sizers structure for locations tree by a treectrl in Topology panel in order to make refreshing of this panel faster
laurent
parents:
636
diff
changeset
|
457 |
self.LocationImageDict = {} |
26236e691330
Replacing sizers structure for locations tree by a treectrl in Topology panel in order to make refreshing of this panel faster
laurent
parents:
636
diff
changeset
|
458 |
|
26236e691330
Replacing sizers structure for locations tree by a treectrl in Topology panel in order to make refreshing of this panel faster
laurent
parents:
636
diff
changeset
|
459 |
# Icons for location items |
26236e691330
Replacing sizers structure for locations tree by a treectrl in Topology panel in order to make refreshing of this panel faster
laurent
parents:
636
diff
changeset
|
460 |
for imgname, itemtype in [ |
717 | 461 |
("CONFIGURATION", LOCATION_CONFNODE), |
650
26236e691330
Replacing sizers structure for locations tree by a treectrl in Topology panel in order to make refreshing of this panel faster
laurent
parents:
636
diff
changeset
|
462 |
("RESOURCE", LOCATION_MODULE), |
26236e691330
Replacing sizers structure for locations tree by a treectrl in Topology panel in order to make refreshing of this panel faster
laurent
parents:
636
diff
changeset
|
463 |
("PROGRAM", LOCATION_GROUP), |
26236e691330
Replacing sizers structure for locations tree by a treectrl in Topology panel in order to make refreshing of this panel faster
laurent
parents:
636
diff
changeset
|
464 |
("VAR_INPUT", LOCATION_VAR_INPUT), |
26236e691330
Replacing sizers structure for locations tree by a treectrl in Topology panel in order to make refreshing of this panel faster
laurent
parents:
636
diff
changeset
|
465 |
("VAR_OUTPUT", LOCATION_VAR_OUTPUT), |
26236e691330
Replacing sizers structure for locations tree by a treectrl in Topology panel in order to make refreshing of this panel faster
laurent
parents:
636
diff
changeset
|
466 |
("VAR_LOCAL", LOCATION_VAR_MEMORY)]: |
781
cdc6393705ce
Adding support using plcopeneditor bitmap library for icon request
laurent
parents:
771
diff
changeset
|
467 |
self.LocationImageDict[itemtype] = self.LocationImageList.Add(GetBitmap(imgname)) |
650
26236e691330
Replacing sizers structure for locations tree by a treectrl in Topology panel in order to make refreshing of this panel faster
laurent
parents:
636
diff
changeset
|
468 |
|
738 | 469 |
# Icons for other items |
470 |
for imgname, itemtype in [ |
|
471 |
("Extension", ITEM_CONFNODE)]: |
|
781
cdc6393705ce
Adding support using plcopeneditor bitmap library for icon request
laurent
parents:
771
diff
changeset
|
472 |
self.TreeImageDict[itemtype] = self.TreeImageList.Add(GetBitmap(imgname)) |
738 | 473 |
|
650
26236e691330
Replacing sizers structure for locations tree by a treectrl in Topology panel in order to make refreshing of this panel faster
laurent
parents:
636
diff
changeset
|
474 |
# Add beremiz's icon in top left corner of the frame |
781
cdc6393705ce
Adding support using plcopeneditor bitmap library for icon request
laurent
parents:
771
diff
changeset
|
475 |
self.SetIcon(wx.Icon(Bpath("images", "brz.ico"), wx.BITMAP_TYPE_ICO)) |
650
26236e691330
Replacing sizers structure for locations tree by a treectrl in Topology panel in order to make refreshing of this panel faster
laurent
parents:
636
diff
changeset
|
476 |
|
788 | 477 |
if projectOpen is not None: |
478 |
projectOpen = DecodeFileSystemPath(projectOpen, False) |
|
479 |
||
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
480 |
if projectOpen is not None and os.path.isdir(projectOpen): |
725 | 481 |
self.CTR = ProjectController(self, self.Log) |
717 | 482 |
self.Controler = self.CTR |
483 |
result = self.CTR.LoadProject(projectOpen, buildpath) |
|
679
d72f3a42f440
Fix recent projects list not updated when creating new project
laurent
parents:
678
diff
changeset
|
484 |
if not result: |
781
cdc6393705ce
Adding support using plcopeneditor bitmap library for icon request
laurent
parents:
771
diff
changeset
|
485 |
self.LibraryPanel.SetController(self.Controler) |
738 | 486 |
self.ProjectTree.Enable(True) |
730 | 487 |
self.PouInstanceVariablesPanel.SetController(self.Controler) |
679
d72f3a42f440
Fix recent projects list not updated when creating new project
laurent
parents:
678
diff
changeset
|
488 |
self.RefreshConfigRecentProjects(os.path.abspath(projectOpen)) |
730 | 489 |
self._Refresh(PROJECTTREE, POUINSTANCEVARIABLESPANEL, LIBRARYTREE) |
679
d72f3a42f440
Fix recent projects list not updated when creating new project
laurent
parents:
678
diff
changeset
|
490 |
else: |
d72f3a42f440
Fix recent projects list not updated when creating new project
laurent
parents:
678
diff
changeset
|
491 |
self.ResetView() |
d72f3a42f440
Fix recent projects list not updated when creating new project
laurent
parents:
678
diff
changeset
|
492 |
self.ShowErrorMessage(result) |
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
493 |
else: |
717 | 494 |
self.CTR = ctr |
495 |
self.Controler = ctr |
|
496 |
if ctr is not None: |
|
781
cdc6393705ce
Adding support using plcopeneditor bitmap library for icon request
laurent
parents:
771
diff
changeset
|
497 |
self.LibraryPanel.SetController(self.Controler) |
738 | 498 |
self.ProjectTree.Enable(True) |
730 | 499 |
self.PouInstanceVariablesPanel.SetController(self.Controler) |
500 |
self._Refresh(PROJECTTREE, POUINSTANCEVARIABLESPANEL, LIBRARYTREE) |
|
490 | 501 |
if self.EnableDebug: |
717 | 502 |
self.DebugVariablePanel.SetDataProducer(self.CTR) |
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
503 |
|
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
504 |
self.Bind(wx.EVT_CLOSE, self.OnCloseFrame) |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
505 |
|
706 | 506 |
self._Refresh(TITLE, EDITORTOOLBAR, FILEMENU, EDITMENU, DISPLAYMENU) |
755 | 507 |
self.RefreshAll() |
590 | 508 |
self.LogConsole.SetFocus() |
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
509 |
|
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
510 |
def RefreshTitle(self): |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
511 |
name = _("Beremiz") |
717 | 512 |
if self.CTR is not None: |
513 |
projectname = self.CTR.GetProjectName() |
|
514 |
if self.CTR.ProjectTestModified(): |
|
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
515 |
projectname = "~%s~" % projectname |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
516 |
self.SetTitle("%s - %s" % (name, projectname)) |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
517 |
else: |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
518 |
self.SetTitle(name) |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
519 |
|
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
520 |
def StartLocalRuntime(self, taskbaricon = True): |
713
37dc330e96a2
Reflected recent changes in ProcessLogger changes in StartLocalRuntime
Edouard Tisserant
parents:
710
diff
changeset
|
521 |
if (self.local_runtime is None) or (self.local_runtime.exitcode is not None): |
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
522 |
# create temporary directory for runtime working directory |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
523 |
self.local_runtime_tmpdir = tempfile.mkdtemp() |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
524 |
# choose an arbitrary random port for runtime |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
525 |
self.runtime_port = int(random.random() * 1000) + 61131 |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
526 |
# launch local runtime |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
527 |
self.local_runtime = ProcessLogger(self.Log, |
958
511bf048b8b7
Added CWD to ProcessLogger, and make sure local runtime have CWD setup correctly
Edouard Tisserant
parents:
918
diff
changeset
|
528 |
"\"%s\" \"%s\" -p %s -i localhost %s %s"%( |
511bf048b8b7
Added CWD to ProcessLogger, and make sure local runtime have CWD setup correctly
Edouard Tisserant
parents:
918
diff
changeset
|
529 |
sys.executable, |
511bf048b8b7
Added CWD to ProcessLogger, and make sure local runtime have CWD setup correctly
Edouard Tisserant
parents:
918
diff
changeset
|
530 |
Bpath("Beremiz_service.py"), |
511bf048b8b7
Added CWD to ProcessLogger, and make sure local runtime have CWD setup correctly
Edouard Tisserant
parents:
918
diff
changeset
|
531 |
self.runtime_port, |
511bf048b8b7
Added CWD to ProcessLogger, and make sure local runtime have CWD setup correctly
Edouard Tisserant
parents:
918
diff
changeset
|
532 |
{False : "-x 0", True :"-x 1"}[taskbaricon], |
511bf048b8b7
Added CWD to ProcessLogger, and make sure local runtime have CWD setup correctly
Edouard Tisserant
parents:
918
diff
changeset
|
533 |
self.local_runtime_tmpdir), |
511bf048b8b7
Added CWD to ProcessLogger, and make sure local runtime have CWD setup correctly
Edouard Tisserant
parents:
918
diff
changeset
|
534 |
no_gui=False, |
511bf048b8b7
Added CWD to ProcessLogger, and make sure local runtime have CWD setup correctly
Edouard Tisserant
parents:
918
diff
changeset
|
535 |
timeout=500, keyword = "working", |
511bf048b8b7
Added CWD to ProcessLogger, and make sure local runtime have CWD setup correctly
Edouard Tisserant
parents:
918
diff
changeset
|
536 |
cwd = self.local_runtime_tmpdir) |
704 | 537 |
self.local_runtime.spin() |
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
538 |
return self.runtime_port |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
539 |
|
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
540 |
def KillLocalRuntime(self): |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
541 |
if self.local_runtime is not None: |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
542 |
# shutdown local runtime |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
543 |
self.local_runtime.kill(gently=False) |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
544 |
# clear temp dir |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
545 |
shutil.rmtree(self.local_runtime_tmpdir) |
539
6ff2c1d34640
Modifying LPCBeremiz to launch silently a frame and show or hide it on demand.
laurent
parents:
513
diff
changeset
|
546 |
|
6ff2c1d34640
Modifying LPCBeremiz to launch silently a frame and show or hide it on demand.
laurent
parents:
513
diff
changeset
|
547 |
self.local_runtime = None |
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
548 |
|
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
549 |
def OnOpenWidgetInspector(self, evt): |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
550 |
# Activate the widget inspection tool |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
551 |
from wx.lib.inspection import InspectionTool |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
552 |
if not InspectionTool().initialized: |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
553 |
InspectionTool().Init() |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
554 |
|
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
555 |
# Find a widget to be selected in the tree. Use either the |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
556 |
# one under the cursor, if any, or this frame. |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
557 |
wnd = wx.FindWindowAtPointer() |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
558 |
if not wnd: |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
559 |
wnd = self |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
560 |
InspectionTool().Show(wnd, True) |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
561 |
|
1015
50bb7cc12a84
Fixed LogConsole: set read only, enabled copy selected text with CTRL+C and primary selection
Laurent Bessard
parents:
1007
diff
changeset
|
562 |
def OnLogConsoleFocusChanged(self, event): |
1087 | 563 |
self.RefreshEditMenu() |
1015
50bb7cc12a84
Fixed LogConsole: set read only, enabled copy selected text with CTRL+C and primary selection
Laurent Bessard
parents:
1007
diff
changeset
|
564 |
event.Skip() |
50bb7cc12a84
Fixed LogConsole: set read only, enabled copy selected text with CTRL+C and primary selection
Laurent Bessard
parents:
1007
diff
changeset
|
565 |
|
50bb7cc12a84
Fixed LogConsole: set read only, enabled copy selected text with CTRL+C and primary selection
Laurent Bessard
parents:
1007
diff
changeset
|
566 |
def OnLogConsoleUpdateUI(self, event): |
50bb7cc12a84
Fixed LogConsole: set read only, enabled copy selected text with CTRL+C and primary selection
Laurent Bessard
parents:
1007
diff
changeset
|
567 |
self.SetCopyBuffer(self.LogConsole.GetSelectedText(), True) |
50bb7cc12a84
Fixed LogConsole: set read only, enabled copy selected text with CTRL+C and primary selection
Laurent Bessard
parents:
1007
diff
changeset
|
568 |
event.Skip() |
50bb7cc12a84
Fixed LogConsole: set read only, enabled copy selected text with CTRL+C and primary selection
Laurent Bessard
parents:
1007
diff
changeset
|
569 |
|
999
cbab4c1635bd
Replaced LogConsole TextCtrl by StyledTextCtrl
Laurent Bessard
parents:
994
diff
changeset
|
570 |
def OnLogConsoleMarginClick(self, event): |
cbab4c1635bd
Replaced LogConsole TextCtrl by StyledTextCtrl
Laurent Bessard
parents:
994
diff
changeset
|
571 |
line_idx = self.LogConsole.LineFromPosition(event.GetPosition()) |
cbab4c1635bd
Replaced LogConsole TextCtrl by StyledTextCtrl
Laurent Bessard
parents:
994
diff
changeset
|
572 |
wx.CallAfter(self.SearchLineForError, self.LogConsole.GetLine(line_idx)) |
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
573 |
event.Skip() |
999
cbab4c1635bd
Replaced LogConsole TextCtrl by StyledTextCtrl
Laurent Bessard
parents:
994
diff
changeset
|
574 |
|
cbab4c1635bd
Replaced LogConsole TextCtrl by StyledTextCtrl
Laurent Bessard
parents:
994
diff
changeset
|
575 |
def OnLogConsoleModified(self, event): |
cbab4c1635bd
Replaced LogConsole TextCtrl by StyledTextCtrl
Laurent Bessard
parents:
994
diff
changeset
|
576 |
line_idx = self.LogConsole.LineFromPosition(event.GetPosition()) |
cbab4c1635bd
Replaced LogConsole TextCtrl by StyledTextCtrl
Laurent Bessard
parents:
994
diff
changeset
|
577 |
line = self.LogConsole.GetLine(line_idx) |
cbab4c1635bd
Replaced LogConsole TextCtrl by StyledTextCtrl
Laurent Bessard
parents:
994
diff
changeset
|
578 |
if line: |
cbab4c1635bd
Replaced LogConsole TextCtrl by StyledTextCtrl
Laurent Bessard
parents:
994
diff
changeset
|
579 |
result = MATIEC_ERROR_MODEL.match(line) |
cbab4c1635bd
Replaced LogConsole TextCtrl by StyledTextCtrl
Laurent Bessard
parents:
994
diff
changeset
|
580 |
if result is not None: |
cbab4c1635bd
Replaced LogConsole TextCtrl by StyledTextCtrl
Laurent Bessard
parents:
994
diff
changeset
|
581 |
self.LogConsole.MarkerAdd(line_idx, 0) |
cbab4c1635bd
Replaced LogConsole TextCtrl by StyledTextCtrl
Laurent Bessard
parents:
994
diff
changeset
|
582 |
event.Skip() |
cbab4c1635bd
Replaced LogConsole TextCtrl by StyledTextCtrl
Laurent Bessard
parents:
994
diff
changeset
|
583 |
|
cbab4c1635bd
Replaced LogConsole TextCtrl by StyledTextCtrl
Laurent Bessard
parents:
994
diff
changeset
|
584 |
def SearchLineForError(self, line): |
717 | 585 |
if self.CTR is not None: |
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
586 |
result = MATIEC_ERROR_MODEL.match(line) |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
587 |
if result is not None: |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
588 |
first_line, first_column, last_line, last_column, error = result.groups() |
717 | 589 |
infos = self.CTR.ShowError(self.Log, |
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
590 |
(int(first_line), int(first_column)), |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
591 |
(int(last_line), int(last_column))) |
978 | 592 |
|
429
1a5471e81a93
Adding support for asking for saving while trying to close a modified project in any case
laurent
parents:
428
diff
changeset
|
593 |
## Function displaying an Error dialog in PLCOpenEditor. |
1a5471e81a93
Adding support for asking for saving while trying to close a modified project in any case
laurent
parents:
428
diff
changeset
|
594 |
# @return False if closing cancelled. |
1a5471e81a93
Adding support for asking for saving while trying to close a modified project in any case
laurent
parents:
428
diff
changeset
|
595 |
def CheckSaveBeforeClosing(self, title=_("Close Project")): |
717 | 596 |
if self.CTR.ProjectTestModified(): |
429
1a5471e81a93
Adding support for asking for saving while trying to close a modified project in any case
laurent
parents:
428
diff
changeset
|
597 |
dialog = wx.MessageDialog(self, |
1a5471e81a93
Adding support for asking for saving while trying to close a modified project in any case
laurent
parents:
428
diff
changeset
|
598 |
_("There are changes, do you want to save?"), |
1a5471e81a93
Adding support for asking for saving while trying to close a modified project in any case
laurent
parents:
428
diff
changeset
|
599 |
title, |
1a5471e81a93
Adding support for asking for saving while trying to close a modified project in any case
laurent
parents:
428
diff
changeset
|
600 |
wx.YES_NO|wx.CANCEL|wx.ICON_QUESTION) |
1a5471e81a93
Adding support for asking for saving while trying to close a modified project in any case
laurent
parents:
428
diff
changeset
|
601 |
answer = dialog.ShowModal() |
1a5471e81a93
Adding support for asking for saving while trying to close a modified project in any case
laurent
parents:
428
diff
changeset
|
602 |
dialog.Destroy() |
1a5471e81a93
Adding support for asking for saving while trying to close a modified project in any case
laurent
parents:
428
diff
changeset
|
603 |
if answer == wx.ID_YES: |
717 | 604 |
self.CTR.SaveProject() |
429
1a5471e81a93
Adding support for asking for saving while trying to close a modified project in any case
laurent
parents:
428
diff
changeset
|
605 |
elif answer == wx.ID_CANCEL: |
1a5471e81a93
Adding support for asking for saving while trying to close a modified project in any case
laurent
parents:
428
diff
changeset
|
606 |
return False |
797
61280a7d9ff2
Adding support for checking that tab content is saved before closing it
laurent
parents:
793
diff
changeset
|
607 |
|
61280a7d9ff2
Adding support for checking that tab content is saved before closing it
laurent
parents:
793
diff
changeset
|
608 |
for idx in xrange(self.TabsOpened.GetPageCount()): |
61280a7d9ff2
Adding support for checking that tab content is saved before closing it
laurent
parents:
793
diff
changeset
|
609 |
window = self.TabsOpened.GetPage(idx) |
61280a7d9ff2
Adding support for checking that tab content is saved before closing it
laurent
parents:
793
diff
changeset
|
610 |
if not window.CheckSaveBeforeClosing(): |
61280a7d9ff2
Adding support for checking that tab content is saved before closing it
laurent
parents:
793
diff
changeset
|
611 |
return False |
61280a7d9ff2
Adding support for checking that tab content is saved before closing it
laurent
parents:
793
diff
changeset
|
612 |
|
429
1a5471e81a93
Adding support for asking for saving while trying to close a modified project in any case
laurent
parents:
428
diff
changeset
|
613 |
return True |
1a5471e81a93
Adding support for asking for saving while trying to close a modified project in any case
laurent
parents:
428
diff
changeset
|
614 |
|
715
135566ab0807
Adding support for automatically saving and restoring state of frame or project perspective
laurent
parents:
714
diff
changeset
|
615 |
def GetTabInfos(self, tab): |
135566ab0807
Adding support for automatically saving and restoring state of frame or project perspective
laurent
parents:
714
diff
changeset
|
616 |
if (isinstance(tab, EditorPanel) and |
135566ab0807
Adding support for automatically saving and restoring state of frame or project perspective
laurent
parents:
714
diff
changeset
|
617 |
not isinstance(tab, (Viewer, |
135566ab0807
Adding support for automatically saving and restoring state of frame or project perspective
laurent
parents:
714
diff
changeset
|
618 |
TextViewer, |
135566ab0807
Adding support for automatically saving and restoring state of frame or project perspective
laurent
parents:
714
diff
changeset
|
619 |
ResourceEditor, |
135566ab0807
Adding support for automatically saving and restoring state of frame or project perspective
laurent
parents:
714
diff
changeset
|
620 |
ConfigurationEditor, |
135566ab0807
Adding support for automatically saving and restoring state of frame or project perspective
laurent
parents:
714
diff
changeset
|
621 |
DataTypeEditor))): |
782 | 622 |
return ("confnode", tab.Controler.CTNFullName(), tab.GetTagName()) |
716
180e4a7d945c
Adding search field for finding function or function block in library tree
laurent
parents:
715
diff
changeset
|
623 |
elif (isinstance(tab, TextViewer) and |
180e4a7d945c
Adding search field for finding function or function block in library tree
laurent
parents:
715
diff
changeset
|
624 |
(tab.Controler is None or isinstance(tab.Controler, MiniTextControler))): |
717 | 625 |
return ("confnode", None, tab.GetInstancePath()) |
715
135566ab0807
Adding support for automatically saving and restoring state of frame or project perspective
laurent
parents:
714
diff
changeset
|
626 |
else: |
135566ab0807
Adding support for automatically saving and restoring state of frame or project perspective
laurent
parents:
714
diff
changeset
|
627 |
return IDEFrame.GetTabInfos(self, tab) |
135566ab0807
Adding support for automatically saving and restoring state of frame or project perspective
laurent
parents:
714
diff
changeset
|
628 |
|
135566ab0807
Adding support for automatically saving and restoring state of frame or project perspective
laurent
parents:
714
diff
changeset
|
629 |
def LoadTab(self, notebook, page_infos): |
717 | 630 |
if page_infos[0] == "confnode": |
716
180e4a7d945c
Adding search field for finding function or function block in library tree
laurent
parents:
715
diff
changeset
|
631 |
if page_infos[1] is None: |
717 | 632 |
confnode = self.CTR |
716
180e4a7d945c
Adding search field for finding function or function block in library tree
laurent
parents:
715
diff
changeset
|
633 |
else: |
717 | 634 |
confnode = self.CTR.GetChildByName(page_infos[1]) |
635 |
return notebook.GetPageIndex(confnode._OpenView(*page_infos[2:])) |
|
715
135566ab0807
Adding support for automatically saving and restoring state of frame or project perspective
laurent
parents:
714
diff
changeset
|
636 |
else: |
135566ab0807
Adding support for automatically saving and restoring state of frame or project perspective
laurent
parents:
714
diff
changeset
|
637 |
return IDEFrame.LoadTab(self, notebook, page_infos) |
135566ab0807
Adding support for automatically saving and restoring state of frame or project perspective
laurent
parents:
714
diff
changeset
|
638 |
|
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
639 |
def OnCloseFrame(self, event): |
1090 | 640 |
for evt_type in [wx.EVT_SET_FOCUS, |
641 |
wx.EVT_KILL_FOCUS, |
|
642 |
wx.stc.EVT_STC_UPDATEUI]: |
|
643 |
self.LogConsole.Unbind(evt_type) |
|
717 | 644 |
if self.CTR is None or self.CheckSaveBeforeClosing(_("Close Application")): |
645 |
if self.CTR is not None: |
|
646 |
self.CTR.KillDebugThread() |
|
429
1a5471e81a93
Adding support for asking for saving while trying to close a modified project in any case
laurent
parents:
428
diff
changeset
|
647 |
self.KillLocalRuntime() |
598
6c919bc1551d
Adding support for saving frame size while closing and restore it at next launch
laurent
parents:
590
diff
changeset
|
648 |
|
715
135566ab0807
Adding support for automatically saving and restoring state of frame or project perspective
laurent
parents:
714
diff
changeset
|
649 |
self.SaveLastState() |
135566ab0807
Adding support for automatically saving and restoring state of frame or project perspective
laurent
parents:
714
diff
changeset
|
650 |
|
429
1a5471e81a93
Adding support for asking for saving while trying to close a modified project in any case
laurent
parents:
428
diff
changeset
|
651 |
event.Skip() |
1a5471e81a93
Adding support for asking for saving while trying to close a modified project in any case
laurent
parents:
428
diff
changeset
|
652 |
else: |
1a5471e81a93
Adding support for asking for saving while trying to close a modified project in any case
laurent
parents:
428
diff
changeset
|
653 |
event.Veto() |
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
654 |
|
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
655 |
def RefreshFileMenu(self): |
675
44b35c27e9ff
Adding support for quickly open recent projects in file menu
laurent
parents:
666
diff
changeset
|
656 |
self.RefreshRecentProjectsMenu() |
44b35c27e9ff
Adding support for quickly open recent projects in file menu
laurent
parents:
666
diff
changeset
|
657 |
|
706 | 658 |
MenuToolBar = self.Panes["MenuToolBar"] |
717 | 659 |
if self.CTR is not None: |
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
660 |
selected = self.TabsOpened.GetSelection() |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
661 |
if selected >= 0: |
784
a1d970365e41
Adding support for beremiz extensions to define custom file editors for project files
laurent
parents:
782
diff
changeset
|
662 |
window = self.TabsOpened.GetPage(selected) |
a1d970365e41
Adding support for beremiz extensions to define custom file editors for project files
laurent
parents:
782
diff
changeset
|
663 |
viewer_is_modified = window.IsModified() |
a1d970365e41
Adding support for beremiz extensions to define custom file editors for project files
laurent
parents:
782
diff
changeset
|
664 |
is_viewer = isinstance(window, Viewer) |
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
665 |
else: |
784
a1d970365e41
Adding support for beremiz extensions to define custom file editors for project files
laurent
parents:
782
diff
changeset
|
666 |
viewer_is_modified = is_viewer = False |
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
667 |
if self.TabsOpened.GetPageCount() > 0: |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
668 |
self.FileMenu.Enable(wx.ID_CLOSE, True) |
784
a1d970365e41
Adding support for beremiz extensions to define custom file editors for project files
laurent
parents:
782
diff
changeset
|
669 |
if is_viewer: |
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
670 |
self.FileMenu.Enable(wx.ID_PREVIEW, True) |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
671 |
self.FileMenu.Enable(wx.ID_PRINT, True) |
706 | 672 |
MenuToolBar.EnableTool(wx.ID_PRINT, True) |
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
673 |
else: |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
674 |
self.FileMenu.Enable(wx.ID_PREVIEW, False) |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
675 |
self.FileMenu.Enable(wx.ID_PRINT, False) |
706 | 676 |
MenuToolBar.EnableTool(wx.ID_PRINT, False) |
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
677 |
else: |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
678 |
self.FileMenu.Enable(wx.ID_CLOSE, False) |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
679 |
self.FileMenu.Enable(wx.ID_PREVIEW, False) |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
680 |
self.FileMenu.Enable(wx.ID_PRINT, False) |
706 | 681 |
MenuToolBar.EnableTool(wx.ID_PRINT, False) |
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
682 |
self.FileMenu.Enable(wx.ID_PAGE_SETUP, True) |
784
a1d970365e41
Adding support for beremiz extensions to define custom file editors for project files
laurent
parents:
782
diff
changeset
|
683 |
project_modified = self.CTR.ProjectTestModified() or viewer_is_modified |
706 | 684 |
self.FileMenu.Enable(wx.ID_SAVE, project_modified) |
685 |
MenuToolBar.EnableTool(wx.ID_SAVE, project_modified) |
|
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
686 |
self.FileMenu.Enable(wx.ID_SAVEAS, True) |
706 | 687 |
MenuToolBar.EnableTool(wx.ID_SAVEAS, True) |
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
688 |
self.FileMenu.Enable(wx.ID_CLOSE_ALL, True) |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
689 |
else: |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
690 |
self.FileMenu.Enable(wx.ID_CLOSE, False) |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
691 |
self.FileMenu.Enable(wx.ID_PAGE_SETUP, False) |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
692 |
self.FileMenu.Enable(wx.ID_PREVIEW, False) |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
693 |
self.FileMenu.Enable(wx.ID_PRINT, False) |
706 | 694 |
MenuToolBar.EnableTool(wx.ID_PRINT, False) |
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
695 |
self.FileMenu.Enable(wx.ID_SAVE, False) |
706 | 696 |
MenuToolBar.EnableTool(wx.ID_SAVE, False) |
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
697 |
self.FileMenu.Enable(wx.ID_SAVEAS, False) |
706 | 698 |
MenuToolBar.EnableTool(wx.ID_SAVEAS, False) |
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
699 |
self.FileMenu.Enable(wx.ID_CLOSE_ALL, False) |
675
44b35c27e9ff
Adding support for quickly open recent projects in file menu
laurent
parents:
666
diff
changeset
|
700 |
|
44b35c27e9ff
Adding support for quickly open recent projects in file menu
laurent
parents:
666
diff
changeset
|
701 |
def RefreshRecentProjectsMenu(self): |
793
1b24b970a816
Fixing bug while loading recent projects open path with old configurations
laurent
parents:
790
diff
changeset
|
702 |
try: |
1b24b970a816
Fixing bug while loading recent projects open path with old configurations
laurent
parents:
790
diff
changeset
|
703 |
recent_projects = map(DecodeFileSystemPath, |
1b24b970a816
Fixing bug while loading recent projects open path with old configurations
laurent
parents:
790
diff
changeset
|
704 |
self.GetConfigEntry("RecentProjects", [])) |
1b24b970a816
Fixing bug while loading recent projects open path with old configurations
laurent
parents:
790
diff
changeset
|
705 |
except: |
1b24b970a816
Fixing bug while loading recent projects open path with old configurations
laurent
parents:
790
diff
changeset
|
706 |
recent_projects = [] |
675
44b35c27e9ff
Adding support for quickly open recent projects in file menu
laurent
parents:
666
diff
changeset
|
707 |
self.FileMenu.Enable(ID_FILEMENURECENTPROJECTS, len(recent_projects) > 0) |
44b35c27e9ff
Adding support for quickly open recent projects in file menu
laurent
parents:
666
diff
changeset
|
708 |
for idx, projectpath in enumerate(recent_projects): |
730 | 709 |
text = u'%d: %s' % (idx + 1, projectpath) |
710 |
||
711 |
if idx < self.RecentProjectsMenu.GetMenuItemCount(): |
|
712 |
item = self.RecentProjectsMenu.FindItemByPosition(idx) |
|
713 |
id = item.GetId() |
|
714 |
item.SetItemLabel(text) |
|
715 |
self.Disconnect(id, id, wx.EVT_BUTTON._getEvtType()) |
|
716 |
else: |
|
717 |
id = wx.NewId() |
|
718 |
AppendMenu(self.RecentProjectsMenu, help='', id=id, |
|
719 |
kind=wx.ITEM_NORMAL, text=text) |
|
675
44b35c27e9ff
Adding support for quickly open recent projects in file menu
laurent
parents:
666
diff
changeset
|
720 |
self.Bind(wx.EVT_MENU, self.GenerateOpenRecentProjectFunction(projectpath), id=id) |
730 | 721 |
|
675
44b35c27e9ff
Adding support for quickly open recent projects in file menu
laurent
parents:
666
diff
changeset
|
722 |
def GenerateOpenRecentProjectFunction(self, projectpath): |
44b35c27e9ff
Adding support for quickly open recent projects in file menu
laurent
parents:
666
diff
changeset
|
723 |
def OpenRecentProject(event): |
717 | 724 |
if self.CTR is not None and not self.CheckSaveBeforeClosing(): |
675
44b35c27e9ff
Adding support for quickly open recent projects in file menu
laurent
parents:
666
diff
changeset
|
725 |
return |
44b35c27e9ff
Adding support for quickly open recent projects in file menu
laurent
parents:
666
diff
changeset
|
726 |
|
44b35c27e9ff
Adding support for quickly open recent projects in file menu
laurent
parents:
666
diff
changeset
|
727 |
self.OpenProject(projectpath) |
44b35c27e9ff
Adding support for quickly open recent projects in file menu
laurent
parents:
666
diff
changeset
|
728 |
return OpenRecentProject |
44b35c27e9ff
Adding support for quickly open recent projects in file menu
laurent
parents:
666
diff
changeset
|
729 |
|
44b35c27e9ff
Adding support for quickly open recent projects in file menu
laurent
parents:
666
diff
changeset
|
730 |
def GenerateMenuRecursive(self, items, menu): |
44b35c27e9ff
Adding support for quickly open recent projects in file menu
laurent
parents:
666
diff
changeset
|
731 |
for kind, infos in items: |
44b35c27e9ff
Adding support for quickly open recent projects in file menu
laurent
parents:
666
diff
changeset
|
732 |
if isinstance(kind, ListType): |
44b35c27e9ff
Adding support for quickly open recent projects in file menu
laurent
parents:
666
diff
changeset
|
733 |
text, id = infos |
44b35c27e9ff
Adding support for quickly open recent projects in file menu
laurent
parents:
666
diff
changeset
|
734 |
submenu = wx.Menu('') |
44b35c27e9ff
Adding support for quickly open recent projects in file menu
laurent
parents:
666
diff
changeset
|
735 |
self.GenerateMenuRecursive(kind, submenu) |
44b35c27e9ff
Adding support for quickly open recent projects in file menu
laurent
parents:
666
diff
changeset
|
736 |
menu.AppendMenu(id, text, submenu) |
44b35c27e9ff
Adding support for quickly open recent projects in file menu
laurent
parents:
666
diff
changeset
|
737 |
elif kind == wx.ITEM_SEPARATOR: |
44b35c27e9ff
Adding support for quickly open recent projects in file menu
laurent
parents:
666
diff
changeset
|
738 |
menu.AppendSeparator() |
44b35c27e9ff
Adding support for quickly open recent projects in file menu
laurent
parents:
666
diff
changeset
|
739 |
else: |
44b35c27e9ff
Adding support for quickly open recent projects in file menu
laurent
parents:
666
diff
changeset
|
740 |
text, id, help, callback = infos |
44b35c27e9ff
Adding support for quickly open recent projects in file menu
laurent
parents:
666
diff
changeset
|
741 |
AppendMenu(menu, help='', id=id, kind=kind, text=text) |
44b35c27e9ff
Adding support for quickly open recent projects in file menu
laurent
parents:
666
diff
changeset
|
742 |
if callback is not None: |
44b35c27e9ff
Adding support for quickly open recent projects in file menu
laurent
parents:
666
diff
changeset
|
743 |
self.Bind(wx.EVT_MENU, callback, id=id) |
44b35c27e9ff
Adding support for quickly open recent projects in file menu
laurent
parents:
666
diff
changeset
|
744 |
|
766
42c0062655a7
Fix bug in reorganization of toolbars after refreshing them
laurent
parents:
765
diff
changeset
|
745 |
def RefreshEditorToolBar(self): |
42c0062655a7
Fix bug in reorganization of toolbars after refreshing them
laurent
parents:
765
diff
changeset
|
746 |
IDEFrame.RefreshEditorToolBar(self) |
42c0062655a7
Fix bug in reorganization of toolbars after refreshing them
laurent
parents:
765
diff
changeset
|
747 |
self.AUIManager.GetPane("EditorToolBar").Position(2) |
42c0062655a7
Fix bug in reorganization of toolbars after refreshing them
laurent
parents:
765
diff
changeset
|
748 |
self.AUIManager.GetPane("StatusToolBar").Position(1) |
42c0062655a7
Fix bug in reorganization of toolbars after refreshing them
laurent
parents:
765
diff
changeset
|
749 |
self.AUIManager.Update() |
42c0062655a7
Fix bug in reorganization of toolbars after refreshing them
laurent
parents:
765
diff
changeset
|
750 |
|
738 | 751 |
def RefreshStatusToolBar(self): |
752 |
StatusToolBar = self.Panes["StatusToolBar"] |
|
753 |
StatusToolBar.ClearTools() |
|
754 |
||
755 |
if self.CTR is not None: |
|
756 |
||
757 |
for confnode_method in self.CTR.StatusMethods: |
|
758 |
if "method" in confnode_method and confnode_method.get("shown",True): |
|
759 |
id = wx.NewId() |
|
760 |
StatusToolBar.AddSimpleTool(id, |
|
781
cdc6393705ce
Adding support using plcopeneditor bitmap library for icon request
laurent
parents:
771
diff
changeset
|
761 |
GetBitmap(confnode_method.get("bitmap", "Unknown")), |
738 | 762 |
confnode_method["tooltip"]) |
763 |
self.Bind(wx.EVT_MENU, self.GetMenuCallBackFunction(confnode_method["method"]), id=id) |
|
764 |
||
765 |
StatusToolBar.Realize() |
|
766 |
self.AUIManager.GetPane("StatusToolBar").BestSize(StatusToolBar.GetBestSize()).Show() |
|
767 |
else: |
|
768 |
self.AUIManager.GetPane("StatusToolBar").Hide() |
|
766
42c0062655a7
Fix bug in reorganization of toolbars after refreshing them
laurent
parents:
765
diff
changeset
|
769 |
self.AUIManager.GetPane("EditorToolBar").Position(2) |
765
ef221ba41dec
Add support for reorganizing toolbars when their size changed
laurent
parents:
762
diff
changeset
|
770 |
self.AUIManager.GetPane("StatusToolBar").Position(1) |
738 | 771 |
self.AUIManager.Update() |
772 |
||
771 | 773 |
def RefreshEditMenu(self): |
774 |
IDEFrame.RefreshEditMenu(self) |
|
1015
50bb7cc12a84
Fixed LogConsole: set read only, enabled copy selected text with CTRL+C and primary selection
Laurent Bessard
parents:
1007
diff
changeset
|
775 |
if self.FindFocus() == self.LogConsole: |
50bb7cc12a84
Fixed LogConsole: set read only, enabled copy selected text with CTRL+C and primary selection
Laurent Bessard
parents:
1007
diff
changeset
|
776 |
self.EditMenu.Enable(wx.ID_COPY, True) |
50bb7cc12a84
Fixed LogConsole: set read only, enabled copy selected text with CTRL+C and primary selection
Laurent Bessard
parents:
1007
diff
changeset
|
777 |
self.Panes["MenuToolBar"].EnableTool(wx.ID_COPY, True) |
771 | 778 |
|
717 | 779 |
if self.CTR is not None: |
675
44b35c27e9ff
Adding support for quickly open recent projects in file menu
laurent
parents:
666
diff
changeset
|
780 |
selected = self.TabsOpened.GetSelection() |
44b35c27e9ff
Adding support for quickly open recent projects in file menu
laurent
parents:
666
diff
changeset
|
781 |
if selected >= 0: |
44b35c27e9ff
Adding support for quickly open recent projects in file menu
laurent
parents:
666
diff
changeset
|
782 |
panel = self.TabsOpened.GetPage(selected) |
44b35c27e9ff
Adding support for quickly open recent projects in file menu
laurent
parents:
666
diff
changeset
|
783 |
else: |
44b35c27e9ff
Adding support for quickly open recent projects in file menu
laurent
parents:
666
diff
changeset
|
784 |
panel = None |
44b35c27e9ff
Adding support for quickly open recent projects in file menu
laurent
parents:
666
diff
changeset
|
785 |
if panel != self.LastPanelSelected: |
771 | 786 |
for i in xrange(self.EditMenuSize, self.EditMenu.GetMenuItemCount()): |
787 |
item = self.EditMenu.FindItemByPosition(self.EditMenuSize) |
|
781
cdc6393705ce
Adding support using plcopeneditor bitmap library for icon request
laurent
parents:
771
diff
changeset
|
788 |
if item is not None: |
cdc6393705ce
Adding support using plcopeneditor bitmap library for icon request
laurent
parents:
771
diff
changeset
|
789 |
if item.IsSeparator(): |
cdc6393705ce
Adding support using plcopeneditor bitmap library for icon request
laurent
parents:
771
diff
changeset
|
790 |
self.EditMenu.RemoveItem(item) |
cdc6393705ce
Adding support using plcopeneditor bitmap library for icon request
laurent
parents:
771
diff
changeset
|
791 |
else: |
cdc6393705ce
Adding support using plcopeneditor bitmap library for icon request
laurent
parents:
771
diff
changeset
|
792 |
self.EditMenu.Delete(item.GetId()) |
675
44b35c27e9ff
Adding support for quickly open recent projects in file menu
laurent
parents:
666
diff
changeset
|
793 |
self.LastPanelSelected = panel |
44b35c27e9ff
Adding support for quickly open recent projects in file menu
laurent
parents:
666
diff
changeset
|
794 |
if panel is not None: |
717 | 795 |
items = panel.GetConfNodeMenuItems() |
675
44b35c27e9ff
Adding support for quickly open recent projects in file menu
laurent
parents:
666
diff
changeset
|
796 |
else: |
44b35c27e9ff
Adding support for quickly open recent projects in file menu
laurent
parents:
666
diff
changeset
|
797 |
items = [] |
771 | 798 |
if len(items) > 0: |
799 |
self.EditMenu.AppendSeparator() |
|
800 |
self.GenerateMenuRecursive(items, self.EditMenu) |
|
675
44b35c27e9ff
Adding support for quickly open recent projects in file menu
laurent
parents:
666
diff
changeset
|
801 |
if panel is not None: |
771 | 802 |
panel.RefreshConfNodeMenu(self.EditMenu) |
803 |
else: |
|
804 |
for i in xrange(self.EditMenuSize, self.EditMenu.GetMenuItemCount()): |
|
805 |
item = self.EditMenu.FindItemByPosition(i) |
|
781
cdc6393705ce
Adding support using plcopeneditor bitmap library for icon request
laurent
parents:
771
diff
changeset
|
806 |
if item is not None: |
cdc6393705ce
Adding support using plcopeneditor bitmap library for icon request
laurent
parents:
771
diff
changeset
|
807 |
if item.IsSeparator(): |
cdc6393705ce
Adding support using plcopeneditor bitmap library for icon request
laurent
parents:
771
diff
changeset
|
808 |
self.EditMenu.RemoveItem(item) |
cdc6393705ce
Adding support using plcopeneditor bitmap library for icon request
laurent
parents:
771
diff
changeset
|
809 |
else: |
cdc6393705ce
Adding support using plcopeneditor bitmap library for icon request
laurent
parents:
771
diff
changeset
|
810 |
self.EditMenu.Delete(item.GetId()) |
771 | 811 |
self.LastPanelSelected = None |
675
44b35c27e9ff
Adding support for quickly open recent projects in file menu
laurent
parents:
666
diff
changeset
|
812 |
self.MenuBar.UpdateMenus() |
44b35c27e9ff
Adding support for quickly open recent projects in file menu
laurent
parents:
666
diff
changeset
|
813 |
|
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
814 |
def RefreshAll(self): |
755 | 815 |
self.RefreshStatusToolBar() |
717 | 816 |
|
738 | 817 |
def GetMenuCallBackFunction(self, method): |
818 |
""" Generate the callbackfunc for a given CTR method""" |
|
819 |
def OnMenu(event): |
|
820 |
# Disable button to prevent re-entrant call |
|
821 |
event.GetEventObject().Disable() |
|
822 |
# Call |
|
823 |
getattr(self.CTR, method)() |
|
824 |
# Re-enable button |
|
825 |
event.GetEventObject().Enable() |
|
826 |
return OnMenu |
|
827 |
||
828 |
def GetConfigEntry(self, entry_name, default): |
|
829 |
return cPickle.loads(str(self.Config.Read(entry_name, cPickle.dumps(default)))) |
|
830 |
||
1000 | 831 |
def ResetConnectionStatusBar(self): |
832 |
for field in xrange(self.ConnectionStatusBar.GetFieldsCount()): |
|
833 |
self.ConnectionStatusBar.SetStatusText('', field) |
|
834 |
||
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
835 |
def ResetView(self): |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
836 |
IDEFrame.ResetView(self) |
717 | 837 |
self.ConfNodeInfos = {} |
838 |
if self.CTR is not None: |
|
839 |
self.CTR.CloseProject() |
|
840 |
self.CTR = None |
|
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
841 |
self.Log.flush() |
490 | 842 |
if self.EnableDebug: |
843 |
self.DebugVariablePanel.SetDataProducer(None) |
|
1000 | 844 |
self.ResetConnectionStatusBar() |
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
845 |
|
679
d72f3a42f440
Fix recent projects list not updated when creating new project
laurent
parents:
678
diff
changeset
|
846 |
def RefreshConfigRecentProjects(self, projectpath): |
793
1b24b970a816
Fixing bug while loading recent projects open path with old configurations
laurent
parents:
790
diff
changeset
|
847 |
try: |
1b24b970a816
Fixing bug while loading recent projects open path with old configurations
laurent
parents:
790
diff
changeset
|
848 |
recent_projects = map(DecodeFileSystemPath, |
1b24b970a816
Fixing bug while loading recent projects open path with old configurations
laurent
parents:
790
diff
changeset
|
849 |
self.GetConfigEntry("RecentProjects", [])) |
1b24b970a816
Fixing bug while loading recent projects open path with old configurations
laurent
parents:
790
diff
changeset
|
850 |
except: |
1b24b970a816
Fixing bug while loading recent projects open path with old configurations
laurent
parents:
790
diff
changeset
|
851 |
recent_projects = [] |
679
d72f3a42f440
Fix recent projects list not updated when creating new project
laurent
parents:
678
diff
changeset
|
852 |
if projectpath in recent_projects: |
d72f3a42f440
Fix recent projects list not updated when creating new project
laurent
parents:
678
diff
changeset
|
853 |
recent_projects.remove(projectpath) |
d72f3a42f440
Fix recent projects list not updated when creating new project
laurent
parents:
678
diff
changeset
|
854 |
recent_projects.insert(0, projectpath) |
788 | 855 |
self.Config.Write("RecentProjects", cPickle.dumps( |
856 |
map(EncodeFileSystemPath, recent_projects[:MAX_RECENT_PROJECTS]))) |
|
679
d72f3a42f440
Fix recent projects list not updated when creating new project
laurent
parents:
678
diff
changeset
|
857 |
self.Config.Flush() |
d72f3a42f440
Fix recent projects list not updated when creating new project
laurent
parents:
678
diff
changeset
|
858 |
|
743 | 859 |
def ResetPerspective(self): |
860 |
IDEFrame.ResetPerspective(self) |
|
861 |
self.RefreshStatusToolBar() |
|
862 |
||
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
863 |
def OnNewProjectMenu(self, event): |
717 | 864 |
if self.CTR is not None and not self.CheckSaveBeforeClosing(): |
429
1a5471e81a93
Adding support for asking for saving while trying to close a modified project in any case
laurent
parents:
428
diff
changeset
|
865 |
return |
1a5471e81a93
Adding support for asking for saving while trying to close a modified project in any case
laurent
parents:
428
diff
changeset
|
866 |
|
790
52d3a084d2b2
Adding secure extraction of last edited project path to avoid crash if path is not well formatted
laurent
parents:
788
diff
changeset
|
867 |
try: |
52d3a084d2b2
Adding secure extraction of last edited project path to avoid crash if path is not well formatted
laurent
parents:
788
diff
changeset
|
868 |
defaultpath = DecodeFileSystemPath(self.Config.Read("lastopenedfolder")) |
52d3a084d2b2
Adding secure extraction of last edited project path to avoid crash if path is not well formatted
laurent
parents:
788
diff
changeset
|
869 |
except: |
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
870 |
defaultpath = os.path.expanduser("~") |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
871 |
|
833
3f997fb22928
Fix confnode new name format that generates an error with frame class name in wxGlade extension
laurent
parents:
815
diff
changeset
|
872 |
dialog = wx.DirDialog(self , _("Choose a project"), defaultpath) |
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
873 |
if dialog.ShowModal() == wx.ID_OK: |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
874 |
projectpath = dialog.GetPath() |
788 | 875 |
self.Config.Write("lastopenedfolder", |
876 |
EncodeFileSystemPath(os.path.dirname(projectpath))) |
|
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
877 |
self.Config.Flush() |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
878 |
self.ResetView() |
725 | 879 |
ctr = ProjectController(self, self.Log) |
717 | 880 |
result = ctr.NewProject(projectpath) |
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
881 |
if not result: |
717 | 882 |
self.CTR = ctr |
883 |
self.Controler = self.CTR |
|
781
cdc6393705ce
Adding support using plcopeneditor bitmap library for icon request
laurent
parents:
771
diff
changeset
|
884 |
self.LibraryPanel.SetController(self.Controler) |
738 | 885 |
self.ProjectTree.Enable(True) |
730 | 886 |
self.PouInstanceVariablesPanel.SetController(self.Controler) |
679
d72f3a42f440
Fix recent projects list not updated when creating new project
laurent
parents:
678
diff
changeset
|
887 |
self.RefreshConfigRecentProjects(projectpath) |
490 | 888 |
if self.EnableDebug: |
717 | 889 |
self.DebugVariablePanel.SetDataProducer(self.CTR) |
730 | 890 |
self._Refresh(PROJECTTREE, POUINSTANCEVARIABLESPANEL, LIBRARYTREE) |
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
891 |
else: |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
892 |
self.ResetView() |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
893 |
self.ShowErrorMessage(result) |
755 | 894 |
self.RefreshAll() |
706 | 895 |
self._Refresh(TITLE, EDITORTOOLBAR, FILEMENU, EDITMENU) |
679
d72f3a42f440
Fix recent projects list not updated when creating new project
laurent
parents:
678
diff
changeset
|
896 |
dialog.Destroy() |
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
897 |
|
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
898 |
def OnOpenProjectMenu(self, event): |
717 | 899 |
if self.CTR is not None and not self.CheckSaveBeforeClosing(): |
429
1a5471e81a93
Adding support for asking for saving while trying to close a modified project in any case
laurent
parents:
428
diff
changeset
|
900 |
return |
1a5471e81a93
Adding support for asking for saving while trying to close a modified project in any case
laurent
parents:
428
diff
changeset
|
901 |
|
790
52d3a084d2b2
Adding secure extraction of last edited project path to avoid crash if path is not well formatted
laurent
parents:
788
diff
changeset
|
902 |
try: |
52d3a084d2b2
Adding secure extraction of last edited project path to avoid crash if path is not well formatted
laurent
parents:
788
diff
changeset
|
903 |
defaultpath = DecodeFileSystemPath(self.Config.Read("lastopenedfolder")) |
52d3a084d2b2
Adding secure extraction of last edited project path to avoid crash if path is not well formatted
laurent
parents:
788
diff
changeset
|
904 |
except: |
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
905 |
defaultpath = os.path.expanduser("~") |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
906 |
|
833
3f997fb22928
Fix confnode new name format that generates an error with frame class name in wxGlade extension
laurent
parents:
815
diff
changeset
|
907 |
dialog = wx.DirDialog(self , _("Choose a project"), defaultpath, style=wx.DEFAULT_DIALOG_STYLE| |
3f997fb22928
Fix confnode new name format that generates an error with frame class name in wxGlade extension
laurent
parents:
815
diff
changeset
|
908 |
wx.RESIZE_BORDER) |
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
909 |
if dialog.ShowModal() == wx.ID_OK: |
675
44b35c27e9ff
Adding support for quickly open recent projects in file menu
laurent
parents:
666
diff
changeset
|
910 |
self.OpenProject(dialog.GetPath()) |
44b35c27e9ff
Adding support for quickly open recent projects in file menu
laurent
parents:
666
diff
changeset
|
911 |
dialog.Destroy() |
44b35c27e9ff
Adding support for quickly open recent projects in file menu
laurent
parents:
666
diff
changeset
|
912 |
|
44b35c27e9ff
Adding support for quickly open recent projects in file menu
laurent
parents:
666
diff
changeset
|
913 |
def OpenProject(self, projectpath): |
44b35c27e9ff
Adding support for quickly open recent projects in file menu
laurent
parents:
666
diff
changeset
|
914 |
if os.path.isdir(projectpath): |
788 | 915 |
self.Config.Write("lastopenedfolder", |
916 |
EncodeFileSystemPath(os.path.dirname(projectpath))) |
|
675
44b35c27e9ff
Adding support for quickly open recent projects in file menu
laurent
parents:
666
diff
changeset
|
917 |
self.Config.Flush() |
44b35c27e9ff
Adding support for quickly open recent projects in file menu
laurent
parents:
666
diff
changeset
|
918 |
self.ResetView() |
725 | 919 |
self.CTR = ProjectController(self, self.Log) |
717 | 920 |
self.Controler = self.CTR |
921 |
result = self.CTR.LoadProject(projectpath) |
|
675
44b35c27e9ff
Adding support for quickly open recent projects in file menu
laurent
parents:
666
diff
changeset
|
922 |
if not result: |
781
cdc6393705ce
Adding support using plcopeneditor bitmap library for icon request
laurent
parents:
771
diff
changeset
|
923 |
self.LibraryPanel.SetController(self.Controler) |
738 | 924 |
self.ProjectTree.Enable(True) |
730 | 925 |
self.PouInstanceVariablesPanel.SetController(self.Controler) |
679
d72f3a42f440
Fix recent projects list not updated when creating new project
laurent
parents:
678
diff
changeset
|
926 |
self.RefreshConfigRecentProjects(projectpath) |
675
44b35c27e9ff
Adding support for quickly open recent projects in file menu
laurent
parents:
666
diff
changeset
|
927 |
if self.EnableDebug: |
717 | 928 |
self.DebugVariablePanel.SetDataProducer(self.CTR) |
730 | 929 |
self._Refresh(PROJECTTREE, POUINSTANCEVARIABLESPANEL, LIBRARYTREE) |
675
44b35c27e9ff
Adding support for quickly open recent projects in file menu
laurent
parents:
666
diff
changeset
|
930 |
else: |
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
931 |
self.ResetView() |
675
44b35c27e9ff
Adding support for quickly open recent projects in file menu
laurent
parents:
666
diff
changeset
|
932 |
self.ShowErrorMessage(result) |
755 | 933 |
self.RefreshAll() |
675
44b35c27e9ff
Adding support for quickly open recent projects in file menu
laurent
parents:
666
diff
changeset
|
934 |
else: |
44b35c27e9ff
Adding support for quickly open recent projects in file menu
laurent
parents:
666
diff
changeset
|
935 |
self.ShowErrorMessage(_("\"%s\" folder is not a valid Beremiz project\n") % projectpath) |
706 | 936 |
self._Refresh(TITLE, EDITORTOOLBAR, FILEMENU, EDITMENU) |
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
937 |
|
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
938 |
def OnCloseProjectMenu(self, event): |
717 | 939 |
if self.CTR is not None and not self.CheckSaveBeforeClosing(): |
429
1a5471e81a93
Adding support for asking for saving while trying to close a modified project in any case
laurent
parents:
428
diff
changeset
|
940 |
return |
1a5471e81a93
Adding support for asking for saving while trying to close a modified project in any case
laurent
parents:
428
diff
changeset
|
941 |
|
1a5471e81a93
Adding support for asking for saving while trying to close a modified project in any case
laurent
parents:
428
diff
changeset
|
942 |
self.ResetView() |
706 | 943 |
self._Refresh(TITLE, EDITORTOOLBAR, FILEMENU, EDITMENU) |
755 | 944 |
self.RefreshAll() |
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
945 |
|
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
946 |
def OnSaveProjectMenu(self, event): |
784
a1d970365e41
Adding support for beremiz extensions to define custom file editors for project files
laurent
parents:
782
diff
changeset
|
947 |
selected = self.TabsOpened.GetSelection() |
a1d970365e41
Adding support for beremiz extensions to define custom file editors for project files
laurent
parents:
782
diff
changeset
|
948 |
if selected != -1: |
a1d970365e41
Adding support for beremiz extensions to define custom file editors for project files
laurent
parents:
782
diff
changeset
|
949 |
window = self.TabsOpened.GetPage(selected) |
a1d970365e41
Adding support for beremiz extensions to define custom file editors for project files
laurent
parents:
782
diff
changeset
|
950 |
window.Save() |
717 | 951 |
if self.CTR is not None: |
952 |
self.CTR.SaveProject() |
|
781
cdc6393705ce
Adding support using plcopeneditor bitmap library for icon request
laurent
parents:
771
diff
changeset
|
953 |
self.RefreshAll() |
636
35c59bfc54f2
Fixing refresh of notebook tab titles after project save
laurent
parents:
631
diff
changeset
|
954 |
self._Refresh(TITLE, FILEMENU, EDITMENU, PAGETITLES) |
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
955 |
|
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
956 |
def OnSaveProjectAsMenu(self, event): |
784
a1d970365e41
Adding support for beremiz extensions to define custom file editors for project files
laurent
parents:
782
diff
changeset
|
957 |
selected = self.TabsOpened.GetSelection() |
a1d970365e41
Adding support for beremiz extensions to define custom file editors for project files
laurent
parents:
782
diff
changeset
|
958 |
if selected != -1: |
a1d970365e41
Adding support for beremiz extensions to define custom file editors for project files
laurent
parents:
782
diff
changeset
|
959 |
window = self.TabsOpened.GetPage(selected) |
a1d970365e41
Adding support for beremiz extensions to define custom file editors for project files
laurent
parents:
782
diff
changeset
|
960 |
window.SaveAs() |
717 | 961 |
if self.CTR is not None: |
962 |
self.CTR.SaveProjectAs() |
|
781
cdc6393705ce
Adding support using plcopeneditor bitmap library for icon request
laurent
parents:
771
diff
changeset
|
963 |
self.RefreshAll() |
636
35c59bfc54f2
Fixing refresh of notebook tab titles after project save
laurent
parents:
631
diff
changeset
|
964 |
self._Refresh(TITLE, FILEMENU, EDITMENU, PAGETITLES) |
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
965 |
|
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
966 |
def OnQuitMenu(self, event): |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
967 |
self.Close() |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
968 |
|
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
969 |
def OnAboutMenu(self, event): |
814 | 970 |
OpenHtmlFrame(self,_("About Beremiz"), Bpath("doc", "about.html"), wx.Size(550, 500)) |
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
971 |
|
738 | 972 |
def OnProjectTreeItemBeginEdit(self, event): |
973 |
selected = event.GetItem() |
|
747 | 974 |
if self.ProjectTree.GetPyData(selected)["type"] == ITEM_CONFNODE: |
738 | 975 |
event.Veto() |
976 |
else: |
|
977 |
IDEFrame.OnProjectTreeItemBeginEdit(self, event) |
|
978 |
||
979 |
def OnProjectTreeRightUp(self, event): |
|
1240
ceaf9b4c0f86
Fixed bug when drag'n dropping POU from project tree, POU editor is selected if open
Laurent Bessard
parents:
1211
diff
changeset
|
980 |
item = event.GetItem() |
738 | 981 |
item_infos = self.ProjectTree.GetPyData(item) |
982 |
||
983 |
if item_infos["type"] == ITEM_CONFNODE: |
|
984 |
confnode_menu = wx.Menu(title='') |
|
985 |
||
986 |
confnode = item_infos["confnode"] |
|
967
8a339cd61cb4
Added support for extension custom contextual add menu
Laurent Bessard
parents:
958
diff
changeset
|
987 |
if confnode is not None: |
8a339cd61cb4
Added support for extension custom contextual add menu
Laurent Bessard
parents:
958
diff
changeset
|
988 |
menu_items = confnode.GetContextualMenuItems() |
8a339cd61cb4
Added support for extension custom contextual add menu
Laurent Bessard
parents:
958
diff
changeset
|
989 |
if menu_items is not None: |
8a339cd61cb4
Added support for extension custom contextual add menu
Laurent Bessard
parents:
958
diff
changeset
|
990 |
for text, help, callback in menu_items: |
8a339cd61cb4
Added support for extension custom contextual add menu
Laurent Bessard
parents:
958
diff
changeset
|
991 |
new_id = wx.NewId() |
8a339cd61cb4
Added support for extension custom contextual add menu
Laurent Bessard
parents:
958
diff
changeset
|
992 |
confnode_menu.Append(help=help, id=new_id, kind=wx.ITEM_NORMAL, text=text) |
8a339cd61cb4
Added support for extension custom contextual add menu
Laurent Bessard
parents:
958
diff
changeset
|
993 |
self.Bind(wx.EVT_MENU, callback, id=new_id) |
8a339cd61cb4
Added support for extension custom contextual add menu
Laurent Bessard
parents:
958
diff
changeset
|
994 |
else: |
8a339cd61cb4
Added support for extension custom contextual add menu
Laurent Bessard
parents:
958
diff
changeset
|
995 |
for name, XSDClass, help in confnode.CTNChildrenTypes: |
8a339cd61cb4
Added support for extension custom contextual add menu
Laurent Bessard
parents:
958
diff
changeset
|
996 |
new_id = wx.NewId() |
8a339cd61cb4
Added support for extension custom contextual add menu
Laurent Bessard
parents:
958
diff
changeset
|
997 |
confnode_menu.Append(help=help, id=new_id, kind=wx.ITEM_NORMAL, text=_("Add") + " " + name) |
8a339cd61cb4
Added support for extension custom contextual add menu
Laurent Bessard
parents:
958
diff
changeset
|
998 |
self.Bind(wx.EVT_MENU, self.GetAddConfNodeFunction(name, confnode), id=new_id) |
738 | 999 |
|
1000 |
new_id = wx.NewId() |
|
1001 |
AppendMenu(confnode_menu, help='', id=new_id, kind=wx.ITEM_NORMAL, text=_("Delete")) |
|
755 | 1002 |
self.Bind(wx.EVT_MENU, self.GetDeleteMenuFunction(confnode), id=new_id) |
738 | 1003 |
|
1004 |
self.PopupMenu(confnode_menu) |
|
1005 |
confnode_menu.Destroy() |
|
1006 |
||
1007 |
event.Skip() |
|
1039
7bd88ac7b871
Fixed bug when right click on ProjectTree project item
Laurent Bessard
parents:
1038
diff
changeset
|
1008 |
elif item_infos["type"] != ITEM_PROJECT: |
1024
626de4ff4bdc
Fixed resource editing, removing definition of more than one resource and deletion of last resource defined
Laurent Bessard
parents:
1019
diff
changeset
|
1009 |
parent = self.ProjectTree.GetItemParent(item) |
626de4ff4bdc
Fixed resource editing, removing definition of more than one resource and deletion of last resource defined
Laurent Bessard
parents:
1019
diff
changeset
|
1010 |
parent_name = self.ProjectTree.GetItemText(parent) |
626de4ff4bdc
Fixed resource editing, removing definition of more than one resource and deletion of last resource defined
Laurent Bessard
parents:
1019
diff
changeset
|
1011 |
if item_infos["type"] != ITEM_RESOURCE or parent_name == _("Resources"): |
626de4ff4bdc
Fixed resource editing, removing definition of more than one resource and deletion of last resource defined
Laurent Bessard
parents:
1019
diff
changeset
|
1012 |
IDEFrame.OnProjectTreeRightUp(self, event) |
1038
1923a69482f8
Fixed bug when right click on ProjectTree project item
Laurent Bessard
parents:
1025
diff
changeset
|
1013 |
else: |
1923a69482f8
Fixed bug when right click on ProjectTree project item
Laurent Bessard
parents:
1025
diff
changeset
|
1014 |
IDEFrame.OnProjectTreeRightUp(self, event) |
738 | 1015 |
|
1016 |
def OnProjectTreeItemActivated(self, event): |
|
1017 |
selected = event.GetItem() |
|
1018 |
name = self.ProjectTree.GetItemText(selected) |
|
1019 |
item_infos = self.ProjectTree.GetPyData(selected) |
|
1020 |
if item_infos["type"] == ITEM_CONFNODE: |
|
1021 |
item_infos["confnode"]._OpenView() |
|
1022 |
event.Skip() |
|
1023 |
elif item_infos["type"] == ITEM_PROJECT: |
|
1024 |
self.CTR._OpenView() |
|
1025 |
else: |
|
1026 |
IDEFrame.OnProjectTreeItemActivated(self, event) |
|
1027 |
||
782 | 1028 |
def ProjectTreeItemSelect(self, select_item): |
1272
0086cbee609b
Fixed bug when open editor while Build is working
Laurent Bessard
parents:
1269
diff
changeset
|
1029 |
if select_item is not None and select_item.IsOk(): |
0086cbee609b
Fixed bug when open editor while Build is working
Laurent Bessard
parents:
1269
diff
changeset
|
1030 |
name = self.ProjectTree.GetItemText(select_item) |
0086cbee609b
Fixed bug when open editor while Build is working
Laurent Bessard
parents:
1269
diff
changeset
|
1031 |
item_infos = self.ProjectTree.GetPyData(select_item) |
0086cbee609b
Fixed bug when open editor while Build is working
Laurent Bessard
parents:
1269
diff
changeset
|
1032 |
if item_infos["type"] == ITEM_CONFNODE: |
0086cbee609b
Fixed bug when open editor while Build is working
Laurent Bessard
parents:
1269
diff
changeset
|
1033 |
item_infos["confnode"]._OpenView(onlyopened=True) |
0086cbee609b
Fixed bug when open editor while Build is working
Laurent Bessard
parents:
1269
diff
changeset
|
1034 |
elif item_infos["type"] == ITEM_PROJECT: |
0086cbee609b
Fixed bug when open editor while Build is working
Laurent Bessard
parents:
1269
diff
changeset
|
1035 |
self.CTR._OpenView(onlyopened=True) |
0086cbee609b
Fixed bug when open editor while Build is working
Laurent Bessard
parents:
1269
diff
changeset
|
1036 |
else: |
0086cbee609b
Fixed bug when open editor while Build is working
Laurent Bessard
parents:
1269
diff
changeset
|
1037 |
IDEFrame.ProjectTreeItemSelect(self, select_item) |
782 | 1038 |
|
738 | 1039 |
def SelectProjectTreeItem(self, tagname): |
1040 |
if self.ProjectTree is not None: |
|
1041 |
root = self.ProjectTree.GetRootItem() |
|
1042 |
if root.IsOk(): |
|
1043 |
words = tagname.split("::") |
|
1044 |
if len(words) == 1: |
|
1045 |
if tagname == "Project": |
|
1046 |
self.SelectedItem = root |
|
1047 |
self.ProjectTree.SelectItem(root) |
|
1269 | 1048 |
self.ResetSelectedItem() |
738 | 1049 |
else: |
1050 |
return self.RecursiveProjectTreeItemSelection(root, |
|
1051 |
[(word, ITEM_CONFNODE) for word in tagname.split(".")]) |
|
1052 |
elif words[0] == "R": |
|
1053 |
return self.RecursiveProjectTreeItemSelection(root, [(words[2], ITEM_RESOURCE)]) |
|
1274 | 1054 |
elif not os.path.exists(words[0]): |
738 | 1055 |
IDEFrame.SelectProjectTreeItem(self, tagname) |
1056 |
||
760
d38560559afb
Replacing dialog asking for a name when adding confnode to project by automatically generated name
laurent
parents:
755
diff
changeset
|
1057 |
def GetAddConfNodeFunction(self, name, confnode=None): |
d38560559afb
Replacing dialog asking for a name when adding confnode to project by automatically generated name
laurent
parents:
755
diff
changeset
|
1058 |
def AddConfNodeMenuFunction(event): |
d38560559afb
Replacing dialog asking for a name when adding confnode to project by automatically generated name
laurent
parents:
755
diff
changeset
|
1059 |
wx.CallAfter(self.AddConfNode, name, confnode) |
d38560559afb
Replacing dialog asking for a name when adding confnode to project by automatically generated name
laurent
parents:
755
diff
changeset
|
1060 |
return AddConfNodeMenuFunction |
d38560559afb
Replacing dialog asking for a name when adding confnode to project by automatically generated name
laurent
parents:
755
diff
changeset
|
1061 |
|
755 | 1062 |
def GetDeleteMenuFunction(self, confnode): |
1063 |
def DeleteMenuFunction(event): |
|
717 | 1064 |
wx.CallAfter(self.DeleteConfNode, confnode) |
755 | 1065 |
return DeleteMenuFunction |
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1066 |
|
760
d38560559afb
Replacing dialog asking for a name when adding confnode to project by automatically generated name
laurent
parents:
755
diff
changeset
|
1067 |
def AddResourceMenu(self, event): |
d38560559afb
Replacing dialog asking for a name when adding confnode to project by automatically generated name
laurent
parents:
755
diff
changeset
|
1068 |
config_names = self.CTR.GetProjectConfigNames() |
d38560559afb
Replacing dialog asking for a name when adding confnode to project by automatically generated name
laurent
parents:
755
diff
changeset
|
1069 |
if len(config_names) > 0: |
d38560559afb
Replacing dialog asking for a name when adding confnode to project by automatically generated name
laurent
parents:
755
diff
changeset
|
1070 |
tagname = self.Controler.ProjectAddConfigurationResource(config_names[0]) |
d38560559afb
Replacing dialog asking for a name when adding confnode to project by automatically generated name
laurent
parents:
755
diff
changeset
|
1071 |
if tagname is not None: |
d38560559afb
Replacing dialog asking for a name when adding confnode to project by automatically generated name
laurent
parents:
755
diff
changeset
|
1072 |
self._Refresh(TITLE, FILEMENU, EDITMENU, PROJECTTREE, POUINSTANCEVARIABLESPANEL) |
d38560559afb
Replacing dialog asking for a name when adding confnode to project by automatically generated name
laurent
parents:
755
diff
changeset
|
1073 |
self.EditProjectElement(ITEM_RESOURCE, tagname) |
d38560559afb
Replacing dialog asking for a name when adding confnode to project by automatically generated name
laurent
parents:
755
diff
changeset
|
1074 |
|
738 | 1075 |
def AddConfNode(self, ConfNodeType, confnode=None): |
717 | 1076 |
if self.CTR.CheckProjectPathPerm(): |
833
3f997fb22928
Fix confnode new name format that generates an error with frame class name in wxGlade extension
laurent
parents:
815
diff
changeset
|
1077 |
ConfNodeName = "%s_0" % ConfNodeType |
760
d38560559afb
Replacing dialog asking for a name when adding confnode to project by automatically generated name
laurent
parents:
755
diff
changeset
|
1078 |
if confnode is not None: |
d38560559afb
Replacing dialog asking for a name when adding confnode to project by automatically generated name
laurent
parents:
755
diff
changeset
|
1079 |
confnode.CTNAddChild(ConfNodeName, ConfNodeType) |
d38560559afb
Replacing dialog asking for a name when adding confnode to project by automatically generated name
laurent
parents:
755
diff
changeset
|
1080 |
else: |
d38560559afb
Replacing dialog asking for a name when adding confnode to project by automatically generated name
laurent
parents:
755
diff
changeset
|
1081 |
self.CTR.CTNAddChild(ConfNodeName, ConfNodeType) |
d38560559afb
Replacing dialog asking for a name when adding confnode to project by automatically generated name
laurent
parents:
755
diff
changeset
|
1082 |
self._Refresh(TITLE, FILEMENU, PROJECTTREE) |
d38560559afb
Replacing dialog asking for a name when adding confnode to project by automatically generated name
laurent
parents:
755
diff
changeset
|
1083 |
|
717 | 1084 |
def DeleteConfNode(self, confnode): |
1085 |
if self.CTR.CheckProjectPathPerm(): |
|
801
435e49e80832
Update list of messages to be translated for internationalization and french translations
laurent
parents:
799
diff
changeset
|
1086 |
dialog = wx.MessageDialog(self, |
435e49e80832
Update list of messages to be translated for internationalization and french translations
laurent
parents:
799
diff
changeset
|
1087 |
_("Really delete node '%s'?") % confnode.CTNName(), |
435e49e80832
Update list of messages to be translated for internationalization and french translations
laurent
parents:
799
diff
changeset
|
1088 |
_("Remove %s node") % confnode.CTNType, |
435e49e80832
Update list of messages to be translated for internationalization and french translations
laurent
parents:
799
diff
changeset
|
1089 |
wx.YES_NO|wx.NO_DEFAULT) |
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1090 |
if dialog.ShowModal() == wx.ID_YES: |
718 | 1091 |
confnode.CTNRemove() |
717 | 1092 |
del confnode |
738 | 1093 |
self._Refresh(TITLE, FILEMENU, PROJECTTREE) |
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1094 |
dialog.Destroy() |
900
3e78925125e1
Fix bug main configuration variables not displayed in lower left panel when project root element is selected
Laurent Bessard
parents:
881
diff
changeset
|
1095 |
|
3e78925125e1
Fix bug main configuration variables not displayed in lower left panel when project root element is selected
Laurent Bessard
parents:
881
diff
changeset
|
1096 |
#------------------------------------------------------------------------------- |
3e78925125e1
Fix bug main configuration variables not displayed in lower left panel when project root element is selected
Laurent Bessard
parents:
881
diff
changeset
|
1097 |
# Highlights showing functions |
3e78925125e1
Fix bug main configuration variables not displayed in lower left panel when project root element is selected
Laurent Bessard
parents:
881
diff
changeset
|
1098 |
#------------------------------------------------------------------------------- |
3e78925125e1
Fix bug main configuration variables not displayed in lower left panel when project root element is selected
Laurent Bessard
parents:
881
diff
changeset
|
1099 |
|
3e78925125e1
Fix bug main configuration variables not displayed in lower left panel when project root element is selected
Laurent Bessard
parents:
881
diff
changeset
|
1100 |
def ShowHighlight(self, infos, start, end, highlight_type): |
3e78925125e1
Fix bug main configuration variables not displayed in lower left panel when project root element is selected
Laurent Bessard
parents:
881
diff
changeset
|
1101 |
config_name = self.Controler.GetProjectMainConfigurationName() |
3e78925125e1
Fix bug main configuration variables not displayed in lower left panel when project root element is selected
Laurent Bessard
parents:
881
diff
changeset
|
1102 |
if config_name is not None and infos[0] == self.Controler.ComputeConfigurationName(config_name): |
3e78925125e1
Fix bug main configuration variables not displayed in lower left panel when project root element is selected
Laurent Bessard
parents:
881
diff
changeset
|
1103 |
self.CTR._OpenView() |
3e78925125e1
Fix bug main configuration variables not displayed in lower left panel when project root element is selected
Laurent Bessard
parents:
881
diff
changeset
|
1104 |
selected = self.TabsOpened.GetSelection() |
3e78925125e1
Fix bug main configuration variables not displayed in lower left panel when project root element is selected
Laurent Bessard
parents:
881
diff
changeset
|
1105 |
if selected != -1: |
3e78925125e1
Fix bug main configuration variables not displayed in lower left panel when project root element is selected
Laurent Bessard
parents:
881
diff
changeset
|
1106 |
viewer = self.TabsOpened.GetPage(selected) |
3e78925125e1
Fix bug main configuration variables not displayed in lower left panel when project root element is selected
Laurent Bessard
parents:
881
diff
changeset
|
1107 |
viewer.AddHighlight(infos[1:], start, end, highlight_type) |
3e78925125e1
Fix bug main configuration variables not displayed in lower left panel when project root element is selected
Laurent Bessard
parents:
881
diff
changeset
|
1108 |
else: |
3e78925125e1
Fix bug main configuration variables not displayed in lower left panel when project root element is selected
Laurent Bessard
parents:
881
diff
changeset
|
1109 |
IDEFrame.ShowHighlight(self, infos, start, end, highlight_type) |
3e78925125e1
Fix bug main configuration variables not displayed in lower left panel when project root element is selected
Laurent Bessard
parents:
881
diff
changeset
|
1110 |
|
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1111 |
#------------------------------------------------------------------------------- |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1112 |
# Exception Handler |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1113 |
#------------------------------------------------------------------------------- |
1067
4f460c1dffb5
Added exception hook to Beremiz_service, so that exception go in PLC log. Extended Beremiz.py exception hook to threads. Stripped images embedded in Beremiz_service.py, user real images instead.
Edouard Tisserant
parents:
1061
diff
changeset
|
1114 |
import threading, traceback |
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1115 |
|
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1116 |
Max_Traceback_List_Size = 20 |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1117 |
|
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1118 |
def Display_Exception_Dialog(e_type, e_value, e_tb, bug_report_path): |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1119 |
trcbck_lst = [] |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1120 |
for i,line in enumerate(traceback.extract_tb(e_tb)): |
734 | 1121 |
trcbck = " " + str(i+1) + ". " |
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1122 |
if line[0].find(os.getcwd()) == -1: |
734 | 1123 |
trcbck += "file : " + str(line[0]) + ", " |
1124 |
else: |
|
1125 |
trcbck += "file : " + str(line[0][len(os.getcwd()):]) + ", " |
|
1126 |
trcbck += "line : " + str(line[1]) + ", " + "function : " + str(line[2]) |
|
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1127 |
trcbck_lst.append(trcbck) |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1128 |
|
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1129 |
# Allow clicking.... |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1130 |
cap = wx.Window_GetCapture() |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1131 |
if cap: |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1132 |
cap.ReleaseMouse() |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1133 |
|
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1134 |
dlg = wx.SingleChoiceDialog(None, |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1135 |
_(""" |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1136 |
An unhandled exception (bug) occured. Bug report saved at : |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1137 |
(%s) |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1138 |
|
434 | 1139 |
Please be kind enough to send this file to: |
734 | 1140 |
beremiz-devel@lists.sourceforge.net |
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1141 |
|
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1142 |
You should now restart Beremiz. |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1143 |
|
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1144 |
Traceback: |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1145 |
""") % bug_report_path + |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1146 |
str(e_type) + " : " + str(e_value), |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1147 |
_("Error"), |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1148 |
trcbck_lst) |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1149 |
try: |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1150 |
res = (dlg.ShowModal() == wx.ID_OK) |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1151 |
finally: |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1152 |
dlg.Destroy() |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1153 |
|
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1154 |
return res |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1155 |
|
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1156 |
def get_last_traceback(tb): |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1157 |
while tb.tb_next: |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1158 |
tb = tb.tb_next |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1159 |
return tb |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1160 |
|
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1161 |
|
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1162 |
def format_namespace(d, indent=' '): |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1163 |
return '\n'.join(['%s%s: %s' % (indent, k, repr(v)[:10000]) for k, v in d.iteritems()]) |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1164 |
|
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1165 |
|
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1166 |
ignored_exceptions = [] # a problem with a line in a module is only reported once per session |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1167 |
|
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1168 |
def AddExceptHook(path, app_version='[No version]'):#, ignored_exceptions=[]): |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1169 |
|
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1170 |
def handle_exception(e_type, e_value, e_traceback): |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1171 |
traceback.print_exception(e_type, e_value, e_traceback) # this is very helpful when there's an exception in the rest of this func |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1172 |
last_tb = get_last_traceback(e_traceback) |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1173 |
ex = (last_tb.tb_frame.f_code.co_filename, last_tb.tb_frame.f_lineno) |
701
166db2cb630b
Stripped dead code in bug report dialog.\nFixed error when log flooded while quitting
Edouard Tisserant
parents:
692
diff
changeset
|
1174 |
if ex not in ignored_exceptions: |
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1175 |
date = time.ctime() |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1176 |
bug_report_path = path+os.sep+"bug_report_"+date.replace(':','-').replace(' ','_')+".txt" |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1177 |
result = Display_Exception_Dialog(e_type,e_value,e_traceback,bug_report_path) |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1178 |
if result: |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1179 |
ignored_exceptions.append(ex) |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1180 |
info = { |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1181 |
'app-title' : wx.GetApp().GetAppName(), # app_title |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1182 |
'app-version' : app_version, |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1183 |
'wx-version' : wx.VERSION_STRING, |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1184 |
'wx-platform' : wx.Platform, |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1185 |
'python-version' : platform.python_version(), #sys.version.split()[0], |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1186 |
'platform' : platform.platform(), |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1187 |
'e-type' : e_type, |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1188 |
'e-value' : e_value, |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1189 |
'date' : date, |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1190 |
'cwd' : os.getcwd(), |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1191 |
} |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1192 |
if e_traceback: |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1193 |
info['traceback'] = ''.join(traceback.format_tb(e_traceback)) + '%s: %s' % (e_type, e_value) |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1194 |
last_tb = get_last_traceback(e_traceback) |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1195 |
exception_locals = last_tb.tb_frame.f_locals # the locals at the level of the stack trace where the exception actually occurred |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1196 |
info['locals'] = format_namespace(exception_locals) |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1197 |
if 'self' in exception_locals: |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1198 |
info['self'] = format_namespace(exception_locals['self'].__dict__) |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1199 |
|
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1200 |
output = open(bug_report_path,'w') |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1201 |
lst = info.keys() |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1202 |
lst.sort() |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1203 |
for a in lst: |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1204 |
output.write(a+":\n"+str(info[a])+"\n\n") |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1205 |
|
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1206 |
#sys.excepthook = lambda *args: wx.CallAfter(handle_exception, *args) |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1207 |
sys.excepthook = handle_exception |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1208 |
|
1067
4f460c1dffb5
Added exception hook to Beremiz_service, so that exception go in PLC log. Extended Beremiz.py exception hook to threads. Stripped images embedded in Beremiz_service.py, user real images instead.
Edouard Tisserant
parents:
1061
diff
changeset
|
1209 |
init_old = threading.Thread.__init__ |
4f460c1dffb5
Added exception hook to Beremiz_service, so that exception go in PLC log. Extended Beremiz.py exception hook to threads. Stripped images embedded in Beremiz_service.py, user real images instead.
Edouard Tisserant
parents:
1061
diff
changeset
|
1210 |
def init(self, *args, **kwargs): |
4f460c1dffb5
Added exception hook to Beremiz_service, so that exception go in PLC log. Extended Beremiz.py exception hook to threads. Stripped images embedded in Beremiz_service.py, user real images instead.
Edouard Tisserant
parents:
1061
diff
changeset
|
1211 |
init_old(self, *args, **kwargs) |
4f460c1dffb5
Added exception hook to Beremiz_service, so that exception go in PLC log. Extended Beremiz.py exception hook to threads. Stripped images embedded in Beremiz_service.py, user real images instead.
Edouard Tisserant
parents:
1061
diff
changeset
|
1212 |
run_old = self.run |
4f460c1dffb5
Added exception hook to Beremiz_service, so that exception go in PLC log. Extended Beremiz.py exception hook to threads. Stripped images embedded in Beremiz_service.py, user real images instead.
Edouard Tisserant
parents:
1061
diff
changeset
|
1213 |
def run_with_except_hook(*args, **kw): |
4f460c1dffb5
Added exception hook to Beremiz_service, so that exception go in PLC log. Extended Beremiz.py exception hook to threads. Stripped images embedded in Beremiz_service.py, user real images instead.
Edouard Tisserant
parents:
1061
diff
changeset
|
1214 |
try: |
4f460c1dffb5
Added exception hook to Beremiz_service, so that exception go in PLC log. Extended Beremiz.py exception hook to threads. Stripped images embedded in Beremiz_service.py, user real images instead.
Edouard Tisserant
parents:
1061
diff
changeset
|
1215 |
run_old(*args, **kw) |
4f460c1dffb5
Added exception hook to Beremiz_service, so that exception go in PLC log. Extended Beremiz.py exception hook to threads. Stripped images embedded in Beremiz_service.py, user real images instead.
Edouard Tisserant
parents:
1061
diff
changeset
|
1216 |
except (KeyboardInterrupt, SystemExit): |
4f460c1dffb5
Added exception hook to Beremiz_service, so that exception go in PLC log. Extended Beremiz.py exception hook to threads. Stripped images embedded in Beremiz_service.py, user real images instead.
Edouard Tisserant
parents:
1061
diff
changeset
|
1217 |
raise |
4f460c1dffb5
Added exception hook to Beremiz_service, so that exception go in PLC log. Extended Beremiz.py exception hook to threads. Stripped images embedded in Beremiz_service.py, user real images instead.
Edouard Tisserant
parents:
1061
diff
changeset
|
1218 |
except: |
4f460c1dffb5
Added exception hook to Beremiz_service, so that exception go in PLC log. Extended Beremiz.py exception hook to threads. Stripped images embedded in Beremiz_service.py, user real images instead.
Edouard Tisserant
parents:
1061
diff
changeset
|
1219 |
sys.excepthook(*sys.exc_info()) |
4f460c1dffb5
Added exception hook to Beremiz_service, so that exception go in PLC log. Extended Beremiz.py exception hook to threads. Stripped images embedded in Beremiz_service.py, user real images instead.
Edouard Tisserant
parents:
1061
diff
changeset
|
1220 |
self.run = run_with_except_hook |
4f460c1dffb5
Added exception hook to Beremiz_service, so that exception go in PLC log. Extended Beremiz.py exception hook to threads. Stripped images embedded in Beremiz_service.py, user real images instead.
Edouard Tisserant
parents:
1061
diff
changeset
|
1221 |
threading.Thread.__init__ = init |
4f460c1dffb5
Added exception hook to Beremiz_service, so that exception go in PLC log. Extended Beremiz.py exception hook to threads. Stripped images embedded in Beremiz_service.py, user real images instead.
Edouard Tisserant
parents:
1061
diff
changeset
|
1222 |
|
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1223 |
if __name__ == '__main__': |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1224 |
# Install a exception handle for bug reports |
588 | 1225 |
AddExceptHook(os.getcwd(),updateinfo_url) |
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1226 |
|
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1227 |
frame = Beremiz(None, projectOpen, buildpath) |
1211
e3f805ba74ca
Fixed bug when launching Beremiz with a wrong project path
Laurent Bessard
parents:
1091
diff
changeset
|
1228 |
if splash: |
e3f805ba74ca
Fixed bug when launching Beremiz with a wrong project path
Laurent Bessard
parents:
1091
diff
changeset
|
1229 |
splash.Close() |
428
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1230 |
frame.Show() |
ea09f33ce717
Update internationalization for new functionalities.
laurent
parents:
427
diff
changeset
|
1231 |
app.MainLoop() |