diff layer/Colour3DPlotRenderer.cpp @ 1125:50324fca1328 spectrogram-minor-refactor

Scale range matching
author Chris Cannam
date Mon, 01 Aug 2016 15:06:16 +0100
parents b71a0491d287
children dc4b8fd3fcb7
line wrap: on
line diff
--- a/layer/Colour3DPlotRenderer.cpp	Mon Aug 01 11:31:53 2016 +0100
+++ b/layer/Colour3DPlotRenderer.cpp	Mon Aug 01 15:06:16 2016 +0100
@@ -359,6 +359,8 @@
                 vector<float>(fullColumn.data() + minbin,
                               fullColumn.data() + maxbin + 1);
 
+            column = ColumnOp::applyGain(column, m_params.scaleFactor);
+            
             magRange.sample(column);
 
 //!!! fft scale                if (m_colourScale != ColourScaleType::Phase) {
@@ -788,6 +790,8 @@
                     vector<float>(fullColumn.data() + minbin,
                                   fullColumn.data() + maxbin + 1);
 
+                column = ColumnOp::applyGain(column, m_params.scaleFactor);
+
 //!!! fft scale                if (m_colourScale != ColourScaleType::Phase) {
 //                    column = ColumnOp::fftScale(column, m_fftSize);
 //                }
@@ -935,6 +939,8 @@
                     vector<float>(fullColumn.data() + minbin,
                                   fullColumn.data() + maxbin + 1);
 
+                column = ColumnOp::applyGain(column, m_params.scaleFactor);
+
                 magRange.sample(column);
                 
 //!!! fft scale                if (m_colourScale != ColourScaleType::Phase) {