From 105aa045b39c4a83ccabcb6bef3ece5e9359d2d7 Mon Sep 17 00:00:00 2001
From: Bill Somerville <g4wjs@classdesign.com>
Date: Mon, 9 Jan 2017 13:50:02 +0000
Subject: [PATCH] Tidy up FreqCal mode time signal switching and Rx DF

Rx  DF is  now  "real-time"  adjusting the  rig  in  concert with  the
monitored DF.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7465 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
---
 mainwindow.cpp | 24 +++++++++++++++++-------
 mainwindow.h   |  2 +-
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 87bf78315..e7b5afbc8 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -219,7 +219,7 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
   m_nWSPRdecodes {0},
   m_k0 {9999999},
   m_nPick {0},
-  m_current_frequency_list_iter {m_config.frequencies ()->end ()},
+  m_frequency_list_fcal_iter {m_config.frequencies ()->end ()},
   m_TRperiodFast {-1},
   m_nTx73 {0},
   m_btxok {false},
@@ -4546,7 +4546,6 @@ void MainWindow::on_actionFreqCal_triggered()
   m_mode="FreqCal";
   ui->actionFreqCal->setChecked(true);
   switch_mode(Modes::FreqCal);
-  m_current_frequency_list_iter = m_config.frequencies ()->begin ();
   m_wideGraph->setMode(m_mode);
   statusChanged();
   m_TRperiod=30;
@@ -4556,11 +4555,12 @@ void MainWindow::on_actionFreqCal_triggered()
   m_FFTSize = m_nsps / 2;
   Q_EMIT FFTSize (m_FFTSize);
   m_hsymStop=96;
+  m_frequency_list_fcal_iter = m_config.frequencies ()->begin ();
   ui->RxFreqSpinBox->setValue(1500);
+  on_RxFreqSpinBox_valueChanged (ui->RxFreqSpinBox->value ()); // ensure triggers
   setup_status_bar (true);
 //                               18:15:47      0  1  1500  1550.349     0.100    3.5   10.2
   ui->decodedTextLabel->setText("  UTC      Freq CAL Offset  fMeas       DF     Level   S/N");
-  on_actionFrequency_calibration_triggered ();
 }
 
 void MainWindow::switch_mode (Mode mode)
@@ -4655,6 +4655,11 @@ void MainWindow::on_TxFreqSpinBox_valueChanged(int n)
 void MainWindow::on_RxFreqSpinBox_valueChanged(int n)
 {
   m_wideGraph->setRxFreq(n);
+  if (m_mode == "FreqCal"
+      && m_frequency_list_fcal_iter != m_config.frequencies ()->end ())
+    {
+      setRig (m_frequency_list_fcal_iter->frequency_ - n);
+    }
   if (m_lockTxFreq && ui->TxFreqSpinBox->isEnabled ())
     {
       ui->TxFreqSpinBox->setValue (n);
@@ -6097,15 +6102,20 @@ void MainWindow::on_actionErase_reference_spectrum_triggered()
 
 void MainWindow::on_actionFrequency_calibration_triggered()
 {
-  if (m_current_frequency_list_iter != m_config.frequencies ()->end ())
+  // pick the next time signal
+  if (m_frequency_list_fcal_iter != m_config.frequencies ()->end ())
     {
-      setRig (m_current_frequency_list_iter->frequency_ - ui->RxFreqSpinBox->value ());
-      if (++m_current_frequency_list_iter == m_config.frequencies ()->end ())
+      if (++m_frequency_list_fcal_iter == m_config.frequencies ()->end ())
         {
           // loop back to beginning
-          m_current_frequency_list_iter = m_config.frequencies ()->begin ();
+          m_frequency_list_fcal_iter = m_config.frequencies ()->begin ();
         }
     }
+  // allow for empty list
+  if (m_frequency_list_fcal_iter != m_config.frequencies ()->end ())
+    {
+      setRig (m_frequency_list_fcal_iter->frequency_ - ui->RxFreqSpinBox->value ());
+    }
 }
 
 void MainWindow::on_sbCQTxFreq_valueChanged(int)
diff --git a/mainwindow.h b/mainwindow.h
index 113b3d608..fd2c79dc2 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -378,7 +378,7 @@ private:
   qint32  m_TRindex;
   qint32  m_FtolIndex;
   qint32  m_Ftol;
-  FrequencyList::const_iterator m_current_frequency_list_iter;
+  FrequencyList::const_iterator m_frequency_list_fcal_iter;
   qint32  m_TRperiodFast;
   qint32  m_nTx73;
   qint32  m_UTCdisk;