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

Save contest exchanges for NA_VHF and EU_VHF.

Browse Source
This commit is contained in:
Joe Taylor 2018-07-31 15:42:51 -04:00
parent 8a732f40a5
commit fde78758e4
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mainwindow.cpp
View File

@ -3078,9 +3078,10 @@ void MainWindow::auto_sequence (DecodedText const& message, unsigned start_toler
|| message_words.contains ("DE"))) || message_words.contains ("DE")))
|| !message.isStandardMessage ()); // free text 73/RR73 || !message.isStandardMessage ()); // free text 73/RR73
QString w2=message_words.at(2); QString w2=message_words.at(2);
QString w34;
int nrpt=0; int nrpt=0;
if(message_words.size()>3) { if(message_words.size()>3) {
QString w34=message_words.at(3); w34=message_words.at(3);
nrpt=w2.toInt(); nrpt=w2.toInt();
if(w2=="R") { if(w2=="R") {
nrpt=w34.toInt(); nrpt=w34.toInt();
@ -3088,6 +3089,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 (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)
@ -3525,6 +3527,10 @@ void MainWindow::guiUpdate()
} }
} }
} }
if(m_nContest==EU_VHF) {
if(m_ntx==2) m_xSent=ui->tx2->text().right(13);
if(m_ntx==3) m_xSent=ui->tx3->text().right(13);
}
} }
if(m_isync==1) msgsent[22]=0; if(m_isync==1) msgsent[22]=0;
if(m_isync==2) msgsent[37]=0; if(m_isync==2) msgsent[37]=0;
@ -5084,6 +5090,14 @@ void MainWindow::on_logQSOButton_clicked() //Log QSO button
m_config.my_callsign(), m_config.my_grid(), m_noSuffix, m_config.my_callsign(), m_config.my_grid(), m_noSuffix,
m_config.log_as_RTTY(), m_config.report_in_comments(), m_config.log_as_RTTY(), m_config.report_in_comments(),
m_config.bFox(), m_opCall); m_config.bFox(), m_opCall);
if(m_nContest!=NONE) {
if(m_nContest==NA_VHF) {
m_xSent=m_config.my_grid().left(4);
m_xRcvd=m_hisGrid;
}
qDebug() << "Logged:" << m_xSent << m_xRcvd;
//call contest logger here
}
} }
void MainWindow::acceptQSO (QDateTime const& QSO_date_off, QString const& call, QString const& grid void MainWindow::acceptQSO (QDateTime const& QSO_date_off, QString const& call, QString const& grid

2
mainwindow.h
View File

@ -591,6 +591,8 @@ private:
QString m_houndCallers; //Sorted list of Hound callers QString m_houndCallers; //Sorted list of Hound callers
QString m_fm0; QString m_fm0;
QString m_fm1; QString m_fm1;
QString m_xSent; //Contest exchange sent
QString m_xRcvd; //Contest exchange received
QSet<QString> m_pfx; QSet<QString> m_pfx;
QSet<QString> m_sfx; QSet<QString> m_sfx;