diff 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
line wrap: on
line diff
--- a/widgets/CSVFormatDialog.cpp	Tue Sep 17 12:50:58 2019 +0100
+++ b/widgets/CSVFormatDialog.cpp	Wed Sep 25 13:48:04 2019 +0100
@@ -318,6 +318,9 @@
     case CSVFormat::TwoDimensionalModelWithDurationAndPitch:
         s = f->getLayerPresentationName(LayerFactory::Notes);
         break;
+    case CSVFormat::TwoDimensionalModelWithDurationAndExtent:
+        s = f->getLayerPresentationName(LayerFactory::Boxes);
+        break;
     case CSVFormat::ThreeDimensionalModel:
         s = f->getLayerPresentationName(LayerFactory::Colour3DPlot);
         break;
@@ -582,6 +585,8 @@
     if (haveStartTime && haveDuration) {
         if (havePitch) {
             m_format.setModelType(CSVFormat::TwoDimensionalModelWithDurationAndPitch);
+        } else if (valueCount == 2) {
+            m_format.setModelType(CSVFormat::TwoDimensionalModelWithDurationAndExtent);
         } else {
             m_format.setModelType(CSVFormat::TwoDimensionalModelWithDuration);
         }