changeset 423:bbe7ba53030e

new analysis menu fully functional (but not much tested)

--- a/src/Analyser.cpp	Wed Mar 25 14:08:54 2015 +0000
+++ b/src/Analyser.cpp	Wed Mar 25 17:02:40 2015 +0000
@@ -353,10 +353,9 @@
     QSettings settings;
     settings.beginGroup("Analyser");
     bool precise = settings.value("precision-analysis", false).toBool();
-    settings.endGroup();
-
-    settings.beginGroup("Analyser");
     bool lowamp = settings.value("lowamp-analysis", false).toBool();
+    bool onset = settings.value("onset-analysis", true).toBool(); // should these be the same as in MainWindow.cpp?
+    bool prune = settings.value("prune-analysis", true).toBool();
     settings.endGroup();
 
     Transform t = tf->getDefaultTransformFor
@@ -380,6 +379,22 @@
         t.setParameter("lowampsuppression", 0.0f);
     }
 
+    if (onset) {
+        cerr << "setting parameters for increased onset sensitivity" << endl;
+        t.setParameter("onsetsensitivity", 0.7f);
+    } else {
+        cerr << "setting parameters for non-increased onset sensitivity" << endl;
+        t.setParameter("onsetsensitivity", 0.0f);
+    }
+
+    if (prune) {
+        cerr << "setting parameters for duration pruning" << endl;
+        t.setParameter("prunethresh", 0.1f);
+    } else {
+        cerr << "setting parameters for no duration pruning" << endl;
+        t.setParameter("prunethresh", 0.0f);
+    }
+
     transforms.push_back(t);
 
     t.setOutput(noteout);

--- a/src/MainWindow.cpp	Wed Mar 25 14:08:54 2015 +0000
+++ b/src/MainWindow.cpp	Wed Mar 25 17:02:40 2015 +0000
@@ -750,6 +750,8 @@
     bool autoAnalyse = settings.value("auto-analysis", true).toBool();
     bool precise = settings.value("precision-analysis", false).toBool();
     bool lowamp = settings.value("lowamp-analysis", true).toBool();
+    bool onset = settings.value("onset-analysis", true).toBool();
+    bool prune = settings.value("prune-analysis", true).toBool();
     settings.endGroup();
 
     action = new QAction(tr("Auto-Analyse &New Audio"), this);
@@ -781,18 +783,18 @@
     connect(action, SIGNAL(triggered()), this, SLOT(lowampAnalysisToggled()));
     menu->addAction(action);
 
-    action = new QAction(tr("&Amplitude-based Note Separation"), this);
+    action = new QAction(tr("&High Onset Sensitivity"), this);
     action->setStatusTip(tr("Increase likelihood of separating notes, especially consecutive notes at the same pitch."));
     action->setCheckable(true);
-    action->setChecked(false);
-    // connect(action, SIGNAL(triggered()), this, SLOT(lowampAnalysisToggled()));
+    action->setChecked(onset);
+    connect(action, SIGNAL(triggered()), this, SLOT(onsetAnalysisToggled()));
     menu->addAction(action);
 
     action = new QAction(tr("&Drop Short Notes"), this);
     action->setStatusTip(tr("Duration-based pruning: automatic note estimator will not output notes of less than 100ms duration."));
     action->setCheckable(true);
-    action->setChecked(true);
-    // connect(action, SIGNAL(triggered()), this, SLOT(lowampAnalysisToggled()));
+    action->setChecked(prune);
+    connect(action, SIGNAL(triggered()), this, SLOT(pruneAnalysisToggled()));
     menu->addAction(action);
 
     menu->addSeparator();
@@ -850,6 +852,38 @@
 }
 
 void
+MainWindow::onsetAnalysisToggled()
+{
+    QAction *a = qobject_cast<QAction *>(sender());
+    if (!a) return;
+
+    bool set = a->isChecked();
+
+    QSettings settings;
+    settings.beginGroup("Analyser");
+    settings.setValue("onset-analysis", set);
+    settings.endGroup();
+
+    // don't run analyseNow() automatically -- it's a destructive operation
+}
+
+void
+MainWindow::pruneAnalysisToggled()
+{
+    QAction *a = qobject_cast<QAction *>(sender());
+    if (!a) return;
+
+    bool set = a->isChecked();
+
+    QSettings settings;
+    settings.beginGroup("Analyser");
+    settings.setValue("prune-analysis", set);
+    settings.endGroup();
+
+    // don't run analyseNow() automatically -- it's a destructive operation
+}
+
+void
 MainWindow::setupHelpMenu()
 {
     QMenu *menu = menuBar()->addMenu(tr("&Help"));

--- a/src/MainWindow.h	Wed Mar 25 14:08:54 2015 +0000
+++ b/src/MainWindow.h	Wed Mar 25 17:02:40 2015 +0000
@@ -85,6 +85,8 @@
     virtual void autoAnalysisToggled();
     virtual void precisionAnalysisToggled();
     virtual void lowampAnalysisToggled();
+    virtual void onsetAnalysisToggled();
+    virtual void pruneAnalysisToggled();
 
     virtual void doubleClickSelectInvoked(sv_frame_t);
     virtual void abandonSelection();