comparison layer/LayerFactory.cpp @ 303:46faec7aae12

* Phase 1 of an image layer.

 #include "TimeRulerLayer.h"
 #include "TimeInstantLayer.h"
 #include "TimeValueLayer.h"
 #include "NoteLayer.h"
 #include "TextLayer.h"
+#include "ImageLayer.h"
 #include "Colour3DPlotLayer.h"
 #include "SpectrumLayer.h"
 #include "SliceLayer.h"
 #include "SliceableLayer.h"
 

 #include "data/model/DenseTimeValueModel.h"
 #include "data/model/SparseOneDimensionalModel.h"
 #include "data/model/SparseTimeValueModel.h"
 #include "data/model/NoteModel.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"
 
 LayerFactory *

     case TimeRuler:    return Layer::tr("Ruler");
     case TimeInstants: return Layer::tr("Time Instants");
     case TimeValues:   return Layer::tr("Time Values");
     case Notes:        return Layer::tr("Notes");
     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");
 
     case MelodicRangeSpectrogram:

 
     if (dynamic_cast<TextModel *>(model)) {
 	types.insert(Text);
     }
 
+    if (dynamic_cast<ImageModel *>(model)) {
+	types.insert(Image);
+    }
+
     if (dynamic_cast<DenseTimeValueModel *>(model)) {
         types.insert(Spectrum);
     }
 
     // We don't count TimeRuler here as it doesn't actually display

     LayerTypeSet types;
     types.insert(TimeInstants);
     types.insert(TimeValues);
     types.insert(Notes);
     types.insert(Text);
+    types.insert(Image);
     //!!! and in principle Colour3DPlot -- now that's a challenge
     return types;
 }
 
 LayerFactory::LayerType

     if (dynamic_cast<const TimeRulerLayer *>(layer)) return TimeRuler;
     if (dynamic_cast<const TimeInstantLayer *>(layer)) return TimeInstants;
     if (dynamic_cast<const TimeValueLayer *>(layer)) return TimeValues;
     if (dynamic_cast<const NoteLayer *>(layer)) return Notes;
     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;
     return UnknownLayer;
 }

     case TimeRuler: return "timeruler";
     case TimeInstants: return "instants";
     case TimeValues: return "values";
     case Notes: return "notes";
     case Text: return "text";
+    case Image: return "image";
     case Colour3DPlot: return "colour3d";
     case Spectrum: return "spectrum";
     case Slice: return "spectrum";
     default: return "unknown";
     }

     case TimeRuler: return "timeruler";
     case TimeInstants: return "timeinstants";
     case TimeValues: return "timevalues";
     case Notes: return "notes";
     case Text: return "text";
+    case Image: return "image";
     case Colour3DPlot: return "colour3dplot";
     case Spectrum: return "spectrum";
     case Slice: return "slice";
     default: return "unknown";
     }

     if (name == "timeruler") return TimeRuler;
     if (name == "timeinstants") return TimeInstants;
     if (name == "timevalues") return TimeValues;
     if (name == "notes") return Notes;
     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 UnknownLayer;
 }

 
     if (trySetModel<NoteLayer, NoteModel>(layer, model))
 	return;
 
     if (trySetModel<TextLayer, TextModel>(layer, model))
+	return;
+
+    if (trySetModel<ImageLayer, ImageModel>(layer, model))
 	return;
 
     if (trySetModel<Colour3DPlotLayer, DenseThreeDimensionalModel>(layer, model))
 	return;
 

 	return new SparseTimeValueModel(baseModel->getSampleRate(), 1, true);
     } else if (layerType == Notes) {
 	return new NoteModel(baseModel->getSampleRate(), 1, true);
     } else if (layerType == Text) {
 	return new TextModel(baseModel->getSampleRate(), 1, true);
+    } else if (layerType == Image) {
+	return new ImageModel(baseModel->getSampleRate(), 1, true);
     } else {
 	return 0;
     }
 }
 

 	layer = new NoteLayer;
 	break;
 
     case Text:
 	layer = new TextLayer;
+	break;
+
+    case Image:
+	layer = new ImageLayer;
 	break;
 
     case Colour3DPlot:
 	layer = new Colour3DPlotLayer;
 	break;