From cba66a924297fd8c806fc7d45a99d8726651614d Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Tue, 14 May 2013 22:47:32 +0000 Subject: [PATCH] Move Tune button to right of "Halt Tx". Tweak decoding parameters in sync9. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3268 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- lib/decoder.f90 | 6 +++--- lib/symspec.f90 | 1 + lib/sync9.f90 | 6 +++--- mainwindow.cpp | 2 +- mainwindow.ui | 15 +++++++-------- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/lib/decoder.f90 b/lib/decoder.f90 index 22d8396a0..abfb85822 100644 --- a/lib/decoder.f90 +++ b/lib/decoder.f90 @@ -139,8 +139,8 @@ subroutine decoder(ss,c0,nstandalone) nsnr=nint(snrdb) ndrift=nint(drift/df3) - write(38,3002) nutc,nsnr,i,ccfred(i),nlim,msg -3002 format(i4.4,i5,i6,f8.1,i9,2x,a22) + write(38,3002) nutc,nsnr,i,freq,ccfred(i),nlim,msg +3002 format(i4.4,i5,i6,2f8.1,i9,2x,a22) if(msg.ne.' ') then if(nqd.eq.0) ndecodes0=ndecodes0+1 @@ -176,7 +176,7 @@ subroutine decoder(ss,c0,nstandalone) if(nstandalone.eq.0) call timer('decoder ',101) call system_clock(iclock,iclock_rate,iclock_max) - write(39,3001) nutc,nfreqs1,nfreqs0,ndecodes1,ndecodes0, & + write(39,3001) nutc,nfreqs1,nfreqs0,ndecodes1,ndecodes0+ndecodes1, & float(iclock-iclock0)/iclock_rate 3001 format(5i8,f10.3) call flush(38) diff --git a/lib/symspec.f90 b/lib/symspec.f90 index 370fff9ad..94e88dae2 100644 --- a/lib/symspec.f90 +++ b/lib/symspec.f90 @@ -152,6 +152,7 @@ subroutine symspec(k,ntrperiod,nsps,ingain,nb,nbslider,pxdb,s,red, & call pctile(ssum,iz,npct,xmed1) fac1=fac00/max(xmed1,0.006*ihsym) savg(1:iz)=fac1*ssum(1:iz) + savg(iz+1:iz+20)=savg(iz) call redsync(ss,ntrperiod,ihsym,iz,red) return diff --git a/lib/sync9.f90 b/lib/sync9.f90 index 1fb73a70a..2cddce861 100644 --- a/lib/sync9.f90 +++ b/lib/sync9.f90 @@ -13,10 +13,10 @@ subroutine sync9(ss,nzhsym,lag1,lag2,ia,ib,ccfred,ipkbest) do i=ia,ib !Loop over freq range ss1=ss(1:184,i) - call pctile(ss1,nzhsym,50,xmed) + call pctile(ss1,nzhsym,40,xmed) ss1=ss1/xmed - 1.0 do j=1,nzhsym - if(ss1(j).gt.3.0) ss1(j)=5.0 + if(ss1(j).gt.3.0) ss1(j)=3.0 enddo smax=0. @@ -40,7 +40,7 @@ subroutine sync9(ss,nzhsym,lag1,lag2,ia,ib,ccfred,ipkbest) call pctile(ccfred(ia),ib-ia+1,50,xmed) if(xmed.le.0.0) xmed=1.0 - ccfred=1.33*ccfred/xmed + ccfred=2.0*ccfred/xmed return end subroutine sync9 diff --git a/mainwindow.cpp b/mainwindow.cpp index d1475d88f..53ee4bfa7 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1,4 +1,4 @@ -//-------------------------------------------------------------- MainWindow +//--------------------------------------------------------------- MainWindow #include "mainwindow.h" #include "ui_mainwindow.h" #include "devsetup.h" diff --git a/mainwindow.ui b/mainwindow.ui index 3fa13b018..7bafe1c14 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -458,13 +458,6 @@ p, li { white-space: pre-wrap; } - - - - &Tune - - - @@ -503,6 +496,13 @@ p, li { white-space: pre-wrap; } + + + + &Tune + + + @@ -2845,7 +2845,6 @@ p, li { white-space: pre-wrap; } monitorButton DecodeButton EraseButton - tuneButton autoButton stopTxButton bandComboBox