w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-03-29 07:28:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Do not alolow bailouts when data were read from disk.

Browse Source
This commit is contained in:
Joe Taylor 2020-03-12 15:07:56 -04:00
parent 0d535f24fb
commit 8e7685ea36
4 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/decoder.f90
View File

@ -118,7 +118,7 @@ subroutine multimode_decoder(ss,id2,params,nfsample)
params%nftx,newdat,params%nutc,params%nfa,params%nfb, & params%nftx,newdat,params%nutc,params%nfa,params%nfb, &
params%nzhsym,params%ndepth,ncontest,logical(params%nagain), & params%nzhsym,params%ndepth,ncontest,logical(params%nagain), &
logical(params%lft8apon),logical(params%lapcqonly), & logical(params%lft8apon),logical(params%lapcqonly), &
params%napwid,mycall,hiscall,hisgrid,ss(1,1)) params%napwid,mycall,hiscall,hisgrid,ss(1,1),params%ndiskdat)
call timer('decft8 ',1) call timer('decft8 ',1)
if(nfox.gt.0) then if(nfox.gt.0) then
n30min=minval(n30fox(1:nfox)) n30min=minval(n30fox(1:nfox))

8
lib/ft8_decode.f90
View File

@ -34,7 +34,7 @@ contains
subroutine decode(this,callback,iwave,nQSOProgress,nfqso,nftx,newdat, & subroutine decode(this,callback,iwave,nQSOProgress,nfqso,nftx,newdat, &
nutc,nfa,nfb,nzhsym,ndepth,ncontest,nagain,lft8apon,lapcqonly, & nutc,nfa,nfb,nzhsym,ndepth,ncontest,nagain,lft8apon,lapcqonly, &
napwid,mycall12,hiscall12,hisgrid6,ss0) napwid,mycall12,hiscall12,hisgrid6,ss0,ldiskdat)
use timer_module, only: timer use timer_module, only: timer
include 'ft8/ft8_params.f90' include 'ft8/ft8_params.f90'
@ -47,6 +47,7 @@ contains
real dd(15*12000),dd1(15*12000) real dd(15*12000),dd1(15*12000)
logical, intent(in) :: lft8apon,lapcqonly,nagain logical, intent(in) :: lft8apon,lapcqonly,nagain
logical newdat,lsubtract,ldupe,lrefinedt logical newdat,lsubtract,ldupe,lrefinedt
logical*1 ldiskdat
logical lsubtracted(MAX_EARLY) logical lsubtracted(MAX_EARLY)
character*12 mycall12,hiscall12 character*12 mycall12,hiscall12
character*6 hisgrid6 character*6 hisgrid6
@ -88,7 +89,7 @@ contains
lrefinedt) lrefinedt)
lsubtracted(i)=.true. lsubtracted(i)=.true.
endif endif
if(nint(ss0).ge.49) then !Bail out before done if(.not.ldiskdat .and. nint(ss0).ge.49) then !Bail out before done
call timer('sub_ft8b',1) call timer('sub_ft8b',1)
go to 700 go to 700
endif endif
@ -173,7 +174,8 @@ contains
call this%callback(sync,nsnr,xdt,f1,msg37,iaptype,qual) call this%callback(sync,nsnr,xdt,f1,msg37,iaptype,qual)
endif endif
endif endif
if(nzhsym.eq.41 .and. nint(ss0).ge.46) go to 700 !Bail out before done if(.not.ldiskdat .and. nzhsym.eq.41 .and. &
nint(ss0).ge.46) go to 700 !Bail out before done
enddo enddo
enddo enddo
go to 800 go to 800

10
widgets/mainwindow.cpp
View File

@ -2325,6 +2325,11 @@ void MainWindow::createStatusBar() //createStatusBar
last_tx_label.setFrameStyle (QFrame::Panel | QFrame::Sunken); last_tx_label.setFrameStyle (QFrame::Panel | QFrame::Sunken);
statusBar()->addWidget (&last_tx_label); statusBar()->addWidget (&last_tx_label);
ndecodes_label.setAlignment (Qt::AlignHCenter);
ndecodes_label.setMinimumSize (QSize {30, 18});
ndecodes_label.setFrameStyle (QFrame::Panel | QFrame::Sunken);
statusBar()->addWidget (&ndecodes_label);
band_hopping_label.setAlignment (Qt::AlignHCenter); band_hopping_label.setAlignment (Qt::AlignHCenter);
band_hopping_label.setMinimumSize (QSize {90, 18}); band_hopping_label.setMinimumSize (QSize {90, 18});
band_hopping_label.setFrameStyle (QFrame::Panel | QFrame::Sunken); band_hopping_label.setFrameStyle (QFrame::Panel | QFrame::Sunken);
@ -3195,8 +3200,9 @@ void MainWindow::readFromStdout() //readFromStdout
int navg=0; int navg=0;
if(line_read.indexOf("<DecodeFinished>") >= 0) { if(line_read.indexOf("<DecodeFinished>") >= 0) {
// qDebug() << "bb" << QDateTime::currentDateTimeUtc().toString("hh:mm:ss.zzz") << line_read; // qDebug() << "bb" << QDateTime::currentDateTimeUtc().toString("hh:mm:ss.zzz") << line_read;
m_ndecodes=0;
if(m_mode=="QRA64") m_wideGraph->drawRed(0,0); if(m_mode=="QRA64") m_wideGraph->drawRed(0,0);
m_bDecoded = line_read.mid(20).trimmed().toInt() > 0; m_bDecoded = line_read.mid(20).trimmed().toInt() > 0;
auto tnow = QDateTime::currentDateTimeUtc (); auto tnow = QDateTime::currentDateTimeUtc ();
double tdone = fmod(double(tnow.time().second()),m_TRperiod); double tdone = fmod(double(tnow.time().second()),m_TRperiod);
int mswait; int mswait;
@ -3214,6 +3220,8 @@ void MainWindow::readFromStdout() //readFromStdout
} }
return; return;
} else { } else {
m_ndecodes+=1;
ndecodes_label.setText(QString::number(m_ndecodes));
if(m_mode=="JT4" or m_mode=="JT65" or m_mode=="QRA64") { if(m_mode=="JT4" or m_mode=="JT65" or m_mode=="QRA64") {
int n=line_read.indexOf("f"); int n=line_read.indexOf("f");
if(n<0) n=line_read.indexOf("d"); if(n<0) n=line_read.indexOf("d");

2
widgets/mainwindow.h
View File

@ -469,6 +469,7 @@ private:
qint32 m_kin0=0; qint32 m_kin0=0;
qint32 m_earlyDecode=41; qint32 m_earlyDecode=41;
qint32 m_earlyDecode2=47; qint32 m_earlyDecode2=47;
qint32 m_ndecodes=0;
bool m_btxok; //True if OK to transmit bool m_btxok; //True if OK to transmit
bool m_diskData; bool m_diskData;
@ -559,6 +560,7 @@ private:
QLabel last_tx_label; QLabel last_tx_label;
QLabel auto_tx_label; QLabel auto_tx_label;
QLabel band_hopping_label; QLabel band_hopping_label;
QLabel ndecodes_label;
QProgressBar progressBar; QProgressBar progressBar;
QLabel watchdog_label; QLabel watchdog_label;