comparison layer/LayerFactory.cpp @ 626:7256926d3af1 tonioni

cleanup

     if (dynamic_cast<SparseTimeValueModel *>(model)) {
 	types.insert(TimeValues);
     }
 
     if (dynamic_cast<NoteModel *>(model)) {
-	// types.insert(FlexiNotes);
 	types.insert(Notes);
     }
 
+	// NOTE: GF: types is a set, so order of insertion does not matter
     if (dynamic_cast<FlexiNoteModel *>(model)) {
 	types.insert(FlexiNotes);
-	// types.insert(Notes);
     }
 
     if (dynamic_cast<RegionModel *>(model)) {
 	types.insert(Regions);
     }

 LayerFactory::setModel(Layer *layer, Model *model)
 {
 //    if (trySetModel<WaveformLayer, RangeSummarisableTimeValueModel>(layer, model))
 //	return;
 	
-	std::cerr << "LayerFactory::setModel called... " << std::endl;
-
     if (trySetModel<WaveformLayer, WaveFileModel>(layer, model))
 	return;
 
     if (trySetModel<WaveformLayer, WritableWaveFileModel>(layer, model))
 	return;

 	return;
 
     if (trySetModel<TimeValueLayer, SparseTimeValueModel>(layer, model))
 	return;
 
-    if (trySetModel<NoteLayer, NoteModel>(layer, model)) {
-		std::cerr << "trying to set note layer model" << std::endl;
-	return; }
-
-    if (trySetModel<FlexiNoteLayer, FlexiNoteModel>(layer, model)) {
-		std::cerr << "trying to set flexi note layer model" << std::endl;
-	return; }
+    if (trySetModel<NoteLayer, NoteModel>(layer, model)) 
+	return; 
+
+	// GF: added FlexiNoteLayer
+    if (trySetModel<FlexiNoteLayer, FlexiNoteModel>(layer, model)) 
+	return; 
 	
-	FlexiNoteLayer *clayer = dynamic_cast<FlexiNoteLayer *>(layer);
-	if (!clayer) { std::cerr << "layer cast failed" << std::endl; return; }
-	FlexiNoteModel *cmodel = dynamic_cast<FlexiNoteModel *>(model);
-	if (!cmodel) { std::cerr << "model cast failed" << std::endl; return; }
-	clayer->setModel(cmodel);
-
     if (trySetModel<RegionLayer, RegionModel>(layer, model))
 	return;
 
     if (trySetModel<TextLayer, TextModel>(layer, model))
 	return;

     if (trySetModel<SpectrumLayer, DenseTimeValueModel>(layer, model)) 
         return;
 
 //    if (trySetModel<SliceLayer, DenseThreeDimensionalModel>(layer, model)) 
 //        return;
-	std::cerr << "LayerFactory::setModel done... " << std::endl;
 }
 
 Model *
 LayerFactory::createEmptyModel(LayerType layerType, Model *baseModel)
 {