comparison data/model/TextModel.h @ 1833:21c792334c2e sensible-delimited-data-strings

Rewrite all the DelimitedDataString stuff so as to return vectors of individual cell strings rather than having the classes add the delimiters themselves. Rename accordingly to names based on StringExport. Take advantage of this in the CSV writer code so as to properly quote cells that contain delimiter characters.

         options.valueAttributeName = "height";
         
         m_events.toXml(out, indent, QString("dimensions=\"2\""), options);
     }
 
-    QString getDelimitedDataHeaderLine(QString delimiter,
-                                       DataExportOptions options) const override {
+    QVector<QString>
+    getStringExportHeaders(DataExportOptions options) const override {
         Event::ExportNameOptions nameOpts;
         nameOpts.valueAttributeName = "height";
-        return m_events.getDelimitedDataHeaderLine(delimiter,
-                                                   options,
-                                                   nameOpts);
-    }
-    
-    QString toDelimitedDataString(QString delimiter,
-                                  DataExportOptions options,
-                                  sv_frame_t startFrame,
-                                  sv_frame_t duration) const override {
-        return m_events.toDelimitedDataString(delimiter,
-                                              options,
-                                              startFrame,
-                                              duration,
-                                              m_sampleRate,
-                                              m_resolution,
-                                              Event().withValue(0.f));
+        return m_events.getStringExportHeaders(options, nameOpts);
+    }
+    
+    QVector<QVector<QString>>
+    toStringExportRows(DataExportOptions options,
+                       sv_frame_t startFrame,
+                       sv_frame_t duration) const override {
+        return m_events.toStringExportRows(options,
+                                           startFrame,
+                                           duration,
+                                           m_sampleRate,
+                                           m_resolution,
+                                           Event().withValue(0.f));
     }
   
 protected:
     sv_samplerate_t m_sampleRate;
     int m_resolution;