w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2026-07-16 07:44:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

Do not make unneeded rig adjustments when Doppler tracking disabled

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5595 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Bill Somerville
2015-06-12 00:26:44 +00:00
parent 98f84a5902
commit 588c037ae9
4 changed files with 45 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mainwindow.cpp
+32 -16
View File
@@ -1362,6 +1362,8 @@ void MainWindow::on_actionAstronomical_data_triggered()
// hook up termination signal
connect (this, &MainWindow::finished, m_astroWidget.data (), &Astro::close);
connect (m_astroWidget.data (), &Astro::doppler_tracking_toggled
, this, &MainWindow::DopplerTracking_toggled);
}
m_astroWidget->showNormal();
m_astroWidget->raise ();
@@ -2147,23 +2149,9 @@ void MainWindow::guiUpdate()
if(m_monitoring or m_transmitting) ipct=int(100*m_nseq/txDuration);
progressBar->setValue(ipct);
}
QDateTime t = QDateTime::currentDateTimeUtc();
if (m_astroWidget) {
auto astro_correction = m_astroWidget->astroUpdate(t, m_config.my_grid (), m_hisGrid
, m_dialFreq, "Echo" == m_mode, m_transmitting);
if (!m_bSimplex // only adjust frequency if allowed by mode
&& m_dialFreq >= 50000000) { // and above 50MHz
if(m_transmitting) {
m_dialFreqTx = m_freqNominal + astro_correction;
ui->labDialFreq->setText (Radio::pretty_frequency_MHz_string (m_dialFreqTx));
Q_EMIT m_config.transceiver_tx_frequency (m_dialFreqTx);
} else {
m_dialFreq = m_freqNominal + astro_correction;
ui->labDialFreq->setText (Radio::pretty_frequency_MHz_string (m_dialFreq));
Q_EMIT m_config.transceiver_frequency(m_dialFreq);
}
}
}
astroCalculations (t, m_astroWidget && m_astroWidget->doppler_tracking ());
if(m_transmitting) {
char s[37];
@@ -4344,3 +4332,31 @@ void MainWindow::on_tabWidget_currentChanged (int new_value)
m_nonWSPRTab = new_value;
}
}
void MainWindow::DopplerTracking_toggled (bool enabled)
{
if (!enabled) {
// do one astro update and last adjustment
astroCalculations (QDateTime::currentDateTimeUtc(), true);
}
}
void MainWindow::astroCalculations (QDateTime const& time, bool adjust) {
if (m_astroWidget) {
auto astro_correction = m_astroWidget->astroUpdate(time, m_config.my_grid (), m_hisGrid
, m_dialFreq, "Echo" == m_mode, m_transmitting);
if (adjust && !m_bSimplex // only adjust frequency if
// requested and allowed by mode
&& m_dialFreq >= 50000000) { // and above 50MHz
if(m_transmitting) {
m_dialFreqTx = m_freqNominal + astro_correction;
ui->labDialFreq->setText (Radio::pretty_frequency_MHz_string (m_dialFreqTx));
Q_EMIT m_config.transceiver_tx_frequency (m_dialFreqTx);
} else {
m_dialFreq = m_freqNominal + astro_correction;
ui->labDialFreq->setText (Radio::pretty_frequency_MHz_string (m_dialFreq));
Q_EMIT m_config.transceiver_frequency(m_dialFreq);
}
}
}
}