comparison src/Analyser.cpp @ 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

 QString
 Analyser::reAnalyseSelection(Selection sel, FrequencyRange range)
 {
     if (sel == m_reAnalysingSelection) return "";
 
-    clearReAnalysis();
-
+    showPitchCandidates(false);
+    m_reAnalysisCandidates.clear();
+    m_currentCandidate = -1;
     m_reAnalysingSelection = sel;
+
+    m_preAnalysis = Clipboard();
+    Layer *myLayer = m_layers[PitchTrack];
+    if (myLayer) {
+        myLayer->copy(m_pane, sel, m_preAnalysis);
+    }
 
     TransformFactory *tf = TransformFactory::getInstance();
     
     QString plugname = "pYIN";
     QString base = "vamp:pyin:localcandidatepyin:";

 
     pitchTrack->deleteSelection(sel);
 }
 
 void
-Analyser::clearReAnalysis()
-{
-    foreach (Layer *layer, m_reAnalysisCandidates) {
-        m_document->removeLayerFromView(m_pane, layer);
-        m_document->deleteLayer(layer); // also releases its model
-    }
+Analyser::clearReAnalysis(Selection sel)
+{
+    showPitchCandidates(false);
+
     m_reAnalysisCandidates.clear();
     m_reAnalysingSelection = Selection();
     m_currentCandidate = -1;
+
+    Layer *myLayer = m_layers[PitchTrack];
+    if (!myLayer) return;
+    myLayer->deleteSelection(sel);
+    myLayer->paste(m_pane, m_preAnalysis, 0, false);
 }    
 
 void
 Analyser::takePitchTrackFrom(Layer *otherLayer)
 {