From e6adce61e27557beeebd73c4d0779384802a3d97 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Thu, 18 Apr 2013 20:12:04 +0000 Subject: [PATCH] Minor changes in scaling of spectra for waterfall. Corrected typo in unix code. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3197 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- lib/symspec.f90 | 18 ++++++++++-------- mainwindow.cpp | 2 +- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/lib/symspec.f90 b/lib/symspec.f90 index 0b33e3e96..2a04d377a 100644 --- a/lib/symspec.f90 +++ b/lib/symspec.f90 @@ -134,17 +134,19 @@ subroutine symspec(k,ntrperiod,nsps,ingain,nb,nbslider,pxdb,s,red, & 999 continue - call pctile(s,iz,50,xmed0) - fac0=1.0/max(xmed0,0.006) -! ave0=sum(s(1:iz))/iz -! fac0=1.0/max(ave0,0.006) + fac00=0.35 + npct=20 + call pctile(s,iz,npct,xmed0) + fac0=fac00/max(xmed0,0.006) s(1:iz)=fac0*s(1:iz) - call pctile(ssum,iz,50,xmed1) - fac1=1.0/max(xmed1,0.006*ihsym) -! ave1=sum(ssum(1:iz))/iz -! fac1=1.0/max(ave1,0.006*ihsym) + call pctile(ssum,iz,npct,xmed1) + fac1=fac00/max(xmed1,0.006*ihsym) savg(1:iz)=fac1*ssum(1:iz) call redsync(ss,ntrperiod,ihsym,iz,red) +! write(67,3101) ihsym,k,xmed0,fac0,xmed1,fac1 +!3101 format(i4,i8,4e12.3) +! call flush(67) + return end subroutine symspec diff --git a/mainwindow.cpp b/mainwindow.cpp index 7a7967b18..47346a495 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1342,7 +1342,7 @@ void MainWindow::readFromStdout() //readFromStdout #endif #ifdef unix - if(b and !m_diskData and and okToPost) { + if(b and !m_diskData and okToPost) { int i1=msg.indexOf(" "); QString c2=msg.mid(i1+1); int i2=c2.indexOf(" ");