Mercurial > hg > easaier-soundaccess
comparison data/fileio/ModelReader.cpp @ 53:4eb9c7e4acf6
DenseThreeDimensionalModel no more used, use instead EditableDenseThreeDimensionalModel
author | lbajardsilogic |
---|---|
date | Wed, 16 May 2007 12:12:44 +0000 |
parents | 11e298cdb9e7 |
children | e006f4a57f86 |
comparison
equal
deleted
inserted
replaced
52:51fd00eae624 | 53:4eb9c7e4acf6 |
---|---|
238 { | 238 { |
239 | 239 |
240 READ_MANDATORY(int, windowSize, toInt); | 240 READ_MANDATORY(int, windowSize, toInt); |
241 READ_MANDATORY(int, yBinCount, toInt); | 241 READ_MANDATORY(int, yBinCount, toInt); |
242 | 242 |
243 //DenseThreeDimensionalModel *model = | |
244 //new DenseThreeDimensionalModel(sampleRate, windowSize, yBinCount); | |
245 | |
246 EditableDenseThreeDimensionalModel *model = | 243 EditableDenseThreeDimensionalModel *model = |
247 new EditableDenseThreeDimensionalModel(sampleRate, windowSize, yBinCount); | 244 new EditableDenseThreeDimensionalModel(sampleRate, windowSize, yBinCount); |
248 | 245 |
249 float minimum = attributes.value("minimum").trimmed().toFloat(&ok); | 246 float minimum = attributes.value("minimum").trimmed().toFloat(&ok); |
250 if (ok) model->setMinimumLevel(minimum); | 247 if (ok) model->setMinimumLevel(minimum); |
351 else if (dynamic_cast<TextModel *>(model)) good = true; | 348 else if (dynamic_cast<TextModel *>(model)) good = true; |
352 break; | 349 break; |
353 | 350 |
354 case 3: | 351 case 3: |
355 if (dynamic_cast<NoteModel *>(model)) good = true; | 352 if (dynamic_cast<NoteModel *>(model)) good = true; |
356 else if (dynamic_cast<DenseThreeDimensionalModel *>(model)) { | 353 else if (dynamic_cast<EditableDenseThreeDimensionalModel *>(model)) { |
357 m_datasetSeparator = attributes.value("separator"); | 354 m_datasetSeparator = attributes.value("separator"); |
358 good = true; | 355 good = true; |
359 } | 356 } |
360 else if (dynamic_cast<IntervalModel *>(model)) good = true; | 357 else if (dynamic_cast<IntervalModel *>(model)) good = true; |
361 break; | 358 break; |
428 return false; | 425 return false; |
429 } | 426 } |
430 | 427 |
431 bool ModelHandler::addBinToDataset(const QXmlAttributes &attributes) | 428 bool ModelHandler::addBinToDataset(const QXmlAttributes &attributes) |
432 { | 429 { |
433 //DenseThreeDimensionalModel *dtdm = dynamic_cast<DenseThreeDimensionalModel *> (m_model); | 430 EditableDenseThreeDimensionalModel *dtdm = dynamic_cast<EditableDenseThreeDimensionalModel *>(m_model); |
434 EditableDenseThreeDimensionalModel *dtdm = dynamic_cast<EditableDenseThreeDimensionalModel *>(m_model); | |
435 | 431 |
436 if (dtdm) { | 432 if (dtdm) { |
437 | 433 |
438 bool ok = false; | 434 bool ok = false; |
439 int n = attributes.value("number").trimmed().toInt(&ok); | 435 int n = attributes.value("number").trimmed().toInt(&ok); |