Fixing video_widget to allow an override, which ignores the project aspect...

Fixing video_widget to allow an override, which ignores the project aspect ratio. When selecting regions from a Clip, the aspact ratio can be different than the project, and thus, we need to only show coordinates that match our clip image data.

src/windows/region.py

@@ -119,8 +119,13 @@ class SelectRegion(QDialog):
         self.videoPreview.setSizePolicy(QSizePolicy.Preferred, QSizePolicy.Expanding)
         self.verticalLayout.insertWidget(0, self.videoPreview)
 
+        # Set aspect ratio to match source content
+        aspect_ratio = openshot.Fraction(self.width, self.height)
+        aspect_ratio.Reduce()
+        self.videoPreview.aspect_ratio = aspect_ratio
+
         # Set max size of video preview (for speed)
-        self.viewport_rect = self.videoPreview.centeredViewport(self.videoPreview.width(), self.videoPreview.height())
+        self.viewport_rect = self.videoPreview.centeredViewport(self.width, self.height)
 
         # Create an instance of a libopenshot Timeline object
         self.r = openshot.Timeline(self.viewport_rect.width(), self.viewport_rect.height(), openshot.Fraction(self.fps_num, self.fps_den), self.sample_rate, self.channels, self.channel_layout)

src/windows/video_widget.py

@@ -114,10 +114,10 @@ class VideoWidget(QWidget, updates.UpdateInterface):
             painter.translate(bbox_center_x, bbox_center_y)
             painter.rotate(rotation)
             painter.translate(-bbox_center_x, -bbox_center_y)
-            
+
         if(x1 and y1 and x2 and y2):
             # Calculate bounds of clip
-            self.clipBounds = QRectF(QPointF(x1*source_width, y1*source_height), QPointF(x2*source_width, y2*source_height))    
+            self.clipBounds = QRectF(QPointF(x1*source_width, y1*source_height), QPointF(x2*source_width, y2*source_height))
             # Calculate 4 corners coordinates
             self.topLeftHandle = QRectF(x1*source_width -(cs/sx/2.0), y1*source_height-(cs/sy/2.0), cs/sx, cs/sy)
             self.topRightHandle = QRectF(x2*source_width-(cs/sx/2.0), y1*source_height-(cs/sy/2.0), cs/sx, cs/sy)
@@ -865,7 +865,7 @@ class VideoWidget(QWidget, updates.UpdateInterface):
                 self.original_clip_data = self.transforming_clip.data
 
             _ = self.getTransformMode(0, 0, 0, event)
-            
+
             if self.transforming_effect_object.info.has_tracked_object:
                 # Get properties of effect at current frame
                 raw_properties = json.loads(self.transforming_effect_object.PropertiesJSON(clip_frame_number))
@@ -931,7 +931,7 @@ class VideoWidget(QWidget, updates.UpdateInterface):
                         elif self.transform_mode == 'scale_bottom':
                             scale_y += (event.pos().y() - self.mouse_position.y()) / (self.clipBounds.height() / 2.0)
                         elif self.transform_mode == 'scale_left':
-                            scale_x -= (event.pos().x() - self.mouse_position.x()) / (self.clipBounds.width() / 2.0)        
+                            scale_x -= (event.pos().x() - self.mouse_position.x()) / (self.clipBounds.width() / 2.0)
                         elif self.transform_mode == 'scale_right':
                             scale_x += (event.pos().x() - self.mouse_position.x()) / (self.clipBounds.width() / 2.0)
 
@@ -1000,7 +1000,7 @@ class VideoWidget(QWidget, updates.UpdateInterface):
         """Update a keyframe property to a new value, adding or updating keyframes as needed"""
         found_point = False
         effect_updated = False
-        
+
         raw_properties = json.loads(self.transforming_effect_object.Json())
 
         c = Effect.get(id=effect_id)
@@ -1088,7 +1088,7 @@ class VideoWidget(QWidget, updates.UpdateInterface):
             self.transforming_effect = Effect.get(id=effect_id)
             self.transforming_effect_object = win.timeline_sync.timeline.GetClipEffect(effect_id)
 
-            if (self.transforming_clip and self.transforming_clip_object and 
+            if (self.transforming_clip and self.transforming_clip_object and
                 self.transforming_effect and self.transforming_effect_object):
                 need_refresh = True
 
@@ -1162,7 +1162,9 @@ class VideoWidget(QWidget, updates.UpdateInterface):
         # Repaint widget on zoom
         self.repaint()
 
-    def __init__(self, *args):
+    def __init__(self, watch_project=True, *args):
+        """watch_project: watch for changes in project size / widget size, and
+        continue to match the current project's aspect ratio."""
         # Invoke parent init
         QWidget.__init__(self, *args)
 
@@ -1245,7 +1247,8 @@ class VideoWidget(QWidget, updates.UpdateInterface):
         self.delayed_resize_timer = QTimer()
         self.delayed_resize_timer.setInterval(200)
         self.delayed_resize_timer.setSingleShot(True)
-        self.delayed_resize_timer.timeout.connect(self.delayed_resize_callback)
+        if watch_project:
+            self.delayed_resize_timer.timeout.connect(self.delayed_resize_callback)
 
         # Connect to signals
         self.win.TransformSignal.connect(self.transformTriggered)

src/windows/views/properties_tableview.py

@@ -30,7 +30,7 @@ import json
 import functools
 from operator import itemgetter
 
-from PyQt5.QtCore import Qt, QRectF, QLocale, pyqtSignal, pyqtSlot
+from PyQt5.QtCore import Qt, QRectF, QLocale, pyqtSignal, pyqtSlot, QRect
 from PyQt5.QtGui import (
     QCursor, QIcon, QColor, QBrush, QPen, QPalette, QPixmap,
     QPainter, QPainterPath, QLinearGradient, QFont, QFontInfo,
@@ -426,7 +426,7 @@ class PropertiesTableView(QTableView):
             if self.menu_reset:
                 self.choices = []
                 self.menu_reset = False
-            
+
             # Handle parent effect options
             if property_key == "parent_effect_id" and not self.choices:
                 clip_choices = [{
@@ -498,7 +498,7 @@ class PropertiesTableView(QTableView):
                                 "selected": False,
                                 "icon": QIcon()
                             })
-                self.choices.append({"name": _("Detected Objects"), "value": object_index_choices, "selected": False, "icon": None})  
+                self.choices.append({"name": _("Detected Objects"), "value": object_index_choices, "selected": False, "icon": None})
 
             # Handle property to set the Tracked Object's child clip
             if property_key == "child_clip_id" and not self.choices:
@@ -772,7 +772,7 @@ class PropertiesTableView(QTableView):
                                 sub_sub_choice["icon"], sub_sub_choice["name"])
                             Choice_Action.setData(sub_sub_choice["value"])
                             Choice_Action.triggered.connect(self.Choice_Action_Triggered)
-                    else:                    
+                    else:
                         if i % SubMenuSize == 0:
                             SubMenuNumber += 1
                             SubMenu = SubMenuRoot.addMenu(str(SubMenuNumber))