comparison src/MainWindow.cpp @ 198:bb391844e2aa

Switching pitch candidate no longer wraps around: you can't go higher than the highest or lower than the lowest (though you can go either "up" or "down" if none of the alternate candidates has been selected yet, regardless of whether the candidates are higher or lower than the actual pitch track)

     action = new QAction(tr("Pick Higher Pitch Candidate"), this);
     action->setShortcut(tr("Ctrl+Up"));
     action->setStatusTip(tr("Switch to the next higher pitch candidate in the selected region"));
     m_keyReference->registerShortcut(action);
     connect(action, SIGNAL(triggered()), this, SLOT(switchPitchUp()));
-    connect(this, SIGNAL(canChangePitchCandidate(bool)), action, SLOT(setEnabled(bool)));
+    connect(this, SIGNAL(canChangeToHigherCandidate(bool)), action, SLOT(setEnabled(bool)));
     menu->addAction(action);
     m_rightButtonMenu->addAction(action);
     
     action = new QAction(tr("Pick Lower Pitch Candidate"), this);
     action->setShortcut(tr("Ctrl+Down"));
     action->setStatusTip(tr("Switch to the next lower pitch candidate in the selected region"));
     m_keyReference->registerShortcut(action);
     connect(action, SIGNAL(triggered()), this, SLOT(switchPitchDown()));
-    connect(this, SIGNAL(canChangePitchCandidate(bool)), action, SLOT(setEnabled(bool)));
+    connect(this, SIGNAL(canChangeToLowerCandidate(bool)), action, SLOT(setEnabled(bool)));
     menu->addAction(action);
     m_rightButtonMenu->addAction(action);
     
     menu->addSeparator();
     m_rightButtonMenu->addSeparator();

     bool haveCurrentTimeValueLayer = 
         (haveCurrentLayer &&
          qobject_cast<TimeValueLayer *>(currentLayer));
     bool pitchCandidatesVisible = 
         m_analyser->arePitchCandidatesShown();
+    bool haveHigher =
+        m_analyser->haveHigherPitchCandidate();
+    bool haveLower =
+        m_analyser->haveLowerPitchCandidate();
 
     emit canChangePlaybackSpeed(true);
     int v = m_playSpeed->value();
     emit canSpeedUpPlayback(v < m_playSpeed->maximum());
     emit canSlowDownPlayback(v > m_playSpeed->minimum());
 
     emit canChangePitchCandidate(pitchCandidatesVisible && haveSelection);
+    emit canChangeToHigherCandidate(pitchCandidatesVisible && haveSelection && haveHigher);
+    emit canChangeToLowerCandidate(pitchCandidatesVisible && haveSelection && haveLower);
 
     if (pitchCandidatesVisible) {
         m_showCandidatesAction->setText(tr("Hide Pitch Candidates"));
         m_showCandidatesAction->setStatusTip(tr("Remove the display of alternate pitch candidates for the selected region"));
     } else {