From 2e82ce45463779ab803ef7d7c4122ebb2bd20544 Mon Sep 17 00:00:00 2001
From: Joe Taylor <joe@princeton.edu>
Date: Thu, 28 Jul 2022 11:00:47 -0400
Subject: [PATCH] Add Doppler to displayed text lines in Echo mode.  Enable RIT
 spinner when DopplerMethod is None.

---
 widgets/astro.cpp      |  3 +--
 widgets/mainwindow.cpp | 10 ++++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/widgets/astro.cpp b/widgets/astro.cpp
index e0be707ee..fd0671d3c 100644
--- a/widgets/astro.cpp
+++ b/widgets/astro.cpp
@@ -167,6 +167,7 @@ auto Astro::astroUpdate(QDateTime const& t, QString const& mygrid, QString const
     correction.width=width2;
   }
   if (ui_->cbDopplerTracking->isChecked ()) {
+    ui_->sbRIT->setEnabled(m_DopplerMethod==0);
     switch (m_DopplerMethod)
       {
       case 1: // All Doppler correction done here; DX station stays at nominal dial frequency.
@@ -361,10 +362,8 @@ void Astro::selectOnDxEcho()
 qint32 Astro::nfRIT()
 {
   if(m_DopplerMethod==0) {
-    ui_->sbRIT->setEnabled(true);
     return ui_->sbRIT->value();
   } else {
-    ui_->sbRIT->setEnabled(false);
     return 0;
   }
 }
diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp
index 199c792ff..ce500577e 100644
--- a/widgets/mainwindow.cpp
+++ b/widgets/mainwindow.cpp
@@ -1609,10 +1609,12 @@ void MainWindow::dataSink(qint64 frames)
       }
       avecho_(dec_data.d2,&nDop,&nfrit,&nauto,&nqual,&f1,&xlevel,&sigdb,
           &dBerr,&dfreq,&width,&m_diskData);
-      qDebug() << "bb" << m_s6 << f1 << nfrit << nDop << width;
+//      qDebug() << "bb" << m_s6 << f1 << nfrit << nDop << width;
       QString t;
-      t = t.asprintf("%3d %7.1f %7.1f %7.1f %7.1f %7.1f %3d",echocom_.nsum,xlevel,sigdb,
-                dBerr,dfreq,width,nqual);
+//      t = t.asprintf("%3d %7.1f %7.1f %7.1f %7.1f %7d %7.1f %3d %7d %7d",echocom_.nsum,xlevel,sigdb,
+//                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;
       if (ui) ui->decodedTextBrowser->appendText(t);
       if(m_echoGraph->isVisible()) m_echoGraph->plotSpec();
@@ -7101,7 +7103,7 @@ void MainWindow::on_actionEcho_triggered()
   m_bFastMode=false;
   m_bFast9=false;
   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
   displayWidgets(nWidgets("00000000000000000010001000000000000000"));
   fast_config(false);