comparison layer/Colour3DPlotRenderer.cpp @ 1161:436df5f24bda 3.0-integration

Fix forehead-slapping failure to use the right model when rendering 3d plot in peaks cache mode (i.e. when zoomed quite far out)

         return DrawBufferPixelResolution;
     }
 }
 
 ColumnOp::Column
-Colour3DPlotRenderer::getColumn(int sx, int minbin, int nbins) const
+Colour3DPlotRenderer::getColumn(int sx, int minbin, int nbins,
+                                bool usePeaksCache) const
 {
     // order:
     // get column -> scale -> normalise -> record extents ->
     // peak pick -> distribute/interpolate -> apply display gain
 

         column = vector<float>(fullColumn.data() + minbin,
                                fullColumn.data() + minbin + nbins);
 
     } else {
                     
-        ColumnOp::Column fullColumn = m_sources.source->getColumn(sx);
+        ColumnOp::Column fullColumn =
+            (usePeaksCache ? m_sources.peaks : m_sources.source)->
+            getColumn(sx);
                 
         column = vector<float>(fullColumn.data() + minbin,
                                fullColumn.data() + minbin + nbins);
 
         column = ColumnOp::applyGain(column, m_params.scaleFactor);

             // order:
             // get column -> scale -> normalise -> record extents ->
             // peak pick -> distribute/interpolate -> apply display gain
 
             // this does the first three:
-            preparedColumn = getColumn(sx, minbin, nbins);
+            preparedColumn = getColumn(sx, minbin, nbins, false);
             
             magRange.sample(preparedColumn);
 
             if (m_params.binDisplay == BinDisplay::PeakBins) {
                 preparedColumn = ColumnOp::peakPick(preparedColumn);

 
         // x is the on-canvas pixel coord; sx (later) will be the
         // source column index
         
         ++columnCount;
-
-#ifdef DEBUG_COLOUR_PLOT_REPAINT
-        cerr << "x = " << x << ", binforx[x] = " << binforx[x] << endl;
-#endif
         
         if (binforx[x] < 0) continue;
 
         int sx0 = binforx[x] / divisor;
         int sx1 = sx0;
         if (x+1 < w) sx1 = binforx[x+1] / divisor;
         if (sx0 < 0) sx0 = sx1 - 1;
         if (sx0 < 0) continue;
         if (sx1 <= sx0) sx1 = sx0 + 1;
 
+#ifdef DEBUG_COLOUR_PLOT_REPAINT
+        cerr << "x = " << x << ", binforx[x] = " << binforx[x] << ", sx range " << sx0 << " -> " << sx1 << endl;
+#endif
+
         vector<float> pixelPeakColumn;
         MagnitudeRange magRange;
         
         for (int sx = sx0; sx < sx1; ++sx) {
-
-#ifdef DEBUG_COLOUR_PLOT_REPAINT
-            cerr << "sx = " << sx << endl;
-#endif
 
             if (sx < 0 || sx >= modelWidth) {
                 continue;
             }
 

                 // order:
                 // get column -> scale -> normalise -> record extents ->
                 // peak pick -> distribute/interpolate -> apply display gain
 
                 // this does the first three:
-                ColumnOp::Column column = getColumn(sx, minbin, nbins);
+                ColumnOp::Column column = getColumn(sx, minbin, nbins,
+                                                    usePeaksCache);
 
                 magRange.sample(column);
                 
                 if (m_params.binDisplay == BinDisplay::PeakBins) {
                     column = ColumnOp::peakPick(column);

             if (sx < 0 || sx >= modelWidth) {
                 continue;
             }
 
             if (sx != psx) {
-                preparedColumn = getColumn(sx, minbin, nbins);
+                preparedColumn = getColumn(sx, minbin, nbins, false);
                 magRange.sample(preparedColumn);
                 psx = sx;
             }
 
             if (sx == sx0) {