comparison layer/Colour3DPlotRenderer.cpp @ 1163:ab169938832a 3.0-integration

Use peak cache at one zoom level lower (since it exists at that level already -- this is a >= vs > question) + make naming more uniform

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

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

     clearDrawBuffer(repaintWidth, h);
 
     vector<int> binforx(repaintWidth);
     vector<double> binfory(h);
     
-    bool usePeaksCache = false;
+    bool usePeakCache = false;
     int binsPerPeak = 1;
     int zoomLevel = v->getZoomLevel();
     int binResolution = model->getResolution();
 
     for (int x = 0; x < repaintWidth; ++x) {
         sv_frame_t f0 = v->getFrameForX(x0 + x);
         double s0 = double(f0 - model->getStartFrame()) / binResolution;
         binforx[x] = int(s0 + 0.0001);
     }
 
-    if (m_sources.peaks) { // peaks cache exists
-
-        binsPerPeak = m_sources.peaks->getColumnsPerPeak();
-        usePeaksCache = (binResolution * binsPerPeak) < zoomLevel;
-        
+    if (m_sources.peakCache) {
+        binsPerPeak = m_sources.peakCache->getColumnsPerPeak();
+        usePeakCache = (zoomLevel >= binResolution * binsPerPeak);
         if (m_params.colourScale.getScale() ==
             ColourScaleType::Phase) {
-            usePeaksCache = false;
-        }
-    }
-
-#ifdef DEBUG_COLOUR_PLOT_REPAINT
-    cerr << "[PIX] zoomLevel = " << zoomLevel
-         << ", binResolution " << binResolution 
-         << ", binsPerPeak " << binsPerPeak
-         << ", peak cache " << m_sources.peaks
-         << ", usePeaksCache = " << usePeaksCache
-         << endl;
-#endif
+            usePeakCache = false;
+        }
+    }
+
+    SVDEBUG << "[PIX] zoomLevel = " << zoomLevel
+            << ", binResolution " << binResolution 
+            << ", binsPerPeak " << binsPerPeak
+            << ", peak cache " << m_sources.peakCache
+            << ", usePeakCache = " << usePeakCache
+            << endl;
     
     for (int y = 0; y < h; ++y) {
         binfory[y] = m_sources.verticalBinLayer->getBinForY(v, h - y - 1);
     }
 

     } else {
         attainedWidth = renderDrawBuffer(repaintWidth,
                                          h,
                                          binforx,
                                          binfory,
-                                         usePeaksCache,
+                                         usePeakCache,
                                          rightToLeft,
                                          timeConstrained);
     }
 
     if (attainedWidth == 0) return;

     
     for (int x = 0; x < drawBufferWidth; ++x) {
         binforx[x] = int(leftBoundaryFrame / binResolution) + x;
     }
 
-#ifdef DEBUG_COLOUR_PLOT_REPAINT
-    cerr << "[BIN] binResolution " << binResolution 
-         << endl;
-#endif
+    SVDEBUG << "[BIN] binResolution " << binResolution 
+            << endl;
     
     for (int y = 0; y < h; ++y) {
         binfory[y] = m_sources.verticalBinLayer->getBinForY(v, h - y - 1);
     }
 

 
 int
 Colour3DPlotRenderer::renderDrawBuffer(int w, int h,
                                        const vector<int> &binforx,
                                        const vector<double> &binfory,
-                                       bool usePeaksCache,
+                                       bool usePeakCache,
                                        bool rightToLeft,
                                        bool timeConstrained)
 {
     // Callers must have checked that the appropriate subset of
     // Sources data members are set for the supplied flags (e.g. that
-    // peaks model exists if usePeaksCache)
+    // peakCache model exists if usePeakCache)
     
     RenderTimer timer(timeConstrained ?
                       RenderTimer::FastRender :
                       RenderTimer::NoTimeout);
 
     int divisor = 1;
     const DenseThreeDimensionalModel *sourceModel = m_sources.source;
-    if (usePeaksCache) {
-        divisor = m_sources.peaks->getColumnsPerPeak();
-        sourceModel = m_sources.peaks;
+    if (usePeakCache) {
+        divisor = m_sources.peakCache->getColumnsPerPeak();
+        sourceModel = m_sources.peakCache;
     }
 
     int sh = sourceModel->getHeight();
     
     int minbin = int(binfory[0] + 0.0001);

                 // 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,
-                                                    usePeaksCache);
+                                                    usePeakCache);
 
                 magRange.sample(column);
 
                 if (m_params.binDisplay == BinDisplay::PeakBins) {
                     column = ColumnOp::peakPick(column);