w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-09-03 13:47:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Send needed arguments to q65c().

Browse Source
This commit is contained in:
Joe Taylor 2024-01-15 13:45:00 -05:00
parent ae1cf334e2
commit 4af9c58bb0
4 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qmap/libqmap/decode0.f90
View File

@ -49,9 +49,5 @@ subroutine decode0(dd,ss,savg)
datetime,ndop00,fselected,bAlso30,nhsym,NCFOM) datetime,ndop00,fselected,bAlso30,nhsym,NCFOM)
call timer('qmapa ',1) call timer('qmapa ',1)
write(*,3001) n60,datetime(1:11),nutc,newdat,nsave,ntx30a,ntx30b,ndecodes
3001 format('A',i3,1x,a11,i6.4,5i5)
return return
end subroutine decode0 end subroutine decode0

12
qmap/libqmap/q65c.f90
View File

@ -1,4 +1,4 @@
subroutine q65c(itimer) subroutine q65c(fname,revision)
use timer_module, only: timer use timer_module, only: timer
use timer_impl, only: fini_timer !, limtrace use timer_impl, only: fini_timer !, limtrace
@ -14,12 +14,14 @@ subroutine q65c(itimer)
integer nparams0(NJUNK+3),nparams(NJUNK+3) integer nparams0(NJUNK+3),nparams(NJUNK+3)
logical first logical first
logical*1 bAlso30 logical*1 bAlso30
character*(*) fname,revision
character*12 mycall,hiscall character*12 mycall,hiscall
character*6 mygrid,hisgrid character*6 mygrid,hisgrid
character*20 datetime character*20 datetime
character*60 result
common/decodes/ndecodes,ncand,nQDecoderDone,nWDecoderBusy, &
nWTransmitting,result(50)
common/datcom2/dd(2,5760000),ss(400,NFFT),savg(NFFT),nparams0 common/datcom2/dd(2,5760000),ss(400,NFFT),savg(NFFT),nparams0
!### REMEMBER that /npar/ is not updated until nparams=nparams0 is executed. ### !### REMEMBER that /npar/ is not updated until nparams=nparams0 is executed. ###
common/npar/fcenter,nutc,fselected,mousedf,mousefqso,nagain, & common/npar/fcenter,nutc,fselected,mousedf,mousefqso,nagain, &
ndepth,ndiskdat,ntx60,newdat,nn1,nn2,nfcal,nfshift, & ndepth,ndiskdat,ntx60,newdat,nn1,nn2,nfcal,nfshift, &
@ -70,6 +72,9 @@ subroutine q65c(itimer)
call decode0(dd,ss,savg) call decode0(dd,ss,savg)
call timer('decode0 ',1) call timer('decode0 ',1)
write(*,3001) n60,datetime(1:11),nutc,newdat,nsave,ntx30a,ntx30b,ndecodes
3001 format('A',i3,1x,a11,i6.4,5i5)
return return
end subroutine q65c end subroutine q65c
@ -80,7 +85,6 @@ subroutine all_done
call timer('decode0 ',101) call timer('decode0 ',101)
call fini_timer call fini_timer
print*,'All Done'
return return
end subroutine all_done end subroutine all_done

9
qmap/mainwindow.cpp
View File

@ -923,7 +923,7 @@ void MainWindow::decode() //decode()
saveFileName=m_saveDir + "/" + m_dateTime + ".qm"; saveFileName=m_saveDir + "/" + m_dateTime + ".qm";
} }
qDebug() << "aa" << m_n60 << datcom_.nhsym << m_revision << saveFileName; // qDebug() << "aa" << m_n60 << datcom_.nhsym << m_revision << saveFileName;
//No need to call decoder for first half, if we transmitted in the first half: //No need to call decoder for first half, if we transmitted in the first half:
if((datcom_.nhsym<=200) and (m_nTx30a>5)) return; if((datcom_.nhsym<=200) and (m_nTx30a>5)) return;
@ -931,8 +931,11 @@ void MainWindow::decode() //decode()
//No need to call decoder in second half, if we transmitted in that half: //No need to call decoder in second half, if we transmitted in that half:
if((datcom_.nhsym>200) and (m_nTx30b>5)) return; if((datcom_.nhsym>200) and (m_nTx30b>5)) return;
int zero=0; int len1=saveFileName.length();
watcher3.setFuture(QtConcurrent::run (std::bind (q65c_, &zero))); int len2=m_revision.length();
watcher3.setFuture(QtConcurrent::run (std::bind (q65c_,
saveFileName.toLatin1().constData(),
m_revision.toLatin1().constData(), len1, len2)));
decodeBusy(true); decodeBusy(true);
} }

4
qmap/mainwindow.h
View File

@ -199,9 +199,7 @@ extern "C" {
void astrosub00_ (int* nyear, int* month, int* nday, double* uth, int* nfreq, void astrosub00_ (int* nyear, int* month, int* nday, double* uth, int* nfreq,
const char* mygrid, int* ndop00, int len1); const char* mygrid, int* ndop00, int len1);
void q65c_(int* itimer); void q65c_(const char* fname, const char* revision, int len1, int len2);
// void q65c_(const char* fname, const char* revision, int* itimer,
// int len1, int len2);
void all_done_(); void all_done_();