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

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
comparison
equal deleted inserted replaced
776:cb587575bc0d 786:5295bdb58840
171 QString id = transform.getPluginIdentifier(); 171 QString id = transform.getPluginIdentifier();
172 172
173 if (FeatureExtractionPluginFactory::instanceFor(id)) { 173 if (FeatureExtractionPluginFactory::instanceFor(id)) {
174 174
175 transformer = 175 transformer =
176 new FeatureExtractionModelTransformer(input, transform); 176 // new FeatureExtractionModelTransformer(input, transform, FeatureExtractionModelTransformer::NoteOutputModel);
177 new FeatureExtractionModelTransformer(input, transform, m_preferredOutputModel);
177 178
178 } else if (RealTimePluginFactory::instanceFor(id)) { 179 } else if (RealTimePluginFactory::instanceFor(id)) {
179 180
180 transformer = 181 transformer =
181 new RealTimeEffectModelTransformer(input, transform); 182 new RealTimeEffectModelTransformer(input, transform);
191 } 192 }
192 193
193 Model * 194 Model *
194 ModelTransformerFactory::transform(const Transform &transform, 195 ModelTransformerFactory::transform(const Transform &transform,
195 const ModelTransformer::Input &input, 196 const ModelTransformer::Input &input,
196 QString &message) 197 QString &message,
198 // outputmodel default value = FeatureExtractionModelTransformer::NoteOutputModel
199 FeatureExtractionModelTransformer::PreferredOutputModel outputmodel)
197 { 200 {
198 SVDEBUG << "ModelTransformerFactory::transform: Constructing transformer with input model " << input.getModel() << endl; 201 SVDEBUG << "ModelTransformerFactory::transform: Constructing transformer with input model " << input.getModel() << endl;
199 202
203 m_preferredOutputModel = outputmodel;
200 ModelTransformer *t = createTransformer(transform, input); 204 ModelTransformer *t = createTransformer(transform, input);
201 if (!t) return 0; 205 if (!t) return 0;
202 206
203 connect(t, SIGNAL(finished()), this, SLOT(transformerFinished())); 207 connect(t, SIGNAL(finished()), this, SLOT(transformerFinished()));
204 208