v2.2.1 - fix #74, fix #92, add optional 64th bar to Classic Visualizer, improve Conway default

.gitignore

@@ -5,6 +5,7 @@ __pycache__
 build/
 dist/
 env/
+prof/
 .venv/
 .env/
 .vscode/
@@ -24,3 +25,5 @@ ffmpeg
 *.goutput*
 *.kate-swp
 *.code-workspace
+.coverage
+htmlcov/

pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "uv_build"
 name = "audio-visualizer-python"
 description = "Create audio visualization videos from a GUI or commandline"
 readme = "README.md"
-version = "2.2.0"
+version = "2.2.1"
 requires-python = ">= 3.12"
 license = "MIT"
 classifiers=[

src/avp/__init__.py

@@ -3,7 +3,7 @@
 import logging
 
 
-__version__ = "2.2.0"
+__version__ = "2.2.1"
 
 
 class Logger(logging.getLoggerClass()):

src/avp/component.py

@@ -18,6 +18,7 @@
     setWidgetValue,
     connectWidget,
     rgbFromString,
+    randomColor,
     blockSignals,
 )
 
@@ -635,9 +636,17 @@ def pickColor_():
 
                 self._colorFuncs = {attr: makeColorFunc(attr) for attr in kwargs[kwarg]}
                 for attr, func in self._colorFuncs.items():
+                    colorText = self._trackedWidgets[attr].text()
+                    if colorText == "":
+                        rndColor = randomColor()
+                        self._trackedWidgets[attr].setText(str(rndColor)[1:-1])
                     self._colorWidgets[attr].clicked.connect(func)
                     self._colorWidgets[attr].setStyleSheet(
-                        "QPushButton {" "background-color : #FFFFFF; outline: none; }"
+                        "QPushButton {"
+                        "background-color : %s; outline: none; }"
+                        % QColor(
+                            *rgbFromString(colorText) if colorText else rndColor
+                        ).name()
                     )
 
             if kwarg == "relativeWidgets":
@@ -798,6 +807,7 @@ def updateRelativeWidget(self, attr):
             if oldUserValue == newUserValue and oldRelativeVal != newRelativeVal:
                 # Float changed without pixel value changing, which
                 # means the pixel value needs to be updated
+                # TODO QDoubleSpinBox doesn't work with relativeWidgets because of this
                 log.debug(
                     "Updating %s #%s's relative widget: %s",
                     self.__class__.name,

src/avp/components/color.py

@@ -2,7 +2,7 @@
 import logging
 
 from ..component import Component
-from ..toolkit.frame import BlankFrame, FloodFrame, FramePainter, PaintColor
+from ..toolkit.frame import BlankFrame, FloodFrame, FramePainter
 
 
 log = logging.getLogger("AVP.Components.Color")
@@ -152,13 +152,13 @@ def drawFrame(self, width, height):
         elif self.spread == 2:
             spread = QtGui.QGradient.Spread.RepeatSpread
         brush.setSpread(spread)
-        brush.setColorAt(0.0, PaintColor(*self.color1))
+        brush.setColorAt(0.0, QtGui.QColor(*self.color1))
         if self.trans:
-            brush.setColorAt(1.0, PaintColor(0, 0, 0, 0))
+            brush.setColorAt(1.0, QtGui.QColor(0, 0, 0, 0))
         elif self.fillType == 1 and self.stretch:
-            brush.setColorAt(0.2, PaintColor(*self.color2))
+            brush.setColorAt(0.2, QtGui.QColor(*self.color2))
         else:
-            brush.setColorAt(1.0, PaintColor(*self.color2))
+            brush.setColorAt(1.0, QtGui.QColor(*self.color2))
         image.setBrush(brush)
         image.drawRect(self.x, self.y, self.sizeWidth, self.sizeHeight)
 

src/avp/components/color.ui

@@ -74,7 +74,7 @@
           </size>
          </property>
          <property name="text">
-          <string>0,0,0</string>
+          <string/>
          </property>
          <property name="maxLength">
           <number>12</number>
@@ -84,10 +84,10 @@
        <item>
         <spacer name="horizontalSpacer_9">
          <property name="orientation">
-          <enum>Qt::Horizontal</enum>
+          <enum>Qt::Orientation::Horizontal</enum>
          </property>
          <property name="sizeType">
-          <enum>QSizePolicy::Fixed</enum>
+          <enum>QSizePolicy::Policy::Fixed</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
@@ -176,7 +176,7 @@
           <string>Width</string>
          </property>
          <property name="alignment">
-          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+          <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter</set>
          </property>
         </widget>
        </item>
@@ -246,10 +246,10 @@
        <item>
         <spacer name="horizontalSpacer_7">
          <property name="orientation">
-          <enum>Qt::Horizontal</enum>
+          <enum>Qt::Orientation::Horizontal</enum>
          </property>
          <property name="sizeType">
-          <enum>QSizePolicy::Fixed</enum>
+          <enum>QSizePolicy::Policy::Fixed</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
@@ -370,7 +370,7 @@
           <number>-1</number>
          </property>
          <property name="sizeAdjustPolicy">
-          <enum>QComboBox::AdjustToContentsOnFirstShow</enum>
+          <enum>QComboBox::SizeAdjustPolicy::AdjustToContentsOnFirstShow</enum>
          </property>
         </widget>
        </item>
@@ -422,10 +422,10 @@
        <item>
         <spacer name="horizontalSpacer_2">
          <property name="orientation">
-          <enum>Qt::Horizontal</enum>
+          <enum>Qt::Orientation::Horizontal</enum>
          </property>
          <property name="sizeType">
-          <enum>QSizePolicy::Minimum</enum>
+          <enum>QSizePolicy::Policy::Minimum</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
@@ -461,7 +461,7 @@
              <x>-1</x>
              <y>0</y>
              <width>561</width>
-             <height>31</height>
+             <height>34</height>
             </rect>
            </property>
            <layout class="QHBoxLayout" name="horizontalLayout">
@@ -503,7 +503,7 @@
                <string>End</string>
               </property>
               <property name="alignment">
-               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+               <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
               </property>
              </widget>
             </item>
@@ -523,7 +523,7 @@
             <item>
              <spacer name="horizontalSpacer">
               <property name="orientation">
-               <enum>Qt::Horizontal</enum>
+               <enum>Qt::Orientation::Horizontal</enum>
               </property>
               <property name="sizeHint" stdset="0">
                <size>
@@ -543,7 +543,7 @@
              <x>-1</x>
              <y>-1</y>
              <width>561</width>
-             <height>31</height>
+             <height>34</height>
             </rect>
            </property>
            <layout class="QHBoxLayout" name="horizontalLayout_3">
@@ -559,7 +559,7 @@
                <string>Start</string>
               </property>
               <property name="alignment">
-               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+               <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
               </property>
              </widget>
             </item>
@@ -588,7 +588,7 @@
                <string>End</string>
               </property>
               <property name="alignment">
-               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+               <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
               </property>
              </widget>
             </item>
@@ -617,14 +617,14 @@
                <string>Centre</string>
               </property>
               <property name="alignment">
-               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+               <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
               </property>
              </widget>
             </item>
             <item>
              <widget class="QSpinBox" name="spinBox_radialGradient_spread">
               <property name="buttonSymbols">
-               <enum>QAbstractSpinBox::PlusMinus</enum>
+               <enum>QAbstractSpinBox::ButtonSymbols::PlusMinus</enum>
               </property>
               <property name="minimum">
                <number>-10000</number>
@@ -640,7 +640,7 @@
             <item>
              <spacer name="horizontalSpacer_3">
               <property name="orientation">
-               <enum>Qt::Horizontal</enum>
+               <enum>Qt::Orientation::Horizontal</enum>
               </property>
               <property name="sizeHint" stdset="0">
                <size>

src/avp/components/image.py

@@ -4,13 +4,13 @@
 from copy import copy
 
 from ..component import Component
-from ..toolkit.frame import BlankFrame
-from .original import Component as Visualizer
+from ..toolkit.frame import BlankFrame, addShadow
+from ..toolkit.visualizer import createSpectrumArray
 
 
 class Component(Component):
     name = "Image"
-    version = "2.0.0"
+    version = "2.1.0"
 
     def widget(self, *args):
         super().widget(*args)
@@ -35,6 +35,7 @@ def widget(self, *args):
                 "mirror": self.page.checkBox_mirror,
                 "respondToAudio": self.page.checkBox_respondToAudio,
                 "sensitivity": self.page.spinBox_sensitivity,
+                "shadow": self.page.checkBox_shadow,
             },
             presetNames={
                 "imagePath": "image",
@@ -75,31 +76,16 @@ def preFrameRender(self, **kwargs):
         # Trigger creation of new base image
         self.existingImage = None
 
-        smoothConstantDown = 0.08 + 0
-        smoothConstantUp = 0.8 - 0
-        self.lastSpectrum = None
-        self.spectrumArray = {}
-
-        for i in range(0, len(self.completeAudioArray), self.sampleSize):
-            if self.canceled:
-                break
-            self.lastSpectrum = Visualizer.transformData(
-                i,
-                self.completeAudioArray,
-                self.sampleSize,
-                smoothConstantDown,
-                smoothConstantUp,
-                self.lastSpectrum,
-                self.sensitivity,
-            )
-            self.spectrumArray[i] = copy(self.lastSpectrum)
-
-            progress = int(100 * (i / len(self.completeAudioArray)))
-            if progress >= 100:
-                progress = 100
-            pStr = "Analyzing audio: " + str(progress) + "%"
-            self.progressBarSetText.emit(pStr)
-            self.progressBarUpdate.emit(int(progress))
+        self.spectrumArray = createSpectrumArray(
+            self,
+            self.completeAudioArray,
+            self.sampleSize,
+            0.08,
+            0.8,
+            self.sensitivity,
+            self.progressBarUpdate,
+            self.progressBarSetText,
+        )
 
     def frameRender(self, frameNo):
         return self.drawFrame(
@@ -139,9 +125,16 @@ def drawFrame(self, width, height, dynamicScale):
                 self.existingImage = image
 
             # Respond to audio
+            resolutionFactor = height / 1080
+            shadX = int(resolutionFactor * 1)
+            shadY = int(resolutionFactor * -1)
+            shadBlur = resolutionFactor * 3.50
             scale = 0
             if dynamicScale is not None:
                 scale = dynamicScale[36 * 4] / 4
+                shadX += int((scale / 4) * resolutionFactor)
+                shadY += int((scale / 2) * resolutionFactor)
+                shadBlur += (scale / 8) * resolutionFactor
                 image = ImageOps.contain(
                     image,
                     (
@@ -161,6 +154,8 @@ def drawFrame(self, width, height, dynamicScale):
             )
             if self.rotate != 0:
                 frame = frame.rotate(self.rotate)
+            if self.shadow:
+                frame = addShadow(frame, shadBlur, shadX, shadY)
 
         return frame
 

src/avp/components/image.ui

@@ -306,6 +306,16 @@
          </property>
         </spacer>
        </item>
+       <item>
+        <widget class="QCheckBox" name="checkBox_shadow">
+         <property name="layoutDirection">
+          <enum>Qt::LayoutDirection::RightToLeft</enum>
+         </property>
+         <property name="text">
+          <string>Shadow</string>
+         </property>
+        </widget>
+       </item>
        <item>
         <widget class="QLabel" name="label_3">
          <property name="sizePolicy">