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

Fixed issue with double printing of ACKS that have MSG IDs

Browse Source
This commit is contained in:
Jordan Sherer 2019-02-10 10:59:50 -05:00
parent ee350524fa
commit 4f243b1e1a
1 changed files with 36 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
mainwindow.cpp
View File

@ -9825,13 +9825,18 @@ void MainWindow::processCommandActivity() {
ad.bits = d.bits; ad.bits = d.bits;
ad.freq = d.freq; ad.freq = d.freq;
ad.snr = d.snr; ad.snr = d.snr;
ad.text = QString("%1: %2%3 ").arg(d.from).arg(d.to).arg(d.cmd);
QStringList text;
text.append(QString("%1: %2%3").arg(d.from).arg(d.to).arg(d.cmd));
if(!d.extra.isEmpty()){ if(!d.extra.isEmpty()){
ad.text += d.extra; text.append(d.extra);
} }
if(!d.text.isEmpty()){ if(!d.text.isEmpty()){
ad.text += d.text; text.append(d.text);
} }
ad.text = text.join(" ");
bool isLast = (ad.bits & Varicode::JS8CallLast) == Varicode::JS8CallLast; bool isLast = (ad.bits & Varicode::JS8CallLast) == Varicode::JS8CallLast;
if (isLast) { if (isLast) {
// can also use \u0004 \u2666 \u2404 // can also use \u0004 \u2666 \u2404
@ -9839,7 +9844,6 @@ void MainWindow::processCommandActivity() {
} }
ad.utcTimestamp = d.utcTimestamp; ad.utcTimestamp = d.utcTimestamp;
// we'd be double printing here if were on frequency, so let's be "smart" about this... // we'd be double printing here if were on frequency, so let's be "smart" about this...
bool shouldDisplay = true; bool shouldDisplay = true;
@ -10814,29 +10818,45 @@ void MainWindow::displayBandActivity() {
int snr = 0; int snr = 0;
float tdrift = 0; float tdrift = 0;
int activityAging = m_config.activity_aging(); int activityAging = m_config.activity_aging();
foreach(ActivityDetail item, items) {
// hide items that shouldn't appear
for(int i = 0; i < items.length(); i++){
auto item = items[i];
bool shouldDisplay = true;
// hide aged items
if (!isOffsetSelected && activityAging && item.utcTimestamp.secsTo(now) / 60 >= activityAging) { if (!isOffsetSelected && activityAging && item.utcTimestamp.secsTo(now) / 60 >= activityAging) {
continue; shouldDisplay = false;
} }
if (m_hbHidden && (item.text.contains(" HB ") || item.text.contains(" ACK "))){ // hide heartbeat items
if (m_hbHidden){
// hide heartbeats and acks if we have heartbeating hidden // hide heartbeats and acks if we have heartbeating hidden
if(item.text.contains(" HB ") || item.text.contains(" ACK ")){
shouldDisplay = false;
}
}
// hide empty items
if (item.text.isEmpty()) {
shouldDisplay = false;
}
// set the visibility of the item
items[i].shouldDisplay = shouldDisplay;
}
// show the items that should appear
foreach(ActivityDetail item, items) {
if(!item.shouldDisplay){
continue; continue;
} }
if (item.text.isEmpty()) {
continue;
}
#if 0
if (item.isCompound || (item.isDirected && item.text.contains("<....>"))){
//continue;
item.text = "[...]";
}
#endif
if (item.isLowConfidence) { if (item.isLowConfidence) {
item.text = QString("[%1]").arg(item.text); item.text = QString("[%1]").arg(item.text);
} }
if ((item.bits & Varicode::JS8CallLast) == Varicode::JS8CallLast) { if ((item.bits & Varicode::JS8CallLast) == Varicode::JS8CallLast) {
// can also use \u0004 \u2666 \u2404 // can also use \u0004 \u2666 \u2404
item.text = QString("%1 \u2301 ").arg(Varicode::rstrip(item.text)); item.text = QString("%1 \u2301 ").arg(Varicode::rstrip(item.text));