From 20b2f5569958b6aa4d2a7efdf02a3c37d87ee2ee Mon Sep 17 00:00:00 2001
From: Rex Schilasky <49162693+rex-schilasky@users.noreply.github.com>
Date: Fri, 26 Apr 2024 13:33:34 +0200
Subject: [PATCH] [app] ecalmon layer detection logic (#1568)

ecalmon_gui / tui layer detection improved
---
 .../src/widgets/models/topic_tree_item.cpp    | 33 ++++++++++---------
 app/mon/mon_tui/src/model/monitor.hpp         |  5 ++-
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/app/mon/mon_gui/src/widgets/models/topic_tree_item.cpp b/app/mon/mon_gui/src/widgets/models/topic_tree_item.cpp
index 6bf48e2cb3..eb2e68e00c 100644
--- a/app/mon/mon_gui/src/widgets/models/topic_tree_item.cpp
+++ b/app/mon/mon_gui/src/widgets/models/topic_tree_item.cpp
@@ -209,22 +209,25 @@ QVariant TopicTreeItem::data(Columns column, Qt::ItemDataRole role) const
       for (const auto& layer : layer_pb)
       {
         QString this_layer_string;
-        switch (layer.type())
+        if (layer.confirmed())
         {
-        case eCAL::pb::eTLayerType::tl_ecal_tcp:
-          this_layer_string = "tcp";
-          break;
-        case eCAL::pb::eTLayerType::tl_ecal_udp_mc:
-          this_layer_string = "udp_mc";
-          break;
-        case eCAL::pb::eTLayerType::tl_ecal_shm:
-          this_layer_string = "shm";
-          break;
-        case eCAL::pb::eTLayerType::tl_all:
-          this_layer_string = "all";
-          break;
-        default:
-          this_layer_string = ("Unknown (" + QString::number((int)layer.type()) + ")");
+          switch (layer.type())
+          {
+          case eCAL::pb::eTLayerType::tl_ecal_tcp:
+            this_layer_string = "tcp";
+            break;
+          case eCAL::pb::eTLayerType::tl_ecal_udp_mc:
+            this_layer_string = "udp_mc";
+            break;
+          case eCAL::pb::eTLayerType::tl_ecal_shm:
+            this_layer_string = "shm";
+            break;
+          case eCAL::pb::eTLayerType::tl_all:
+            this_layer_string = "all";
+            break;
+          default:
+            this_layer_string = ("Unknown (" + QString::number((int)layer.type()) + ")");
+          }
         }
 
         if (!layer_string.isEmpty() && !this_layer_string.isEmpty())
diff --git a/app/mon/mon_tui/src/model/monitor.hpp b/app/mon/mon_tui/src/model/monitor.hpp
index 1a87994939..63170a3ab6 100644
--- a/app/mon/mon_tui/src/model/monitor.hpp
+++ b/app/mon/mon_tui/src/model/monitor.hpp
@@ -204,7 +204,10 @@ class MonitorModel
       topic.type_descriptor = std::move(*t.mutable_tdatatype()->mutable_desc());
       for(auto &tl: t.tlayer())
       {
-        topic.transport_layers.emplace_back(TopicTransportLayer(tl.type()));
+        if (tl.confirmed())
+        {
+          topic.transport_layers.emplace_back(TopicTransportLayer(tl.type()));
+        }
       }
       topic.size = t.tsize();
       topic.local_connections_count = t.connections_loc();