comparison transform/FeatureExtractionModelTransformer.cpp @ 859:13803edd513d tonioni

Use a settings setting for flexi/non-flexi determination -- this may not be the right thing in the long run but it's simpler and easier than passing through a random value that doesn't actually come from anywhere

 
 #include "TransformFactory.h"
 
 #include <iostream>
 
+#include <QSettings>
+
 FeatureExtractionModelTransformer::FeatureExtractionModelTransformer(Input in,
-                                                                     const Transform &transform,
-                                                                     const PreferredOutputModel outputmodel) :
+                                                                     const Transform &transform) :
     ModelTransformer(in, transform),
-    m_plugin(0),
-    m_preferredOutputModel(outputmodel)
+    m_plugin(0)
 {
 //    SVDEBUG << "FeatureExtractionModelTransformer::FeatureExtractionModelTransformer: plugin " << pluginId << ", outputName " << m_transform.getOutput() << endl;
 
     initialise();
 }
 
 FeatureExtractionModelTransformer::FeatureExtractionModelTransformer(Input in,
-                                                                     const Transforms &transforms,
-                                                                     const PreferredOutputModel outputmodel) :
+                                                                     const Transforms &transforms) :
     ModelTransformer(in, transforms),
-    m_plugin(0),
-    m_preferredOutputModel(outputmodel)
+    m_plugin(0)
 {
 //    SVDEBUG << "FeatureExtractionModelTransformer::FeatureExtractionModelTransformer: plugin " << pluginId << ", outputName " << m_transform.getOutput() << endl;
 
     initialise();
 }

 
         // If we had a "sparse 3D model", we would have the additional
         // problem of determining whether to use that here (if bin
         // count > 1).  But we don't.
 
-		if (isNoteModel && m_preferredOutputModel == NoteOutputModel) {
+        QSettings settings;
+        settings.beginGroup("Transformer");
+        bool flexi = settings.value("use-flexi-note-model", false).toBool();
+        settings.endGroup();
+
+        cerr << "flexi = " << flexi << endl;
+
+        if (isNoteModel && !flexi) {
 
             NoteModel *model;
             if (haveExtents) {
-	            model = new NoteModel (modelRate, modelResolution, minValue, maxValue, false);
+                model = new NoteModel
+                    (modelRate, modelResolution, minValue, maxValue, false);
             } else {
-	            model = new NoteModel (modelRate, modelResolution, false);
+                model = new NoteModel
+                    (modelRate, modelResolution, false);
             }
             model->setScaleUnits(m_descriptors[n]->unit.c_str());
             out = model;
 
-		// GF: FlexiNoteModel is selected if the m_preferredOutputModel is set
-        } else if (isNoteModel && m_preferredOutputModel == FlexiNoteOutputModel) {
+        } else if (isNoteModel && flexi) {
 
             FlexiNoteModel *model;
             if (haveExtents) {
-                model = new FlexiNoteModel (modelRate, modelResolution, minValue, maxValue, false);
+                model = new FlexiNoteModel
+                    (modelRate, modelResolution, minValue, maxValue, false);
             } else {
-                model = new FlexiNoteModel (modelRate, modelResolution, false);
+                model = new FlexiNoteModel
+                    (modelRate, modelResolution, false);
             }
             model->setScaleUnits(m_descriptors[n]->unit.c_str());
             out = model;
 
         } else {