I04_1-172:

- added forgotten icon to the configuration gui
- added a delayed stop button layout

Author: UrszulaNeuman

dls_barcode/config/barcode_config_dialog.py

@@ -2,6 +2,8 @@
 from .camera_config_control import CameraConfigControl
 from .store_directory_config_control import StoreDirectoryConfigControl
 
+from PyQt4.QtGui import QStyle
+
 
 class BarcodeConfigDialog(ConfigDialog):
     """ Dialog to edit the configuration options for the program. Provides a custom control for
@@ -10,12 +12,15 @@ class BarcodeConfigDialog(ConfigDialog):
     def __init__(self, config, to_run_before_test_camera):
         ConfigDialog.__init__(self, config)
         self._to_run_before_test_camera = to_run_before_test_camera
-        self._init_ui(to_run_before_test_camera)
+        self._config_icon = self.style().standardIcon(QStyle.SP_FileDialogDetailedView)
+        self._init_ui()
         self.finalize_layout()
 
-    def _init_ui(self, to_run_before_test_camera):
+    def _init_ui(self):
         self.setGeometry(100, 100, 450, 400)
 
+        self.setWindowIcon(self._config_icon)
+
         self._to_run_before_test_camera()
 
         cfg = self._config

dls_barcode/gui/main_window.py

@@ -124,12 +124,14 @@ def _on_scan_action_clicked(self):
         if not self._camera_capture_alive():
             self._initialise_scanner()
             self._restart_live_capture_from_side()
+            self._scan_button.setDelayedStopLayout()
         else:
             self._cleanup()
+            self._scan_button.setStartLayout()
 
     def _on_options_action_clicked(self):
         dialog = BarcodeConfigDialog(self._config, self._cleanup)
-        dialog.setWindowIcon(self._config_icon)
+        self._scan_button.setStartLayout()
         dialog.exec_()
 
     def closeEvent(self, event):
@@ -145,7 +147,6 @@ def _cleanup(self):
         self._camera_scanner.kill()
         self._camera_scanner = None
         self._camera_switch = None
-        self._scan_button.setStartLayout()
 
     def _initialise_scanner(self):
         self._camera_scanner = CameraScanner(self._result_queue, self._view_queue, self._message_queue, self._config)
@@ -257,4 +258,6 @@ def _restart_live_capture_from_top(self):
     def _restart_live_capture_from_side(self):
         self._reset_msg_timer()
         self._camera_switch.restart_live_capture_from_side()
-        self._scan_button.setStopLayout()
+
+
+

dls_barcode/gui/scan_button.py

@@ -1,8 +1,7 @@
 from __future__ import division
 
-
+from PyQt4.QtCore import QTime, QTimer
 from PyQt4.QtGui import QPushButton, QGroupBox, QVBoxLayout, QStyle
-from PyQt4.QtCore import Qt
 
 
 class ScanButton(QGroupBox):
@@ -29,9 +28,16 @@ def _init_ui(self):
         vbox.addWidget(self._scan_button)
         self.setLayout(vbox)
 
+    # A small delay in the button layout change - process restart is slow at the moment
+    def setDelayedStopLayout(self):
+        self._scan_button.setDisabled(True)
+        timer = QTimer()
+        timer.singleShot(6000, self.setStopLayout) # 6sec delay
+
     def setStopLayout(self):
         self._scan_button.setIcon(self._stop_capture_icon)
         self._scan_button.setStyleSheet("background-color: rgb(255, 0, 0)")
+        self._scan_button.setDisabled(False)
 
     def setStartLayout(self):
         self._scan_button.setIcon(self._start_capture_icon)