comparison transform/FeatureExtractionModelTransformer.cpp @ 787:4faea021b5c1 tonioni

cleanup
author gyorgyf
date Sat, 13 Apr 2013 15:36:54 +0100
parents 5295bdb58840
children 54829c1e155e
comparison
equal deleted inserted replaced
786:5295bdb58840 787:4faea021b5c1
290 // count > 1). But we don't. 290 // count > 1). But we don't.
291 291
292 if (isNoteModel && m_preferredOutputModel == NoteOutputModel) { 292 if (isNoteModel && m_preferredOutputModel == NoteOutputModel) {
293 293
294 NoteModel *model; 294 NoteModel *model;
295 // FlexiNoteModel *model;
296 if (haveExtents) { 295 if (haveExtents) {
297 // GF: hard coding FlexiNoteModel
298 model = new NoteModel (modelRate, modelResolution, minValue, maxValue, false); 296 model = new NoteModel (modelRate, modelResolution, minValue, maxValue, false);
299 // model = new FlexiNoteModel (modelRate, modelResolution, minValue, maxValue, false);
300 } else { 297 } else {
301 model = new NoteModel (modelRate, modelResolution, false); 298 model = new NoteModel (modelRate, modelResolution, false);
302 // model = new FlexiNoteModel (modelRate, modelResolution, false);
303 } 299 }
304 model->setScaleUnits(m_descriptor->unit.c_str()); 300 model->setScaleUnits(m_descriptor->unit.c_str());
305 m_output = model; 301 m_output = model;
306 302
303 // GF: FlexiNoteModel is selected if the m_preferredOutputModel is set
307 } else if (isNoteModel && m_preferredOutputModel == FlexiNoteOutputModel) { 304 } else if (isNoteModel && m_preferredOutputModel == FlexiNoteOutputModel) {
308 305
309 // NoteModel *model;
310 FlexiNoteModel *model; 306 FlexiNoteModel *model;
311 if (haveExtents) { 307 if (haveExtents) {
312 // GF: hard coding FlexiNoteModel
313 // model = new NoteModel (modelRate, modelResolution, minValue, maxValue, false);
314 model = new FlexiNoteModel (modelRate, modelResolution, minValue, maxValue, false); 308 model = new FlexiNoteModel (modelRate, modelResolution, minValue, maxValue, false);
315 } else { 309 } else {
316 // model = new NoteModel (modelRate, modelResolution, false);
317 model = new FlexiNoteModel (modelRate, modelResolution, false); 310 model = new FlexiNoteModel (modelRate, modelResolution, false);
318 } 311 }
319 model->setScaleUnits(m_descriptor->unit.c_str()); 312 model->setScaleUnits(m_descriptor->unit.c_str());
320 m_output = model; 313 m_output = model;
321 314