Mercurial > hg > svcore
comparison data/model/Model.h @ 1074:b792ea8243be
Merge
author | Chris Cannam |
---|---|
date | Thu, 21 May 2015 16:38:52 +0100 |
parents | 882d448c8a6d |
children | 4d9816ba0ebe |
comparison
equal
deleted
inserted
replaced
1073:d4212687520e | 1074:b792ea8243be |
---|---|
218 virtual void toXml(QTextStream &stream, | 218 virtual void toXml(QTextStream &stream, |
219 QString indent = "", | 219 QString indent = "", |
220 QString extraAttributes = "") const; | 220 QString extraAttributes = "") const; |
221 | 221 |
222 virtual QString toDelimitedDataString(QString delimiter) const { | 222 virtual QString toDelimitedDataString(QString delimiter) const { |
223 return toDelimitedDataStringSubset(delimiter, getStartFrame(), getEndFrame()); | 223 return toDelimitedDataStringSubset |
224 (delimiter, getStartFrame(), getEndFrame() + 1); | |
224 } | 225 } |
225 virtual QString toDelimitedDataStringWithOptions(QString delimiter, DataExportOptions opts) const { | 226 virtual QString toDelimitedDataStringWithOptions(QString delimiter, DataExportOptions opts) const { |
226 return toDelimitedDataStringSubsetWithOptions(delimiter, opts, getStartFrame(), getEndFrame()); | 227 return toDelimitedDataStringSubsetWithOptions |
228 (delimiter, opts, getStartFrame(), getEndFrame() + 1); | |
227 } | 229 } |
228 virtual QString toDelimitedDataStringSubset(QString, sv_frame_t /* f0 */, sv_frame_t /* f1 */) const { | 230 virtual QString toDelimitedDataStringSubset(QString, sv_frame_t /* f0 */, sv_frame_t /* f1 */) const { |
229 return ""; | 231 return ""; |
230 } | 232 } |
231 virtual QString toDelimitedDataStringSubsetWithOptions(QString delimiter, DataExportOptions, sv_frame_t f0, sv_frame_t f1) const { | 233 virtual QString toDelimitedDataStringSubsetWithOptions(QString delimiter, DataExportOptions, sv_frame_t f0, sv_frame_t f1) const { |