comparison document/SVFileReader.cpp @ 3:e764bbf2b090 last-cc-copyright

* Move the current DenseThreeDimensionalModel to EditableDenseThreeDimensionalModel
  (wow!), and make DTDM an abstract base
* Move FFTFuzzyAdapter to FFTModel as a new subclass of DTDM

 #include "base/PlayParameterRepository.h"
 
 #include "data/fileio/AudioFileReaderFactory.h"
 
 #include "data/model/WaveFileModel.h"
-#include "data/model/DenseThreeDimensionalModel.h"
+#include "data/model/EditableDenseThreeDimensionalModel.h"
 #include "data/model/SparseOneDimensionalModel.h"
 #include "data/model/SparseTimeValueModel.h"
 #include "data/model/NoteModel.h"
 #include "data/model/TextModel.h"
 

 	if (dimensions == 3) {
 	    
 	    READ_MANDATORY(int, windowSize, toInt);
 	    READ_MANDATORY(int, yBinCount, toInt);
 	    
-	    DenseThreeDimensionalModel *model =
-		new DenseThreeDimensionalModel(sampleRate, windowSize, yBinCount);
+            EditableDenseThreeDimensionalModel *model =
+		new EditableDenseThreeDimensionalModel
+                (sampleRate, windowSize, yBinCount);
 	    
 	    float minimum = attributes.value("minimum").trimmed().toFloat(&ok);
 	    if (ok) model->setMinimumLevel(minimum);
 	    
 	    float maximum = attributes.value("maximum").trimmed().toFloat(&ok);

 	else if (dynamic_cast<TextModel *>(model)) good = true;
 	break;
 
     case 3:
 	if (dynamic_cast<NoteModel *>(model)) good = true;
-	else if (dynamic_cast<DenseThreeDimensionalModel *>(model)) {
+	else if (dynamic_cast<EditableDenseThreeDimensionalModel *>(model)) {
 	    m_datasetSeparator = attributes.value("separator");
 	    good = true;
 	}
 	break;
     }

 }
 
 bool
 SVFileReader::addBinToDataset(const QXmlAttributes &attributes)
 {
-    DenseThreeDimensionalModel *dtdm = dynamic_cast<DenseThreeDimensionalModel *>
+    EditableDenseThreeDimensionalModel *dtdm = 
+        dynamic_cast<EditableDenseThreeDimensionalModel *>
 	(m_currentDataset);
 
     if (dtdm) {
 
 	bool ok = false;

 }
 
 bool
 SVFileReader::readRowData(const QString &text)
 {
-    DenseThreeDimensionalModel *dtdm = dynamic_cast<DenseThreeDimensionalModel *>
+    EditableDenseThreeDimensionalModel *dtdm =
+        dynamic_cast<EditableDenseThreeDimensionalModel *>
 	(m_currentDataset);
 
     bool warned = false;
 
     if (dtdm) {

 	    } else {
 		values.push_back(value);
 	    }
 	}
 
-	size_t windowStartFrame = m_rowNumber * dtdm->getWindowSize();
+	size_t windowStartFrame = m_rowNumber * dtdm->getResolution();
 
 	dtdm->setBinValues(windowStartFrame, values);
 	return true;
     }