comparison layer/SpectrogramLayer.cpp @ 1129:371320c9f8d9 spectrogram-minor-refactor

A threshold fix

         sources.peaks = getPeakCache();
 
         ColourScale::Parameters cparams;
         cparams.colourMap = m_colourMap;
         cparams.scale = m_colourScale;
-        cparams.threshold = m_threshold;
-        cparams.gain = m_gain;
+
+        if (m_colourScale != ColourScaleType::Phase) {
+            cparams.gain = m_gain;
+            cparams.threshold = m_threshold;
+        }
 
         if (m_colourScale == ColourScaleType::Linear &&
             m_normalization == ColumnNormalization::None) {
             //!!! This should not be necessary -- what is the actual range
             cparams.maxValue = 0.1;
+            if (cparams.maxValue <= m_threshold) {
+                cparams.maxValue = m_threshold + 0.1;
+            }
         }
-        
+
         Colour3DPlotRenderer::Parameters params;
         params.colourScale = ColourScale(cparams);
         params.normalization = m_normalization;
         params.binDisplay = m_binDisplay;
         params.binScale = m_binScale;
         params.alwaysOpaque = false; //!!! should be true though
         params.invertVertical = false;
         params.scaleFactor = 1.0;
         params.colourRotation = m_colourRotation;
 
-        if (m_colourScale != ColourScaleType::Phase &&
-            m_normalization == ColumnNormalization::None) {
+        if (m_colourScale != ColourScaleType::Phase) {
             params.scaleFactor *= 2.f / float(getFFTSize());
         }
 
         Preferences::SpectrogramSmoothing smoothing = 
             Preferences::getInstance()->getSpectrogramSmoothing();

 	for (int i = 0; i < ch; ++i) {
 
             double dBval = dBmin + (((dBmax - dBmin) * i) / (ch - 1));
             int idb = int(dBval);
 
-            //!!!
             double value = AudioLevel::dB_to_multiplier(dBval);
-            cerr << "dBval = " << dBval << ", value = " << value << endl;
             paint.setPen(getRenderer(v)->getColour(value));
 
             int y = textHeight * topLines + 4 + ch - i;
 
             paint.drawLine(5 + cw - cbw, y, cw + 2, y);