I04_1-396: use qt5 instead of qt4 layout update

Author: UrszulaNeuman

dls_barcode/gui/image_frame.py

@@ -1,26 +1,27 @@
 from __future__ import division
 
-from PyQt5.QtCore import Qt
+
+
+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.setMaximumWidth(750)
         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(700)
         self._frame.setAlignment(Qt.AlignCenter)
-
         vbox = QVBoxLayout()
         vbox.addWidget(self._frame)
 

dls_barcode/gui/image_widget.py

@@ -0,0 +1,19 @@
+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()
+            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

@@ -40,7 +40,7 @@ def _init_ui(self):
         """
         self._window_icon = QtGui.QIcon("..\\resources\\icons\\qr_code_32.png")
 
-        self.setGeometry(10, 50, 1650, 950)
+        self.setGeometry(10, 50, 1900, 950)
         self.setWindowTitle('Diamond Puck Barcode Scanner')
         self.setWindowIcon(self._window_icon)
 

dls_barcode/gui/record_table.py

@@ -29,7 +29,7 @@ def __init__(self, barcode_table, image_frame, options):
         self._imageFrame = image_frame
 
         self.setTitle("Scan Records")
-        self.setMaximumWidth(900)
+        self.setMaximumWidth(1200)
 
         self._init_ui()
 
@@ -38,7 +38,7 @@ def __init__(self, barcode_table, image_frame, options):
     def _init_ui(self):
         # Create record table - lists all the records in the store
         self._table = QTableWidget()
-        self._table.setMinimumWidth(750)
+        self._table.setMinimumWidth(900)
         self._table.setMinimumHeight(600)
         self._table.setColumnCount(len(self.COLUMNS))
         self._table.setHorizontalHeaderLabels(self.COLUMNS)