Mercurial > hg > svcore
comparison data/model/NoteModel.h @ 1824:1cd161242250
Merge
| author | Chris Cannam | 
|---|---|
| date | Tue, 28 Jan 2020 14:34:13 +0000 | 
| parents | c546429d4c2f | 
| children | 21c792334c2e | 
   comparison
  equal
  deleted
  inserted
  replaced
| 1823:07a8793a0388 | 1824:1cd161242250 | 
|---|---|
| 195 EventSeries::Direction direction, | 195 EventSeries::Direction direction, | 
| 196 Event &found) const { | 196 Event &found) const { | 
| 197 return m_events.getNearestEventMatching | 197 return m_events.getNearestEventMatching | 
| 198 (startSearchAt, predicate, direction, found); | 198 (startSearchAt, predicate, direction, found); | 
| 199 } | 199 } | 
| 200 int getIndexForEvent(const Event &e) { | |
| 201 return m_events.getIndexForEvent(e); | |
| 202 } | |
| 200 | 203 | 
| 201 /** | 204 /** | 
| 202 * Editing methods. | 205 * Editing methods. | 
| 203 */ | 206 */ | 
| 204 void add(Event e) override { | 207 void add(Event e) override { | 
| 403 .arg(extraAttributes)); | 406 .arg(extraAttributes)); | 
| 404 | 407 | 
| 405 m_events.toXml(out, indent, QString("dimensions=\"3\"")); | 408 m_events.toXml(out, indent, QString("dimensions=\"3\"")); | 
| 406 } | 409 } | 
| 407 | 410 | 
| 411 QString getDelimitedDataHeaderLine(QString delimiter, | |
| 412 DataExportOptions options) const override { | |
| 413 return m_events.getDelimitedDataHeaderLine(delimiter, | |
| 414 options, | |
| 415 Event::ExportNameOptions()); | |
| 416 } | |
| 417 | |
| 408 QString toDelimitedDataString(QString delimiter, | 418 QString toDelimitedDataString(QString delimiter, | 
| 409 DataExportOptions options, | 419 DataExportOptions options, | 
| 410 sv_frame_t startFrame, | 420 sv_frame_t startFrame, | 
| 411 sv_frame_t duration) const override { | 421 sv_frame_t duration) const override { | 
| 412 return m_events.toDelimitedDataString | 422 return m_events.toDelimitedDataString | 
