From 81856e08666b6bf2e06dd4ea57b759679df13b3f Mon Sep 17 00:00:00 2001 From: Phil Olynyk Date: Tue, 17 Aug 2021 19:29:46 -0400 Subject: [PATCH] Clean up code around reporting missing value summaries --- oscar/SleepLib/session.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/oscar/SleepLib/session.cpp b/oscar/SleepLib/session.cpp index 6fd2e375..25e05684 100644 --- a/oscar/SleepLib/session.cpp +++ b/oscar/SleepLib/session.cpp @@ -1139,15 +1139,17 @@ void Session::updateCountSummary(ChannelID code) } } - if ( valsum.size() == 0) { + if ( valsum.size() == 0) { // no value summary for this channel using namespace schema; Channel *ch_p = channel.channels[code]; - if ( ! ch_p->isNull() ) { - if ( (ch_p->type() & FLAG) == FLAG ) - return; - qDebug() << "No valuesummary for channel " << ch_p->label(); + if ( ! ch_p->isNull() ) { // the channel was found in the channel list + if ( ! ((ch_p->type() & FLAG) == FLAG) ) { // the channel is not a flag type + qDebug() << "No valuesummary for channel " << ch_p->label(); // so tell about missing summary + } + } else { + // This channel wasn't added to the channel list, so we can't check its type + qDebug() << "No valuesummary for channel (hex)" << QString::number(code, 16); } - qDebug() << "No valuesummary for channel (hex)" << QString::number(code, 16); return; }