From b3d8750949de6e0868b458faf584918f825eb68a Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Thu, 18 Jan 2024 16:25:08 -0500 Subject: [PATCH] Increase width of "result" from 60 to 64, to accommodate longest messages. --- qmap/commons.h | 2 +- qmap/libqmap/decode0.f90 | 2 +- qmap/libqmap/q65b.f90 | 3 +-- qmap/libqmap/q65c.f90 | 2 +- qmap/libqmap/qmapa.f90 | 2 +- widgets/mainwindow.cpp | 2 +- 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/qmap/commons.h b/qmap/commons.h index e973a58de..1b9d72210 100644 --- a/qmap/commons.h +++ b/qmap/commons.h @@ -93,7 +93,7 @@ extern struct { int nQDecoderDone; //1 for real-time decodes, 2 for data from disk int nWDecoderBusy; //Set to 1 when WSJT-X decoder is busy int nWTransmitting; //Set to TRperiod when WSJT-X is transmitting - char result[50][60]; //Staging area for QMAP decodes + char result[50][64]; //Staging area for QMAP decodes } decodes_; extern struct { diff --git a/qmap/libqmap/decode0.f90 b/qmap/libqmap/decode0.f90 index 271ed54f8..3567e4ed7 100644 --- a/qmap/libqmap/decode0.f90 +++ b/qmap/libqmap/decode0.f90 @@ -10,7 +10,7 @@ subroutine decode0(dd,ss,savg) logical*1 bAlso30 character mycall*12,hiscall*12,mygrid*6,hisgrid*6,datetime*20 character mycall0*12,hiscall0*12,hisgrid0*6 - character*60 result + character*64 result common/decodes/ndecodes,ncand,nQDecoderDone,nWDecoderBusy, & nWTransmitting,result(50) common/npar/fcenter,nutc,fselected,mousedf,mousefqso,nagain, & diff --git a/qmap/libqmap/q65b.f90 b/qmap/libqmap/q65b.f90 index 2717b0449..5ef96b5c6 100644 --- a/qmap/libqmap/q65b.f90 +++ b/qmap/libqmap/q65b.f90 @@ -26,7 +26,7 @@ subroutine q65b(nutc,nqd,fcenter,nfcal,nfsample,ikhz,mousedf,ntol, & character*6 hisgrid character*4 grid4 character*3 csubmode - character*60 result,ctmp + character*64 result,ctmp character*20 datetime,datetime1 common/decodes/ndecodes,ncand,nQDecoderDone,nWDecoderBusy, & nWTransmitting,result(50) @@ -118,7 +118,6 @@ subroutine q65b(nutc,nqd,fcenter,nfcal,nfsample,ikhz,mousedf,ntol, & do i=1,ndecodes !Check for dupes i1=index(result(i)(42:),trim(msg0)) - if(bClickDecode) print*,'C',i,i1,result(i)(42:),trim(msg0) ! If this is a dupe, don't save it again: if(i1.gt.0 .and. (.not.bClickDecode .or. nhsym.eq.390)) go to 800 enddo diff --git a/qmap/libqmap/q65c.f90 b/qmap/libqmap/q65c.f90 index f742948d6..7832375a2 100644 --- a/qmap/libqmap/q65c.f90 +++ b/qmap/libqmap/q65c.f90 @@ -20,7 +20,7 @@ subroutine q65c character*12 mycall,hiscall character*6 mygrid,hisgrid character*20 datetime - character*60 result + character*64 result common/decodes/ndecodes,ncand,nQDecoderDone,nWDecoderBusy, & nWTransmitting,result(50) common/datcom2/dd(2,5760000),ss(400,NFFT),savg(NFFT),nparams0 diff --git a/qmap/libqmap/qmapa.f90 b/qmap/libqmap/qmapa.f90 index edc6b41e3..7c61856a8 100644 --- a/qmap/libqmap/qmapa.f90 +++ b/qmap/libqmap/qmapa.f90 @@ -27,7 +27,7 @@ subroutine qmapa(dd,ss,savg,newdat,nutc,fcenter,ntol,nfa,nfb, & logical*1 bAlso30,bClickDecode character mycall*12,hiscall*12,hisgrid*6 type(candidate) :: cand(MAX_CANDIDATES) - character*60 result + character*64 result character*20 datetime common/decodes/ndecodes,ncand,nQDecoderDone,nWDecoderBusy, & nWTransmitting,result(50) diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index 81772df38..d4fbe7415 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -225,7 +225,7 @@ struct { int nQDecoderDone; //QMAP decoder is finished (0 or 1) int nWDecoderBusy; //WSJT-X decoder is busy (0 or 1) int nWTransmitting; //WSJT-X is transmitting (0 or 1) - char result[50][60]; //Decodes as character*60 arrays + char result[50][64]; //Decodes as character*64 arrays } qmapcom; int* ipc_qmap;