Mercurial > hg > svcore

diff transform/ModelTransformerFactory.cpp @ 786:5295bdb58840 tonioni

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed flexi note layer and propagated model selection to analyser
author gyorgyf
date Sat, 13 Apr 2013 13:39:17 +0100
parents 1424aa29ae95
children 4faea021b5c1
line wrap: on
line diff
--- a/transform/ModelTransformerFactory.cpp	Tue Mar 26 20:15:04 2013 +0000
+++ b/transform/ModelTransformerFactory.cpp	Sat Apr 13 13:39:17 2013 +0100
@@ -173,7 +173,8 @@
     if (FeatureExtractionPluginFactory::instanceFor(id)) {
 
         transformer =
-            new FeatureExtractionModelTransformer(input, transform);
+            // new FeatureExtractionModelTransformer(input, transform, FeatureExtractionModelTransformer::NoteOutputModel);
+        	new FeatureExtractionModelTransformer(input, transform, m_preferredOutputModel);
 
     } else if (RealTimePluginFactory::instanceFor(id)) {
 
@@ -193,10 +194,13 @@
 Model *
 ModelTransformerFactory::transform(const Transform &transform,
                                    const ModelTransformer::Input &input,
-                                   QString &message)
+                                   QString &message,
+								   // outputmodel default value = FeatureExtractionModelTransformer::NoteOutputModel
+								   FeatureExtractionModelTransformer::PreferredOutputModel outputmodel) 
 {
     SVDEBUG << "ModelTransformerFactory::transform: Constructing transformer with input model " << input.getModel() << endl;
 
+	m_preferredOutputModel = outputmodel;
     ModelTransformer *t = createTransformer(transform, input);
     if (!t) return 0;