chris/js8call
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated directed call cache to be better represent recent directed calls

Browse Source
This commit is contained in:
Jordan Sherer 2018-07-09 17:29:43 -04:00
parent 42a8338d1c
commit cd9079e7ff
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
mainwindow.cpp
View File

@ -3171,8 +3171,14 @@ void MainWindow::readFromStdout() //readFromStdout
if(abs(audioFreq - m_wideGraph->rxFreq()) <= 10) bDisplayRight=true; if(abs(audioFreq - m_wideGraph->rxFreq()) <= 10) bDisplayRight=true;
} }
if(!bDisplayRight){ // TODO: jsherer - this is duped...
bDisplayRight = m_rxDirectedCache.contains(audioFreq/10*10); // if this frequency offset is within our directed call cache in the last 2 minutes.
bool recentlyDirected = (
m_rxDirectedCache.contains(audioFreq/10*10) &&
m_rxDirectedCache[audioFreq/10*10]->secsTo(QDateTime::currentDateTimeUtc()) < 120
);
if(recentlyDirected){
bDisplayRight = true;
} }
if (bDisplayRight) { if (bDisplayRight) {
@ -3197,7 +3203,8 @@ void MainWindow::readFromStdout() //readFromStdout
d.utcTimestamp = QDateTime::currentDateTimeUtc(); d.utcTimestamp = QDateTime::currentDateTimeUtc();
m_rxFrameQueue.append(d); m_rxFrameQueue.append(d);
if(!m_config.my_callsign().isEmpty() && d.text.contains(m_config.my_callsign())){ // bump the directed cache datetime if this is our callsign, or we've seen this recently...
if(recentlyDirected || (!m_config.my_callsign().isEmpty() && d.text.contains(m_config.my_callsign()))){
m_rxDirectedCache.insert(audioFreq/10*10, new QDateTime(QDateTime::currentDateTimeUtc()), 25); m_rxDirectedCache.insert(audioFreq/10*10, new QDateTime(QDateTime::currentDateTimeUtc()), 25);
} }
} }
@ -7679,9 +7686,11 @@ void MainWindow::postDecode (bool is_new, QString const& message)
textItem->setBackground(QBrush(m_config.color_CQ())); textItem->setBackground(QBrush(m_config.color_CQ()));
} }
if ((!m_config.my_callsign().isEmpty() && text.last().contains(m_config.my_callsign())) || bool recentlyDirected = (
(m_rxDirectedCache.contains(offset/10*10)) m_rxDirectedCache.contains(offset/10*10) &&
){ m_rxDirectedCache[offset/10*10]->secsTo(QDateTime::currentDateTimeUtc()) < 120
);
if (recentlyDirected || (!m_config.my_callsign().isEmpty() && text.last().contains(m_config.my_callsign()))){
offsetItem->setBackground(QBrush(m_config.color_MyCall())); offsetItem->setBackground(QBrush(m_config.color_MyCall()));
snrItem->setBackground(QBrush(m_config.color_MyCall())); snrItem->setBackground(QBrush(m_config.color_MyCall()));
textItem->setBackground(QBrush(m_config.color_MyCall())); textItem->setBackground(QBrush(m_config.color_MyCall()));