diff layer/Colour3DPlotRenderer.cpp @ 1131:ee98d587cd1a spectrogram-minor-refactor

Sensible vertical scale and hybrid normalisation range in colour 3d plot

--- a/layer/Colour3DPlotRenderer.cpp	Tue Aug 02 09:20:16 2016 +0100
+++ b/layer/Colour3DPlotRenderer.cpp	Tue Aug 02 09:58:41 2016 +0100
@@ -30,7 +30,7 @@
 
 #include <vector>
 
-#define DEBUG_COLOUR_PLOT_REPAINT 1
+//#define DEBUG_COLOUR_PLOT_REPAINT 1
 
 using namespace std;
 
@@ -360,12 +360,12 @@
                               fullColumn.data() + maxbin + 1);
 
             column = ColumnOp::applyGain(column, m_params.scaleFactor);
-            
-            magRange.sample(column);
 
 //                if (m_colourScale != ColourScaleType::Phase) {
             preparedColumn = ColumnOp::normalize(column, m_params.normalization);
 //                }
+            
+            magRange.sample(preparedColumn);
 
             if (m_params.binDisplay == BinDisplay::PeakBins) {
                 preparedColumn = ColumnOp::peakPick(preparedColumn);
@@ -788,12 +788,12 @@
 
                 column = ColumnOp::applyGain(column, m_params.scaleFactor);
 
-                magRange.sample(column);
-
 //                if (m_colourScale != ColourScaleType::Phase) {
                     column = ColumnOp::normalize(column, m_params.normalization);
 //                }
 
+                magRange.sample(column);
+
                 if (m_params.binDisplay == BinDisplay::PeakBins) {
                     column = ColumnOp::peakPick(column);
                 }
@@ -932,14 +932,14 @@
                                   fullColumn.data() + maxbin + 1);
 
                 column = ColumnOp::applyGain(column, m_params.scaleFactor);
-
-                magRange.sample(column);
                 
 //!!!                if (m_colourScale != ColourScaleType::Phase) {
                 preparedColumn = ColumnOp::normalize
                     (column, m_params.normalization);
 //!!!                }
 
+                magRange.sample(preparedColumn);
+
                 psx = sx;
             }