fix signal detection

josevcm · Nov 23, 2024 · 7516972 · 7516972
1 parent ca07392
commit 7516972
Showing 1 changed file with 13 additions and 7 deletions.
diff --git a/src/nfc-app/app-qt/src/main/cpp/QtWindow.cpp b/src/nfc-app/app-qt/src/main/cpp/QtWindow.cpp
@@ -24,7 +24,6 @@
 #include <QClipboard>
 #include <QComboBox>
 #include <QTimer>
-#include <QDateTime>
 #include <QStandardPaths>
 #include <QScreen>
 #include <QRegularExpression>
@@ -34,8 +33,6 @@
 #include <hw/SignalType.h>
 #include <hw/SignalBuffer.h>
 
-#include <lab/nfc/Nfc.h>
-
 #include <model/StreamFilter.h>
 #include <model/StreamModel.h>
 #include <model/ParserModel.h>
@@ -923,12 +920,21 @@ struct QtWindow::Impl
       bool signalSelected = ui->logicView->selectionSizeRange() > 0 || ui->radioView->selectionSizeRange() > 0;
       bool signalPresent = logicSignalPresent || radioSignalPresent;
       bool signalWide = logicSignalWide || radioSignalWide;
+      bool decoderEnabled = logicDecoderEnabled || radioDecoderEnabled;
+
+      // update signal label
+      if (signalPresent && !decoderEnabled)
+         ui->signalLabel->setText(tr("Enable decoder to view acquired signal"));
+      else if (!decoderEnabled)
+         ui->signalLabel->setText(tr("Enable decoder and start acquisition or open a trace file"));
+      else
+         ui->signalLabel->setText(tr("Start acquisition or open a trace file"));
 
       // show views based on selected features
-      ui->logicView->setVisible(logicSignalPresent);
-      ui->radioView->setVisible(radioSignalPresent);
-      ui->signalScroll->setVisible(signalPresent);
-      ui->signalLabel->setVisible(!signalPresent);
+      ui->logicView->setVisible(logicSignalPresent && logicDecoderEnabled);
+      ui->radioView->setVisible(radioSignalPresent && radioDecoderEnabled);
+      ui->signalScroll->setVisible(signalPresent && decoderEnabled);
+      ui->signalLabel->setVisible(!signalPresent || !decoderEnabled);
       ui->frequencyView->setEnabled(spectrumEnabled);
 
       // if no data is present, disable related actions