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

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

 
 #include "view/ViewManager.h" // for main model sample rate. Pity
 
 #include <vector>
 
-#define DEBUG_COLOUR_PLOT_REPAINT 1
+//#define DEBUG_COLOUR_PLOT_REPAINT 1
 
 using namespace std;
 
 Colour3DPlotRenderer::RenderResult
 Colour3DPlotRenderer::render(const LayerGeometryProvider *v, QPainter &paint, QRect rect)

             ColumnOp::Column column =
                 vector<float>(fullColumn.data() + minbin,
                               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);
             }
 

                     vector<float>(fullColumn.data() + minbin,
                                   fullColumn.data() + maxbin + 1);
 
                 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);
                 }
 

                 ColumnOp::Column column =
                     vector<float>(fullColumn.data() + minbin,
                                   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;
             }
 
             if (sx == sx0) {