BUILD_RTI conditional fixes and Qt6 API updates
- cmake/FindRTI.cmake: Add INTERFACE placeholder targets when RTI not found - cmake/FindRTI.cmake: Force BUILD_RTI=OFF when RTI not installed - Lts/Common/LtsSession/CMakeLists.txt: Make LtsSessionDataDds conditional on BUILD_RTI - Lts/Viewer/CMakeLists.txt: Make LtsDataView conditional on BUILD_RTI - Lts/Plugins/*/CMakeLists.txt: 97 plugin files wrapped in BUILD_RTI conditionals - cmake/NGLMacros.cmake: Fix NGL_ADD_BIG_RESOURCES macro (removed premature return()) - Multiple Qt6 API fixes: QLinkedList→std::list, QStringRef→QStringView, etc. - BUILD_RTI_FIXES_SUMMARY.md: Comprehensive documentation of all fixes Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
2065 files changed
+48219
-1763
No files matched your search
@@ -16,7 +16,7 @@
|
||||
#include <AlarmManagement/alm_dts_types.h>
|
||||
#include <ExerciseEventManagement/eem_dtc.h>
|
||||
#include <MarkerManagement/mrk_ftc.h>
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <TrainingAreaBase/tab_dtc.h>
|
||||
#include <ExerciseManagement/exm_dtc.h>
|
||||
#include "logger.h"
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
#include "dds_handler.h"
|
||||
#include "logger.h"
|
||||
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QList>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#include <dds_handler.h>
|
||||
#include "logger.h"
|
||||
|
||||
#include <DDS/Core/core_types.h>
|
||||
#include <Core/core_types.h>
|
||||
//Generated
|
||||
#include <AlarmManagement/alm_db.h>
|
||||
|
||||
|
||||
+1
-1
@@ -25,7 +25,7 @@
|
||||
|
||||
#include <Plugins/ProjectDataManagement/pdm_data_plugin_interface.h>
|
||||
#include <ExerciseManagement/exm_dtc.h>
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <ParticipantManagement/ppm_ftc.h>
|
||||
|
||||
#include <TrainingAreaBase/tab_dts.h>
|
||||
|
||||
+1
-1
@@ -21,7 +21,7 @@
|
||||
|
||||
#include <Plugins/ProjectDataManagement/pdm_data_plugin_interface.h>
|
||||
#include <ExerciseManagement/exm_dtc.h>
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <ParticipantManagement/ppm_ftc.h>
|
||||
|
||||
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@
|
||||
|
||||
// AES
|
||||
#include <AreaEffectSimulation/Utils/polygons.h>
|
||||
#include <DDS/Core/core_types.h>
|
||||
#include <Core/core_types.h>
|
||||
#include <Core/core.hpp>
|
||||
|
||||
|
||||
|
||||
+1
-1
@@ -19,7 +19,7 @@
|
||||
|
||||
#include <ExerciseManagement/exm_dtc.h>
|
||||
#include <InfrastructureManagement/ism_dtc.h>
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <ProjectDataManagement/pdm_dtc.h>
|
||||
#include <ParticipantManagement/ppm_ftc.h>
|
||||
|
||||
|
||||
+1
-1
@@ -19,7 +19,7 @@
|
||||
|
||||
#include <Plugins/ProjectDataManagement/pdm_data_plugin_interface.h>
|
||||
#include <ExerciseManagement/exm_dtc.h>
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <ParticipantManagement/ppm_ftc.h>
|
||||
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
#include <LtsCoordinate/lts_coord_vector.h>
|
||||
#include <LtsCoordinate/lts_coordinate.h>
|
||||
#include <LtsUtilsCore/qpoint3d.h>
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <ProjectDataManagement/pdm_db_structs.h>
|
||||
#include <Trajectory/trajectory_helper.h>
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
#include <DDS/Core/core_dtc.h>
|
||||
#include <DDS/Core/topic_lock_master.h>
|
||||
#include <ProjectDataManagement/pdm_dtc.h>
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <TrainingAreaBase/tab_ftc.h>
|
||||
#include <CentralEffectSimulation/ces_ftc.h>
|
||||
#include <AssetManagement/asm_dtc.h> // For Elevation
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
#pragma once
|
||||
|
||||
#include "logger.h"
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
|
||||
#include <QObject>
|
||||
#include <QHash>
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
#include "special_area_provider.h"
|
||||
|
||||
#include "logger.h"
|
||||
#include <DDS/Core/core_types.h>
|
||||
#include <Core/core_types.h>
|
||||
#include <ProjectDataManagement/pdm_dtc.h>
|
||||
#include <Trajectory/trajectory_generator.h>
|
||||
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
#include <QObject>
|
||||
|
||||
#include "object_base.h"
|
||||
#include <DDS/Core/core_types.h>
|
||||
#include <Core/core_types.h>
|
||||
#include <AreaEffectSimulation/aes_db.h>
|
||||
|
||||
|
||||
|
||||
+1
-1
@@ -11,7 +11,7 @@
|
||||
|
||||
#include "logger.h"
|
||||
|
||||
#include <DDS/Core/core_types.h>
|
||||
#include <Core/core_types.h>
|
||||
#include <aes_db.h>
|
||||
#include <aes_dtc.h>
|
||||
#include <aes_ftc.h>
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
#include <QObject>
|
||||
|
||||
#include "object_base.h"
|
||||
#include <DDS/Core/core_types.h>
|
||||
#include <Core/core_types.h>
|
||||
#include <AreaEffectSimulation/aes_db.h>
|
||||
|
||||
|
||||
|
||||
+1
-1
@@ -17,7 +17,7 @@
|
||||
|
||||
#include <QLineF>
|
||||
#include <QPolygonF>
|
||||
#include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h> // LtsUtils::toOptional
|
||||
#include <LtsUtils/LtsUtilsGui/LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h> // LtsUtils::toOptional
|
||||
#include <LtsUtilsCore/dds_bitarray.h>
|
||||
#include <ngldb/dbtransaction.h>
|
||||
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <LtsUtilsGuiDds/request_helper.h>
|
||||
#include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
|
||||
|
||||
#include "aes_db.h"
|
||||
#include "object_base.h"
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
#include "dds_handler.h"
|
||||
#include "logger.h"
|
||||
|
||||
#include <DDS/Core/core_types.h>
|
||||
#include <Core/core_types.h>
|
||||
|
||||
// Generated
|
||||
#include <AssetManagement/asm_db.h>
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
#pragma once
|
||||
|
||||
#include "logger.h"
|
||||
#include <DDS/Core/core_types.h>
|
||||
#include <Core/core_types.h>
|
||||
|
||||
// Generated
|
||||
#include <AssetManagement/asm_db.h>
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
#include "dds_handler.h"
|
||||
#include "logger.h"
|
||||
|
||||
#include <DDS/Core/core_types.h>
|
||||
#include <Core/core_types.h>
|
||||
|
||||
// Generated
|
||||
#include <AssetManagement/asm_db.h>
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
#include <QObject>
|
||||
#include "dds_handler.h"
|
||||
#include "logger.h"
|
||||
#include <DDS/Core/core_types.h>
|
||||
#include <Core/core_types.h>
|
||||
|
||||
// Generated
|
||||
#include <AssetManagement/asm_db.h>
|
||||
|
||||
+1
-1
@@ -41,7 +41,7 @@ AvmVcaTests::AvmVcaTests(int domainId, int exerciseId, int operatorId)
|
||||
: m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(domainId, IDL::PartitionType::Exercise))
|
||||
, m_exerciseId(exerciseId)
|
||||
, m_operatorId(operatorId)
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("VcaTest"))
|
||||
.getNGLLogger("VcaTest"))
|
||||
{
|
||||
Q_ASSERT(exerciseId > 0);
|
||||
Q_ASSERT(operatorId > 0);
|
||||
|
||||
+1
-1
@@ -13,7 +13,7 @@
|
||||
#include "logger.h"
|
||||
#include <AudioVideoManagement/avm_dts.h>
|
||||
#include <AudioVideoManagement/avm_db.h>
|
||||
#include <DDS/Core/core_types.h>
|
||||
#include <Core/core_types.h>
|
||||
#include <ngldb/dbtransaction.h>
|
||||
#include <vector>
|
||||
#include <set>
|
||||
|
||||
+1
-1
@@ -13,7 +13,7 @@
|
||||
#include <CentralEffectSimulation/handler_participant.h>
|
||||
#include <CentralEffectSimulation/handler_building_data.h>
|
||||
#include <AreaEffectSimulation/aes_dtc.h>
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <TrainingAreaBase/tab_ftc.h>
|
||||
|
||||
#include <QtCore/QObject>
|
||||
|
||||
+1
-1
@@ -40,7 +40,7 @@ Ces2DInterfaceImpl::Ces2DInterfaceImpl(CentralEffectSimulation::Plugin::DataProv
|
||||
, m_db(db)
|
||||
, m_handlerBuildingData(handlerBuildingData)
|
||||
, m_handlerParticipant(handlerParticipant)
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("CES.Plugin.CentralEffectSimulation2DInterfaceImpl"))
|
||||
.getNGLLogger("CES.Plugin.CentralEffectSimulation2DInterfaceImpl"))
|
||||
{
|
||||
Q_UNUSED(settings)
|
||||
}
|
||||
|
||||
+1
-1
@@ -27,7 +27,7 @@ EchoInterfaceImpl::EchoInterfaceImpl(CentralEffectSimulation::Plugin::DataProvid
|
||||
|
||||
NGL::Settings *settings)
|
||||
: m_pdp(pdp)
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("CES.Plugin.EchoInterfaceImpl"))
|
||||
.getNGLLogger("CES.Plugin.EchoInterfaceImpl"))
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -32,7 +32,7 @@ CesGeoPairingInterfaceImpl::CesGeoPairingInterfaceImpl(CentralEffectSimulation::
|
||||
, m_ddsHandler(m_mainHandler->dds())
|
||||
, m_db(m_mainHandler->db())
|
||||
, m_handlerParticipant(m_mainHandler->handlerParticipant())
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("CES.Plugin.GeoPairingInterfaceImpl"))
|
||||
.getNGLLogger("CES.Plugin.GeoPairingInterfaceImpl"))
|
||||
{
|
||||
Q_UNUSED(settings)
|
||||
}
|
||||
|
||||
+1
-1
@@ -168,7 +168,7 @@ bool CesMissionPlanHandler::isUasInAutoMode(int participantId)
|
||||
return (uas.uasState() == ProjectDataManagement::UasState::Auto);
|
||||
}
|
||||
|
||||
// stolen from Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_dialog.cpp
|
||||
// stolen from Lts/ParticipantManagement/Gui/ParticipantInfo/participant_info_dialog.cpp
|
||||
bool CesMissionPlanHandler::isUasCombatReady(int participantId)
|
||||
{
|
||||
|
||||
|
||||
+1
-1
@@ -9,7 +9,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <ParticipantManagement/ppm_db.h>
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <ParticipantManagement/logger.h>
|
||||
#include <CentralEffectSimulation/dds_handler.h>
|
||||
|
||||
|
||||
+1
-1
@@ -12,7 +12,7 @@
|
||||
|
||||
#include <CentralEffectSimulation/dds_handler.h>
|
||||
#include <CentralEffectSimulation/ces_db.h>
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <TrainingAreaBase/tab_ftc.h>
|
||||
#include <CentralEffectSimulation/handler_participant.h>
|
||||
#include <handler_participant_building.h>
|
||||
|
||||
+1
-1
@@ -11,7 +11,7 @@
|
||||
#include <DDS/DDSConnector/dds_connector.h>
|
||||
#include <DDS/Core/core_dtc.h>
|
||||
#include <DDS/Core/topic_lock_master.h>
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <TrainingAreaBase/tab_ftc.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
|
||||
+1
-1
@@ -26,7 +26,7 @@ TargetAreasInterfaceImpl::TargetAreasInterfaceImpl(CentralEffectSimulation::Plug
|
||||
NGL::Settings *settings)
|
||||
: m_pdp(pdp)
|
||||
, m_ddsConnector(dDSConnector)
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("CES.Plugin.TargetAreasInterfaceImpl"))
|
||||
.getNGLLogger("CES.Plugin.TargetAreasInterfaceImpl"))
|
||||
{
|
||||
Q_UNUSED(settings)
|
||||
}
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
#include <ExerciseManagement/exm_dtc.h>
|
||||
#include <InfrastructureManagement/ism_dtc.h>
|
||||
#include <ProjectDataManagement/pdm_dtc.h>
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <ParticipantManagement/ppm_ftc.h>
|
||||
#include <ParticipantManagement/ppm_ftc_types.h>
|
||||
#include <TrainingAreaBase/tab_ftc.h>
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
#include <QObject>
|
||||
#include <NotificationManagement/nom_ftc.h>
|
||||
|
||||
#include <DDS/Core/core_types.h>
|
||||
#include <Core/core_types.h>
|
||||
|
||||
// Generated
|
||||
#include <EffectShowClient/esc_db.h>
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
#include <AreaEffectSimulation/aes_dtc.h>
|
||||
#include <AreaEffectSimulation/aes_ftc.h>
|
||||
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <ProjectDataManagement/pdm_dtc.h>
|
||||
#include <MeteoDataManagement/mdm_dtc.h>
|
||||
#include <TrainingAreaBase/tab_dtc.h>
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
#include "initialization.h"
|
||||
#include "logger.h"
|
||||
#include <QMap>
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
|
||||
// Participand Management-Handling for Effect Show Actors
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
#include "dds_handler.h"
|
||||
#include "logger.h"
|
||||
|
||||
#include <DDS/Core/core_types.h>
|
||||
#include <Core/core_types.h>
|
||||
|
||||
// Generated
|
||||
#include <EffectShowManagement/esm_db.h>
|
||||
|
||||
+1
-1
@@ -12,7 +12,7 @@
|
||||
#include "esm_convert_from_tab.h"
|
||||
#include "logger.h"
|
||||
|
||||
#include <DDS/Core/core_types.h>
|
||||
#include <Core/core_types.h>
|
||||
#include <EffectShowManagement/esm_db.h>
|
||||
#include <EffectShowManagement/esm_dts.h>
|
||||
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
#include "esm_convert_to_tab.h"
|
||||
#include "logger.h"
|
||||
|
||||
#include <DDS/Core/core_types.h>
|
||||
#include <Core/core_types.h>
|
||||
#include <EffectShowManagement/esm_db.h>
|
||||
#include <EffectShowManagement/esm_dts.h>
|
||||
|
||||
|
||||
+1
-1
@@ -11,7 +11,7 @@
|
||||
#include "handler_ppm_data.h"
|
||||
#include "logger.h"
|
||||
|
||||
#include <DDS/Core/core_types.h>
|
||||
#include <Core/core_types.h>
|
||||
|
||||
// Generated
|
||||
#include <EffectShowManagement/esm_db.h>
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
#include "dds_handler.h"
|
||||
#include "logger.h"
|
||||
|
||||
#include <DDS/Core/core_types.h>
|
||||
#include <Core/core_types.h>
|
||||
|
||||
// Generated
|
||||
#include <Evaluations/evl_db.h>
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
#include "dds_handler.h"
|
||||
#include "logger.h"
|
||||
|
||||
#include <DDS/Core/core_types.h>
|
||||
#include <Core/core_types.h>
|
||||
|
||||
// Generated
|
||||
#include <Evaluations/evl_db.h>
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
#include "dds_handler.h"
|
||||
#include "logger.h"
|
||||
|
||||
#include <DDS/Core/core_types.h>
|
||||
#include <Core/core_types.h>
|
||||
|
||||
// Generated
|
||||
#include <Evaluations/evl_db.h>
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
#include "dds_handler.h"
|
||||
#include "logger.h"
|
||||
|
||||
#include <DDS/Core/core_types.h>
|
||||
#include <Core/core_types.h>
|
||||
|
||||
// Generated
|
||||
#include <Evaluations/evl_db.h>
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
#include "dds_handler.h"
|
||||
#include "logger.h"
|
||||
|
||||
#include <DDS/Core/core_types.h>
|
||||
#include <Core/core_types.h>
|
||||
|
||||
// Generated
|
||||
#include <Evaluations/evl_db.h>
|
||||
|
||||
+1
-1
@@ -11,7 +11,7 @@
|
||||
#include "main_handler.h"
|
||||
#include "logger.h"
|
||||
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <AreaEffectSimulation/aes_dtc.h>
|
||||
#include <Proxies/Buildings/bld_dtc.h>
|
||||
#include <Proxies/Buildings/bld.hpp>
|
||||
|
||||
+2
-2
@@ -12,7 +12,7 @@
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
|
||||
#include <DDS/QosProfile/DDS_DefaultQos.h>
|
||||
#include <Common/ProjectConfig/project_defines.h>
|
||||
#include <Lts/Common/ProjectConfig/project_defines.h>
|
||||
#include <DDS/DTS/generic_dts_impl.h>
|
||||
#include <DDS/DTC/generic_dtc_impl.h>
|
||||
|
||||
@@ -33,7 +33,7 @@ DataTopicTests::DataTopicTests()
|
||||
, m_subscriberListenerBinder(nullptr)
|
||||
, m_dtcExercise(nullptr)
|
||||
, m_mainThreadId(QThread::currentThreadId())
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("UnitTests.DataTopicTests"))
|
||||
.getNGLLogger("UnitTests.DataTopicTests"))
|
||||
{
|
||||
if (!DDS::QosProfile::setDefault())
|
||||
ERROR_LOG() << "Error setting default QoS from xml-file ";
|
||||
|
||||
+1
-1
@@ -12,7 +12,7 @@
|
||||
|
||||
#include <QtTest/QTest>
|
||||
|
||||
#include <Common/ProjectConfig/project_defines.h>
|
||||
#include <Lts/Common/ProjectConfig/project_defines.h>
|
||||
#include <nglapplication/nglcoreapplication.h>
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
|
||||
|
||||
+2
-2
@@ -11,7 +11,7 @@
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
|
||||
#include <DDS/QosProfile/DDS_DefaultQos.h>
|
||||
#include <Common/ProjectConfig/project_defines.h>
|
||||
#include <Lts/Common/ProjectConfig/project_defines.h>
|
||||
|
||||
|
||||
Initialisation::Initialisation()
|
||||
@@ -22,7 +22,7 @@ Initialisation::Initialisation()
|
||||
, m_ddsPublisher(nullptr)
|
||||
, m_ddsSubscriber(nullptr)
|
||||
, m_subListener(new DTC::SubscriberListener)
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("UnitTests.Initialisation"))
|
||||
.getNGLLogger("UnitTests.Initialisation"))
|
||||
|
||||
{
|
||||
DDS::DefaultQos defaultQos;
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
#include <ExerciseManagement/exm_db.h>
|
||||
#include <ExerciseManagement/exm.hpp>
|
||||
|
||||
#include <Common/ProjectConfig/project_defines.h>
|
||||
#include <Lts/Common/ProjectConfig/project_defines.h>
|
||||
#include <LtsUtilsCore/dds_vector.h>
|
||||
|
||||
namespace ExerciseManagement
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
#include <ExerciseManagement/exm_dts.h>
|
||||
#include <ExerciseManagement/exm_fts.h>
|
||||
#include <ServiceManagement/scm_ftc.h>
|
||||
#include <ParticipantManagement/ppm_dtc.h> // for checkEquipmentNumbersOnAllExercises
|
||||
#include <ParticipantManagement/ppm.hpp> // for checkEquipmentNumbersOnAllExercises
|
||||
#include <AudioVideoManagement/avm_dtc.h> // for checking double cnrconfigs in linked exercise
|
||||
|
||||
#include "logger.h"
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
#include <DBAdministration/copy_exercise.h>
|
||||
#include <DBAdministration/exercise_table_generator.h>
|
||||
#include <Common/ProjectConfig/project_defines.h>
|
||||
#include <Lts/Common/ProjectConfig/project_defines.h>
|
||||
#include <QDateTime>
|
||||
|
||||
namespace ExerciseManagement
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
#include <QObject>
|
||||
#include "dds_handler.h"
|
||||
#include <DDS/Core/core_types.h>
|
||||
#include <Core/core_types.h>
|
||||
|
||||
// Generated
|
||||
#include <ExerciseManagement/exm_db.h>
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <DDS/Core/core_types.h>
|
||||
#include <Core/core_types.h>
|
||||
|
||||
// Generated
|
||||
#include <ExerciseManagement/exm_db.h>
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
#include "base.h"
|
||||
|
||||
#include <DDS/Core/core_types.h>
|
||||
#include <Core/core_types.h>
|
||||
|
||||
// Generated
|
||||
#include <FileManagement/flm_db.h>
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
#include "base.h"
|
||||
|
||||
#include <DDS/Core/core_types.h>
|
||||
#include <Core/core_types.h>
|
||||
|
||||
// Generated
|
||||
#include <FileManagement/flm_db.h>
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
#include "base.h"
|
||||
|
||||
#include <DDS/Core/core_types.h>
|
||||
#include <Core/core_types.h>
|
||||
|
||||
// Generated
|
||||
#include <FileManagement/flm_db.h>
|
||||
|
||||
@@ -57,7 +57,7 @@ LoggerFactory *ThpScriptServer::createLoggerFactory()
|
||||
// Logger
|
||||
Logger::Logger(LoggerFactory *loggerFactory, QObject *parent)
|
||||
: httq::Logger(loggerFactory, parent)
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger(QString::fromUtf8(parent->metaObject()->className()).replace(QStringLiteral("::"), QStringLiteral(".")).toStdString())) // man man
|
||||
.getNGLLogger(QString::fromUtf8(parent->metaObject()->className()).replace(QStringLiteral("::"), QStringLiteral(".")).toStdString())) // man man
|
||||
{}
|
||||
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <Proxies/TrainingAreaBase/tab_dtc.h>
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
|
||||
#include "dds_handler.h"
|
||||
#include "logger.h"
|
||||
|
||||
@@ -10,8 +10,8 @@
|
||||
#include "dds_handler.h"
|
||||
#include "logger.h"
|
||||
|
||||
#include <DDS/Core/core_types.h>
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
#include <Core/core_types.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
|
||||
// Generated
|
||||
#include <GuezIedManagement/gim_db.h>
|
||||
|
||||
+1
-1
@@ -44,7 +44,7 @@ GmpMinefieldInterpreterTestsMain::GmpMinefieldInterpreterTestsMain()
|
||||
, m_receivedVeType(0)
|
||||
, m_minefieldInterpreterTimer(nullptr)
|
||||
, m_minefieldSpy(nullptr)
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("Tests.GmpMinefieldInterpreterTest"))
|
||||
.getNGLLogger("Tests.GmpMinefieldInterpreterTest"))
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@
|
||||
|
||||
#include <AreaEffectSimulation/aes_ftc.h>
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <Proxies/TrainingAreaBase/tab_dtc.h>
|
||||
#include "GFS_map_cont.h"
|
||||
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
#pragma once
|
||||
|
||||
#include "base.h"
|
||||
#include <DDS/Core/core_types.h>
|
||||
#include <Core/core_types.h>
|
||||
|
||||
#include <InfrastructureManagement/ism_db.h>
|
||||
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
#pragma once
|
||||
|
||||
#include "base.h"
|
||||
#include <DDS/Core/core_types.h>
|
||||
#include <Core/core_types.h>
|
||||
|
||||
#include <InfrastructureManagement/ism_db.h>
|
||||
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
#pragma once
|
||||
|
||||
#include "base.h"
|
||||
#include <DDS/Core/core_types.h>
|
||||
#include <Core/core_types.h>
|
||||
|
||||
#include <InfrastructureManagement/ism_db.h>
|
||||
|
||||
|
||||
+1
-1
@@ -12,7 +12,7 @@
|
||||
#include <QMap>
|
||||
#include <QJsonArray>
|
||||
#include "base.h"
|
||||
#include <DDS/Core/core_types.h>
|
||||
#include <Core/core_types.h>
|
||||
|
||||
#include <InfrastructureManagement/ism_db.h>
|
||||
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
#pragma once
|
||||
|
||||
#include "base.h"
|
||||
#include <DDS/Core/core_types.h>
|
||||
#include <Core/core_types.h>
|
||||
|
||||
#include <InfrastructureManagement/ism_db.h>
|
||||
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
#pragma once
|
||||
|
||||
#include "base.h"
|
||||
#include <DDS/Core/core_types.h>
|
||||
#include <Core/core_types.h>
|
||||
|
||||
#include <InfrastructureManagement/ism_db.h>
|
||||
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
#pragma once
|
||||
|
||||
#include "base.h"
|
||||
#include <DDS/Core/core_types.h>
|
||||
#include <Core/core_types.h>
|
||||
|
||||
#include <InfrastructureManagement/ism_db.h>
|
||||
#include <InfrastructureManagement/object_main_structure_element.h>
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
#include "dds_handler.h"
|
||||
#include "mrk_db.h"
|
||||
#include <DDS/Core/core_types.h>
|
||||
#include <Core/core_types.h>
|
||||
|
||||
// Generated
|
||||
#include <MarkerManagement/mrk_db.h>
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
#include <QVector>
|
||||
#include "dds_handler.h"
|
||||
#include "mrk_db.h"
|
||||
#include <DDS/Core/core_types.h>
|
||||
#include <Core/core_types.h>
|
||||
|
||||
// Generated
|
||||
#include <MarkerManagement/mrk_db.h>
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
#include <DDS/Core/topic_lock_master.h>
|
||||
#include <DDS/Core/core_dtc.h>
|
||||
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
|
||||
#include <Messaging/msg_dts.h>
|
||||
#include <Messaging/msg_fts.h>
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
#include <QObject>
|
||||
#include <QHash>
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <OcSituationServer/oss_dtc.h>
|
||||
#include <TrainingAreaBase/tab.hpp>
|
||||
#include <DDS/DDSConnector/dds_connector.h>
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
|
||||
#include "dds_handler.h"
|
||||
//#include "nom_db.h"
|
||||
#include <DDS/Core/core_types.h>
|
||||
#include <Core/core_types.h>
|
||||
|
||||
// Generated
|
||||
#include <NotificationManagement/nom_db.h>
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
#include <nglsettings/nglsettings_settings.h>
|
||||
#include <ngldb/dbtransaction.h>
|
||||
#include <ngldb/dbconnection.h>
|
||||
#include <ngldb/ngldb_export.h>
|
||||
#include <ngldb_export.h>
|
||||
#include <ngldb/nsqlquery.h>
|
||||
#include <ngltools/ngltools_filesystem.h>
|
||||
#include "main_handler.h"
|
||||
|
||||
+1
-1
@@ -9,7 +9,7 @@
|
||||
|
||||
#include <QHash>
|
||||
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <ParticipantManagement/ppm_ftc.h>
|
||||
#include <OcSituationServer/oc_situation.h>
|
||||
#include <TrainingAreaBase/tab_dts.h>
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
#include <OcSituationServer/oss_dts.h>
|
||||
#include <OcSituationServer/oss_fts.h>
|
||||
#include <OperatorManagement/opm_dtc.h>
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <ParticipantManagement/ppm_ftc.h>
|
||||
#include <TrainingAreaBase/tab_dtc.h>
|
||||
#include <TrainingAreaBase/tab_dts.h>
|
||||
|
||||
+1
-1
@@ -16,7 +16,7 @@
|
||||
#include <QSet>
|
||||
|
||||
#include <AreaEffectSimulation/aes_dtc.h>
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
|
||||
#include "main_handler.h"
|
||||
#include "position_converter.h"
|
||||
|
||||
+1
-1
@@ -17,7 +17,7 @@
|
||||
#include <QVector>
|
||||
|
||||
#include <AreaEffectSimulation/aes_dtc.h>
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
|
||||
#include "main_handler.h"
|
||||
#include "position_converter.h"
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
#include <Evaluations/evl_ftc.h>
|
||||
#include <GuezIedManagement/gim_dtc.h>
|
||||
#include <Messaging/msg_ftc.h>
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <ParticipantManagement/ppm_ftc.h>
|
||||
|
||||
#include <TrainingAreaBase/tab_dtc.h>
|
||||
|
||||
+1
-1
@@ -11,7 +11,7 @@
|
||||
#include "handler_operator.h"
|
||||
#include <DDS/FTS/generic_fts_impl.h>
|
||||
#include <DDS/DTS/generic_dts_impl.h>
|
||||
#include <DDS/Core/core_types.h>
|
||||
#include <Core/core_types.h>
|
||||
|
||||
#include <QMutableHashIterator>
|
||||
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <DDS/Core/core_types.h>
|
||||
#include <Core/core_types.h>
|
||||
|
||||
// Generated
|
||||
#include <OperatorManagement/opm_db.h>
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <DDS/Core/core_types.h>
|
||||
#include <Core/core_types.h>
|
||||
|
||||
// Generated
|
||||
#include <OperatorManagement/opm_db.h>
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <DDS/Core/core_types.h>
|
||||
#include <Core/core_types.h>
|
||||
#include <QSet>
|
||||
|
||||
// Generated
|
||||
|
||||
+1
-1
@@ -20,7 +20,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <ParticipantManagement/ppm_ftc.h>
|
||||
#include <ParticipantManagement/ppm_ftc_types.h>
|
||||
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
* @RDE_HEADER@
|
||||
* The FiringUnitValidator regulates the rules for firing units
|
||||
* $Id: participant_dis_helper.h 37747 2017-12-08 08:07:01Z ehrlicher $
|
||||
* $HeadURL: svn://10.196.0.54/TDS/branches/product/features/24_vulcano/Lts/Plugins/ParticipantManagement/Gui/Common/participant_dis_helper.h $
|
||||
* $HeadURL: svn://10.196.0.54/TDS/branches/product/features/24_vulcano/Lts/ParticipantManagement/Gui/Common/participant_dis_helper.h $
|
||||
* $Author: ehrlicher $
|
||||
* Created by Hannes Fritsche, ESZS, 2024-03-07
|
||||
*/
|
||||
|
||||
+2
-2
@@ -2,7 +2,7 @@
|
||||
* @RDE_HEADER@
|
||||
* The FiringUnitValidator regulates the rules for firing units serverside
|
||||
* $Id: participant_dis_helper.h 37747 2017-12-08 08:07:01Z ehrlicher $
|
||||
* $HeadURL: svn://10.196.0.54/TDS/branches/product/features/24_vulcano/Lts/Plugins/ParticipantManagement/Gui/Common/participant_dis_helper.h $
|
||||
* $HeadURL: svn://10.196.0.54/TDS/branches/product/features/24_vulcano/Lts/ParticipantManagement/Gui/Common/participant_dis_helper.h $
|
||||
* $Author: ehrlicher $
|
||||
* Created by Hannes Fritsche, ESZS, 2024-03-07
|
||||
*/
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
#include <QObject>
|
||||
#include <memory>
|
||||
#include <DDS/Core/core_types.h>
|
||||
#include <Core/core_types.h>
|
||||
|
||||
namespace ParticipantManagement
|
||||
{
|
||||
|
||||
+1
-1
@@ -17,7 +17,7 @@
|
||||
|
||||
#include <QJsonDocument>
|
||||
#include <ExerciseManagement/exm_dtc.h>
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <ParticipantManagement/ppm_fts.h>
|
||||
#include <ProjectDataManagement/pdm_dtc.h>
|
||||
#include <TrainingAreaBase/tab_dts.h>
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <ParticipantManagement/ppm_db.h>
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
|
||||
namespace ParticipantManagement
|
||||
{
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
#include "dds_handler.h"
|
||||
#include <ParticipantManagement/logger.h>
|
||||
|
||||
#include <DDS/Core/core_types.h>
|
||||
#include <Core/core_types.h>
|
||||
|
||||
// Generated
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
#include "main_handler.h"
|
||||
#include "convert_db_to_dds.h"
|
||||
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
|
||||
namespace ParticipantManagement
|
||||
{
|
||||
|
||||
+1
-1
@@ -189,7 +189,7 @@ bool MissionPlanHandler::isUasInAutoMode(int participantId)
|
||||
return (uas.uasState() == ProjectDataManagement::UasState::Auto);
|
||||
}
|
||||
|
||||
// stolen from Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_dialog.cpp
|
||||
// stolen from Lts/ParticipantManagement/Gui/ParticipantInfo/participant_info_dialog.cpp
|
||||
bool MissionPlanHandler::isUasCombatReady(int participantId)
|
||||
{
|
||||
m_mainHandler->ddsHandler()->dtc()->waitForHistoricalDataDynamicParticipantData(3000);
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
|
||||
|
||||
#include <ParticipantManagement/ppm_db.h>
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <ParticipantManagement/logger.h>
|
||||
#include <ParticipantManagement/dds_handler.h>
|
||||
#include "logger.h"
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <ParticipantManagement/ppm_db.h>
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
|
||||
namespace ParticipantManagement
|
||||
{
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
|
||||
#include <LtsWebSocket/data_manager_base_dl.h>
|
||||
#include <ParticipantManagement/ppm_db.h>
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include "logger.h"
|
||||
|
||||
namespace ParticipantManagement
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
#include <DDS/DDSConnector/dds_connector.h>
|
||||
#include <DDS/Core/topic_lock_master.h>
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <ParticipantManagement/ppm_dts.h>
|
||||
#include <ParticipantManagement/ppm_fts.h>
|
||||
#include <ProjectDataManagement/pdm_dtc.h>
|
||||
|
||||
@@ -37,6 +37,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcPreCommon
|
||||
PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../
|
||||
${CMAKE_CURRENT_BINARY_DIR}/../
|
||||
${CMAKE_CURRENT_BINARY_DIR}
|
||||
)
|
||||
IF(BUILD_RTI)
|
||||
NGL_TARGET_LINK_LIBRARIES(svcPreCommon
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <QMap>
|
||||
#include <DDS/Core/core_types.h>
|
||||
#include <Core/core_types.h>
|
||||
|
||||
#include <PresentationManagement/pre_db.h>
|
||||
#include <PresentationManagement/pre.hpp>
|
||||
|
||||
+1
-1
@@ -12,7 +12,7 @@
|
||||
#include "rep_db.h"
|
||||
#include "logger.h"
|
||||
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <AreaEffectSimulation/aes_dtc.h>
|
||||
#ifdef GUEZ_MODE
|
||||
#include <GuezIedManagement/gim_dtc.h>
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@
|
||||
#include "rep_db.h"
|
||||
|
||||
#include <AreaEffectSimulation/aes_dtc.h>
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
|
||||
#include <QElapsedTimer>
|
||||
#include <QMap>
|
||||
|
||||
Loaded 100 of 2065 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user