Webcam dialog shows cam port being used

cdeldon · Oct 16, 2017 · b92dd38 · b92dd38
1 parent 7cde89a
commit b92dd38
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/gui/design/webcam_dialog_design.py b/gui/design/webcam_dialog_design.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Form implementation generated from reading ui file 'webcam_view.ui'
+# Form implementation generated from reading ui file 'design\webcam_view.ui'
 #
 # Created by: PyQt4 UI code generator 4.11.4
 #
@@ -16,15 +16,12 @@ def _fromUtf8(s):
 
 try:
     _encoding = QtGui.QApplication.UnicodeUTF8
-
-
     def _translate(context, text, disambig):
         return QtGui.QApplication.translate(context, text, disambig, _encoding)
 except AttributeError:
     def _translate(context, text, disambig):
         return QtGui.QApplication.translate(context, text, disambig)
 
-
 class Ui_WebCam(object):
     def setupUi(self, WebCam):
         WebCam.setObjectName(_fromUtf8("WebCam"))
@@ -74,9 +71,8 @@ def setupUi(self, WebCam):
 
     def retranslateUi(self, WebCam):
         WebCam.setWindowTitle(_translate("WebCam", "ThermoGUI - Webcam", None))
-        self.webcam_view.setText(_translate("WebCam",
-                                            "<html><head/><body><p align=\"center\"><span style=\" font-weight:600;\">WebCam</span></p></body></html>",
-                                            None))
+        self.webcam_view.setText(_translate("WebCam", "<html><head/><body><p align=\"center\"><span style=\" font-weight:600;\">WebCam</span></p></body></html>", None))
         self.previous_button.setText(_translate("WebCam", "Previous", None))
-        self.ok_button.setText(_translate("WebCam", "OK!", None))
+        self.ok_button.setText(_translate("WebCam", "Use port 0!", None))
         self.next_button.setText(_translate("WebCam", "Next", None))
+
diff --git a/gui/design/webcam_view.ui b/gui/design/webcam_view.ui
@@ -74,7 +74,7 @@
       <item>
        <widget class="QPushButton" name="ok_button">
         <property name="text">
-         <string>OK!</string>
+         <string>Use port 0!</string>
         </property>
        </widget>
       </item>

diff --git a/gui/dialogs/webcam_dialog.py b/gui/dialogs/webcam_dialog.py
@@ -49,6 +49,7 @@ def set_webcam(self):
         self.cap.release()
         self.cap = cv2.VideoCapture(self.webcam_value)
         self.start()
+        self.ok_button.setText("Use port {}!".format(self.webcam_value))
 
     def start(self):
         self.timer = QtCore.QTimer()