comparison data/fileio/CSVFileReader.cpp @ 1794:71e97de5053f

Merge from branch time-frequency-boxes

 #include "model/SparseOneDimensionalModel.h"
 #include "model/SparseTimeValueModel.h"
 #include "model/EditableDenseThreeDimensionalModel.h"
 #include "model/RegionModel.h"
 #include "model/NoteModel.h"
+#include "model/BoxModel.h"
 #include "model/WritableWaveFileModel.h"
 #include "DataFileReaderFactory.h"
 
 #include <QFile>
 #include <QDir>

 
     SparseOneDimensionalModel *model1 = nullptr;
     SparseTimeValueModel *model2 = nullptr;
     RegionModel *model2a = nullptr;
     NoteModel *model2b = nullptr;
+    BoxModel *model2c = nullptr;
     EditableDenseThreeDimensionalModel *model3 = nullptr;
     WritableWaveFileModel *modelW = nullptr;
     Model *model = nullptr;
 
     QTextStream in(m_device);

                 case CSVFormat::TwoDimensionalModelWithDurationAndPitch:
                     model2b = new NoteModel(sampleRate, windowSize, false);
                     model = model2b;
                     break;
                 
+                case CSVFormat::TwoDimensionalModelWithDurationAndExtent:
+                    model2c = new BoxModel(sampleRate, windowSize, false);
+                    model = model2c;
+                    break;
+                
                 case CSVFormat::ThreeDimensionalModel:
                     model3 = new EditableDenseThreeDimensionalModel
                         (sampleRate, windowSize, valueColumns);
                     model = model3;
                     break;

                 SVCERR << "Failed to create model to load CSV file into"
                        << endl;
                 if (model) {
                     delete model;
                     model = nullptr;
-                    model1 = nullptr; model2 = nullptr; model2a = nullptr; model2b = nullptr;
+                    model1 = nullptr; model2 = nullptr;
+                    model2a = nullptr; model2b = nullptr; model2c = nullptr;
                     model3 = nullptr; modelW = nullptr;
                 }
                 abandoned = true;
                 break;
             }
             
             float value = 0.f;
+            float otherValue = 0.f;
             float pitch = 0.f;
             QString label = "";
 
             duration = 0.f;
             haveEndTime = false;

                 case CSVFormat::ColumnDuration:
                     duration = convertTimeValue(s, lineno, sampleRate, windowSize);
                     break;
 
                 case CSVFormat::ColumnValue:
+                    if (haveAnyValue) {
+                        otherValue = value;
+                    }
                     value = s.toFloat();
                     haveAnyValue = true;
                     break;
 
                 case CSVFormat::ColumnPitch:

             } else if (modelType == CSVFormat::TwoDimensionalModelWithDurationAndPitch) {
 
                 float level = ((value >= 0.f && value <= 1.f) ? value : 1.f);
                 Event note(frameNo, pitch, duration, level, label);
                 model2b->add(note);
+
+            } else if (modelType == CSVFormat::TwoDimensionalModelWithDurationAndExtent) {
+
+                float level = 0.f;
+                if (value > otherValue) {
+                    level = value - otherValue;
+                    value = otherValue;
+                } else {
+                    level = otherValue - value;
+                }
+                Event box(frameNo, value, duration, level, label);
+                model2c->add(box);
 
             } else if (modelType == CSVFormat::ThreeDimensionalModel) {
 
                 DenseThreeDimensionalModel::Column values;