w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-06-01 22:32:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix a flaw that prevented Q65W decodes from being displayed in its main window.

Browse Source
This commit is contained in:
Joe Taylor 2022-12-16 13:06:44 -05:00
parent 5f94a115f7
commit 2fcf6c45fe
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
q65w/commons.h
View File

@ -86,7 +86,8 @@ extern struct { //This is "common/datcom/..." in Fortran
extern struct { extern struct {
int ndecodes; int ndecodes;
int ncand; int ncand;
int nQDecoderBusy; int nQDecoderDone;
int nWDecoderBusy;
int nWTransmitting; int nWTransmitting;
char result[50][60]; char result[50][60];
} decodes_; } decodes_;

1
q65w/libq65/decode0.f90
View File

@ -46,7 +46,6 @@ subroutine decode0(dd,ss,savg)
mousedf,mousefqso,nagain,ndecdone,nfshift,max_drift, & mousedf,mousefqso,nagain,ndecdone,nfshift,max_drift, &
nfcal,mycall,hiscall,hisgrid,nhsym,nfsample,nmode,ndop00) nfcal,mycall,hiscall,hisgrid,nhsym,nfsample,nmode,ndop00)
call timer('q65wa ',1) call timer('q65wa ',1)
flush(6)
return return
end subroutine decode0 end subroutine decode0

1
q65w/libq65/q65wa.f90
View File

@ -70,7 +70,6 @@ subroutine q65wa(dd,ss,savg,newdat,nutc,fcenter,ntol,nfa,nfb, &
if(idec.ge.0) candec(icand)=.true. if(idec.ge.0) candec(icand)=.true.
enddo ! icand enddo ! icand
ndecdone=2 ndecdone=2
nQDecoderDone=1
return return
end subroutine q65wa end subroutine q65wa

7
q65w/mainwindow.cpp
View File

@ -743,7 +743,7 @@ void MainWindow::decoderFinished() //diskWriteFinished
m_startAnother=m_loopall; m_startAnother=m_loopall;
ui->DecodeButton->setStyleSheet(""); ui->DecodeButton->setStyleSheet("");
decodeBusy(false); decodeBusy(false);
decodes_.nQDecoderDone=1;
QString t1; QString t1;
t1=t1.asprintf(" %3d/%d ",decodes_.ndecodes,decodes_.ncand); t1=t1.asprintf(" %3d/%d ",decodes_.ndecodes,decodes_.ncand);
lab5->setText(t1); lab5->setText(t1);
@ -908,6 +908,7 @@ void MainWindow::decode() //decode()
decodes_.ndecodes=0; decodes_.ndecodes=0;
decodes_.ncand=0; decodes_.ncand=0;
decodes_.nQDecoderDone=0;
m_fetched=0; m_fetched=0;
int itimer=0; int itimer=0;
watcher3.setFuture(QtConcurrent::run (std::bind (q65c_, &itimer))); watcher3.setFuture(QtConcurrent::run (std::bind (q65c_, &itimer)));
@ -952,9 +953,10 @@ void MainWindow::guiUpdate()
on_actionOpen_next_in_directory_triggered(); on_actionOpen_next_in_directory_triggered();
} }
if(decodes_.ndecodes>m_fetched) { if(decodes_.ndecodes > m_fetched) {
while(m_fetched<decodes_.ndecodes) { while(m_fetched<decodes_.ndecodes) {
QString t=QString::fromLatin1(decodes_.result[m_fetched]); QString t=QString::fromLatin1(decodes_.result[m_fetched]);
// qDebug() << "CCC" << nsec%60 << decodes_.ndecodes << m_fetched << t;
ui->decodedTextBrowser->append(t.trimmed()); ui->decodedTextBrowser->append(t.trimmed());
m_fetched++; m_fetched++;
} }
@ -965,6 +967,7 @@ void MainWindow::guiUpdate()
if(nsec != m_sec0) { //Once per second if(nsec != m_sec0) { //Once per second
// qDebug() << "AAA" << nsec%60 << ipc_wsjtx[3] << ipc_wsjtx[4]<< m_monitoring; // qDebug() << "AAA" << nsec%60 << ipc_wsjtx[3] << ipc_wsjtx[4]<< m_monitoring;
// qDebug() << "BBB" << nsec%60 << decodes_.ndecodes << m_fetched;
if(m_pctZap>30.0) { if(m_pctZap>30.0) {
lab4->setStyleSheet("QLabel{background-color: #ff0000}"); lab4->setStyleSheet("QLabel{background-color: #ff0000}");