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

Add Doppler to displayed text lines in Echo mode. Enable RIT spinner when DopplerMethod is None.

Browse Source
This commit is contained in:
Joe Taylor 2022-07-28 11:00:47 -04:00
parent d4ed6785fb
commit 2e82ce4546
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
widgets/astro.cpp
View File

@ -167,6 +167,7 @@ auto Astro::astroUpdate(QDateTime const& t, QString const& mygrid, QString const
correction.width=width2; correction.width=width2;
} }
if (ui_->cbDopplerTracking->isChecked ()) { if (ui_->cbDopplerTracking->isChecked ()) {
ui_->sbRIT->setEnabled(m_DopplerMethod==0);
switch (m_DopplerMethod) switch (m_DopplerMethod)
{ {
case 1: // All Doppler correction done here; DX station stays at nominal dial frequency. case 1: // All Doppler correction done here; DX station stays at nominal dial frequency.
@ -361,10 +362,8 @@ void Astro::selectOnDxEcho()
qint32 Astro::nfRIT() qint32 Astro::nfRIT()
{ {
if(m_DopplerMethod==0) { if(m_DopplerMethod==0) {
ui_->sbRIT->setEnabled(true);
return ui_->sbRIT->value(); return ui_->sbRIT->value();
} else { } else {
ui_->sbRIT->setEnabled(false);
return 0; return 0;
} }
} }

10
widgets/mainwindow.cpp
View File

@ -1609,10 +1609,12 @@ void MainWindow::dataSink(qint64 frames)
} }
avecho_(dec_data.d2,&nDop,&nfrit,&nauto,&nqual,&f1,&xlevel,&sigdb, avecho_(dec_data.d2,&nDop,&nfrit,&nauto,&nqual,&f1,&xlevel,&sigdb,
&dBerr,&dfreq,&width,&m_diskData); &dBerr,&dfreq,&width,&m_diskData);
qDebug() << "bb" << m_s6 << f1 << nfrit << nDop << width; // qDebug() << "bb" << m_s6 << f1 << nfrit << nDop << width;
QString t; QString t;
t = t.asprintf("%3d %7.1f %7.1f %7.1f %7.1f %7.1f %3d",echocom_.nsum,xlevel,sigdb, // t = t.asprintf("%3d %7.1f %7.1f %7.1f %7.1f %7d %7.1f %3d %7d %7d",echocom_.nsum,xlevel,sigdb,
dBerr,dfreq,width,nqual); // dBerr,dfreq,m_fDop,width,nqual,nDop,nfrit);
t = t.asprintf("%3d %7.1f %7.1f %7.1f %7.1f %7d %7.1f %3d",echocom_.nsum,xlevel,sigdb,
dBerr,dfreq,m_fDop,width,nqual);
t=QDateTime::currentDateTimeUtc().toString("hh:mm:ss ") + t; t=QDateTime::currentDateTimeUtc().toString("hh:mm:ss ") + t;
if (ui) ui->decodedTextBrowser->appendText(t); if (ui) ui->decodedTextBrowser->appendText(t);
if(m_echoGraph->isVisible()) m_echoGraph->plotSpec(); if(m_echoGraph->isVisible()) m_echoGraph->plotSpec();
@ -7101,7 +7103,7 @@ void MainWindow::on_actionEcho_triggered()
m_bFastMode=false; m_bFastMode=false;
m_bFast9=false; m_bFast9=false;
WSPR_config(true); WSPR_config(true);
ui->lh_decodes_headings_label->setText(" UTC N Level SNR dBerr DF Width Q"); ui->lh_decodes_headings_label->setText(" UTC N Level SNR dBerr DF Doppler Width Q");
// 01234567890123456789012345678901234567 // 01234567890123456789012345678901234567
displayWidgets(nWidgets("00000000000000000010001000000000000000")); displayWidgets(nWidgets("00000000000000000010001000000000000000"));
fast_config(false); fast_config(false);