From adc5a559621196403f10b448af8ded86a48ee8f5 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Thu, 29 Nov 2012 19:01:48 +0000 Subject: [PATCH] Fixed the "DF6NM 73 K" bug in message packing. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2787 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- lib/packgrid.f90 | 4 ++-- mainwindow.cpp | 15 ++++++--------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/lib/packgrid.f90 b/lib/packgrid.f90 index 300d29e01..605ecf622 100644 --- a/lib/packgrid.f90 +++ b/lib/packgrid.f90 @@ -38,9 +38,9 @@ subroutine packgrid(grid,ng,text) ! Now check for extended-range signal reports: -50 to -31, and 0 to +49. 10 n=99 c1=grid(1:1) - read(grid,*,err=20) n + read(grid,*,err=20,end=20) n go to 30 -20 read(grid(2:4),*,err=30) n +20 read(grid(2:4),*,err=30,end=30) n 30 if(n.ge.-50 .and. n.le.49) then if(c1.eq.'R') then write(grid,1002) n+50 diff --git a/mainwindow.cpp b/mainwindow.cpp index 5af0ad277..3eeb75306 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -30,7 +30,7 @@ MainWindow::MainWindow(QWidget *parent) : ui->setupUi(this); #ifdef WIN32 -// freopen("wsjtx.log","w",stderr); + freopen("wsjtx.log","w",stderr); #endif on_EraseButton_clicked(); ui->labUTC->setStyleSheet( \ @@ -1189,17 +1189,14 @@ void MainWindow::ba2msg(QByteArray ba, char message[]) //ba2msg() bool eom; eom=false; int iz=ba.length(); - for(int i=0;i