comparison layer/Colour3DPlotExporter.cpp @ 1593:32171776fcc9 sensible-delimited-data-strings

Switch to the StringExport api now found in svcore

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

     
         nbins = layer->getIBinForY(provider, 0) - minbin + 1;
         if (minbin + nbins > sh) nbins = sh - minbin;
     }
 
-    QStringList list;
+    QVector<QString> headers;
 
     if (opts & DataExportAlwaysIncludeTimestamp) {
         if (opts & DataExportWriteTimeInFrames) {
-            list << "FRAME";
+            headers << "FRAME";
         } else {
-            list << "TIME";
+            headers << "TIME";
         }
     }
     
     if (m_params.binDisplay == BinDisplay::PeakFrequencies) {
         for (int i = 0; i < nbins/4; ++i) {
-            list << QString("FREQ %1").arg(i+1)
+            headers << QString("FREQ %1").arg(i+1)
                  << QString("MAG %1").arg(i+1);
         }
     } else {
         bool hasValues = model->hasBinValues();
         QString unit = (hasValues ? model->getBinValueUnit() : "");

                 } else {
                     name = QString("BIN %1")
                         .arg(i+1);
                 }
             }
-            list << name;
-        }
-    }
-
-    return list.join(delimiter);
-}
-
-QString
-Colour3DPlotExporter::toDelimitedDataString(QString delimiter,
-                                            DataExportOptions opts,
-                                            sv_frame_t startFrame,
-                                            sv_frame_t duration) const
+            headers << name;
+        }
+    }
+
+    return headers;
+}
+
+QVector<QVector<QString>>
+Colour3DPlotExporter::toStringExportRows(DataExportOptions opts,
+                                         sv_frame_t startFrame,
+                                         sv_frame_t duration) const
 {
     QMutexLocker locker(&m_mutex);
 
     BinDisplay binDisplay = m_params.binDisplay;
 

         if (minbin + nbins > sh) nbins = sh - minbin;
     }
 
     int w = model->getWidth();
 
-    QString s;
+    QVector<QVector<QString>> rows;
     
     for (int i = 0; i < w; ++i) {
         
         sv_frame_t fr = model->getStartFrame() + i * model->getResolution();
         if (fr < startFrame || fr >= startFrame + duration) {

                                   column.data() + minbin + nbins);
 
         // The scale factor is always applied
         column = ColumnOp::applyGain(column, m_params.scaleFactor);
         
-        QStringList list;
-
+        QVector<QString> row;
+ 
         if (opts & DataExportAlwaysIncludeTimestamp) {
             if (opts & DataExportWriteTimeInFrames) {
-                list << QString("%1").arg(fr);
+                row << QString("%1").arg(fr);
             } else {
-                list << RealTime::frame2RealTime(fr, model->getSampleRate())
+                row << RealTime::frame2RealTime(fr, model->getSampleRate())
                     .toString().c_str();
             }
         }
         
         if (binDisplay == BinDisplay::PeakFrequencies) {

                 }
 
                 double freq = p.second;
                 double value = column[bin - minbin];
                 
-                list << QString("%1").arg(freq) << QString("%1").arg(value);
+                row << QString("%1").arg(freq) << QString("%1").arg(value);
             }
 
         } else {
         
             if (binDisplay == BinDisplay::PeakBins) {
                 column = ColumnOp::peakPick(column);
             }
         
             for (auto value: column) {
-                list << QString("%1").arg(value);
-            }
-        }
-
-        if (!list.empty()) {
-            s += list.join(delimiter) + "\n";
-        }
-    }
-
-    return s;
-}
-
+                row << QString("%1").arg(value);
+            }
+        }
+
+        if (!row.empty()) {
+            rows.push_back(row);
+        }
+    }
+
+    return rows;
+}
+