Mercurial > hg > svcore

diff data/fileio/CSVFileReader.cpp @ 152:21792a550ec9 last-cc-copyright

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Move the current DenseThreeDimensionalModel to EditableDenseThreeDimensionalModel (wow!), and make DTDM an abstract base * Move FFTFuzzyAdapter to FFTModel as a new subclass of DTDM
author Chris Cannam
date Mon, 31 Jul 2006 17:05:18 +0000
parents 4b2ea82fd0ed
children f75f8a1cd7b1
line wrap: on
line diff
--- a/data/fileio/CSVFileReader.cpp	Mon Jul 31 16:15:45 2006 +0000
+++ b/data/fileio/CSVFileReader.cpp	Mon Jul 31 17:05:18 2006 +0000
@@ -19,7 +19,7 @@
 #include "base/RealTime.h"
 #include "model/SparseOneDimensionalModel.h"
 #include "model/SparseTimeValueModel.h"
-#include "model/DenseThreeDimensionalModel.h"
+#include "model/EditableDenseThreeDimensionalModel.h"
 
 #include <QFile>
 #include <QString>
@@ -112,7 +112,7 @@
 
     SparseOneDimensionalModel *model1 = 0;
     SparseTimeValueModel *model2 = 0;
-    DenseThreeDimensionalModel *model3 = 0;
+    EditableDenseThreeDimensionalModel *model3 = 0;
     Model *model = 0;
 
     QTextStream in(m_file);
@@ -149,8 +149,9 @@
 		break;
 		
 	    case CSVFormatDialog::ThreeDimensionalModel:
-		model3 = new DenseThreeDimensionalModel(sampleRate, windowSize,
-							list.size());
+		model3 = new EditableDenseThreeDimensionalModel(sampleRate,
+                                                                windowSize,
+                                                                list.size());
 		model = model3;
 		break;
 	    }