Mercurial > hg > svcore
comparison data/fileio/CSVFileReader.cpp @ 1643:7a23dfe65d66 single-point
Update NoteModel to use EventSeries. This is incomplete and won't provide enough to update svgui for it yet; must also refactor to avoid duplication of nasty APIs when updating the rest of the models
author | Chris Cannam |
---|---|
date | Wed, 13 Mar 2019 14:50:10 +0000 |
parents | 70e172e6cc59 |
children | 513192aa9b03 |
comparison
equal
deleted
inserted
replaced
1642:d591836e47ef | 1643:7a23dfe65d66 |
---|---|
451 model2a->addPoint(point); | 451 model2a->addPoint(point); |
452 | 452 |
453 } else if (modelType == CSVFormat::TwoDimensionalModelWithDurationAndPitch) { | 453 } else if (modelType == CSVFormat::TwoDimensionalModelWithDurationAndPitch) { |
454 | 454 |
455 float level = ((value >= 0.f && value <= 1.f) ? value : 1.f); | 455 float level = ((value >= 0.f && value <= 1.f) ? value : 1.f); |
456 NoteModel::Point point(frameNo, pitch, duration, level, label); | 456 Event note(frameNo, pitch, duration, level, label); |
457 model2b->addPoint(point); | 457 model2b->addPoint(note); |
458 | 458 |
459 } else if (modelType == CSVFormat::ThreeDimensionalModel) { | 459 } else if (modelType == CSVFormat::ThreeDimensionalModel) { |
460 | 460 |
461 DenseThreeDimensionalModel::Column values; | 461 DenseThreeDimensionalModel::Column values; |
462 | 462 |