From b0056364e18d219d4c652fbd03ef336de5f20e1f Mon Sep 17 00:00:00 2001
From: Joe Taylor <k1jt@arrl.org>
Date: Fri, 12 Apr 2013 14:20:05 +0000
Subject: [PATCH] One more try at getting the decoded line lengths right. 
 Should be OK in Linux, too -- CHECK THIS -- and keeps the message string at
 length 22, as required for JT65.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3160 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
---
 lib/decoder.f90 | 14 +++++++-------
 mainwindow.cpp  |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/decoder.f90 b/lib/decoder.f90
index aa6fecd8d..a56193fd1 100644
--- a/lib/decoder.f90
+++ b/lib/decoder.f90
@@ -34,23 +34,23 @@ subroutine decoder(ss,c0)
   if(ntrMinutes.eq.1) then
      nsps=6912
      df3=1500.0/2048.0
-     fmt='(i4.4,i4,i5,f6.1,f8.0,i4,3x,a18)'
+     fmt='(i4.4,i4,i5,f6.1,f8.0,i4,3x,a22)'
   else if(ntrMinutes.eq.2) then
      nsps=15360
      df3=1500.0/2048.0
-     fmt='(i4.4,i4,i5,f6.1,f8.1,i4,3x,a18)'
+     fmt='(i4.4,i4,i5,f6.1,f8.1,i4,3x,a22)'
   else if(ntrMinutes.eq.5) then
      nsps=40960
      df3=1500.0/6144.0
-     fmt='(i4.4,i4,i5,f6.1,f8.1,i4,3x,a18)' 
+     fmt='(i4.4,i4,i5,f6.1,f8.1,i4,3x,a22)' 
  else if(ntrMinutes.eq.10) then
      nsps=82944
      df3=1500.0/12288.0
-     fmt='(i4.4,i4,i5,f6.1,f8.2,i4,3x,a18)'
+     fmt='(i4.4,i4,i5,f6.1,f8.2,i4,3x,a22)'
   else if(ntrMinutes.eq.30) then
      nsps=252000
      df3=1500.0/32768.0
-     fmt='(i4.4,i4,i5,f6.1,f8.2,i4,3x,a18)'
+     fmt='(i4.4,i4,i5,f6.1,f8.2,i4,3x,a22)'
   endif
   if(nsps.eq.0) stop 'Error: bad TRperiod'    !Better: return an error code###
 
@@ -133,8 +133,8 @@ subroutine decoder(ss,c0)
            nsnr=nint(snrdb)
            ndrift=nint(drift/df3)
            if(msg.ne.'                      ') then
-              write(*,fmt) nutc,nsync,nsnr,xdt,freq,ndrift,msg(1:18)
-              write(13,fmt) nutc,nsync,nsnr,xdt,freq,ndrift,msg(1:18)
+              write(*,fmt) nutc,nsync,nsnr,xdt,freq,ndrift,msg
+              write(13,fmt) nutc,nsync,nsnr,xdt,freq,ndrift,msg
               fgood=f
               nsynced=1
               ndecoded=1
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 359f53945..acbf49956 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -1239,7 +1239,7 @@ void MainWindow::readFromStdout()                             //readFromStdout
       bool bQSO=abs(t.mid(22,4).toInt() - g_pWideGraph->QSOfreq()) < 10;
       QString t1=t.mid(0,5) + t.mid(10,4) + t.mid(15,5) + t.mid(22,4) +
           t.mid(32);
-      t1=t1.replace("\n","").mid(0,t1.length()-2);
+      t1=t1.replace("\n","").mid(0,t1.length()-4);
       QString s = "<table border=0 cellspacing=0 width=100%><tr><td bgcolor=\"" +
           bg + "\"><pre>" + t1 + "</pre></td></tr></table>";
       if(bQSO) {