w4kek
/
WSJT-X
mirror of https://github.com/saitohirga/WSJT-X.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow messages to be regenerated when trying to start a new QSO

This commit is contained in:
Bill Somerville 2021-03-14 14:19:43 +00:00
parent d4c4cd0e05
commit 4b031c862f
No known key found for this signature in database
GPG Key ID: D864B06D1E81618F
1 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
widgets/mainwindow.cpp
View File

@ -4038,8 +4038,8 @@ void MainWindow::guiUpdate()
if(m_tune or m_mode=="Echo") { if(m_tune or m_mode=="Echo") {
itone[0]=0; itone[0]=0;
} else { } else {
if(m_QSOProgress==2 or m_QSOProgress==3) m_bSentReport=true; if(m_QSOProgress==REPORT || m_QSOProgress==ROGER_REPORT) m_bSentReport=true;
if(m_bSentReport and (m_QSOProgress<2 or m_QSOProgress>3)) m_bSentReport=false; if(m_bSentReport and (m_QSOProgress<REPORT or m_QSOProgress>ROGER_REPORT)) m_bSentReport=false;
if(m_modeTx=="JT4") gen4_(message, &ichk , msgsent, const_cast<int *> (itone), if(m_modeTx=="JT4") gen4_(message, &ichk , msgsent, const_cast<int *> (itone),
&m_currentMessageType, 22, 22); &m_currentMessageType, 22, 22);
if(m_modeTx=="JT9") gen9_(message, &ichk, msgsent, const_cast<int *> (itone), if(m_modeTx=="JT9") gen9_(message, &ichk, msgsent, const_cast<int *> (itone),
@ -5211,25 +5211,24 @@ void MainWindow::processMessage (DecodedText const& message, Qt::KeyboardModifie
lookup(); lookup();
m_hisGrid = ui->dxGridEntry->text(); m_hisGrid = ui->dxGridEntry->text();
QString rpt = message.report(); if (!m_bSentReport || base_call != qso_partner_base_call) // Don't change report within a QSO
int n=rpt.toInt(); {
if(m_mode=="MSK144" and m_bShMsgs) { auto n = message.report ().toInt ();
int n=rpt.toInt(); if(m_mode=="MSK144" and m_bShMsgs) {
if(n<=-2) n=-3; if(n<=-2) n=-3;
if(n>=-1 and n<=1) n=0; if(n>=-1 and n<=1) n=0;
if(n>=2 and n<=4) n=3; if(n>=2 and n<=4) n=3;
if(n>=5 and n<=7) n=6; if(n>=5 and n<=7) n=6;
if(n>=8 and n<=11) n=10; if(n>=8 and n<=11) n=10;
if(n>=12 and n<=14) n=13; if(n>=12 and n<=14) n=13;
if(n>=15) n=16; if(n>=15) n=16;
rpt=QString::number(n); }
} ui->rptSpinBox->setValue (n);
}
if(!m_bSentReport) ui->rptSpinBox->setValue(n); //Don't change report within a QSO
// Don't genStdMsgs if we're already sending 73, or a "TU; " msg is queued. // Don't genStdMsgs if we're already sending 73, or a "TU; " msg is queued.
m_bTUmsg=false; //### Temporary: disable use of "TU;" messages m_bTUmsg=false; //### Temporary: disable use of "TU;" messages
if (!m_bSentReport and !m_nTx73 and !m_bTUmsg) { if (!m_nTx73 and !m_bTUmsg) {
genStdMsgs(rpt); genStdMsgs (QString::number (ui->rptSpinBox->value ()));
} }
if(m_transmitting) m_restart=true; if(m_transmitting) m_restart=true;
if (ui->cbAutoSeq->isVisible () && ui->cbAutoSeq->isChecked () if (ui->cbAutoSeq->isVisible () && ui->cbAutoSeq->isChecked ()