# HG changeset patch
# User Chris Cannam
# Date 1160390986 0
# Node ID 5f9fdca0c7d80fe874234dc6f8472dda63be29cd
# Parent  209cf46e24137f4504ed0b160295d3d8f7e2c24c
* Some dull work to continue unifying the fft model and editable dense 3d model
  interfaces

diff -r 209cf46e2413 -r 5f9fdca0c7d8 document/SVFileReader.cpp
--- 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;
     }
 
diff -r 209cf46e2413 -r 5f9fdca0c7d8 transform/FeatureExtractionPluginTransform.cpp
--- 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);
     }
 }