Skip to content

Commit 9e373e8

Browse files
Sylwester DawidaSylwester Dawida
Sylwester Dawida
authored and
Sylwester Dawida
committed
update
1 parent a44eeba commit 9e373e8

File tree

2 files changed

+53
-6
lines changed

2 files changed

+53
-6
lines changed

python/.idea/workspace.xml

-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

python/gui.py

+53-1
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,16 @@ def setupUi(self, RobotController):
5656
self.pushButton_2.setFont(font)
5757
self.pushButton_2.setAcceptDrops(False)
5858
self.pushButton_2.setObjectName("pushButton_2")
59+
60+
self.pushButton_4 = QtWidgets.QPushButton(self.centralwidget)
61+
self.pushButton_4.setGeometry(QtCore.QRect(1200, 48, 80, 60))
62+
font = QtGui.QFont()
63+
font.setFamily("Arial")
64+
font.setPointSize(15)
65+
self.pushButton_4.setFont(font)
66+
self.pushButton_4.setAcceptDrops(False)
67+
self.pushButton_4.setObjectName("pushButton_4")
68+
5969
self.textBrowser = QtWidgets.QTextBrowser(self.centralwidget)
6070
self.textBrowser.setGeometry(QtCore.QRect(50, 230, 500, 280))
6171
font = QtGui.QFont()
@@ -77,6 +87,13 @@ def setupUi(self, RobotController):
7787
self.fps.setFont(font)
7888
self.fps.setLayoutDirection(QtCore.Qt.LeftToRight)
7989

90+
self.capturing = QtWidgets.QLabel(self.centralwidget)
91+
self.capturing.setGeometry(QtCore.QRect(1000, 50, 381, 61))
92+
font = QtGui.QFont()
93+
font.setPointSize(13)
94+
self.capturing.setFont(font)
95+
self.capturing.setLayoutDirection(QtCore.Qt.LeftToRight)
96+
8097
self.label.setObjectName("label")
8198
self.graphicsView = QtWidgets.QLabel(self.centralwidget)
8299
self.graphicsView.setGeometry(QtCore.QRect(700, 60, 800, 600))
@@ -100,6 +117,15 @@ def setupUi(self, RobotController):
100117
self.statusbar.setObjectName("statusbar")
101118
RobotController.setStatusBar(self.statusbar)
102119

120+
font.setPointSize(12)
121+
self.label_4 = QtWidgets.QLabel(self.centralwidget)
122+
self.label_4.setGeometry(QtCore.QRect(490, 110, 200, 41))
123+
self.label_4.setFont(font)
124+
self.label_4.setLayoutDirection(QtCore.Qt.LeftToRight)
125+
self.label_4.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignVCenter)
126+
self.label_4.setObjectName("Capture probabilities")
127+
self.label_4.setText("Capture probabilities:")
128+
103129
self.retranslateUi(RobotController)
104130
QtCore.QMetaObject.connectSlotsByName(RobotController)
105131

@@ -113,11 +139,28 @@ def setupUi(self, RobotController):
113139
self.connectionInProgress = False
114140
self.pushButton.clicked.connect(self.connect)
115141
self.pushButton3.clicked.connect(self.emergencyStop)
142+
self.pushButton_4.clicked.connect(self.capture)
143+
144+
self.gesturesLabels = []
145+
146+
font = QtGui.QFont()
147+
font.setPointSize(10)
116148

117149
self.print("Application started")
118150
self.comboBox.addItem("None", 1)
151+
offset = 30
152+
i = 0
119153
for val in self.commands.commands:
120154
self.comboBox.addItem(val.name, val.value)
155+
label_2 = QtWidgets.QLabel(self.centralwidget)
156+
label_2.setGeometry(QtCore.QRect(560, 150 + i*offset, 130, 41))
157+
label_2.setFont(font)
158+
label_2.setLayoutDirection(QtCore.Qt.LeftToRight)
159+
label_2.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignVCenter)
160+
label_2.setObjectName(val.name)
161+
label_2.setText(val.name)
162+
self.gesturesLabels.append(label_2)
163+
i += 1
121164

122165
self.pushButton_2.clicked.connect(self.send)
123166

@@ -126,7 +169,7 @@ def setupUi(self, RobotController):
126169
self.recognition.signals.result.connect(self.getRecognitionResult)
127170

128171
self.finished = self.recognition.signals.finished
129-
172+
self.gesturesCapturing = False
130173
self.recognition.start()
131174

132175
def retranslateUi(self, RobotController):
@@ -135,10 +178,19 @@ def retranslateUi(self, RobotController):
135178
self.pushButton.setText(_translate("RobotController", "Connect"))
136179
self.pushButton_2.setText(_translate("RobotController", "Send"))
137180
self.pushButton3.setText(_translate("RobotController", "Emergency stop"))
181+
self.pushButton_4.setText(_translate("RobotController", "OFF"))
138182
self.label.setText(_translate("RobotController", "Information"))
139183
self.fps.setText("Fps: 0")
184+
self.capturing.setText("Gesture capturing: ")
140185
self.label_2.setText(_translate("RobotController", "Manual commands"))
141186

187+
def capture(self):
188+
if self.gesturesCapturing:
189+
self.pushButton_4.setText("ON")
190+
else:
191+
self.pushButton_4.setText("OFF")
192+
self.gesturesCapturing = not self.gesturesCapturing
193+
142194
def showFps(self, fps):
143195
self.fps.setText("Fps: {}".format(fps))
144196

0 commit comments

Comments
 (0)