w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-07-31 05:02:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Tidy up FreqCal mode time signal switching and Rx DF

Browse Source 
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
This commit is contained in:
Bill Somerville 2017-01-09 13:50:02 +00:00
parent 5b62f118c6
commit 105aa045b3
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
mainwindow.cpp
View File

@ -219,7 +219,7 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
m_nWSPRdecodes {0}, m_nWSPRdecodes {0},
m_k0 {9999999}, m_k0 {9999999},
m_nPick {0}, 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_TRperiodFast {-1},
m_nTx73 {0}, m_nTx73 {0},
m_btxok {false}, m_btxok {false},
@ -4546,7 +4546,6 @@ void MainWindow::on_actionFreqCal_triggered()
m_mode="FreqCal"; m_mode="FreqCal";
ui->actionFreqCal->setChecked(true); ui->actionFreqCal->setChecked(true);
switch_mode(Modes::FreqCal); switch_mode(Modes::FreqCal);
m_current_frequency_list_iter = m_config.frequencies ()->begin ();
m_wideGraph->setMode(m_mode); m_wideGraph->setMode(m_mode);
statusChanged(); statusChanged();
m_TRperiod=30; m_TRperiod=30;
@ -4556,11 +4555,12 @@ void MainWindow::on_actionFreqCal_triggered()
m_FFTSize = m_nsps / 2; m_FFTSize = m_nsps / 2;
Q_EMIT FFTSize (m_FFTSize); Q_EMIT FFTSize (m_FFTSize);
m_hsymStop=96; m_hsymStop=96;
m_frequency_list_fcal_iter = m_config.frequencies ()->begin ();
ui->RxFreqSpinBox->setValue(1500); ui->RxFreqSpinBox->setValue(1500);
on_RxFreqSpinBox_valueChanged (ui->RxFreqSpinBox->value ()); // ensure triggers
setup_status_bar (true); setup_status_bar (true);
// 18:15:47 0 1 1500 1550.349 0.100 3.5 10.2 // 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"); ui->decodedTextLabel->setText(" UTC Freq CAL Offset fMeas DF Level S/N");
on_actionFrequency_calibration_triggered ();
} }
void MainWindow::switch_mode (Mode mode) void MainWindow::switch_mode (Mode mode)
@ -4655,6 +4655,11 @@ void MainWindow::on_TxFreqSpinBox_valueChanged(int n)
void MainWindow::on_RxFreqSpinBox_valueChanged(int n) void MainWindow::on_RxFreqSpinBox_valueChanged(int n)
{ {
m_wideGraph->setRxFreq(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 ()) if (m_lockTxFreq && ui->TxFreqSpinBox->isEnabled ())
{ {
ui->TxFreqSpinBox->setValue (n); ui->TxFreqSpinBox->setValue (n);
@ -6097,15 +6102,20 @@ void MainWindow::on_actionErase_reference_spectrum_triggered()
void MainWindow::on_actionFrequency_calibration_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_frequency_list_fcal_iter == m_config.frequencies ()->end ())
if (++m_current_frequency_list_iter == m_config.frequencies ()->end ())
{ {
// loop back to beginning // 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) void MainWindow::on_sbCQTxFreq_valueChanged(int)

2
mainwindow.h
View File

@ -378,7 +378,7 @@ private:
qint32 m_TRindex; qint32 m_TRindex;
qint32 m_FtolIndex; qint32 m_FtolIndex;
qint32 m_Ftol; qint32 m_Ftol;
FrequencyList::const_iterator m_current_frequency_list_iter; FrequencyList::const_iterator m_frequency_list_fcal_iter;
qint32 m_TRperiodFast; qint32 m_TRperiodFast;
qint32 m_nTx73; qint32 m_nTx73;
qint32 m_UTCdisk; qint32 m_UTCdisk;