adding explicit control for SigMF Labels

Signed-off-by: Jacob Gilbert <jacobgilbert@protonmail.com>

Author: Jacob Gilbert

src/mainwindow.cpp

@@ -52,6 +52,7 @@ MainWindow::MainWindow()
     connect(dock->scalesCheckBox, &QCheckBox::stateChanged, plots, &PlotView::enableScales);
     connect(dock->annosCheckBox, &QCheckBox::stateChanged, plots, &PlotView::enableAnnotations);
     connect(dock->annosCheckBox, &QCheckBox::stateChanged, dock, &SpectrogramControls::enableAnnotations);
+    connect(dock->annoLabelCheckBox, &QCheckBox::stateChanged, plots, &PlotView::enableAnnoLabels);
     connect(dock->commentsCheckBox, &QCheckBox::stateChanged, plots, &PlotView::enableAnnotationCommentsTooltips);
     connect(dock->annoColorCheckBox, &QCheckBox::stateChanged, plots, &PlotView::enableAnnoColors);
     connect(dock->cursorSymbolsSpinBox, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged), plots, &PlotView::setCursorSegments);

src/plotview.cpp

@@ -52,9 +52,9 @@ PlotView::PlotView(InputSource *input) : cursors(this), viewRange({0, 0})
     enableScales(true);
 
     enableAnnotations(true);
-    enableAnnotationCommentsTooltips(true);
-
+    enableAnnoLabels(true);
     enableAnnoColors(true);
+    enableAnnotationCommentsTooltips(true);
 
     addPlot(spectrogramPlot);
 
@@ -666,6 +666,14 @@ void PlotView::enableAnnotations(bool enabled)
     viewport()->update();
 }
 
+void PlotView::enableAnnoLabels(bool enabled)
+{
+    if (spectrogramPlot != nullptr)
+        spectrogramPlot->enableAnnoLabels(enabled);
+
+    viewport()->update();
+}
+
 void PlotView::enableAnnotationCommentsTooltips(bool enabled)
 {
     annotationCommentsEnabled = enabled;

src/plotview.h

@@ -47,6 +47,7 @@ public slots:
     void enableCursors(bool enabled);
     void enableScales(bool enabled);
     void enableAnnotations(bool enabled);
+    void enableAnnoLabels(bool enabled);
     void enableAnnotationCommentsTooltips(bool enabled);
     void enableAnnoColors(bool enabled);
     void invalidateEvent() override;

src/spectrogramcontrols.cpp

@@ -99,6 +99,8 @@ SpectrogramControls::SpectrogramControls(const QString & title, QWidget * parent
 
     annosCheckBox = new QCheckBox(widget);
     layout->addRow(new QLabel(tr("Display Annotations:")), annosCheckBox);
+    annoLabelCheckBox = new QCheckBox(widget);
+    layout->addRow(new QLabel(tr("Annotation Labels:")), annoLabelCheckBox);
     commentsCheckBox = new QCheckBox(widget);
     layout->addRow(new QLabel(tr("Annotation comments:")), commentsCheckBox);
     annoColorCheckBox = new QCheckBox(widget);
@@ -138,6 +140,7 @@ void SpectrogramControls::setDefaults()
     cursorSymbolsSpinBox->setValue(1);
 
     annosCheckBox->setCheckState(Qt::Checked);
+    annoLabelCheckBox->setCheckState(Qt::Checked);
     annoColorCheckBox->setCheckState(Qt::Checked);
 
     // Try to set the sample rate from the last-used value

src/spectrogramcontrols.h

@@ -75,6 +75,7 @@ private slots:
     QLabel *symbolPeriodLabel;
     QCheckBox *scalesCheckBox;
     QCheckBox *annosCheckBox;
+    QCheckBox *annoLabelCheckBox;
     QCheckBox *commentsCheckBox;
     QCheckBox *annoColorCheckBox;
 };

src/spectrogramplot.cpp

@@ -43,6 +43,7 @@ SpectrogramPlot::SpectrogramPlot(std::shared_ptr<SampleSource<std::complex<float
     sampleRate = 0;
     frequencyScaleEnabled = false;
     sigmfAnnotationsEnabled = true;
+    sigmfAnnotationLabels = true;
     sigmfAnnotationColors = true;
 
     for (int i = 0; i < 256; i++) {
@@ -201,9 +202,10 @@ void SpectrogramPlot::paintAnnotations(QPainter &painter, QRect &rect, range_t<s
             if (sigmfAnnotationColors) {
                 painter.setPen(a.boxColor);
             }
-
-            // Draw the label 2 pixels above the box
-            painter.drawText(x, y - 2, a.label);
+            if (sigmfAnnotationLabels) {
+                // Draw the label 2 pixels above the box
+                painter.drawText(x, y - 2, a.label);
+            }
             painter.drawRect(x, y, width, height);
 
             visibleAnnotationLocations.emplace_back(a, x, y, width, height);
@@ -436,6 +438,11 @@ bool SpectrogramPlot::isAnnotationsEnabled(void)
     return sigmfAnnotationsEnabled;
 }
 
+void SpectrogramPlot::enableAnnoLabels(bool enabled)
+{
+    sigmfAnnotationLabels = enabled;
+}
+
 void SpectrogramPlot::enableAnnoColors(bool enabled)
 {
     sigmfAnnotationColors = enabled;

src/spectrogramplot.h

@@ -52,6 +52,7 @@ class SpectrogramPlot : public Plot
     bool tunerEnabled();
     void enableScales(bool enabled);
     void enableAnnotations(bool enabled);
+    void enableAnnoLabels(bool enabled);
     bool isAnnotationsEnabled();
     void enableAnnoColors(bool enabled);
     QString *mouseAnnotationComment(const QMouseEvent *event);
@@ -84,6 +85,7 @@ public slots:
     double sampleRate;
     bool frequencyScaleEnabled;
     bool sigmfAnnotationsEnabled;
+    bool sigmfAnnotationLabels;
     bool sigmfAnnotationColors;
 
     Tuner tuner;