Adds immediate migration results in progress

qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/handler_infrastructure_data.cpp

@@ -13,11 +13,10 @@
 
 using namespace VideoOverlayManagement;
 
-HandlerInfrastructureData::HandlerInfrastructureData(const std::shared_ptr<DdsHandler> &ddsHandler, QObject *parent)
-  : QObject(parent)
+HandlerInfrastructureData::HandlerInfrastructureData(const std::shared_ptr<DdsHandler> &ddsHandler, QObject *parent) : QObject(parent)
   , m_ddsHandler(ddsHandler)
-  , m_exerciseId(0)
-{
+  , m_exerciseId(0),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
 } // end of ctor()
 //-----------------------------------------------------------------------------
 
@@ -33,7 +32,7 @@ bool HandlerInfrastructureData::init(int exerciseId)
   m_dtc = InfrastructureManagement::Interface::Dtc::create(m_ddsHandler->dds());
   if (m_dtc == nullptr)
   {
-    ERROR_LOG() << "Could not create DTC InfrastructureManagement";
+    ERROR_LOG(m_logger) << "Could not create DTC InfrastructureManagement";
     return false;
   }
 
@@ -44,7 +43,7 @@ bool HandlerInfrastructureData::init(int exerciseId)
       !m_dtc->waitForHistoricalDataMountingPointAsset() ||
       !m_dtc->waitForHistoricalDataInstrumentationAsset())
   {
-    ERROR_LOG() << "init() DTC InfrastructureManagement failed";
+    ERROR_LOG(m_logger) << "init() DTC InfrastructureManagement failed";
     return false;
   }
 
@@ -58,7 +57,7 @@ bool HandlerInfrastructureData::init(int exerciseId)
   };
   if (!m_dtc->getAllAssetsPerRoom(predicate, assetsMap))
   {
-    WARNING_LOG() << "HandlerInfrastructureData::getAllAssetsPerRoom() failed"
+    WARNING_LOG(m_logger) << "HandlerInfrastructureData::getAllAssetsPerRoom() failed"
                           << " assetsMap.size(): " << assetsMap.size();
   }
 
@@ -71,7 +70,7 @@ bool HandlerInfrastructureData::init(int exerciseId)
                           asset.availableInExercise().end(), m_exerciseId);
       if (it == asset.availableInExercise().end())
       {
-        DEBUG_LOG() << "Asset " << asset.id()
+        DEBUG_LOG(m_logger) << "Asset " << asset.id()
                             << " is not available in current exercise - skipping";
         continue;
       }
@@ -79,16 +78,16 @@ bool HandlerInfrastructureData::init(int exerciseId)
       m_roomId2CameraNameMap.insert(roomId, QString::fromStdString(asset.name()));
       // und fuer subscribe in m_assetId2RoomIdMap eintragen
       m_assetId2RoomIdMap.insert(asset.id(), roomId);
-      DEBUG_LOG() << " assetId: " << asset.id()
+      DEBUG_LOG(m_logger) << " assetId: " << asset.id()
                           << " mountingPointTypeId: " << asset.mountingPointTypeId()
                           << " name: " << asset.name();
     }
   }  // for(auto i = assetMap...
 
-  INFO_LOG() << "m_roomId2CameraNameMap.size(): " << m_roomId2CameraNameMap.size();
+  INFO_LOG(m_logger) << "m_roomId2CameraNameMap.size(): " << m_roomId2CameraNameMap.size();
   for (auto i = m_roomId2CameraNameMap.begin(); i != m_roomId2CameraNameMap.end(); ++i)
   {
-    INFO_LOG() << "roomId: " << i.key()
+    INFO_LOG(m_logger) << "roomId: " << i.key()
                        << " cameraName: " << i.value();
   }
 
@@ -100,7 +99,7 @@ bool HandlerInfrastructureData::init(int exerciseId)
   m_dtc->enableMainStructureElement(false);
   m_dtc->enableMountingPointAsset(false);
 
-  INFO_LOG() << "HandlerInfrastructureData::init() finished. "
+  INFO_LOG(m_logger) << "HandlerInfrastructureData::init() finished. "
                      << " m_roomId2CameraNameMap.size(): " << m_roomId2CameraNameMap.size();
   return true;
 } // end of init()
@@ -116,7 +115,7 @@ QString HandlerInfrastructureData::getStreamNameFromRoomId(int roomId) const
 {
   auto it = m_roomId2CameraNameMap.find(roomId);
   const QString qs(it == m_roomId2CameraNameMap.end() ? QString() : it.value());
-  DEBUG_LOG() << "streamName for roomId: " << roomId << " '" << qs << "' ";
+  DEBUG_LOG(m_logger) << "streamName for roomId: " << roomId << " '" << qs << "' ";
 
   return qs;
 } // end of getStreamNameFromRoomId()
@@ -128,7 +127,7 @@ void HandlerInfrastructureData::onAssetChanged(const InfrastructureManagement::I
   if (data.mountingPointTypeId() != InfrastructureManagement::MountingPointType::IndoorCamera)
     return;
 
-  INFO_LOG() << "onAssetChanged()"
+  INFO_LOG(m_logger) << "onAssetChanged()"
                      << " assetId: " << data.id()
                      << " name: " << data.name();
 
@@ -136,7 +135,7 @@ void HandlerInfrastructureData::onAssetChanged(const InfrastructureManagement::I
                       data.availableInExercise().end(), m_exerciseId);
   if (it == data.availableInExercise().end())
   {
-    DEBUG_LOG() << "Asset " << data.id()
+    DEBUG_LOG(m_logger) << "Asset " << data.id()
                         << " is not available in current exercise - skipping";
     return;
   }
@@ -146,7 +145,7 @@ void HandlerInfrastructureData::onAssetChanged(const InfrastructureManagement::I
 
   for (auto i = m_roomId2CameraNameMap.begin(); i != m_roomId2CameraNameMap.end(); ++i)
   {
-    DEBUG_LOG() << "m_roomId2CameraNameMap changed... "
+    DEBUG_LOG(m_logger) << "m_roomId2CameraNameMap changed... "
                         << " m_roomId2CameraNameMap.size(): " << m_roomId2CameraNameMap.size()
                         << " roomId: " << i.key()
                         << " cameraName: " << *i;