Mercurial > hg > svcore
diff transform/FeatureExtractionModelTransformer.cpp @ 787:4faea021b5c1 tonioni
cleanup
author | gyorgyf |
---|---|
date | Sat, 13 Apr 2013 15:36:54 +0100 |
parents | 5295bdb58840 |
children | 54829c1e155e |
line wrap: on
line diff
--- a/transform/FeatureExtractionModelTransformer.cpp Sat Apr 13 13:39:17 2013 +0100 +++ b/transform/FeatureExtractionModelTransformer.cpp Sat Apr 13 15:36:54 2013 +0100 @@ -292,28 +292,21 @@ if (isNoteModel && m_preferredOutputModel == NoteOutputModel) { NoteModel *model; - // FlexiNoteModel *model; if (haveExtents) { - // GF: hard coding FlexiNoteModel model = new NoteModel (modelRate, modelResolution, minValue, maxValue, false); - // model = new FlexiNoteModel (modelRate, modelResolution, minValue, maxValue, false); } else { model = new NoteModel (modelRate, modelResolution, false); - // model = new FlexiNoteModel (modelRate, modelResolution, false); } model->setScaleUnits(m_descriptor->unit.c_str()); m_output = model; + // GF: FlexiNoteModel is selected if the m_preferredOutputModel is set } else if (isNoteModel && m_preferredOutputModel == FlexiNoteOutputModel) { - // NoteModel *model; FlexiNoteModel *model; if (haveExtents) { - // GF: hard coding FlexiNoteModel - // model = new NoteModel (modelRate, modelResolution, minValue, maxValue, false); model = new FlexiNoteModel (modelRate, modelResolution, minValue, maxValue, false); } else { - // model = new NoteModel (modelRate, modelResolution, false); model = new FlexiNoteModel (modelRate, modelResolution, false); } model->setScaleUnits(m_descriptor->unit.c_str());