comparison data/model/Model.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.

     void toXml(QTextStream &stream,
                QString indent = "",
                QString extraAttributes = "") const override;
 
     /**
-     * Emit a label for each column that would be written by
-     * toDelimitedDataString, separated by the given delimiter.
-     */
-    virtual QString getDelimitedDataHeaderLine(QString delimiter,
-                                               DataExportOptions options) const = 0;
-    
-    /**
-     * Emit the contents of the model within the given range to a
-     * delimited (e.g. comma-separated) data format.
-     */
-    virtual QString toDelimitedDataString(QString delimiter,
-                                          DataExportOptions options,
-                                          sv_frame_t startFrame,
-                                          sv_frame_t duration) const = 0;
+     * Return a label for each column that would be written by
+     * toStringExportRows.
+     */
+    virtual QVector<QString>
+    getStringExportHeaders(DataExportOptions options) const = 0;
+    
+    /**
+     * Emit events starting within the given range as string rows
+     * ready for conversion to an e.g. comma-separated data format.
+     */
+    virtual QVector<QVector<QString>>
+    toStringExportRows(DataExportOptions options,
+                       sv_frame_t startFrame,
+                       sv_frame_t duration) const = 0;
 
 signals:
     /**
      * Emitted when a model has been edited (or more data retrieved
      * from cache, in the case of a cached model that generates slowly)