w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-15 08:31:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix bugs found in test with K9AN on Aug 28.

Browse Source 
Double-click on "CQ K9AN EN50" mistakenly put EN50 into DXcall.
Enable Tx was turned off after 73 is sent.
Sh mode did not auto-sequence correctly.
Received exchange not logged correctly in EU VHF mode.
This commit is contained in:
Joe Taylor 2018-08-28 09:44:00 -04:00
parent 16598f2ed8
commit 2aecad8718
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
decodedtext.cpp
View File

@ -166,7 +166,7 @@ void DecodedText::deCallAndGrid(/*out*/QString& call, QString& grid) const
grid = match.captured ("word3"); grid = match.captured ("word3");
if ("R" == grid) grid = match.captured ("word4"); if ("R" == grid) grid = match.captured ("word4");
if(match.captured("word1")=="CQ" and call.length()>=3 and call.length()<=4 if(match.captured("word1")=="CQ" and call.length()>=3 and call.length()<=4
and !call.contains(QRegExp("0-9"))) { and !call.contains(QRegExp("[0-9]"))) {
//Second word has length 3 or 4 and contains no digits //Second word has length 3 or 4 and contains no digits
call = match.captured ("word3"); call = match.captured ("word3");
grid = match.captured ("word4"); grid = match.captured ("word4");

6
mainwindow.cpp
View File

@ -3112,7 +3112,7 @@ void MainWindow::auto_sequence (DecodedText const& message, unsigned start_toler
} }
} }
bool bEU_VHF_w2=(nrpt>=520001 and nrpt<=594000); bool bEU_VHF_w2=(nrpt>=520001 and nrpt<=594000);
if(bEU_VHF_w2) m_xRcvd=message.string().trimmed().right(13); if(bEU_VHF_w2) m_xRcvd=message.string().left(45).trimmed().right(13);
if (m_auto if (m_auto
&& (m_QSOProgress==REPLYING or (!ui->tx1->isEnabled () and m_QSOProgress==REPORT)) && (m_QSOProgress==REPLYING or (!ui->tx1->isEnabled () and m_QSOProgress==REPORT))
&& qAbs (ui->TxFreqSpinBox->value () - df) <= int (stop_tolerance) && qAbs (ui->TxFreqSpinBox->value () - df) <= int (stop_tolerance)
@ -3614,7 +3614,7 @@ void MainWindow::guiUpdate()
} }
} }
bool b=(m_mode=="FT8" or m_mode=="MSK144") and ui->cbAutoSeq->isChecked(); bool b=(m_mode=="FT8") and ui->cbAutoSeq->isChecked();
if(is_73 and (m_config.disable_TX_on_73() or b)) { if(is_73 and (m_config.disable_TX_on_73() or b)) {
auto_tx_mode (false); auto_tx_mode (false);
if(b) { if(b) {
@ -4249,6 +4249,7 @@ void MainWindow::processMessage (DecodedText const& message, Qt::KeyboardModifie
int gen_msg {0}; int gen_msg {0};
if(dtext.contains (" " + m_baseCall + " ") if(dtext.contains (" " + m_baseCall + " ")
|| dtext.contains ("<" + m_baseCall + "> ") || dtext.contains ("<" + m_baseCall + "> ")
|| dtext.contains ("<" + m_baseCall + " " + hiscall + "> ")
|| dtext.contains ("/" + m_baseCall + " ") || dtext.contains ("/" + m_baseCall + " ")
|| dtext.contains (" " + m_baseCall + "/") || dtext.contains (" " + m_baseCall + "/")
|| (firstcall == "DE")) { || (firstcall == "DE")) {
@ -4264,7 +4265,6 @@ void MainWindow::processMessage (DecodedText const& message, Qt::KeyboardModifie
// ### Should be in EU VHF Contest mode ??? ### // ### Should be in EU VHF Contest mode ??? ###
MessageBox::information_message (this, tr ("Should you switch to EU VHF Contest mode?")); MessageBox::information_message (this, tr ("Should you switch to EU VHF Contest mode?"));
} }
QStringList t=message.string().split(' ', QString::SkipEmptyParts); QStringList t=message.string().split(' ', QString::SkipEmptyParts);
int n=t.size(); int n=t.size();
QString t0=t.at(n-2); QString t0=t.at(n-2);