comparison framework/Document.cpp @ 296:19282182e60d tonioni_multi_transform

Update to the multi-transform api in svcore

 }
 
 Layer *
 Document::createDerivedLayer(const Transform &transform,
                              const ModelTransformer::Input &input,
-                             const LayerFactory::LayerType type,
-							 const FeatureExtractionModelTransformer::PreferredOutputModel outputmodel)
+                             const LayerFactory::LayerType type)
 {
 	// !!! THIS IS TOTALLY REDUNDANT CODE, EXCEPT FOR THE type SETTING
 	
 	    QString message;
-	    Model *newModel = addDerivedModel(transform, input, message, outputmodel);
+	    Model *newModel = addDerivedModel(transform, input, message);
 	    if (!newModel) {
 	        emit modelGenerationFailed(transform.getIdentifier(), message);
 	        return 0;
 	    } else if (message != "") {
 	        emit modelGenerationWarning(transform.getIdentifier(), message);

 }
 
 Model *
 Document::addDerivedModel(const Transform &transform,
                           const ModelTransformer::Input &input,
-                          QString &message,
-						  const FeatureExtractionModelTransformer::PreferredOutputModel outputmodel)
+                          QString &message)
 {
     Model *model = 0;
 	// model = (Model) new FlexiNoteModel();
 	// return model;
 

 				std::cerr << "derived model taken from map " << std::endl;
 	    return i->first;
 	}
     }
 
-	// GF: TODO: propagate preferredOutputModelSelection (done)
     model = ModelTransformerFactory::getInstance()->transform
-        (transform, input, message, outputmodel); //e.g. FeatureExtractionModelTransformer::FlexiNoteOutputModel
+        (transform, input, message);
 
     // The transform we actually used was presumably identical to the
     // one asked for, except that the version of the plugin may
     // differ.  It's possible that the returned message contains a
     // warning about this; that doesn't concern us here, but we do