Mercurial > hg > svcore
changeset 1126:39019ce29178 tony-2.0-integration
Merge through to branch for Tony 2.0
| author | Chris Cannam |
|---|---|
| date | Thu, 20 Aug 2015 14:54:21 +0100 |
| parents | e22bfe8ca248 (diff) 2c43f9904068 (current diff) |
| children | 815f82508f96 |
| files | data/fft/FFTCacheReader.h data/fft/FFTCacheStorageType.h data/fft/FFTCacheWriter.h data/fft/FFTDataServer.cpp data/fft/FFTDataServer.h data/fft/FFTFileCacheReader.cpp data/fft/FFTFileCacheReader.h data/fft/FFTFileCacheWriter.cpp data/fft/FFTFileCacheWriter.h data/fft/FFTMemoryCache.cpp data/fft/FFTMemoryCache.h data/fileio/CSVFileReader.cpp data/fileio/CSVFileReader.h data/fileio/FFTFuzzyAdapter.cpp data/fileio/FFTFuzzyAdapter.h data/model/SparseModel.h |
| diffstat | 4 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/data/fileio/CSVFileReader.cpp Thu Aug 20 13:33:46 2015 +0100 +++ b/data/fileio/CSVFileReader.cpp Thu Aug 20 14:54:21 2015 +0100 @@ -31,6 +31,7 @@ #include <QRegExp> #include <QStringList> #include <QTextStream> +#include <QIODevice> #include <iostream> #include <map>
--- a/data/fileio/CSVFileReader.h Thu Aug 20 13:33:46 2015 +0100 +++ b/data/fileio/CSVFileReader.h Thu Aug 20 14:54:21 2015 +0100 @@ -27,6 +27,7 @@ #include <QIODevice> class QFile; +class QIODevice; class CSVFileReader : public DataFileReader {
--- a/data/fileio/CSVFileWriter.cpp Thu Aug 20 13:33:46 2015 +0100 +++ b/data/fileio/CSVFileWriter.cpp Thu Aug 20 14:54:21 2015 +0100 @@ -68,7 +68,7 @@ .arg(temp.getTemporaryFilename()); return; } - + QTextStream out(&file); out << m_model->toDelimitedDataStringWithOptions (m_delimiter, m_options);
--- a/data/model/SparseModel.h Thu Aug 20 13:33:46 2015 +0100 +++ b/data/model/SparseModel.h Thu Aug 20 14:54:21 2015 +0100 @@ -181,7 +181,7 @@ } else { QString s; for (PointListConstIterator i = m_points.begin(); i != m_points.end(); ++i) { - if (i->frame >= f0 && i->frame < f1) { + if (i->frame >= f0 && i->frame <= f1) { s += i->toDelimitedDataString(delimiter, opts, m_sampleRate) + "\n"; } } @@ -559,8 +559,8 @@ QMutexLocker locker(&m_mutex); sv_frame_t f = 0; if (!m_points.empty()) { - PointListConstIterator i(m_points.end()); - f = (--i)->frame; + PointListConstIterator i(m_points.end()); + f = (--i)->frame; } if (m_extendTo > f) return m_extendTo; else return f;