From 1297af61c9ce00b6dd76f8ec690baedf5bf887c7 Mon Sep 17 00:00:00 2001
From: tassaron
Date: Sat, 29 Jul 2017 20:27:46 -0400
Subject: waveform component is working, preview is glitchy

---
 src/components/original.py | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/components/original.py')

diff --git a/src/components/original.py b/src/components/original.py
index 3d1a574..621af6f 100644
--- a/src/components/original.py
+++ b/src/components/original.py
@@ -18,6 +18,9 @@ class Component(Component):
     def names(*args):
         return ['Original Audio Visualization']
 
+    def properties(self):
+        return ['pcm']
+
     def widget(self, *args):
         self.visColor = (255, 255, 255)
         self.scale = 20
-- 
cgit v1.2.3


From 3c1b52205f183e9a2c943c5f666ed2c01db3aaf5 Mon Sep 17 00:00:00 2001
From: tassaron
Date: Tue, 1 Aug 2017 17:57:39 -0400
Subject: component class now tracks colorwidgets

so adding new color-selection widgets is now simple
---
 setup.py                   |  2 +-
 src/component.py           | 73 +++++++++++++++++++++++++++++++++++++++++-----
 src/components/color.py    | 58 +++++-------------------------------
 src/components/original.py | 35 +++-------------------
 src/components/text.py     | 27 ++---------------
 src/components/waveform.py | 40 ++++---------------------
 src/toolkit/common.py      | 19 ------------
 src/toolkit/frame.py       |  6 ++--
 8 files changed, 90 insertions(+), 170 deletions(-)

(limited to 'src/components/original.py')

diff --git a/setup.py b/setup.py
index d4f226b..4a4511f 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@ from setuptools import setup
 import os
 
 
-__version__ = '2.0.0.rc2'
+__version__ = '2.0.0.rc3'
 
 
 def package_files(directory):
diff --git a/src/component.py b/src/component.py
index 36ad9d3..d47aeae 100644
--- a/src/component.py
+++ b/src/component.py
@@ -3,18 +3,20 @@
     on making a valid component.
 '''
 from PyQt5 import uic, QtCore, QtWidgets
+from PyQt5.QtGui import QColor
 import os
 import sys
 import time
 
 from toolkit.frame import BlankFrame
-from toolkit import getWidgetValue, setWidgetValue, connectWidget
+from toolkit import (
+    getWidgetValue, setWidgetValue, connectWidget, rgbFromString
+)
 
 
 class ComponentMetaclass(type(QtCore.QObject)):
     '''
-        Checks the validity of each Component class imported, and
-        mutates some attributes for easier use by the core program.
+        Checks the validity of each Component class and mutates some attrs.
         E.g., takes only major version from version string & decorates methods
     '''
 
@@ -173,6 +175,8 @@ class Component(QtCore.QObject, metaclass=ComponentMetaclass):
         self._trackedWidgets = {}
         self._presetNames = {}
         self._commandArgs = {}
+        self._colorWidgets = {}
+        self._relativeWidgets = {}
         self._lockedProperties = None
         self._lockedError = None
 
@@ -188,7 +192,7 @@ class Component(QtCore.QObject, metaclass=ComponentMetaclass):
         )
 
     # =~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~==~=~=~=~=~=~=~=~=~=~=~=~=~=~
-    # Critical Methods
+    # Render Methods
     # =~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~==~=~=~=~=~=~=~=~=~=~=~=~=~=~
 
     def previewRender(self):
@@ -286,7 +290,17 @@ class Component(QtCore.QObject, metaclass=ComponentMetaclass):
             Call super() at the END if you need to subclass this.
         '''
         for attr, widget in self._trackedWidgets.items():
-            setattr(self, attr, getWidgetValue(widget))
+            if attr in self._colorWidgets:
+                rgbTuple = rgbFromString(widget.text())
+                setattr(self, attr, rgbTuple)
+                btnStyle = (
+                    "QPushButton { background-color : %s; outline: none; }"
+                    % QColor(*rgbTuple).name()
+                )
+                self._colorWidgets[attr].setStyleSheet(btnStyle)
+            else:
+                setattr(self, attr, getWidgetValue(widget))
+
         if not self.core.openingProject:
             self.parent.drawPreview()
             saveValueStore = self.savePreset()
@@ -305,7 +319,16 @@ class Component(QtCore.QObject, metaclass=ComponentMetaclass):
             key = attr if attr not in self._presetNames \
                 else self._presetNames[attr]
             val = presetDict[key]
-            setWidgetValue(widget, val)
+
+            if attr in self._colorWidgets:
+                widget.setText('%s,%s,%s' % val)
+                btnStyle = (
+                    "QPushButton { background-color : %s; outline: none; }"
+                    % QColor(*val).name()
+                )
+                self._colorWidgets[attr].setStyleSheet(btnStyle)
+            else:
+                setWidgetValue(widget, val)
 
     def savePreset(self):
         saveValueStore = {}
@@ -352,7 +375,12 @@ class Component(QtCore.QObject, metaclass=ComponentMetaclass):
         self._trackedWidgets = trackDict
         for kwarg in kwargs:
             try:
-                if kwarg in ('presetNames', 'commandArgs'):
+                if kwarg in (
+                        'presetNames',
+                        'commandArgs',
+                        'colorWidgets',
+                        'relativeWidgets',
+                        ):
                     setattr(self, '_%s' % kwarg, kwargs[kwarg])
                 else:
                     raise ComponentError(
@@ -360,6 +388,37 @@ class Component(QtCore.QObject, metaclass=ComponentMetaclass):
             except ComponentError:
                 continue
 
+            if kwarg == 'colorWidgets':
+                def makeColorFunc(attr):
+                    def pickColor_():
+                        self.pickColor(
+                            self._trackedWidgets[attr],
+                            self._colorWidgets[attr]
+                        )
+                    return pickColor_
+                self._colorFuncs = {
+                    attr: makeColorFunc(attr) for attr in kwargs[kwarg]
+                }
+                for attr, func in self._colorFuncs.items():
+                    self._colorWidgets[attr].clicked.connect(func)
+                    self._colorWidgets[attr].setStyleSheet(
+                        "QPushButton {"
+                        "background-color : #FFFFFF; outline: none; }"
+                    )
+
+    def pickColor(self, textWidget, button):
+        '''Use color picker to get color input from the user.'''
+        dialog = QtWidgets.QColorDialog()
+        dialog.setOption(QtWidgets.QColorDialog.ShowAlphaChannel, True)
+        color = dialog.getColor()
+        if color.isValid():
+            RGBstring = '%s,%s,%s' % (
+                str(color.red()), str(color.green()), str(color.blue()))
+            btnStyle = "QPushButton{background-color: %s; outline: none;}" \
+                % color.name()
+            textWidget.setText(RGBstring)
+            button.setStyleSheet(btnStyle)
+
     def lockProperties(self, propList):
         self._lockedProperties = propList
 
diff --git a/src/components/color.py b/src/components/color.py
index 2abd79a..d6fffc6 100644
--- a/src/components/color.py
+++ b/src/components/color.py
@@ -6,7 +6,6 @@ import os
 
 from component import Component
 from toolkit.frame import BlankFrame, FloodFrame, FramePainter, PaintColor
-from toolkit import rgbFromString, pickColor
 
 
 class Component(Component):
@@ -14,25 +13,12 @@ class Component(Component):
     version = '1.0.0'
 
     def widget(self, *args):
-        self.color1 = (0, 0, 0)
-        self.color2 = (133, 133, 133)
         self.x = 0
         self.y = 0
         super().widget(*args)
 
-        self.page.lineEdit_color1.setText('%s,%s,%s' % self.color1)
-        self.page.lineEdit_color2.setText('%s,%s,%s' % self.color2)
-
-        btnStyle1 = "QPushButton { background-color : %s; outline: none; }" \
-            % QColor(*self.color1).name()
-
-        btnStyle2 = "QPushButton { background-color : %s; outline: none; }" \
-            % QColor(*self.color2).name()
-
-        self.page.pushButton_color1.setStyleSheet(btnStyle1)
-        self.page.pushButton_color2.setStyleSheet(btnStyle2)
-        self.page.pushButton_color1.clicked.connect(lambda: self.pickColor(1))
-        self.page.pushButton_color2.clicked.connect(lambda: self.pickColor(2))
+        self.page.lineEdit_color1.setText('0,0,0')
+        self.page.lineEdit_color2.setText('133,133,133')
 
         # disable color #2 until non-default 'fill' option gets changed
         self.page.lineEdit_color2.setDisabled(True)
@@ -66,16 +52,18 @@ class Component(Component):
                 'LG_end': self.page.spinBox_linearGradient_end,
                 'RG_centre': self.page.spinBox_radialGradient_spread,
                 'fillType': self.page.comboBox_fill,
+                'color1': self.page.lineEdit_color1,
+                'color2': self.page.lineEdit_color2,
             }, presetNames={
                 'sizeWidth': 'width',
                 'sizeHeight': 'height',
-            }
+            }, colorWidgets={
+                'color1': self.page.pushButton_color1,
+                'color2': self.page.pushButton_color2,
+            },
         )
 
     def update(self):
-        self.color1 = rgbFromString(self.page.lineEdit_color1.text())
-        self.color2 = rgbFromString(self.page.lineEdit_color2.text())
-
         fillType = self.page.comboBox_fill.currentIndex()
         if fillType == 0:
             self.page.lineEdit_color2.setEnabled(False)
@@ -161,36 +149,6 @@ class Component(Component):
 
         return image.finalize()
 
-    def loadPreset(self, pr, *args):
-        super().loadPreset(pr, *args)
-
-        self.page.lineEdit_color1.setText('%s,%s,%s' % pr['color1'])
-        self.page.lineEdit_color2.setText('%s,%s,%s' % pr['color2'])
-
-        btnStyle1 = "QPushButton { background-color : %s; outline: none; }" \
-            % QColor(*pr['color1']).name()
-        btnStyle2 = "QPushButton { background-color : %s; outline: none; }" \
-            % QColor(*pr['color2']).name()
-        self.page.pushButton_color1.setStyleSheet(btnStyle1)
-        self.page.pushButton_color2.setStyleSheet(btnStyle2)
-
-    def savePreset(self):
-        saveValueStore = super().savePreset()
-        saveValueStore['color1'] = self.color1
-        saveValueStore['color2'] = self.color2
-        return saveValueStore
-
-    def pickColor(self, num):
-        RGBstring, btnStyle = pickColor()
-        if not RGBstring:
-            return
-        if num == 1:
-            self.page.lineEdit_color1.setText(RGBstring)
-            self.page.pushButton_color1.setStyleSheet(btnStyle)
-        else:
-            self.page.lineEdit_color2.setText(RGBstring)
-            self.page.pushButton_color2.setStyleSheet(btnStyle)
-
     def commandHelp(self):
         print('Specify a color:\n    color=255,255,255')
 
diff --git a/src/components/original.py b/src/components/original.py
index 621af6f..950ac7b 100644
--- a/src/components/original.py
+++ b/src/components/original.py
@@ -8,7 +8,6 @@ from copy import copy
 
 from component import Component
 from toolkit.frame import BlankFrame
-from toolkit import rgbFromString, pickColor
 
 
 class Component(Component):
@@ -22,7 +21,6 @@ class Component(Component):
         return ['pcm']
 
     def widget(self, *args):
-        self.visColor = (255, 255, 255)
         self.scale = 20
         self.y = 0
         super().widget(*args)
@@ -33,35 +31,17 @@ class Component(Component):
         self.page.comboBox_visLayout.addItem("Top")
         self.page.comboBox_visLayout.setCurrentIndex(0)
 
-        self.page.lineEdit_visColor.setText('%s,%s,%s' % self.visColor)
-        self.page.pushButton_visColor.clicked.connect(lambda: self.pickColor())
-        btnStyle = "QPushButton { background-color : %s; outline: none; }" \
-            % QColor(*self.visColor).name()
-        self.page.pushButton_visColor.setStyleSheet(btnStyle)
+        self.page.lineEdit_visColor.setText('255,255,255')
 
         self.trackWidgets({
+            'visColor': self.page.lineEdit_visColor,
             'layout': self.page.comboBox_visLayout,
             'scale': self.page.spinBox_scale,
             'y': self.page.spinBox_y,
+        }, colorWidgets={
+            'visColor': self.page.pushButton_visColor,
         })
 
-    def update(self):
-        self.visColor = rgbFromString(self.page.lineEdit_visColor.text())
-        super().update()
-
-    def loadPreset(self, pr, *args):
-        super().loadPreset(pr, *args)
-
-        self.page.lineEdit_visColor.setText('%s,%s,%s' % pr['visColor'])
-        btnStyle = "QPushButton { background-color : %s; outline: none; }" \
-            % QColor(*pr['visColor']).name()
-        self.page.pushButton_visColor.setStyleSheet(btnStyle)
-
-    def savePreset(self):
-        saveValueStore = super().savePreset()
-        saveValueStore['visColor'] = self.visColor
-        return saveValueStore
-
     def previewRender(self):
         spectrum = numpy.fromfunction(
             lambda x: float(self.scale)/2500*(x-128)**2, (255,), dtype="int16")
@@ -99,13 +79,6 @@ class Component(Component):
             self.spectrumArray[arrayNo],
             self.visColor, self.layout)
 
-    def pickColor(self):
-        RGBstring, btnStyle = pickColor()
-        if not RGBstring:
-            return
-        self.page.lineEdit_visColor.setText(RGBstring)
-        self.page.pushButton_visColor.setStyleSheet(btnStyle)
-
     def transformData(
       self, i, completeAudioArray, sampleSize,
       smoothConstantDown, smoothConstantUp, lastSpectrum):
diff --git a/src/components/text.py b/src/components/text.py
index 8a302ff..1fe3467 100644
--- a/src/components/text.py
+++ b/src/components/text.py
@@ -5,7 +5,6 @@ import os
 
 from component import Component
 from toolkit.frame import FramePainter
-from toolkit import rgbFromString, pickColor
 
 
 class Component(Component):
@@ -33,11 +32,6 @@ class Component(Component):
         self.page.comboBox_textAlign.addItem("Right")
 
         self.page.lineEdit_textColor.setText('%s,%s,%s' % self.textColor)
-        self.page.pushButton_textColor.clicked.connect(self.pickColor)
-        btnStyle = "QPushButton { background-color : %s; outline: none; }" \
-            % QColor(*self.textColor).name()
-        self.page.pushButton_textColor.setStyleSheet(btnStyle)
-
         self.page.lineEdit_title.setText(self.title)
         self.page.comboBox_textAlign.setCurrentIndex(int(self.alignment))
         self.page.spinBox_fontSize.setValue(int(self.fontSize))
@@ -48,21 +42,18 @@ class Component(Component):
             self.update
         )
         self.trackWidgets({
+            'textColor': self.page.lineEdit_textColor,
             'title': self.page.lineEdit_title,
             'alignment': self.page.comboBox_textAlign,
             'fontSize': self.page.spinBox_fontSize,
             'xPosition': self.page.spinBox_xTextAlign,
             'yPosition': self.page.spinBox_yTextAlign,
+        }, colorWidgets={
+            'textColor': self.page.pushButton_textColor,
         })
 
     def update(self):
         self.titleFont = self.page.fontComboBox_titleFont.currentFont()
-        self.textColor = rgbFromString(
-            self.page.lineEdit_textColor.text())
-        btnStyle = "QPushButton { background-color : %s; outline: none; }" \
-            % QColor(*self.textColor).name()
-        self.page.pushButton_textColor.setStyleSheet(btnStyle)
-
         super().update()
 
     def getXY(self):
@@ -86,15 +77,10 @@ class Component(Component):
         font = QFont()
         font.fromString(pr['titleFont'])
         self.page.fontComboBox_titleFont.setCurrentFont(font)
-        self.page.lineEdit_textColor.setText('%s,%s,%s' % pr['textColor'])
-        btnStyle = "QPushButton { background-color : %s; outline: none; }" \
-            % QColor(*pr['textColor']).name()
-        self.page.pushButton_textColor.setStyleSheet(btnStyle)
 
     def savePreset(self):
         saveValueStore = super().savePreset()
         saveValueStore['titleFont'] = self.titleFont.toString()
-        saveValueStore['textColor'] = self.textColor
         return saveValueStore
 
     def previewRender(self):
@@ -122,13 +108,6 @@ class Component(Component):
 
         return image.finalize()
 
-    def pickColor(self):
-        RGBstring, btnStyle = pickColor()
-        if not RGBstring:
-            return
-        self.page.lineEdit_textColor.setText(RGBstring)
-        self.page.pushButton_textColor.setStyleSheet(btnStyle)
-
     def commandHelp(self):
         print('Enter a string to use as centred white text:')
         print('    "title=User Error"')
diff --git a/src/components/waveform.py b/src/components/waveform.py
index 6c5133d..9c3cf86 100644
--- a/src/components/waveform.py
+++ b/src/components/waveform.py
@@ -7,7 +7,7 @@ import subprocess
 
 from component import Component
 from toolkit.frame import BlankFrame, scale
-from toolkit import checkOutput, rgbFromString, pickColor
+from toolkit import checkOutput
 from toolkit.ffmpeg import (
     openPipe, closePipe, getAudioDuration, FfmpegVideo, exampleSound
 )
@@ -18,15 +18,9 @@ class Component(Component):
     version = '1.0.0'
 
     def widget(self, *args):
-        self.color = (255, 255, 255)
         super().widget(*args)
 
-        self.page.lineEdit_color.setText('%s,%s,%s' % self.color)
-        btnStyle = "QPushButton { background-color : %s; outline: none; }" \
-            % QColor(*self.color).name()
-        self.page.pushButton_color.setStyleSheet(btnStyle)
-        self.page.pushButton_color.clicked.connect(lambda: self.pickColor())
-        self.page.spinBox_scale.valueChanged.connect(self.updateChunksize)
+        self.page.lineEdit_color.setText('255,255,255')
 
         if hasattr(self.parent, 'window'):
             self.parent.window.lineEdit_audioFile.textChanged.connect(
@@ -35,6 +29,7 @@ class Component(Component):
 
         self.trackWidgets(
             {
+                'color': self.page.lineEdit_color,
                 'mode': self.page.comboBox_mode,
                 'amplitude': self.page.comboBox_amplitude,
                 'x': self.page.spinBox_x,
@@ -44,36 +39,11 @@ class Component(Component):
                 'opacity': self.page.spinBox_opacity,
                 'compress': self.page.checkBox_compress,
                 'mono': self.page.checkBox_mono,
+            }, colorWidgets={
+                'color': self.page.pushButton_color,
             }
         )
 
-    def update(self):
-        self.color = rgbFromString(self.page.lineEdit_color.text())
-        btnStyle = "QPushButton { background-color : %s; outline: none; }" \
-            % QColor(*self.color).name()
-        self.page.pushButton_color.setStyleSheet(btnStyle)
-        super().update()
-
-    def loadPreset(self, pr, *args):
-        super().loadPreset(pr, *args)
-
-        self.page.lineEdit_color.setText('%s,%s,%s' % pr['color'])
-        btnStyle = "QPushButton { background-color : %s; outline: none; }" \
-            % QColor(*pr['color']).name()
-        self.page.pushButton_color.setStyleSheet(btnStyle)
-
-    def savePreset(self):
-        saveValueStore = super().savePreset()
-        saveValueStore['color'] = self.color
-        return saveValueStore
-
-    def pickColor(self):
-        RGBstring, btnStyle = pickColor()
-        if not RGBstring:
-            return
-        self.page.lineEdit_color.setText(RGBstring)
-        self.page.pushButton_color.setStyleSheet(btnStyle)
-
     def previewRender(self):
         self.updateChunksize()
         frame = self.getPreviewFrame(self.width, self.height)
diff --git a/src/toolkit/common.py b/src/toolkit/common.py
index db278c0..eba57d9 100644
--- a/src/toolkit/common.py
+++ b/src/toolkit/common.py
@@ -74,25 +74,6 @@ def disableWhenOpeningProject(func):
     return decorator
 
 
-def pickColor():
-    '''
-        Use color picker to get color input from the user,
-        and return this as an RGB string and QPushButton stylesheet.
-        In a subclass apply stylesheet to any color selection widgets
-    '''
-    dialog = QtWidgets.QColorDialog()
-    dialog.setOption(QtWidgets.QColorDialog.ShowAlphaChannel, True)
-    color = dialog.getColor()
-    if color.isValid():
-        RGBstring = '%s,%s,%s' % (
-            str(color.red()), str(color.green()), str(color.blue()))
-        btnStyle = "QPushButton{background-color: %s; outline: none;}" \
-            % color.name()
-        return RGBstring, btnStyle
-    else:
-        return None, None
-
-
 def rgbFromString(string):
     '''Turns an RGB string like "255, 255, 255" into a tuple'''
     try:
diff --git a/src/toolkit/frame.py b/src/toolkit/frame.py
index f42d4c9..c007188 100644
--- a/src/toolkit/frame.py
+++ b/src/toolkit/frame.py
@@ -42,9 +42,9 @@ class PaintColor(QtGui.QColor):
             super().__init__(b, g, r, a)
 
 
-def scale(scale, width, height, returntype=None):
-    width = (float(width) / 100.0) * float(scale)
-    height = (float(height) / 100.0) * float(scale)
+def scale(scalePercent, width, height, returntype=None):
+    width = (float(width) / 100.0) * float(scalePercent)
+    height = (float(height) / 100.0) * float(scalePercent)
     if returntype == str:
         return (str(math.ceil(width)), str(math.ceil(height)))
     elif returntype == int:
-- 
cgit v1.2.3


From 5784cdbcf87556b61519782cd1fc27065ffbc631 Mon Sep 17 00:00:00 2001
From: tassaron
Date: Tue, 1 Aug 2017 21:57:36 -0400
Subject: x/y pixel values update to match output resolution

---
 src/component.py           | 39 ++++++++++++++++++++++++++++++++++++---
 src/components/color.py    |  3 +++
 src/components/image.py    |  3 +++
 src/components/original.py |  2 ++
 src/components/spectrum.py |  3 +++
 src/components/text.py     | 19 +++++++++++--------
 src/components/video.py    |  3 +++
 src/components/waveform.py |  3 +++
 src/mainwindow.py          |  5 ++++-
 9 files changed, 68 insertions(+), 12 deletions(-)

(limited to 'src/components/original.py')

diff --git a/src/component.py b/src/component.py
index d47aeae..5dfe2ab 100644
--- a/src/component.py
+++ b/src/component.py
@@ -6,6 +6,7 @@ from PyQt5 import uic, QtCore, QtWidgets
 from PyQt5.QtGui import QColor
 import os
 import sys
+import math
 import time
 
 from toolkit.frame import BlankFrame
@@ -176,7 +177,9 @@ class Component(QtCore.QObject, metaclass=ComponentMetaclass):
         self._presetNames = {}
         self._commandArgs = {}
         self._colorWidgets = {}
+        self._colorFuncs = {}
         self._relativeWidgets = {}
+        self._relativeValues = {}
         self._lockedProperties = None
         self._lockedError = None
 
@@ -291,14 +294,44 @@ class Component(QtCore.QObject, metaclass=ComponentMetaclass):
         '''
         for attr, widget in self._trackedWidgets.items():
             if attr in self._colorWidgets:
+                # Color Widgets: text stored as tuple & update the button color
                 rgbTuple = rgbFromString(widget.text())
-                setattr(self, attr, rgbTuple)
                 btnStyle = (
                     "QPushButton { background-color : %s; outline: none; }"
-                    % QColor(*rgbTuple).name()
-                )
+                    % QColor(*rgbTuple).name())
                 self._colorWidgets[attr].setStyleSheet(btnStyle)
+                setattr(self, attr, rgbTuple)
+
+            elif attr in self._relativeWidgets:
+                # Relative widgets: number scales to fit export resolution
+                if self._relativeWidgets[attr] == 'x':
+                    dimension = self.width
+                else:
+                    dimension = self.height
+                try:
+                    oldUserValue = getattr(self, attr)
+                except AttributeError:
+                    oldUserValue = self._trackedWidgets[attr].value()
+                newUserValue = self._trackedWidgets[attr].value()
+                newRelativeVal = newUserValue / dimension
+
+                if attr in self._relativeValues:
+                    if oldUserValue == newUserValue:
+                        oldRelativeVal = self._relativeValues[attr]
+                        if oldRelativeVal != newRelativeVal:
+                            # Float changed without pixel value changing, which
+                            # means the pixel value needs to be updated
+                            self._trackedWidgets[attr].blockSignals(True)
+                            self._trackedWidgets[attr].setValue(
+                                math.ceil(dimension * oldRelativeVal))
+                            self._trackedWidgets[attr].blockSignals(False)
+                if oldUserValue != newUserValue \
+                        or attr not in self._relativeValues:
+                    self._relativeValues[attr] = newRelativeVal
+                setattr(self, attr, self._trackedWidgets[attr].value())
+
             else:
+                # Normal tracked widget
                 setattr(self, attr, getWidgetValue(widget))
 
         if not self.core.openingProject:
diff --git a/src/components/color.py b/src/components/color.py
index d6fffc6..703caca 100644
--- a/src/components/color.py
+++ b/src/components/color.py
@@ -60,6 +60,9 @@ class Component(Component):
             }, colorWidgets={
                 'color1': self.page.pushButton_color1,
                 'color2': self.page.pushButton_color2,
+            }, relativeWidgets={
+                'x': 'x',
+                'y': 'y',
             },
         )
 
diff --git a/src/components/image.py b/src/components/image.py
index a96f127..2ffa5a1 100644
--- a/src/components/image.py
+++ b/src/components/image.py
@@ -28,6 +28,9 @@ class Component(Component):
                 'imagePath': 'image',
                 'xPosition': 'x',
                 'yPosition': 'y',
+            }, relativeWidgets={
+                'xPosition': 'x',
+                'yPosition': 'y',
             },
         )
 
diff --git a/src/components/original.py b/src/components/original.py
index 950ac7b..67e3239 100644
--- a/src/components/original.py
+++ b/src/components/original.py
@@ -40,6 +40,8 @@ class Component(Component):
             'y': self.page.spinBox_y,
         }, colorWidgets={
             'visColor': self.page.pushButton_visColor,
+        }, relativeWidgets={
+            'y': 'y',
         })
 
     def previewRender(self):
diff --git a/src/components/spectrum.py b/src/components/spectrum.py
index 8ab8404..2cc641d 100644
--- a/src/components/spectrum.py
+++ b/src/components/spectrum.py
@@ -49,6 +49,9 @@ class Component(Component):
                 'compress': self.page.checkBox_compress,
                 'mono': self.page.checkBox_mono,
                 'hue': self.page.spinBox_hue,
+            }, relativeWidgets={
+                'x': 'x',
+                'y': 'y',
             }
         )
         for widget in self._trackedWidgets.values():
diff --git a/src/components/text.py b/src/components/text.py
index 1fe3467..0f87038 100644
--- a/src/components/text.py
+++ b/src/components/text.py
@@ -17,15 +17,12 @@ class Component(Component):
 
     def widget(self, *args):
         super().widget(*args)
-        height = int(self.settings.value('outputHeight'))
-        width = int(self.settings.value('outputWidth'))
+        # height = int(self.settings.value('outputHeight'))
+        # width = int(self.settings.value('outputWidth'))
         self.textColor = (255, 255, 255)
         self.title = 'Text'
         self.alignment = 1
-        self.fontSize = height / 13.5
-        fm = QtGui.QFontMetrics(self.titleFont)
-        self.xPosition = width / 2 - fm.width(self.title)/2
-        self.yPosition = height / 2 * 1.036
+        self.fontSize = self.height / 13.5
 
         self.page.comboBox_textAlign.addItem("Left")
         self.page.comboBox_textAlign.addItem("Middle")
@@ -35,8 +32,11 @@ class Component(Component):
         self.page.lineEdit_title.setText(self.title)
         self.page.comboBox_textAlign.setCurrentIndex(int(self.alignment))
         self.page.spinBox_fontSize.setValue(int(self.fontSize))
-        self.page.spinBox_xTextAlign.setValue(int(self.xPosition))
-        self.page.spinBox_yTextAlign.setValue(int(self.yPosition))
+
+        fm = QtGui.QFontMetrics(self.titleFont)
+        self.page.spinBox_xTextAlign.setValue(
+            self.width / 2 - fm.width(self.title)/2)
+        self.page.spinBox_yTextAlign.setValue(self.height / 2 * 1.036)
 
         self.page.fontComboBox_titleFont.currentFontChanged.connect(
             self.update
@@ -50,6 +50,9 @@ class Component(Component):
             'yPosition': self.page.spinBox_yTextAlign,
         }, colorWidgets={
             'textColor': self.page.pushButton_textColor,
+        }, relativeWidgets={
+            'xPosition': 'x',
+            'yPosition': 'y',
         })
 
     def update(self):
diff --git a/src/components/video.py b/src/components/video.py
index 6cd16e5..3569d17 100644
--- a/src/components/video.py
+++ b/src/components/video.py
@@ -38,6 +38,9 @@ class Component(Component):
                 'loopVideo': 'loop',
                 'xPosition': 'x',
                 'yPosition': 'y',
+            }, relativeWidgets={
+                'xPosition': 'x',
+                'yPosition': 'y',
             }
         )
 
diff --git a/src/components/waveform.py b/src/components/waveform.py
index 9c3cf86..a25116b 100644
--- a/src/components/waveform.py
+++ b/src/components/waveform.py
@@ -41,6 +41,9 @@ class Component(Component):
                 'mono': self.page.checkBox_mono,
             }, colorWidgets={
                 'color': self.page.pushButton_color,
+            }, relativeWidgets={
+                'x': 'x',
+                'y': 'y',
             }
         )
 
diff --git a/src/mainwindow.py b/src/mainwindow.py
index d9e95e2..1c8806d 100644
--- a/src/mainwindow.py
+++ b/src/mainwindow.py
@@ -644,9 +644,12 @@ class MainWindow(QtWidgets.QMainWindow):
     def updateResolution(self):
         resIndex = int(self.window.comboBox_resolution.currentIndex())
         res = Core.resolutions[resIndex].split('x')
+        changed = res[0] != self.settings.value("outputWidth")
         self.settings.setValue('outputWidth', res[0])
         self.settings.setValue('outputHeight', res[1])
-        self.drawPreview()
+        if changed:
+            for i in range(len(self.core.selectedComponents)):
+                self.core.updateComponent(i)
 
     def drawPreview(self, force=False, **kwargs):
         '''Use autosave keyword arg to force saving or not saving if needed'''
-- 
cgit v1.2.3


From 219e846984bb10e9674432fa7aeac4157635c743 Mon Sep 17 00:00:00 2001
From: tassaron
Date: Thu, 3 Aug 2017 12:16:57 -0400
Subject: relativeWidgets might as well be a list

---
 src/component.py           |  5 +---
 src/components/color.py    | 63 +++++++++++++++++++++-------------------------
 src/components/image.py    | 36 ++++++++++++--------------
 src/components/original.py |  6 ++---
 src/components/spectrum.py | 47 ++++++++++++++++------------------
 src/components/text.py     |  8 +++---
 src/components/video.py    | 37 +++++++++++++--------------
 src/components/waveform.py | 35 ++++++++++++--------------
 8 files changed, 106 insertions(+), 131 deletions(-)

(limited to 'src/components/original.py')

diff --git a/src/component.py b/src/component.py
index 5dfe2ab..c5bc44b 100644
--- a/src/component.py
+++ b/src/component.py
@@ -304,10 +304,7 @@ class Component(QtCore.QObject, metaclass=ComponentMetaclass):
 
             elif attr in self._relativeWidgets:
                 # Relative widgets: number scales to fit export resolution
-                if self._relativeWidgets[attr] == 'x':
-                    dimension = self.width
-                else:
-                    dimension = self.height
+                dimension = self.width
                 try:
                     oldUserValue = getattr(self, attr)
                 except AttributeError:
diff --git a/src/components/color.py b/src/components/color.py
index f5d618e..5d1233e 100644
--- a/src/components/color.py
+++ b/src/components/color.py
@@ -37,41 +37,34 @@ class Component(Component):
             self.page.comboBox_fill.addItem(label)
         self.page.comboBox_fill.setCurrentIndex(0)
 
-        self.trackWidgets(
-            {
-                'x': self.page.spinBox_x,
-                'y': self.page.spinBox_y,
-                'sizeWidth': self.page.spinBox_width,
-                'sizeHeight': self.page.spinBox_height,
-                'trans': self.page.checkBox_trans,
-                'spread': self.page.comboBox_spread,
-                'stretch': self.page.checkBox_stretch,
-                'RG_start': self.page.spinBox_radialGradient_start,
-                'LG_start': self.page.spinBox_linearGradient_start,
-                'RG_end': self.page.spinBox_radialGradient_end,
-                'LG_end': self.page.spinBox_linearGradient_end,
-                'RG_centre': self.page.spinBox_radialGradient_spread,
-                'fillType': self.page.comboBox_fill,
-                'color1': self.page.lineEdit_color1,
-                'color2': self.page.lineEdit_color2,
-            }, presetNames={
-                'sizeWidth': 'width',
-                'sizeHeight': 'height',
-            }, colorWidgets={
-                'color1': self.page.pushButton_color1,
-                'color2': self.page.pushButton_color2,
-            }, relativeWidgets={
-                'x': 'x',
-                'y': 'y',
-                'sizeWidth': 'x',
-                'sizeHeight': 'y',
-                'RG_start': 'x',
-                'LG_start': 'x',
-                'RG_end': 'x',
-                'LG_end': 'x',
-                'RG_centre': 'x',
-            },
-        )
+        self.trackWidgets({
+            'x': self.page.spinBox_x,
+            'y': self.page.spinBox_y,
+            'sizeWidth': self.page.spinBox_width,
+            'sizeHeight': self.page.spinBox_height,
+            'trans': self.page.checkBox_trans,
+            'spread': self.page.comboBox_spread,
+            'stretch': self.page.checkBox_stretch,
+            'RG_start': self.page.spinBox_radialGradient_start,
+            'LG_start': self.page.spinBox_linearGradient_start,
+            'RG_end': self.page.spinBox_radialGradient_end,
+            'LG_end': self.page.spinBox_linearGradient_end,
+            'RG_centre': self.page.spinBox_radialGradient_spread,
+            'fillType': self.page.comboBox_fill,
+            'color1': self.page.lineEdit_color1,
+            'color2': self.page.lineEdit_color2,
+        }, presetNames={
+            'sizeWidth': 'width',
+            'sizeHeight': 'height',
+        }, colorWidgets={
+            'color1': self.page.pushButton_color1,
+            'color2': self.page.pushButton_color2,
+        }, relativeWidgets=[
+            'x', 'y',
+            'sizeWidth', 'sizeHeight',
+            'LG_start', 'LG_end',
+            'RG_start', 'RG_end', 'RG_centre',
+        ])
 
     def update(self):
         fillType = self.page.comboBox_fill.currentIndex()
diff --git a/src/components/image.py b/src/components/image.py
index 2ffa5a1..19c4796 100644
--- a/src/components/image.py
+++ b/src/components/image.py
@@ -13,26 +13,22 @@ class Component(Component):
     def widget(self, *args):
         super().widget(*args)
         self.page.pushButton_image.clicked.connect(self.pickImage)
-        self.trackWidgets(
-            {
-                'imagePath': self.page.lineEdit_image,
-                'scale': self.page.spinBox_scale,
-                'rotate': self.page.spinBox_rotate,
-                'color': self.page.spinBox_color,
-                'xPosition': self.page.spinBox_x,
-                'yPosition': self.page.spinBox_y,
-                'stretched': self.page.checkBox_stretch,
-                'mirror': self.page.checkBox_mirror,
-            },
-            presetNames={
-                'imagePath': 'image',
-                'xPosition': 'x',
-                'yPosition': 'y',
-            }, relativeWidgets={
-                'xPosition': 'x',
-                'yPosition': 'y',
-            },
-        )
+        self.trackWidgets({
+            'imagePath': self.page.lineEdit_image,
+            'scale': self.page.spinBox_scale,
+            'rotate': self.page.spinBox_rotate,
+            'color': self.page.spinBox_color,
+            'xPosition': self.page.spinBox_x,
+            'yPosition': self.page.spinBox_y,
+            'stretched': self.page.checkBox_stretch,
+        }, presetNames={
+            'mirror': self.page.checkBox_mirror,
+            'imagePath': 'image',
+            'xPosition': 'x',
+            'yPosition': 'y',
+        }, relativeWidgets=[
+            'xPosition', 'yPosition',
+        ])
 
     def previewRender(self):
         return self.drawFrame(self.width, self.height)
diff --git a/src/components/original.py b/src/components/original.py
index 67e3239..f886374 100644
--- a/src/components/original.py
+++ b/src/components/original.py
@@ -40,9 +40,9 @@ class Component(Component):
             'y': self.page.spinBox_y,
         }, colorWidgets={
             'visColor': self.page.pushButton_visColor,
-        }, relativeWidgets={
-            'y': 'y',
-        })
+        }, relativeWidgets=[
+            'y',
+        ])
 
     def previewRender(self):
         spectrum = numpy.fromfunction(
diff --git a/src/components/spectrum.py b/src/components/spectrum.py
index 9a0c59a..666e20a 100644
--- a/src/components/spectrum.py
+++ b/src/components/spectrum.py
@@ -30,31 +30,28 @@ class Component(Component):
                 self.update
             )
 
-        self.trackWidgets(
-            {
-                'filterType': self.page.comboBox_filterType,
-                'window': self.page.comboBox_window,
-                '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,
-            }, relativeWidgets={
-                'x': 'x',
-                'y': 'y',
-            }
-        )
+        self.trackWidgets({
+            'filterType': self.page.comboBox_filterType,
+            'window': self.page.comboBox_window,
+            '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,
+        }, relativeWidgets=[
+            'x', 'y',
+        ])
         for widget in self._trackedWidgets.values():
             connectWidget(widget, lambda: self.changed())
 
diff --git a/src/components/text.py b/src/components/text.py
index 2a5d433..b7c244e 100644
--- a/src/components/text.py
+++ b/src/components/text.py
@@ -48,11 +48,9 @@ class Component(Component):
             'yPosition': self.page.spinBox_yTextAlign,
         }, colorWidgets={
             'textColor': self.page.pushButton_textColor,
-        }, relativeWidgets={
-            'xPosition': 'x',
-            'yPosition': 'y',
-            'fontSize': 'y',
-        })
+        }, relativeWidgets=[
+            'xPosition', 'yPosition', 'fontSize',
+        ])
 
     def update(self):
         self.titleFont = self.page.fontComboBox_titleFont.currentFont()
diff --git a/src/components/video.py b/src/components/video.py
index 2cd67c6..b6bdd52 100644
--- a/src/components/video.py
+++ b/src/components/video.py
@@ -23,26 +23,23 @@ class Component(Component):
         super().widget(*args)
         self._image = BlankFrame(self.width, self.height)
         self.page.pushButton_video.clicked.connect(self.pickVideo)
-        self.trackWidgets(
-            {
-                'videoPath': self.page.lineEdit_video,
-                'loopVideo': self.page.checkBox_loop,
-                'useAudio': self.page.checkBox_useAudio,
-                'distort': self.page.checkBox_distort,
-                'scale': self.page.spinBox_scale,
-                'volume': self.page.spinBox_volume,
-                'xPosition': self.page.spinBox_x,
-                'yPosition': self.page.spinBox_y,
-            }, presetNames={
-                'videoPath': 'video',
-                'loopVideo': 'loop',
-                'xPosition': 'x',
-                'yPosition': 'y',
-            }, relativeWidgets={
-                'xPosition': 'x',
-                'yPosition': 'y',
-            }
-        )
+        self.trackWidgets({
+            'videoPath': self.page.lineEdit_video,
+            'loopVideo': self.page.checkBox_loop,
+            'useAudio': self.page.checkBox_useAudio,
+            'distort': self.page.checkBox_distort,
+            'scale': self.page.spinBox_scale,
+            'volume': self.page.spinBox_volume,
+            'xPosition': self.page.spinBox_x,
+            'yPosition': self.page.spinBox_y,
+        }, presetNames={
+            'videoPath': 'video',
+            'loopVideo': 'loop',
+            'xPosition': 'x',
+            'yPosition': 'y',
+        }, relativeWidgets=[
+            'xPosition', 'yPosition',
+        ])
 
     def update(self):
         if self.page.checkBox_useAudio.isChecked():
diff --git a/src/components/waveform.py b/src/components/waveform.py
index 526e6fb..71cbcac 100644
--- a/src/components/waveform.py
+++ b/src/components/waveform.py
@@ -28,25 +28,22 @@ class Component(Component):
                 self.update
             )
 
-        self.trackWidgets(
-            {
-                'color': self.page.lineEdit_color,
-                'mode': self.page.comboBox_mode,
-                'amplitude': self.page.comboBox_amplitude,
-                'x': self.page.spinBox_x,
-                'y': self.page.spinBox_y,
-                'mirror': self.page.checkBox_mirror,
-                'scale': self.page.spinBox_scale,
-                'opacity': self.page.spinBox_opacity,
-                'compress': self.page.checkBox_compress,
-                'mono': self.page.checkBox_mono,
-            }, colorWidgets={
-                'color': self.page.pushButton_color,
-            }, relativeWidgets={
-                'x': 'x',
-                'y': 'y',
-            }
-        )
+        self.trackWidgets({
+            'color': self.page.lineEdit_color,
+            'mode': self.page.comboBox_mode,
+            'amplitude': self.page.comboBox_amplitude,
+            'x': self.page.spinBox_x,
+            'y': self.page.spinBox_y,
+            'mirror': self.page.checkBox_mirror,
+            'scale': self.page.spinBox_scale,
+            'opacity': self.page.spinBox_opacity,
+            'compress': self.page.checkBox_compress,
+            'mono': self.page.checkBox_mono,
+        }, colorWidgets={
+            'color': self.page.pushButton_color,
+        }, relativeWidgets=[
+            'x', 'y',
+        ])
 
     def previewRender(self):
         self.updateChunksize()
-- 
cgit v1.2.3