Mercurial > hg > svgui
comparison widgets/CSVFormatDialog.cpp @ 1522:d5ef91dc2ea7
Merge from branch time-frequency-boxes
author | Chris Cannam |
---|---|
date | Wed, 25 Sep 2019 13:48:04 +0100 |
parents | d3ef60b6ae93 |
children | 129c704566ff |
comparison
equal
deleted
inserted
replaced
1510:872873aa6463 | 1522:d5ef91dc2ea7 |
---|---|
316 s = f->getLayerPresentationName(LayerFactory::Regions); | 316 s = f->getLayerPresentationName(LayerFactory::Regions); |
317 break; | 317 break; |
318 case CSVFormat::TwoDimensionalModelWithDurationAndPitch: | 318 case CSVFormat::TwoDimensionalModelWithDurationAndPitch: |
319 s = f->getLayerPresentationName(LayerFactory::Notes); | 319 s = f->getLayerPresentationName(LayerFactory::Notes); |
320 break; | 320 break; |
321 case CSVFormat::TwoDimensionalModelWithDurationAndExtent: | |
322 s = f->getLayerPresentationName(LayerFactory::Boxes); | |
323 break; | |
321 case CSVFormat::ThreeDimensionalModel: | 324 case CSVFormat::ThreeDimensionalModel: |
322 s = f->getLayerPresentationName(LayerFactory::Colour3DPlot); | 325 s = f->getLayerPresentationName(LayerFactory::Colour3DPlot); |
323 break; | 326 break; |
324 case CSVFormat::WaveFileModel: | 327 case CSVFormat::WaveFileModel: |
325 s = f->getLayerPresentationName(LayerFactory::Waveform); | 328 s = f->getLayerPresentationName(LayerFactory::Waveform); |
580 } | 583 } |
581 | 584 |
582 if (haveStartTime && haveDuration) { | 585 if (haveStartTime && haveDuration) { |
583 if (havePitch) { | 586 if (havePitch) { |
584 m_format.setModelType(CSVFormat::TwoDimensionalModelWithDurationAndPitch); | 587 m_format.setModelType(CSVFormat::TwoDimensionalModelWithDurationAndPitch); |
588 } else if (valueCount == 2) { | |
589 m_format.setModelType(CSVFormat::TwoDimensionalModelWithDurationAndExtent); | |
585 } else { | 590 } else { |
586 m_format.setModelType(CSVFormat::TwoDimensionalModelWithDuration); | 591 m_format.setModelType(CSVFormat::TwoDimensionalModelWithDuration); |
587 } | 592 } |
588 } else { | 593 } else { |
589 if (valueCount > 1) { | 594 if (valueCount > 1) { |