Change beat grid to slider. Removed old beat grid boolean code

5 files changed, 17 insertions, 46 deletions

diff --git a/src/waveform/renderers/waveformrenderbeat.cpp b/src/waveform/renderers/waveformrenderbeat.cpp
index 0dd4f66385..a4816c2e33 100644
--- a/src/waveform/renderers/waveformrenderbeat.cpp
+++ b/src/waveform/renderers/waveformrenderbeat.cpp
@@ -34,14 +34,10 @@ void WaveformRenderBeat::draw(QPainter* painter, QPaintEvent* /*event*/) {
     if (!trackBeats)
         return;
 
-    if (!m_waveformRenderer->isBeatGridEnabled())
+    int alpha = m_waveformRenderer->beatGridAlpha();
+    if (alpha == 0)
         return;
-
-    if(m_waveformRenderer->isBeatGridAlpha()){
-        m_beatColor.setAlphaF(0.3);
-    } else {
-        m_beatColor.setAlphaF(0.9);
-    }
+    m_beatColor.setAlphaF(alpha/100.0);
 
     const int trackSamples = m_waveformRenderer->getTrackSamples();
     if (trackSamples <= 0) {
diff --git a/src/waveform/renderers/waveformwidgetrenderer.cpp b/src/waveform/renderers/waveformwidgetrenderer.cpp
index 2acb8d96de..d1f7302e5a 100644
--- a/src/waveform/renderers/waveformwidgetrenderer.cpp
+++ b/src/waveform/renderers/waveformwidgetrenderer.cpp
@@ -28,8 +28,7 @@ WaveformWidgetRenderer::WaveformWidgetRenderer(const char* group)
       m_visualSamplePerPixel(1.0),
       m_audioSamplePerPixel(1.0),
       m_enableBeatGrid(true),
-      m_alphaBeatGrid(false),
-
+      m_alphaBeatGrid(90),
       // Really create some to manage those;
       m_visualPlayPosition(NULL),
       m_playPos(-1),
@@ -280,8 +279,8 @@ void WaveformWidgetRenderer::setDisplayBeatGrid(bool set) {
     m_enableBeatGrid = set;
 }
 
-void WaveformWidgetRenderer::setDisplayBeatGridAlpha(bool set) {
-    m_alphaBeatGrid = set;
+void WaveformWidgetRenderer::setDisplayBeatGridAlpha(int alpha) {
+    m_alphaBeatGrid = alpha;
 }
 
 void WaveformWidgetRenderer::setTrack(TrackPointer track) {
diff --git a/src/waveform/renderers/waveformwidgetrenderer.h b/src/waveform/renderers/waveformwidgetrenderer.h
index 39d3f89063..4283d6dec8 100644
--- a/src/waveform/renderers/waveformwidgetrenderer.h
+++ b/src/waveform/renderers/waveformwidgetrenderer.h
@@ -45,7 +45,7 @@ class WaveformWidgetRenderer {
     void setZoom(int zoom);
 
     void setDisplayBeatGrid(bool set);
-    void setDisplayBeatGridAlpha(bool set);
+    void setDisplayBeatGridAlpha(int alpha);
 
     double getVisualSamplePerPixel() const { return m_visualSamplePerPixel;};
     double getAudioSamplePerPixel() const { return m_audioSamplePerPixel;};
@@ -75,7 +75,7 @@ class WaveformWidgetRenderer {
     int getTrackSamples() const { return m_trackSamples;}
 
     bool isBeatGridEnabled() const { return m_enableBeatGrid; }
-    bool isBeatGridAlpha() const { return m_alphaBeatGrid; }
+    int beatGridAlpha() const { return m_alphaBeatGrid; }
 
     void resize(int width, int height);
     int getHeight() const { return m_height;}
@@ -113,7 +113,7 @@ class WaveformWidgetRenderer {
     double m_audioSamplePerPixel;
 
     bool m_enableBeatGrid;
-    bool m_alphaBeatGrid;
+    int m_alphaBeatGrid;
 
     //TODO: vRince create some class to manage control/value
     //ControlConnection
diff --git a/src/waveform/waveformwidgetfactory.cpp b/src/waveform/waveformwidgetfactory.cpp
index 38912b21a4..3bad7368a7 100644
--- a/src/waveform/waveformwidgetfactory.cpp
+++ b/src/waveform/waveformwidgetfactory.cpp
@@ -67,8 +67,7 @@ WaveformWidgetFactory::WaveformWidgetFactory() :
         m_overviewNormalized(false),
         m_openGLAvailable(false),
         m_openGLShaderAvailable(false),
-        m_beatGridEnabled(true),
-        m_beatGridAlpha(false),
+        m_beatGridAlpha(90),
         m_vsyncThread(NULL),
         m_frameCnt(0),
         m_actualFrameRate(0),
@@ -225,11 +224,8 @@ bool WaveformWidgetFactory::setConfig(UserSettingsPointer config) {
         m_config->set(ConfigKey("[Waveform]","ZoomSynchronization"), ConfigValue(m_zoomSync));
     }
 
-    bool showBeatGrid = m_config->getValue(ConfigKey("[Waveform]", "beatGridLinesCheckBox"), m_beatGridEnabled);
-    setDisplayBeatGrid(showBeatGrid);
-
-    bool showBeatGridAlpha = m_config->getValue(ConfigKey("[Waveform]", "dimModeCheckBox"), m_beatGridAlpha);
-    setDisplayBeatGridAlpha(showBeatGridAlpha);
+    int beatGridAlpha = m_config->getValue(ConfigKey("[Waveform]", "beatGridAlpha"), m_beatGridAlpha);
+    setDisplayBeatGridAlpha(beatGridAlpha);
 
     WaveformWidgetType::Type type = static_cast<WaveformWidgetType::Type>(
             m_config->getValueString(ConfigKey("[Waveform]","WaveformType")).toInt(&ok));
@@ -442,25 +438,8 @@ void WaveformWidgetFactory::setZoomSync(bool sync) {
     }
 }
 
-void WaveformWidgetFactory::setDisplayBeatGrid(bool sync) {
-    m_beatGridEnabled = sync;
-    if (m_config) {
-        m_config->set(ConfigKey("[Waveform]", "beatGridLinesCheckBox"), ConfigValue(m_beatGridEnabled));
-    }
-
-    if (m_waveformWidgetHolders.size() == 0) {
-        return;
-    }
-
-    for (int i = 0; i < m_waveformWidgetHolders.size(); i++) {
-        m_waveformWidgetHolders[i].m_waveformWidget->setDisplayBeatGrid(m_beatGridEnabled);
-    }
-
-}
-
-
-void WaveformWidgetFactory::setDisplayBeatGridAlpha(bool sync) {
-    m_beatGridAlpha = sync;
+void WaveformWidgetFactory::setDisplayBeatGridAlpha(int alpha) {
+    m_beatGridAlpha = alpha;
     if (m_waveformWidgetHolders.size() == 0) {
         return;
     }
diff --git a/src/waveform/waveformwidgetfactory.h b/src/waveform/waveformwidgetfactory.h
index 4bbc65108e..994837d124 100644
--- a/src/waveform/waveformwidgetfactory.h
+++ b/src/waveform/waveformwidgetfactory.h
@@ -87,11 +87,8 @@ class WaveformWidgetFactory : public QObject, public Singleton<WaveformWidgetFac
     void setZoomSync(bool sync);
     int isZoomSync() const { return m_zoomSync;}
 
-    void setDisplayBeatGrid(bool sync);
-    bool isBeatGridEnabled() const { return m_beatGridEnabled; }
-
-    void setDisplayBeatGridAlpha(bool sync);
-    bool isBeatGridAlpha() const { return m_beatGridAlpha; }
+    void setDisplayBeatGridAlpha(int alpha);
+    int beatGridAlpha() const { return m_beatGridAlpha; }
 
     void setVisualGain(FilterIndex index, double gain);
     double getVisualGain(FilterIndex index) const;
@@ -155,7 +152,7 @@ class WaveformWidgetFactory : public QObject, public Singleton<WaveformWidgetFac
     QString m_openGLVersion;
     bool m_openGLShaderAvailable;
     bool m_beatGridEnabled;
-    bool m_beatGridAlpha;
+    int m_beatGridAlpha;
 
     VSyncThread* m_vsyncThread;