comparison layer/SpectrogramLayer.cpp @ 1090:c8c747783110 spectrogram-minor-refactor

Cut over to using the renderer (though it's very incomplete) and fix some cache problems and pointer lifetime misunderstandings

 
 #ifndef __GNUC__
 #include <alloca.h>
 #endif
 
+#define DEBUG_SPECTROGRAM 1
 #define DEBUG_SPECTROGRAM_REPAINT 1
 
 using namespace std;
 
 SpectrogramLayer::SpectrogramLayer(Configuration config) :

 
     return true;
 }
 
 double
-SpectrogramLayer::getYForBin(LayerGeometryProvider *, double bin) const {
+SpectrogramLayer::getYForBin(LayerGeometryProvider *, double) const {
     //!!! not implemented
     throw std::logic_error("not implemented");
 }
 
 double

 
 ScrollableImageCache &
 SpectrogramLayer::getImageCacheReference(const LayerGeometryProvider *view) const
 {
     if (m_imageCaches.find(view->getId()) == m_imageCaches.end()) {
-        m_imageCaches[view->getId()] = ScrollableImageCache(view);
+        m_imageCaches[view->getId()] = ScrollableImageCache();
     }
     return m_imageCaches.at(view->getId());
 }
 
 void
 SpectrogramLayer::paintAlternative(LayerGeometryProvider *v, QPainter &paint, QRect rect) const
 {
     Colour3DPlotRenderer *renderer = getRenderer(v);
 
-    
+    //!!! not time-constrained for now
+    Colour3DPlotRenderer::RenderResult result = renderer->render(v, paint, rect);
+
+    //!!! do
+    (void)result;
 }
 
 Colour3DPlotRenderer *
 SpectrogramLayer::getRenderer(LayerGeometryProvider *v) const
 {
     if (m_renderers.find(v->getId()) == m_renderers.end()) {
 
         Colour3DPlotRenderer::Sources sources;
-        sources.geometryProvider = v;
         sources.verticalBinLayer = this;
-        sources.source = m_fftModel;
-        sources.peaks = m_peakCache;
-        sources.fft = m_fftModel;
+        sources.fft = getFFTModel();
+        sources.source = sources.fft;
+        sources.peaks = getPeakCache();
 
         ::ColourScale::Parameters cparams;
         //!!! todo 
         
         Colour3DPlotRenderer::Parameters params;

 
     if (isLayerDormant(v)) {
 	SVDEBUG << "SpectrogramLayer::paint(): Layer is dormant, making it undormant again" << endl;
     }
 
-//    paintAlternative(v, paint, rect);
-//    return;
+    paintAlternative(v, paint, rect);
+    return;
 
     //!!!
     
     // Need to do this even if !isLayerDormant, as that could mean v
     // is not in the dormancy map at all -- we need it to be present

                 
 #ifdef DEBUG_SPECTROGRAM_REPAINT
             cerr << "SpectrogramLayer: scrolling the image cache if applicable" << endl;
 #endif
 
-            cache.scrollTo(startFrame);
+            cache.scrollTo(v, startFrame);
             
 #ifdef DEBUG_SPECTROGRAM_REPAINT
             cerr << "SpectrogramLayer: after scrolling, cache valid from "
                  << cache.getValidLeft() << " width " << cache.getValidWidth()
                  << endl;

 			       getEffectiveMaxFrequency(),
 			       m_frequencyScale == LogFrequencyScale);
 }
 
 int
-SpectrogramLayer::getCompletion(LayerGeometryProvider *v) const
+SpectrogramLayer::getCompletion(LayerGeometryProvider *) const
 {
     if (!m_fftModel) return 100;
     int completion = m_fftModel->getCompletion();
 #ifdef DEBUG_SPECTROGRAM_REPAINT
     cerr << "SpectrogramLayer::getCompletion: completion = " << completion << endl;
 #endif
     return completion;
 }
 
 QString
-SpectrogramLayer::getError(LayerGeometryProvider *v) const
-{
-    const View *view = v->getView();
+SpectrogramLayer::getError(LayerGeometryProvider *) const
+{
     if (!m_fftModel) return "";
     return m_fftModel->getError();
 }
 
 bool