comparison layer/LayerFactory.cpp @ 623:49afde2dd704 tonioni

put the FlexiNote layer before the note layer to see what happens -- not much

     if (dynamic_cast<SparseTimeValueModel *>(model)) {
 	types.insert(TimeValues);
     }
 
     if (dynamic_cast<NoteModel *>(model)) {
+	types.insert(FlexiNotes);
 	types.insert(Notes);
     }
 
     if (dynamic_cast<FlexiNoteModel *>(model)) {
 	types.insert(FlexiNotes);
+	types.insert(Notes);
     }
 
     if (dynamic_cast<RegionModel *>(model)) {
 	types.insert(Regions);
     }

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

     if (dynamic_cast<const WaveformLayer *>(layer)) return Waveform;
     if (dynamic_cast<const SpectrogramLayer *>(layer)) return Spectrogram;
     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 FlexiNoteLayer *>(layer)) return FlexiNotes;
     if (dynamic_cast<const NoteLayer *>(layer)) return Notes;
-    if (dynamic_cast<const FlexiNoteLayer *>(layer)) return FlexiNotes;
     if (dynamic_cast<const RegionLayer *>(layer)) return Regions;
     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;

     case Spectrogram: return "spectrogram";
     case TimeRuler: return "timeruler";
     case TimeInstants: return "timeinstants";
     case TimeValues: return "timevalues";
     case Notes: return "notes";
-    case FlexiNotes: return "flexible notes";
+    case FlexiNotes: return "flexinotes";
     case Regions: return "regions";
     case Text: return "text";
     case Image: return "image";
     case Colour3DPlot: return "colour3dplot";
     case Spectrum: return "spectrum";

     if (name == "waveform") return Waveform;
     if (name == "spectrogram") return Spectrogram;
     if (name == "timeruler") return TimeRuler;
     if (name == "timeinstants") return TimeInstants;
     if (name == "timevalues") return TimeValues;
-    if (name == "flexible notes") return FlexiNotes;
+    if (name == "flexinotes") return FlexiNotes;
     if (name == "regions") return Regions;
     if (name == "text") return Text;
     if (name == "image") return Image;
     if (name == "colour3dplot") return Colour3DPlot;
     if (name == "spectrum") return Spectrum;

 {
     if (layerType == TimeInstants) {
 	return new SparseOneDimensionalModel(baseModel->getSampleRate(), 1);
     } else if (layerType == TimeValues) {
 	return new SparseTimeValueModel(baseModel->getSampleRate(), 1, true);
+	} else if (layerType == FlexiNotes) {
+	return new FlexiNoteModel(baseModel->getSampleRate(), 1, true);
     } else if (layerType == Notes) {
-	return new NoteModel(baseModel->getSampleRate(), 1, true);
-    } else if (layerType == FlexiNotes) {
 	return new NoteModel(baseModel->getSampleRate(), 1, true);
     } else if (layerType == Regions) {
 	return new RegionModel(baseModel->getSampleRate(), 1, true);
     } else if (layerType == Text) {
 	return new TextModel(baseModel->getSampleRate(), 1, true);

 
     case TimeValues:
 	layer = new TimeValueLayer;
 	break;
 
+    case FlexiNotes:
+	layer = new FlexiNoteLayer;
+	break;
+
     case Notes:
 	layer = new NoteLayer;
-	break;
-
-    case FlexiNotes:
-	layer = new FlexiNoteLayer;
 	break;
 
     case Regions:
 	layer = new RegionLayer;
 	break;