Merge pull request #71 from DiamondLightSource/I04_1-396

I04 1 396

Author: UrszulaNeuman

.travis.yml

@@ -1,12 +1,12 @@
 language: python
 sudo: required
 python:
-  - "3.4"
+  - "3.5"
 virtualenv:
-  system_site_packages: true
+  system_site_packages: false
 
 install:
-  - sudo apt-get install -y python3-pyqt4 python3-sip
+  - pip install --upgrade pip
   - pip install -r requirements.txt | cat
 
 script:

dls_barcode/config/barcode_config_dialog.py

@@ -2,7 +2,7 @@
 from .camera_config_control import CameraConfigControl
 from .store_directory_config_control import StoreDirectoryConfigControl
 
-from PyQt4.QtGui import QStyle
+from PyQt5.QtWidgets import QStyle
 
 
 class BarcodeConfigDialog(ConfigDialog):

dls_barcode/config/camera_config_control.py

@@ -1,6 +1,6 @@
 import cv2
 
-from PyQt4.QtGui import QLabel, QVBoxLayout, QHBoxLayout, QMessageBox, QLineEdit, QPushButton
+from PyQt5.QtWidgets import QLabel, QVBoxLayout, QHBoxLayout, QMessageBox, QLineEdit, QPushButton
 from dls_util.config import ConfigControl
 from dls_util.cv import CameraStream
 

dls_barcode/config/store_directory_config_control.py

@@ -1,5 +1,5 @@
 import os.path
-from PyQt4 import QtGui
+from PyQt5.QtWidgets import QMessageBox
 
 from dls_util.config import DirectoryConfigControl
 
@@ -18,10 +18,10 @@ def before_apply(self):
 
         confirm_msg = "The Startup Store Directory was changed from " + current_dir + " to\n" + new_dir + ".\n\n"\
             "This change will only take effect at the next startup."
-        reply = QtGui.QMessageBox.information(self, 'Startup Store Directory',
-                                              confirm_msg, QtGui.QMessageBox.Ok, QtGui.QMessageBox.Cancel)
+        reply = QMessageBox.information(self, 'Startup Store Directory',
+                                              confirm_msg, QMessageBox.Ok, QMessageBox.Cancel)
 
-        if reply == QtGui.QMessageBox.Cancel:
+        if reply == QMessageBox.Cancel:
             self.is_confirmed = False
 
 

dls_barcode/gui/barcode_table.py

@@ -2,9 +2,9 @@
 
 import os
 
-from PyQt4 import QtGui
-from PyQt4.QtCore import Qt
-from PyQt4.QtGui import QGroupBox, QVBoxLayout, QHBoxLayout
+from PyQt5.QtCore import Qt
+from PyQt5.QtWidgets import QGroupBox, QVBoxLayout, QHBoxLayout, QPushButton, QTableWidget, QLabel, QTableWidgetItem
+from PyQt5 import QtGui
 
 from dls_barcode.plate import NOT_FOUND_SLOT_SYMBOL, EMPTY_SLOT_SYMBOL
 
@@ -18,24 +18,26 @@ def __init__(self, options):
         self._options = options
 
         self.setTitle("Plate Barcodes")
+        self.setMaximumWidth(160)
+        self.setMinimumWidth(160)
         self._init_ui()
         self.clear()
 
     def _init_ui(self):
         # Plate being displayed
-        self._plate_lbl = QtGui.QLabel()
+        self._plate_lbl = QLabel()
 
         # Create barcode table - lists all the barcodes in a record
-        self._table = QtGui.QTableWidget()
-        self._table.setMinimumWidth(110)
+        self._table = QTableWidget()
+        self._table.setMinimumWidth(70)
         self._table.setMinimumHeight(600)
         self._table.setColumnCount(1)
         self._table.setRowCount(10)
         self._table.setHorizontalHeaderLabels(['Barcode'])
-        self._table.setColumnWidth(0, 100)
+        self._table.setMinimumWidth(200)
 
         # Clipboard button - copy the selected barcodes to the clipboard
-        self._btn_clipboard = QtGui.QPushButton('Copy To Clipboard')
+        self._btn_clipboard = QPushButton('Copy To Clipboard')
         self._btn_clipboard.setToolTip('Copy barcodes for the selected record to the clipboard')
         self._btn_clipboard.resize(self._btn_clipboard.sizeHint())
         self._btn_clipboard.clicked.connect(self.copy_to_clipboard)
@@ -87,8 +89,8 @@ def _populate_table(self):
             cell_color.a = 192
 
             # Set table item
-            barcode = QtGui.QTableWidgetItem(barcode)
-            barcode.setBackgroundColor(cell_color.to_qt())
+            barcode = QTableWidgetItem(barcode)
+            barcode.setBackground(cell_color.to_qt())
             barcode.setFlags(Qt.ItemIsSelectable | Qt.ItemIsEnabled)
             self._table.setItem(index, 0, barcode)
 
@@ -111,7 +113,11 @@ def copy_to_clipboard(self):
             pyperclip.copy(sep.join(clipboard_barcodes))
 
     def _update_plate_label(self):
-        text = "Plate : " + str(self._holder_barcode) if self._has_barcodes() else "Plate:"
+        barcode_holder = str(self._holder_barcode)
+        text = "Plate : " + barcode_holder if self._has_barcodes() else "Plate:"
+        myFont = QtGui.QFont()
+        myFont.setBold(True)
+        self._plate_lbl.setFont(myFont)
         self._plate_lbl.setText(text)
 
     def _has_barcodes(self):

dls_barcode/gui/image_frame.py

@@ -1,26 +1,27 @@
 from __future__ import division
 
-from PyQt4.QtCore import Qt
-from PyQt4.QtGui import QLabel, QGroupBox, QVBoxLayout
+
+
+from PyQt5.QtCore import Qt, QSize
+from PyQt5.QtWidgets import QLabel, QGroupBox, QVBoxLayout
+
+from dls_barcode.gui.image_widget import ImageWidget
 
 
 class ImageFrame(QGroupBox):
     """ GUI component. Displays an image of the currently selected barcode.
     """
     def __init__(self, title):
         super(ImageFrame, self).__init__()
-
         self.setTitle(title)
         self._init_ui()
 
     def _init_ui(self):
         # Image frame - displays image of the currently selected scan record
-        self._frame = QLabel()
+        self._frame = ImageWidget()
         self._frame.setStyleSheet("background-color: white; color: red; font-size: 30pt; text-align: center")
-        self._frame.setMinimumWidth(500)
-        self._frame.setMinimumHeight(500)
+        self._frame.setMinimumWidth(700)
         self._frame.setAlignment(Qt.AlignCenter)
-
         vbox = QVBoxLayout()
         vbox.addWidget(self._frame)
 

dls_barcode/gui/image_widget.py

@@ -0,0 +1,20 @@
+from PyQt5 import QtCore, QtWidgets
+from PyQt5.QtWidgets import QLabel
+
+# Resize button in the right corner didn't work correctly for the image
+# I had to add a event filter to the class so that the pixmap is scaled when resizing happens.
+
+
+class ImageWidget(QLabel):
+
+    def __init__(self, parent=None):
+        super(ImageWidget, self).__init__(parent)
+        self.setSizePolicy(QtWidgets.QSizePolicy.Ignored, QtWidgets.QSizePolicy.Ignored)
+        self.installEventFilter(self)
+
+    def eventFilter(self, source, event):
+        if source is self and event.type() == QtCore.QEvent.Resize:
+            ma = self.pixmap()
+            if ma is not None:
+                self.setPixmap(ma.scaled(self.size(), QtCore.Qt.KeepAspectRatio, QtCore.Qt.SmoothTransformation))
+        return QtWidgets.QWidget.eventFilter(self, source, event)

dls_barcode/gui/main_window.py

@@ -1,5 +1,5 @@
 import sys
-from PyQt4 import QtGui
+from PyQt5 import QtWidgets, QtGui
 
 from dls_barcode.config import BarcodeConfigDialog
 
@@ -13,13 +13,14 @@
 from .menu_bar import MenuBar
 
 
-class DiamondBarcodeMainWindow(QtGui.QMainWindow):
+class DiamondBarcodeMainWindow(QtWidgets.QMainWindow):
     """ Main GUI window for the Barcode Scanner App.
     """
 
-    def __init__(self, config, version):
-        super(DiamondBarcodeMainWindow, self).__init__()
+    def __init__(self, config, version, flags, *args, **kwargs):
+        #super(DiamondBarcodeMainWindow, self).__init__(None, None)
 
+        super().__init__(flags, *args, **kwargs)
         self._config = config
         self._version = version
         self._cleanup = None
@@ -39,11 +40,11 @@ def _init_ui(self):
         """
         self._window_icon = QtGui.QIcon("..\\resources\\icons\\qr_code_32.png")
 
-        self.setGeometry(100, 100, 1020, 650)
+        self.setGeometry(50, 50, 1500, 650) #950
         self.setWindowTitle('Diamond Puck Barcode Scanner')
         self.setWindowIcon(self._window_icon)
 
-        self._menu_bar = MenuBar(self.menuBar(), self._version)
+        self._menu_bar = MenuBar(self.menuBar(), self._version, None)
 
         # Barcode table - lists all the barcodes in a record
         self._barcode_table = BarcodeTable(self._config)
@@ -62,25 +63,25 @@ def _init_ui(self):
 
         # Create layout
 
-        hbox = QtGui.QHBoxLayout()
+        hbox = QtWidgets.QHBoxLayout()
         hbox.setSpacing(10)
 
-        table_vbox = QtGui.QVBoxLayout()
+        table_vbox = QtWidgets.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()
+        img_vbox = QtWidgets.QVBoxLayout()
         img_vbox.addWidget(self._image_frame)
         img_vbox.addWidget(self._message_box)
         hbox.addLayout(img_vbox)
 
-        vbox = QtGui.QVBoxLayout()
+        vbox = QtWidgets.QVBoxLayout()
         vbox.addLayout(hbox)
 
-        main_widget = QtGui.QWidget()
+        main_widget = QtWidgets.QWidget()
         main_widget.setLayout(vbox)
         self.setCentralWidget(main_widget)
 
@@ -101,7 +102,7 @@ def _to_run_on_table_clicked(self):
         self._scan_button.setStartLayout()
 
     def _on_about_action_clicked(self):
-        QtGui.QMessageBox.about(self, 'About', "Version: " + self._version)
+        QtWidgets.QMessageBox.about(self, 'About', "Version: " + self._version)
 
 
     def _on_scan_action_clicked(self):

dls_barcode/gui/menu_bar.py

@@ -1,14 +1,15 @@
 from __future__ import division
 
-from PyQt4.QtGui import qApp, QAction, QMainWindow, QStyle
+from PyQt5.QtWidgets import qApp, QAction, QMainWindow, QStyle
 
 
 class MenuBar(QMainWindow):
     """ GUI component. Displays a start/stop button
     """
 
-    def __init__(self, mainMenu, version):
-        super(MenuBar, self).__init__()
+    def __init__(self, mainMenu, version, flags, *args, **kwargs):
+        #super(MenuBar, self).__init__(mainMenu, version)
+        super().__init__(flags, *args, **kwargs)
         self._version = version
 
         self._exit_icon = self.style().standardIcon(QStyle.SP_DialogCloseButton)

dls_barcode/gui/message_box.py

@@ -1,12 +1,13 @@
-from PyQt4.QtGui import QLabel, QGroupBox, QVBoxLayout
-from PyQt4 import QtCore
+from PyQt5.QtWidgets import QLabel, QGroupBox, QVBoxLayout
+from PyQt5 import QtCore
 
 from dls_util.message import MessageType
 
 RED = "; color: red"
 BLACK = "; color: black"
 BASIC_STYLE_SHEET = "font-size: 14pt"
 
+
 class MessageBox(QGroupBox):
     """GUI component. Displays messages for the user."""
     def __init__(self):