w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-21 19:55:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Repair regression that stopped Best S&P transmitting on a match

Browse Source 
This change also ensures that second or subsequent matches in the same
T/R period do not trigger a QSO with a new QSO partner.
This commit is contained in:
Bill Somerville 2020-11-27 12:36:24 +00:00
parent 3663b3ea32
commit 6a44e68033
No known key found for this signature in database
GPG Key ID: D864B06D1E81618F
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
widgets/displaytext.cpp
View File

@ -15,6 +15,7 @@
#include <QScrollBar> #include <QScrollBar>
#include "Configuration.hpp" #include "Configuration.hpp"
#include "Decoder/decodedtext.h"
#include "Network/LotWUsers.hpp" #include "Network/LotWUsers.hpp"
#include "models/DecodeHighlightingModel.hpp" #include "models/DecodeHighlightingModel.hpp"
#include "logbook/logbook.h" #include "logbook/logbook.h"

3
widgets/displaytext.h
View File

@ -8,11 +8,10 @@
#include <QPair> #include <QPair>
#include <QString> #include <QString>
#include "Decoder/decodedtext.h"
class QAction; class QAction;
class Configuration; class Configuration;
class LogBook; class LogBook;
class DecodedText;
class DisplayText class DisplayText
: public QTextEdit : public QTextEdit

4
widgets/mainwindow.cpp
View File

@ -3441,19 +3441,21 @@ void MainWindow::readFromStdout() //readFromStdout
ui->cbCQonly->isVisible() && ui->cbCQonly->isChecked(), ui->cbCQonly->isVisible() && ui->cbCQonly->isChecked(),
haveFSpread, fSpread); haveFSpread, fSpread);
if(m_bBestSPArmed and m_mode=="FT4") { if(m_bBestSPArmed && m_mode=="FT4" && CALLING == m_QSOProgress) {
QString messagePriority=ui->decodedTextBrowser->CQPriority(); QString messagePriority=ui->decodedTextBrowser->CQPriority();
if(messagePriority!="") { if(messagePriority!="") {
if(messagePriority=="New Call on Band" if(messagePriority=="New Call on Band"
and m_BestCQpriority!="New Call on Band" and m_BestCQpriority!="New Call on Band"
and m_BestCQpriority!="New Multiplier") { and m_BestCQpriority!="New Multiplier") {
m_BestCQpriority="New Call on Band"; m_BestCQpriority="New Call on Band";
m_bDoubleClicked = true;
processMessage(decodedtext0); processMessage(decodedtext0);
} }
if(messagePriority=="New DXCC" if(messagePriority=="New DXCC"
and m_BestCQpriority!="New DXCC" and m_BestCQpriority!="New DXCC"
and m_BestCQpriority!="New Multiplier") { and m_BestCQpriority!="New Multiplier") {
m_BestCQpriority="New DXCC"; m_BestCQpriority="New DXCC";
m_bDoubleClicked = true;
processMessage(decodedtext0); processMessage(decodedtext0);
} }
} }