Cue colors

build/depends.py

@@ -971,6 +971,7 @@ def sources(self, build):
 
                    "waveform/renderers/waveformrenderersignalbase.cpp",
                    "waveform/renderers/waveformmark.cpp",
+                   "waveform/renderers/waveformmarkproperties.cpp",
                    "waveform/renderers/waveformmarkset.cpp",
                    "waveform/renderers/waveformmarkrange.cpp",
                    "waveform/renderers/glwaveformrenderersimplesignal.cpp",

res/schema.xml

@@ -416,4 +416,13 @@ METADATA
       ALTER TABLE library ADD COLUMN tracktotal TEXT DEFAULT '//';
     </sql>
   </revision>
+  <revision version="27" min_compatible="3">
+    <description>
+      Add cue color support. Default color is #FF0000.
+      See library/dao/cue.h.
+    </description>
+    <sql>
+      ALTER TABLE cues ADD COLUMN color INTEGER DEFAULT 0xFFFF0000 NOT NULL;
+    </sql>
+  </revision>
 </schema>

src/library/dao/cue.cpp

@@ -7,6 +7,10 @@
 #include "library/dao/cue.h"
 #include "util/assert.h"
 
+namespace {
+    const QColor kDefaultColor = QColor("#FF0000");
+}
+
 Cue::~Cue() {
     qDebug() << "~Cue()" << m_iId;
 }
@@ -19,20 +23,22 @@ Cue::Cue(TrackId trackId)
           m_iPosition(-1),
           m_iLength(0),
           m_iHotCue(-1),
-          m_label("") {
+          m_label(),
+          m_color(kDefaultColor) {
 }
 
 
 Cue::Cue(int id, TrackId trackId, Cue::CueType type, int position, int length,
-         int hotCue, QString label)
+         int hotCue, QString label, QColor color)
         : m_bDirty(false),
           m_iId(id),
           m_trackId(trackId),
           m_type(type),
           m_iPosition(position),
           m_iLength(length),
           m_iHotCue(hotCue),
-          m_label(label) {
+          m_label(label),
+          m_color(color) {
 }
 
 int Cue::getId() const {
@@ -134,6 +140,19 @@ void Cue::setLabel(const QString label) {
     emit(updated());
 }
 
+QColor Cue::getColor() const {
+    QMutexLocker lock(&m_mutex);
+    return m_color;
+}
+
+void Cue::setColor(const QColor color) {
+    QMutexLocker lock(&m_mutex);
+    m_color = color;
+    m_bDirty = true;
+    lock.unlock();
+    emit(updated());
+}
+
 bool Cue::isDirty() const {
     QMutexLocker lock(&m_mutex);
     return m_bDirty;

src/library/dao/cue.h

@@ -7,6 +7,7 @@
 #include <QObject>
 #include <QMutex>
 #include <QSharedPointer>
+#include <QColor>
 
 #include "track/trackid.h"
 
@@ -44,15 +45,18 @@ class Cue : public QObject {
     void setHotCue(int hotCue);
 
     QString getLabel() const;
-    void setLabel(const QString label);
+    void setLabel(QString label);
+
+    QColor getColor() const;
+    void setColor(QColor color);
 
   signals:
     void updated();
 
   private:
     explicit Cue(TrackId trackId);
     Cue(int id, TrackId trackId, CueType type, int position, int length,
-        int hotCue, QString label);
+        int hotCue, QString label, QColor color);
     void setDirty(bool dirty);
     void setId(int id);
     void setTrackId(TrackId trackId);
@@ -67,6 +71,7 @@ class Cue : public QObject {
     int m_iLength;
     int m_iHotCue;
     QString m_label;
+    QColor m_color;
 
     friend class Track;
     friend class CueDAO;

src/library/dao/cuedao.cpp

@@ -62,8 +62,9 @@ CuePointer CueDAO::cueFromRow(const QSqlQuery& query) const {
     int length = record.value(record.indexOf("length")).toInt();
     int hotcue = record.value(record.indexOf("hotcue")).toInt();
     QString label = record.value(record.indexOf("label")).toString();
+    QColor color = QColor::fromRgba(record.value(record.indexOf("color")).toInt());
     CuePointer pCue(new Cue(id, trackId, (Cue::CueType)type,
-                       position, length, hotcue, label));
+                       position, length, hotcue, label, color));
     m_cues[id] = pCue;
     return pCue;
 }
@@ -148,13 +149,14 @@ bool CueDAO::saveCue(Cue* cue) {
     if (cue->getId() == -1) {
         // New cue
         QSqlQuery query(m_database);
-        query.prepare("INSERT INTO " CUE_TABLE " (track_id, type, position, length, hotcue, label) VALUES (:track_id, :type, :position, :length, :hotcue, :label)");
+        query.prepare("INSERT INTO " CUE_TABLE " (track_id, type, position, length, hotcue, label, color) VALUES (:track_id, :type, :position, :length, :hotcue, :label, :color)");
         query.bindValue(":track_id", cue->getTrackId().toVariant());
         query.bindValue(":type", cue->getType());
         query.bindValue(":position", cue->getPosition());
         query.bindValue(":length", cue->getLength());
         query.bindValue(":hotcue", cue->getHotCue());
         query.bindValue(":label", cue->getLabel());
+        query.bindValue(":color", cue->getColor().rgba());
 
         if (query.exec()) {
             int id = query.lastInsertId().toInt();
@@ -172,7 +174,8 @@ bool CueDAO::saveCue(Cue* cue) {
                         "position = :position,"
                         "length = :length,"
                         "hotcue = :hotcue,"
-                        "label = :label"
+                        "label = :label,"
+                        "color = :color"
                         " WHERE id = :id");
         query.bindValue(":id", cue->getId());
         query.bindValue(":track_id", cue->getTrackId().toVariant());
@@ -181,6 +184,7 @@ bool CueDAO::saveCue(Cue* cue) {
         query.bindValue(":length", cue->getLength());
         query.bindValue(":hotcue", cue->getHotCue());
         query.bindValue(":label", cue->getLabel());
+        query.bindValue(":color", cue->getColor().rgba());
 
         if (query.exec()) {
             cue->setDirty(false);

src/library/trackcollection.cpp

@@ -14,7 +14,7 @@
 #include "util/assert.h"
 
 // static
-const int TrackCollection::kRequiredSchemaVersion = 26;
+const int TrackCollection::kRequiredSchemaVersion = 27;
 
 TrackCollection::TrackCollection(UserSettingsPointer pConfig)
         : m_pConfig(pConfig),

src/waveform/renderers/waveformmark.cpp

@@ -1,62 +1,25 @@
 #include <QtDebug>
 
-#include "waveformmark.h"
+#include "skin/skincontext.h"
+#include "waveform/renderers/waveformmarkproperties.h"
 
-#include "waveformwidgetrenderer.h"
-#include "control/controlobject.h"
-#include "control/controlproxy.h"
-#include "widget/wskincolor.h"
+#include "waveformmark.h"
 
 WaveformMark::WaveformMark()
-    : m_pPointCos(nullptr) {
+    : m_iHotCue(-1) {
 }
 
-WaveformMark::~WaveformMark() {
-    delete m_pPointCos;
+WaveformMark::WaveformMark(int hotCue)
+    : m_iHotCue(hotCue) {
 }
 
 void WaveformMark::setup(const QString& group, const QDomNode& node,
                          const SkinContext& context,
                          const WaveformSignalColors& signalColors) {
     QString item = context.selectString(node, "Control");
     if (!item.isEmpty()) {
-        m_pPointCos = new ControlProxy(group, item);
-    }
-
-    m_color = context.selectString(node, "Color");
-    if (!m_color.isValid()) {
-        // As a fallback, grab the color from the parent's AxesColor
-        m_color = signalColors.getAxesColor();
-        qDebug() << "Didn't get mark <Color>, using parent's <AxesColor>:" << m_color;
-    } else {
-        m_color = WSkinColor::getCorrectColor(m_color);
-    }
-
-    m_textColor = context.selectString(node, "TextColor");
-    if (!m_textColor.isValid()) {
-        // Read the text color, otherwise use the parent's BgColor.
-        m_textColor = signalColors.getBgColor();
-        qDebug() << "Didn't get mark <TextColor>, using parent's <BgColor>:" << m_textColor;
+        m_pPointCos = std::make_unique<ControlProxy>(group, item);
     }
 
-    QString markAlign = context.selectString(node, "Align");
-    if (markAlign.contains("bottom", Qt::CaseInsensitive)) {
-        m_align = Qt::AlignBottom;
-    } else {
-        m_align = Qt::AlignTop; // Default
-    }
-
-    m_text = context.selectString(node, "Text");
-    m_pixmapPath = context.selectString(node, "Pixmap");
-    if (!m_pixmapPath.isEmpty()) {
-        m_pixmapPath = context.getSkinPath(m_pixmapPath);
-    }
-}
-
-// called from WaveformMarkSet::setup() for hot cues
-// TODO(XXX): subclass and override WaveformMark::setup
-void WaveformMark::setKeyAndIndex(const ConfigKey& key, int i) {
-    DEBUG_ASSERT(m_pPointCos == NULL);
-    m_pPointCos = new ControlProxy(key);
-    m_text = m_text.arg(i);
+    m_properties = WaveformMarkProperties(node, context, signalColors);
 }

src/waveform/renderers/waveformmark.h

@@ -1,39 +1,42 @@
 #ifndef WAVEFORMMARK_H
 #define WAVEFORMMARK_H
 
-#include <QString>
+#include <QDomNode>
 #include <QImage>
-#include <QColor>
 
-#include "preferences/usersettings.h"
-#include "skin/skincontext.h"
+#include "control/controlproxy.h"
+#include "util/memory.h"
 
-class ControlProxy;
-class QDomNode;
+#include "waveform/renderers/waveformmarkproperties.h"
+
+class SkinContext;
 class WaveformSignalColors;
 
 class WaveformMark {
   public:
     WaveformMark();
-    ~WaveformMark();
+    WaveformMark(int hotCue);
+
     void setup(const QString& group, const QDomNode& node,
                const SkinContext& context,
                const WaveformSignalColors& signalColors);
-    void setKeyAndIndex(const ConfigKey& key, int i);
 
-  private:
-    ControlProxy* m_pPointCos;
+    std::unique_ptr<ControlProxy> m_pPointCos;
+
+    const WaveformMarkProperties& getProperties() const { return m_properties; };
+    void setProperties(const WaveformMarkProperties& properties) { m_properties = properties; };
 
-    QColor m_color;
-    QColor m_textColor;
-    QString m_text;
-    Qt::Alignment m_align;
-    QString m_pixmapPath;
+    int getHotCue() const { return m_iHotCue; };
+    void setHotCue(int hotCue) { m_iHotCue = hotCue; };
+
+  private:
+    WaveformMarkProperties m_properties;
+    int m_iHotCue;
     QImage m_image;
 
-    friend class WaveformMarkSet;
     friend class WaveformRenderMark;
-    friend class WOverview;
 };
 
+typedef QSharedPointer<WaveformMark> WaveformMarkPointer;
+
 #endif // WAVEFORMMARK_H

src/waveform/renderers/waveformmarkproperties.cpp

@@ -0,0 +1,38 @@
+#include "skin/skincontext.h"
+#include "waveform/renderers/waveformsignalcolors.h"
+#include "widget/wskincolor.h"
+
+#include "waveform/renderers/waveformmarkproperties.h"
+
+WaveformMarkProperties::WaveformMarkProperties(const QDomNode& node,
+                                               const SkinContext& context,
+                                               const WaveformSignalColors& signalColors) {
+    m_color = context.selectString(node, "Color");
+    if (!m_color.isValid()) {
+        // As a fallback, grab the color from the parent's AxesColor
+        m_color = signalColors.getAxesColor();
+        qDebug() << "Didn't get mark <Color>, using parent's <AxesColor>:" << m_color;
+    } else {
+        m_color = WSkinColor::getCorrectColor(m_color);
+    }
+
+    m_textColor = context.selectString(node, "TextColor");
+    if (!m_textColor.isValid()) {
+        // Read the text color, otherwise use the parent's BgColor.
+        m_textColor = signalColors.getBgColor();
+        qDebug() << "Didn't get mark <TextColor>, using parent's <BgColor>:" << m_textColor;
+    }
+
+    QString markAlign = context.selectString(node, "Align");
+    if (markAlign.contains("bottom", Qt::CaseInsensitive)) {
+        m_align = Qt::AlignBottom;
+    } else {
+        m_align = Qt::AlignTop; // Default
+    }
+
+    m_text = context.selectString(node, "Text");
+    m_pixmapPath = context.selectString(node, "Pixmap");
+    if (!m_pixmapPath.isEmpty()) {
+        m_pixmapPath = context.getSkinPath(m_pixmapPath);
+    }
+}

src/waveform/renderers/waveformmarkproperties.h

@@ -0,0 +1,24 @@
+#ifndef WAVEFORMMARKPROPERTIES_H
+#define WAVEFORMMARKPROPERTIES_H
+
+#include <QColor>
+#include <QDomNode>
+
+class SkinContext;
+class WaveformSignalColors;
+
+class WaveformMarkProperties final {
+  public:
+    WaveformMarkProperties() = default;
+    WaveformMarkProperties(const QDomNode& node,
+                           const SkinContext& context,
+                           const WaveformSignalColors& signalColors);
+
+    QColor m_color;
+    QColor m_textColor;
+    QString m_text;
+    Qt::Alignment m_align;
+    QString m_pixmapPath;
+};
+
+#endif // WAVEFORMMARKPROPERTIES_H