comparison src/MainWindow.cpp @ 167:6b6906017536

Choose a different pitch candidate within selection by hitting Return

     menu->addAction(action);
 
     action = new QAction(tr("Octave Shift Down"), this);
     action->setShortcut(tr("PgDown"));
     connect(action, SIGNAL(triggered()), this, SLOT(octaveShiftDown()));
+    connect(this, SIGNAL(canClearSelection(bool)), action, SLOT(setEnabled(bool)));
+    menu->addAction(action);
+    
+    //!!! shortcuts, status tip, key reference etc
+    action = new QAction(tr("Switch Pitch Candidate"), this);
+    action->setShortcut(tr("Return"));
+    connect(action, SIGNAL(triggered()), this, SLOT(switchPitchUp()));
     connect(this, SIGNAL(canClearSelection(bool)), action, SLOT(setEnabled(bool)));
     menu->addAction(action);
 }
 
 void

 {
     if (!checkSaveModified()) return;
 
     while (m_paneStack->getPaneCount() > 0) {
 
-    Pane *pane = m_paneStack->getPane(m_paneStack->getPaneCount() - 1);
-
-    while (pane->getLayerCount() > 0) {
-        m_document->removeLayerFromView
-        (pane, pane->getLayer(pane->getLayerCount() - 1));
-    }
-
-    m_overview->unregisterView(pane);
-    m_paneStack->deletePane(pane);
+        Pane *pane = m_paneStack->getPane(m_paneStack->getPaneCount() - 1);
+
+        while (pane->getLayerCount() > 0) {
+            m_document->removeLayerFromView
+                (pane, pane->getLayer(pane->getLayerCount() - 1));
+        }
+        
+        m_overview->unregisterView(pane);
+        m_paneStack->deletePane(pane);
     }
 
     while (m_paneStack->getHiddenPaneCount() > 0) {
 
-    Pane *pane = m_paneStack->getHiddenPane
-        (m_paneStack->getHiddenPaneCount() - 1);
-
-    while (pane->getLayerCount() > 0) {
-        m_document->removeLayerFromView
-        (pane, pane->getLayer(pane->getLayerCount() - 1));
-    }
-
-    m_overview->unregisterView(pane);
-    m_paneStack->deletePane(pane);
+        Pane *pane = m_paneStack->getHiddenPane
+            (m_paneStack->getHiddenPaneCount() - 1);
+        
+        while (pane->getLayerCount() > 0) {
+            m_document->removeLayerFromView
+                (pane, pane->getLayer(pane->getLayerCount() - 1));
+        }
+        
+        m_overview->unregisterView(pane);
+        m_paneStack->deletePane(pane);
     }
 
     delete m_document;
     m_document = 0;
     m_viewManager->clearSelections();

     Selection sel(f0, f1);
     m_viewManager->setSelection(sel);
 }
 
 void
+MainWindow::clearSelection()
+{
+    cerr << "MainWindow::clearSelection()" << endl;
+
+    m_analyser->clearReAnalysis();
+    MainWindowBase::clearSelection();
+}
+
+void
 MainWindow::selectionChanged()
 {
     MultiSelection::SelectionList selections = m_viewManager->getSelections();
 
     cerr << "MainWindow::selectionChanged" << endl;

 }
 
 void
 MainWindow::octaveShift(bool up)
 {
+    // Should this be in the Analyser?
+
     float factor = (up ? 2.f : 0.5f);
 
     MultiSelection::SelectionList selections = m_viewManager->getSelections();
 
     CommandHistory::getInstance()->startCompoundOperation(tr("Octave Shift"), true);

             }
         }
     }
 
     CommandHistory::getInstance()->endCompoundOperation();
+}
+
+void
+MainWindow::switchPitchUp()
+{
+    MultiSelection::SelectionList selections = m_viewManager->getSelections();
+
+    for (MultiSelection::SelectionList::iterator k = selections.begin();
+         k != selections.end(); ++k) {
+        m_analyser->switchPitchCandidate(*k, true);
+    }
+}
+
+void
+MainWindow::switchPitchDown()
+{
+    MultiSelection::SelectionList selections = m_viewManager->getSelections();
+
+    for (MultiSelection::SelectionList::iterator k = selections.begin();
+         k != selections.end(); ++k) {
+        m_analyser->switchPitchCandidate(*k, false);
+    }
 }
 
 void
 MainWindow::playSpeedChanged(int position)
 {