comparison layer/LayerFactory.cpp @ 1518:2e94c268f7a0 time-frequency-boxes

Rename TimeFrequencyBoxLayer to just BoxLayer, supporting vertical scales other than Hz

 #include "TimeInstantLayer.h"
 #include "TimeValueLayer.h"
 #include "NoteLayer.h"
 #include "FlexiNoteLayer.h"
 #include "RegionLayer.h"
-#include "TimeFrequencyBoxLayer.h"
+#include "BoxLayer.h"
 #include "TextLayer.h"
 #include "ImageLayer.h"
 #include "Colour3DPlotLayer.h"
 #include "SpectrumLayer.h"
 #include "SliceLayer.h"

 #include "data/model/DenseTimeValueModel.h"
 #include "data/model/SparseOneDimensionalModel.h"
 #include "data/model/SparseTimeValueModel.h"
 #include "data/model/NoteModel.h"
 #include "data/model/RegionModel.h"
-#include "data/model/TimeFrequencyBoxModel.h"
+#include "data/model/BoxModel.h"
 #include "data/model/TextModel.h"
 #include "data/model/ImageModel.h"
 #include "data/model/DenseThreeDimensionalModel.h"
 #include "data/model/WaveFileModel.h"
 #include "data/model/WritableWaveFileModel.h"

     case TimeInstants: return Layer::tr("Time Instants");
     case TimeValues:   return Layer::tr("Time Values");
     case Notes:        return Layer::tr("Notes");
     case FlexiNotes:   return Layer::tr("Flexible Notes");
     case Regions:      return Layer::tr("Regions");
-    case TimeFrequencyBox: return Layer::tr("Time-Frequency Box");
+    case Boxes:        return Layer::tr("Boxes");
     case Text:         return Layer::tr("Text");
     case Image:        return Layer::tr("Images");
     case Colour3DPlot: return Layer::tr("Colour 3D Plot");
     case Spectrum:     return Layer::tr("Spectrum");
     case Slice:        return Layer::tr("Time Slice");

 
     if (ModelById::getAs<RegionModel>(modelId)) {
         types.insert(Regions);
     }
 
-    if (ModelById::getAs<TimeFrequencyBoxModel>(modelId)) {
-        types.insert(TimeFrequencyBox);
+    if (ModelById::getAs<BoxModel>(modelId)) {
+        types.insert(Boxes);
     }
 
     if (ModelById::getAs<TextModel>(modelId)) {
         types.insert(Text);
     }

     // to show in a menu -- it should not contain FlexiNotes; the
     // layer isn't meaningfully editable in SV
 //    types.insert(FlexiNotes);
     types.insert(Notes);
     types.insert(Regions);
-    types.insert(TimeFrequencyBox);
+    types.insert(Boxes);
     types.insert(Text);
     types.insert(Image);
     //!!! and in principle Colour3DPlot -- now that's a challenge
     return types;
 }

     if (dynamic_cast<const TimeInstantLayer *>(layer)) return TimeInstants;
     if (dynamic_cast<const TimeValueLayer *>(layer)) return TimeValues;
     if (dynamic_cast<const FlexiNoteLayer *>(layer)) return FlexiNotes;
     if (dynamic_cast<const NoteLayer *>(layer)) return Notes;
     if (dynamic_cast<const RegionLayer *>(layer)) return Regions;
-    if (dynamic_cast<const TimeFrequencyBoxLayer *>(layer)) return TimeFrequencyBox;
+    if (dynamic_cast<const BoxLayer *>(layer)) return Boxes;
     if (dynamic_cast<const TextLayer *>(layer)) return Text;
     if (dynamic_cast<const ImageLayer *>(layer)) return Image;
     if (dynamic_cast<const Colour3DPlotLayer *>(layer)) return Colour3DPlot;
     if (dynamic_cast<const SpectrumLayer *>(layer)) return Spectrum;
     if (dynamic_cast<const SliceLayer *>(layer)) return Slice;

     case TimeInstants: return "instants";
     case TimeValues: return "values";
     case Notes: return "notes";
     case FlexiNotes: return "flexinotes";
     case Regions: return "regions";
-    case TimeFrequencyBox: return "timefreq";
+    case Boxes: return "boxes";
     case Text: return "text";
     case Image: return "image";
     case Colour3DPlot: return "colour3d";
     case Spectrum: return "spectrum";
     case Slice: return "spectrum";

     case TimeInstants: return "timeinstants";
     case TimeValues: return "timevalues";
     case Notes: return "notes";
     case FlexiNotes: return "flexinotes";
     case Regions: return "regions";
-    case TimeFrequencyBox: return "timefrequencybox";
+    case Boxes: return "boxes";
     case Text: return "text";
     case Image: return "image";
     case Colour3DPlot: return "colour3dplot";
     case Spectrum: return "spectrum";
     case Slice: return "slice";

     if (name == "timeinstants") return TimeInstants;
     if (name == "timevalues") return TimeValues;
     if (name == "notes") return Notes;
     if (name == "flexinotes") return FlexiNotes;
     if (name == "regions") return Regions;
-    if (name == "timefrequencybox") return TimeFrequencyBox;
+    if (name == "boxes" || name == "timefrequencybox") return Boxes;
     if (name == "text") return Text;
     if (name == "image") return Image;
     if (name == "colour3dplot") return Colour3DPlot;
     if (name == "spectrum") return Spectrum;
     if (name == "slice") return Slice;

         return; 
         
     if (trySetModel<RegionLayer, RegionModel>(layer, model))
         return;
 
-    if (trySetModel<TimeFrequencyBoxLayer, TimeFrequencyBoxModel>(layer, model))
+    if (trySetModel<BoxLayer, BoxModel>(layer, model))
         return;
 
     if (trySetModel<TextLayer, TextModel>(layer, model))
         return;
 

         return std::make_shared<NoteModel>(rate, 1, true);
     } else if (layerType == Notes) {
         return std::make_shared<NoteModel>(rate, 1, true);
     } else if (layerType == Regions) {
         return std::make_shared<RegionModel>(rate, 1, true);
-    } else if (layerType == TimeFrequencyBox) {
-        return std::make_shared<TimeFrequencyBoxModel>(rate, 1, true);
+    } else if (layerType == Boxes) {
+        return std::make_shared<BoxModel>(rate, 1, true);
     } else if (layerType == Text) {
         return std::make_shared<TextModel>(rate, 1, true);
     } else if (layerType == Image) {
         return std::make_shared<ImageModel>(rate, 1, true);
     } else {

 
     case Regions:
         layer = new RegionLayer;
         break;
 
-    case TimeFrequencyBox:
-        layer = new TimeFrequencyBoxLayer;
+    case Boxes:
+        layer = new BoxLayer;
         break;
 
     case Text:
         layer = new TextLayer;
         break;