Mercurial > hg > svcore
comparison transform/FeatureExtractionModelTransformer.cpp @ 1769:9a8327e7b2dc
Respect use-flexi-note-model setting
author | Chris Cannam |
---|---|
date | Thu, 18 Jul 2019 14:42:24 +0100 |
parents | d1e2062cbdec |
children | e3db163e3f50 |
comparison
equal
deleted
inserted
replaced
1768:4fec4527e50e | 1769:9a8327e7b2dc |
---|---|
412 | 412 |
413 QSettings settings; | 413 QSettings settings; |
414 | 414 |
415 if (isNoteModel) { | 415 if (isNoteModel) { |
416 | 416 |
417 QSettings settings; | |
418 settings.beginGroup("Transformer"); | |
419 bool flexi = settings.value("use-flexi-note-model", false).toBool(); | |
420 settings.endGroup(); | |
421 | |
422 SVCERR << "flexi = " << flexi << endl; | |
423 | |
417 NoteModel *model; | 424 NoteModel *model; |
418 if (haveExtents) { | 425 if (haveExtents) { |
419 model = new NoteModel | 426 model = new NoteModel |
420 (modelRate, modelResolution, minValue, maxValue, false); | 427 (modelRate, modelResolution, minValue, maxValue, false, |
428 flexi ? NoteModel::FLEXI_NOTE : NoteModel::NORMAL_NOTE); | |
421 } else { | 429 } else { |
422 model = new NoteModel | 430 model = new NoteModel |
423 (modelRate, modelResolution, false); | 431 (modelRate, modelResolution, false, |
432 flexi ? NoteModel::FLEXI_NOTE : NoteModel::NORMAL_NOTE); | |
424 } | 433 } |
425 model->setScaleUnits(m_descriptors[n].unit.c_str()); | 434 model->setScaleUnits(m_descriptors[n].unit.c_str()); |
426 out.reset(model); | 435 out.reset(model); |
427 | 436 |
428 } else { | 437 } else { |