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

Basic fix of auto sequencing with free text 73 messages, more to come

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8044 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Bill Somerville 2017-08-29 03:20:51 +00:00
parent 5e23faa02a
commit 8f27ea5203
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mainwindow.cpp
View File

@ -3720,13 +3720,14 @@ void MainWindow::processMessage(QString const& messages, int position, bool ctrl
QString hiscall;
QString hisgrid;
decodedtext.deCallAndGrid(/*out*/hiscall,hisgrid);
auto acceptable_73 = m_QSOProgress >= ROGER_REPORT && message_is_73 (0, t4);
if (!Radio::is_callsign (hiscall) // not interested if not from QSO partner
&& !(t4.size () == 7 // unless it is of the form
&& (t4.at (5) == m_baseCall // "<our-call> 73"
|| t4.at (5).startsWith (m_baseCall + '/')
|| t4.at (5).endsWith ('/' + m_baseCall))
&& t4.at (6) == "73")
&& !(m_QSOProgress >= ROGER_REPORT && message_is_73 (0, t4)))
&& !acceptable_73)
{
qDebug () << "Not processing message - hiscall:" << hiscall << "hisgrid:" << hisgrid;
return;
@ -3900,7 +3901,7 @@ void MainWindow::processMessage(QString const& messages, int position, bool ctrl
}
}
}
else if (m_QSOProgress >= ROGERS && message_is_73 (0, t4)) {
else if (acceptable_73) {
if(ui->tabWidget->currentIndex()==1) {
gen_msg = 5;
if (ui->rbGenMsg->isChecked ()) m_ntx=7;
@ -3943,7 +3944,7 @@ void MainWindow::processMessage(QString const& messages, int position, bool ctrl
m_QSOText=decodedtext;
}
if (hiscall != "73"
if (hiscall != "73" && !acceptable_73
&& (base_call != qso_partner_base_call || base_call != hiscall))
{
if (qso_partner_base_call != base_call) {