From 8cdbea788f0e9a74c2890b47d9ac0a59a511e2f0 Mon Sep 17 00:00:00 2001
From: Joe Taylor <joe@princeton.edu>
Date: Mon, 29 Aug 2022 13:45:29 -0400
Subject: [PATCH] Clean up some displayed parameters in Echo mode.
---
lib/avecho.f90 | 2 +-
widgets/mainwindow.cpp | 7 +++----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/lib/avecho.f90 b/lib/avecho.f90
index 44c44d458..69b006e41 100644
--- a/lib/avecho.f90
+++ b/lib/avecho.f90
@@ -31,7 +31,7 @@ subroutine avecho(id2,ndop,nfrit,nauto,nqual,f1,xlevel,snrdb,db_err, &
read(39,*) fspread
close(39)
endif
- fspread=min(max(0.1,fspread),700.0)
+ fspread=min(max(0.04,fspread),700.0)
width=fspread
dop=ndop
sq=0.
diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp
index 9eeb38cfa..313d6db60 100644
--- a/widgets/mainwindow.cpp
+++ b/widgets/mainwindow.cpp
@@ -1619,8 +1619,8 @@ void MainWindow::dataSink(qint64 frames)
}
if(m_monitoring or m_auto or m_diskData) {
QString t;
- t = t.asprintf("%3d %7.1f %7.1f %7.1f %7.1f %7d %7.1f %3d",echocom_.nsum,xlevel,sigdb,
- dBerr,dfreq,nDopTotal,width,nqual);
+ t = t.asprintf("%3d %7.1f %7.1f %7.1f %6d %7d %7.1f %3d",echocom_.nsum,xlevel,sigdb,
+ dBerr,qRound(dfreq),nDopTotal,width,nqual);
QString t0;
if(m_diskData) {
t0=t0.asprintf("%06d ",m_UTCdisk);
@@ -1631,13 +1631,12 @@ void MainWindow::dataSink(qint64 frames)
if (ui) ui->decodedTextBrowser->appendText(t);
}
if(m_echoGraph->isVisible()) m_echoGraph->plotSpec();
- if(m_saveAll) {
+ if(m_saveAll and !m_diskData) {
int idir=1;
save_echo_params_(&m_fDop,&nDop,&nfrit,&f1,&width,dec_data.d2,&idir);
m_fSpread=width;
}
m_nclearave=0;
-
}
if(m_mode=="FreqCal") {
return;