comparison framework/SVFileReader.cpp @ 710:3e930ea94db6

Rename time-frequency box to plain box - but also reload sessions if they have the "old" name (even though it was only used in 4.0-pre1 exports)

 #include "data/model/SparseTimeValueModel.h"
 #include "data/model/NoteModel.h"
 #include "data/model/RegionModel.h"
 #include "data/model/TextModel.h"
 #include "data/model/ImageModel.h"
-#include "data/model/TimeFrequencyBoxModel.h"
+#include "data/model/BoxModel.h"
 #include "data/model/AlignmentModel.h"
 #include "data/model/AggregateWaveModel.h"
 
 #include "transform/TransformFactory.h"
 

                     m_models[id] = ModelById::add(model);
                 } else if (attributes.value("subtype") == "path") {
                     // Paths are no longer actually models
                     Path *path = new Path(sampleRate, resolution);
                     m_paths[id] = path;
-                } else if (attributes.value("subtype") == "timefrequencybox") {
-                    auto model = std::make_shared<TimeFrequencyBoxModel>
+                } else if (attributes.value("subtype") == "box" ||
+                           attributes.value("subtype") == "timefrequencybox") {
+                    auto model = std::make_shared<BoxModel>
                         (sampleRate, resolution, notifyOnAdd);
+                    model->setScaleUnits(units);
                     model->setObjectName(name);
                     m_models[id] = ModelById::add(model);
                 } else {
                     std::shared_ptr<SparseTimeValueModel> model;
                     if (haveMinMax) {

 
     case 2:
         good =
             (ModelById::isa<SparseTimeValueModel>(modelId) ||
              ModelById::isa<TextModel>(modelId) ||
-             ModelById::isa<TimeFrequencyBoxModel>(modelId) ||
+             ModelById::isa<BoxModel>(modelId) ||
              path);
         break;
 
     case 3:
         if (ModelById::isa<EditableDenseThreeDimensionalModel>(modelId)) {

         QString label = attributes.value("label");
         tm->add(Event(frame, height, label));
         return ok;
     }
 
-    if (auto bm = ModelById::getAs<TimeFrequencyBoxModel>(modelId)) {
-        float frequency = attributes.value("frequency").trimmed().toFloat(&ok);
+    if (auto bm = ModelById::getAs<BoxModel>(modelId)) {
+        float value = attributes.value("value").trimmed().toFloat(&ok);
+        if (!ok) {
+            value = attributes.value("frequency").trimmed().toFloat(&ok);
+            if (bm->getScaleUnits() == "") {
+                bm->setScaleUnits("Hz");
+            }
+        }
         float extent = attributes.value("extent").trimmed().toFloat(&ok);
         int duration = attributes.value("duration").trimmed().toInt(&ok);
         QString label = attributes.value("label");
-        bm->add(Event(frame, frequency, duration, extent, label));
+        bm->add(Event(frame, value, duration, extent, label));
         return ok;
     }
 
     if (auto im = ModelById::getAs<ImageModel>(modelId)) {
         QString image = attributes.value("image");