comparison layer/Colour3DPlotExporter.cpp @ 1568:3943553b95b0 csv-export-dialog

Add CSV export dialog, + associated supporting changes

     m_sources.provider = nullptr;
 }
 
 QString
 Colour3DPlotExporter::getDelimitedDataHeaderLine(QString delimiter,
-                                                 DataExportOptions) const
+                                                 DataExportOptions opts) const
 {
     auto model =
         ModelById::getAs<DenseThreeDimensionalModel>(m_sources.source);
     
     auto layer = m_sources.verticalBinLayer;

         if (minbin + nbins > sh) nbins = sh - minbin;
     }
 
     QStringList list;
 
-    switch (m_params.timestampFormat) {
-    case TimestampFormat::None:
-        break;
-    case TimestampFormat::Frames:
-        list << "FRAME";
-        break;
-    case TimestampFormat::Seconds:
-        list << "TIME";
-        break;
+    if (opts & DataExportAlwaysIncludeTimestamp) {
+        if (opts & DataExportWriteTimeInFrames) {
+            list << "FRAME";
+        } else {
+            list << "TIME";
+        }
     }
     
     if (m_params.binDisplay == BinDisplay::PeakFrequencies) {
         for (int i = 0; i < nbins/4; ++i) {
             list << QString("FREQ %1").arg(i+1)

     return list.join(delimiter);
 }
 
 QString
 Colour3DPlotExporter::toDelimitedDataString(QString delimiter,
-                                            DataExportOptions,
+                                            DataExportOptions opts,
                                             sv_frame_t startFrame,
                                             sv_frame_t duration) const
 {
     QMutexLocker locker(&m_mutex);
 

         // The scale factor is always applied
         column = ColumnOp::applyGain(column, m_params.scaleFactor);
         
         QStringList list;
 
-        switch (m_params.timestampFormat) {
-        case TimestampFormat::None:
-            break;
-        case TimestampFormat::Frames:
-            list << QString("%1").arg(fr);
-            break;
-        case TimestampFormat::Seconds:
-            list << RealTime::frame2RealTime(fr, model->getSampleRate())
-                .toString().c_str();
-            break;
+        if (opts & DataExportAlwaysIncludeTimestamp) {
+            if (opts & DataExportWriteTimeInFrames) {
+                list << QString("%1").arg(fr);
+            } else {
+                list << RealTime::frame2RealTime(fr, model->getSampleRate())
+                    .toString().c_str();
+            }
         }
         
         if (binDisplay == BinDisplay::PeakFrequencies) {
             
             FFTModel::PeakSet peaks = fftModel->getPeakFrequencies