comparison layer/SpectrogramLayer.cpp @ 1062:38ecdd5924ac spectrogram-minor-refactor

A more sensible order for column operations

     }
     return out;
 }
 
 // order:
-// get column -> scale -> distribute/interpolate -> record extents -> normalise -> peak pick -> apply display gain
+// get column -> scale -> record extents -> normalise -> peak pick -> apply display gain -> distribute/interpolate
 
 int
 SpectrogramLayer::paintDrawBuffer(LayerGeometryProvider *v,
                                   int w,
                                   int h,

                                                    sx,
                                                    minbin,
                                                    maxbin - minbin + 1);
                 }
 
-                vector<float> distributed =
-                    distributeColumn(scaleColumn(column),
+                column = scaleColumn(column);
+                
+                recordColumnExtents(column,
+                                    sx,
+                                    overallMag,
+                                    overallMagChanged);
+
+                preparedColumn =
+                    distributeColumn(applyDisplayGain
+                                     (peakPickColumn
+                                      (normalizeColumn
+                                       (column))),
                                      h,
                                      binfory,
                                      minbin,
                                      interpolate);
-
-                recordColumnExtents(distributed,
-                                    sx,
-                                    overallMag,
-                                    overallMagChanged);
-                
-                preparedColumn =
-                    applyDisplayGain(peakPickColumn
-                                     (normalizeColumn(distributed)));
                 
                 psx = sx;
             }
 
             //!!! now peak of all preparedColumns for this pixel