From d24842271bde9a1886af6c62421423b66b4a8af3 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Thu, 15 Nov 2012 16:39:41 +0000 Subject: [PATCH] Put nlim ar end of lines in wsjtx_rx.log. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2734 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- lib/decoder.f90 | 12 ++++++------ mainwindow.cpp | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/decoder.f90 b/lib/decoder.f90 index ea80eae59..a9602260e 100644 --- a/lib/decoder.f90 +++ b/lib/decoder.f90 @@ -50,23 +50,23 @@ subroutine decoder(ntrSeconds,ndepth,nRxLog,c00) if(ntrMinutes.eq.1) then nsps=6912 df3=1500.0/2048.0 - fmt='(i4.4,i4,i5,f6.1,f8.0,f6.1,3x,a22)' + fmt='(i4.4,i4,i5,f6.1,f8.0,f6.1,3x,a22,5x,i6)' else if(ntrMinutes.eq.2) then nsps=15360 df3=1500.0/2048.0 - fmt='(i4.4,i4,i5,f6.1,f8.1,f6.2,3x,a22)' + fmt='(i4.4,i4,i5,f6.1,f8.1,f6.2,3x,a22,5x,i6)' else if(ntrMinutes.eq.5) then nsps=40960 df3=1500.0/6144.0 - fmt='(i4.4,i4,i5,f6.1,f8.1,f6.2,3x,a22)' + fmt='(i4.4,i4,i5,f6.1,f8.1,f6.2,3x,a22,5x,i6)' else if(ntrMinutes.eq.10) then nsps=82944 df3=1500.0/12288.0 - fmt='(i4.4,i4,i5,f6.1,f8.2,f6.2,3x,a22)' + fmt='(i4.4,i4,i5,f6.1,f8.2,f6.2,3x,a22,5x,i6)' else if(ntrMinutes.eq.30) then nsps=252000 df3=1500.0/32768.0 - fmt='(i4.4,i4,i5,f6.1,f8.2,f6.2,3x,a22)' + fmt='(i4.4,i4,i5,f6.1,f8.2,f6.2,3x,a22,5x,i6)' endif if(nsps.eq.0) stop 'Error: bad TRperiod' !Better: return an error code### @@ -116,7 +116,7 @@ subroutine decoder(ntrSeconds,ndepth,nRxLog,c00) if(msg.ne.' ') then write(13,fmt) nutc,nsync,nsnr,xdt,1000.0+fpk,drift,msg - write(14,fmt) nutc,nsync,nsnr,xdt,1000.0+fpk,drift,msg + write(14,fmt) nutc,nsync,nsnr,xdt,1000.0+fpk,drift,msg,nlim fgood=f nsynced=1 ndecoded=1 diff --git a/mainwindow.cpp b/mainwindow.cpp index 0679c75f8..1c3256d05 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1,4 +1,4 @@ -//-------------------------------------------------------------- MainWindow +//------------------------------------------------------------- MainWindow #include "mainwindow.h" #include "ui_mainwindow.h" #include "devsetup.h"