Mercurial > hg > svcore
comparison data/model/DenseTimeValueModel.cpp @ 1527:710e6250a401 zoom
Merge from default branch
author | Chris Cannam |
---|---|
date | Mon, 17 Sep 2018 13:51:14 +0100 |
parents | 0d4f1fcad97a |
children | 0d89abd631ac |
comparison
equal
deleted
inserted
replaced
1324:d4a28d1479a8 | 1527:710e6250a401 |
---|---|
25 | 25 |
26 DenseTimeValueModel::~DenseTimeValueModel() | 26 DenseTimeValueModel::~DenseTimeValueModel() |
27 { | 27 { |
28 PlayParameterRepository::getInstance()->removePlayable(this); | 28 PlayParameterRepository::getInstance()->removePlayable(this); |
29 } | 29 } |
30 | 30 |
31 QString | 31 QString |
32 DenseTimeValueModel::toDelimitedDataStringSubset(QString delimiter, sv_frame_t f0, sv_frame_t f1) const | 32 DenseTimeValueModel::toDelimitedDataStringSubset(QString delimiter, sv_frame_t f0, sv_frame_t f1) const |
33 { | 33 { |
34 int ch = getChannelCount(); | 34 int ch = getChannelCount(); |
35 | 35 |
36 cerr << "f0 = " << f0 << ", f1 = " << f1 << endl; | 36 // cerr << "f0 = " << f0 << ", f1 = " << f1 << endl; |
37 | 37 |
38 if (f1 <= f0) return ""; | 38 if (f1 <= f0) return ""; |
39 | 39 |
40 auto data = getMultiChannelData(0, ch - 1, f0, f1 - f0); | 40 auto data = getMultiChannelData(0, ch - 1, f0, f1 - f0); |
41 | 41 |