comparison data/model/BoxModel.h @ 1835:804dd0c06f0e

Merge from branch sensible-delimited-data-strings

         options.levelAttributeName = "extent";
         
         m_events.toXml(out, indent, QString("dimensions=\"2\""), options);
     }
 
-    QString getDelimitedDataHeaderLine(QString delimiter,
-                                       DataExportOptions opts) const override {
+    QVector<QString>
+    getStringExportHeaders(DataExportOptions opts) const override {
+
         QStringList list;
 
         // These are considered API rather than human-readable text -
         // they shouldn't be translated
 

             list << "start" << "end";
         }
 
         list << "extent start" << "extent end" << "label";
 
-        return list.join(delimiter).toUpper();
-    }
-    
-    QString toDelimitedDataString(QString delimiter,
-                                  DataExportOptions opts,
-                                  sv_frame_t startFrame,
-                                  sv_frame_t duration) const override {
+        QVector<QString> sv;
+        for (QString s: list) {
+            sv.push_back(s.toUpper());
+        }
+        return sv;
+    }
+    
+    QVector<QVector<QString>>
+    toStringExportRows(DataExportOptions opts,
+                       sv_frame_t startFrame,
+                       sv_frame_t duration) const override {
 
         // We need a custom format here
 
         EventVector ee = m_events.getEventsSpanning(startFrame, duration);
 
-        QString s;
+        QVector<QVector<QString>> rows;
         
         for (auto e: ee) {
 
-            QStringList list;
+            QVector<QString> list;
 
             if (opts & DataExportWriteTimeInFrames) {
                 
                 list << QString("%1").arg(e.getFrame());
                 list << QString("%1").arg(e.getFrame() + e.getDuration());

             
             if (e.getLabel() != "") {
                 list << e.getLabel();
             }
 
-            s += list.join(delimiter) + "\n";
-        }
-
-        return s;
+            rows.push_back(list);
+        }
+
+        return rows;
     }
 
 protected:
     sv_samplerate_t m_sampleRate;
     int m_resolution;