Mercurial > hg > sonic-visualiser
changeset 51:5f9fdca0c7d8
* Some dull work to continue unifying the fft model and editable dense 3d model
interfaces
author | Chris Cannam |
---|---|
date | Mon, 09 Oct 2006 10:49:46 +0000 (2006-10-09) |
parents | 209cf46e2413 |
children | 527598e2fa10 |
files | document/SVFileReader.cpp transform/FeatureExtractionPluginTransform.cpp |
diffstat | 2 files changed, 5 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/document/SVFileReader.cpp Fri Oct 06 16:53:25 2006 +0000 +++ b/document/SVFileReader.cpp Mon Oct 09 10:49:46 2006 +0000 @@ -843,11 +843,11 @@ if (dtdm) { QStringList data = text.split(m_datasetSeparator); - DenseThreeDimensionalModel::BinValueSet values; + DenseThreeDimensionalModel::Column values; for (QStringList::iterator i = data.begin(); i != data.end(); ++i) { - if (values.size() == dtdm->getYBinCount()) { + if (values.size() == dtdm->getHeight()) { if (!warned) { std::cerr << "WARNING: SV-XML: Too many y-bins in 3-D dataset row " << m_rowNumber << std::endl; @@ -866,9 +866,7 @@ } } - size_t windowStartFrame = m_rowNumber * dtdm->getResolution(); - - dtdm->setBinValues(windowStartFrame, values); + dtdm->setColumn(m_rowNumber, values); return true; }
--- a/transform/FeatureExtractionPluginTransform.cpp Fri Oct 06 16:53:25 2006 +0000 +++ b/transform/FeatureExtractionPluginTransform.cpp Mon Oct 09 10:49:46 2006 +0000 @@ -445,13 +445,13 @@ } else { - DenseThreeDimensionalModel::BinValueSet values = feature.values; + DenseThreeDimensionalModel::Column values = feature.values; EditableDenseThreeDimensionalModel *model = getOutput<EditableDenseThreeDimensionalModel>(); if (!model) return; - model->setBinValues(frame, values); + model->setColumn(frame / model->getResolution(), values); } }