comparison layer/Colour3DPlotRenderer.cpp @ 1119:be5b91ec81a0 spectrogram-minor-refactor

Inch toward using the mag cache (currently will crash with debug exception)

     if (x1 > v->getPaintWidth()) x1 = v->getPaintWidth();
 
     m_cache.resize(v->getPaintSize());
     m_cache.setZoomLevel(v->getZoomLevel());
 
+    m_magCache.resize(v->getPaintSize().width());
+    m_magCache.setZoomLevel(v->getZoomLevel());
+    
     cerr << "cache start " << m_cache.getStartFrame()
          << " valid left " << m_cache.getValidLeft()
          << " valid right " << m_cache.getValidRight()
          << endl;
     cerr << " view start " << startFrame

 
             cerr << "cache hit" << endl;
             
             // cache is valid for the complete requested area
             paint.drawImage(rect, m_cache.getImage(), rect);
-            return { rect, {} };
+
+            //!!! a dev debug check
+            if (!m_magCache.areColumnsSet(x0, x1 - x0)) {
+                cerr << "Columns (" << x0 << " -> " << x1-x0
+                     << ") not set in mag cache" << endl;
+                throw std::logic_error("Columns not set in mag cache");
+            }
+            
+            MagnitudeRange range = m_magCache.getRange(x0, x1-x0);
+
+            return { rect, range };
 
         } else {
             cerr << "cache partial hit" << endl;
             
             // cache doesn't begin at the right frame or doesn't
             // contain the complete view, but might be scrollable or
             // partially usable
             m_cache.scrollTo(v, startFrame);
+            m_magCache.scrollTo(v, startFrame);
 
             // if we are not time-constrained, then we want to paint
             // the whole area in one go; we don't return a partial
             // paint. To avoid providing the more complex logic to
             // handle painting discontiguous areas, if the only valid

             }
         }
     } else {
         // cache is completely invalid
         m_cache.setStartFrame(startFrame);
+        m_magCache.setStartFrame(startFrame);
     }
 
     bool rightToLeft = false;
 
     if (!m_cache.isValid() && timeConstrained) {