comparison data/model/SparseModel.h @ 1074:b792ea8243be

Merge
author Chris Cannam
date Thu, 21 May 2015 16:38:52 +0100
parents 882d448c8a6d
children ed207f89aaef
comparison
equal deleted inserted replaced
1073:d4212687520e 1074:b792ea8243be
151 virtual void toXml(QTextStream &out, 151 virtual void toXml(QTextStream &out,
152 QString indent = "", 152 QString indent = "",
153 QString extraAttributes = "") const; 153 QString extraAttributes = "") const;
154 154
155 virtual QString toDelimitedDataString(QString delimiter) const { 155 virtual QString toDelimitedDataString(QString delimiter) const {
156 return toDelimitedDataStringWithOptions(delimiter, DataExportDefaults); 156 return toDelimitedDataStringWithOptions
157 (delimiter, DataExportDefaults);
157 } 158 }
158 159
159 virtual QString toDelimitedDataStringWithOptions(QString delimiter, 160 virtual QString toDelimitedDataStringWithOptions(QString delimiter,
160 DataExportOptions opts) const { 161 DataExportOptions opts) const {
161 return toDelimitedDataStringSubsetWithOptions 162 return toDelimitedDataStringSubsetWithOptions
162 (delimiter, opts, 163 (delimiter, opts,
163 std::min(getStartFrame(), sv_frame_t(0)), getEndFrame()); 164 std::min(getStartFrame(), sv_frame_t(0)), getEndFrame() + 1);
164 } 165 }
165 166
166 virtual QString toDelimitedDataStringSubset(QString delimiter, sv_frame_t f0, sv_frame_t f1) const { 167 virtual QString toDelimitedDataStringSubset(QString delimiter, sv_frame_t f0, sv_frame_t f1) const {
167 return toDelimitedDataStringSubsetWithOptions(delimiter, DataExportDefaults, f0, f1); 168 return toDelimitedDataStringSubsetWithOptions
169 (delimiter, DataExportDefaults, f0, f1);
168 } 170 }
169 171
170 virtual QString toDelimitedDataStringSubsetWithOptions(QString delimiter, DataExportOptions opts, sv_frame_t f0, sv_frame_t f1) const { 172 virtual QString toDelimitedDataStringSubsetWithOptions(QString delimiter, DataExportOptions opts, sv_frame_t f0, sv_frame_t f1) const {
171 if (opts & DataExportFillGaps) { 173 if (opts & DataExportFillGaps) {
172 return toDelimitedDataStringSubsetFilled(delimiter, opts, f0, f1); 174 return toDelimitedDataStringSubsetFilled(delimiter, opts, f0, f1);