From a12be862e22bdec6a243a3f0b5f4f28d69084a2a Mon Sep 17 00:00:00 2001
From: Brianna Rainey
Date: Thu, 22 Jan 2026 16:29:46 -0500
Subject: fix #89 with Image component v2.0 + 23 tests (#90)

* qtbot is needed in any test that uses a QObject
previously these tests would fail if they ran before qtbot was initialized by another test. I'm now running tests in a random order

* add tests for drawBars, readAudioFile, BlankFrame

* replace numpy.seterr with numpy.errstate

* fix incorrect comment

* add MockVideoWorker and imageDataSum

* test further into visualization (less likely to be a false positive)

* test FloodFrame function

* add failing test for Image component
one step towards fixing #89

* test component name CLI parsing

* prevent log warning when 1 setting changed

* correct tests to use widgets when needed

* test undo and blockSignals

* remove stretch_scale (use scale only)

* image ignores scale if stretch checkbox checked
fixes #89

* test Title Text component, ffmpeg command

* Image v2: replace stretched setting with resizeMode
3 resize modes are scale, cover, and stretch. Scale only applies when resizeMode is set to scale. Cover uses ImageOps.fit() to stretch while maintaining aspect ratio. Also, spinBox_scale was moved to be underneath comboBox_resizeMode.

* change transformData into staticmethod
the purpose is to allow easier reuse in other components

* add respondToAudio option to Image component
this causes the image to scale up and down slightly based on the input audio file

* cache static portion of image when animating
increases rendering speed of a 1-minute video by 12 seconds (based on two manual tests anyway)---
 src/avp/component.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'src/avp/component.py')

diff --git a/src/avp/component.py b/src/avp/component.py
index 01d4e44..6c5e381 100644
--- a/src/avp/component.py
+++ b/src/avp/component.py
@@ -910,11 +910,12 @@ class ComponentUpdate(QUndoCommand):
 
         # Determine if this update is mergeable
         self.id_ = -1
-        if len(self.modifiedVals) == 1 and self.parent.mergeUndo:
-            attr, val = self.modifiedVals.popitem()
-            self.id_ = sum([ord(letter) for letter in attr[-14:]])
-            self.modifiedVals[attr] = val
-        else:
+        if self.parent.mergeUndo:
+            if len(self.modifiedVals) == 1:
+                attr, val = self.modifiedVals.popitem()
+                self.id_ = sum([ord(letter) for letter in attr[-14:]])
+                self.modifiedVals[attr] = val
+                return
             log.warning(
                 "%s component settings changed at once. (%s)",
                 len(self.modifiedVals),
-- 
cgit v1.2.3