diff src/Analyser.h @ 184:ea15fa75ae6f

Ctrl+Return now switches the alternate pitch candidates on and off; Ctrl+Up/Down selects among them

--- a/src/Analyser.h	Thu Feb 20 12:00:16 2014 +0000
+++ b/src/Analyser.h	Sun Feb 23 17:59:23 2014 +0000
@@ -91,6 +91,24 @@
     QString reAnalyseSelection(Selection sel);
 
     /**
+     * Return true if the analysed pitch candidates are currently
+     * visible (by default they are hidden after construction until
+     * the user requests them). Note that the shown/hidden state is
+     * independent of whether any pitch candidates actually exist --
+     * it's possible they might be shown but not have been created yet
+     * because creation (through reAnalyseSelection) is asynchronous.
+     */
+    bool arePitchCandidatesShown() const;
+
+    /**
+     * Show or hide the analysed pitch candidate layers. As in
+     * arePitchCandidatesShown, this is independent of whether the
+     * candidate layers actually exist. Call reAnalyseSelection to
+     * schedule creation of those layers.
+     */
+    void showPitchCandidates(bool shown);
+
+    /**
      * If a re-analysis has been activated, switch the selected area
      * of the main pitch track to a different candidate from the
      * analysis results.
@@ -98,10 +116,10 @@
     void switchPitchCandidate(Selection sel, bool up);
 
     /**
-     * Remove the pitch estimates from the selected area of the main
+     * Delete the pitch estimates from the selected area of the main
      * pitch track.
      */
-    void clearPitches(Selection sel);
+    void deletePitches(Selection sel);
 
     /**
      * Move the main pitch track and any active analysis candidate
@@ -142,6 +160,7 @@
     Selection m_reAnalysingSelection;
     std::vector<Layer *> m_reAnalysisCandidates;
     int m_currentCandidate;
+    bool m_candidatesVisible;
 
     QString addVisualisations();
     QString addWaveform();