comparison layer/Colour3DPlotRenderer.h @ 1163:ab169938832a 3.0-integration

Use peak cache at one zoom level lower (since it exists at that level already -- this is a >= vs > question) + make naming more uniform

 
 class Colour3DPlotRenderer
 {
 public:
     struct Sources {
-        Sources() : verticalBinLayer(0), source(0), peaks(0), fft(0) { }
+        Sources() : verticalBinLayer(0), source(0), peakCache(0), fft(0) { }
         
         // These must all outlive this class
         const VerticalBinLayer *verticalBinLayer;  // always
 	const DenseThreeDimensionalModel *source;  // always
-	const Dense3DModelPeakCache *peaks;        // optionally
+	const Dense3DModelPeakCache *peakCache;    // optionally
 	const FFTModel *fft;                       // optionally
     };        
 
     struct Parameters {
 	Parameters() :

                                     int repaintWidth);
 
     int renderDrawBuffer(int w, int h,
                          const std::vector<int> &binforx,
                          const std::vector<double> &binfory,
-                         bool usePeaksCache,
+                         bool usePeakCache,
                          bool rightToLeft,
                          bool timeConstrained);
 
     int renderDrawBufferPeakFrequencies(const LayerGeometryProvider *v,
                                         int w, int h,

     };
 
     RenderType decideRenderType(const LayerGeometryProvider *) const;
 
     ColumnOp::Column getColumn(int sx, int minbin, int nbins,
-                               bool usePeaksCache) const;
+                               bool usePeakCache) const;
 };
 
 #endif