Skip to content

Commit ead1db2

Browse files
jethorntonjethornton
committed
add touch screen number pad
Signed-off-by: John Thornton <[email protected]>
1 parent a3e13a5 commit ead1db2

File tree

5 files changed

+56
-37
lines changed

5 files changed

+56
-37
lines changed

‎flexgui/src/flexgui

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ from libflexgui import status
2020
from libflexgui import dialogs
2121
from libflexgui import editor
2222

23+
2324
class flexgui(QMainWindow):
2425
def __init__(self):
2526
super().__init__()
@@ -170,7 +171,7 @@ class flexgui(QMainWindow):
170171
if event.button() == Qt.MouseButton.LeftButton:
171172
editor.show_line(self)
172173
if obj.objectName() == 'touchoff_le' and event.type() == QEvent.Type.MouseButtonRelease:
173-
print('touchoff_le')
174+
dialogs.numbers(self, self.touchoff_le)
174175
if obj.objectName() == 'tool_touchoff_le' and event.type() == QEvent.Type.MouseButtonRelease:
175176
print('tool_touchoff_le')
176177
return super(flexgui, self).eventFilter(obj, event)

‎flexgui/src/libflexgui/dialogs.py

+11
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,17 @@
55
from PyQt6.QtGui import QPixmap
66
from PyQt6.QtCore import Qt
77

8+
from libflexgui import number_pad
9+
10+
def numbers(parent, obj):
11+
np = number_pad.number_pad()
12+
stylesheet = os.path.join(parent.lib_path, 'touch.qss')
13+
with open(stylesheet,'r') as fh:
14+
np.setStyleSheet(fh.read())
15+
result = np.exec()
16+
if result:
17+
obj.setText(np.retval())
18+
819
def warn_msg_ok(text, title=None):
920
msg_box = QMessageBox()
1021
msg_box.setIcon(QMessageBox.Icon.Warning)

‎flexgui/src/libflexgui/number_pad.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ def dash(self):
4444

4545
def retval(self):
4646
try:
47-
return(float(self.numbers_lb.text()))
47+
return self.numbers_lb.text()
4848
except:
4949
return False
5050

‎flexgui/src/libflexgui/startup.py

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
from libflexgui import actions
1414
from libflexgui import commands
1515
from libflexgui import dialogs
16-
from libflexgui import number_pad
1716
from libflexgui import utilities
1817
from libflexgui import flexplot
1918

‎flexgui/src/num.ui renamed to ‎flexgui/src/numbers.ui

+42-34
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
14-
<string>Form</string>
14+
<string>Number Input</string>
1515
</property>
1616
<layout class="QGridLayout" name="gridLayout">
1717
<item row="4" column="1">
@@ -21,34 +21,56 @@
2121
</property>
2222
</widget>
2323
</item>
24-
<item row="7" column="2">
24+
<item row="9" column="2">
25+
<widget class="QPushButton" name="dash_pb">
26+
<property name="text">
27+
<string>-</string>
28+
</property>
29+
</widget>
30+
</item>
31+
<item row="8" column="2">
2532
<widget class="QPushButton" name="num_pb_3">
2633
<property name="text">
2734
<string>3</string>
2835
</property>
2936
</widget>
3037
</item>
31-
<item row="5" column="2">
38+
<item row="6" column="2">
3239
<widget class="QPushButton" name="num_pb_6">
3340
<property name="text">
3441
<string>6</string>
3542
</property>
3643
</widget>
3744
</item>
3845
<item row="0" column="0" colspan="3">
39-
<widget class="QLabel" name="label">
46+
<widget class="QLabel" name="numbers_lb">
47+
<property name="font">
48+
<font>
49+
<family>FreeMono</family>
50+
<pointsize>14</pointsize>
51+
<weight>75</weight>
52+
<bold>true</bold>
53+
</font>
54+
</property>
4055
<property name="frameShape">
4156
<enum>QFrame::Box</enum>
4257
</property>
4358
<property name="text">
44-
<string>TextLabel</string>
59+
<string/>
4560
</property>
4661
<property name="alignment">
4762
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
4863
</property>
4964
</widget>
5065
</item>
51-
<item row="7" column="1">
66+
<item row="10" column="0">
67+
<widget class="QPushButton" name="clear_pb">
68+
<property name="text">
69+
<string>Clear</string>
70+
</property>
71+
</widget>
72+
</item>
73+
<item row="8" column="1">
5274
<widget class="QPushButton" name="num_pb_2">
5375
<property name="text">
5476
<string>2</string>
@@ -69,59 +91,45 @@
6991
</property>
7092
</widget>
7193
</item>
72-
<item row="8" column="0">
94+
<item row="9" column="0">
7395
<widget class="QPushButton" name="num_pb_0">
7496
<property name="text">
7597
<string>0</string>
7698
</property>
7799
</widget>
78100
</item>
79-
<item row="5" column="0">
80-
<widget class="QPushButton" name="num_pb_5">
81-
<property name="text">
82-
<string>4</string>
83-
</property>
84-
</widget>
85-
</item>
86-
<item row="5" column="1">
87-
<widget class="QPushButton" name="num_pb_4">
88-
<property name="text">
89-
<string>5</string>
101+
<item row="10" column="1" colspan="2">
102+
<widget class="QDialogButtonBox" name="buttonBox">
103+
<property name="standardButtons">
104+
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Save</set>
90105
</property>
91106
</widget>
92107
</item>
93-
<item row="7" column="0">
108+
<item row="8" column="0">
94109
<widget class="QPushButton" name="num_pb_1">
95110
<property name="text">
96111
<string>1</string>
97112
</property>
98113
</widget>
99114
</item>
100-
<item row="8" column="2">
101-
<widget class="QPushButton" name="pushButton">
102-
<property name="text">
103-
<string>-</string>
104-
</property>
105-
</widget>
106-
</item>
107-
<item row="8" column="1">
108-
<widget class="QPushButton" name="pushButton_2">
115+
<item row="9" column="1">
116+
<widget class="QPushButton" name="dot_pb">
109117
<property name="text">
110118
<string>.</string>
111119
</property>
112120
</widget>
113121
</item>
114-
<item row="9" column="0">
115-
<widget class="QPushButton" name="pushButton_4">
122+
<item row="6" column="0">
123+
<widget class="QPushButton" name="num_pb_4">
116124
<property name="text">
117-
<string>Send</string>
125+
<string>4</string>
118126
</property>
119127
</widget>
120128
</item>
121-
<item row="9" column="2">
122-
<widget class="QPushButton" name="pushButton_3">
129+
<item row="6" column="1">
130+
<widget class="QPushButton" name="num_pb_5">
123131
<property name="text">
124-
<string>Clear</string>
132+
<string>5</string>
125133
</property>
126134
</widget>
127135
</item>

0 commit comments

Comments
 (0)