comparison layer/SpectrogramLayer.cpp @ 1122:94370157b265 spectrogram-minor-refactor

Fixes and debug output for mag range calculations

 SpectrogramLayer::paintWithRenderer(LayerGeometryProvider *v, QPainter &paint, QRect rect) const
 {
     Colour3DPlotRenderer *renderer = getRenderer(v);
 
     Colour3DPlotRenderer::RenderResult result;
+    MagnitudeRange magRange;
+    int viewId = v->getId();
+
+    if (!renderer->geometryChanged(v)) {
+        cerr << "geometry unchanged, extending view mag range" << endl;
+        magRange = m_viewMags[viewId];
+    } else {
+        cerr << "geometry changed!! creating new view mag range" << endl;
+    }
     
     if (m_synchronous) {
 
         result = renderer->render(v, paint, rect);
 
     } else {
 
         result = renderer->renderTimeConstrained(v, paint, rect);
 
-        cerr << "mag range in this paint: " << result.range.getMin() << " -> "
+        cerr << "rect width from this paint: " << result.rendered.width()
+             << ", mag range in this paint: " << result.range.getMin() << " -> "
              << result.range.getMax() << endl;
         
         //!!!
 
         QRect uncached = renderer->getLargestUncachedRect(v);

                  << uncached.width() << endl;
             v->updatePaintRect(uncached);
         }
     }
 
-    //!!! at the mo this measures the range of the whole thing, not
-    //!!! just the view - need to reset it when view extents change
-
-    m_viewMags[v->getId()].sample(result.range);
+    magRange.sample(result.range);
+
+    if (magRange.isSet()) {
+        if (m_viewMags[viewId] == magRange) {
+            cerr << "mag range unchanged" << endl;
+        } else {
+            cerr << "mag range changed!!" << endl;
+            m_viewMags[viewId] = magRange;
+        }
+    }
     
     cerr << "mag range in this view: "
-         << m_viewMags[v->getId()].getMin()
+         << m_viewMags[viewId].getMin()
          << " -> "
-         << m_viewMags[v->getId()].getMax()
+         << m_viewMags[viewId].getMax()
          << endl;
-        
 }
 
 void
 SpectrogramLayer::paint(LayerGeometryProvider *v, QPainter &paint, QRect rect) const
 {