RGB Matrix: allow to get/set multiple colors programmatically

engine/src/rgbalgorithm.cpp

@@ -39,15 +39,27 @@
 
 RGBAlgorithm::RGBAlgorithm(Doc * doc)
     : m_doc(doc)
-    , m_startColor(QColor())
-    , m_endColor(QColor())
 {
 }
 
-void RGBAlgorithm::setColors(QColor start, QColor end)
+void RGBAlgorithm::setColors(QVector<QColor> colors)
 {
-    m_startColor = start;
-    m_endColor = end;
+    int nCols = acceptColors();
+    m_colors.clear();
+
+    for (int i = 0; i < nCols; i++)
+    {
+        if (i < colors.count())
+            m_colors.append(colors.at(i));
+    }
+}
+
+QColor RGBAlgorithm::getColor(uint i) const
+{
+    if (i >= (uint)m_colors.count())
+        return QColor();
+
+    return m_colors[i];
 }
 
 /****************************************************************************

engine/src/rgbalgorithm.h

@@ -40,6 +40,8 @@ typedef QVector<QVector<uint> > RGBMap;
 #define KXMLQLCRGBAlgorithm     QString("Algorithm")
 #define KXMLQLCRGBAlgorithmType QString("Type")
 
+#define RGBAlgorithmColorDisplayCount 5
+
 class RGBAlgorithm
 {
 public:
@@ -72,6 +74,12 @@ class RGBAlgorithm
     /** Maximum step count for rgbMap() function. */
     virtual int rgbMapStepCount(const QSize& size) = 0;
 
+    /** Set the colors for the RGBmap */
+    virtual void rgbMapSetColors(QVector<uint> &colors) = 0;
+
+    /** Get the colors from the RGB script */
+    virtual QVector<uint> rgbMapGetColors() = 0;
+
     /** Load a RGBMap for the given step. */
     virtual void rgbMap(const QSize& size, uint rgb, int step, RGBMap &map) = 0;
 
@@ -101,15 +109,14 @@ class RGBAlgorithm
      * RGB Colors
      ************************************************************************/
 public:
-    /** Set the start/end color the algorithm can use */
-    virtual void setColors(QColor start, QColor end);
-
-    QColor startColor() { return m_startColor; }
+    /** Set the colors the algorithm can use */
+    virtual void setColors(QVector<QColor>);
 
-    QColor endColor() { return m_endColor; }
+    /** Get the color which is set for the algorithm */
+    virtual QColor getColor(uint i) const;
 
 private:
-    QColor m_startColor, m_endColor;
+    QVector<QColor> m_colors;
 
     /************************************************************************
      * Available algorithms

engine/src/rgbaudio.cpp

@@ -86,19 +86,21 @@ void RGBAudio::calculateColors(int barsHeight)
 {
     if (barsHeight > 0)
     {
+        QColor startColor = getColor(0);
+        QColor endColor = getColor(1);
         m_barColors.clear();
-        if (endColor() == QColor()
+        if (endColor == QColor()
             || barsHeight == 1) // to avoid division by 0 below
         {
             for (int i = 0; i < barsHeight; i++)
-                m_barColors.append(startColor().rgb());
+                m_barColors.append(startColor.rgb());
         }
         else
         {
-            int crDelta = (endColor().red() - startColor().red()) / (barsHeight - 1);
-            int cgDelta = (endColor().green() - startColor().green()) / (barsHeight - 1);
-            int cbDelta = (endColor().blue() - startColor().blue()) / (barsHeight - 1);
-            QColor pixelColor = startColor();
+            int crDelta = (endColor.red() - startColor.red()) / (barsHeight - 1);
+            int cgDelta = (endColor.green() - startColor.green()) / (barsHeight - 1);
+            int cbDelta = (endColor.blue() - startColor.blue()) / (barsHeight - 1);
+            QColor pixelColor = startColor;
 
             for (int i = 0; i < barsHeight; i++)
             {
@@ -121,6 +123,16 @@ int RGBAudio::rgbMapStepCount(const QSize& size)
     return 1;
 }
 
+void RGBAudio::rgbMapSetColors(QVector<uint> &colors)
+{
+    Q_UNUSED(colors);
+}
+
+QVector<uint> RGBAudio::rgbMapGetColors()
+{
+    return QVector<uint>();
+}
+
 void RGBAudio::rgbMap(const QSize& size, uint rgb, int step, RGBMap &map)
 {
     Q_UNUSED(step);
@@ -203,9 +215,9 @@ int RGBAudio::apiVersion() const
     return 1;
 }
 
-void RGBAudio::setColors(QColor start, QColor end)
+void RGBAudio::setColors(QVector<QColor> colors)
 {
-    RGBAlgorithm::setColors(start, end);
+    RGBAlgorithm::setColors(colors);
 
     // invalidate bars colors so the next time a rendering is
     // required, it will be filled with the right values

engine/src/rgbaudio.h

@@ -70,6 +70,12 @@ protected slots:
     /** @reimp */
     int rgbMapStepCount(const QSize& size);
 
+    /** @reimp */
+    void rgbMapSetColors(QVector<uint> &colors);
+
+    /** @reimp */
+    QVector<uint> rgbMapGetColors();
+
     /** @reimp */
     void rgbMap(const QSize& size, uint rgb, int step, RGBMap &map);
 
@@ -86,7 +92,7 @@ protected slots:
     int apiVersion() const;
 
     /** @reimp */
-    void setColors(QColor start, QColor end);
+    void setColors(QVector<QColor> colors);
 
     /** @reimp */
     RGBAlgorithm::Type type() const;

engine/src/rgbimage.cpp

@@ -235,6 +235,16 @@ int RGBImage::rgbMapStepCount(const QSize& size)
     }
 }
 
+void RGBImage::rgbMapSetColors(QVector<uint> &colors)
+{
+    Q_UNUSED(colors);
+}
+
+QVector<uint> RGBImage::rgbMapGetColors()
+{
+    return QVector<uint>();
+}
+
 void RGBImage::rgbMap(const QSize& size, uint rgb, int step, RGBMap &map)
 {
     Q_UNUSED(rgb);

engine/src/rgbimage.h

@@ -102,6 +102,12 @@ class RGBImage : public RGBAlgorithm
     /** @reimp */
     int rgbMapStepCount(const QSize& size);
 
+    /** @reimp */
+    void rgbMapSetColors(QVector<uint> &colors);
+
+    /** @reimp */
+    QVector<uint> rgbMapGetColors();
+
     /** @reimp */
     void rgbMap(const QSize& size, uint rgb, int step, RGBMap &map);