Multiple independent bandmap windows

.github/workflows/macOSBuild.yml

@@ -13,7 +13,7 @@ jobs:
      name: MacOS Build
      strategy:
        matrix:
-         os: [macos-12, macos-13]
+         os: [macos-12, macos-14]
 
      runs-on: ${{ matrix.os }}
 

core/main.cpp

@@ -519,7 +519,7 @@ int main(int argc, char* argv[])
     QIcon icon(":/res/qlog.png");
     splash.finish(&w);
     w.setWindowIcon(icon);
-
+    QObject::connect(&app, &QCoreApplication::aboutToQuit, &w, &MainWindow::aboutToQuit);
     w.show();
 #ifdef Q_OS_OSX
     w.setLayoutGeometry();

ui/BandmapWidget.cpp

@@ -1,12 +1,12 @@
 #include <QGraphicsScene>
+#include <QGraphicsSceneMouseEvent>
 #include <QGraphicsTextItem>
-#include <QMutableMapIterator>
 #include <QMenu>
-#include <QTextDocument>
+#include <QMutableMapIterator>
 #include <QScrollBar>
-#include <QGraphicsSceneMouseEvent>
-#include <algorithm>
+#include <QTextDocument>
 #include <QWheelEvent>
+#include <algorithm>
 
 #include "BandmapWidget.h"
 #include "ui_BandmapWidget.h"
@@ -28,15 +28,18 @@ MODULE_IDENTIFICATION("qlog.ui.bandmapwidget");
 
 #define WIDGET_CENTER ( height()/2 - 50 )
 
-BandmapWidget::BandmapWidget(QWidget *parent) :
-    QWidget(parent),
-    ui(new Ui::BandmapWidget),
-    rxMark(nullptr),
-    txMark(nullptr),
-    keepRXCenter(true),
-    pendingSpots(0),
-    lastStationUpdate(0),
-    bandmapAnimation(true)
+QMap<double, DxSpot> BandmapWidget::spots;
+
+BandmapWidget::BandmapWidget(QWidget *parent, QString nonVfoWidgetId)
+    : QWidget(parent)
+    , ui(new Ui::BandmapWidget)
+    , rxMark(nullptr)
+    , txMark(nullptr)
+    , keepRXCenter(true)
+    , pendingSpots(0)
+    , lastStationUpdate(0)
+    , bandmapAnimation(true)
+    , isNonVfo(nonVfoWidgetId != nullptr)
 {
     FCT_IDENTIFICATION;
 
@@ -49,7 +52,27 @@ BandmapWidget::BandmapWidget(QWidget *parent) :
     const QString &submode = settings.value("newcontact/submode").toString();
     keepRXCenter = settings.value("bandmap/centerrx", true).toBool();
 
-    setBand(BandPlan::freq2Band(ritFreq), false);
+    if (isNonVfo) {
+        setObjectName(nonVfoWidgetId);
+        ui->bottomRow->setVisible(false);
+        ui->clearButton->setVisible(false);
+        // read the band for this window from persisted state (settings) or a new
+        // bandmap should start at the currently active vfo
+        Band startingBand = BandPlan::freq2Band(ritFreq);
+        QString nonVfoBandName = settings.value(nonVfoWidgetId).toString();
+        qCDebug(runtime) << nonVfoWidgetId << "band from settings" << nonVfoBandName;
+
+        for (const Band &enabledBand : BandPlan::bandsList(false, true)) {
+            if (enabledBand.name == nonVfoBandName) {
+                startingBand = enabledBand;
+                break;
+            }
+        }
+        setBand(startingBand);
+    } else {
+        ui->clearSpotOlderSpin->setValue(settings.value("bandmap/spot_aging", 0).toInt());
+        setBand(BandPlan::freq2Band(ritFreq), false);
+    }
 
     bandmapScene = new GraphicsScene(this);
     bandmapScene->setFocusOnTouch(false);
@@ -63,8 +86,6 @@ BandmapWidget::BandmapWidget(QWidget *parent) :
     ui->graphicsView->installEventFilter(this);
     //ui->scrollArea->verticalScrollBar()->setSingleStep(5);
 
-    ui->clearSpotOlderSpin->setValue(settings.value("bandmap/spot_aging", 0).toInt());
-
     update_timer = new QTimer;
     connect(update_timer, &QTimer::timeout, this, &BandmapWidget::updateStationTimer);
     update_timer->start(BANDMAP_MAX_REFRESH_TIME);
@@ -191,7 +212,9 @@ void BandmapWidget::updateStations()
 
     clearAllCallsignFromScene();
 
-    spotAging();
+    if (!isNonVfo) {
+        spotAging();
+    }
 
     // do not show bandmap for submm bands
     if ( rx_freq > 250000.0 || currentBand.start >= 300000.0 )
@@ -251,6 +274,10 @@ void BandmapWidget::updateStations()
 
     pendingSpots = 0;
     lastStationUpdate = QDateTime::currentMSecsSinceEpoch();
+    if (!isNonVfo) {
+        // signal to the non-vfo bandmaps that the spots should be redrawn
+        emit spotsUpdated();
+    }
 }
 
 void BandmapWidget::determineStepDigits(double &step, int &digits) const
@@ -378,9 +405,7 @@ void BandmapWidget::drawTXRXMarks(double step)
          && tx_freq != rx_freq )
     {
         drawFreqMark(tx_freq, step, QColor(255, 0, 0), &txMark);
-    }
-    else
-    {
+    } else {
         clearFreqMark(&txMark);
     }
 }
@@ -523,6 +548,10 @@ void BandmapWidget::setBand(const Band &newBand, bool savePrevBandZoom)
     zoom = getSavedZoom(newBand);
     zoomFreq = getSavedScrollFreq(newBand);
     zoomWidgetYOffset = WIDGET_CENTER;
+    if (isNonVfo) {
+        qCDebug(runtime) << objectName() << "set band" << newBand.name;
+        settings.setValue(objectName(), newBand.name);
+    }
 }
 
 void BandmapWidget::saveCurrentZoom()
@@ -812,11 +841,14 @@ void BandmapWidget::showContextMenu(const QPoint &point)
     for ( const Band &enabledBand : BandPlan::bandsList(false, true))
     {
         QAction* action = new QAction(enabledBand.name);
-        connect(action, &QAction::triggered, this, [this, enabledBand]()
-        {
+        connect(action, &QAction::triggered, this, [this, enabledBand]() {
             setBand(enabledBand);
             update();
         });
+        if (enabledBand == currentBand) {
+            action->setCheckable(true);
+            action->setChecked(true);
+        }
         bandsMenu.addAction(action);
     }
 
@@ -831,11 +863,15 @@ void BandmapWidget::showContextMenu(const QPoint &point)
     contextMenu.exec(ui->graphicsView->mapToGlobal(point));
 }
 
-void BandmapWidget::updateTunedFrequency(VFOID, double vfoFreq, double ritFreq, double xitFreq)
+void BandmapWidget::updateTunedFrequency(VFOID vfo, double vfoFreq, double ritFreq, double xitFreq)
 {
     FCT_IDENTIFICATION;
 
     qCDebug(function_parameters) << vfoFreq << ritFreq << xitFreq;
+    if (isNonVfo) {
+        updateTunedFrequencyNonVfo(vfo, vfoFreq, ritFreq, xitFreq);
+        return;
+    }
 
     /* always show the bandmap for RIT Freq */
     rx_freq = ritFreq;
@@ -872,6 +908,34 @@ void BandmapWidget::updateTunedFrequency(VFOID, double vfoFreq, double ritFreq,
     updateNearestSpot();
 }
 
+void BandmapWidget::updateTunedFrequencyNonVfo(VFOID, double vfoFreq, double ritFreq, double xitFreq)
+{
+    FCT_IDENTIFICATION;
+
+    qCDebug(function_parameters) << vfoFreq << ritFreq << xitFreq;
+
+    /* always show the bandmap for RIT Freq */
+    rx_freq = ritFreq;
+    tx_freq = xitFreq;
+
+    if (rx_freq >= currentBand.start && rx_freq <= currentBand.end) {
+        // bandmap is showing the tuned frequency, so show the marker
+        double step;
+        int digits;
+
+        determineStepDigits(step, digits);
+
+        /************************/
+        /* Draw TX and RX Marks */
+        /************************/
+        drawTXRXMarks(step);
+        scrollToFreq(rx_freq);
+    } else {
+        clearFreqMark(&txMark);
+        clearFreqMark(&rxMark);
+    }
+}
+
 void BandmapWidget::updateMode(VFOID, const QString &, const QString &mode,
                                const QString &subMode, qint32 width)
 {
@@ -986,13 +1050,10 @@ void BandmapWidget::scrollToFreq(double freq)
         if ( freqScenePos < sliderSceneMin )
         {
             anim->setEndValue(sliderSceneMin - (sliderSceneMin - freqScenePos) - 40);
-        }
-        else if ( freqScenePos > sliderSceneMax - 20 ) //asymetric becuase possible slider below
+        } else if (freqScenePos > sliderSceneMax - 20) //asymetric becuase possible slider below
         {
             anim->setEndValue(sliderSceneMin + (freqScenePos - sliderSceneMax) + 60);
-        }
-        else
-        {
+        } else {
             anim->setEndValue(ui->scrollArea->verticalScrollBar()->value());
         }
     }
@@ -1062,6 +1123,16 @@ void BandmapWidget::centerRXActionChecked(bool state)
         scrollToFreq(rx_freq);
 }
 
+void BandmapWidget::clickNewBandmapWindow()
+{
+    FCT_IDENTIFICATION;
+    emit requestNewNonVfoBandmapWindow();
+}
+Band *BandmapWidget::getBand()
+{
+    return &currentBand;
+}
+
 void GraphicsScene::mousePressEvent(QGraphicsSceneMouseEvent *evt)
 {
     FCT_IDENTIFICATION;

ui/BandmapWidget.h

@@ -41,7 +41,7 @@ class BandmapWidget : public QWidget
     Q_OBJECT
 
 public:
-    explicit BandmapWidget(QWidget *parent = nullptr);
+    explicit BandmapWidget(QWidget *parent = nullptr, QString nonVfoWidgetId = nullptr);
     ~BandmapWidget();
 
     enum BandmapZoom {
@@ -54,6 +54,7 @@ class BandmapWidget : public QWidget
         ZOOM_10KHZ
     };
 
+    Band *getBand();
 public slots:
     void update();
     void updateTunedFrequency(VFOID, double, double, double);
@@ -71,15 +72,18 @@ public slots:
     void recalculateDxccStatus();
     void resetDupe();
     void recalculateDupe();
+    void clickNewBandmapWindow();
+    void updateStations();
 
 signals:
     void tuneDx(DxSpot);
     void nearestSpotFound(const DxSpot &);
+    void requestNewNonVfoBandmapWindow();
+    void spotsUpdated();
 
 private:
     void removeDuplicates(DxSpot &spot);
     void spotAging();
-    void updateStations();
     void determineStepDigits(double &steps, int &digits) const;
     void clearAllCallsignFromScene();
     void clearFreqMark(QGraphicsPolygonItem **);
@@ -99,6 +103,7 @@ public slots:
     void saveCurrentScrollFreq();
     double getSavedScrollFreq(Band);
     double visibleCentreFreq() const;
+    void updateTunedFrequencyNonVfo(VFOID, double, double, double);
 
 private slots:
     void centerRXActionChecked(bool);
@@ -115,7 +120,6 @@ private slots:
     Band currentBand;
     BandmapZoom zoom;
     GraphicsScene* bandmapScene;
-    QMap<double, DxSpot> spots;
     QTimer *update_timer;
     QList<QGraphicsLineItem *> lineItemList;
     QList<QGraphicsTextItem *> textItemList;
@@ -138,6 +142,8 @@ private slots:
     };
     LastTuneDx lastTunedDX;
     DxSpot lastNearestSpot;
+    bool isNonVfo;
+    static QMap<double, DxSpot> spots;
 };
 
 Q_DECLARE_METATYPE(BandmapWidget::BandmapZoom)