Another attempt at optimizing the red sync curve for QRA64.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6895 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2016-07-08 15:22:50 +00:00
parent 6d2e974b8d
commit 874204dfe9
3 changed files with 16 additions and 15 deletions

View File

@ -78,20 +78,21 @@ subroutine qra64a(dd,nf1,nf2,nfqso,ntol,mycall_12,sync,nsnr,dtx,nfreq, &
enddo enddo
enddo enddo
red(ia:ib)=0. ! red(ia:ib)=0.
rewind 73 ! rewind 73
do i=ia+3,ib-3 ! do i=ia+3,ib-3
r1=red0(i) ! r1=red0(i)
red0(i)=0. ! red0(i)=0.
r0=max(red0(i-3),red0(i-2),red0(i+2),red0(i+3)) ! r0=max(red0(i-3),red0(i-2),red0(i+2),red0(i+3))
red0(i)=r1 ! red0(i)=r1
red(i)=max(0.0,r1-r0) ! red(i)=max(0.0,r1-r0)
write(73,3001) i*df,red(i),red0(i),r0 ! write(73,3001) i*df,red(i),red0(i),r0
3001 format(4f12.3) !3001 format(4f12.3)
enddo ! enddo
flush(73) ! flush(73)
write(17) ia,ib,red(ia:ib) red0=red0-4.0
write(17) ia,ib,red0(ia:ib)
close(17) close(17)
if0=nint(f0/df) if0=nint(f0/df)

View File

@ -3975,7 +3975,6 @@ void MainWindow::on_actionMSK144_triggered()
m_toneSpacing=0.0; m_toneSpacing=0.0;
ui->cbShMsgs->setChecked(false); ui->cbShMsgs->setChecked(false);
ui->cbShMsgs->setVisible(true); ui->cbShMsgs->setVisible(true);
// ui->sbFtol->setVisible(false); //Maybe?
ui->actionMSK144->setChecked(true); ui->actionMSK144->setChecked(true);
} }

View File

@ -148,7 +148,8 @@ void CPlotter::draw(float swide[], bool bScroll, bool bRed)
y3[i]=smax; y3[i]=smax;
if(smax>y3max)y3max=smax; if(smax>y3max)y3max=smax;
} }
float fac=0.8/qMax(y3max,50.0f); float fac=0.8/qMax(y3max,10.0f);
qDebug() << "a" << y3max;
for(int i=1; i<iz; i++) { for(int i=1; i<iz; i++) {
if(y3[i]>0.0) { if(y3[i]>0.0) {
y2=fac*y3[i]; y2=fac*y3[i];