w4kek
/
WSJT-X
mirror of https://github.com/saitohirga/WSJT-X.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Implement "Single decode" logic; write to "avemsg.txt" in jt65_decode; 

list the correct UTC in decoded text line when using the "Decode" button.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6519 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2016-03-10 18:35:41 +00:00
parent 697886465d
commit 80873a6040
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/jt65_decode.f90
View File

@ -77,7 +77,7 @@ contains
character*22 decoded
end type accepted_decode
type(accepted_decode) dec(50)
logical :: first_time, robust, prtavg
logical :: first_time,robust,prtavg,single_decode
integer h0(0:11),d0(0:11)
real r0(0:11)
@ -128,7 +128,8 @@ contains
! endif
nfa=nf1
nfb=nf2
if(naggressive.gt.0 .and. ntol.lt.1000) then
single_decode=iand(nexp_decode,32).ne.0
if(single_decode .or. (naggressive.gt.0 .and. ntol.lt.1000)) then
nfa=max(200,nfqso-ntol)
nfb=min(4000,nfqso+ntol)
thresh0=1.0
@ -150,7 +151,9 @@ contains
call timer('sync65 ',1)
endif
! If a candidate was found within +/- ntol of nfqso, move it into ca(1).
call fqso_first(nfqso,ntol,ca,ncand)
if(single_decode) ncand=1
nvec=ntrials
if(ncand.gt.75) then
@ -174,7 +177,7 @@ contains
if(ipass.eq.2) ntry65b=ntry65b + 1
call timer('decod65a',0)
call decode65a(dd,npts,first_time,nqd,freq,nflip,mode65,nvec, &
naggressive,ndepth,mycall,hiscall,hisgrid,nexp_decode, &
naggressive,ndepth,mycall,hiscall,hisgrid,nexp_decode, &
sync2,a,dtx,nft,qual,nhist,nsmo,decoded)
call timer('decod65a',1)
nfreq=nint(freq+a(1))
@ -352,7 +355,7 @@ contains
do i=1,nsave
csync='*'
if(nflipsave(i).lt.0.0) csync='#'
write(61,1000) cused(i),iutc(i),syncsave(i),dtsave(i),nfsave(i),csync
write(14,1000) cused(i),iutc(i),syncsave(i),dtsave(i),nfsave(i),csync
1000 format(a1,i5.4,f6.1,f6.2,i6,1x,a1)
enddo

7
mainwindow.cpp
View File

@ -1768,8 +1768,10 @@ void MainWindow::decode() //decode()
{
if(!m_dataAvailable or m_TRperiod==0) return;
ui->DecodeButton->setChecked (true);
if(m_diskData and !m_bFastMode) dec_data.params.nutc=dec_data.params.nutc/100;
if(dec_data.params.newdat==1 && (!m_diskData)) {
if(dec_data.params.nagain==0 && m_diskData && !m_bFastMode) {
dec_data.params.nutc=dec_data.params.nutc/100;
}
if(dec_data.params.nagain==0 && dec_data.params.newdat==1 && (!m_diskData)) {
qint64 ms = QDateTime::currentMSecsSinceEpoch() % 86400000;
int imin=ms/60000;
int ihr=imin/60;
@ -1786,7 +1788,6 @@ void MainWindow::decode() //decode()
dec_data.params.nutc=10000*ihr + 100*imin + isec;
}
}
dec_data.params.nfqso=m_wideGraph->rxFreq();
dec_data.params.ndepth=m_ndepth;
dec_data.params.n2pass=1;