Merge pull request #65 from DiamondLightSource/I04_1-172

I04_1-172

Author: UrszulaNeuman

dls_barcode/camera/camera_switch.py

@@ -11,17 +11,17 @@ def __init__(self, camera_scanner, timeout_config):
         self._reset_top_scan_timer()
         self._switch_to_side()
 
-    def stop_live_capture(self):
+    def _stop_live_capture(self):
         self._scanner.stop_scan()
         self._reset_top_scan_timer()
 
     def restart_live_capture_from_side(self):
-        self.stop_live_capture()
+        self._stop_live_capture()
         self._switch_to_side()
         self._scanner.start_scan(CameraPosition.SIDE)
 
     def restart_live_capture_from_top(self):
-        self.stop_live_capture()
+        self._stop_live_capture()
         self._switch_to_top()
         self._start_top_scan_timer()
         self._scanner.start_scan(CameraPosition.TOP)

dls_barcode/config/barcode_config.py

@@ -25,10 +25,10 @@ def __init__(self, file, file_manager):
         else:
             default_store = "../store/"
 
-        self.color_ok = add(ColorConfigItem, "Read Color", Color.Green())
-        self.color_accept = add(ColorConfigItem, "Partially Read Color", Color.Yellow())
-        self.color_unreadable = add(ColorConfigItem, "Not Read Color", Color.Red())
-        self.color_empty = add(ColorConfigItem, "Empty Color", Color.Grey())
+        self.color_ok = add(ColorConfigItem, "Pin/Puck Read", Color.Green())
+        self.color_accept = add(ColorConfigItem, "Puck Partially Read", Color.Yellow())
+        self.color_unreadable = add(ColorConfigItem, "Pin/Puck Not Read", Color.Red())
+        self.color_empty = add(ColorConfigItem, "Pin Empty", Color.Grey())
 
         self.plate_type = add(EnumConfigItem, "Sample Plate Type", default=Geometry.UNIPUCK, extra_arg=Geometry.TYPES)
         self.top_barcode_size = add(EnumConfigItem, "Datamatrix Size", default=DataMatrix.DEFAULT_SIZE,
@@ -38,11 +38,11 @@ def __init__(self, file, file_manager):
         self.scan_beep = add(BoolConfigItem, "Beep While Scanning", default=True)
         self.scan_clipboard = add(BoolConfigItem, "Results to Clipboard", default=True)
 
-        self.image_puck = add(BoolConfigItem, "Draw Puck", default=True)
-        self.image_pins = add(BoolConfigItem, "Draw Slot Highlights", default=True)
+        self.image_puck = add(BoolConfigItem, "Puck Highlight", default=True)
+        self.image_pins = add(BoolConfigItem, "Slots Highlight", default=True)
         self.image_crop = add(BoolConfigItem, "Crop to Puck", default=True)
 
-        self.store_directory = add(DirectoryConfigItem, "Startup Store Directory", default=default_store)
+        self.store_directory = add(DirectoryConfigItem, "Store Directory", default=default_store)
         self.store_capacity = add(IntConfigItem, "Results History Size", default=50)
 
         self.console_frame = add(BoolConfigItem, "Print Frame Summary", default=False)

dls_barcode/config/barcode_config_dialog.py

@@ -2,30 +2,38 @@
 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
     setting up the camera.
     """
     def __init__(self, config, to_run_before_test_camera):
         ConfigDialog.__init__(self, config)
-
-        self._init_ui(to_run_before_test_camera)
+        self._to_run_before_test_camera = 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
         add = self.add_item
 
-        camera_top = CameraConfigControl(cfg.get_top_camera_config(), to_run_before_test_camera)
-        camera_side = CameraConfigControl(cfg.get_side_camera_config(), to_run_before_test_camera)
+        camera_top = CameraConfigControl(cfg.get_top_camera_config())
+        camera_side = CameraConfigControl(cfg.get_side_camera_config())
 
         self.start_group("Colors")
         add(cfg.color_ok)
         add(cfg.color_unreadable)
         add(cfg.color_empty)
+        add(cfg.color_accept)
 
         self.start_group("Top Camera")
         add(cfg.top_barcode_size)

dls_barcode/config/camera_config_control.py

@@ -7,14 +7,13 @@
 
 class CameraConfigControl(ConfigControl):
     RES_TEXT_WIDTH = 50
-    BUTTON_WIDTH = 100
+    BUTTON_WIDTH = 150
 
-    def __init__(self, camera_config, to_run_before_test_camera):
+    def __init__(self, camera_config):
         ConfigControl.__init__(self, camera_config)
         self._number_item = camera_config.camera_number
         self._width_item = camera_config.width
         self._height_item = camera_config.height
-        self._to_run_before_test_camera = to_run_before_test_camera
         self._init_ui()
 
     def _init_ui(self):
@@ -87,8 +86,6 @@ def _test_camera(self):
             QMessageBox.critical(self, "Camera Error", "Camera number, width, and height must be integers")
             return
 
-        self._to_run_before_test_camera()
-
         # Check that we can connect to the camera
         try:
             stream = CameraStream(camera_num, camera_width, camera_height, use_default_as_backup=False)
@@ -130,6 +127,5 @@ def _test_camera(self):
 
     def _open_camera_controls(self):
         camera_num = int(self.txt_number.text())
-        self._to_run_before_test_camera()
         CameraStream.open_camera_controls(camera_num)
 

dls_barcode/geometry/unipuck_locator.py

@@ -42,7 +42,7 @@ def find_location(self):
             hull = cv2.convexHull(match_cnt)
             hull_area = cv2.contourArea(hull)
             feature_area = cv2.contourArea(match_cnt)
-            puck_area = math.pi * math.sqrt(radius)
+            #puck_area = math.pi * math.sqrt(radius)
             area_factor = feature_area / hull_area
             #puck_area_factor = feature_area / puck_area
             if round(area_factor, 2) > FEATURE_HULL_MATCH_FACTOR:# and puck_area_factor > PUCK_FEATURE_AREA_FACTOR_MIN:

dls_barcode/gui/image_frame.py

@@ -7,20 +7,18 @@
 class ImageFrame(QGroupBox):
     """ GUI component. Displays an image of the currently selected barcode.
     """
-    def __init__(self, width_item, height_item, title):
+    def __init__(self, title):
         super(ImageFrame, self).__init__()
 
         self.setTitle(title)
-        self._width_item = width_item
-        self._height_item = height_item
         self._init_ui()
 
     def _init_ui(self):
         # Image frame - displays image of the currently selected scan record
         self._frame = QLabel()
         self._frame.setStyleSheet("background-color: black; color: red; font-size: 30pt; text-align: center")
-        self._frame.setFixedWidth(self._width_item)
-        self._frame.setFixedHeight(self._height_item)
+        self._frame.setFixedWidth(500)
+        self._frame.setFixedHeight(500)
         self._frame.setAlignment(Qt.AlignCenter)
 
         vbox = QVBoxLayout()

dls_barcode/gui/main_window.py

@@ -6,18 +6,19 @@
 
 from dls_barcode.config import BarcodeConfig, BarcodeConfigDialog
 from dls_barcode.camera import CameraScanner, CameraSwitch, NoNewBarcodeMessage
+from dls_barcode.gui.scan_button import ScanButton
 from dls_util import Beeper
 from dls_util.file import FileManager
 from .barcode_table import BarcodeTable
 from .image_frame import ImageFrame
 from .record_table import ScanRecordTable
 from .message_box import MessageBox
 from .message_factory import MessageFactory
+from .menu_bar import MenuBar
 
-
-RESULT_TIMER_PERIOD = 1000 # ms
-VIEW_TIMER_PERIOD = 1 # ms
-MESSAGE_TIMER_PERIOD = 1 # ms
+RESULT_TIMER_PERIOD = 1000  # ms
+VIEW_TIMER_PERIOD = 1  # ms
+MESSAGE_TIMER_PERIOD = 1  # ms
 
 
 class DiamondBarcodeMainWindow(QtGui.QMainWindow):
@@ -33,6 +34,7 @@ def __init__(self, config_file, version):
         self._record_table = None
         self._barcode_table = None
         self._image_frame = None
+        self._scan_button = None
 
         # Scan elements
         self._camera_scanner = None
@@ -65,35 +67,39 @@ 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.init_menu_bar()
+        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._on_scan_action_clicked)
+
         # Image frame - displays image of the currently selected scan record
-        self._image_frame = ImageFrame(500, 500, "Plate Image")
+        self._image_frame = ImageFrame("Plate Image")
 
         # Scan record table - lists all the records in the store
-        self._record_table = ScanRecordTable(self._barcode_table, self._image_frame, self._config, self.on_record_table_clicked)
+        self._record_table = ScanRecordTable(self._barcode_table, self._image_frame, self._config, self._to_run_on_table_clicked)
 
         # Message display
         self._message_box = MessageBox()
-        self._message_box.setFixedHeight(64)
-
-        # Open options first to make sure the cameras are set up correctly.
-        # Start live capture of the side as soon as the dialog box is closed
-        self._open_options_dialog()
 
         # Create layout
+
         hbox = QtGui.QHBoxLayout()
         hbox.setSpacing(10)
-        hbox.addWidget(self._record_table)
+
+        table_vbox = QtGui.QVBoxLayout()
+        table_vbox.addWidget(self._record_table)
+        table_vbox.addWidget(self._scan_button)
+
+        hbox.addLayout(table_vbox)
         hbox.addWidget(self._barcode_table)
 
         img_vbox = QtGui.QVBoxLayout()
@@ -110,52 +116,9 @@ 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._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 init_menu_bar(self):
-        """Create and populate the menu bar.
-        """
-        # Continuous scanner mode
-        live_action = QtGui.QAction(self._start_capture_icon, '&Camera Capture', self)
-        live_action.setShortcut('Ctrl+W')
-        live_action.setStatusTip('Capture continuously from camera')
-        live_action.triggered.connect(self._on_scan_action_clicked)
-
-        # Exit Application
-        exit_action = QtGui.QAction(self._exit_icon, '&Exit', self)
-        exit_action.setShortcut('Ctrl+Q')
-        exit_action.setStatusTip('Exit application')
-        exit_action.triggered.connect(self._cleanup)
-        exit_action.triggered.connect(QtGui.qApp.quit)
-
-        # Open options dialog
-        options_action = QtGui.QAction(self._config_icon, '&Config', self)
-        options_action.setShortcut('Ctrl+O')
-        options_action.setStatusTip('Open Options Dialog')
-        options_action.triggered.connect(self._on_options_action_clicked)
-
-        # Show version number
-        about_action = QtGui.QAction(self._about_icon, "About", self)
-        about_action.triggered.connect(self._on_about_action_clicked)
-
-        # Create menu bar
-        menu_bar = self.menuBar()
-        file_menu = menu_bar.addMenu('&File')
-        file_menu.addAction(exit_action)
-
-        scan_menu = menu_bar.addMenu('&Scan')
-        scan_menu.addAction(live_action)
-
-        option_menu = menu_bar.addMenu('&Options')
-        option_menu.addAction(options_action)
-
-        help_menu = menu_bar.addMenu('?')
-        help_menu.addAction(about_action)
+    def _to_run_on_table_clicked(self):
+        self._cleanup()
+        self._scan_button.setStartLayout()
 
     def _on_about_action_clicked(self):
         QtGui.QMessageBox.about(self, 'About', "Version: " + self._version)
@@ -164,23 +127,16 @@ def _on_scan_action_clicked(self):
         print("MAIN: Scan menu clicked")
         if not self._camera_capture_alive():
             self._initialise_scanner()
-
-        self._restart_live_capture_from_side()
+            self._restart_live_capture_from_side()
+            self._scan_button.setDelayedStopLayout()
+        else:
+            self._cleanup()
+            self._scan_button.setStartLayout()
 
     def _on_options_action_clicked(self):
-        result_ok = self._open_options_dialog()
-        if not result_ok:
-            return
-
-        self._cleanup()
-        self._initialise_scanner()
-        self._restart_live_capture_from_side()
-
-    def _open_options_dialog(self):
-        dialog = BarcodeConfigDialog(self._config, self._before_test_camera)
-        dialog.setWindowIcon(self._config_icon)
-        result_ok = dialog.exec_()
-        return result_ok
+        dialog = BarcodeConfigDialog(self._config, self._cleanup)
+        self._scan_button.setStartLayout()
+        dialog.exec_()
 
     def closeEvent(self, event):
         """This overrides the method from the base class.
@@ -200,14 +156,6 @@ def _initialise_scanner(self):
         self._camera_scanner = CameraScanner(self._result_queue, self._view_queue, self._message_queue, self._config)
         self._camera_switch = CameraSwitch(self._camera_scanner, self._config.top_camera_timeout)
 
-    def on_record_table_clicked(self):
-        if self._camera_capture_alive():
-            self._camera_switch.stop_live_capture()
-
-    def _before_test_camera(self):
-        # We need to stop the cameras otherwise the Test Camera button won't be able to open them
-        self._cleanup()
-
     def _camera_capture_alive(self):
         return self._camera_scanner is not None and self._camera_switch is not None
 
@@ -242,17 +190,17 @@ def _read_message_queue(self):
             self._message_box.display(MessageFactory.from_scanner_message(scanner_msg))
 
     def _reset_msg_timer(self):
-        self._duplicate_record_msg_timer = None
+        self._record_msg_timer = None
 
     def _start_msg_timer(self):
-        self._duplicate_record_msg_timer = time.time()
+        self._record_msg_timer = time.time()
 
     def _msg_timer_is_running(self):
-        return self._duplicate_record_msg_timer is not None
+        return self._record_msg_timer is not None
 
     def _has_msg_timer_timeout(self):
         timeout = 2 * RESULT_TIMER_PERIOD / 1000
-        return self._msg_timer_is_running() and time.time() - self._duplicate_record_msg_timer > timeout
+        return self._msg_timer_is_running() and time.time() - self._record_msg_timer > timeout
 
     def _read_result_queue(self):
         """ Called every second; read any new results from the scan results queue, store them and display them.
@@ -315,3 +263,5 @@ def _restart_live_capture_from_side(self):
         self._reset_msg_timer()
         self._camera_switch.restart_live_capture_from_side()
 
+
+