Mercurial > hg > svcore
comparison data/fileio/CSVFileReader.cpp @ 152:21792a550ec9 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
author | Chris Cannam |
---|---|
date | Mon, 31 Jul 2006 17:05:18 +0000 |
parents | 4b2ea82fd0ed |
children | f75f8a1cd7b1 |
comparison
equal
deleted
inserted
replaced
151:3c1d5ef43baa | 152:21792a550ec9 |
---|---|
17 | 17 |
18 #include "model/Model.h" | 18 #include "model/Model.h" |
19 #include "base/RealTime.h" | 19 #include "base/RealTime.h" |
20 #include "model/SparseOneDimensionalModel.h" | 20 #include "model/SparseOneDimensionalModel.h" |
21 #include "model/SparseTimeValueModel.h" | 21 #include "model/SparseTimeValueModel.h" |
22 #include "model/DenseThreeDimensionalModel.h" | 22 #include "model/EditableDenseThreeDimensionalModel.h" |
23 | 23 |
24 #include <QFile> | 24 #include <QFile> |
25 #include <QString> | 25 #include <QString> |
26 #include <QRegExp> | 26 #include <QRegExp> |
27 #include <QStringList> | 27 #include <QStringList> |
110 } | 110 } |
111 } | 111 } |
112 | 112 |
113 SparseOneDimensionalModel *model1 = 0; | 113 SparseOneDimensionalModel *model1 = 0; |
114 SparseTimeValueModel *model2 = 0; | 114 SparseTimeValueModel *model2 = 0; |
115 DenseThreeDimensionalModel *model3 = 0; | 115 EditableDenseThreeDimensionalModel *model3 = 0; |
116 Model *model = 0; | 116 Model *model = 0; |
117 | 117 |
118 QTextStream in(m_file); | 118 QTextStream in(m_file); |
119 in.seek(0); | 119 in.seek(0); |
120 | 120 |
147 false); | 147 false); |
148 model = model2; | 148 model = model2; |
149 break; | 149 break; |
150 | 150 |
151 case CSVFormatDialog::ThreeDimensionalModel: | 151 case CSVFormatDialog::ThreeDimensionalModel: |
152 model3 = new DenseThreeDimensionalModel(sampleRate, windowSize, | 152 model3 = new EditableDenseThreeDimensionalModel(sampleRate, |
153 list.size()); | 153 windowSize, |
154 list.size()); | |
154 model = model3; | 155 model = model3; |
155 break; | 156 break; |
156 } | 157 } |
157 } | 158 } |
158 | 159 |