w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-03-21 11:38:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'qmap' of bitbucket.org:k1jt/wsjtx into qmap

Browse Source
This commit is contained in:
Joe Taylor 2024-01-13 13:32:21 -05:00
commit ae14fa13e9
3 changed files with 2 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qmap/libqmap/save_qm.f90
View File

@ -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//" "

16
qmap/mainwindow.cpp
View File

@ -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);

3
qmap/mainwindow.h
View File

@ -40,7 +40,6 @@ public slots:
void showStatusMessage(const QString& statusMsg);
void dataSink(int k);
void diskDat();
void diskWriteFinished();
void decoderFinished();
void freezeDecode(int n);
void guiUpdate();
@ -157,9 +156,7 @@ private:
QMessageBox msgBox0;
QFuture<void>* future1;
QFuture<void>* future2;
QFutureWatcher<void>* watcher1;
QFutureWatcher<void>* watcher2;
QFutureWatcher<void> watcher3; //For decoder
QString m_path;