From 8ee47c1768e8b63c7dbaed6e28e9568afffb3965 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Tue, 17 Jan 2017 19:21:57 +0000 Subject: [PATCH] Faster decoding if mode65==0. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@7526 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- libm65/map65a.f90 | 3 +-- libm65/qra64c.f90 | 8 +++++++- mainwindow.cpp | 2 -- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/libm65/map65a.f90 b/libm65/map65a.f90 index caaa25dc8..2c86cf2d0 100644 --- a/libm65/map65a.f90 +++ b/libm65/map65a.f90 @@ -118,7 +118,6 @@ subroutine map65a(dd,ss,savg,newdat,nutc,fcenter,ntol,idphi,nfa,nfb, & enddo if(smax.gt.1.1 .or. ia.eq.ib) then - if(nqd.lt.2) then ! Look for JT65 sync patterns and shorthand square-wave patterns. call timer('ccf65 ',0) @@ -354,7 +353,7 @@ subroutine map65a(dd,ss,savg,newdat,nutc,fcenter,ntol,idphi,nfa,nfb, & 1013 format('',2i4) flush(6) endif -! if(nqd.eq.2) exit !### TESTING: do only QRA64 + if(nqd.eq.2 .and. mode65.eq.0) go to 999 if(nagain.eq.1 .and. nqd.eq.1) go to 999 enddo diff --git a/libm65/qra64c.f90 b/libm65/qra64c.f90 index be235b962..4bfe74ee3 100644 --- a/libm65/qra64c.f90 +++ b/libm65/qra64c.f90 @@ -87,15 +87,21 @@ subroutine qra64c(cx,cy,nutc,nqd,ikhz,nfqso,ntol,xpol,mycall_12, & irc=-99 s3lim=20. + itryz=5 itz=11 if(mode64.eq.4) itz=9 if(mode64.eq.2) itz=7 if(mode64.eq.1) itz=5 + if(mode64.eq.1) then + itz=0 + itryz=1 + endif + LL=64*(mode64+2) NN=63 napmin=99 - do itry0=1,5 + do itry0=1,itryz idt=itry0/2 if(mod(itry0,2).eq.0) idt=-idt jpk=jpk0 + 750*idt diff --git a/mainwindow.cpp b/mainwindow.cpp index 3c0019ea1..dbc1c2997 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1530,7 +1530,6 @@ void MainWindow::guiUpdate() int itx=0; ptt_(&m_pttPort,&itx,&iptt); // Lower PTT if(!m_txMute) { -// qDebug() << "C"; soundOutThread.quitExecution=true;\ } m_transmitting=false; @@ -2062,7 +2061,6 @@ void MainWindow::on_actionErase_map65_tx_log_triggered() //Erase Tx log void MainWindow::on_actionNoJT65_triggered() { m_modeJT65=0; - qDebug() << QPalette::Window; lab5->setStyleSheet(""); lab5->setText(""); }