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
---
 src/components/original.py | 35 ++++-------------------------------
 1 file changed, 4 insertions(+), 31 deletions(-)

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

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):
-- 
cgit v1.2.3