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

Extracted isMyCallIncluded

Browse Source
This commit is contained in:
Jordan Sherer 2018-07-11 10:40:29 -04:00
parent 494459ee11
commit 2cb78f5414
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mainwindow.cpp
View File

@ -3212,7 +3212,7 @@ void MainWindow::readFromStdout() //readFromStdout
m_rxFrameQueue.append(d); m_rxFrameQueue.append(d);
// bump the directed cache datetime if this is our callsign, or we've seen this recently... // 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()))){ if(isRecentlyDirected(audioFreq) || isMyCallIncluded(d.text)){
m_rxDirectedCache.insert(audioFreq/10*10, new QDateTime(QDateTime::currentDateTimeUtc()), 25); m_rxDirectedCache.insert(audioFreq/10*10, new QDateTime(QDateTime::currentDateTimeUtc()), 25);
} }
} }
@ -7650,6 +7650,16 @@ bool MainWindow::isRecentlyDirected(int offset){
); );
} }
bool MainWindow::isMyCallIncluded(const QString &text){
QString myCall = m_config.my_callsign();
if(myCall.isEmpty()){
return false;
}
return text.contains(myCall);
}
void MainWindow::displayActivity(){ void MainWindow::displayActivity(){
if(!m_rxDirty){ if(!m_rxDirty){
return; return;
@ -7741,7 +7751,7 @@ void MainWindow::displayActivity(){
textItem->setBackground(QBrush(m_config.color_CQ())); textItem->setBackground(QBrush(m_config.color_CQ()));
} }
if (isRecentlyDirected(offset) || (!m_config.my_callsign().isEmpty() && text.last().contains(m_config.my_callsign()))){ if (isRecentlyDirected(offset) || isMyCallIncluded(text.last())){
offsetItem->setBackground(QBrush(m_config.color_MyCall())); offsetItem->setBackground(QBrush(m_config.color_MyCall()));
//ageItem->setBackground(QBrush(m_config.color_MyCall())); //ageItem->setBackground(QBrush(m_config.color_MyCall()));
snrItem->setBackground(QBrush(m_config.color_MyCall())); snrItem->setBackground(QBrush(m_config.color_MyCall()));

1
mainwindow.h
View File

@ -741,6 +741,7 @@ private:
void replayDecodes (); void replayDecodes ();
void postDecode (bool is_new, QString const& message); void postDecode (bool is_new, QString const& message);
void displayTransmit(); void displayTransmit();
bool isMyCallIncluded(QString const &text);
bool isRecentlyDirected(int offset); bool isRecentlyDirected(int offset);
void displayActivity(); void displayActivity();
void postWSPRDecode (bool is_new, QStringList message_parts); void postWSPRDecode (bool is_new, QStringList message_parts);