comparison layer/Colour3DPlotRenderer.cpp @ 1120:65cdaf8d6b50 spectrogram-minor-refactor

Toward updating mag cache

 
 #include "view/ViewManager.h" // for main model sample rate. Pity
 
 #include <vector>
 
-//#define DEBUG_SPECTROGRAM_REPAINT 1
+#define DEBUG_SPECTROGRAM_REPAINT 1 //!!! name
 
 using namespace std;
 
 Colour3DPlotRenderer::RenderResult
 Colour3DPlotRenderer::render(const LayerGeometryProvider *v, QPainter &paint, QRect rect)

         // cases because we are quite well zoomed-in, and the sums are
         // easier this way. Calculating boundaries later will be
         // fiddly for partial paints otherwise.
         timeConstrained = false;
     }
-    
-    if (renderType == DirectTranslucent) {
-        renderDirectTranslucent(v, paint, rect);
-        return { rect, {} }; //!!! this return arg is not very useful
-    }
-
-    sv_frame_t startFrame = v->getStartFrame();
-    
+
     int x0 = v->getXForViewX(rect.x());
     int x1 = v->getXForViewX(rect.x() + rect.width());
     if (x0 < 0) x0 = 0;
     if (x1 > v->getPaintWidth()) x1 = v->getPaintWidth();
 
+    sv_frame_t startFrame = v->getStartFrame();
+    
     m_cache.resize(v->getPaintSize());
     m_cache.setZoomLevel(v->getZoomLevel());
 
     m_magCache.resize(v->getPaintSize().width());
     m_magCache.setZoomLevel(v->getZoomLevel());
+    
+    if (renderType == DirectTranslucent) {
+        renderDirectTranslucent(v, paint, rect);
+        //!!! mag range!
+
+        //!!! 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");
+        }
+
+        //!!! this is wrong
+        MagnitudeRange range = m_magCache.getRange(x0, x1-x0);
+
+        return { rect, range }; //!!! this return arg is not very useful
+    }
     
     cerr << "cache start " << m_cache.getStartFrame()
          << " valid left " << m_cache.getValidLeft()
          << " valid right " << m_cache.getValidRight()
          << endl;

         //!!! on a first cut, there is a risk that this will happen
         //!!! when we are at start/end of model -- trap, report, and
         //!!! then fix
         throw std::logic_error("internal error: failed to render entire requested rect even when not time-constrained");
     }
-    
-    return { pr, {} };
+
+    //!!! 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 { pr, range };
 
     //!!! todo: timing/incomplete paint
 
     //!!! todo: peak frequency style
 

 
         // x is the on-canvas pixel coord; sx (later) will be the
         // source column index
         
         ++columnCount;
+
+#ifdef DEBUG_SPECTROGRAM_REPAINT
+        cerr << "x = " << x << endl;
+#endif
         
         if (binforx[x] < 0) continue;
 
         int sx0 = binforx[x] / divisor;
         int sx1 = sx0;

 
 //!!! fft scale                if (m_colourScale != ColourScaleType::Phase) {
 //                    column = ColumnOp::fftScale(column, m_fftSize);
 //                }
 
+                MagnitudeRange r;
+                r.sample(column);
+                int magColIndex = sx - int(m_magCache.getStartFrame() /
+                                           sourceModel->getResolution());
+                cerr << "magColIndex = " << magColIndex << endl;
+                m_magCache.sampleColumn(magColIndex, r);
+                
 //!!! extents                recordColumnExtents(column,
 //                                    sx,
 //                                    overallMag,
 //                                    overallMagChanged);