comparison data/model/NoteModel.h @ 1062:1ec57a28e924 tonioni

Merge
author Chris Cannam
date Tue, 31 Mar 2015 10:39:54 +0100
parents 57633d605547
children 48e9f538e6e9
comparison
equal deleted inserted replaced
1061:c1e43c8d2527 1062:1ec57a28e924
60 QString("%1<point frame=\"%2\" value=\"%3\" duration=\"%4\" level=\"%5\" label=\"%6\" %7/>\n") 60 QString("%1<point frame=\"%2\" value=\"%3\" duration=\"%4\" level=\"%5\" label=\"%6\" %7/>\n")
61 .arg(indent).arg(frame).arg(value).arg(duration).arg(level) 61 .arg(indent).arg(frame).arg(value).arg(duration).arg(level)
62 .arg(XmlExportable::encodeEntities(label)).arg(extraAttributes); 62 .arg(XmlExportable::encodeEntities(label)).arg(extraAttributes);
63 } 63 }
64 64
65 QString toDelimitedDataString(QString delimiter, sv_samplerate_t sampleRate) const 65 QString toDelimitedDataString(QString delimiter, DataExportOptions opts, sv_samplerate_t sampleRate) const {
66 {
67 QStringList list; 66 QStringList list;
68 list << RealTime::frame2RealTime(frame, sampleRate).toString().c_str(); 67 list << RealTime::frame2RealTime(frame, sampleRate).toString().c_str();
69 list << QString("%1").arg(value); 68 list << QString("%1").arg(value);
70 list << RealTime::frame2RealTime(duration, sampleRate).toString().c_str(); 69 list << RealTime::frame2RealTime(duration, sampleRate).toString().c_str();
71 list << QString("%1").arg(level); 70 if (!(opts & DataExportOmitLevels)) {
71 list << QString("%1").arg(level);
72 }
72 if (label != "") list << label; 73 if (label != "") list << label;
73 return list.join(delimiter); 74 return list.join(delimiter);
74 } 75 }
75 76
76 struct Comparator { 77 struct Comparator {