diff layer/Colour3DPlotExporter.h @ 1569:b33b0b06133e

Merge from branch csv-export-dialog

--- a/layer/Colour3DPlotExporter.h	Tue Jan 14 13:19:18 2020 +0000
+++ b/layer/Colour3DPlotExporter.h	Tue Jan 14 15:48:44 2020 +0000
@@ -31,20 +31,13 @@
         const LayerGeometryProvider *provider; // optionally
     };
 
-    enum class TimestampFormat {
-        None,
-        Seconds,
-        Frames
-    };
-
     struct Parameters {
         Parameters() :
             binDisplay(BinDisplay::AllBins),
             scaleFactor(1.0),
             threshold(0.0),
             gain(1.0),
-            normalization(ColumnNormalization::None),
-            timestampFormat(TimestampFormat::None) { }
+            normalization(ColumnNormalization::None) { }
 
         /** Selection of bins to include in the export. */
         BinDisplay binDisplay;
@@ -70,10 +63,6 @@
          *  calculate thresholding level. The exported values are
          *  un-normalized. */
         ColumnNormalization normalization;
-
-        /** Format to use for the timestamp column. If None, no
-         *  timestamp column will be included. */
-        TimestampFormat timestampFormat;
     };
     
     Colour3DPlotExporter(Sources sources, Parameters parameters);