comparison src/MainWindow.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

     m_rightButtonMenu->addAction(action);
 
     action = new QAction(tr("C&lear Selection"), this);
     action->setShortcut(tr("Esc"));
     action->setStatusTip(tr("Clear the selection"));
-    connect(action, SIGNAL(triggered()), this, SLOT(clearSelection()));
+    connect(action, SIGNAL(triggered()), this, SLOT(abandonSelection()));
     connect(this, SIGNAL(canClearSelection(bool)), action, SLOT(setEnabled(bool)));
     m_keyReference->registerShortcut(action);
     menu->addAction(action);
     m_rightButtonMenu->addAction(action);
 

     Selection sel(f0, f1);
     m_viewManager->setSelection(sel);
 }
 
 void
-MainWindow::clearSelection()
-{
-    cerr << "MainWindow::clearSelection()" << endl;
+MainWindow::abandonSelection()
+{
+    // Named abandonSelection rather than clearSelection to indicate
+    // that this is an active operation -- it restores the original
+    // content of the pitch track in the selected region rather than
+    // simply un-selecting.
+
+    cerr << "MainWindow::abandonSelection()" << endl;
 
     CommandHistory::getInstance()->startCompoundOperation(tr("Clear Selection"), true);
 
-    m_analyser->clearReAnalysis();
+    MultiSelection::SelectionList selections = m_viewManager->getSelections();
+    if (!selections.empty()) {
+        Selection sel = *selections.begin();
+        m_analyser->clearReAnalysis(sel);
+    }
+
     MainWindowBase::clearSelection();
 
     CommandHistory::getInstance()->endCompoundOperation();
 }