w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-03-23 20:48:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fox should not log hound again if they've been logged before. Call is still noted in FoxQSO however, with Dup: instead of Log: (K7AR)

Browse Source
This commit is contained in:
Brian Moran 2023-02-18 10:00:18 -08:00
parent 6b6d74cad8
commit ce622487ca
1 changed files with 28 additions and 19 deletions

47
widgets/mainwindow.cpp
View File

@ -9606,26 +9606,35 @@ list2Done:
}
if(hc1!="") {
// Log this QSO!
auto QSO_time = QDateTime::currentDateTimeUtc ();
m_hisCall=hc1;
m_hisGrid=m_foxQSO[hc1].grid;
m_rptSent=m_foxQSO[hc1].sent;
m_rptRcvd=m_foxQSO[hc1].rcvd;
if (!m_foxLogWindow) on_fox_log_action_triggered ();
if (m_logBook.fox_log ()->add_QSO (QSO_time, m_hisCall, m_hisGrid, m_rptSent, m_rptRcvd, m_lastBand))
{
writeFoxQSO (QString {" Log: %1 %2 %3 %4 %5"}.arg (m_hisCall).arg (m_hisGrid)
.arg (m_rptSent).arg (m_rptRcvd).arg (m_lastBand));
on_logQSOButton_clicked ();
m_foxRateQueue.enqueue (now); //Add present time in seconds
//to Rate queue.
QTimer::singleShot (13000, [=] {
m_foxQSOinProgress.removeOne(hc1); //Remove from In Progress window
updateFoxQSOsInProgressDisplay(); //Update InProgress display after Tx is complete
});
auto already_logged = m_loggedByFox[hc1].contains(m_lastBand + " "); // already logged this call on this band?
if (!already_logged) { // Log this QSO!
auto QSO_time = QDateTime::currentDateTimeUtc ();
m_hisCall=hc1;
m_hisGrid=m_foxQSO[hc1].grid;
m_rptSent=m_foxQSO[hc1].sent;
m_rptRcvd=m_foxQSO[hc1].rcvd;
if (!m_foxLogWindow) on_fox_log_action_triggered ();
if (m_logBook.fox_log ()->add_QSO (QSO_time, m_hisCall, m_hisGrid, m_rptSent, m_rptRcvd, m_lastBand))
{
writeFoxQSO (QString {" Log: %1 %2 %3 %4 %5"}.arg (m_hisCall).arg (m_hisGrid)
.arg (m_rptSent).arg (m_rptRcvd).arg (m_lastBand));
on_logQSOButton_clicked ();
m_foxRateQueue.enqueue (now); //Add present time in seconds
//to Rate queue.
QTimer::singleShot (13000, [=] {
m_foxQSOinProgress.removeOne(hc1); //Remove from In Progress window
updateFoxQSOsInProgressDisplay(); //Update InProgress display after Tx is complete
});
}
m_loggedByFox[hc1] += (m_lastBand + " ");
}
else
{
// note that this is a duplicate
writeFoxQSO(QString{" Dup: %1 %2 %3 %4 %5"}.arg(m_hisCall).arg(m_hisGrid)
.arg(m_rptSent).arg(m_rptRcvd).arg(m_lastBand));
}
m_loggedByFox[hc1] += (m_lastBand + " ");
}
if(i<n2 and fm=="") {