Add ensemble ID to service details

AlbrechtL · Oct 9, 2024 · 6a1adf0 · 6a1adf0
1 parent 33ab26b
commit 6a1adf0
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/src/welle-gui/QML/expertviews/ServiceDetails.qml b/src/welle-gui/QML/expertviews/ServiceDetails.qml
@@ -132,6 +132,11 @@ ViewBaseFrame {
             }
         }
 
+        TextExpert {
+            name: qsTr("Ensemble ID") + ":"
+            text: "0x" + radioController.ensembleId.toString(16)
+        }
+
         TextExpert {
             name: qsTr("DAB date and time") + ":"
             text: radioController.dateTime.toUTCString()

diff --git a/src/welle-gui/radio_controller.cpp b/src/welle-gui/radio_controller.cpp
@@ -366,6 +366,7 @@ void CRadioController::setChannel(QString Channel, bool isScan, bool Force)
         if (!isScan)
             emit autoChannelChanged(autoChannel);
         emit ensembleChanged();
+        emit ensembleIdChanged();
         emit frequencyChanged();
     }
 }
@@ -654,6 +655,7 @@ void CRadioController::resetTechnicalData(void)
     currentEId = 0;
     currentEnsembleLabel = "";
     emit ensembleChanged();
+    emit ensembleIdChanged();
 
     currentFrequency = 0;
     emit frequencyChanged();
@@ -730,12 +732,13 @@ bool CRadioController::deviceRestart()
  *****************/
 void CRadioController::ensembleId(quint16 eId)
 {
-    qDebug() << "RadioController: ID of ensemble:" << eId;
+    qDebug() << "RadioController: ID of ensemble:" << Qt::hex << eId;
 
     if (currentEId == eId)
         return;
 
     currentEId = eId;
+    emit ensembleIdChanged();
 
     //auto label = radioReceiver->getEnsembleLabel();
     //currentEnsembleLabel = QString::fromStdString(label.utf8_label());

diff --git a/src/welle-gui/radio_controller.h b/src/welle-gui/radio_controller.h
@@ -89,6 +89,7 @@ class CRadioController :
     Q_PROPERTY(QStringList lastChannel MEMBER currentLastChannel NOTIFY lastChannelChanged)
     Q_PROPERTY(QString autoChannel MEMBER autoChannel NOTIFY autoChannelChanged)
     Q_PROPERTY(QString ensemble MEMBER currentEnsembleLabel NOTIFY ensembleChanged)
+    Q_PROPERTY(int ensembleId MEMBER currentEId NOTIFY ensembleIdChanged)
     Q_PROPERTY(int frequency MEMBER currentFrequency NOTIFY frequencyChanged)
     Q_PROPERTY(quint32 service MEMBER currentService NOTIFY stationChanged)
     Q_PROPERTY(quint32 autoService MEMBER autoService NOTIFY autoServiceChanged)
@@ -290,6 +291,7 @@ private slots:
     void lastChannelChanged();
     void autoChannelChanged(QString autoChannel);
     void ensembleChanged();
+    void ensembleIdChanged();
     void frequencyChanged();
     void stationChanged();
     void autoServiceChanged(quint32 autoService);