author | Edouard Tisserant <edouard.tisserant@gmail.com> |
Sun, 17 Jul 2022 17:49:34 +0200 | |
changeset 3547 | 8a9a7d180b93 |
parent 3303 | 0ffb41625592 |
child 3750 | f62625418bff |
permissions | -rw-r--r-- |
814 | 1 |
# -*- coding: utf-8 -*- |
2 |
||
1571
486f94a8032c
fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
941
diff
changeset
|
3 |
# 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:
941
diff
changeset
|
4 |
# programming IEC 61131-3 automates supporting plcopen standard and CanFestival. |
814 | 5 |
# |
1571
486f94a8032c
fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
941
diff
changeset
|
6 |
# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD |
814 | 7 |
# |
1571
486f94a8032c
fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
941
diff
changeset
|
8 |
# See COPYING file for copyrights details. |
814 | 9 |
# |
1571
486f94a8032c
fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
941
diff
changeset
|
10 |
# 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:
941
diff
changeset
|
11 |
# 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:
941
diff
changeset
|
12 |
# 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:
941
diff
changeset
|
13 |
# of the License, or (at your option) any later version. |
814 | 14 |
# |
1571
486f94a8032c
fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
941
diff
changeset
|
15 |
# 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:
941
diff
changeset
|
16 |
# 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:
941
diff
changeset
|
17 |
# 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:
941
diff
changeset
|
18 |
# GNU General Public License for more details. |
814 | 19 |
# |
1571
486f94a8032c
fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
941
diff
changeset
|
20 |
# 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:
941
diff
changeset
|
21 |
# 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:
941
diff
changeset
|
22 |
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
814 | 23 |
|
1881
091005ec69c4
fix pylint py3k conversion warning: "(no-absolute-import) import missing `from __future__ import absolute_import`"
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1846
diff
changeset
|
24 |
|
091005ec69c4
fix pylint py3k conversion warning: "(no-absolute-import) import missing `from __future__ import absolute_import`"
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1846
diff
changeset
|
25 |
from __future__ import absolute_import |
814 | 26 |
import re |
27 |
import datetime |
|
2434
07f48018b6f5
python3 support: pylint, W1612 # (unicode-builtin) unicode built-in referenced
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1881
diff
changeset
|
28 |
from builtins import str as text |
814 | 29 |
|
30 |
import wx |
|
31 |
||
1782
5b6ad7a7fd9d
clean-up: fix PEP8 E265 block comment should start with '# '
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1780
diff
changeset
|
32 |
# ------------------------------------------------------------------------------- |
814 | 33 |
# Helpers |
1782
5b6ad7a7fd9d
clean-up: fix PEP8 E265 block comment should start with '# '
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1780
diff
changeset
|
34 |
# ------------------------------------------------------------------------------- |
814 | 35 |
|
1739
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1736
diff
changeset
|
36 |
LOCATIONDATATYPES = {"X": ["BOOL"], |
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1736
diff
changeset
|
37 |
"B": ["SINT", "USINT", "BYTE", "STRING"], |
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1736
diff
changeset
|
38 |
"W": ["INT", "UINT", "WORD", "WSTRING"], |
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1736
diff
changeset
|
39 |
"D": ["DINT", "UDINT", "REAL", "DWORD"], |
ec153828ded2
clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1736
diff
changeset
|
40 |
"L": ["LINT", "ULINT", "LREAL", "LWORD"]} |
814 | 41 |
|
1736
7e61baa047f0
clean-up: fix PEP8 E302 expected 2 blank lines, found 1
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1730
diff
changeset
|
42 |
|
814 | 43 |
def gen_get_function(f): |
44 |
def get_function(v): |
|
45 |
try: |
|
46 |
return f(v) |
|
1780
c52d1460cea8
clean-up: fix PEP8 E722 do not use bare except'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1768
diff
changeset
|
47 |
except Exception: |
814 | 48 |
return None |
49 |
return get_function |
|
50 |
||
1736
7e61baa047f0
clean-up: fix PEP8 E302 expected 2 blank lines, found 1
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1730
diff
changeset
|
51 |
|
878
37256069baed
Fix display of string variables value in debug
Laurent Bessard
parents:
814
diff
changeset
|
52 |
def gen_get_string(delimiter): |
37256069baed
Fix display of string variables value in debug
Laurent Bessard
parents:
814
diff
changeset
|
53 |
STRING_MODEL = re.compile("%(delimiter)s([^%(delimiter)s]*)%(delimiter)s$" % {"delimiter": delimiter}) |
1750
acf02488f37f
clean-up: fix PEP8 E306 expected 1 blank line before a nested definition, found X
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1749
diff
changeset
|
54 |
|
878
37256069baed
Fix display of string variables value in debug
Laurent Bessard
parents:
814
diff
changeset
|
55 |
def get_string(v): |
37256069baed
Fix display of string variables value in debug
Laurent Bessard
parents:
814
diff
changeset
|
56 |
result = STRING_MODEL.match(v) |
37256069baed
Fix display of string variables value in debug
Laurent Bessard
parents:
814
diff
changeset
|
57 |
if result is not None: |
37256069baed
Fix display of string variables value in debug
Laurent Bessard
parents:
814
diff
changeset
|
58 |
return result.group(1) |
37256069baed
Fix display of string variables value in debug
Laurent Bessard
parents:
814
diff
changeset
|
59 |
return None |
37256069baed
Fix display of string variables value in debug
Laurent Bessard
parents:
814
diff
changeset
|
60 |
return get_string |
37256069baed
Fix display of string variables value in debug
Laurent Bessard
parents:
814
diff
changeset
|
61 |
|
1749
d73b64672238
clean-up: fix PEP8 E305 expected 2 blank lines after class or function definition
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1745
diff
changeset
|
62 |
|
814 | 63 |
getinteger = gen_get_function(int) |
64 |
getfloat = gen_get_function(float) |
|
878
37256069baed
Fix display of string variables value in debug
Laurent Bessard
parents:
814
diff
changeset
|
65 |
getstring = gen_get_string("'") |
37256069baed
Fix display of string variables value in debug
Laurent Bessard
parents:
814
diff
changeset
|
66 |
getwstring = gen_get_string('"') |
814 | 67 |
|
68 |
SECOND = 1000000 |
|
69 |
MINUTE = 60 * SECOND |
|
70 |
HOUR = 60 * MINUTE |
|
71 |
DAY = 24 * HOUR |
|
72 |
||
2439
f0a040f1de1b
Fix pep8 warning: W605 invalid escape sequence ?x?
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2434
diff
changeset
|
73 |
IEC_TIME_MODEL = re.compile(r"(?:(?:T|TIME)#)?(-)?(?:(%(float)s)D_?)?(?:(%(float)s)H_?)?(?:(%(float)s)M(?!S)_?)?(?:(%(float)s)S_?)?(?:(%(float)s)MS)?$" % {"float": r"[0-9]+(?:\.[0-9]+)?"}) |
f0a040f1de1b
Fix pep8 warning: W605 invalid escape sequence ?x?
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2434
diff
changeset
|
74 |
IEC_DATE_MODEL = re.compile(r"(?:(?:D|DATE)#)?([0-9]{4})-([0-9]{2})-([0-9]{2})$") |
f0a040f1de1b
Fix pep8 warning: W605 invalid escape sequence ?x?
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2434
diff
changeset
|
75 |
IEC_DATETIME_MODEL = re.compile(r"(?:(?:DT|DATE_AND_TIME)#)?([0-9]{4})-([0-9]{2})-([0-9]{2})-([0-9]{2}):([0-9]{2}):([0-9]{2}(?:\.[0-9]+)?)$") |
f0a040f1de1b
Fix pep8 warning: W605 invalid escape sequence ?x?
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2434
diff
changeset
|
76 |
IEC_TIMEOFDAY_MODEL = re.compile(r"(?:(?:TOD|TIME_OF_DAY)#)?([0-9]{2}):([0-9]{2}):([0-9]{2}(?:\.[0-9]+)?)$") |
814 | 77 |
|
1736
7e61baa047f0
clean-up: fix PEP8 E302 expected 2 blank lines, found 1
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1730
diff
changeset
|
78 |
|
1730
64d8f52bc8c8
clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1701
diff
changeset
|
79 |
def gettime(v): |
814 | 80 |
result = IEC_TIME_MODEL.match(v.upper()) |
81 |
if result is not None: |
|
82 |
negative, days, hours, minutes, seconds, milliseconds = result.groups() |
|
83 |
microseconds = 0 |
|
84 |
not_null = False |
|
85 |
for value, factor in [(days, DAY), |
|
86 |
(hours, HOUR), |
|
87 |
(minutes, MINUTE), |
|
88 |
(seconds, SECOND), |
|
89 |
(milliseconds, 1000)]: |
|
90 |
if value is not None: |
|
91 |
microseconds += float(value) * factor |
|
92 |
not_null = True |
|
93 |
if not not_null: |
|
94 |
return None |
|
95 |
if negative is not None: |
|
96 |
microseconds = -microseconds |
|
97 |
return datetime.timedelta(microseconds=microseconds) |
|
1730
64d8f52bc8c8
clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1701
diff
changeset
|
98 |
|
64d8f52bc8c8
clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1701
diff
changeset
|
99 |
else: |
814 | 100 |
return None |
101 |
||
1736
7e61baa047f0
clean-up: fix PEP8 E302 expected 2 blank lines, found 1
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1730
diff
changeset
|
102 |
|
814 | 103 |
def getdate(v): |
104 |
result = IEC_DATE_MODEL.match(v.upper()) |
|
105 |
if result is not None: |
|
106 |
year, month, day = result.groups() |
|
107 |
try: |
|
108 |
date = datetime.datetime(int(year), int(month), int(day)) |
|
1846
14b40afccd69
remove unused variables found by pylint
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1782
diff
changeset
|
109 |
except ValueError: |
814 | 110 |
return None |
111 |
base_date = datetime.datetime(1970, 1, 1) |
|
112 |
return date - base_date |
|
1730
64d8f52bc8c8
clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1701
diff
changeset
|
113 |
else: |
814 | 114 |
return None |
115 |
||
1736
7e61baa047f0
clean-up: fix PEP8 E302 expected 2 blank lines, found 1
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1730
diff
changeset
|
116 |
|
814 | 117 |
def getdatetime(v): |
118 |
result = IEC_DATETIME_MODEL.match(v.upper()) |
|
119 |
if result is not None: |
|
120 |
year, month, day, hours, minutes, seconds = result.groups() |
|
121 |
try: |
|
941
b6e93549de2e
Fixed bug ForceVariableDialog when forcing DATETIME variables
Laurent Bessard
parents:
878
diff
changeset
|
122 |
date = datetime.datetime(int(year), int(month), int(day), int(hours), int(minutes), int(float(seconds)), int((float(seconds) * SECOND) % SECOND)) |
1846
14b40afccd69
remove unused variables found by pylint
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1782
diff
changeset
|
123 |
except ValueError: |
814 | 124 |
return None |
125 |
base_date = datetime.datetime(1970, 1, 1) |
|
126 |
return date - base_date |
|
1730
64d8f52bc8c8
clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1701
diff
changeset
|
127 |
else: |
814 | 128 |
return None |
129 |
||
1736
7e61baa047f0
clean-up: fix PEP8 E302 expected 2 blank lines, found 1
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1730
diff
changeset
|
130 |
|
814 | 131 |
def gettimeofday(v): |
132 |
result = IEC_TIMEOFDAY_MODEL.match(v.upper()) |
|
133 |
if result is not None: |
|
134 |
hours, minutes, seconds = result.groups() |
|
135 |
microseconds = 0 |
|
136 |
for value, factor in [(hours, HOUR), |
|
137 |
(minutes, MINUTE), |
|
138 |
(seconds, SECOND)]: |
|
139 |
microseconds += float(value) * factor |
|
140 |
return datetime.timedelta(microseconds=microseconds) |
|
141 |
else: |
|
142 |
return None |
|
143 |
||
1749
d73b64672238
clean-up: fix PEP8 E305 expected 2 blank lines after class or function definition
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1745
diff
changeset
|
144 |
|
814 | 145 |
GetTypeValue = {"BOOL": lambda x: {"TRUE": True, "FALSE": False, "0": False, "1": True}.get(x.upper(), None), |
146 |
"SINT": getinteger, |
|
147 |
"INT": getinteger, |
|
148 |
"DINT": getinteger, |
|
149 |
"LINT": getinteger, |
|
150 |
"USINT": getinteger, |
|
151 |
"UINT": getinteger, |
|
152 |
"UDINT": getinteger, |
|
153 |
"ULINT": getinteger, |
|
154 |
"BYTE": getinteger, |
|
155 |
"WORD": getinteger, |
|
156 |
"DWORD": getinteger, |
|
157 |
"LWORD": getinteger, |
|
158 |
"REAL": getfloat, |
|
159 |
"LREAL": getfloat, |
|
160 |
"STRING": getstring, |
|
878
37256069baed
Fix display of string variables value in debug
Laurent Bessard
parents:
814
diff
changeset
|
161 |
"WSTRING": getwstring, |
814 | 162 |
"TIME": gettime, |
163 |
"DATE": getdate, |
|
164 |
"DT": getdatetime, |
|
165 |
"TOD": gettimeofday} |
|
166 |
||
1782
5b6ad7a7fd9d
clean-up: fix PEP8 E265 block comment should start with '# '
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1780
diff
changeset
|
167 |
# ------------------------------------------------------------------------------- |
814 | 168 |
# Force Variable Dialog |
1782
5b6ad7a7fd9d
clean-up: fix PEP8 E265 block comment should start with '# '
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1780
diff
changeset
|
169 |
# ------------------------------------------------------------------------------- |
814 | 170 |
|
1736
7e61baa047f0
clean-up: fix PEP8 E302 expected 2 blank lines, found 1
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1730
diff
changeset
|
171 |
|
2508
9076249f11eb
Rewrite ForceVariableDialog. It's not based on wx.TextEntryDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2439
diff
changeset
|
172 |
class ForceVariableDialog(wx.Dialog): |
9076249f11eb
Rewrite ForceVariableDialog. It's not based on wx.TextEntryDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2439
diff
changeset
|
173 |
"""Dialog to enforce new value for variables in debug panel""" |
814 | 174 |
|
175 |
def __init__(self, parent, iec_type, defaultValue=""): |
|
2513
1ee326651a74
Add SpinButtons for integer and floating point variables in ForceVariableDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2511
diff
changeset
|
176 |
""" |
1ee326651a74
Add SpinButtons for integer and floating point variables in ForceVariableDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2511
diff
changeset
|
177 |
Constructor |
1ee326651a74
Add SpinButtons for integer and floating point variables in ForceVariableDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2511
diff
changeset
|
178 |
@param parent: Parent wx.Window of dialog for modal |
1ee326651a74
Add SpinButtons for integer and floating point variables in ForceVariableDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2511
diff
changeset
|
179 |
@param iec_type: IEC type of variable (string). For example 'BOOL', 'LREAL'. |
1ee326651a74
Add SpinButtons for integer and floating point variables in ForceVariableDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2511
diff
changeset
|
180 |
@param defaultValue: current variable value as string. Default is empty string. |
1ee326651a74
Add SpinButtons for integer and floating point variables in ForceVariableDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2511
diff
changeset
|
181 |
""" |
2508
9076249f11eb
Rewrite ForceVariableDialog. It's not based on wx.TextEntryDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2439
diff
changeset
|
182 |
wx.Dialog.__init__( |
1768
691083b5682a
clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1750
diff
changeset
|
183 |
self, parent, |
2508
9076249f11eb
Rewrite ForceVariableDialog. It's not based on wx.TextEntryDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2439
diff
changeset
|
184 |
name='ForceVariableDialog', |
9076249f11eb
Rewrite ForceVariableDialog. It's not based on wx.TextEntryDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2439
diff
changeset
|
185 |
title=_("Please enter value for a \"%s\" variable:") % iec_type, |
9076249f11eb
Rewrite ForceVariableDialog. It's not based on wx.TextEntryDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2439
diff
changeset
|
186 |
style=wx.DEFAULT_DIALOG_STYLE, pos=wx.DefaultPosition) |
1730
64d8f52bc8c8
clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1701
diff
changeset
|
187 |
|
64d8f52bc8c8
clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1701
diff
changeset
|
188 |
self.IEC_Type = iec_type |
2508
9076249f11eb
Rewrite ForceVariableDialog. It's not based on wx.TextEntryDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2439
diff
changeset
|
189 |
info_sizer = wx.BoxSizer(wx.VERTICAL) |
9076249f11eb
Rewrite ForceVariableDialog. It's not based on wx.TextEntryDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2439
diff
changeset
|
190 |
|
9076249f11eb
Rewrite ForceVariableDialog. It's not based on wx.TextEntryDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2439
diff
changeset
|
191 |
message_label = wx.StaticText(self, label=_("Forcing Variable Value")) |
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:
2513
diff
changeset
|
192 |
info_sizer.Add(message_label, border=10, |
2508
9076249f11eb
Rewrite ForceVariableDialog. It's not based on wx.TextEntryDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2439
diff
changeset
|
193 |
flag=wx.ALIGN_LEFT | wx.GROW | wx.TOP | wx.LEFT | wx.RIGHT) |
9076249f11eb
Rewrite ForceVariableDialog. It's not based on wx.TextEntryDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2439
diff
changeset
|
194 |
|
2513
1ee326651a74
Add SpinButtons for integer and floating point variables in ForceVariableDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2511
diff
changeset
|
195 |
if GetTypeValue[self.IEC_Type] in [getinteger, getfloat]: |
1ee326651a74
Add SpinButtons for integer and floating point variables in ForceVariableDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2511
diff
changeset
|
196 |
self.InitCtrlNumber(info_sizer, defaultValue) |
1ee326651a74
Add SpinButtons for integer and floating point variables in ForceVariableDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2511
diff
changeset
|
197 |
elif self.IEC_Type == "BOOL": |
1ee326651a74
Add SpinButtons for integer and floating point variables in ForceVariableDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2511
diff
changeset
|
198 |
self.InitCtrlBool(info_sizer, defaultValue) |
1ee326651a74
Add SpinButtons for integer and floating point variables in ForceVariableDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2511
diff
changeset
|
199 |
else: |
1ee326651a74
Add SpinButtons for integer and floating point variables in ForceVariableDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2511
diff
changeset
|
200 |
self.InitCtrlDefault(info_sizer, defaultValue) |
1ee326651a74
Add SpinButtons for integer and floating point variables in ForceVariableDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2511
diff
changeset
|
201 |
self.GetEnteredValue = self.GetValueDefault |
1701
8337f6c169d0
add button to ForceVariableDialog to toggle forced boolean value
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1581
diff
changeset
|
202 |
|
2508
9076249f11eb
Rewrite ForceVariableDialog. It's not based on wx.TextEntryDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2439
diff
changeset
|
203 |
button_sizer = self.CreateButtonSizer(wx.OK | wx.CANCEL | wx.CENTRE) |
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:
2513
diff
changeset
|
204 |
self.Bind(wx.EVT_BUTTON, self.OnOK, id=self.GetAffirmativeId()) |
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:
2513
diff
changeset
|
205 |
info_sizer.Add(button_sizer, border=10, flag=wx.ALIGN_RIGHT | wx.ALL) |
2508
9076249f11eb
Rewrite ForceVariableDialog. It's not based on wx.TextEntryDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2439
diff
changeset
|
206 |
|
9076249f11eb
Rewrite ForceVariableDialog. It's not based on wx.TextEntryDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2439
diff
changeset
|
207 |
self.SetSizer(info_sizer) |
1701
8337f6c169d0
add button to ForceVariableDialog to toggle forced boolean value
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1581
diff
changeset
|
208 |
self.Fit() |
2513
1ee326651a74
Add SpinButtons for integer and floating point variables in ForceVariableDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2511
diff
changeset
|
209 |
self.ValueCtrl.SetFocus() |
1ee326651a74
Add SpinButtons for integer and floating point variables in ForceVariableDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2511
diff
changeset
|
210 |
|
1ee326651a74
Add SpinButtons for integer and floating point variables in ForceVariableDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2511
diff
changeset
|
211 |
# --------------------------------- |
1ee326651a74
Add SpinButtons for integer and floating point variables in ForceVariableDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2511
diff
changeset
|
212 |
# default type methods |
1ee326651a74
Add SpinButtons for integer and floating point variables in ForceVariableDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2511
diff
changeset
|
213 |
# --------------------------------- |
1ee326651a74
Add SpinButtons for integer and floating point variables in ForceVariableDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2511
diff
changeset
|
214 |
|
1ee326651a74
Add SpinButtons for integer and floating point variables in ForceVariableDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2511
diff
changeset
|
215 |
def InitCtrlDefault(self, info_sizer, defaultValue): |
1ee326651a74
Add SpinButtons for integer and floating point variables in ForceVariableDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2511
diff
changeset
|
216 |
"""Add simple text control to change variable of any type""" |
1ee326651a74
Add SpinButtons for integer and floating point variables in ForceVariableDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2511
diff
changeset
|
217 |
self.ValueCtrl = wx.TextCtrl(self) |
1ee326651a74
Add SpinButtons for integer and floating point variables in ForceVariableDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2511
diff
changeset
|
218 |
self.ValueCtrl.SetValue(defaultValue) |
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:
2513
diff
changeset
|
219 |
info_sizer.Add(self.ValueCtrl, border=10, proportion=1, |
2513
1ee326651a74
Add SpinButtons for integer and floating point variables in ForceVariableDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2511
diff
changeset
|
220 |
flag=wx.ALIGN_LEFT | wx.GROW | wx.TOP | wx.LEFT | wx.RIGHT) |
1ee326651a74
Add SpinButtons for integer and floating point variables in ForceVariableDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2511
diff
changeset
|
221 |
|
1ee326651a74
Add SpinButtons for integer and floating point variables in ForceVariableDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2511
diff
changeset
|
222 |
def GetValueDefault(self): |
1ee326651a74
Add SpinButtons for integer and floating point variables in ForceVariableDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2511
diff
changeset
|
223 |
""" |
1ee326651a74
Add SpinButtons for integer and floating point variables in ForceVariableDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2511
diff
changeset
|
224 |
Returns text representation for a variable value |
1ee326651a74
Add SpinButtons for integer and floating point variables in ForceVariableDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2511
diff
changeset
|
225 |
@return: variable value as a string |
1ee326651a74
Add SpinButtons for integer and floating point variables in ForceVariableDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2511
diff
changeset
|
226 |
""" |
1ee326651a74
Add SpinButtons for integer and floating point variables in ForceVariableDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2511
diff
changeset
|
227 |
return text(self.ValueCtrl.GetValue()) |
1ee326651a74
Add SpinButtons for integer and floating point variables in ForceVariableDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2511
diff
changeset
|
228 |
|
1ee326651a74
Add SpinButtons for integer and floating point variables in ForceVariableDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2511
diff
changeset
|
229 |
# ----------------------------------------------- |
1ee326651a74
Add SpinButtons for integer and floating point variables in ForceVariableDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2511
diff
changeset
|
230 |
# integer and floating point number type methods |
1ee326651a74
Add SpinButtons for integer and floating point variables in ForceVariableDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2511
diff
changeset
|
231 |
# ---------------------------------------------- |
1ee326651a74
Add SpinButtons for integer and floating point variables in ForceVariableDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2511
diff
changeset
|
232 |
|
1ee326651a74
Add SpinButtons for integer and floating point variables in ForceVariableDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2511
diff
changeset
|
233 |
def InitCtrlNumber(self, info_sizer, defaultValue): |
1ee326651a74
Add SpinButtons for integer and floating point variables in ForceVariableDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2511
diff
changeset
|
234 |
"""Add controls to change float and integer variables""" |
1ee326651a74
Add SpinButtons for integer and floating point variables in ForceVariableDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2511
diff
changeset
|
235 |
sizer = wx.BoxSizer(wx.HORIZONTAL) |
1ee326651a74
Add SpinButtons for integer and floating point variables in ForceVariableDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2511
diff
changeset
|
236 |
self.InitCtrlDefault(sizer, defaultValue) |
1ee326651a74
Add SpinButtons for integer and floating point variables in ForceVariableDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2511
diff
changeset
|
237 |
self.SpinButtonCtrl = wx.SpinButton(self, style=wx.HORIZONTAL | wx.SP_WRAP) |
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:
2513
diff
changeset
|
238 |
sizer.Add(self.SpinButtonCtrl, border=10, |
2513
1ee326651a74
Add SpinButtons for integer and floating point variables in ForceVariableDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2511
diff
changeset
|
239 |
flag=wx.ALIGN_LEFT | wx.GROW | wx.TOP | wx.LEFT | wx.RIGHT | wx.EXPAND) |
1ee326651a74
Add SpinButtons for integer and floating point variables in ForceVariableDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2511
diff
changeset
|
240 |
self.Bind(wx.EVT_SPIN_UP, self.SpinButtonChanged) |
1ee326651a74
Add SpinButtons for integer and floating point variables in ForceVariableDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2511
diff
changeset
|
241 |
self.Bind(wx.EVT_SPIN_DOWN, self.SpinButtonChanged) |
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:
2513
diff
changeset
|
242 |
info_sizer.Add(sizer, proportion=1, flag=wx.EXPAND) |
2513
1ee326651a74
Add SpinButtons for integer and floating point variables in ForceVariableDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2511
diff
changeset
|
243 |
|
1ee326651a74
Add SpinButtons for integer and floating point variables in ForceVariableDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2511
diff
changeset
|
244 |
def SpinButtonChanged(self, evt): |
1ee326651a74
Add SpinButtons for integer and floating point variables in ForceVariableDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2511
diff
changeset
|
245 |
"""Increment/decrement variable value""" |
1ee326651a74
Add SpinButtons for integer and floating point variables in ForceVariableDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2511
diff
changeset
|
246 |
value = self.GetValue() |
1ee326651a74
Add SpinButtons for integer and floating point variables in ForceVariableDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2511
diff
changeset
|
247 |
if value is not None: |
1ee326651a74
Add SpinButtons for integer and floating point variables in ForceVariableDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2511
diff
changeset
|
248 |
up = evt.GetEventType() == wx.EVT_SPIN_UP._getEvtType() |
1ee326651a74
Add SpinButtons for integer and floating point variables in ForceVariableDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2511
diff
changeset
|
249 |
value = value + 1 if up else value - 1 |
1ee326651a74
Add SpinButtons for integer and floating point variables in ForceVariableDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2511
diff
changeset
|
250 |
self.ValueCtrl.SetValue(text(value)) |
1ee326651a74
Add SpinButtons for integer and floating point variables in ForceVariableDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2511
diff
changeset
|
251 |
evt.Skip() |
1ee326651a74
Add SpinButtons for integer and floating point variables in ForceVariableDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2511
diff
changeset
|
252 |
|
1ee326651a74
Add SpinButtons for integer and floating point variables in ForceVariableDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2511
diff
changeset
|
253 |
# ----------------------------------------------- |
1ee326651a74
Add SpinButtons for integer and floating point variables in ForceVariableDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2511
diff
changeset
|
254 |
# bool type related methods |
1ee326651a74
Add SpinButtons for integer and floating point variables in ForceVariableDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2511
diff
changeset
|
255 |
# ---------------------------------------------- |
1ee326651a74
Add SpinButtons for integer and floating point variables in ForceVariableDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2511
diff
changeset
|
256 |
|
1ee326651a74
Add SpinButtons for integer and floating point variables in ForceVariableDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2511
diff
changeset
|
257 |
def InitCtrlBool(self, info_sizer, defaultValue): |
1ee326651a74
Add SpinButtons for integer and floating point variables in ForceVariableDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2511
diff
changeset
|
258 |
"""Add button to change value of boolean variable""" |
1ee326651a74
Add SpinButtons for integer and floating point variables in ForceVariableDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2511
diff
changeset
|
259 |
self.ValueCtrl = wx.ToggleButton(self, label=_("Toggle value")) |
1ee326651a74
Add SpinButtons for integer and floating point variables in ForceVariableDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2511
diff
changeset
|
260 |
value = GetTypeValue[self.IEC_Type](defaultValue) |
1ee326651a74
Add SpinButtons for integer and floating point variables in ForceVariableDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2511
diff
changeset
|
261 |
if value is not None: |
1ee326651a74
Add SpinButtons for integer and floating point variables in ForceVariableDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2511
diff
changeset
|
262 |
self.ValueCtrl.SetValue(value) |
1ee326651a74
Add SpinButtons for integer and floating point variables in ForceVariableDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2511
diff
changeset
|
263 |
|
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:
2513
diff
changeset
|
264 |
info_sizer.Add(self.ValueCtrl, border=10, |
2513
1ee326651a74
Add SpinButtons for integer and floating point variables in ForceVariableDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2511
diff
changeset
|
265 |
flag=wx.ALIGN_LEFT | wx.GROW | wx.TOP | wx.LEFT | wx.RIGHT | wx.GROW) |
1701
8337f6c169d0
add button to ForceVariableDialog to toggle forced boolean value
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1581
diff
changeset
|
266 |
|
814 | 267 |
def OnOK(self, event): |
2511
d6e0442a3986
Don't close ForceVariableDialog if user entered wrong new value
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2510
diff
changeset
|
268 |
""" |
d6e0442a3986
Don't close ForceVariableDialog if user entered wrong new value
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2510
diff
changeset
|
269 |
Checks new entered value |
d6e0442a3986
Don't close ForceVariableDialog if user entered wrong new value
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2510
diff
changeset
|
270 |
before closing dialog window |
d6e0442a3986
Don't close ForceVariableDialog if user entered wrong new value
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2510
diff
changeset
|
271 |
""" |
814 | 272 |
message = None |
2511
d6e0442a3986
Don't close ForceVariableDialog if user entered wrong new value
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2510
diff
changeset
|
273 |
ret = True |
2513
1ee326651a74
Add SpinButtons for integer and floating point variables in ForceVariableDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2511
diff
changeset
|
274 |
value = self.GetEnteredValue() |
814 | 275 |
if value == "": |
276 |
message = _("You must type a value!") |
|
277 |
elif GetTypeValue[self.IEC_Type](value) is None: |
|
1744
69dfdb26f600
clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1742
diff
changeset
|
278 |
message = _("Invalid value \"{a1}\" for \"{a2}\" variable!").format(a1=value, a2=self.IEC_Type) |
814 | 279 |
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
|
280 |
dialog = wx.MessageDialog(self, message, _("Error"), wx.OK | wx.ICON_ERROR) |
814 | 281 |
dialog.ShowModal() |
282 |
dialog.Destroy() |
|
2511
d6e0442a3986
Don't close ForceVariableDialog if user entered wrong new value
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2510
diff
changeset
|
283 |
ret = False |
814 | 284 |
else: |
285 |
self.EndModal(wx.ID_OK) |
|
2511
d6e0442a3986
Don't close ForceVariableDialog if user entered wrong new value
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2510
diff
changeset
|
286 |
event.Skip(ret) |
814 | 287 |
|
288 |
def GetValue(self): |
|
2510
4f78f0e201d9
Additional fix for rewrite ForceVariableDialog commit (9076249f)
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2508
diff
changeset
|
289 |
""" |
4f78f0e201d9
Additional fix for rewrite ForceVariableDialog commit (9076249f)
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2508
diff
changeset
|
290 |
Return new enforce value of particular type |
4f78f0e201d9
Additional fix for rewrite ForceVariableDialog commit (9076249f)
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2508
diff
changeset
|
291 |
""" |
2513
1ee326651a74
Add SpinButtons for integer and floating point variables in ForceVariableDialog
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2511
diff
changeset
|
292 |
return GetTypeValue[self.IEC_Type](self.GetEnteredValue()) |