I04_1-172: Small refactorisation

to make the main window class smallelr

Author: UrszulaNeuman

dls_barcode/gui/main_window.py

@@ -67,21 +67,19 @@ def __init__(self, config_file, version):
     def _init_ui(self):
         """ Create the basic elements of the user interface.
         """
-        self._init_icons()
+        self._window_icon = QtGui.QIcon("..\\resources\\icons\\qr_code_32.png")
 
         self.setGeometry(100, 100, 1020, 650)
         self.setWindowTitle('Diamond Puck Barcode Scanner')
         self.setWindowIcon(self._window_icon)
 
-        self._menu_bar = MenuBar(self.menuBar(), self._version, self._cleanup, self._on_options_action_clicked,
-                                 self._on_about_action_clicked, self._exit_icon, self._config_icon, self._about_icon)
+        self._menu_bar = MenuBar(self.menuBar(), self._version, self._cleanup, self._on_options_action_clicked,self._on_about_action_clicked)
 
         # Barcode table - lists all the barcodes in a record
         self._barcode_table = BarcodeTable(self._config)
 
         # Scan button - start/stop scan
-        self._scan_button = ScanButton('Start/stop scan', self._stop_capture_icon, self._start_capture_icon,
-                                       self._on_scan_action_clicked)
+        self._scan_button = ScanButton('Start/stop scan', self._on_scan_action_clicked)
 
         # Image frame - displays image of the currently selected scan record
         self._image_frame = ImageFrame("Plate Image")
@@ -118,14 +116,6 @@ def _init_ui(self):
 
         self.show()
 
-    def _init_icons(self):
-        self._window_icon = QtGui.QIcon("..\\resources\\icons\\qr_code_32.png")
-        self._start_capture_icon = self.style().standardIcon(QtGui.QStyle.SP_MediaPlay)
-        self._stop_capture_icon = self.style().standardIcon(QtGui.QStyle.SP_MediaStop)
-        self._exit_icon = self.style().standardIcon(QtGui.QStyle.SP_DialogCloseButton)
-        self._config_icon = self.style().standardIcon(QtGui.QStyle.SP_FileDialogDetailedView)
-        self._about_icon = self.style().standardIcon(QtGui.QStyle.SP_FileDialogInfoView)
-
     def _on_about_action_clicked(self):
         QtGui.QMessageBox.about(self, 'About', "Version: " + self._version)
 

dls_barcode/gui/menu_bar.py

@@ -1,22 +1,23 @@
 from __future__ import division
 
-from PyQt4.QtGui import qApp, QAction, QMainWindow
+from PyQt4.QtGui import qApp, QAction, QMainWindow, QStyle
 
 
 class MenuBar(QMainWindow):
     """ GUI component. Displays a start/stop button
     """
 
-    def __init__(self, mainMenu, version, clean_up, on_options_action_clicked, on_about_action_clicked, exit_icon, config_icon,
-                 about_icon):
+    def __init__(self, mainMenu, version, clean_up, on_options_action_clicked, on_about_action_clicked):
         super(MenuBar, self).__init__()
         self._version = version
         self._cleanup = clean_up
         self._on_options_action_clicked = on_options_action_clicked
         self._on_about_action_clicked = on_about_action_clicked
-        self._exit_icon = exit_icon
-        self._config_icon = config_icon
-        self._about_icon = about_icon
+
+        self._exit_icon = self.style().standardIcon(QStyle.SP_DialogCloseButton)
+        self._config_icon = self.style().standardIcon(QStyle.SP_FileDialogDetailedView)
+        self._about_icon = self.style().standardIcon(QStyle.SP_FileDialogInfoView)
+
         self._mainMenu = mainMenu
 
         self._init_ui()

dls_barcode/gui/scan_button.py

@@ -1,18 +1,18 @@
 from __future__ import division
 
 
-from PyQt4.QtGui import QPushButton, QGroupBox, QVBoxLayout
+from PyQt4.QtGui import QPushButton, QGroupBox, QVBoxLayout, QStyle
 from PyQt4.QtCore import Qt
 
 
 class ScanButton(QGroupBox):
     """ GUI component. Displays a start/stop button
     """
-    def __init__(self, title, icon_stop, icon_start, on_scan_action_clicked):
+    def __init__(self, title, on_scan_action_clicked):
         super(ScanButton, self).__init__()
         self._on_scan_action_clicked = on_scan_action_clicked
-        self._stop_capture_icon = icon_stop
-        self._start_capture_icon = icon_start
+        self._start_capture_icon = self.style().standardIcon(QStyle.SP_MediaPlay)
+        self._stop_capture_icon = self.style().standardIcon(QStyle.SP_MediaStop)
         self.setTitle(title)
 
         self._init_ui()

tests/unit_tests/test_dls_barcode/test_camera/test_camera_switch.py

@@ -37,7 +37,7 @@ def test_given_a_new_switch_then_we_can_stop_the_stream(self):
         switch = self._create_switch()
 
         # Act
-        switch.stop_live_capture()
+        switch._stop_live_capture()
 
         # Assert
         self._mock_scanner.stop_scan.assert_called_once()
@@ -47,7 +47,7 @@ def test_given_a_new_switch_when_stopping_the_stream_then_there_is_no_top_scan_t
         switch = self._create_switch()
 
         # Act
-        switch.stop_live_capture()
+        switch._stop_live_capture()
 
         # Assert
         self.assertFalse(switch.is_top_scan_timeout())
@@ -162,7 +162,7 @@ def test_given_capture_started_from_top_when_capture_is_stopped_then_timeout_is_
         switch.restart_live_capture_from_top()
 
         # Act
-        switch.stop_live_capture()
+        switch._stop_live_capture()
 
         # Assert
         time.sleep(timeout)