more options for the Spectrum component

3 files changed, 437 insertions, 34 deletions

diff --git a/src/component.py b/src/component.py
index 1a5a5a4..36ad9d3 100644
--- a/src/component.py
+++ b/src/component.py
@@ -427,7 +427,7 @@ class ComponentError(RuntimeError):
                     name,
                     'an' if any([
                         sys.exc_info()[0].__name__.startswith(vowel)
-                        for vowel in ('A', 'I')
+                        for vowel in ('A', 'I', 'U', 'O', 'E')
                     ]) else 'a',
                     sys.exc_info()[0].__name__,
                     str(sys.exc_info()[1])
diff --git a/src/components/spectrum.py b/src/components/spectrum.py
index 261d9cc..d1ad297 100644
--- a/src/components/spectrum.py
+++ b/src/components/spectrum.py
@@ -1,6 +1,5 @@
 from PIL import Image
 from PyQt5 import QtGui, QtCore, QtWidgets
-from PyQt5.QtGui import QColor
 import os
 import math
 import subprocess
@@ -8,7 +7,7 @@ import time
 
 from component import Component
 from toolkit.frame import BlankFrame, scale
-from toolkit import checkOutput, rgbFromString, pickColor, connectWidget
+from toolkit import checkOutput, connectWidget
 from toolkit.ffmpeg import (
     openPipe, closePipe, getAudioDuration, FfmpegVideo, exampleSound
 )
@@ -19,7 +18,6 @@ class Component(Component):
     version = '1.0.0'
 
     def widget(self, *args):
-        self.color = (255, 255, 255)
         self.previewFrame = None
         super().widget(*args)
         self.chunkSize = 4 * self.width * self.height
@@ -35,14 +33,22 @@ class Component(Component):
             {
                 'filterType': self.page.comboBox_filterType,
                 'window': self.page.comboBox_window,
-                'amplitude': self.page.comboBox_amplitude,
+                'mode': self.page.comboBox_mode,
+                'amplitude': self.page.comboBox_amplitude0,
+                'amplitude1': self.page.comboBox_amplitude1,
+                'amplitude2': self.page.comboBox_amplitude2,
+                'display': self.page.comboBox_display,
+                'zoom': self.page.spinBox_zoom,
+                'tc': self.page.spinBox_tc,
                 'x': self.page.spinBox_x,
                 'y': self.page.spinBox_y,
                 'mirror': self.page.checkBox_mirror,
+                'draw': self.page.checkBox_draw,
                 'scale': self.page.spinBox_scale,
                 'color': self.page.comboBox_color,
                 'compress': self.page.checkBox_compress,
                 'mono': self.page.checkBox_mono,
+                'hue': self.page.spinBox_hue,
             }
         )
         for widget in self._trackedWidgets.values():
@@ -52,9 +58,8 @@ class Component(Component):
         self.changedOptions = True
 
     def update(self):
-        count = self.page.stackedWidget.count()
-        i = self.page.comboBox_filterType.currentIndex()
-        self.page.stackedWidget.setCurrentIndex(i if i < count else count - 1)
+        self.page.stackedWidget.setCurrentIndex(
+            self.page.comboBox_filterType.currentIndex())
         super().update()
 
     def previewRender(self):
@@ -141,25 +146,26 @@ class Component(Component):
 
     def makeFfmpegFilter(self, preview=False, startPt=0):
         w, h = scale(self.scale, self.width, self.height, str)
-        if self.amplitude == 0:
-            amplitude = 'sqrt'
-        elif self.amplitude == 1:
-            amplitude = 'cbrt'
-        elif self.amplitude == 2:
-            amplitude = '4thrt'
-        elif self.amplitude == 3:
-            amplitude = '5thrt'
-        elif self.amplitude == 4:
-            amplitude = 'lin'
-        elif self.amplitude == 5:
-            amplitude = 'log'
         color = self.page.comboBox_color.currentText().lower()
         genericPreview = self.settings.value("pref_genericPreview")
 
         if self.filterType == 0:  # Spectrum
+            if self.amplitude == 0:
+                amplitude = 'sqrt'
+            elif self.amplitude == 1:
+                amplitude = 'cbrt'
+            elif self.amplitude == 2:
+                amplitude = '4thrt'
+            elif self.amplitude == 3:
+                amplitude = '5thrt'
+            elif self.amplitude == 4:
+                amplitude = 'lin'
+            elif self.amplitude == 5:
+                amplitude = 'log'
             filter_ = (
                 'showspectrum=s=%sx%s:slide=scroll:win_func=%s:'
-                'color=%s:scale=%s' % (
+                'color=%s:scale=%s,'
+                'colorkey=color=black:similarity=0.1:blend=0.5' % (
                     self.settings.value("outputWidth"),
                     self.settings.value("outputHeight"),
                     self.page.comboBox_window.currentText(),
@@ -167,32 +173,61 @@ class Component(Component):
                 )
             )
         elif self.filterType == 1:  # Histogram
+            if self.amplitude1 == 0:
+                amplitude = 'log'
+            elif self.amplitude1 == 1:
+                amplitude = 'lin'
+            if self.display == 0:
+                display = 'log'
+            elif self.display == 1:
+                display = 'sqrt'
+            elif self.display == 2:
+                display = 'cbrt'
+            elif self.display == 3:
+                display = 'lin'
+            elif self.display == 4:
+                display = 'rlog'
             filter_ = (
-                'ahistogram=r=%s:s=%sx%s:dmode=separate' % (
+                'ahistogram=r=%s:s=%sx%s:dmode=separate:ascale=%s:scale=%s' % (
                     self.settings.value("outputFrameRate"),
                     self.settings.value("outputWidth"),
                     self.settings.value("outputHeight"),
+                    amplitude, display
                 )
             )
         elif self.filterType == 2:  # Vector Scope
+            if self.amplitude2 == 0:
+                amplitude = 'log'
+            elif self.amplitude2 == 1:
+                amplitude = 'sqrt'
+            elif self.amplitude2 == 2:
+                amplitude = 'cbrt'
+            elif self.amplitude2 == 3:
+                amplitude = 'lin'
+            m = self.page.comboBox_mode.currentText()
             filter_ = (
-                'avectorscope=s=%sx%s:draw=line:m=polar:scale=log' % (
+                'avectorscope=s=%sx%s:draw=%s:m=%s:scale=%s:zoom=%s' % (
                     self.settings.value("outputWidth"),
                     self.settings.value("outputHeight"),
+                    'line'if self.draw else 'dot',
+                    m, amplitude, str(self.zoom),
                 )
             )
         elif self.filterType == 3:  # Musical Scale
             filter_ = (
-                'showcqt=r=%s:s=%sx%s:count=30:text=0' % (
+                'showcqt=r=%s:s=%sx%s:count=30:text=0:tc=%s,'
+                'colorkey=color=black:similarity=0.1:blend=0.5 ' % (
                     self.settings.value("outputFrameRate"),
                     self.settings.value("outputWidth"),
                     self.settings.value("outputHeight"),
+                    str(self.tc),
                 )
             )
         elif self.filterType == 4:  # Phase
             filter_ = (
-                'aphasemeter=r=%s:s=%sx%s:mpc=white:video=1[atrash][vtmp]; '
-                '[atrash] anullsink; [vtmp] null' % (
+                'aphasemeter=r=%s:s=%sx%s:video=1 [atrash][vtmp1]; '
+                '[atrash] anullsink; '
+                '[vtmp1] colorkey=color=black:similarity=0.1:blend=0.5 ' % (
                     self.settings.value("outputFrameRate"),
                     self.settings.value("outputWidth"),
                     self.settings.value("outputHeight"),
@@ -201,18 +236,22 @@ class Component(Component):
 
         return [
             '-filter_complex',
-            '%s%s%s%s%s [v1]; '
-            '[v1] scale=%s:%s%s [v]' % (
+            '%s%s%s%s [v1]; '
+            '[v1] %sscale=%s:%s%s%s%s [v]' % (
                 exampleSound() if preview and genericPreview else '[0:a] ',
                 'compand=gain=4,' if self.compress else '',
                 'aformat=channel_layouts=mono,' if self.mono else '',
                 filter_,
-                ', hflip' if self.mirror else'',
+                'hflip, ' if self.mirror else '',
                 w, h,
+                ', hue=h=%s:s=10' % str(self.hue) if self.hue > 0 else '',
                 ', trim=start=%s:end=%s' % (
-                    "{0:.3f}".format(startPt + 15),
-                    "{0:.3f}".format(startPt + 15.5)
+                    "{0:.3f}".format(startPt + 12),
+                    "{0:.3f}".format(startPt + 12.5)
                 ) if preview else '',
+                ', convolution=-2 -1 0 -1 1 1 0 1 2:-2 -1 0 -1 1 1 0 1 2:-2 '
+                '-1 0 -1 1 1 0 1 2:-2 -1 0 -1 1 1 0 1 2'
+                if self.filterType == 3 else ''
             ),
             '-map', '[v]',
         ]
diff --git a/src/components/spectrum.ui b/src/components/spectrum.ui
index 59ca0b8..c6a8a15 100644
--- a/src/components/spectrum.ui
+++ b/src/components/spectrum.ui
@@ -32,6 +32,9 @@
       <number>4</number>
      </property>
      <item>
+      <layout class="QHBoxLayout" name="horizontalLayout_5"/>
+     </item>
+     <item>
       <layout class="QHBoxLayout" name="horizontalLayout_8">
        <item>
         <widget class="QLabel" name="label_4">
@@ -209,6 +212,26 @@
         </spacer>
        </item>
        <item>
+        <widget class="QLabel" name="label_11">
+         <property name="text">
+          <string>Hue</string>
+         </property>
+         <property name="margin">
+          <number>4</number>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QSpinBox" name="spinBox_hue">
+         <property name="suffix">
+          <string>° </string>
+         </property>
+         <property name="maximum">
+          <number>359</number>
+         </property>
+        </widget>
+       </item>
+       <item>
         <widget class="QLabel" name="label">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
@@ -272,7 +295,7 @@
            <x>0</x>
            <y>0</y>
            <width>561</width>
-           <height>72</height>
+           <height>66</height>
           </rect>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_3">
@@ -415,7 +438,7 @@
              </widget>
             </item>
             <item>
-             <widget class="QComboBox" name="comboBox_amplitude">
+             <widget class="QComboBox" name="comboBox_amplitude0">
               <item>
                <property name="text">
                 <string>Square root</string>
@@ -554,7 +577,348 @@
          </layout>
         </widget>
        </widget>
-       <widget class="QWidget" name="page_2"/>
+       <widget class="QWidget" name="page_2">
+        <widget class="QWidget" name="verticalLayoutWidget_2">
+         <property name="geometry">
+          <rect>
+           <x>-1</x>
+           <y>-1</y>
+           <width>561</width>
+           <height>31</height>
+          </rect>
+         </property>
+         <layout class="QVBoxLayout" name="verticalLayout_4">
+          <item>
+           <layout class="QHBoxLayout" name="horizontalLayout_2">
+            <item>
+             <widget class="QLabel" name="label_6">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="text">
+               <string>Display Scale</string>
+              </property>
+              <property name="margin">
+               <number>4</number>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QComboBox" name="comboBox_display">
+              <item>
+               <property name="text">
+                <string>Logarithmic</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string>Square root</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string>Cubic root</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string>Linear</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string>Reverse Log</string>
+               </property>
+              </item>
+             </widget>
+            </item>
+            <item>
+             <widget class="QLabel" name="label_5">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="text">
+               <string>Amplitude</string>
+              </property>
+              <property name="margin">
+               <number>4</number>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QComboBox" name="comboBox_amplitude1">
+              <item>
+               <property name="text">
+                <string>Logarithmic</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string>Linear</string>
+               </property>
+              </item>
+             </widget>
+            </item>
+            <item>
+             <spacer name="horizontalSpacer">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeType">
+               <enum>QSizePolicy::Minimum</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+           </layout>
+          </item>
+         </layout>
+        </widget>
+       </widget>
+       <widget class="QWidget" name="page_3">
+        <widget class="QWidget" name="verticalLayoutWidget_3">
+         <property name="geometry">
+          <rect>
+           <x>-1</x>
+           <y>-1</y>
+           <width>585</width>
+           <height>64</height>
+          </rect>
+         </property>
+         <layout class="QVBoxLayout" name="verticalLayout_5">
+          <item>
+           <layout class="QHBoxLayout" name="horizontalLayout_3">
+            <item>
+             <widget class="QLabel" name="label_9">
+              <property name="text">
+               <string>Mode</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QComboBox" name="comboBox_mode">
+              <item>
+               <property name="text">
+                <string>lissajous</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string>lissajous_xy</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string>polar</string>
+               </property>
+              </item>
+             </widget>
+            </item>
+            <item>
+             <widget class="QLabel" name="label_7">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="text">
+               <string>Amplitude</string>
+              </property>
+              <property name="margin">
+               <number>4</number>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QComboBox" name="comboBox_amplitude2">
+              <item>
+               <property name="text">
+                <string>Linear</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string>Square root</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string>Cubic root</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string>Logarithmic</string>
+               </property>
+              </item>
+             </widget>
+            </item>
+            <item>
+             <spacer name="horizontalSpacer_5">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+           </layout>
+          </item>
+          <item>
+           <layout class="QHBoxLayout" name="horizontalLayout_6">
+            <item>
+             <widget class="QLabel" name="label_8">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="text">
+               <string>Zoom</string>
+              </property>
+              <property name="margin">
+               <number>4</number>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QSpinBox" name="spinBox_zoom">
+              <property name="minimum">
+               <number>1</number>
+              </property>
+              <property name="maximum">
+               <number>10</number>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QCheckBox" name="checkBox_draw">
+              <property name="text">
+               <string>Line</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <spacer name="horizontalSpacer_6">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+           </layout>
+          </item>
+         </layout>
+        </widget>
+       </widget>
+       <widget class="QWidget" name="page_4">
+        <widget class="QWidget" name="verticalLayoutWidget_4">
+         <property name="geometry">
+          <rect>
+           <x>0</x>
+           <y>0</y>
+           <width>561</width>
+           <height>31</height>
+          </rect>
+         </property>
+         <layout class="QVBoxLayout" name="verticalLayout_6">
+          <item>
+           <layout class="QHBoxLayout" name="horizontalLayout_7">
+            <item>
+             <widget class="QLabel" name="label_10">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="text">
+               <string>Timeclamp</string>
+              </property>
+              <property name="margin">
+               <number>4</number>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QDoubleSpinBox" name="spinBox_tc">
+              <property name="suffix">
+               <string>s</string>
+              </property>
+              <property name="decimals">
+               <number>3</number>
+              </property>
+              <property name="minimum">
+               <double>0.002000000000000</double>
+              </property>
+              <property name="maximum">
+               <double>1.000000000000000</double>
+              </property>
+              <property name="singleStep">
+               <double>0.010000000000000</double>
+              </property>
+              <property name="value">
+               <double>0.017000000000000</double>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <spacer name="horizontalSpacer_7">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+           </layout>
+          </item>
+         </layout>
+        </widget>
+       </widget>
+       <widget class="QWidget" name="page_5">
+        <widget class="QWidget" name="verticalLayoutWidget_5">
+         <property name="geometry">
+          <rect>
+           <x>0</x>
+           <y>0</y>
+           <width>551</width>
+           <height>31</height>
+          </rect>
+         </property>
+         <layout class="QVBoxLayout" name="verticalLayout_7">
+          <item>
+           <layout class="QHBoxLayout" name="horizontalLayout_11"/>
+          </item>
+         </layout>
+        </widget>
+       </widget>
       </widget>
      </item>
     </layout>