comparison layer/Colour3DPlotRenderer.cpp @ 1123:343887ac6766 spectrogram-minor-refactor

Some tidying

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

     if (renderType == DirectTranslucent) {
         MagnitudeRange range = renderDirectTranslucent(v, paint, rect);
         return { rect, range };
     }
     
+#ifdef DEBUG_COLOUR_PLOT_REPAINT
     cerr << "cache start " << m_cache.getStartFrame()
          << " valid left " << m_cache.getValidLeft()
          << " valid right " << m_cache.getValidRight()
          << endl;
     cerr << " view start " << startFrame
          << " x0 " << x0
          << " x1 " << x1
          << endl;
+#endif
     
     if (m_cache.isValid()) { // some part of the cache is valid
 
         if (v->getXForFrame(m_cache.getStartFrame()) ==
             v->getXForFrame(startFrame) &&
             m_cache.getValidLeft() <= x0 &&
             m_cache.getValidRight() >= x1) {
 
+#ifdef DEBUG_COLOUR_PLOT_REPAINT
             cerr << "cache hit" << endl;
+#endif
             
             // cache is valid for the complete requested area
             paint.drawImage(rect, m_cache.getImage(), rect);
 
-            //!!! a dev debug check
-            if (!m_magCache.areColumnsSet(x0, x1 - x0)) {
-                cerr << "NB 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 {
+#ifdef DEBUG_COLOUR_PLOT_REPAINT
             cerr << "cache partial hit" << endl;
+#endif
             
             // 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);

 
     MagnitudeRange range = m_magCache.getRange(reqx0, reqx1 - reqx0);
     
     return { pr, range };
 
-    //!!! todo: timing/incomplete paint
-
-    //!!! todo: peak frequency style
-
-    //!!! todo: transparent style from Colour3DPlot
-
-    //!!! todo: view magnitudes / normalise visible area
-
-    //!!! todo: alter documentation for view mag stuff (cached paints
-    //!!! do not update MagnitudeRange)
-
     //!!! todo, here or in caller: illuminateLocalFeatures
 
-    //!!! todo: colourmap rotation
+    //!!! todo: handle vertical range other than full range of column
     
     //!!! fft model scaling?
-    
-    //!!! should we own the Dense3DModelPeakCache here? or should it persist
 }
 
 Colour3DPlotRenderer::RenderType
 Colour3DPlotRenderer::decideRenderType(const LayerGeometryProvider *v) const
 {

             // get column -> scale -> record extents ->
             // normalise -> peak pick -> apply display gain ->
             // distribute/interpolate
 
             ColumnOp::Column fullColumn = model->getColumn(sx);
-
-//                cerr << "x " << x << ", sx " << sx << ", col height " << fullColumn.size()
-//                     << ", minbin " << minbin << ", maxbin " << maxbin << endl;
                 
             ColumnOp::Column column =
                 vector<float>(fullColumn.data() + minbin,
                               fullColumn.data() + maxbin + 1);
 
             magRange.sample(column);
 
 //!!! fft scale                if (m_colourScale != ColourScaleType::Phase) {
 //                    column = ColumnOp::fftScale(column, m_fftSize);
 //                }
-
-//!!! extents                recordColumnExtents(column,
-//                                    sx,
-//                                    overallMag,
-//                                    overallMagChanged);
 
 //                if (m_colourScale != ColourScaleType::Phase) {
             preparedColumn = ColumnOp::normalize(column, m_params.normalization);
 //                }
 

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

         vector<float> pixelPeakColumn;
         MagnitudeRange magRange;
         
         for (int sx = sx0; sx < sx1; ++sx) {
 
-#ifdef DEBUG_SPECTROGRAM_REPAINT
+#ifdef DEBUG_COLOUR_PLOT_REPAINT
             cerr << "sx = " << sx << endl;
 #endif
 
             if (sx < 0 || sx >= modelWidth) {
                 continue;

 //!!! fft scale                if (m_colourScale != ColourScaleType::Phase) {
 //                    column = ColumnOp::fftScale(column, m_fftSize);
 //                }
 
                 magRange.sample(column);
-                
-//!!! extents                recordColumnExtents(column,
-//                                    sx,
-//                                    overallMag,
-//                                    overallMagChanged);
 
 //                if (m_colourScale != ColourScaleType::Phase) {
                     column = ColumnOp::normalize(column, m_params.normalization);
 //                }
 

                 
 //!!! fft scale                if (m_colourScale != ColourScaleType::Phase) {
 //                    column = ColumnOp::fftScale(column, getFFTSize());
 //                }
 
-//!!! extents                recordColumnExtents(column,
-//                                    sx,
-//                                    overallMag,
-//                                    overallMagChanged);
-
 //!!!                if (m_colourScale != ColourScaleType::Phase) {
                     column = ColumnOp::normalize(column, m_params.normalization);
 //!!!                }
 
                     preparedColumn = column;