[WIP] Enable Setting hotcue color via controlobject

src/engine/cuecontrol.cpp

@@ -299,6 +299,9 @@ void CueControl::trackCuesUpdated() {
  } else {
  // If the old hotcue is the same, then we only need to update
  pControl->setPosition(pCue->getPosition());
+ // NOTE(Swiftb0y): I don't know if this is the smartest location to manage
+ // please suggest whether this should rather go somewhere else.
+ pControl->setColor(pCue->getColor());
  }
  // Add the hotcue to the list of active hotcues
  active_hotcues.insert(hotcue);
@@ -1018,6 +1021,14 @@ HotcueControl::HotcueControl(QString group, int i)
  m_hotcueEnabled = new ControlObject(keyForControl(i, "enabled"));
  m_hotcueEnabled->setReadOnly();
 
+ // NOTE(Swiftb0y): since ControlObjects only deal with double values,
+ // the Color is stored as a QRgb (which is just a unsigned int
+ // representation of the color (AARRGGBB)
+ m_hotcueColor = new ControlObject(keyForControl(i, "color"));
+ connect(m_hotcueColor, SIGNAL(valueChanged(double)),
+ this, SLOT(slotHotcueColorChanged(double)),
+ Qt::DirectConnection);
+
  m_hotcueSet = new ControlPushButton(keyForControl(i, "set"));
  connect(m_hotcueSet, SIGNAL(valueChanged(double)),
  this, SLOT(slotHotcueSet(double)),
@@ -1057,6 +1068,7 @@ HotcueControl::HotcueControl(QString group, int i)
 HotcueControl::~HotcueControl() {
  delete m_hotcuePosition;
  delete m_hotcueEnabled;
+ delete m_hotcueColor;
  delete m_hotcueSet;
  delete m_hotcueGoto;
  delete m_hotcueGotoAndPlay;
@@ -1099,6 +1111,11 @@ void HotcueControl::slotHotcuePositionChanged(double newPosition) {
  emit(hotcuePositionChanged(this, newPosition));
 }
 
+void HotcueControl::slotHotcueColorChanged(double newColor) {
+ m_pCue->setColor(QColor(static_cast<QRgb>(newColor)));
+ emit(hotcueColorChanged(this, newColor));
+}
+
 double HotcueControl::getPosition() const {
  return m_hotcuePosition->get();
 }
@@ -1109,7 +1126,16 @@ void HotcueControl::setCue(CuePointer pCue) {
  // because we have a null check for valid data else where in the code
  m_pCue = pCue;
 }
+QColor HotcueControl::getColor() const {
+ // QRgb is just an unsigned int representation of the
+ // color components (AARRGGBB) so conversion
+ // from double shouldn't be an issue
+ return QColor::fromRgb(static_cast<QRgb>(m_hotcueColor->get()));
+}
 
+void HotcueControl::setColor(QColor newColor) {
+ m_hotcueColor->set(static_cast<double>(newColor.rgb()));
+}
 void HotcueControl::resetCue() {
  // clear pCue first because we have a null check for valid data else where
  // in the code

src/engine/cuecontrol.h

@@ -30,6 +30,8 @@ class HotcueControl : public QObject {
  void setCue(CuePointer pCue);
  void resetCue();
  void setPosition(double position);
+ void setColor(QColor newColor);
+ QColor getColor() const;
 
  // Used for caching the preview state of this hotcue control.
  inline bool isPreviewing() {
@@ -54,6 +56,7 @@ class HotcueControl : public QObject {
  void slotHotcueActivatePreview(double v);
  void slotHotcueClear(double v);
  void slotHotcuePositionChanged(double newPosition);
+ void slotHotcueColorChanged(double newColor);
 
  signals:
  void hotcueSet(HotcueControl* pHotcue, double v);
@@ -64,6 +67,7 @@ class HotcueControl : public QObject {
  void hotcueActivatePreview(HotcueControl* pHotcue, double v);
  void hotcueClear(HotcueControl* pHotcue, double v);
  void hotcuePositionChanged(HotcueControl* pHotcue, double newPosition);
+ void hotcueColorChanged(HotcueControl* pHotcue, double newColor);
  void hotcuePlay(double v);
 
  private:
@@ -76,6 +80,7 @@ class HotcueControl : public QObject {
  // Hotcue state controls
  ControlObject* m_hotcuePosition;
  ControlObject* m_hotcueEnabled;
+ ControlObject* m_hotcueColor;
  // Hotcue button controls
  ControlObject* m_hotcueSet;
  ControlObject* m_hotcueGoto;

src/library/dlgtrackinfo.cpp

@@ -332,12 +332,15 @@ void DlgTrackInfo::populateCues(TrackPointer pTrack) {
  // Make the duration read only
  durationItem->setFlags(Qt::NoItemFlags);
 
+ QColor cueColor = pCue->getColor();
+
  m_cueMap[row] = pCue;
  cueTable->insertRow(row);
  cueTable->setItem(row, 0, new QTableWidgetItem(rowStr));
  cueTable->setItem(row, 1, durationItem);
  cueTable->setItem(row, 2, new QTableWidgetItem(hotcue));
- cueTable->setItem(row, 3, new QTableWidgetItem(pCue->getLabel()));
+ cueTable->setItem(row, 3, new QTableWidgetItem(cueColor.name().toUpper()));
+ cueTable->setItem(row, 4, new QTableWidgetItem(pCue->getLabel()));
  row += 1;
  }
  cueTable->setSortingEnabled(true);
@@ -381,10 +384,13 @@ void DlgTrackInfo::saveTrack() {
  for (int row = 0; row < cueTable->rowCount(); ++row) {
  QTableWidgetItem* rowItem = cueTable->item(row, 0);
  QTableWidgetItem* hotcueItem = cueTable->item(row, 2);
- QTableWidgetItem* labelItem = cueTable->item(row, 3);
+ QTableWidgetItem* colorItem = cueTable->item(row, 3);
+ QTableWidgetItem* labelItem = cueTable->item(row, 4);
 
- if (!rowItem || !hotcueItem || !labelItem)
+ VERIFY_OR_DEBUG_ASSERT(rowItem && hotcueItem && colorItem && labelItem) {
+ qWarning() << "unable to retrieve cells from cueTable row";
  continue;
+ }
 
  int oldRow = rowItem->data(Qt::DisplayRole).toInt();
  CuePointer pCue(m_cueMap.value(oldRow, CuePointer()));
@@ -404,6 +410,16 @@ void DlgTrackInfo::saveTrack() {
  pCue->setHotCue(-1);
  }
 
+ QVariant vHotCueColor = colorItem->data(Qt::DisplayRole);
+ if (vHotcue.canConvert<QString>()) {
+ QString colorString = vHotCueColor.toString();
+ auto color = QColor(colorString);
+ if (color.isValid()) {
+ pCue->setColor(color);
+ }
+ // do nothing for now.
+ }
+
  QString label = labelItem->data(Qt::DisplayRole).toString();
  pCue->setLabel(label);
  }

src/library/dlgtrackinfo.ui

@@ -820,6 +820,11 @@ Often results in higher quality beatgrids, but will not do well on tracks that h
  <string>Hotcue</string>
  </property>
  </column>
+ <column>
+ <property name="text">
+ <string>Color</string>
+ </property>
+ </column>
  <column>
  <property name="text">
  <string>Label</string>

src/waveform/renderers/waveformmarkproperties.cpp

@@ -47,6 +47,7 @@ WaveformMarkProperties::WaveformMarkProperties(const QDomNode& node,
  const WaveformSignalColors& signalColors,
  int hotCue) {
  m_color = context.selectString(node, "Color");
+ // TODO (Swiftb0y): get CuePointer and color for m_color instead of skin color.
  if (!m_color.isValid()) {
  // As a fallback, grab the color from the parent's AxesColor
  m_color = signalColors.getAxesColor();

src/waveform/renderers/waveformrendermark.cpp

@@ -224,7 +224,9 @@ void WaveformRenderMark::generateMarkImage(WaveformMark* pMark) {
  // Prepare colors for drawing of marker lines
  QColor lineColor = markProperties.m_color;
  lineColor.setAlpha(200);
- QColor contrastLineColor(0,0,0,120);
+ QColor contrastLineColor = (brightness(lineColor) < 130) ?
+ QColor(255,255,255,120) :
+ QColor(0,0,0,120);
 
  // Draw marker lines
  if (m_waveformRenderer->getOrientation() == Qt::Horizontal) {

src/waveform/renderers/waveformrendermark.h

@@ -5,6 +5,7 @@
 
 #include "skin/skincontext.h"
 #include "util/class.h"
+#include "util/math.h"
 #include "waveform/renderers/waveformmarkset.h"
 #include "waveform/renderers/waveformrendererabstract.h"
 #include "library/dao/cue.h"
@@ -31,7 +32,15 @@ class WaveformRenderMark : public QObject, public WaveformRendererAbstract {
 
  private:
  void generateMarkImage(WaveformMark* pMark);
-
+ // algorithm by http://www.nbdtech.com/Blog/archive/2008/04/27/Calculating-the-Perceived-Brightness-of-a-Color.aspx
+ // NOTE(Swiftb0y): please suggest if I should you use other methods
+ // (like the W3C algorithm) or if this approach is to to performance hungry
+ int brightness(QColor& c) {
+ return static_cast<int>(sqrtf(
+ c.red() * c.red() * .241 +
+ c.green() * c.green() * .691 +
+ c.blue() * c.blue() * .068));
+ };
  WaveformMarkSet m_marks;
  DISALLOW_COPY_AND_ASSIGN(WaveformRenderMark);
 };

src/widget/woverview.cpp

@@ -230,6 +230,8 @@ void WOverview::slotLoadingTrack(TrackPointer pNewTrack, TrackPointer pOldTrack)
  this, SLOT(slotWaveformSummaryUpdated()));
  connect(pNewTrack.get(), SIGNAL(analyzerProgress(int)),
  this, SLOT(slotAnalyzerProgress(int)));
+ connect(pNewTrack.get(), SIGNAL(cuesUpdated()),
+ this, SLOT(receiveCuesUpdated()));
 
  slotAnalyzerProgress(pNewTrack->getAnalyzerProgress());
  } else {
@@ -247,6 +249,7 @@ void WOverview::onEndOfTrackChange(double v) {
 
 void WOverview::onMarkChanged(double /*v*/) {
  //qDebug() << "WOverview::onMarkChanged()" << v;
+ updateCues(m_pCurrentTrack->getCuePoints());
  update();
 }
 
@@ -255,6 +258,30 @@ void WOverview::onMarkRangeChange(double /*v*/) {
  update();
 }
 
+// currently only updates the mark color but it could be easily extended.
+void WOverview::updateCues(const QList<CuePointer> &loadedCues) {
+ for (CuePointer currentCue: loadedCues) {
+ const WaveformMarkPointer currentMark = m_marks.getHotCueMark(currentCue->getHotCue());
+
+ if (currentMark && currentMark->isValid()) {
+ WaveformMarkProperties markProperties = currentMark->getProperties();
+ const QColor newColor = currentCue->getColor();
+
+ if (newColor != markProperties.m_color || newColor != markProperties.m_textColor) {
+ markProperties.m_color = newColor;
+ markProperties.m_textColor = newColor;
+ currentMark->setProperties(markProperties);
+ }
+ }
+ }
+}
+
+// connecting the tracks cuesUpdated and onMarkChanged is not possible
+// due to the incompatible signatures. This is a "wrapper" workaround
+void WOverview::receiveCuesUpdated() {
+ onMarkChanged(0);
+}
+
 void WOverview::mouseMoveEvent(QMouseEvent* e) {
  if (m_orientation == Qt::Horizontal) {
  m_iPos = math_clamp(e->x(), 0, width() - 1);

src/widget/woverview.h

@@ -84,6 +84,7 @@ class WOverview : public WWidget {
 
  void onMarkChanged(double v);
  void onMarkRangeChange(double v);
+ void receiveCuesUpdated();
 
  void slotWaveformSummaryUpdated();
  void slotAnalyzerProgress(int progress);
@@ -99,6 +100,8 @@ class WOverview : public WWidget {
  return (static_cast<double>(position) + m_b) / m_a;
  }
 
+ void updateCues(const QList<CuePointer> &loadedCues);
+
  const QString m_group;
  UserSettingsPointer m_pConfig;
  ControlProxy* m_endOfTrackControl;