w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-08-19 14:12:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Make sure diskDat() finished before starting another file.

Browse Source
This commit is contained in:
Joe Taylor 2023-12-17 07:27:28 -05:00
parent bb5e8efd52
commit d5a8ce97e3
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
qmap/mainwindow.cpp
View File

@ -707,6 +707,7 @@ void MainWindow::on_actionDecode_remaining_files_in_directory_triggered()
void MainWindow::diskDat() //diskDat() void MainWindow::diskDat() //diskDat()
{ {
m_bDiskDatBusy=true;
double hsym; double hsym;
//These may be redundant?? //These may be redundant??
m_diskData=true; m_diskData=true;
@ -721,6 +722,7 @@ void MainWindow::diskDat() //diskDat()
qApp->processEvents(); // Wait for an early decode to finish qApp->processEvents(); // Wait for an early decode to finish
} }
} }
m_bDiskDatBusy=false;
} }
void MainWindow::diskWriteFinished() //diskWriteFinished void MainWindow::diskWriteFinished() //diskWriteFinished
@ -730,9 +732,9 @@ void MainWindow::diskWriteFinished() //diskWriteFinished
void MainWindow::decoderFinished() //diskWriteFinished void MainWindow::decoderFinished() //diskWriteFinished
{ {
m_startAnother=m_loopall;
ui->DecodeButton->setStyleSheet(""); ui->DecodeButton->setStyleSheet("");
decodeBusy(false); decodeBusy(false);
m_startAnother=m_loopall;
decodes_.nQDecoderDone=1; decodes_.nQDecoderDone=1;
if(m_diskData) decodes_.nQDecoderDone=2; if(m_diskData) decodes_.nQDecoderDone=2;
mem_qmap.lock(); mem_qmap.lock();
@ -743,7 +745,6 @@ void MainWindow::decoderFinished() //diskWriteFinished
QString t1; QString t1;
t1=t1.asprintf(" %d ",decodes_.ndecodes); t1=t1.asprintf(" %d ",decodes_.ndecodes);
lab4->setText(t1); lab4->setText(t1);
QDateTime now=QDateTime::currentDateTimeUtc();
} }
void MainWindow::on_actionDelete_all_iq_files_in_SaveDir_triggered() void MainWindow::on_actionDelete_all_iq_files_in_SaveDir_triggered()
@ -940,7 +941,7 @@ void MainWindow::guiUpdate()
m_wide_graph_window->updateFreqLabel(); m_wide_graph_window->updateFreqLabel();
if(m_startAnother) { if(m_startAnother and !m_bDiskDatBusy) {
m_startAnother=false; m_startAnother=false;
on_actionOpen_next_in_directory_triggered(); on_actionOpen_next_in_directory_triggered();
} }
@ -971,7 +972,6 @@ void MainWindow::guiUpdate()
if(t.indexOf(m_myCall)>10 and m_myCallColor==2) f.setBackground(QBrush(Qt::green)); if(t.indexOf(m_myCall)>10 and m_myCallColor==2) f.setBackground(QBrush(Qt::green));
if(t.indexOf(m_myCall)>10 and m_myCallColor==3) f.setBackground(QBrush(Qt::cyan)); if(t.indexOf(m_myCall)>10 and m_myCallColor==3) f.setBackground(QBrush(Qt::cyan));
cursor.setBlockFormat(f); cursor.setBlockFormat(f);
// qDebug() << "aa" << m_nline << m_decoderBusy << t.trimmed();
} }
} }
@ -992,8 +992,6 @@ void MainWindow::guiUpdate()
if(m_WSJTX_TRperiod==30) m_nTx30++; if(m_WSJTX_TRperiod==30) m_nTx30++;
if(m_WSJTX_TRperiod==60) m_nTx60++; if(m_WSJTX_TRperiod==60) m_nTx60++;
} }
// qDebug() << "AAA" << n60 << itest[0] << itest[1] << itest[2] << itest[3] << itest[4]
// << m_nTx30 << m_nTx60;
if(n60<n60z) { if(n60<n60z) {
m_nTx30=0; m_nTx30=0;
m_nTx60=0; m_nTx60=0;

1
qmap/mainwindow.h
View File

@ -138,6 +138,7 @@ private:
bool m_fs96000; bool m_fs96000;
bool m_decode_called=false; bool m_decode_called=false;
bool m_bAlso30=false; bool m_bAlso30=false;
bool m_bDiskDatBusy=false;
float m_pctZap; float m_pctZap;