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 two bad behaviors following double-click on a decode.

Browse Source 
1. Make it work even if second callsign is not that of present QSO partner.
2. Sequence to Tx4 if message contains R+report.
This commit is contained in:
Joe Taylor 2018-11-07 11:33:30 -05:00
parent c57b5d3fca
commit 48017c5827
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mainwindow.cpp
View File

@ -4148,7 +4148,7 @@ void MainWindow::doubleClickOnCall2(Qt::KeyboardModifiers modifiers)
void MainWindow::doubleClickOnCall(Qt::KeyboardModifiers modifiers) void MainWindow::doubleClickOnCall(Qt::KeyboardModifiers modifiers)
{ {
if(!(modifiers & Qt::AltModifier) and m_transmitting) { if(!(modifiers & Qt::AltModifier) and m_transmitting) {
// qDebug() << "aa" << "Double-click ignored"; // qDebug() << "aa" << "Double-click on decode is ignored while transmitting";
return; return;
} }
QTextCursor cursor; QTextCursor cursor;
@ -4351,7 +4351,8 @@ void MainWindow::processMessage (DecodedText const& message, Qt::KeyboardModifie
if(message_words.size () > 3 // enough fields for a normal message if(message_words.size () > 3 // enough fields for a normal message
&& (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 bEU_VHF_w2)) { // && (message_words.at(2).contains(qso_partner_base_call) or bEU_VHF_w2)) {
&& (message_words.at(2).contains(qso_partner_base_call) or m_bDoubleClicked or bEU_VHF_w2)) {
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()){ if(SpecOp::NA_VHF==m_config.special_op_id()){
@ -4442,10 +4443,15 @@ void MainWindow::processMessage (DecodedText const& message, Qt::KeyboardModifie
SpecOp::RTTY==m_config.special_op_id()) { SpecOp::RTTY==m_config.special_op_id()) {
gen_msg=setTxMsg(2); gen_msg=setTxMsg(2);
m_QSOProgress=REPORT; m_QSOProgress=REPORT;
} else {
if(r.left(2)=="R-" or r.left(2)=="R+") {
gen_msg=setTxMsg(4);
m_QSOProgress=ROGERS;
} else { } else {
gen_msg=setTxMsg(3); gen_msg=setTxMsg(3);
m_QSOProgress=ROGER_REPORT; m_QSOProgress=ROGER_REPORT;
} }
}
} else { // nothing for us } else { // nothing for us
return; return;
} }