Merge branch 'master' into exclude_list

qt/pe/details_dialog.py

@@ -128,11 +128,7 @@ class DetailsDialog(DetailsDialogBase):
 
         # This works when expanding but it's ugly:
         if self.selectedImageViewer.size().width() > self.referenceImageViewer.size().width():
-            # print(f"""Before selected size: {self.selectedImageViewer.size()}\n""",
-            #       f"""Before reference size: {self.referenceImageViewer.size()}""")
             self.selectedImageViewer.resize(self.referenceImageViewer.size())
-            # print(f"""After selected size: {self.selectedImageViewer.size()}\n""",
-            #       f"""After reference size: {self.referenceImageViewer.size()}""")
 
     # model --> view
     def refresh(self):

qt/pe/image_viewer.py

@@ -758,11 +758,15 @@ class QWidgetImageViewer(QWidget):
                 return
             self.disconnectMouseSignals()
 
+    def contextMenuEvent(self, event):
+        """Block parent's (main window) context menu on right click."""
+        event.accept()
+
     def mousePressEvent(self, event):
         if self.bestFit or not self.isEnabled():
             event.ignore()
             return
-        if event.button() == Qt.LeftButton:
+        if event.button() & (Qt.LeftButton | Qt.MidButton | Qt.RightButton):
             self._drag = True
         else:
             self._drag = False
@@ -790,8 +794,8 @@ class QWidgetImageViewer(QWidget):
         if self.bestFit or not self.isEnabled():
             event.ignore()
             return
-        if event.button() == Qt.LeftButton:
-            self._drag = False
+        # if event.button() == Qt.LeftButton:
+        self._drag = False
 
         self._app.restoreOverrideCursor()
         self.setMouseTracking(False)
@@ -956,11 +960,18 @@ class ScrollAreaImageViewer(QScrollArea):
         self._horizontalScrollBar.valueChanged.connect(
             self.controller.onHScrollBarChanged, Qt.UniqueConnection)
 
+    def contextMenuEvent(self, event):
+        """Block parent's (main window) context menu on right click."""
+        # Even though we don't have a context menu right now, and the default
+        # contextMenuPolicy is DefaultContextMenu, we leverage that handler to
+        # avoid raising the Result window's Actions menu
+        event.accept()
+
     def mousePressEvent(self, event):
         if self.bestFit:
             event.ignore()
             return
-        if event.button() == Qt.LeftButton:
+        if event.button() & (Qt.LeftButton | Qt.MidButton | Qt.RightButton):
             self._drag = True
         else:
             self._drag = False
@@ -985,8 +996,7 @@ class ScrollAreaImageViewer(QScrollArea):
         if self.bestFit:
             event.ignore()
             return
-        if event.button() == Qt.LeftButton:
-            self._drag = False
+        self._drag = False
         self._app.restoreOverrideCursor()
         self.setMouseTracking(False)
         super().mouseReleaseEvent(event)
@@ -1203,11 +1213,15 @@ class GraphicsViewViewer(QGraphicsView):
             self.setVerticalScrollBarPolicy(Qt.ScrollBarAsNeeded)
             self.setHorizontalScrollBarPolicy(Qt.ScrollBarAsNeeded)
 
+    def contextMenuEvent(self, event):
+        """Block parent's (main window) context menu on right click."""
+        event.accept()
+
     def mousePressEvent(self, event):
         if self.bestFit:
             event.ignore()
             return
-        if event.button() == Qt.LeftButton:
+        if event.button() & (Qt.LeftButton | Qt.MidButton | Qt.RightButton):
             self._drag = True
         else:
             self._drag = False
@@ -1223,8 +1237,7 @@ class GraphicsViewViewer(QGraphicsView):
         if self.bestFit:
             event.ignore()
             return
-        if event.button() == Qt.LeftButton:
-            self._drag = False
+        self._drag = False
         self._app.restoreOverrideCursor()
         self.setMouseTracking(False)
         self.updateCenterPoint()

qt/pe/photo.py

@@ -29,6 +29,15 @@ class File(PhotoBase):
     def _plat_get_blocks(self, block_count_per_side, orientation):
         image = QImage(str(self.path))
         image = image.convertToFormat(QImage.Format_RGB888)
+        if type(orientation) == str:
+            logging.warning("Orientation for file '%s' was a str '%s', not an int.",
+                            str(self.path), orientation)
+            try:
+                orientation = int(orientation)
+            except Exception as e:
+                logging.exception("Skipping transformation because could not \
+convert str to int. %s", e)
+                return getblocks(image, block_count_per_side)
         # MYSTERY TO SOLVE: For reasons I cannot explain, orientations 5 and 7 don't work for
         # duplicate scanning. The transforms seems to work fine (if I try to save the image after
         # the transform, we see that the image has been correctly flipped and rotated), but the