Mercurial > hg > svapp
diff framework/SVFileReader.cpp @ 515:51befd6165a3 alignment-simple
Merge in from SV 3.0-integration branches
| author | Chris Cannam |
|---|---|
| date | Wed, 02 Mar 2016 17:25:27 +0000 |
| parents | aecd5bdfc71f |
| children | 150cadf9c5fe |
line wrap: on
line diff
--- a/framework/SVFileReader.cpp Mon Jun 15 09:15:55 2015 +0100 +++ b/framework/SVFileReader.cpp Wed Mar 02 17:25:27 2016 +0000 @@ -26,7 +26,7 @@ #include "data/fileio/FileFinder.h" -#include "data/model/WaveFileModel.h" +#include "data/model/ReadOnlyWaveFileModel.h" #include "data/model/EditableDenseThreeDimensionalModel.h" #include "data/model/SparseOneDimensionalModel.h" #include "data/model/SparseTimeValueModel.h" @@ -489,7 +489,7 @@ if (mm) rate = mm->getSampleRate(); } - model = new WaveFileModel(file, rate); + model = new ReadOnlyWaveFileModel(file, rate); if (!model->isOK()) { delete model; model = 0; @@ -1166,7 +1166,7 @@ for (QStringList::iterator i = data.begin(); i != data.end(); ++i) { - if (values.size() == (int)dtdm->getHeight()) { + if (int(values.size()) == dtdm->getHeight()) { if (!warned) { cerr << "WARNING: SV-XML: Too many y-bins in 3-D dataset row " << m_rowNumber << endl;