WOverView/WVisual: allow custom dim/bright treshold for marks

src/util/color/color.cpp

@@ -17,7 +17,7 @@ int brightness(int red, int green, int blue) {
 
 // If the baseColor is darker than the global threshold,
 // returns a lighter color, otherwise returns a darker color.
-QColor chooseContrastColor(QColor baseColor) {
+QColor chooseContrastColor(QColor baseColor, int dimBrightThreshold) {
     // Will produce a color that is 60% brighter.
     static const int iLighterFactor = 160;
     // We consider a hsv color dark if its value is <= 20% of max value
@@ -44,7 +44,10 @@ QColor chooseContrastColor(QColor baseColor) {
     // not a good indicator of a color brightness (saturation comes into play too).
     // That's why we call chooseColorByBrightness so the proper brightness of the color is used
     // to choose between the light and the dark colors.
-    QColor contrastColor = chooseColorByBrightness(baseColor, lightColor.toRgb(), darkColor.toRgb());
+    QColor contrastColor = chooseColorByBrightness(baseColor,
+            lightColor.toRgb(),
+            darkColor.toRgb(),
+            dimBrightThreshold);
     return contrastColor;
 }
 

src/waveform/renderers/waveformmark.cpp

@@ -80,7 +80,8 @@ WaveformMark::WaveformMark(const QString& group,
     } else {
         color = WSkinColor::getCorrectColor(color);
     }
-    setBaseColor(color);
+    int dimBrightThreshold = signalColors.getDimBrightThreshold();
+    setBaseColor(color, dimBrightThreshold);
 
     m_textColor = context.selectString(node, "TextColor");
     if (!m_textColor.isValid()) {
@@ -103,11 +104,14 @@ WaveformMark::WaveformMark(const QString& group,
     }
 }
 
-void WaveformMark::setBaseColor(QColor baseColor) {
+void WaveformMark::setBaseColor(QColor baseColor, int dimBrightThreshold) {
     m_image = QImage();
     m_fillColor = baseColor;
-    m_borderColor = Color::chooseContrastColor(baseColor);
-    m_labelColor = Color::chooseColorByBrightness(baseColor, QColor(255,255,255,255), QColor(0,0,0,255));
+    m_borderColor = Color::chooseContrastColor(baseColor, dimBrightThreshold);
+    m_labelColor = Color::chooseColorByBrightness(baseColor,
+            QColor(255, 255, 255, 255),
+            QColor(0, 0, 0, 255),
+            dimBrightThreshold);
 };
 
 bool WaveformMark::contains(QPoint point, Qt::Orientation orientation) const {

src/waveform/renderers/waveformmark.h

@@ -55,7 +55,7 @@ class WaveformMark {
     }
 
     // Sets the appropriate mark colors based on the base color
-    void setBaseColor(QColor baseColor);
+    void setBaseColor(QColor baseColor, int dimBrightThreshold);
     QColor fillColor() const {
         return m_fillColor;
     }

src/waveform/renderers/waveformrendermark.cpp

@@ -134,7 +134,8 @@ void WaveformRenderMark::slotCuesUpdated() {
                 !pMark->fillColor().isValid() ||
                 newColor != pMark->fillColor()) {
             pMark->m_text = newLabel;
-            pMark->setBaseColor(newColor);
+            int dimBrightThreshold = m_waveformRenderer->getDimBrightThreshold();
+            pMark->setBaseColor(newColor, dimBrightThreshold);
             generateMarkImage(pMark);
         }
     }

src/waveform/renderers/waveformsignalcolors.cpp

@@ -5,7 +5,12 @@
 #include "widget/wskincolor.h"
 #include "widget/wwidget.h"
 
-WaveformSignalColors::WaveformSignalColors() {
+namespace {
+constexpr int kDefaultDimBrightThreshold = 127;
+}
+
+WaveformSignalColors::WaveformSignalColors()
+        : m_dimBrightThreshold(kDefaultDimBrightThreshold) {
 }
 
 bool WaveformSignalColors::setup(const QDomNode &node, const SkinContext& context) {
@@ -76,6 +81,12 @@ bool WaveformSignalColors::setup(const QDomNode &node, const SkinContext& contex
     }
     m_bgColor = WSkinColor::getCorrectColor(m_bgColor).toRgb();
 
+    bool okay;
+    m_dimBrightThreshold = context.selectInt(node, QStringLiteral("DimBrightThreshold"), &okay);
+    if (!okay) {
+        m_dimBrightThreshold = kDefaultDimBrightThreshold;
+    }
+
     bool filteredColorValid = m_lowColor.isValid() && m_midColor.isValid() && m_highColor.isValid();
 
     if (m_signalColor.isValid() && filteredColorValid) {

src/waveform/renderers/waveformsignalcolors.h

@@ -25,6 +25,7 @@ class WaveformSignalColors {
     inline const QColor& getPlayedOverlayColor() const { return m_playedOverlayColor; }
     inline const QColor& getPassthroughOverlayColor() const { return m_passthroughOverlayColor; }
     inline const QColor& getBgColor() const { return m_bgColor; }
+    inline int getDimBrightThreshold() const { return m_dimBrightThreshold; }
 
   protected:
     void fallBackFromSignalColor();
@@ -45,6 +46,7 @@ class WaveformSignalColors {
     QColor m_playedOverlayColor;
     QColor m_passthroughOverlayColor;
     QColor m_bgColor;
+    int m_dimBrightThreshold;
 };
 
 #endif // WAVEFORMSIGNALCOLORS_H

src/waveform/renderers/waveformwidgetrenderer.cpp

@@ -16,9 +16,14 @@ const double WaveformWidgetRenderer::s_waveformMaxZoom = 10.0;
 const double WaveformWidgetRenderer::s_waveformDefaultZoom = 3.0;
 const double WaveformWidgetRenderer::s_defaultPlayMarkerPosition = 0.5;
 
+namespace {
+constexpr int kDefaultDimBrightThreshold = 127;
+}
+
 WaveformWidgetRenderer::WaveformWidgetRenderer(const QString& group)
         : m_group(group),
           m_orientation(Qt::Horizontal),
+          m_dimBrightThreshold(kDefaultDimBrightThreshold),
           m_height(-1),
           m_width(-1),
           m_devicePixelRatio(1.0f),
@@ -315,6 +320,12 @@ void WaveformWidgetRenderer::setup(
         m_orientation = Qt::Horizontal;
     }
 
+    bool okay;
+    m_dimBrightThreshold = context.selectInt(node, QStringLiteral("DimBrightThreshold"), &okay);
+    if (!okay) {
+        m_dimBrightThreshold = kDefaultDimBrightThreshold;
+    }
+
     m_colors.setup(node, context);
     for (int i = 0; i < m_rendererStack.size(); ++i) {
         m_rendererStack[i]->setScaleFactor(m_scaleFactor);

src/waveform/renderers/waveformwidgetrenderer.h

@@ -91,6 +91,7 @@ class WaveformWidgetRenderer {
     int getBreadth() const { return m_orientation == Qt::Horizontal ? m_height : m_width;}
     Qt::Orientation getOrientation() const { return m_orientation;}
     const WaveformSignalColors* getWaveformSignalColors() const { return &m_colors; };
+    int getDimBrightThreshold() { return m_dimBrightThreshold; }
 
     template< class T_Renderer>
     inline T_Renderer* addRenderer() {
@@ -120,6 +121,7 @@ class WaveformWidgetRenderer {
     TrackPointer m_pTrack;
     QList<WaveformRendererAbstract*> m_rendererStack;
     Qt::Orientation m_orientation;
+    int m_dimBrightThreshold;
     int m_height;
     int m_width;
     float m_devicePixelRatio;

src/widget/woverview.cpp

@@ -119,6 +119,7 @@ void WOverview::setup(const QDomNode& node, const SkinContext& context) {
     m_passthroughOverlayColor = m_signalColors.getPassthroughOverlayColor();
     m_playedOverlayColor = m_signalColors.getPlayedOverlayColor();
     m_lowColor = m_signalColors.getLowColor();
+    m_dimBrightThreshold = m_signalColors.getDimBrightThreshold();
 
     m_labelBackgroundColor = context.selectColor(node, "LabelBackgroundColor");
     if (!m_labelBackgroundColor.isValid()) {
@@ -390,7 +391,7 @@ void WOverview::updateCues(const QList<CuePointer> &loadedCues) {
             && pMark->getSamplePosition() != Cue::kNoPosition) {
             QColor newColor = mixxx::RgbColor::toQColor(currentCue->getColor());
             if (newColor != pMark->fillColor() || newColor != pMark->m_textColor) {
-                pMark->setBaseColor(newColor);
+                pMark->setBaseColor(newColor, m_dimBrightThreshold);
             }
 
             int hotcueNumber = currentCue->getHotCue();

src/widget/woverview.h

@@ -177,6 +177,7 @@ class WOverview : public WWidget, public TrackDropTarget {
     QColor m_passthroughOverlayColor;
     QColor m_playedOverlayColor;
     QColor m_lowColor;
+    int m_dimBrightThreshold;
     QLabel* m_pPassthroughLabel;
 
     // All WaveformMarks

src/widget/wwaveformviewer.cpp

@@ -52,6 +52,7 @@ void WWaveformViewer::setup(const QDomNode& node, const SkinContext& context) {
     if (m_waveformWidget) {
         m_waveformWidget->setup(node, context);
     }
+    m_dimBrightThreshold = m_waveformWidget->getDimBrightThreshold();
 }
 
 void WWaveformViewer::resizeEvent(QResizeEvent* /*event*/) {
@@ -272,13 +273,14 @@ CuePointer WWaveformViewer::getCuePointerFromCueMark(WaveformMarkPointer pMark)
 }
 
 void WWaveformViewer::highlightMark(WaveformMarkPointer pMark) {
-    QColor highlightColor = Color::chooseContrastColor(pMark->fillColor());
-    pMark->setBaseColor(highlightColor);
+    QColor highlightColor = Color::chooseContrastColor(pMark->fillColor(),
+            m_dimBrightThreshold);
+    pMark->setBaseColor(highlightColor, m_dimBrightThreshold);
 }
 
 void WWaveformViewer::unhighlightMark(WaveformMarkPointer pMark) {
     QColor originalColor = mixxx::RgbColor::toQColor(getCuePointerFromCueMark(pMark)->getColor());
-    pMark->setBaseColor(originalColor);
+    pMark->setBaseColor(originalColor, m_dimBrightThreshold);
 }
 
 bool WWaveformViewer::isPlaying() const {

src/widget/wwaveformviewer.h

@@ -87,6 +87,8 @@ class WWaveformViewer : public WWidget, public TrackDropTarget {
 
     WaveformWidgetAbstract* m_waveformWidget;
 
+    int m_dimBrightThreshold;
+
     friend class WaveformWidgetFactory;
 
     CuePointer getCuePointerFromCueMark(WaveformMarkPointer pMark) const;