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

Try to fix saving of ntx30[ab] in qm files.

Browse Source
This commit is contained in:
Joe Taylor 2024-01-05 14:11:05 -05:00
parent d594d14a1e
commit 07e82b0c40
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
qmap/libqmap/read_qm.f90
View File

@ -7,7 +7,10 @@ subroutine read_qm(fname)
real*8 fcenter real*8 fcenter
integer nxtra(15) !For possible future additions integer nxtra(15) !For possible future additions
integer*1 id1(2,NMAX) integer*1 id1(2,NMAX)
common/datcom/dd(2,5760000),ss(400,NFFT),savg(NFFT),fcenter,nutc,junk(NJUNK) common/datcom/dd(2,5760000),ss(400,NFFT),savg(NFFT), &
fcenter,nutc,fselected,mousedf,mousefqso,nagain, &
ndepth,ndiskdat,ntx60,newdat,nn1,nn2,nfcal,nfshift, &
ntx30a,ntx30b !...
open(28,file=trim(fname),status='old',access='stream',err=900) open(28,file=trim(fname),status='old',access='stream',err=900)
read(28) prog_id,mycall,mygrid,fcenter,nutc,ntx30a,ntx30b,ndop00,ndop58, & read(28) prog_id,mycall,mygrid,fcenter,nutc,ntx30a,ntx30b,ndop00,ndop58, &

17
qmap/mainwindow.cpp
View File

@ -419,7 +419,8 @@ void MainWindow::dataSink(int k)
*future2 = QtConcurrent::run(save_iq, fname); *future2 = QtConcurrent::run(save_iq, fname);
watcher2->setFuture(*future2); watcher2->setFuture(*future2);
QString t{"QMAP v" + QCoreApplication::applicationVersion() + " " + revision()}; QString t{"QMAP v" + QCoreApplication::applicationVersion() + " " + revision()};
// qDebug() << "aa" << t.simplified() << m_myCall << m_myGrid << datcom_.fcenter; // qDebug() << "aa" << t.simplified() << m_myCall << m_myGrid << datcom_.fcenter
// << m_nTx30a << m_nTx30b << datcom2_.ntx30a << datcom2_.ntx30b;
save_qm_(fname.toLatin1(), t.toLatin1(), m_myCall.toLatin1(), m_myGrid.toLatin1(), save_qm_(fname.toLatin1(), t.toLatin1(), m_myCall.toLatin1(), m_myGrid.toLatin1(),
datcom2_.d4, &datcom2_.ntx30a, &datcom2_.ntx30b, &datcom2_.fcenter, datcom2_.d4, &datcom2_.ntx30a, &datcom2_.ntx30b, &datcom2_.fcenter,
&datcom2_.nutc, &m_dop00, &m_dop58, &datcom2_.nutc, &m_dop00, &m_dop58,
@ -835,12 +836,6 @@ void MainWindow::freezeDecode(int n) //freezeDecode()
void MainWindow::decode() //decode() void MainWindow::decode() //decode()
{ {
if(m_decoderBusy) return; //Don't attempt decode if decoder already busy if(m_decoderBusy) return; //Don't attempt decode if decoder already busy
if(m_nTx60>10) return; //Don't decode if WSJT-X transmitted too much in 60 s mode
//No need to call decoder for first half, if we transmitted in the first half:
if((datcom_.nhsym<=200) and (m_nTx30a>5)) return;
//No need to call decoder in second half, if we transmitted in that half:
if((datcom_.nhsym>200) and (m_nTx30b>5)) return;
QString fname=" "; QString fname=" ";
ui->DecodeButton->setStyleSheet(m_pbdecoding_style1); ui->DecodeButton->setStyleSheet(m_pbdecoding_style1);
@ -914,10 +909,14 @@ void MainWindow::decode() //decode()
decodes_.ncand=0; decodes_.ncand=0;
decodes_.nQDecoderDone=0; decodes_.nQDecoderDone=0;
if(m_nTx30a<5 or m_nTx30b<5 ) { //No need to call decoder for first half, if we transmitted in the first half:
if((datcom_.nhsym<=200) and (m_nTx30a>5)) return;
//No need to call decoder in second half, if we transmitted in that half:
if((datcom_.nhsym>200) and (m_nTx30b>5)) return;
watcher3.setFuture(QtConcurrent::run (std::bind (q65c_, &m_zero))); watcher3.setFuture(QtConcurrent::run (std::bind (q65c_, &m_zero)));
decodeBusy(true); decodeBusy(true);
}
} }
void MainWindow::on_EraseButton_clicked() void MainWindow::on_EraseButton_clicked()