comparison layer/Colour3DPlotRenderer.h @ 1094:8a815776151c spectrogram-minor-refactor

Split out cache rendering functions and some fixes to calculations

 	    colourScale(ColourScale::Parameters()),
 	    normalization(ColumnOp::NoNormalization),
 	    binDisplay(AllBins),
             binScale(LinearBinScale),
 	    alwaysOpaque(false),
-            interpolate(false),
+            interpolate(false), //!!! separate out x-interpolate and y-interpolate? the spectrogram actually does (or used to)
             invertVertical(false) { }
 
 	ColourScale colourScale;       // complete ColourScale object by value
 	ColumnOp::Normalization normalization;
 	BinDisplay binDisplay;

     // carried out by repainting to cache (via the draw buffer) any
     // area that is being requested but is not valid in the cache, and
     // then repainting from cache to the requested painter.
     ScrollableImageCache m_cache;
 
+    bool useBinResolutionForDrawBuffer(LayerGeometryProvider *) const;
+
     RenderResult render(LayerGeometryProvider *v,
                         QPainter &paint, QRect rect, bool timeConstrained);
-    void renderToCache(LayerGeometryProvider *v, int x0, int repaintWidth,
-                       bool rightToLeft, bool timeConstrained);
+    void renderToCachePixelResolution(LayerGeometryProvider *v, int x0,
+                                      int repaintWidth, bool rightToLeft,
+                                      bool timeConstrained);
+    void renderToCacheBinResolution(LayerGeometryProvider *v, int x0,
+                                    int repaintWidth);
     int renderDrawBuffer(int w, int h,
                          const std::vector<int> &binforx,
                          const std::vector<double> &binfory,
                          bool usePeaksCache,
                          bool rightToLeft,