[WIP] Enable Setting hotcue color via controlobject

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,9 +384,10 @@ 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)
+ if (!rowItem || !hotcueItem || !colorItem|| !labelItem)
  continue;
 
  int oldRow = rowItem->data(Qt::DisplayRole).toInt();
@@ -404,6 +408,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/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(void)),
+ this, SLOT(onTrackCueChange(void)));
 
  slotAnalyzerProgress(pNewTrack->getAnalyzerProgress());
  } else {
@@ -247,14 +249,36 @@ void WOverview::onEndOfTrackChange(double v) {
 
 void WOverview::onMarkChanged(double /*v*/) {
  //qDebug() << "WOverview::onMarkChanged()" << v;
- update();
+ onTrackCueChange();
+ //update();
 }
 
 void WOverview::onMarkRangeChange(double /*v*/) {
  //qDebug() << "WOverview::onMarkRangeChange()" << v;
  update();
 }
 
+// currently only updates the mark color but it could be easily extended.
+void WOverview::onTrackCueChange(void) {
+ const QList<CuePointer> loadedCues = m_pCurrentTrack->getCuePoints();
+
+ 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);
+ }
+ }
+ }
+ update();
+}
+
 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 onTrackCueChange(void);
 
  void slotWaveformSummaryUpdated();
  void slotAnalyzerProgress(int progress);