w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-07-22 11:35:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Allow "TU; ..." msgs only in RTTY mode, for now. Fix a bug in adif.cpp.

Browse Source
This commit is contained in:
Joe Taylor 2018-10-09 16:33:31 -04:00
parent 343cef2e03
commit b7dc5de1ad
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
logbook/adif.cpp
View File

@ -208,7 +208,8 @@ QByteArray ADIF::QSOToADIF(QString const& hisCall, QString const& hisGrid, QStri
if(xSent!="") t += " <STX_STRING:" + QString::number(xSent.length()) + ">" + xSent; if(xSent!="") t += " <STX_STRING:" + QString::number(xSent.length()) + ">" + xSent;
if(xRcvd!="") { if(xRcvd!="") {
t += " <SRX_STRING:" + QString::number(xRcvd.length()) + ">" + xRcvd; t += " <SRX_STRING:" + QString::number(xRcvd.length()) + ">" + xRcvd;
QString t1=xRcvd.split(" ").at(1); QString t1="";
if(xRcvd.split(" ").size()==2) t1=xRcvd.split(" ").at(1);
if(t1.toInt()>0) { if(t1.toInt()>0) {
t += " <SRX:" + QString::number(t1.length()) + ">" + t1; t += " <SRX:" + QString::number(t1.length()) + ">" + t1;
} else { } else {

2
logqso.cpp
View File

@ -121,7 +121,7 @@ void LogQSO::accept()
QString strDialFreq(QString::number(m_dialFreq / 1.e6,'f',6)); QString strDialFreq(QString::number(m_dialFreq / 1.e6,'f',6));
operator_call = ui->loggedOperator->text(); operator_call = ui->loggedOperator->text();
//Log this QSO to ADIF file "wsjtx_log.adi" //Log this QSO to ADIF file "wsjtx_log.adi"
QString filename = "wsjtx_log.adi"; // TODO allow user to set QString filename = "wsjtx_log.adi"; // TODO allow user to set
ADIF adifile; ADIF adifile;
auto adifilePath = QDir {QStandardPaths::writableLocation (QStandardPaths::DataLocation)}.absoluteFilePath ("wsjtx_log.adi"); auto adifilePath = QDir {QStandardPaths::writableLocation (QStandardPaths::DataLocation)}.absoluteFilePath ("wsjtx_log.adi");
adifile.init(adifilePath); adifile.init(adifilePath);

1
mainwindow.cpp
View File

@ -4473,6 +4473,7 @@ void MainWindow::processMessage (DecodedText const& message, Qt::KeyboardModifie
} }
else { // nothing for us else { // nothing for us
if(message_words.size () > 3 // enough fields for a normal message if(message_words.size () > 3 // enough fields for a normal message
&& m_nContest==RTTY
&& (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) and !bEU_VHF_w2)) { && (!message_words.at(2).contains(qso_partner_base_call) and !bEU_VHF_w2)) {
// Queue up the next QSO partner // Queue up the next QSO partner