comparison layer/LayerFactory.cpp @ 765:410816717c2c tony_integration

Merge from tonioni branch

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

     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 FlexiNoteLayer *>(layer)) return FlexiNotes;
     if (dynamic_cast<const NoteLayer *>(layer)) return Notes;
     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;

     case Spectrogram: return "spectrogram";
     case TimeRuler: return "timeruler";
     case TimeInstants: return "instants";
     case TimeValues: return "values";
     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 "colour3d";
     case 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) {
+    } 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 == Regions) {
 	return new RegionModel(baseModel->getSampleRate(), 1, true);