diff --git a/qmap/libqmap/save_qm.f90 b/qmap/libqmap/save_qm.f90 index ebb398696..1811c4569 100644 --- a/qmap/libqmap/save_qm.f90 +++ b/qmap/libqmap/save_qm.f90 @@ -47,12 +47,6 @@ subroutine save_qm(fname,prog_id,mycall,mygrid,dd,ntx30a,ntx30b,fcenter, & enddo if(ia.gt.30*96000) id1(1:2,1:ia-1)=0 if(ib.eq.30*96000) id1(1:2,ib+1:60*96000)=0 - - jz=len(fname) - fname(jz-1:jz)="qm" -! write(*,3001) fname(jz-13:jz),rms,db(rms*rms),dmax,nbad,ia,ib, & -! nsum/(2*96000),ntx30a,ntx30b -!3001 format(a14,3f7.1,i8,2i9,3i5) open(29,file=trim(fname),status='unknown',access='stream') prog_id_24=prog_id//" " diff --git a/qmap/mainwindow.cpp b/qmap/mainwindow.cpp index 018b23cb4..39ca9ee24 100644 --- a/qmap/mainwindow.cpp +++ b/qmap/mainwindow.cpp @@ -135,11 +135,6 @@ MainWindow::MainWindow(QWidget *parent) : future1 = new QFuture<void>; watcher1 = new QFutureWatcher<void>; connect(watcher1, SIGNAL(finished()),this,SLOT(diskDat())); - - future2 = new QFuture<void>; - watcher2 = new QFutureWatcher<void>; - connect(watcher2, SIGNAL(finished()),this,SLOT(diskWriteFinished())); - connect(&watcher3, SIGNAL(finished()),this,SLOT(decoderFinished())); // Assign input device and start input thread @@ -423,9 +418,7 @@ void MainWindow::dataSink(int k) if (!dir.exists()) dir.mkpath("."); QString fname=m_saveDir + "/" + t.date().toString("yyMMdd") + "_" + t.time().toString("hhmm"); - fname += ".iq"; -// *future2 = QtConcurrent::run(save_iq, fname); -// watcher2->setFuture(*future2); + fname += ".qm"; QString t{"QMAP v" + QCoreApplication::applicationVersion() + " " + revision()}; save_qm_(fname.toLatin1(), t.toLatin1(), m_myCall.toLatin1(), m_myGrid.toLatin1(), datcom2_.d4, &datcom2_.ntx30a, &datcom2_.ntx30b, &datcom2_.fcenter, @@ -751,12 +744,7 @@ void MainWindow::diskDat() //diskDat() m_bDiskDatBusy=false; } -void MainWindow::diskWriteFinished() //diskWriteFinished -{ -// qDebug() << "diskWriteFinished"; -} - -void MainWindow::decoderFinished() //diskWriteFinished +void MainWindow::decoderFinished() { ui->DecodeButton->setStyleSheet(""); decodeBusy(false); diff --git a/qmap/mainwindow.h b/qmap/mainwindow.h index 3a799a14f..2765fb46a 100644 --- a/qmap/mainwindow.h +++ b/qmap/mainwindow.h @@ -157,9 +157,7 @@ private: QMessageBox msgBox0; QFuture<void>* future1; - QFuture<void>* future2; QFutureWatcher<void>* watcher1; - QFutureWatcher<void>* watcher2; QFutureWatcher<void> watcher3; //For decoder QString m_path;