comparison layer/Colour3DPlotRenderer.cpp @ 1124:b71a0491d287 spectrogram-minor-refactor

Some notes on gain

 
             //!!! this is in common with renderDrawBuffer - pull it out
 
             // order:
             // get column -> scale -> record extents ->
-            // normalise -> peak pick -> apply display gain ->
-            // distribute/interpolate
-
+            // normalise -> peak pick -> apply display gain
+            
             ColumnOp::Column fullColumn = model->getColumn(sx);
                 
             ColumnOp::Column column =
                 vector<float>(fullColumn.data() + minbin,
                               fullColumn.data() + maxbin + 1);

 //                }
 
             if (m_params.binDisplay == BinDisplay::PeakBins) {
                 preparedColumn = ColumnOp::peakPick(preparedColumn);
             }
+
+            // Display gain belongs to the colour scale and is
+            // applied by the colour scale object when mapping it
 
             psx = sx;
         }
 
 	sv_frame_t fx = sx * modelResolution + modelStart;

 
             if (sx != psx) {
 
                 // order:
                 // get column -> scale -> record extents ->
-                // normalise -> peak pick -> apply display gain ->
-                // distribute/interpolate
+                // normalise -> peak pick -> distribute/interpolate ->
+                // apply display gain
 
                 ColumnOp::Column fullColumn = sourceModel->getColumn(sx);
 
 //                cerr << "x " << x << ", sx " << sx << ", col height " << fullColumn.size()
 //                     << ", minbin " << minbin << ", maxbin " << maxbin << endl;

                 if (m_params.binDisplay == BinDisplay::PeakBins) {
                     column = ColumnOp::peakPick(column);
                 }
 
                 preparedColumn =
-                    ColumnOp::distribute(column, //!!! gain? ColumnOp::applyGain(column, m_gain),
+                    ColumnOp::distribute(column,
                                          h,
                                          binfory,
                                          minbin,
                                          m_params.interpolate);
+
+                // Display gain belongs to the colour scale and is
+                // applied by the colour scale object when mapping it
                 
                 psx = sx;
             }
 
             if (sx == sx0) {

 //!!! fft scale                if (m_colourScale != ColourScaleType::Phase) {
 //                    column = ColumnOp::fftScale(column, getFFTSize());
 //                }
 
 //!!!                if (m_colourScale != ColourScaleType::Phase) {
-                    column = ColumnOp::normalize(column, m_params.normalization);
+                preparedColumn = ColumnOp::normalize
+                    (column, m_params.normalization);
 //!!!                }
 
-                    preparedColumn = column;
-//!!! gain?                preparedColumn = ColumnOp::applyGain(column, m_params.gain);
-                
                 psx = sx;
             }
 
             if (sx == sx0) {
                 pixelPeakColumn = preparedColumn;