From cd216964d28ce3f602c262fa13fd9d18a07fea8e Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Thu, 25 Oct 2012 15:06:44 +0000 Subject: [PATCH] Update jt9.f90 git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2691 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- lib/jt9.f90 | 14 ++++++++++---- mainwindow.cpp | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/lib/jt9.f90 b/lib/jt9.f90 index d598e73ee..4f0f9a2e9 100644 --- a/lib/jt9.f90 +++ b/lib/jt9.f90 @@ -90,12 +90,18 @@ program jt9 nutc=nutc0 ! Get sync, approx freq - call sync9(ss,tstep,df3,ntol,nfqso,sync,fpk,red) + call sync9(ss,tstep,df3,ntol,nfqso,sync,snr,fpk0,red) ! print*,'B',sync,fpk,npts8,nsps - call spec9(c0,npts8,nsps,fpk,xdt,i1SoftSymbols) + call spec9(c0,npts8,nsps,fpk0,fpk,xdt,i1SoftSymbols) call decode9(i1SoftSymbols,msg) - write(*,1010) nutc,sync,xdt,1000.0+fpk,msg -1010 format(i4.4,3f7.1,2x,a22) + nsync=sync + nsnr=nint(snr) + width=0.0 + write(*,1010) nutc,nsync,nsnr,xdt,1000.0+fpk,width,msg +1010 format(i4.4,i4,i5,f6.1,f8.2,f6.2,3x,a22) + +! write(*,1010) nutc,sync,xdt,1000.0+fpk,msg +!1010 format(i4.4,3f7.1,2x,a22) enddo go to 999 diff --git a/mainwindow.cpp b/mainwindow.cpp index 2df3f15b7..9df9c5fcc 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1,4 +1,4 @@ -//---------------------------------------------------------------- MainWindow +//--------------------------------------------------------------- MainWindow #include "mainwindow.h" #include "ui_mainwindow.h" #include "devsetup.h"