diff --git a/qmap/libqmap/q65b.f90 b/qmap/libqmap/q65b.f90 index 1d88303a7..28c4207c5 100644 --- a/qmap/libqmap/q65b.f90 +++ b/qmap/libqmap/q65b.f90 @@ -133,7 +133,6 @@ subroutine q65b(nutc,nqd,fcenter,nfcal,nfsample,ikhz,mousedf,ntol, & freq1=freq0 + 0.001d0*(ikhz1-ikhz) frx=0.001*k0*df+nkhz_center-48.0+1.0 - 0.001*nfcal fsked=frx - 0.001*ndop00/2.0 - 0.001*offset - print*,'B',nCFOM,ndop00,frx,fsked,nsnr0,bClickDecode if(iand(nCFOM,2).eq.2) write(*,3001) nCFOM,ndop00,frx,fsked 3001 format('A',i5,i8,f10.3,f10.1) ctmp=csubmode//' '//trim(msg0) diff --git a/qmap/libqmap/q65c.f90 b/qmap/libqmap/q65c.f90 index a3e8bb313..678d504b3 100644 --- a/qmap/libqmap/q65c.f90 +++ b/qmap/libqmap/q65c.f90 @@ -44,7 +44,6 @@ subroutine q65c(itimer) call chkstat(dd,max_nhsym,bSkip) if(bSkip) return - print*,'A' call timer('decode0 ',0) call decode0(dd,ss,savg) call timer('decode0 ',1) diff --git a/qmap/mainwindow.cpp b/qmap/mainwindow.cpp index 17ca8a739..404a82f08 100644 --- a/qmap/mainwindow.cpp +++ b/qmap/mainwindow.cpp @@ -197,8 +197,7 @@ MainWindow::MainWindow(QWidget *parent) : MainWindow::~MainWindow() { writeSettings(); - int itimer=1; - q65c_(&itimer); + q65c_(&m_one); if (soundInThread.isRunning()) { soundInThread.quit(); @@ -332,6 +331,7 @@ void MainWindow::dataSink(int k) static int ndiskdat; static int nb; static int k0=0; + static int ndop00=0; static float px=0.0; static uchar lstrong[1024]; static float slimit; @@ -351,7 +351,6 @@ void MainWindow::dataSink(int k) if(!m_fs96000) nfsample=95238; if(m_bCFOM) { - int ndop00=0; if(m_astro_window) ndop00=m_astro_window->getSelfDop(); cfom_(datcom_.d4, &k0, &k, &ndop00); } @@ -748,7 +747,6 @@ void MainWindow::diskWriteFinished() //diskWriteFinished void MainWindow::decoderFinished() //diskWriteFinished { - qDebug() << "bb Decoder Finished"; ui->DecodeButton->setStyleSheet(""); decodeBusy(false); m_startAnother=m_loopall; @@ -921,9 +919,7 @@ void MainWindow::decode() //decode() decodes_.ncand=0; decodes_.nQDecoderDone=0; if(m_nTx30<5) { - int itimer=0; - qDebug() << "aa" << datcom_.nagain; - watcher3.setFuture(QtConcurrent::run (std::bind (q65c_, &itimer))); + watcher3.setFuture(QtConcurrent::run (std::bind (q65c_, &m_zero))); decodeBusy(true); } } diff --git a/qmap/mainwindow.h b/qmap/mainwindow.h index 8dc7d377f..ab8b0bacd 100644 --- a/qmap/mainwindow.h +++ b/qmap/mainwindow.h @@ -122,6 +122,8 @@ private: qint32 m_nDoubleClicked=0; qint32 m_nline=0; qint32 m_WSJTX_TRperiod=0; + qint32 m_zero=0; + qint32 m_one=1; double m_fAdd; double m_xavg;