diff layer/Colour3DPlotRenderer.h @ 1374:631897ba9fca zoom

Merge from default branch

--- a/layer/Colour3DPlotRenderer.h	Fri Oct 05 10:25:52 2018 +0100
+++ b/layer/Colour3DPlotRenderer.h	Tue Nov 06 08:59:03 2018 +0000
@@ -67,6 +67,7 @@
             alwaysOpaque(false),
             interpolate(false),
             invertVertical(false),
+            showDerivative(false),
             scaleFactor(1.0),
             colourRotation(0) { }
 
@@ -100,6 +101,10 @@
         /** Whether to render the whole caboodle upside-down. */
         bool invertVertical;
 
+        /** Whether to show the frame-to-frame difference instead of
+         *  the actual value */
+        bool showDerivative;
+
         /** Initial scale factor (e.g. for FFT scaling). This factor
          *  is applied to all values read from the underlying model
          *  *before* magnitude ranges are calculated, in contrast to
@@ -319,6 +324,8 @@
     
     ColumnOp::Column getColumn(int sx, int minbin, int nbins,
                                int peakCacheIndex) const; // -1 => don't use cache
+    ColumnOp::Column getColumnRaw(int sx, int minbin, int nbins,
+                                  int peakCacheIndex) const; // -1 => don't use cache
 
     void getPreferredPeakCache(const LayerGeometryProvider *,
                                int &peakCacheIndex, int &binsPerPeak) const;