w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-05-23 18:02:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Correct bug in RTTY RU autosequencing introduced with the new EU VHF Contest message format.

Browse Source
This commit is contained in:
Joe Taylor 2020-05-01 13:33:27 -04:00
parent 82657db51b
commit f3e0eed06b
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
widgets/mainwindow.cpp
View File

@ -4592,19 +4592,24 @@ void MainWindow::processMessage (DecodedText const& message, Qt::KeyboardModifie
QString w2; QString w2;
if(w.size()>=3) w2=w.at(2); if(w.size()>=3) w2=w.at(2);
QString w34;
if(w.size()>=4) w34=w.at(3);
int nrpt=w2.toInt(); int nrpt=w2.toInt();
if(w2=="R") {
nrpt=w34.toInt();
w34=w.at(4);
}
bool bEU_VHF_w2=(nrpt>=520001 and nrpt<=594000); bool bEU_VHF_w2=(nrpt>=520001 and nrpt<=594000);
QString w34;
if(w.size()>=4) {
int i=2;
if(bEU_VHF_w2) i=3;
w34=w.at(i);
if(w2=="R") {
nrpt=w34.toInt();
w34=w.at(i+1);
}
}
if(bEU_VHF_w2 and SpecOp::EU_VHF!=m_config.special_op_id()) { if(bEU_VHF_w2 and SpecOp::EU_VHF!=m_config.special_op_id()) {
auto const& message = tr("Should you switch to EU VHF Contest mode?\n\n" auto const& msg = tr("Should you switch to EU VHF Contest mode?\n\n"
"To do so, check 'Special operating activity' and\n" "To do so, check 'Special operating activity' and\n"
"'EU VHF Contest' on the Settings | Advanced tab."); "'EU VHF Contest' on the Settings | Advanced tab.");
MessageBox::information_message (this, message); MessageBox::information_message (this, msg);
} }
QStringList t=message.string().split(' ', QString::SkipEmptyParts); QStringList t=message.string().split(' ', QString::SkipEmptyParts);
@ -4641,7 +4646,6 @@ void MainWindow::processMessage (DecodedText const& message, Qt::KeyboardModifie
&& (message_words.at(1).contains(m_baseCall) || "DE" == message_words.at(1)) && (message_words.at(1).contains(m_baseCall) || "DE" == message_words.at(1))
&& (message_words.at(2).contains(qso_partner_base_call) or m_bDoubleClicked && (message_words.at(2).contains(qso_partner_base_call) or m_bDoubleClicked
or bEU_VHF_w2 or (m_QSOProgress==CALLING))) { or bEU_VHF_w2 or (m_QSOProgress==CALLING))) {
if(message_words.at(3).contains(grid_regexp) and SpecOp::EU_VHF!=m_config.special_op_id()) { if(message_words.at(3).contains(grid_regexp) and SpecOp::EU_VHF!=m_config.special_op_id()) {
if(SpecOp::NA_VHF==m_config.special_op_id() or SpecOp::WW_DIGI==m_config.special_op_id()){ if(SpecOp::NA_VHF==m_config.special_op_id() or SpecOp::WW_DIGI==m_config.special_op_id()){
gen_msg=setTxMsg(3); gen_msg=setTxMsg(3);