w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-05-24 10:22:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use bVHF rather than single_decode to control display of params at end of decode line.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7225 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2016-10-24 15:25:25 +00:00
parent 5b47bbf22e
commit 87d4f2fdbc
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/decoder.f90
View File

@ -23,7 +23,7 @@ subroutine multimode_decoder(ss,id2,params,nfsample)
end type counting_jt9_decoder end type counting_jt9_decoder
real ss(184,NSMAX) real ss(184,NSMAX)
logical baddata,newdat65,newdat9,single_decode logical baddata,newdat65,newdat9,single_decode,bVHF
integer*2 id2(NTMAX*12000) integer*2 id2(NTMAX*12000)
type(params_block) :: params type(params_block) :: params
real*4 dd(NTMAX*12000) real*4 dd(NTMAX*12000)
@ -38,6 +38,7 @@ subroutine multimode_decoder(ss,id2,params,nfsample)
my_jt9%decoded = 0 my_jt9%decoded = 0
single_decode=iand(params%nexp_decode,32).ne.0 single_decode=iand(params%nexp_decode,32).ne.0
bVHF=iand(params%nexp_decode,64).ne.0
if(mod(params%nranera,2).eq.0) ntrials=10**(params%nranera/2) if(mod(params%nranera,2).eq.0) ntrials=10**(params%nranera/2)
if(mod(params%nranera,2).eq.1) ntrials=3*10**(params%nranera/2) if(mod(params%nranera,2).eq.1) ntrials=3*10**(params%nranera/2)
if(params%nranera.eq.0) ntrials=0 if(params%nranera.eq.0) ntrials=0
@ -265,7 +266,7 @@ contains
write(*,1010) params%nutc,snr,dt,freq write(*,1010) params%nutc,snr,dt,freq
else else
is_average=nsum.ge.2 is_average=nsum.ge.2
if(params%naggressive.gt.0 .and. ft.gt.0) then if(bVHF .and. ft.gt.0) then
cflags='f ' cflags='f '
if(is_deep) then if(is_deep) then
cflags(1:2)='d1' cflags(1:2)='d1'

7
mainwindow.cpp
View File

@ -2202,10 +2202,9 @@ void MainWindow::decode() //decode()
if(m_config.decode_at_52s()) dec_data.params.emedelay=2.5; if(m_config.decode_at_52s()) dec_data.params.emedelay=2.5;
dec_data.params.minSync=ui->syncSpinBox->isVisible () ? m_minSync : 0; dec_data.params.minSync=ui->syncSpinBox->isVisible () ? m_minSync : 0;
dec_data.params.nexp_decode=0; dec_data.params.nexp_decode=0;
if(m_config.single_decode()) { if(m_config.single_decode()) dec_data.params.nexp_decode += 32;
dec_data.params.nexp_decode += 32; if(m_config.enable_VHF_features()) dec_data.params.nexp_decode += 64;
if(dec_data.params.naggressive<1) dec_data.params.naggressive=1;
}
strncpy(dec_data.params.datetime, m_dateTime.toLatin1(), 20); strncpy(dec_data.params.datetime, m_dateTime.toLatin1(), 20);
strncpy(dec_data.params.mycall, (m_config.my_callsign()+" ").toLatin1(),12); strncpy(dec_data.params.mycall, (m_config.my_callsign()+" ").toLatin1(),12);

1
plotter.cpp
View File

@ -722,5 +722,4 @@ void CPlotter::SetPercent2DScreen(int percent)
void CPlotter::setVHF(bool bVHF) void CPlotter::setVHF(bool bVHF)
{ {
m_bVHF=bVHF; m_bVHF=bVHF;
qDebug() << "A" << m_bVHF;
} }