From 874204dfe9bacc158bf7c4a5f79f8dd70217041e Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Fri, 8 Jul 2016 15:22:50 +0000 Subject: [PATCH] Another attempt at optimizing the red sync curve for QRA64. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6895 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- lib/qra64a.f90 | 27 ++++++++++++++------------- mainwindow.cpp | 1 - plotter.cpp | 3 ++- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/lib/qra64a.f90 b/lib/qra64a.f90 index e378161df..4ec18d217 100644 --- a/lib/qra64a.f90 +++ b/lib/qra64a.f90 @@ -78,20 +78,21 @@ subroutine qra64a(dd,nf1,nf2,nfqso,ntol,mycall_12,sync,nsnr,dtx,nfreq, & enddo enddo - red(ia:ib)=0. - rewind 73 - do i=ia+3,ib-3 - r1=red0(i) - red0(i)=0. - r0=max(red0(i-3),red0(i-2),red0(i+2),red0(i+3)) - red0(i)=r1 - red(i)=max(0.0,r1-r0) - write(73,3001) i*df,red(i),red0(i),r0 -3001 format(4f12.3) - enddo - flush(73) +! red(ia:ib)=0. +! rewind 73 +! do i=ia+3,ib-3 +! r1=red0(i) +! red0(i)=0. +! r0=max(red0(i-3),red0(i-2),red0(i+2),red0(i+3)) +! red0(i)=r1 +! red(i)=max(0.0,r1-r0) +! write(73,3001) i*df,red(i),red0(i),r0 +!3001 format(4f12.3) +! enddo +! flush(73) - write(17) ia,ib,red(ia:ib) + red0=red0-4.0 + write(17) ia,ib,red0(ia:ib) close(17) if0=nint(f0/df) diff --git a/mainwindow.cpp b/mainwindow.cpp index 0381a58fb..d8eb7d7fb 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -3975,7 +3975,6 @@ void MainWindow::on_actionMSK144_triggered() m_toneSpacing=0.0; ui->cbShMsgs->setChecked(false); ui->cbShMsgs->setVisible(true); -// ui->sbFtol->setVisible(false); //Maybe? ui->actionMSK144->setChecked(true); } diff --git a/plotter.cpp b/plotter.cpp index cfed4a26e..31e746464 100644 --- a/plotter.cpp +++ b/plotter.cpp @@ -148,7 +148,8 @@ void CPlotter::draw(float swide[], bool bScroll, bool bRed) y3[i]=smax; if(smax>y3max)y3max=smax; } - float fac=0.8/qMax(y3max,50.0f); + float fac=0.8/qMax(y3max,10.0f); + qDebug() << "a" << y3max; for(int i=1; i0.0) { y2=fac*y3[i];