comparison main/MainWindow.cpp @ 673:90ee5448c205

Fix inconsistency between MainWindow and Analyser in the default value of the lowampsuppression option, and enforce default values in a single place. As it stood, the menu option was showing "checked" (on first run) but the parameter was actually unset until you toggled it or used the reset-to-default function.

 }
 
 void
 MainWindow::resetAnalyseOptions()
 {
-    //!!! oh no, we need to update the menu states as well...
     QSettings settings;
     settings.beginGroup("Analyser");
+
     settings.setValue("auto-analysis", true);
-    settings.setValue("precision-analysis", false);
-    settings.setValue("lowamp-analysis", true);
-    settings.setValue("onset-analysis", true);
-    settings.setValue("prune-analysis", true);
+    
+    auto keyMap = Analyser::getAnalysisSettings();
+    for (auto p: keyMap) {
+        settings.setValue(p.first, p.second);
+    }
+
     settings.endGroup();
     updateAnalyseStates();
 }
 
 void
 MainWindow::updateAnalyseStates()
 {
     QSettings settings;
     settings.beginGroup("Analyser");
+
     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();
+    m_autoAnalyse->setChecked(autoAnalyse);
+
+    std::map<QString, QAction *> actions {
+        { "precision-analysis", m_precise },
+        { "lowamp-analysis", m_lowamp },
+        { "onset-analysis", m_onset },
+        { "prune-analysis", m_prune }
+    };
+
+    auto keyMap = Analyser::getAnalysisSettings();
+    
+    for (auto p: actions) {
+        auto ki = keyMap.find(p.first);
+        if (ki != keyMap.end()) {
+            p.second->setChecked(settings.value
+                                 (ki->first, ki->second).toBool());
+        } else {
+            throw std::logic_error("Internal error: One or more analysis settings keys not found in map returned by Analyser: check updateAnalyseStates and getAnalysisSettings");
+        }
+    }
+
     settings.endGroup();
-
-    m_autoAnalyse->setChecked(autoAnalyse);
-    m_precise->setChecked(precise);
-    m_lowamp->setChecked(lowamp);
-    m_onset->setChecked(onset);
-    m_prune->setChecked(prune);
 }
 
 void
 MainWindow::autoAnalysisToggled()
 {

 
     QSettings settings;
     settings.beginGroup("Analyser");
     settings.setValue("auto-analysis", set);
     settings.endGroup();
+
+    // make result visible explicitly, in case e.g. we just set the wrong key
+    updateAnalyseStates();
 }
 
 void
 MainWindow::precisionAnalysisToggled()
 {

     settings.beginGroup("Analyser");
     settings.setValue("precision-analysis", set);
     settings.endGroup();
 
     // don't run analyseNow() automatically -- it's a destructive operation
+
+    // make result visible explicitly, in case e.g. we just set the wrong key
+    updateAnalyseStates();
 }
 
 void
 MainWindow::lowampAnalysisToggled()
 {

     settings.beginGroup("Analyser");
     settings.setValue("lowamp-analysis", set);
     settings.endGroup();
 
     // don't run analyseNow() automatically -- it's a destructive operation
+
+    // make result visible explicitly, in case e.g. we just set the wrong key
+    updateAnalyseStates();
 }
 
 void
 MainWindow::onsetAnalysisToggled()
 {

     settings.beginGroup("Analyser");
     settings.setValue("onset-analysis", set);
     settings.endGroup();
 
     // don't run analyseNow() automatically -- it's a destructive operation
+
+    // make result visible explicitly, in case e.g. we just set the wrong key
+    updateAnalyseStates();
 }
 
 void
 MainWindow::pruneAnalysisToggled()
 {

     settings.beginGroup("Analyser");
     settings.setValue("prune-analysis", set);
     settings.endGroup();
 
     // don't run analyseNow() automatically -- it's a destructive operation
+
+    // make result visible explicitly, in case e.g. we just set the wrong key
+    updateAnalyseStates();
 }
 
 void
 MainWindow::setupHelpMenu()
 {