w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-10-30 20:40:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix three minor flaws in Echo mode.

Browse Source
This commit is contained in:
Joe Taylor 2022-08-16 12:15:08 -04:00
parent f683d47f5b
commit a767a7dd1e
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
widgets/mainwindow.cpp
View File

@ -1610,12 +1610,9 @@ void MainWindow::dataSink(qint64 frames)
} }
avecho_(dec_data.d2,&nDop,&nfrit,&nauto,&nqual,&f1,&xlevel,&sigdb, avecho_(dec_data.d2,&nDop,&nfrit,&nauto,&nqual,&f1,&xlevel,&sigdb,
&dBerr,&dfreq,&width,&m_diskData); &dBerr,&dfreq,&width,&m_diskData);
// qDebug() << "bb" << m_s6 << f1 << nfrit << nDop << width;
QString t; QString t;
// t = t.asprintf("%3d %7.1f %7.1f %7.1f %7.1f %7d %7.1f %3d %7d %7d",echocom_.nsum,xlevel,sigdb,
// dBerr,dfreq,m_fDop,width,nqual,nDop,nfrit);
t = t.asprintf("%3d %7.1f %7.1f %7.1f %7.1f %7d %7.1f %3d",echocom_.nsum,xlevel,sigdb, t = t.asprintf("%3d %7.1f %7.1f %7.1f %7.1f %7d %7.1f %3d",echocom_.nsum,xlevel,sigdb,
dBerr,dfreq,m_fDop,width,nqual); dBerr,dfreq,nDop,width,nqual);
QString t0; QString t0;
if(m_diskData) { if(m_diskData) {
t0=t0.asprintf("%06d ",m_UTCdisk); t0=t0.asprintf("%06d ",m_UTCdisk);
@ -2038,14 +2035,9 @@ void MainWindow::on_autoButton_clicked (bool checked)
if (!checked) m_bCallingCQ = false; if (!checked) m_bCallingCQ = false;
statusUpdate (); statusUpdate ();
m_bEchoTxOK=false; m_bEchoTxOK=false;
if(m_mode=="Echo") { if(m_mode=="Echo" and m_auto) {
if(m_auto) { m_nclearave=1;
m_nclearave=1; echocom_.nsum=0;
echocom_.nsum=0;
if(m_astroWidget) m_astroWidget->selectOwnEcho();
} else {
if(m_astroWidget) m_astroWidget->selectOnDxEcho();
}
} }
m_tAutoOn=QDateTime::currentMSecsSinceEpoch()/1000; m_tAutoOn=QDateTime::currentMSecsSinceEpoch()/1000;
} }
@ -4544,7 +4536,7 @@ void MainWindow::guiUpdate()
} }
if(m_restart) { if(m_restart) {
write_all("Tx",m_currentMessage); write_all("Tx",m_currentMessage);
if (m_config.TX_messages ()) { if (m_config.TX_messages () and m_mode!="Echo") {
ui->decodedTextBrowser2->displayTransmittedText(m_currentMessage.trimmed(),m_mode, ui->decodedTextBrowser2->displayTransmittedText(m_currentMessage.trimmed(),m_mode,
ui->TxFreqSpinBox->value(),m_bFastMode,m_TRperiod); ui->TxFreqSpinBox->value(),m_bFastMode,m_TRperiod);
} }
@ -4643,7 +4635,7 @@ void MainWindow::guiUpdate()
m_msgSent0 = current_message; m_msgSent0 = current_message;
} }
if (m_mode != "FST4W" && m_mode != "WSPR") if (m_mode != "FST4W" && m_mode != "WSPR" && m_mode!="Echo")
{ {
if(!m_tune) write_all("Tx",m_currentMessage); if(!m_tune) write_all("Tx",m_currentMessage);
if (m_config.TX_messages () && !m_tune && SpecOp::FOX!=m_specOp) if (m_config.TX_messages () && !m_tune && SpecOp::FOX!=m_specOp)