author | GP Orcullo <kinsamanka@gmail.com> |
Wed, 09 Nov 2022 22:17:13 +0800 | |
branch | python3 |
changeset 3779 | 31c9409a5841 |
parent 3765 | 88fe6fc9fd38 |
child 3791 | c98646b1c981 |
permissions | -rw-r--r-- |
814 | 1 |
#!/usr/bin/env python |
2 |
# -*- coding: utf-8 -*- |
|
3 |
||
1571
486f94a8032c
fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1556
diff
changeset
|
4 |
# This file is part of Beremiz, a Integrated Development Environment for |
486f94a8032c
fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1556
diff
changeset
|
5 |
# programming IEC 61131-3 automates supporting plcopen standard and CanFestival. |
814 | 6 |
# |
1571
486f94a8032c
fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1556
diff
changeset
|
7 |
# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD |
814 | 8 |
# |
1571
486f94a8032c
fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1556
diff
changeset
|
9 |
# See COPYING file for copyrights details. |
814 | 10 |
# |
1571
486f94a8032c
fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1556
diff
changeset
|
11 |
# This program is free software; you can redistribute it and/or |
486f94a8032c
fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1556
diff
changeset
|
12 |
# modify it under the terms of the GNU General Public License |
486f94a8032c
fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1556
diff
changeset
|
13 |
# as published by the Free Software Foundation; either version 2 |
486f94a8032c
fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1556
diff
changeset
|
14 |
# of the License, or (at your option) any later version. |
814 | 15 |
# |
1571
486f94a8032c
fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1556
diff
changeset
|
16 |
# This program is distributed in the hope that it will be useful, |
486f94a8032c
fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1556
diff
changeset
|
17 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of |
486f94a8032c
fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1556
diff
changeset
|
18 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
486f94a8032c
fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1556
diff
changeset
|
19 |
# GNU General Public License for more details. |
814 | 20 |
# |
1571
486f94a8032c
fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1556
diff
changeset
|
21 |
# You should have received a copy of the GNU General Public License |
486f94a8032c
fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1556
diff
changeset
|
22 |
# along with this program; if not, write to the Free Software |
486f94a8032c
fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1556
diff
changeset
|
23 |
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
814 | 24 |
|
1853
47a3f39bead0
fix pylint warning "(relative-import) Relative import 'Y', should be 'X.Y'"
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1850
diff
changeset
|
25 |
|
814 | 26 |
import re |
2456
7373e3048167
python3 support: pylint,W1610 # (reduce-builtin) reduce built-in referenced
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2450
diff
changeset
|
27 |
from functools import reduce |
814 | 28 |
|
29 |
import wx |
|
30 |
import wx.stc |
|
31 |
||
32 |
from graphics.GraphicCommons import ERROR_HIGHLIGHT, SEARCH_RESULT_HIGHLIGHT, REFRESH_HIGHLIGHT_PERIOD |
|
1850
614396cbffbf
fix pylint warning '(unused-import), Unused import connectors'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1847
diff
changeset
|
33 |
from plcopen.structures import ST_BLOCK_START_KEYWORDS, IEC_BLOCK_START_KEYWORDS, LOCATIONDATATYPES |
1853
47a3f39bead0
fix pylint warning "(relative-import) Relative import 'Y', should be 'X.Y'"
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1850
diff
changeset
|
34 |
from editors.EditorPanel import EditorPanel |
1850
614396cbffbf
fix pylint warning '(unused-import), Unused import connectors'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1847
diff
changeset
|
35 |
from controls.CustomStyledTextCtrl import CustomStyledTextCtrl, faces, GetCursorPos |
814 | 36 |
|
1782
5b6ad7a7fd9d
clean-up: fix PEP8 E265 block comment should start with '# '
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1780
diff
changeset
|
37 |
# ------------------------------------------------------------------------------- |
814 | 38 |
# Textual programs Viewer class |
1782
5b6ad7a7fd9d
clean-up: fix PEP8 E265 block comment should start with '# '
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1780
diff
changeset
|
39 |
# ------------------------------------------------------------------------------- |
814 | 40 |
|
41 |
||
42 |
NEWLINE = "\n" |
|
3750
f62625418bff
automated conversion using 2to3-3.9 tool
GP Orcullo <kinsamanka@gmail.com>
parents:
3688
diff
changeset
|
43 |
NUMBERS = [str(i) for i in range(10)] |
814 | 44 |
LETTERS = ['_'] |
3750
f62625418bff
automated conversion using 2to3-3.9 tool
GP Orcullo <kinsamanka@gmail.com>
parents:
3688
diff
changeset
|
45 |
for i in range(26): |
814 | 46 |
LETTERS.append(chr(ord('a') + i)) |
47 |
LETTERS.append(chr(ord('A') + i)) |
|
48 |
||
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
49 |
[STC_PLC_WORD, STC_PLC_COMMENT, STC_PLC_NUMBER, STC_PLC_STRING, |
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
50 |
STC_PLC_VARIABLE, STC_PLC_PARAMETER, STC_PLC_FUNCTION, STC_PLC_JUMP, |
1509
7aaf850d8d1c
fix highlighting of multiline comments in ST and IL
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1504
diff
changeset
|
51 |
STC_PLC_ERROR, STC_PLC_SEARCH_RESULT, |
3750
f62625418bff
automated conversion using 2to3-3.9 tool
GP Orcullo <kinsamanka@gmail.com>
parents:
3688
diff
changeset
|
52 |
STC_PLC_EMPTY] = list(range(11)) |
f62625418bff
automated conversion using 2to3-3.9 tool
GP Orcullo <kinsamanka@gmail.com>
parents:
3688
diff
changeset
|
53 |
[SPACE, WORD, NUMBER, STRING, WSTRING, COMMENT, PRAGMA, DPRAGMA] = list(range(8)) |
814 | 54 |
|
55 |
re_texts = {} |
|
56 |
re_texts["letter"] = "[A-Za-z]" |
|
57 |
re_texts["digit"] = "[0-9]" |
|
1734
750eeb7230a1
clean-up: fix some PEP8 E228 missing whitespace around modulo operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1730
diff
changeset
|
58 |
re_texts["identifier"] = "((?:%(letter)s|(?:_(?:%(letter)s|%(digit)s)))(?:_?(?:%(letter)s|%(digit)s))*)" % re_texts |
814 | 59 |
IDENTIFIER_MODEL = re.compile(re_texts["identifier"]) |
1734
750eeb7230a1
clean-up: fix some PEP8 E228 missing whitespace around modulo operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1730
diff
changeset
|
60 |
LABEL_MODEL = re.compile("[ \t\n]%(identifier)s:[ \t\n]" % re_texts) |
814 | 61 |
EXTENSIBLE_PARAMETER = re.compile("IN[1-9][0-9]*$") |
62 |
||
63 |
HIGHLIGHT_TYPES = { |
|
64 |
ERROR_HIGHLIGHT: STC_PLC_ERROR, |
|
65 |
SEARCH_RESULT_HIGHLIGHT: STC_PLC_SEARCH_RESULT, |
|
66 |
} |
|
67 |
||
1736
7e61baa047f0
clean-up: fix PEP8 E302 expected 2 blank lines, found 1
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1734
diff
changeset
|
68 |
|
814 | 69 |
def LineStartswith(line, symbols): |
3750
f62625418bff
automated conversion using 2to3-3.9 tool
GP Orcullo <kinsamanka@gmail.com>
parents:
3688
diff
changeset
|
70 |
return reduce(lambda x, y: x or y, list(map(line.startswith, symbols)), False) |
814 | 71 |
|
1736
7e61baa047f0
clean-up: fix PEP8 E302 expected 2 blank lines, found 1
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1734
diff
changeset
|
72 |
|
814 | 73 |
class TextViewer(EditorPanel): |
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
74 |
|
814 | 75 |
def _init_Editor(self, prnt): |
2737
38afed869ff6
Finished fixing Wx IDs abuse. There was still some wasted IDs because of wx.NewId calls in many places where it wasn't needed, and those IDs were not re-used. As a consequence Beremiz was making exception crashing after a few hours of intensive use.
Edouard Tisserant
parents:
2456
diff
changeset
|
76 |
self.Editor = CustomStyledTextCtrl(parent=prnt, name="TextViewer", size=wx.Size(0, 0), style=0) |
814 | 77 |
self.Editor.ParentWindow = self |
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
78 |
|
814 | 79 |
self.Editor.CmdKeyAssign(ord('+'), wx.stc.STC_SCMOD_CTRL, wx.stc.STC_CMD_ZOOMIN) |
80 |
self.Editor.CmdKeyAssign(ord('-'), wx.stc.STC_SCMOD_CTRL, wx.stc.STC_CMD_ZOOMOUT) |
|
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
81 |
|
814 | 82 |
self.Editor.SetViewWhiteSpace(False) |
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
83 |
|
814 | 84 |
self.Editor.SetLexer(wx.stc.STC_LEX_CONTAINER) |
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
85 |
|
814 | 86 |
# Global default styles for all languages |
87 |
self.Editor.StyleSetSpec(wx.stc.STC_STYLE_DEFAULT, "face:%(mono)s,size:%(size)d" % faces) |
|
88 |
self.Editor.StyleClearAll() # Reset all to be like the default |
|
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
89 |
|
814 | 90 |
self.Editor.StyleSetSpec(wx.stc.STC_STYLE_LINENUMBER, "back:#C0C0C0,size:%(size)d" % faces) |
91 |
self.Editor.SetSelBackground(1, "#E0E0E0") |
|
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
92 |
|
814 | 93 |
# Highlighting styles |
94 |
self.Editor.StyleSetSpec(STC_PLC_WORD, "fore:#00007F,bold,size:%(size)d" % faces) |
|
95 |
self.Editor.StyleSetSpec(STC_PLC_VARIABLE, "fore:#7F0000,size:%(size)d" % faces) |
|
96 |
self.Editor.StyleSetSpec(STC_PLC_PARAMETER, "fore:#7F007F,size:%(size)d" % faces) |
|
97 |
self.Editor.StyleSetSpec(STC_PLC_FUNCTION, "fore:#7F7F00,size:%(size)d" % faces) |
|
98 |
self.Editor.StyleSetSpec(STC_PLC_COMMENT, "fore:#7F7F7F,size:%(size)d" % faces) |
|
99 |
self.Editor.StyleSetSpec(STC_PLC_NUMBER, "fore:#007F7F,size:%(size)d" % faces) |
|
100 |
self.Editor.StyleSetSpec(STC_PLC_STRING, "fore:#007F00,size:%(size)d" % faces) |
|
101 |
self.Editor.StyleSetSpec(STC_PLC_JUMP, "fore:#FF7FFF,size:%(size)d" % faces) |
|
102 |
self.Editor.StyleSetSpec(STC_PLC_ERROR, "fore:#FF0000,back:#FFFF00,size:%(size)d" % faces) |
|
103 |
self.Editor.StyleSetSpec(STC_PLC_SEARCH_RESULT, "fore:#FFFFFF,back:#FFA500,size:%(size)d" % faces) |
|
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
104 |
|
814 | 105 |
# Indicators styles |
106 |
self.Editor.IndicatorSetStyle(0, wx.stc.STC_INDIC_SQUIGGLE) |
|
107 |
if self.ParentWindow is not None and self.Controler is not None: |
|
108 |
self.Editor.IndicatorSetForeground(0, wx.RED) |
|
109 |
else: |
|
110 |
self.Editor.IndicatorSetForeground(0, wx.WHITE) |
|
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
111 |
|
814 | 112 |
# Line numbers in the margin |
113 |
self.Editor.SetMarginType(1, wx.stc.STC_MARGIN_NUMBER) |
|
114 |
self.Editor.SetMarginWidth(1, 50) |
|
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
115 |
|
814 | 116 |
# Folding |
117 |
self.Editor.MarkerDefine(wx.stc.STC_MARKNUM_FOLDEROPEN, wx.stc.STC_MARK_BOXMINUS, "white", "#808080") |
|
118 |
self.Editor.MarkerDefine(wx.stc.STC_MARKNUM_FOLDER, wx.stc.STC_MARK_BOXPLUS, "white", "#808080") |
|
119 |
self.Editor.MarkerDefine(wx.stc.STC_MARKNUM_FOLDERSUB, wx.stc.STC_MARK_VLINE, "white", "#808080") |
|
120 |
self.Editor.MarkerDefine(wx.stc.STC_MARKNUM_FOLDERTAIL, wx.stc.STC_MARK_LCORNER, "white", "#808080") |
|
121 |
self.Editor.MarkerDefine(wx.stc.STC_MARKNUM_FOLDEREND, wx.stc.STC_MARK_BOXPLUSCONNECTED, "white", "#808080") |
|
122 |
self.Editor.MarkerDefine(wx.stc.STC_MARKNUM_FOLDEROPENMID, wx.stc.STC_MARK_BOXMINUSCONNECTED, "white", "#808080") |
|
123 |
self.Editor.MarkerDefine(wx.stc.STC_MARKNUM_FOLDERMIDTAIL, wx.stc.STC_MARK_TCORNER, "white", "#808080") |
|
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
124 |
|
814 | 125 |
# Indentation size |
126 |
self.Editor.SetTabWidth(2) |
|
127 |
self.Editor.SetUseTabs(0) |
|
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
128 |
|
1742
92932cd370a4
clean-up: fix PEP8 E225 missing whitespace around operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1736
diff
changeset
|
129 |
self.Editor.SetModEventMask(wx.stc.STC_MOD_BEFOREINSERT | |
3682
c613afdab571
IDE: Optimization of modification events processing in text editors.
Edouard Tisserant
parents:
3319
diff
changeset
|
130 |
wx.stc.STC_MOD_BEFOREDELETE) |
814 | 131 |
|
2737
38afed869ff6
Finished fixing Wx IDs abuse. There was still some wasted IDs because of wx.NewId calls in many places where it wasn't needed, and those IDs were not re-used. As a consequence Beremiz was making exception crashing after a few hours of intensive use.
Edouard Tisserant
parents:
2456
diff
changeset
|
132 |
self.Bind(wx.stc.EVT_STC_STYLENEEDED, self.OnStyleNeeded, self.Editor) |
814 | 133 |
self.Editor.Bind(wx.stc.EVT_STC_MARGINCLICK, self.OnMarginClick) |
1126
26baa0ae9fd7
Fixed bug with Copy/Paste in Primary Selection in Text Viewers
Laurent Bessard
parents:
1108
diff
changeset
|
134 |
self.Editor.Bind(wx.stc.EVT_STC_UPDATEUI, self.OnUpdateUI) |
814 | 135 |
self.Editor.Bind(wx.EVT_KEY_DOWN, self.OnKeyDown) |
136 |
if self.Controler is not None: |
|
137 |
self.Editor.Bind(wx.EVT_KILL_FOCUS, self.OnKillFocus) |
|
2737
38afed869ff6
Finished fixing Wx IDs abuse. There was still some wasted IDs because of wx.NewId calls in many places where it wasn't needed, and those IDs were not re-used. As a consequence Beremiz was making exception crashing after a few hours of intensive use.
Edouard Tisserant
parents:
2456
diff
changeset
|
138 |
self.Bind(wx.stc.EVT_STC_DO_DROP, self.OnDoDrop, self.Editor) |
38afed869ff6
Finished fixing Wx IDs abuse. There was still some wasted IDs because of wx.NewId calls in many places where it wasn't needed, and those IDs were not re-used. As a consequence Beremiz was making exception crashing after a few hours of intensive use.
Edouard Tisserant
parents:
2456
diff
changeset
|
139 |
self.Bind(wx.stc.EVT_STC_MODIFIED, self.OnModification, self.Editor) |
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
140 |
|
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1743
diff
changeset
|
141 |
def __init__(self, parent, tagname, window, controler, debug=False, instancepath=""): |
814 | 142 |
if tagname != "" and controler is not None: |
143 |
self.VARIABLE_PANEL_TYPE = controler.GetPouType(tagname.split("::")[1]) |
|
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
144 |
|
814 | 145 |
EditorPanel.__init__(self, parent, tagname, window, controler, debug) |
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
146 |
|
814 | 147 |
self.Keywords = [] |
148 |
self.Variables = {} |
|
149 |
self.Functions = {} |
|
150 |
self.TypeNames = [] |
|
151 |
self.Jumps = [] |
|
152 |
self.EnumeratedValues = [] |
|
153 |
self.DisableEvents = True |
|
154 |
self.TextSyntax = None |
|
155 |
self.CurrentAction = None |
|
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
156 |
|
814 | 157 |
self.InstancePath = instancepath |
158 |
self.ContextStack = [] |
|
159 |
self.CallStack = [] |
|
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
160 |
|
1178
3e2aebc9c7c0
Fixed search highlight bug in ST and Code text editors
Laurent Bessard
parents:
1126
diff
changeset
|
161 |
self.ResetSearchResults() |
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
162 |
|
814 | 163 |
self.RefreshHighlightsTimer = wx.Timer(self, -1) |
164 |
self.Bind(wx.EVT_TIMER, self.OnRefreshHighlightsTimer, self.RefreshHighlightsTimer) |
|
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
165 |
|
814 | 166 |
def GetTitle(self): |
167 |
if self.Debug or self.TagName == "": |
|
168 |
if len(self.InstancePath) > 15: |
|
169 |
return "..." + self.InstancePath[-12:] |
|
170 |
return self.InstancePath |
|
171 |
return EditorPanel.GetTitle(self) |
|
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
172 |
|
814 | 173 |
def GetInstancePath(self): |
174 |
return self.InstancePath |
|
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
175 |
|
814 | 176 |
def IsViewing(self, tagname): |
177 |
if self.Debug or self.TagName == "": |
|
178 |
return self.InstancePath == tagname |
|
179 |
else: |
|
180 |
return self.TagName == tagname |
|
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
181 |
|
814 | 182 |
def GetText(self): |
183 |
return self.Editor.GetText() |
|
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
184 |
|
814 | 185 |
def SetText(self, text): |
186 |
self.Editor.SetText(text) |
|
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
187 |
|
814 | 188 |
def SelectAll(self): |
189 |
self.Editor.SelectAll() |
|
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
190 |
|
814 | 191 |
def Colourise(self, start, end): |
192 |
self.Editor.Colourise(start, end) |
|
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
193 |
|
3303
0ffb41625592
Preliminary support for WxPython 4.1.0. Needs more testing. Grid selection/focus seems broken, and probably many other bugs hidden in dialogs and editors.
Edouard Tisserant <edouard.tisserant@gmail.com>
parents:
2737
diff
changeset
|
194 |
def StartStyling(self, pos): |
0ffb41625592
Preliminary support for WxPython 4.1.0. Needs more testing. Grid selection/focus seems broken, and probably many other bugs hidden in dialogs and editors.
Edouard Tisserant <edouard.tisserant@gmail.com>
parents:
2737
diff
changeset
|
195 |
self.Editor.StartStyling(pos) |
0ffb41625592
Preliminary support for WxPython 4.1.0. Needs more testing. Grid selection/focus seems broken, and probably many other bugs hidden in dialogs and editors.
Edouard Tisserant <edouard.tisserant@gmail.com>
parents:
2737
diff
changeset
|
196 |
|
0ffb41625592
Preliminary support for WxPython 4.1.0. Needs more testing. Grid selection/focus seems broken, and probably many other bugs hidden in dialogs and editors.
Edouard Tisserant <edouard.tisserant@gmail.com>
parents:
2737
diff
changeset
|
197 |
INDIC0 = 0 |
0ffb41625592
Preliminary support for WxPython 4.1.0. Needs more testing. Grid selection/focus seems broken, and probably many other bugs hidden in dialogs and editors.
Edouard Tisserant <edouard.tisserant@gmail.com>
parents:
2737
diff
changeset
|
198 |
INDIC1 = 1 |
0ffb41625592
Preliminary support for WxPython 4.1.0. Needs more testing. Grid selection/focus seems broken, and probably many other bugs hidden in dialogs and editors.
Edouard Tisserant <edouard.tisserant@gmail.com>
parents:
2737
diff
changeset
|
199 |
INDIC2 = 2 |
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
200 |
|
814 | 201 |
def SetStyling(self, length, style): |
202 |
self.Editor.SetStyling(length, style) |
|
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
203 |
|
3429
67a4d207bace
IDE: Fix one more sequel of wxPython4 port : typo in editors/TextViewer.py
Edouard Tisserant <edouard.tisserant@gmail.com>
parents:
3327
diff
changeset
|
204 |
def SetIndicatorCurrentFillRange(self, start, length, indic): |
3303
0ffb41625592
Preliminary support for WxPython 4.1.0. Needs more testing. Grid selection/focus seems broken, and probably many other bugs hidden in dialogs and editors.
Edouard Tisserant <edouard.tisserant@gmail.com>
parents:
2737
diff
changeset
|
205 |
self.Editor.SetIndicatorCurrent(indic) |
0ffb41625592
Preliminary support for WxPython 4.1.0. Needs more testing. Grid selection/focus seems broken, and probably many other bugs hidden in dialogs and editors.
Edouard Tisserant <edouard.tisserant@gmail.com>
parents:
2737
diff
changeset
|
206 |
self.Editor.IndicatorFillRange(start, length) |
0ffb41625592
Preliminary support for WxPython 4.1.0. Needs more testing. Grid selection/focus seems broken, and probably many other bugs hidden in dialogs and editors.
Edouard Tisserant <edouard.tisserant@gmail.com>
parents:
2737
diff
changeset
|
207 |
|
814 | 208 |
def GetCurrentPos(self): |
209 |
return self.Editor.GetCurrentPos() |
|
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
210 |
|
1178
3e2aebc9c7c0
Fixed search highlight bug in ST and Code text editors
Laurent Bessard
parents:
1126
diff
changeset
|
211 |
def ResetSearchResults(self): |
3e2aebc9c7c0
Fixed search highlight bug in ST and Code text editors
Laurent Bessard
parents:
1126
diff
changeset
|
212 |
self.Highlights = [] |
3e2aebc9c7c0
Fixed search highlight bug in ST and Code text editors
Laurent Bessard
parents:
1126
diff
changeset
|
213 |
self.SearchParams = None |
3e2aebc9c7c0
Fixed search highlight bug in ST and Code text editors
Laurent Bessard
parents:
1126
diff
changeset
|
214 |
self.SearchResults = None |
3e2aebc9c7c0
Fixed search highlight bug in ST and Code text editors
Laurent Bessard
parents:
1126
diff
changeset
|
215 |
self.CurrentFindHighlight = None |
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
216 |
|
3682
c613afdab571
IDE: Optimization of modification events processing in text editors.
Edouard Tisserant
parents:
3319
diff
changeset
|
217 |
Buffering = "Off" |
814 | 218 |
def OnModification(self, event): |
219 |
if not self.DisableEvents: |
|
220 |
mod_type = event.GetModificationType() |
|
1745
f9d32913bad4
clean-up: fix PEP8 E227 missing whitespace around bitwise or shift operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1744
diff
changeset
|
221 |
if mod_type & wx.stc.STC_MOD_BEFOREINSERT: |
1743
c3c3d1318130
clean-up: fix PEP8 E711 comparison to None should be 'if cond is not None:'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1742
diff
changeset
|
222 |
if self.CurrentAction is None: |
3682
c613afdab571
IDE: Optimization of modification events processing in text editors.
Edouard Tisserant
parents:
3319
diff
changeset
|
223 |
self.Buffering = "ShouldStart" |
814 | 224 |
elif self.CurrentAction[0] != "Add" or self.CurrentAction[1] != event.GetPosition() - 1: |
3682
c613afdab571
IDE: Optimization of modification events processing in text editors.
Edouard Tisserant
parents:
3319
diff
changeset
|
225 |
self.Buffering = "ShouldRestart" |
814 | 226 |
self.CurrentAction = ("Add", event.GetPosition()) |
3682
c613afdab571
IDE: Optimization of modification events processing in text editors.
Edouard Tisserant
parents:
3319
diff
changeset
|
227 |
self.RefreshModelAfter() |
1745
f9d32913bad4
clean-up: fix PEP8 E227 missing whitespace around bitwise or shift operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1744
diff
changeset
|
228 |
elif mod_type & wx.stc.STC_MOD_BEFOREDELETE: |
1743
c3c3d1318130
clean-up: fix PEP8 E711 comparison to None should be 'if cond is not None:'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1742
diff
changeset
|
229 |
if self.CurrentAction is None: |
3682
c613afdab571
IDE: Optimization of modification events processing in text editors.
Edouard Tisserant
parents:
3319
diff
changeset
|
230 |
self.Buffering = "ShouldStart" |
814 | 231 |
elif self.CurrentAction[0] != "Delete" or self.CurrentAction[1] != event.GetPosition() + 1: |
3682
c613afdab571
IDE: Optimization of modification events processing in text editors.
Edouard Tisserant
parents:
3319
diff
changeset
|
232 |
self.Buffering = "ShouldRestart" |
814 | 233 |
self.CurrentAction = ("Delete", event.GetPosition()) |
3682
c613afdab571
IDE: Optimization of modification events processing in text editors.
Edouard Tisserant
parents:
3319
diff
changeset
|
234 |
self.RefreshModelAfter() |
814 | 235 |
event.Skip() |
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
236 |
|
814 | 237 |
def OnDoDrop(self, event): |
238 |
try: |
|
239 |
values = eval(event.GetDragText()) |
|
1780
c52d1460cea8
clean-up: fix PEP8 E722 do not use bare except'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1775
diff
changeset
|
240 |
except Exception: |
814 | 241 |
values = event.GetDragText() |
242 |
if isinstance(values, tuple): |
|
243 |
message = None |
|
244 |
if values[1] in ["program", "debug"]: |
|
245 |
event.SetDragText("") |
|
246 |
elif values[1] in ["functionBlock", "function"]: |
|
247 |
blocktype = values[0] |
|
248 |
blockname = values[2] |
|
249 |
if len(values) > 3: |
|
250 |
blockinputs = values[3] |
|
251 |
else: |
|
252 |
blockinputs = None |
|
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
253 |
if values[1] != "function": |
814 | 254 |
if blockname == "": |
1745
f9d32913bad4
clean-up: fix PEP8 E227 missing whitespace around bitwise or shift operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1744
diff
changeset
|
255 |
dialog = wx.TextEntryDialog(self.ParentWindow, _("Block name"), _("Please enter a block name"), "", wx.OK | wx.CANCEL | wx.CENTRE) |
814 | 256 |
if dialog.ShowModal() == wx.ID_OK: |
257 |
blockname = dialog.GetValue() |
|
258 |
else: |
|
1730
64d8f52bc8c8
clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1637
diff
changeset
|
259 |
event.SetDragText("") |
814 | 260 |
return |
261 |
dialog.Destroy() |
|
262 |
if blockname.upper() in [name.upper() for name in self.Controler.GetProjectPouNames(self.Debug)]: |
|
1734
750eeb7230a1
clean-up: fix some PEP8 E228 missing whitespace around modulo operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1730
diff
changeset
|
263 |
message = _("\"%s\" pou already exists!") % blockname |
814 | 264 |
elif blockname.upper() in [name.upper() for name in self.Controler.GetEditedElementVariables(self.TagName, self.Debug)]: |
1734
750eeb7230a1
clean-up: fix some PEP8 E228 missing whitespace around modulo operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1730
diff
changeset
|
265 |
message = _("\"%s\" element for this pou already exists!") % blockname |
814 | 266 |
else: |
267 |
self.Controler.AddEditedElementPouVar(self.TagName, values[0], blockname) |
|
268 |
self.RefreshVariablePanel() |
|
269 |
self.RefreshVariableTree() |
|
270 |
blockinfo = self.Controler.GetBlockType(blocktype, blockinputs, self.Debug) |
|
271 |
hint = ',\n '.join( |
|
1878
fb73a6b6622d
fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1853
diff
changeset
|
272 |
[" " + fctdecl[0]+" := (*"+fctdecl[1]+"*)" for fctdecl in blockinfo["inputs"]] + |
fb73a6b6622d
fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1853
diff
changeset
|
273 |
[" " + fctdecl[0]+" => (*"+fctdecl[1]+"*)" for fctdecl in blockinfo["outputs"]]) |
814 | 274 |
if values[1] == "function": |
275 |
event.SetDragText(blocktype+"(\n "+hint+")") |
|
276 |
else: |
|
277 |
event.SetDragText(blockname+"(\n "+hint+")") |
|
278 |
elif values[1] == "location": |
|
1847
6198190bc121
explicitly mark unused variables found by pylint with _ or dummy
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1833
diff
changeset
|
279 |
_pou_name, pou_type = self.Controler.GetEditedElementType(self.TagName, self.Debug) |
814 | 280 |
if len(values) > 2 and pou_type == "program": |
281 |
var_name = values[3] |
|
1417
374238039643
Added a variable name text entry dialog to allow name change on drag'n'drops
Edouard Tisserant
parents:
1409
diff
changeset
|
282 |
dlg = wx.TextEntryDialog( |
374238039643
Added a variable name text entry dialog to allow name change on drag'n'drops
Edouard Tisserant
parents:
1409
diff
changeset
|
283 |
self.ParentWindow, |
374238039643
Added a variable name text entry dialog to allow name change on drag'n'drops
Edouard Tisserant
parents:
1409
diff
changeset
|
284 |
_("Confirm or change variable name"), |
1578
f8e2a04c4445
add localization to time strings in DebugVariablePanel and to dialog shown after variable drag'n'drop
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1571
diff
changeset
|
285 |
_('Variable Drop'), var_name) |
1417
374238039643
Added a variable name text entry dialog to allow name change on drag'n'drops
Edouard Tisserant
parents:
1409
diff
changeset
|
286 |
dlg.SetValue(var_name) |
374238039643
Added a variable name text entry dialog to allow name change on drag'n'drops
Edouard Tisserant
parents:
1409
diff
changeset
|
287 |
var_name = dlg.GetValue() if dlg.ShowModal() == wx.ID_OK else None |
374238039643
Added a variable name text entry dialog to allow name change on drag'n'drops
Edouard Tisserant
parents:
1409
diff
changeset
|
288 |
dlg.Destroy() |
374238039643
Added a variable name text entry dialog to allow name change on drag'n'drops
Edouard Tisserant
parents:
1409
diff
changeset
|
289 |
if var_name is None: |
374238039643
Added a variable name text entry dialog to allow name change on drag'n'drops
Edouard Tisserant
parents:
1409
diff
changeset
|
290 |
return |
374238039643
Added a variable name text entry dialog to allow name change on drag'n'drops
Edouard Tisserant
parents:
1409
diff
changeset
|
291 |
elif var_name.upper() in [name.upper() for name in self.Controler.GetProjectPouNames(self.Debug)]: |
1734
750eeb7230a1
clean-up: fix some PEP8 E228 missing whitespace around modulo operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1730
diff
changeset
|
292 |
message = _("\"%s\" pou already exists!") % var_name |
814 | 293 |
elif var_name.upper() in [name.upper() for name in self.Controler.GetEditedElementVariables(self.TagName, self.Debug)]: |
1734
750eeb7230a1
clean-up: fix some PEP8 E228 missing whitespace around modulo operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1730
diff
changeset
|
294 |
message = _("\"%s\" element for this pou already exists!") % var_name |
814 | 295 |
else: |
296 |
location = values[0] |
|
297 |
if not location.startswith("%"): |
|
1768
691083b5682a
clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1766
diff
changeset
|
298 |
dialog = wx.SingleChoiceDialog( |
691083b5682a
clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1766
diff
changeset
|
299 |
self.ParentWindow, |
691083b5682a
clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1766
diff
changeset
|
300 |
_("Select a variable class:"), |
691083b5682a
clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1766
diff
changeset
|
301 |
_("Variable class"), |
691083b5682a
clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1766
diff
changeset
|
302 |
[_("Input"), _("Output"), _("Memory")], |
691083b5682a
clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1766
diff
changeset
|
303 |
wx.DEFAULT_DIALOG_STYLE | wx.OK | wx.CANCEL) |
814 | 304 |
if dialog.ShowModal() == wx.ID_OK: |
305 |
selected = dialog.GetSelection() |
|
306 |
else: |
|
307 |
selected = None |
|
308 |
dialog.Destroy() |
|
309 |
if selected is None: |
|
310 |
event.SetDragText("") |
|
311 |
return |
|
312 |
if selected == 0: |
|
313 |
location = "%I" + location |
|
314 |
elif selected == 1: |
|
315 |
location = "%Q" + location |
|
316 |
else: |
|
317 |
location = "%M" + location |
|
318 |
if values[2] is not None: |
|
319 |
var_type = values[2] |
|
320 |
else: |
|
321 |
var_type = LOCATIONDATATYPES.get(location[2], ["BOOL"])[0] |
|
1768
691083b5682a
clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1766
diff
changeset
|
322 |
self.Controler.AddEditedElementPouVar( |
691083b5682a
clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1766
diff
changeset
|
323 |
self.TagName, |
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
324 |
var_type, var_name, |
1406
82db84fe88ea
Added 'NamedConstant' drag'n'drop in programs. It does create a simple variable with initial value and is usefull for drag'n'drop constants from extensions while keeping a name associated with constant
Edouard Tisserant
parents:
1347
diff
changeset
|
325 |
location=location, description=values[4]) |
814 | 326 |
self.RefreshVariablePanel() |
327 |
self.RefreshVariableTree() |
|
328 |
event.SetDragText(var_name) |
|
329 |
else: |
|
330 |
event.SetDragText("") |
|
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
331 |
elif values[1] == "NamedConstant": |
1847
6198190bc121
explicitly mark unused variables found by pylint with _ or dummy
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1833
diff
changeset
|
332 |
_pou_name, pou_type = self.Controler.GetEditedElementType(self.TagName, self.Debug) |
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
333 |
if pou_type == "program": |
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
334 |
initval = values[0] |
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
335 |
var_name = values[3] |
1417
374238039643
Added a variable name text entry dialog to allow name change on drag'n'drops
Edouard Tisserant
parents:
1409
diff
changeset
|
336 |
dlg = wx.TextEntryDialog( |
374238039643
Added a variable name text entry dialog to allow name change on drag'n'drops
Edouard Tisserant
parents:
1409
diff
changeset
|
337 |
self.ParentWindow, |
374238039643
Added a variable name text entry dialog to allow name change on drag'n'drops
Edouard Tisserant
parents:
1409
diff
changeset
|
338 |
_("Confirm or change variable name"), |
1578
f8e2a04c4445
add localization to time strings in DebugVariablePanel and to dialog shown after variable drag'n'drop
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1571
diff
changeset
|
339 |
_('Variable Drop'), var_name) |
1417
374238039643
Added a variable name text entry dialog to allow name change on drag'n'drops
Edouard Tisserant
parents:
1409
diff
changeset
|
340 |
dlg.SetValue(var_name) |
374238039643
Added a variable name text entry dialog to allow name change on drag'n'drops
Edouard Tisserant
parents:
1409
diff
changeset
|
341 |
var_name = dlg.GetValue() if dlg.ShowModal() == wx.ID_OK else None |
374238039643
Added a variable name text entry dialog to allow name change on drag'n'drops
Edouard Tisserant
parents:
1409
diff
changeset
|
342 |
dlg.Destroy() |
374238039643
Added a variable name text entry dialog to allow name change on drag'n'drops
Edouard Tisserant
parents:
1409
diff
changeset
|
343 |
if var_name is None: |
374238039643
Added a variable name text entry dialog to allow name change on drag'n'drops
Edouard Tisserant
parents:
1409
diff
changeset
|
344 |
return |
374238039643
Added a variable name text entry dialog to allow name change on drag'n'drops
Edouard Tisserant
parents:
1409
diff
changeset
|
345 |
elif var_name.upper() in [name.upper() for name in self.Controler.GetProjectPouNames(self.Debug)]: |
1734
750eeb7230a1
clean-up: fix some PEP8 E228 missing whitespace around modulo operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1730
diff
changeset
|
346 |
message = _("\"%s\" pou already exists!") % var_name |
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
347 |
else: |
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
348 |
var_type = values[2] |
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
349 |
if not var_name.upper() in [name.upper() for name in self.Controler.GetEditedElementVariables(self.TagName, self.Debug)]: |
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
350 |
self.Controler.AddEditedElementPouVar(self.TagName, |
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
351 |
var_type, |
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
352 |
var_name, |
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
353 |
description=values[4], initval=initval) |
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
354 |
self.RefreshVariablePanel() |
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
355 |
self.RefreshVariableTree() |
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
356 |
event.SetDragText(var_name) |
814 | 357 |
elif values[1] == "Global": |
358 |
var_name = values[0] |
|
1417
374238039643
Added a variable name text entry dialog to allow name change on drag'n'drops
Edouard Tisserant
parents:
1409
diff
changeset
|
359 |
dlg = wx.TextEntryDialog( |
374238039643
Added a variable name text entry dialog to allow name change on drag'n'drops
Edouard Tisserant
parents:
1409
diff
changeset
|
360 |
self.ParentWindow, |
374238039643
Added a variable name text entry dialog to allow name change on drag'n'drops
Edouard Tisserant
parents:
1409
diff
changeset
|
361 |
_("Confirm or change variable name"), |
1578
f8e2a04c4445
add localization to time strings in DebugVariablePanel and to dialog shown after variable drag'n'drop
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1571
diff
changeset
|
362 |
_('Variable Drop'), var_name) |
1417
374238039643
Added a variable name text entry dialog to allow name change on drag'n'drops
Edouard Tisserant
parents:
1409
diff
changeset
|
363 |
dlg.SetValue(var_name) |
374238039643
Added a variable name text entry dialog to allow name change on drag'n'drops
Edouard Tisserant
parents:
1409
diff
changeset
|
364 |
var_name = dlg.GetValue() if dlg.ShowModal() == wx.ID_OK else None |
374238039643
Added a variable name text entry dialog to allow name change on drag'n'drops
Edouard Tisserant
parents:
1409
diff
changeset
|
365 |
dlg.Destroy() |
374238039643
Added a variable name text entry dialog to allow name change on drag'n'drops
Edouard Tisserant
parents:
1409
diff
changeset
|
366 |
if var_name is None: |
374238039643
Added a variable name text entry dialog to allow name change on drag'n'drops
Edouard Tisserant
parents:
1409
diff
changeset
|
367 |
return |
374238039643
Added a variable name text entry dialog to allow name change on drag'n'drops
Edouard Tisserant
parents:
1409
diff
changeset
|
368 |
elif var_name.upper() in [name.upper() for name in self.Controler.GetProjectPouNames(self.Debug)]: |
1734
750eeb7230a1
clean-up: fix some PEP8 E228 missing whitespace around modulo operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1730
diff
changeset
|
369 |
message = _("\"%s\" pou already exists!") % var_name |
814 | 370 |
else: |
371 |
if not var_name.upper() in [name.upper() for name in self.Controler.GetEditedElementVariables(self.TagName, self.Debug)]: |
|
3319
e6c758e41f82
Sequel to 95fe62bfe920 : Copy description when DnD variables from Globals in resources and configuration variable panels to POUs, now including ST/IL POUs.
Edouard Tisserant
parents:
2737
diff
changeset
|
372 |
kwargs = dict(description=values[4]) if len(values)>4 else {} |
e6c758e41f82
Sequel to 95fe62bfe920 : Copy description when DnD variables from Globals in resources and configuration variable panels to POUs, now including ST/IL POUs.
Edouard Tisserant
parents:
2737
diff
changeset
|
373 |
self.Controler.AddEditedElementPouExternalVar(self.TagName, values[2], var_name, **kwargs) |
814 | 374 |
self.RefreshVariablePanel() |
375 |
self.RefreshVariableTree() |
|
376 |
event.SetDragText(var_name) |
|
377 |
elif values[1] == "Constant": |
|
378 |
event.SetDragText(values[0]) |
|
379 |
elif values[3] == self.TagName: |
|
380 |
self.ResetBuffer() |
|
381 |
event.SetDragText(values[0]) |
|
3682
c613afdab571
IDE: Optimization of modification events processing in text editors.
Edouard Tisserant
parents:
3319
diff
changeset
|
382 |
self.RefreshModelAfter() |
814 | 383 |
else: |
384 |
message = _("Variable don't belong to this POU!") |
|
385 |
if message is not None: |
|
1745
f9d32913bad4
clean-up: fix PEP8 E227 missing whitespace around bitwise or shift operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1744
diff
changeset
|
386 |
dialog = wx.MessageDialog(self, message, _("Error"), wx.OK | wx.ICON_ERROR) |
814 | 387 |
dialog.ShowModal() |
388 |
dialog.Destroy() |
|
389 |
event.SetDragText("") |
|
390 |
event.Skip() |
|
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
391 |
|
814 | 392 |
def SetTextSyntax(self, syntax): |
393 |
self.TextSyntax = syntax |
|
394 |
if syntax in ["ST", "ALL"]: |
|
395 |
self.Editor.SetMarginType(2, wx.stc.STC_MARGIN_SYMBOL) |
|
396 |
self.Editor.SetMarginMask(2, wx.stc.STC_MASK_FOLDERS) |
|
397 |
self.Editor.SetMarginSensitive(2, 1) |
|
398 |
self.Editor.SetMarginWidth(2, 12) |
|
399 |
if syntax == "ST": |
|
400 |
self.BlockStartKeywords = ST_BLOCK_START_KEYWORDS |
|
401 |
self.BlockEndKeywords = ST_BLOCK_START_KEYWORDS |
|
402 |
else: |
|
403 |
self.BlockStartKeywords = IEC_BLOCK_START_KEYWORDS |
|
404 |
self.BlockEndKeywords = IEC_BLOCK_START_KEYWORDS |
|
405 |
else: |
|
406 |
self.BlockStartKeywords = [] |
|
407 |
self.BlockEndKeywords = [] |
|
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
408 |
|
814 | 409 |
def SetKeywords(self, keywords): |
410 |
self.Keywords = [keyword.upper() for keyword in keywords] |
|
411 |
self.Colourise(0, -1) |
|
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
412 |
|
814 | 413 |
def RefreshJumpList(self): |
1637
6f4624687b89
fix IL jumps highlighting in Text Viewer
Surkov Sergey <surkovsv93@gmail.com>
parents:
1613
diff
changeset
|
414 |
if self.TextSyntax == "IL": |
814 | 415 |
self.Jumps = [jump.upper() for jump in LABEL_MODEL.findall(self.GetText())] |
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
416 |
|
814 | 417 |
# Buffer the last model state |
418 |
def RefreshBuffer(self): |
|
419 |
self.Controler.BufferProject() |
|
420 |
if self.ParentWindow: |
|
421 |
self.ParentWindow.RefreshTitle() |
|
422 |
self.ParentWindow.RefreshFileMenu() |
|
423 |
self.ParentWindow.RefreshEditMenu() |
|
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
424 |
|
814 | 425 |
def StartBuffering(self): |
426 |
self.Controler.StartBuffering() |
|
427 |
if self.ParentWindow: |
|
428 |
self.ParentWindow.RefreshTitle() |
|
429 |
self.ParentWindow.RefreshFileMenu() |
|
430 |
self.ParentWindow.RefreshEditMenu() |
|
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
431 |
|
3682
c613afdab571
IDE: Optimization of modification events processing in text editors.
Edouard Tisserant
parents:
3319
diff
changeset
|
432 |
def EndBuffering(self): |
c613afdab571
IDE: Optimization of modification events processing in text editors.
Edouard Tisserant
parents:
3319
diff
changeset
|
433 |
self.Controler.EndBuffering() |
c613afdab571
IDE: Optimization of modification events processing in text editors.
Edouard Tisserant
parents:
3319
diff
changeset
|
434 |
|
814 | 435 |
def ResetBuffer(self): |
1743
c3c3d1318130
clean-up: fix PEP8 E711 comparison to None should be 'if cond is not None:'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1742
diff
changeset
|
436 |
if self.CurrentAction is not None: |
3682
c613afdab571
IDE: Optimization of modification events processing in text editors.
Edouard Tisserant
parents:
3319
diff
changeset
|
437 |
self.EndBuffering() |
814 | 438 |
self.CurrentAction = None |
3682
c613afdab571
IDE: Optimization of modification events processing in text editors.
Edouard Tisserant
parents:
3319
diff
changeset
|
439 |
self.Buffering == "Off" |
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
440 |
|
814 | 441 |
def GetBufferState(self): |
442 |
if not self.Debug and self.TextSyntax != "ALL": |
|
443 |
return self.Controler.GetBufferState() |
|
444 |
return False, False |
|
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
445 |
|
814 | 446 |
def Undo(self): |
447 |
if not self.Debug and self.TextSyntax != "ALL": |
|
448 |
self.Controler.LoadPrevious() |
|
449 |
self.ParentWindow.CloseTabsWithoutModel() |
|
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
450 |
|
814 | 451 |
def Redo(self): |
452 |
if not self.Debug and self.TextSyntax != "ALL": |
|
453 |
self.Controler.LoadNext() |
|
454 |
self.ParentWindow.CloseTabsWithoutModel() |
|
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
455 |
|
814 | 456 |
def HasNoModel(self): |
457 |
if not self.Debug and self.TextSyntax != "ALL": |
|
458 |
return self.Controler.GetEditedElement(self.TagName) is None |
|
459 |
return False |
|
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
460 |
|
814 | 461 |
def RefreshView(self, variablepanel=True): |
462 |
EditorPanel.RefreshView(self, variablepanel) |
|
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
463 |
|
814 | 464 |
if self.Controler is not None: |
465 |
self.ResetBuffer() |
|
466 |
self.DisableEvents = True |
|
467 |
old_cursor_pos = self.GetCurrentPos() |
|
1060
ac9896336b90
Fixed unexpected scrolling when PythonEditor, TextViewer and CFileEditor get focus
Laurent Bessard
parents:
1057
diff
changeset
|
468 |
line = self.Editor.GetFirstVisibleLine() |
ac9896336b90
Fixed unexpected scrolling when PythonEditor, TextViewer and CFileEditor get focus
Laurent Bessard
parents:
1057
diff
changeset
|
469 |
column = self.Editor.GetXOffset() |
814 | 470 |
old_text = self.GetText() |
471 |
new_text = self.Controler.GetEditedElementText(self.TagName, self.Debug) |
|
1060
ac9896336b90
Fixed unexpected scrolling when PythonEditor, TextViewer and CFileEditor get focus
Laurent Bessard
parents:
1057
diff
changeset
|
472 |
if old_text != new_text: |
ac9896336b90
Fixed unexpected scrolling when PythonEditor, TextViewer and CFileEditor get focus
Laurent Bessard
parents:
1057
diff
changeset
|
473 |
self.SetText(new_text) |
ac9896336b90
Fixed unexpected scrolling when PythonEditor, TextViewer and CFileEditor get focus
Laurent Bessard
parents:
1057
diff
changeset
|
474 |
new_cursor_pos = GetCursorPos(old_text, new_text) |
ac9896336b90
Fixed unexpected scrolling when PythonEditor, TextViewer and CFileEditor get focus
Laurent Bessard
parents:
1057
diff
changeset
|
475 |
self.Editor.LineScroll(column, line) |
1743
c3c3d1318130
clean-up: fix PEP8 E711 comparison to None should be 'if cond is not None:'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1742
diff
changeset
|
476 |
if new_cursor_pos is not None: |
1060
ac9896336b90
Fixed unexpected scrolling when PythonEditor, TextViewer and CFileEditor get focus
Laurent Bessard
parents:
1057
diff
changeset
|
477 |
self.Editor.GotoPos(new_cursor_pos) |
ac9896336b90
Fixed unexpected scrolling when PythonEditor, TextViewer and CFileEditor get focus
Laurent Bessard
parents:
1057
diff
changeset
|
478 |
else: |
ac9896336b90
Fixed unexpected scrolling when PythonEditor, TextViewer and CFileEditor get focus
Laurent Bessard
parents:
1057
diff
changeset
|
479 |
self.Editor.GotoPos(old_cursor_pos) |
ac9896336b90
Fixed unexpected scrolling when PythonEditor, TextViewer and CFileEditor get focus
Laurent Bessard
parents:
1057
diff
changeset
|
480 |
self.RefreshJumpList() |
ac9896336b90
Fixed unexpected scrolling when PythonEditor, TextViewer and CFileEditor get focus
Laurent Bessard
parents:
1057
diff
changeset
|
481 |
self.Editor.EmptyUndoBuffer() |
814 | 482 |
self.DisableEvents = False |
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
483 |
|
814 | 484 |
self.RefreshVariableTree() |
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
485 |
|
814 | 486 |
self.TypeNames = [typename.upper() for typename in self.Controler.GetDataTypes(self.TagName, True, self.Debug)] |
487 |
self.EnumeratedValues = [value.upper() for value in self.Controler.GetEnumeratedDataValues()] |
|
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
488 |
|
814 | 489 |
self.Functions = {} |
490 |
for category in self.Controler.GetBlockTypes(self.TagName, self.Debug): |
|
491 |
for blocktype in category["list"]: |
|
492 |
blockname = blocktype["name"].upper() |
|
3750
f62625418bff
automated conversion using 2to3-3.9 tool
GP Orcullo <kinsamanka@gmail.com>
parents:
3688
diff
changeset
|
493 |
if blocktype["type"] == "function" and blockname not in self.Keywords and blockname not in list(self.Variables.keys()): |
1847
6198190bc121
explicitly mark unused variables found by pylint with _ or dummy
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1833
diff
changeset
|
494 |
interface = dict([(name, {}) for name, _type, _modifier in blocktype["inputs"] + blocktype["outputs"] if name != '']) |
814 | 495 |
for param in ["EN", "ENO"]: |
1775
b45f2768fab1
clean-up: fix PEP8 E713 test for membership should be 'not in'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1773
diff
changeset
|
496 |
if param not in interface: |
814 | 497 |
interface[param] = {} |
1763
bcc07ff2362c
clean-up: fix PEP8 W601 .has_key() is deprecated, use 'in'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1758
diff
changeset
|
498 |
if blockname in self.Functions: |
814 | 499 |
self.Functions[blockname]["interface"].update(interface) |
500 |
self.Functions[blockname]["extensible"] |= blocktype["extensible"] |
|
501 |
else: |
|
502 |
self.Functions[blockname] = {"interface": interface, |
|
503 |
"extensible": blocktype["extensible"]} |
|
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
504 |
|
814 | 505 |
self.Colourise(0, -1) |
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
506 |
|
814 | 507 |
def RefreshVariableTree(self): |
508 |
words = self.TagName.split("::") |
|
1878
fb73a6b6622d
fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1853
diff
changeset
|
509 |
self.Variables = self.GenerateVariableTree([ |
fb73a6b6622d
fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1853
diff
changeset
|
510 |
(variable.Name, variable.Type, variable.Tree) |
fb73a6b6622d
fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1853
diff
changeset
|
511 |
for variable in |
fb73a6b6622d
fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1853
diff
changeset
|
512 |
self.Controler.GetEditedElementInterfaceVars( |
fb73a6b6622d
fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1853
diff
changeset
|
513 |
self.TagName, True, self.Debug) |
fb73a6b6622d
fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1853
diff
changeset
|
514 |
]) |
814 | 515 |
if self.Controler.GetEditedElementType(self.TagName, self.Debug)[1] == "function" or words[0] == "T" and self.TextSyntax == "IL": |
1847
6198190bc121
explicitly mark unused variables found by pylint with _ or dummy
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1833
diff
changeset
|
516 |
return_type, (var_tree, _var_dimension) = self.Controler.GetEditedElementInterfaceReturnType(self.TagName, True, self.Debug) |
814 | 517 |
if return_type is not None: |
518 |
self.Variables[words[-1].upper()] = self.GenerateVariableTree(var_tree) |
|
519 |
else: |
|
520 |
self.Variables[words[-1].upper()] = {} |
|
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
521 |
|
814 | 522 |
def GenerateVariableTree(self, list): |
523 |
tree = {} |
|
1847
6198190bc121
explicitly mark unused variables found by pylint with _ or dummy
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1833
diff
changeset
|
524 |
for var_name, _var_type, (var_tree, _var_dimension) in list: |
814 | 525 |
tree[var_name.upper()] = self.GenerateVariableTree(var_tree) |
526 |
return tree |
|
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
527 |
|
814 | 528 |
def IsValidVariable(self, name, context): |
529 |
return context is not None and context.get(name, None) is not None |
|
530 |
||
531 |
def IsCallParameter(self, name, call): |
|
532 |
if call is not None: |
|
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
533 |
return (call["interface"].get(name.upper(), None) is not None or |
814 | 534 |
call["extensible"] and EXTENSIBLE_PARAMETER.match(name.upper()) is not None) |
535 |
return False |
|
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
536 |
|
814 | 537 |
def RefreshLineFolding(self, line_number): |
538 |
if self.TextSyntax in ["ST", "ALL"]: |
|
539 |
level = wx.stc.STC_FOLDLEVELBASE + self.Editor.GetLineIndentation(line_number) |
|
540 |
line = self.Editor.GetLine(line_number).strip() |
|
541 |
if line == "": |
|
542 |
if line_number > 0: |
|
543 |
if LineStartswith(self.Editor.GetLine(line_number - 1).strip(), self.BlockEndKeywords): |
|
544 |
level = self.Editor.GetFoldLevel(self.Editor.GetFoldParent(line_number - 1)) & wx.stc.STC_FOLDLEVELNUMBERMASK |
|
545 |
else: |
|
546 |
level = self.Editor.GetFoldLevel(line_number - 1) & wx.stc.STC_FOLDLEVELNUMBERMASK |
|
547 |
if level != wx.stc.STC_FOLDLEVELBASE: |
|
1758
845ca626db09
clean-up: fix PEP8 E222 multiple spaces after operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1747
diff
changeset
|
548 |
level |= wx.stc.STC_FOLDLEVELWHITEFLAG |
814 | 549 |
elif LineStartswith(line, self.BlockStartKeywords): |
550 |
level |= wx.stc.STC_FOLDLEVELHEADERFLAG |
|
551 |
elif LineStartswith(line, self.BlockEndKeywords): |
|
552 |
if LineStartswith(self.Editor.GetLine(line_number - 1).strip(), self.BlockEndKeywords): |
|
553 |
level = self.Editor.GetFoldLevel(self.Editor.GetFoldParent(line_number - 1)) & wx.stc.STC_FOLDLEVELNUMBERMASK |
|
554 |
else: |
|
555 |
level = self.Editor.GetFoldLevel(line_number - 1) & wx.stc.STC_FOLDLEVELNUMBERMASK |
|
556 |
self.Editor.SetFoldLevel(line_number, level) |
|
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
557 |
|
814 | 558 |
def OnStyleNeeded(self, event): |
559 |
self.TextChanged = True |
|
560 |
line_number = self.Editor.LineFromPosition(self.Editor.GetEndStyled()) |
|
561 |
if line_number == 0: |
|
562 |
start_pos = last_styled_pos = 0 |
|
563 |
else: |
|
564 |
start_pos = last_styled_pos = self.Editor.GetLineEndPosition(line_number - 1) + 1 |
|
565 |
self.RefreshLineFolding(line_number) |
|
566 |
end_pos = event.GetPosition() |
|
3303
0ffb41625592
Preliminary support for WxPython 4.1.0. Needs more testing. Grid selection/focus seems broken, and probably many other bugs hidden in dialogs and editors.
Edouard Tisserant <edouard.tisserant@gmail.com>
parents:
2737
diff
changeset
|
567 |
self.StartStyling(start_pos) |
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
568 |
|
814 | 569 |
current_context = self.Variables |
570 |
current_call = None |
|
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
571 |
|
814 | 572 |
current_pos = last_styled_pos |
573 |
state = SPACE |
|
574 |
line = "" |
|
575 |
word = "" |
|
576 |
while current_pos < end_pos: |
|
577 |
char = chr(self.Editor.GetCharAt(current_pos)).upper() |
|
578 |
line += char |
|
579 |
if char == NEWLINE: |
|
580 |
self.ContextStack = [] |
|
581 |
current_context = self.Variables |
|
582 |
if state == COMMENT: |
|
1509
7aaf850d8d1c
fix highlighting of multiline comments in ST and IL
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1504
diff
changeset
|
583 |
self.SetStyling(current_pos - last_styled_pos, STC_PLC_COMMENT) |
814 | 584 |
elif state == NUMBER: |
585 |
self.SetStyling(current_pos - last_styled_pos, STC_PLC_NUMBER) |
|
586 |
elif state == WORD: |
|
587 |
if word in self.Keywords or word in self.TypeNames: |
|
588 |
self.SetStyling(current_pos - last_styled_pos, STC_PLC_WORD) |
|
589 |
elif self.IsValidVariable(word, current_context): |
|
590 |
self.SetStyling(current_pos - last_styled_pos, STC_PLC_VARIABLE) |
|
591 |
elif self.IsCallParameter(word, current_call): |
|
592 |
self.SetStyling(current_pos - last_styled_pos, STC_PLC_PARAMETER) |
|
593 |
elif word in self.Functions: |
|
594 |
self.SetStyling(current_pos - last_styled_pos, STC_PLC_FUNCTION) |
|
595 |
elif self.TextSyntax == "IL" and word in self.Jumps: |
|
596 |
self.SetStyling(current_pos - last_styled_pos, STC_PLC_JUMP) |
|
597 |
elif word in self.EnumeratedValues: |
|
598 |
self.SetStyling(current_pos - last_styled_pos, STC_PLC_NUMBER) |
|
599 |
else: |
|
1509
7aaf850d8d1c
fix highlighting of multiline comments in ST and IL
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1504
diff
changeset
|
600 |
self.SetStyling(current_pos - last_styled_pos, STC_PLC_EMPTY) |
814 | 601 |
if word not in ["]", ")"] and (self.GetCurrentPos() < last_styled_pos or self.GetCurrentPos() > current_pos): |
3303
0ffb41625592
Preliminary support for WxPython 4.1.0. Needs more testing. Grid selection/focus seems broken, and probably many other bugs hidden in dialogs and editors.
Edouard Tisserant <edouard.tisserant@gmail.com>
parents:
2737
diff
changeset
|
602 |
self.SetIndicatorCurrentFillRange(last_styled_pos, current_pos - last_styled_pos, self.INDIC0) |
0ffb41625592
Preliminary support for WxPython 4.1.0. Needs more testing. Grid selection/focus seems broken, and probably many other bugs hidden in dialogs and editors.
Edouard Tisserant <edouard.tisserant@gmail.com>
parents:
2737
diff
changeset
|
603 |
self.StartStyling(current_pos) |
814 | 604 |
else: |
1509
7aaf850d8d1c
fix highlighting of multiline comments in ST and IL
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1504
diff
changeset
|
605 |
self.SetStyling(current_pos - last_styled_pos, STC_PLC_EMPTY) |
814 | 606 |
last_styled_pos = current_pos |
1509
7aaf850d8d1c
fix highlighting of multiline comments in ST and IL
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1504
diff
changeset
|
607 |
if (state != DPRAGMA) and (state != COMMENT): |
1108
1ec5b4d244f3
Fix bug with multiline Pragma syntax highlighting in TextViewer
Laurent Bessard
parents:
1091
diff
changeset
|
608 |
state = SPACE |
814 | 609 |
line = "" |
610 |
line_number += 1 |
|
611 |
self.RefreshLineFolding(line_number) |
|
612 |
elif line.endswith("(*") and state != COMMENT: |
|
1509
7aaf850d8d1c
fix highlighting of multiline comments in ST and IL
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1504
diff
changeset
|
613 |
self.SetStyling(current_pos - last_styled_pos - 1, STC_PLC_EMPTY) |
814 | 614 |
last_styled_pos = current_pos |
615 |
if state == WORD: |
|
616 |
current_context = self.Variables |
|
617 |
state = COMMENT |
|
871
1af078aa0cf8
Add support for double bracket pragma in syntax highlighting of TextViewer
Laurent Bessard
parents:
858
diff
changeset
|
618 |
elif line.endswith("{") and state not in [PRAGMA, DPRAGMA]: |
1509
7aaf850d8d1c
fix highlighting of multiline comments in ST and IL
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1504
diff
changeset
|
619 |
self.SetStyling(current_pos - last_styled_pos, STC_PLC_EMPTY) |
814 | 620 |
last_styled_pos = current_pos |
621 |
if state == WORD: |
|
622 |
current_context = self.Variables |
|
623 |
state = PRAGMA |
|
871
1af078aa0cf8
Add support for double bracket pragma in syntax highlighting of TextViewer
Laurent Bessard
parents:
858
diff
changeset
|
624 |
elif line.endswith("{{") and state == PRAGMA: |
1509
7aaf850d8d1c
fix highlighting of multiline comments in ST and IL
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1504
diff
changeset
|
625 |
self.SetStyling(current_pos - last_styled_pos, STC_PLC_EMPTY) |
871
1af078aa0cf8
Add support for double bracket pragma in syntax highlighting of TextViewer
Laurent Bessard
parents:
858
diff
changeset
|
626 |
last_styled_pos = current_pos |
1af078aa0cf8
Add support for double bracket pragma in syntax highlighting of TextViewer
Laurent Bessard
parents:
858
diff
changeset
|
627 |
state = DPRAGMA |
814 | 628 |
elif state == COMMENT: |
629 |
if line.endswith("*)"): |
|
630 |
self.SetStyling(current_pos - last_styled_pos + 2, STC_PLC_COMMENT) |
|
631 |
last_styled_pos = current_pos + 1 |
|
632 |
state = SPACE |
|
1521
e44950d4c218
fix highlighting input/outputs in function call in ST, if comment section is placed
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1509
diff
changeset
|
633 |
if len(self.CallStack) > 0: |
e44950d4c218
fix highlighting input/outputs in function call in ST, if comment section is placed
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1509
diff
changeset
|
634 |
current_call = self.CallStack.pop() |
e44950d4c218
fix highlighting input/outputs in function call in ST, if comment section is placed
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1509
diff
changeset
|
635 |
else: |
1730
64d8f52bc8c8
clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1637
diff
changeset
|
636 |
current_call = None |
814 | 637 |
elif state == PRAGMA: |
638 |
if line.endswith("}"): |
|
1509
7aaf850d8d1c
fix highlighting of multiline comments in ST and IL
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1504
diff
changeset
|
639 |
self.SetStyling(current_pos - last_styled_pos, STC_PLC_EMPTY) |
871
1af078aa0cf8
Add support for double bracket pragma in syntax highlighting of TextViewer
Laurent Bessard
parents:
858
diff
changeset
|
640 |
last_styled_pos = current_pos |
1af078aa0cf8
Add support for double bracket pragma in syntax highlighting of TextViewer
Laurent Bessard
parents:
858
diff
changeset
|
641 |
state = SPACE |
1af078aa0cf8
Add support for double bracket pragma in syntax highlighting of TextViewer
Laurent Bessard
parents:
858
diff
changeset
|
642 |
elif state == DPRAGMA: |
1af078aa0cf8
Add support for double bracket pragma in syntax highlighting of TextViewer
Laurent Bessard
parents:
858
diff
changeset
|
643 |
if line.endswith("}}"): |
1509
7aaf850d8d1c
fix highlighting of multiline comments in ST and IL
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1504
diff
changeset
|
644 |
self.SetStyling(current_pos - last_styled_pos + 1, STC_PLC_EMPTY) |
814 | 645 |
last_styled_pos = current_pos + 1 |
646 |
state = SPACE |
|
647 |
elif (line.endswith("'") or line.endswith('"')) and state not in [STRING, WSTRING]: |
|
1509
7aaf850d8d1c
fix highlighting of multiline comments in ST and IL
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1504
diff
changeset
|
648 |
self.SetStyling(current_pos - last_styled_pos, STC_PLC_EMPTY) |
814 | 649 |
last_styled_pos = current_pos |
650 |
if state == WORD: |
|
651 |
current_context = self.Variables |
|
652 |
if line.endswith("'"): |
|
653 |
state = STRING |
|
654 |
else: |
|
655 |
state = WSTRING |
|
656 |
elif state == STRING: |
|
657 |
if line.endswith("'") and not line.endswith("$'"): |
|
658 |
self.SetStyling(current_pos - last_styled_pos + 1, STC_PLC_STRING) |
|
659 |
last_styled_pos = current_pos + 1 |
|
660 |
state = SPACE |
|
661 |
elif state == WSTRING: |
|
662 |
if line.endswith('"') and not line.endswith('$"'): |
|
663 |
self.SetStyling(current_pos - last_styled_pos + 1, STC_PLC_STRING) |
|
664 |
last_styled_pos = current_pos + 1 |
|
665 |
state = SPACE |
|
666 |
elif char in LETTERS: |
|
667 |
if state == NUMBER: |
|
668 |
word = "#" |
|
669 |
state = WORD |
|
670 |
elif state == SPACE: |
|
1509
7aaf850d8d1c
fix highlighting of multiline comments in ST and IL
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1504
diff
changeset
|
671 |
self.SetStyling(current_pos - last_styled_pos, STC_PLC_EMPTY) |
814 | 672 |
word = char |
673 |
last_styled_pos = current_pos |
|
674 |
state = WORD |
|
675 |
else: |
|
676 |
word += char |
|
677 |
elif char in NUMBERS or char == '.' and state != WORD: |
|
678 |
if state == SPACE: |
|
1509
7aaf850d8d1c
fix highlighting of multiline comments in ST and IL
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1504
diff
changeset
|
679 |
self.SetStyling(current_pos - last_styled_pos, STC_PLC_EMPTY) |
814 | 680 |
last_styled_pos = current_pos |
681 |
state = NUMBER |
|
682 |
elif state == WORD and char != '.': |
|
683 |
word += char |
|
684 |
elif char == '(' and state == SPACE: |
|
685 |
self.CallStack.append(current_call) |
|
686 |
current_call = None |
|
687 |
else: |
|
688 |
if state == WORD: |
|
689 |
if word in self.Keywords or word in self.TypeNames: |
|
690 |
self.SetStyling(current_pos - last_styled_pos, STC_PLC_WORD) |
|
691 |
elif self.IsValidVariable(word, current_context): |
|
692 |
self.SetStyling(current_pos - last_styled_pos, STC_PLC_VARIABLE) |
|
693 |
elif self.IsCallParameter(word, current_call): |
|
694 |
self.SetStyling(current_pos - last_styled_pos, STC_PLC_PARAMETER) |
|
695 |
elif word in self.Functions: |
|
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
696 |
self.SetStyling(current_pos - last_styled_pos, STC_PLC_FUNCTION) |
814 | 697 |
elif self.TextSyntax == "IL" and word in self.Jumps: |
698 |
self.SetStyling(current_pos - last_styled_pos, STC_PLC_JUMP) |
|
699 |
elif word in self.EnumeratedValues: |
|
700 |
self.SetStyling(current_pos - last_styled_pos, STC_PLC_NUMBER) |
|
701 |
else: |
|
1509
7aaf850d8d1c
fix highlighting of multiline comments in ST and IL
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1504
diff
changeset
|
702 |
self.SetStyling(current_pos - last_styled_pos, STC_PLC_EMPTY) |
814 | 703 |
if word not in ["]", ")"] and (self.GetCurrentPos() < last_styled_pos or self.GetCurrentPos() > current_pos): |
3303
0ffb41625592
Preliminary support for WxPython 4.1.0. Needs more testing. Grid selection/focus seems broken, and probably many other bugs hidden in dialogs and editors.
Edouard Tisserant <edouard.tisserant@gmail.com>
parents:
2737
diff
changeset
|
704 |
self.SetIndicatorCurrentFillRange(last_styled_pos, current_pos - last_styled_pos, self.INDIC0) |
0ffb41625592
Preliminary support for WxPython 4.1.0. Needs more testing. Grid selection/focus seems broken, and probably many other bugs hidden in dialogs and editors.
Edouard Tisserant <edouard.tisserant@gmail.com>
parents:
2737
diff
changeset
|
705 |
self.StartStyling(current_pos) |
814 | 706 |
if char == '.': |
707 |
if word != "]": |
|
708 |
if current_context is not None: |
|
709 |
current_context = current_context.get(word, None) |
|
710 |
else: |
|
711 |
current_context = None |
|
712 |
elif char == '(': |
|
713 |
self.CallStack.append(current_call) |
|
714 |
current_call = self.Functions.get(word, None) |
|
715 |
if current_call is None and self.IsValidVariable(word, current_context): |
|
716 |
current_call = {"interface": current_context.get(word, {}), |
|
717 |
"extensible": False} |
|
718 |
current_context = self.Variables |
|
719 |
else: |
|
894
a4919f228924
Fixed bug when indexing table in Pragma within ST/IL code
Laurent Bessard
parents:
871
diff
changeset
|
720 |
if char == '[' and current_context is not None: |
814 | 721 |
self.ContextStack.append(current_context.get(word, None)) |
722 |
current_context = self.Variables |
|
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
723 |
|
814 | 724 |
word = "" |
725 |
last_styled_pos = current_pos |
|
726 |
state = SPACE |
|
727 |
elif state == NUMBER: |
|
728 |
self.SetStyling(current_pos - last_styled_pos, STC_PLC_NUMBER) |
|
729 |
last_styled_pos = current_pos |
|
730 |
state = SPACE |
|
731 |
if char == ']': |
|
732 |
if len(self.ContextStack) > 0: |
|
733 |
current_context = self.ContextStack.pop() |
|
734 |
else: |
|
735 |
current_context = self.Variables |
|
736 |
word = char |
|
737 |
state = WORD |
|
738 |
elif char == ')': |
|
739 |
current_context = self.Variables |
|
740 |
if len(self.CallStack) > 0: |
|
741 |
current_call = self.CallStack.pop() |
|
742 |
else: |
|
743 |
current_call = None |
|
744 |
word = char |
|
745 |
state = WORD |
|
746 |
current_pos += 1 |
|
747 |
if state == COMMENT: |
|
748 |
self.SetStyling(current_pos - last_styled_pos + 2, STC_PLC_COMMENT) |
|
749 |
elif state == NUMBER: |
|
750 |
self.SetStyling(current_pos - last_styled_pos, STC_PLC_NUMBER) |
|
751 |
elif state == WORD: |
|
752 |
if word in self.Keywords or word in self.TypeNames: |
|
753 |
self.SetStyling(current_pos - last_styled_pos, STC_PLC_WORD) |
|
754 |
elif self.IsValidVariable(word, current_context): |
|
755 |
self.SetStyling(current_pos - last_styled_pos, STC_PLC_VARIABLE) |
|
756 |
elif self.IsCallParameter(word, current_call): |
|
757 |
self.SetStyling(current_pos - last_styled_pos, STC_PLC_PARAMETER) |
|
758 |
elif self.TextSyntax == "IL" and word in self.Functions: |
|
759 |
self.SetStyling(current_pos - last_styled_pos, STC_PLC_FUNCTION) |
|
760 |
elif word in self.Jumps: |
|
761 |
self.SetStyling(current_pos - last_styled_pos, STC_PLC_JUMP) |
|
762 |
elif word in self.EnumeratedValues: |
|
763 |
self.SetStyling(current_pos - last_styled_pos, STC_PLC_NUMBER) |
|
764 |
else: |
|
1509
7aaf850d8d1c
fix highlighting of multiline comments in ST and IL
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1504
diff
changeset
|
765 |
self.SetStyling(current_pos - last_styled_pos, STC_PLC_EMPTY) |
814 | 766 |
else: |
1509
7aaf850d8d1c
fix highlighting of multiline comments in ST and IL
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1504
diff
changeset
|
767 |
self.SetStyling(current_pos - start_pos, STC_PLC_EMPTY) |
814 | 768 |
self.ShowHighlights(start_pos, end_pos) |
769 |
event.Skip() |
|
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
770 |
|
814 | 771 |
def OnMarginClick(self, event): |
772 |
if event.GetMargin() == 2: |
|
773 |
line = self.Editor.LineFromPosition(event.GetPosition()) |
|
774 |
if self.Editor.GetFoldLevel(line) & wx.stc.STC_FOLDLEVELHEADERFLAG: |
|
775 |
self.Editor.ToggleFold(line) |
|
776 |
event.Skip() |
|
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
777 |
|
1126
26baa0ae9fd7
Fixed bug with Copy/Paste in Primary Selection in Text Viewers
Laurent Bessard
parents:
1108
diff
changeset
|
778 |
def OnUpdateUI(self, event): |
1262
7b9259945453
Fixed bug with Copy/Paste in generated ST code Viewer
Laurent Bessard
parents:
1178
diff
changeset
|
779 |
selected = self.Editor.GetSelectedText() |
7b9259945453
Fixed bug with Copy/Paste in generated ST code Viewer
Laurent Bessard
parents:
1178
diff
changeset
|
780 |
if self.ParentWindow and selected != "": |
7b9259945453
Fixed bug with Copy/Paste in generated ST code Viewer
Laurent Bessard
parents:
1178
diff
changeset
|
781 |
self.ParentWindow.SetCopyBuffer(selected, True) |
1126
26baa0ae9fd7
Fixed bug with Copy/Paste in Primary Selection in Text Viewers
Laurent Bessard
parents:
1108
diff
changeset
|
782 |
event.Skip() |
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
783 |
|
814 | 784 |
def Cut(self): |
785 |
self.ResetBuffer() |
|
786 |
self.DisableEvents = True |
|
787 |
self.Editor.CmdKeyExecute(wx.stc.STC_CMD_CUT) |
|
788 |
self.DisableEvents = False |
|
789 |
self.RefreshModel() |
|
790 |
self.RefreshBuffer() |
|
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
791 |
|
814 | 792 |
def Copy(self): |
793 |
self.Editor.CmdKeyExecute(wx.stc.STC_CMD_COPY) |
|
1126
26baa0ae9fd7
Fixed bug with Copy/Paste in Primary Selection in Text Viewers
Laurent Bessard
parents:
1108
diff
changeset
|
794 |
if self.ParentWindow: |
26baa0ae9fd7
Fixed bug with Copy/Paste in Primary Selection in Text Viewers
Laurent Bessard
parents:
1108
diff
changeset
|
795 |
self.ParentWindow.RefreshEditMenu() |
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
796 |
|
814 | 797 |
def Paste(self): |
798 |
self.ResetBuffer() |
|
799 |
self.DisableEvents = True |
|
800 |
self.Editor.CmdKeyExecute(wx.stc.STC_CMD_PASTE) |
|
801 |
self.DisableEvents = False |
|
802 |
self.RefreshModel() |
|
803 |
self.RefreshBuffer() |
|
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
804 |
|
1057
3837e165b3f9
Added support for search in PythonEditor and IECCodeViewer
Laurent Bessard
parents:
980
diff
changeset
|
805 |
def Search(self, criteria): |
3837e165b3f9
Added support for search in PythonEditor and IECCodeViewer
Laurent Bessard
parents:
980
diff
changeset
|
806 |
return self.Controler.SearchInPou(self.TagName, criteria, self.Debug) |
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
807 |
|
814 | 808 |
def Find(self, direction, search_params): |
809 |
if self.SearchParams != search_params: |
|
810 |
self.ClearHighlights(SEARCH_RESULT_HIGHLIGHT) |
|
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
811 |
|
814 | 812 |
self.SearchParams = search_params |
813 |
self.SearchResults = [ |
|
814 |
(infos[1:], start, end, SEARCH_RESULT_HIGHLIGHT) |
|
1847
6198190bc121
explicitly mark unused variables found by pylint with _ or dummy
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1833
diff
changeset
|
815 |
for infos, start, end, _text in |
1556
32e9d0ef30dc
fix major bugs in Find and Search in Project functionality.
Sergey Surkov <surkovsv93@gmail.com>
parents:
1548
diff
changeset
|
816 |
self.Search(search_params)] |
1057
3837e165b3f9
Added support for search in PythonEditor and IECCodeViewer
Laurent Bessard
parents:
980
diff
changeset
|
817 |
self.CurrentFindHighlight = None |
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
818 |
|
814 | 819 |
if len(self.SearchResults) > 0: |
820 |
if self.CurrentFindHighlight is not None: |
|
821 |
old_idx = self.SearchResults.index(self.CurrentFindHighlight) |
|
822 |
if self.SearchParams["wrap"]: |
|
823 |
idx = (old_idx + direction) % len(self.SearchResults) |
|
824 |
else: |
|
825 |
idx = max(0, min(old_idx + direction, len(self.SearchResults) - 1)) |
|
826 |
if idx != old_idx: |
|
827 |
self.RemoveHighlight(*self.CurrentFindHighlight) |
|
828 |
self.CurrentFindHighlight = self.SearchResults[idx] |
|
829 |
self.AddHighlight(*self.CurrentFindHighlight) |
|
830 |
else: |
|
831 |
self.CurrentFindHighlight = self.SearchResults[0] |
|
832 |
self.AddHighlight(*self.CurrentFindHighlight) |
|
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
833 |
|
814 | 834 |
else: |
835 |
if self.CurrentFindHighlight is not None: |
|
836 |
self.RemoveHighlight(*self.CurrentFindHighlight) |
|
837 |
self.CurrentFindHighlight = None |
|
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
838 |
|
3682
c613afdab571
IDE: Optimization of modification events processing in text editors.
Edouard Tisserant
parents:
3319
diff
changeset
|
839 |
pending_model_refresh=False |
814 | 840 |
def RefreshModel(self): |
3682
c613afdab571
IDE: Optimization of modification events processing in text editors.
Edouard Tisserant
parents:
3319
diff
changeset
|
841 |
self.pending_model_refresh=False |
814 | 842 |
self.RefreshJumpList() |
1904
7dd49b65208b
Textviewer : moved call to Colourise in a better place, so that ST highlighting gets also updated when typing in some case, not only IL
Edouard Tisserant <edouard.tisserant@gmail.com>
parents:
1878
diff
changeset
|
843 |
self.Colourise(0, -1) |
3682
c613afdab571
IDE: Optimization of modification events processing in text editors.
Edouard Tisserant
parents:
3319
diff
changeset
|
844 |
|
c613afdab571
IDE: Optimization of modification events processing in text editors.
Edouard Tisserant
parents:
3319
diff
changeset
|
845 |
if self.Buffering == "ShouldStart": |
c613afdab571
IDE: Optimization of modification events processing in text editors.
Edouard Tisserant
parents:
3319
diff
changeset
|
846 |
self.StartBuffering() |
c613afdab571
IDE: Optimization of modification events processing in text editors.
Edouard Tisserant
parents:
3319
diff
changeset
|
847 |
self.Buffering == "On" |
c613afdab571
IDE: Optimization of modification events processing in text editors.
Edouard Tisserant
parents:
3319
diff
changeset
|
848 |
elif self.Buffering == "ShouldRestart": |
c613afdab571
IDE: Optimization of modification events processing in text editors.
Edouard Tisserant
parents:
3319
diff
changeset
|
849 |
self.EndBuffering() |
c613afdab571
IDE: Optimization of modification events processing in text editors.
Edouard Tisserant
parents:
3319
diff
changeset
|
850 |
self.StartBuffering() |
c613afdab571
IDE: Optimization of modification events processing in text editors.
Edouard Tisserant
parents:
3319
diff
changeset
|
851 |
self.Buffering == "On" |
c613afdab571
IDE: Optimization of modification events processing in text editors.
Edouard Tisserant
parents:
3319
diff
changeset
|
852 |
|
814 | 853 |
self.Controler.SetEditedElementText(self.TagName, self.GetText()) |
1178
3e2aebc9c7c0
Fixed search highlight bug in ST and Code text editors
Laurent Bessard
parents:
1126
diff
changeset
|
854 |
self.ResetSearchResults() |
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
855 |
|
3682
c613afdab571
IDE: Optimization of modification events processing in text editors.
Edouard Tisserant
parents:
3319
diff
changeset
|
856 |
def RefreshModelAfter(self): |
c613afdab571
IDE: Optimization of modification events processing in text editors.
Edouard Tisserant
parents:
3319
diff
changeset
|
857 |
if self.pending_model_refresh: |
c613afdab571
IDE: Optimization of modification events processing in text editors.
Edouard Tisserant
parents:
3319
diff
changeset
|
858 |
return |
c613afdab571
IDE: Optimization of modification events processing in text editors.
Edouard Tisserant
parents:
3319
diff
changeset
|
859 |
self.pending_model_refresh=True |
c613afdab571
IDE: Optimization of modification events processing in text editors.
Edouard Tisserant
parents:
3319
diff
changeset
|
860 |
wx.CallAfter(self.RefreshModel) |
c613afdab571
IDE: Optimization of modification events processing in text editors.
Edouard Tisserant
parents:
3319
diff
changeset
|
861 |
|
814 | 862 |
def OnKeyDown(self, event): |
1262
7b9259945453
Fixed bug with Copy/Paste in generated ST code Viewer
Laurent Bessard
parents:
1178
diff
changeset
|
863 |
key = event.GetKeyCode() |
814 | 864 |
if self.Controler is not None: |
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
865 |
|
814 | 866 |
if self.Editor.CallTipActive(): |
867 |
self.Editor.CallTipCancel() |
|
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
868 |
|
814 | 869 |
key_handled = False |
870 |
||
871 |
line = self.Editor.GetCurrentLine() |
|
872 |
if line == 0: |
|
873 |
start_pos = 0 |
|
874 |
else: |
|
875 |
start_pos = self.Editor.GetLineEndPosition(line - 1) + 1 |
|
876 |
end_pos = self.GetCurrentPos() |
|
877 |
lineText = self.Editor.GetTextRange(start_pos, end_pos).replace("\t", " ") |
|
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
878 |
|
814 | 879 |
# Code completion |
880 |
if key == wx.WXK_SPACE and event.ControlDown(): |
|
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
881 |
|
814 | 882 |
words = lineText.split(" ") |
883 |
words = [word for i, word in enumerate(words) if word != '' or i == len(words) - 1] |
|
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
884 |
|
814 | 885 |
kw = [] |
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
886 |
|
814 | 887 |
if self.TextSyntax == "IL": |
888 |
if len(words) == 1: |
|
889 |
kw = self.Keywords |
|
890 |
elif len(words) == 2: |
|
891 |
if words[0].upper() in ["CAL", "CALC", "CALNC"]: |
|
892 |
kw = self.Functions |
|
893 |
elif words[0].upper() in ["JMP", "JMPC", "JMPNC"]: |
|
894 |
kw = self.Jumps |
|
895 |
else: |
|
3750
f62625418bff
automated conversion using 2to3-3.9 tool
GP Orcullo <kinsamanka@gmail.com>
parents:
3688
diff
changeset
|
896 |
kw = list(self.Variables.keys()) |
f62625418bff
automated conversion using 2to3-3.9 tool
GP Orcullo <kinsamanka@gmail.com>
parents:
3688
diff
changeset
|
897 |
else: |
f62625418bff
automated conversion using 2to3-3.9 tool
GP Orcullo <kinsamanka@gmail.com>
parents:
3688
diff
changeset
|
898 |
kw = self.Keywords + list(self.Variables.keys()) + list(self.Functions.keys()) |
814 | 899 |
if len(kw) > 0: |
900 |
if len(words[-1]) > 0: |
|
901 |
kw = [keyword for keyword in kw if keyword.startswith(words[-1])] |
|
902 |
kw.sort() |
|
903 |
self.Editor.AutoCompSetIgnoreCase(True) |
|
904 |
self.Editor.AutoCompShow(len(words[-1]), " ".join(kw)) |
|
905 |
key_handled = True |
|
906 |
elif key == wx.WXK_RETURN or key == wx.WXK_NUMPAD_ENTER: |
|
907 |
if self.TextSyntax in ["ST", "ALL"]: |
|
908 |
indent = self.Editor.GetLineIndentation(line) |
|
909 |
if LineStartswith(lineText.strip(), self.BlockStartKeywords): |
|
2437
105c20fdeb19
python3 support: pylint, W1619 #(old-division) division w/o __future__ statement
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2432
diff
changeset
|
910 |
indent = (indent // 2 + 1) * 2 |
814 | 911 |
self.Editor.AddText("\n" + " " * indent) |
912 |
key_handled = True |
|
913 |
elif key == wx.WXK_BACK: |
|
914 |
if self.TextSyntax in ["ST", "ALL"]: |
|
1613
41ca586da9dc
fix strange behavior on Backspace press in ST
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1578
diff
changeset
|
915 |
if not self.Editor.GetSelectedText(): |
41ca586da9dc
fix strange behavior on Backspace press in ST
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1578
diff
changeset
|
916 |
indent = self.Editor.GetColumn(self.Editor.GetCurrentPos()) |
41ca586da9dc
fix strange behavior on Backspace press in ST
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1578
diff
changeset
|
917 |
if lineText.strip() == "" and len(lineText) > 0 and indent > 0: |
41ca586da9dc
fix strange behavior on Backspace press in ST
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1578
diff
changeset
|
918 |
self.Editor.DelLineLeft() |
2437
105c20fdeb19
python3 support: pylint, W1619 #(old-division) division w/o __future__ statement
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2432
diff
changeset
|
919 |
self.Editor.AddText(" " * ((max(0, indent - 1) // 2) * 2)) |
1613
41ca586da9dc
fix strange behavior on Backspace press in ST
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1578
diff
changeset
|
920 |
key_handled = True |
814 | 921 |
if not key_handled: |
922 |
event.Skip() |
|
1548
3ebc08f75fef
fix issue with non-working global hotkeys in IEC code panel
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1521
diff
changeset
|
923 |
else: |
1262
7b9259945453
Fixed bug with Copy/Paste in generated ST code Viewer
Laurent Bessard
parents:
1178
diff
changeset
|
924 |
event.Skip() |
814 | 925 |
|
926 |
def OnKillFocus(self, event): |
|
927 |
self.Editor.AutoCompCancel() |
|
928 |
event.Skip() |
|
929 |
||
1782
5b6ad7a7fd9d
clean-up: fix PEP8 E265 block comment should start with '# '
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1780
diff
changeset
|
930 |
# ------------------------------------------------------------------------------- |
5b6ad7a7fd9d
clean-up: fix PEP8 E265 block comment should start with '# '
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1780
diff
changeset
|
931 |
# Highlights showing functions |
5b6ad7a7fd9d
clean-up: fix PEP8 E265 block comment should start with '# '
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1780
diff
changeset
|
932 |
# ------------------------------------------------------------------------------- |
814 | 933 |
|
934 |
def OnRefreshHighlightsTimer(self, event): |
|
935 |
self.RefreshView() |
|
936 |
event.Skip() |
|
937 |
||
938 |
def ClearHighlights(self, highlight_type=None): |
|
939 |
EditorPanel.ClearHighlights(self, highlight_type) |
|
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
940 |
|
814 | 941 |
if highlight_type is None: |
942 |
self.Highlights = [] |
|
943 |
else: |
|
944 |
highlight_type = HIGHLIGHT_TYPES.get(highlight_type, None) |
|
945 |
if highlight_type is not None: |
|
946 |
self.Highlights = [(infos, start, end, highlight) for (infos, start, end, highlight) in self.Highlights if highlight != highlight_type] |
|
947 |
self.RefreshView() |
|
948 |
||
949 |
def AddHighlight(self, infos, start, end, highlight_type): |
|
950 |
EditorPanel.AddHighlight(self, infos, start, end, highlight_type) |
|
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
951 |
|
814 | 952 |
highlight_type = HIGHLIGHT_TYPES.get(highlight_type, None) |
953 |
if infos[0] == "body" and highlight_type is not None: |
|
954 |
self.Highlights.append((infos[1], start, end, highlight_type)) |
|
955 |
self.Editor.GotoPos(self.Editor.PositionFromLine(start[0]) + start[1]) |
|
956 |
self.RefreshHighlightsTimer.Start(int(REFRESH_HIGHLIGHT_PERIOD * 1000), oneShot=True) |
|
957 |
||
958 |
def RemoveHighlight(self, infos, start, end, highlight_type): |
|
959 |
EditorPanel.RemoveHighlight(self, infos, start, end, highlight_type) |
|
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
960 |
|
814 | 961 |
highlight_type = HIGHLIGHT_TYPES.get(highlight_type, None) |
1766
c1e5b9f19483
clean-up: fix PEP8 E129 visually indented line with same indent as next logical line
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1763
diff
changeset
|
962 |
if infos[0] == "body" and highlight_type is not None and \ |
c1e5b9f19483
clean-up: fix PEP8 E129 visually indented line with same indent as next logical line
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1763
diff
changeset
|
963 |
(infos[1], start, end, highlight_type) in self.Highlights: |
814 | 964 |
self.Highlights.remove((infos[1], start, end, highlight_type)) |
965 |
self.RefreshHighlightsTimer.Start(int(REFRESH_HIGHLIGHT_PERIOD * 1000), oneShot=True) |
|
1409
48f5f2a622c8
Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).
Edouard Tisserant
parents:
1406
diff
changeset
|
966 |
|
814 | 967 |
def ShowHighlights(self, start_pos, end_pos): |
968 |
for indent, start, end, highlight_type in self.Highlights: |
|
969 |
if start[0] == 0: |
|
970 |
highlight_start_pos = start[1] - indent |
|
971 |
else: |
|
972 |
highlight_start_pos = self.Editor.GetLineEndPosition(start[0] - 1) + start[1] - indent + 1 |
|
973 |
if end[0] == 0: |
|
974 |
highlight_end_pos = end[1] - indent + 1 |
|
975 |
else: |
|
976 |
highlight_end_pos = self.Editor.GetLineEndPosition(end[0] - 1) + end[1] - indent + 2 |
|
977 |
if highlight_start_pos < end_pos and highlight_end_pos > start_pos: |
|
3303
0ffb41625592
Preliminary support for WxPython 4.1.0. Needs more testing. Grid selection/focus seems broken, and probably many other bugs hidden in dialogs and editors.
Edouard Tisserant <edouard.tisserant@gmail.com>
parents:
2737
diff
changeset
|
978 |
self.StartStyling(highlight_start_pos) |
814 | 979 |
self.SetStyling(highlight_end_pos - highlight_start_pos, highlight_type) |
3303
0ffb41625592
Preliminary support for WxPython 4.1.0. Needs more testing. Grid selection/focus seems broken, and probably many other bugs hidden in dialogs and editors.
Edouard Tisserant <edouard.tisserant@gmail.com>
parents:
2737
diff
changeset
|
980 |
self.StartStyling(highlight_start_pos) |
2409
00d90ab8a462
Fix segmentation fault when last lines in text POUs should be highlighted
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2177
diff
changeset
|
981 |
until_end = max(0, len(self.Editor.GetText()) - highlight_end_pos) |
00d90ab8a462
Fix segmentation fault when last lines in text POUs should be highlighted
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2177
diff
changeset
|
982 |
self.SetStyling(until_end, wx.stc.STC_STYLE_DEFAULT) |