comparison src/Analyser.h @ 194:34797795a76c

Clearing the selection by hitting Esc now restores the selected region of the pitch track to its contents from before the selection was made (and any alternate candidate chosen). Fixes feature #885

 #include <map>
 #include <vector>
 
 #include "framework/Document.h"
 #include "base/Selection.h"
+#include "base/Clipboard.h"
 
 class WaveFileModel;
 class Pane;
 class PaneStack;
 class Layer;

      * 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.
+     *
+     *!!! this interface is not right
      */
     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.
+     *
+     *!!! this interface is not right
      */
     void showPitchCandidates(bool shown);
 
     /**
      * If a re-analysis has been activated, switch the selected area

      * tracks up or down an octave in the selected area.
      */
     void shiftOctave(Selection sel, bool up);
 
     /**
-     * Remove any re-analysis layers.
+     * Remove any re-analysis layers (equivalent to
+     * showPitchCandidates(false)) and also reset the pitch track in
+     * the given selection to its state prior to the last re-analysis,
+     * abandoning any changes made since then.
      */
-    void clearReAnalysis();
+    void clearReAnalysis(Selection sel);
 
     /**
      * Import the pitch track from the given layer into our
      * pitch-track layer.
      */

     PaneStack *m_paneStack;
     Pane *m_pane;
 
     mutable std::map<Component, Layer *> m_layers;
 
+    Clipboard m_preAnalysis;
     Selection m_reAnalysingSelection;
     std::vector<Layer *> m_reAnalysisCandidates;
     int m_currentCandidate;
     bool m_candidatesVisible;