Updating region widget selection, and fixing cancel effect which broke QDragManager

Author: jonoomph

src/windows/process_effect.py

@@ -195,7 +195,7 @@ def __init__(self, clip_id, effect_name, effect_params):
         # flag to close the clip processing thread
         self.cancel_clip_processing = False
         self.effect = None
-        
+
     def spinner_value_changed(self, widget, param, value):
         """Spinner value change callback"""
         self.context[param["setting"]] = value
@@ -250,20 +250,21 @@ def rect_select_clicked(self, widget, param):
                 viewPortSize = win.viewport_rect
 
                 # Get QImage of region
-                region_qimage = win.videoPreview.region_qimage
+                if win.videoPreview.region_qimage:
+                    region_qimage = win.videoPreview.region_qimage
 
-                # Resize QImage to match button size
-                resized_qimage = region_qimage.scaled(widget.size(), Qt.IgnoreAspectRatio, Qt.SmoothTransformation)
+                    # Resize QImage to match button size
+                    resized_qimage = region_qimage.scaled(widget.size(), Qt.IgnoreAspectRatio, Qt.SmoothTransformation)
 
-                # Draw Qimage onto QPushButton (to display region selection to user)
-                palette = widget.palette()
-                palette.setBrush(widget.backgroundRole(), QBrush(resized_qimage))
-                widget.setFlat(True)
-                widget.setAutoFillBackground(True)
-                widget.setPalette(palette)
+                    # Draw Qimage onto QPushButton (to display region selection to user)
+                    palette = widget.palette()
+                    palette.setBrush(widget.backgroundRole(), QBrush(resized_qimage))
+                    widget.setFlat(True)
+                    widget.setAutoFillBackground(True)
+                    widget.setPalette(palette)
 
-                # Remove button text (so region QImage is more visible)
-                widget.setText("")
+                    # Remove button text (so region QImage is more visible)
+                    widget.setText("")
 
                 # If data found, add to context
                 if topLeft and bottomRight:
@@ -326,18 +327,17 @@ def accept(self):
             # if the cancel button was pressed, close the processing thread
             if(self.cancel_clip_processing):
                 processing.CancelProcessing()
+                break
 
         if(not self.cancel_clip_processing):
-        
+
             # Load processed data into effect
             self.effect = openshot.EffectInfo().CreateEffect(self.effect_name)
             self.effect.SetJson( '{"protobuf_data_path": "%s"}' % protobufPath )
             self.effect.Id(ID)
-            
-            print("Applied effect: %s to clip: %s" % (self.effect_name, self.clip_instance.Id()))
 
-        # Accept dialog
-        super(ProcessEffect, self).accept()
+            # Accept dialog
+            super(ProcessEffect, self).accept()
 
     def reject(self):
         # Cancel dialog
@@ -364,7 +364,7 @@ def generateJson(self, protobufPath):
             trackerType = self.context["tracker-type"]
             jsonString += ',"tracker_type": "%s"' % trackerType
 
-            # Get bounding box coordinates 
+            # Get bounding box coordinates
             tracker_dict = self.context["region"]
             bbox = (tracker_dict["x"],tracker_dict["y"],tracker_dict["width"],tracker_dict["height"])
             jsonString += ',"bbox": {"x": %d, "y": %d, "w": %d, "h": %d}' % (bbox)
@@ -380,7 +380,7 @@ def generateJson(self, protobufPath):
 
             modelConfigPath = self.context["model-config"]
             jsonString += ', "model_configuration": "%s"' % modelConfigPath
-                
+
             classNamesPath = self.context["class-names"]
             jsonString += ', "classes_file": "%s"' % classNamesPath
 
@@ -389,4 +389,4 @@ def generateJson(self, protobufPath):
 
         # Finish JSON string
         jsonString+='}'
-        return jsonString
+        return jsonString

src/windows/video_widget.py

@@ -367,9 +367,6 @@ def mouseReleaseEvent(self, event):
         # Save region image data (as QImage)
         # This can be used other widgets to display the selected region
         if self.region_enabled:
-            # Find centered viewport
-            viewport_rect = self.centeredViewport(self.width(), self.height())
-
             # Get region coordinates
             region_rect = QRectF(self.regionTopLeftHandle.x(), self.regionTopLeftHandle.y(),
                                  self.regionBottomRightHandle.x() - self.regionTopLeftHandle.x(),
@@ -378,9 +375,19 @@ def mouseReleaseEvent(self, event):
             # Map region (due to zooming)
             mapped_region_rect = self.region_transform.mapToPolygon(region_rect.toRect()).boundingRect()
 
-            # Create QImage from videoPreview widget
-            self.region_qimage = QImage(mapped_region_rect.width(), mapped_region_rect.height(), QImage.Format_ARGB32)
+            # Render a scaled version of the region (as a QImage)
+            # TODO: Grab higher quality pixmap from the QWidget, as this method seems to be 1/2 resolution
+            # of the original QWidget video element.
+            scale = 3.0
+
+            # Map rect to transform (for scaling video elements)
+            mapped_region_rect = QRect(mapped_region_rect.x(), mapped_region_rect.y(), mapped_region_rect.width() * scale, mapped_region_rect.height() * scale)
+
+            # Render QWidget onto scaled QImage
+            self.region_qimage = QImage(mapped_region_rect.width(), mapped_region_rect.height(), QImage.Format_RGBA8888)
             region_painter = QPainter(self.region_qimage)
+            region_painter.setRenderHints(QPainter.Antialiasing | QPainter.SmoothPixmapTransform | QPainter.TextAntialiasing, True)
+            region_painter.scale(scale, scale)
             self.render(region_painter, QPoint(0,0), QRegion(mapped_region_rect, QRegion.Rectangle))
             region_painter.end()