Adds further migration results and moves generated tests in

This commit is contained in:
torsten committed 2026-08-19 21:21:59 +02:00
1 parent 19ab996be2
commit 72cbe318b6
442 files changed
+17126 -246

No files matched your search

@@ -28,6 +28,10 @@ NGL_WRAP_UI(aes_base_gui_SRCS
)
NGL_ADD_LIBRARY2(WS AesBaseGui SHARED ${aes_base_gui_SRCS})
NGL_TARGET_INCLUDE_DIRECTORIES(AesBaseGui
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../../../Services/
)
NGL_TARGET_LINK_LIBRARIES(AesBaseGui
PRIVATE
ExmDataPluginInterface
@@ -28,6 +28,7 @@ NGL_ADD_LIBRARY2(WS AvmShared SHARED ${SRCS})
NGL_TARGET_INCLUDE_DIRECTORIES(AvmShared
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../../Services/
${CMAKE_CURRENT_SOURCE_DIR}/../../Common/
)
NGL_TARGET_LINK_LIBRARIES(AvmShared
PUBLIC
@@ -4,6 +4,23 @@
# $Author$
#
# Add Services directory to include path for all plugins
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../Services/)
# Add AudioVideoManagement stub headers for non-RTI builds
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../include/AudioVideoManagement/)
# Add GuezNasat for logger.h
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../Proxies/GuezNasat/)
# Add Viewer/LtsDataView for abstract_display_widget.h
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../Viewer/LtsDataView/)
# Add OperatorManagement stub headers for non-FilterManagement builds
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../include/OperatorManagement/)
# Add NGLLogger stub headers
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../include/NGLLogger/)
# Add LtsSession stub headers
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../include/LtsSession/)
# Add TopicEditorBase stub headers
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../include/TopicEditorBase/)
ADD_SUBDIRECTORY(AdvancedSymbology)
ADD_SUBDIRECTORY(AppStarter)
ADD_SUBDIRECTORY(AreaEffectSimulation)
@@ -40,13 +57,17 @@ ADD_SUBDIRECTORY(OcBaseDownload)
ADD_SUBDIRECTORY(OcSituationClient)
ADD_SUBDIRECTORY(OnlineReports)
ADD_SUBDIRECTORY(OperatorManagement)
ADD_SUBDIRECTORY(ParticipantManagement) # includes ParticipantOrgChart (conditionally built)
IF(BUILD_RTI)
ADD_SUBDIRECTORY(ParticipantManagement) # includes ParticipantOrgChart (conditionally built)
ENDIF()
# PlanEditor requires WebEngine + ArcGIS - skip for Qt6 migration baseline
IF(BUILD_PLUGINS_PLANEDITOR)
ADD_SUBDIRECTORY(PlanEditor)
ENDIF()
ADD_SUBDIRECTORY(PlanOverlays)
ADD_SUBDIRECTORY(PresentationManagement)
IF(BUILD_RTI)
ADD_SUBDIRECTORY(PresentationManagement)
ENDIF()
ADD_SUBDIRECTORY(ProjectDataManagement)
ADD_SUBDIRECTORY(ProjectionWorkstation)
ADD_SUBDIRECTORY(ReportManagement)
@@ -16,6 +16,10 @@ SET(gna_common_gui_SRCS
)
NGL_ADD_LIBRARY2(WS GnaCommon SHARED ${gna_common_gui_SRCS} )
NGL_TARGET_INCLUDE_DIRECTORIES(GnaCommon
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../../Services/
)
NGL_TARGET_LINK_LIBRARIES(GnaCommon
PRIVATE
LtsSessionData
@@ -5,7 +5,7 @@
#include "gnacommon_export.h"
#include <GuezNasat/gna_dtc.h>
#include <GuezNasat/logger.h>
#include <LtsGuezNasat/logger.h>
#include <LtsWidgets/lts_abstract_table_model.h>
@@ -22,6 +22,10 @@ NGL_WRAP_UI(mrk_common_gui_SRCS
)
NGL_ADD_LIBRARY2(WS MrkCommon SHARED ${mrk_common_gui_SRCS})
NGL_TARGET_INCLUDE_DIRECTORIES(MrkCommon
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../../Viewer/
)
NGL_TARGET_LINK_LIBRARIES(MrkCommon
PRIVATE
NGLLogger
@@ -2,7 +2,7 @@
#pragma once
#include <Viewer/LtsDataView/abstract_display_widget.h>
#include <LtsDataView/abstract_display_widget.h>
#include <mrkcommon_export.h>
namespace Ui
@@ -13,7 +13,7 @@
#include <QJsonDocument>
#include <QJsonObject>
#include <QTimer>
#include <QWebSocket>
#include <QtWebSockets/QWebSocket>
namespace OcBaseDownload
{
@@ -61,7 +61,7 @@ void ParticipantSearchModal::onOkay()
close();
}
void ParticipantSearchModal::onParticipantChanged(const ParticipantManagement::Participant &data, DataModification modType)
void ParticipantSearchModal::onParticipantChanged(const ParticipantManagement::Participant &data, ::DataModification modType)
{
const int newEqId = data.equipmentNumber().is_set() ? data.equipmentNumber().get() : 0;
switch (modType)
@@ -34,7 +34,7 @@ public:
private slots:
void onOkay();
void onParticipantChanged(const ParticipantManagement::Participant &data, DataModification modType);
void onParticipantChanged(const ParticipantManagement::Participant &data, ::DataModification modType);
signals:
void participantSelected(int participantId);
@@ -26,6 +26,12 @@ NGL_WRAP_UI(pre_common_SRCS
)
NGL_ADD_LIBRARY2(WS PreGuiCommon SHARED ${pre_common_SRCS})
NGL_TARGET_INCLUDE_DIRECTORIES(PreGuiCommon
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../../../../../include/Services/PresentationManagement
${CMAKE_CURRENT_SOURCE_DIR}/../../../../Common/LtsUtils
${CMAKE_CURRENT_SOURCE_DIR}/../../../../../include
)
NGL_TARGET_LINK_LIBRARIES(PreGuiCommon
Qt6::Core
Qt6::Widgets
@@ -6,7 +6,7 @@
#include <PresentationManagement/pre_dtc.h>
#include <Services/PresentationManagement/logger.h>
#include <preguicommon_export.h>
#include <Services/OperatorManagement/opm_dtc.h>
#include <Lts/Services/OperatorManagement/opm_dtc.h>
#include <LtsWidgets/lts_abstract_table_model.h>
#include <LtsWidgets/lts_column_filter_proxy_model.h>
@@ -5,6 +5,8 @@
#include <QtGlobal>
#include <QVector>
#include <QDataStream>
#include <QVarLengthArray>
#include <QIODevice>
namespace ProjectionWorkstation
{
@@ -4,7 +4,7 @@
#include "WebSocket/pws_web_socket_client.h"
#include <QWebSocket>
#include <QtWebSockets/QWebSocket>
#include <LtsWidgets/lts_dialog.h>
#include <LtsProjectionWorkstation/logger.h>
@@ -5,7 +5,7 @@
#include "adapter_dds.h"
#include <utility>
#include <Map/map.h>
#include <Lts/Viewer/SituationMap/Map/map.h>
#include <Map/layer_factory.h>
#include <Map/location_display.h>
#include <Map/party_id_to_color_functor.h>
@@ -8,7 +8,7 @@
#include "plugin_provider.h"
#include "map_object_type.h"
#include "resource_manager_mode.h"
#include <Map/situation_map_types.h>
#include <Lts/Viewer/SituationMap/Map/situation_map_types.h>
#include <Common/situation_map_logging.h>
#include <Common/ref_pointer.h>
@@ -3,7 +3,7 @@
#include "booby_traps_to_map.h"
#include <Map/object_factory.h>
#include <Map/map.h>
#include <Lts/Viewer/SituationMap/Map/map.h>
namespace SituationMap
{
@@ -4,7 +4,7 @@
#include "building_contamination.h"
#include <utility>
#include <Map/map.h>
#include <Lts/Viewer/SituationMap/Map/map.h>
#include <Map/object_factory.h>
#include <MapObjects/cube.h>
@@ -6,7 +6,7 @@
#include "plugin_provider.h"
#include <Map/situation_map_types.h>
#include <Lts/Viewer/SituationMap/Map/situation_map_types.h>
#include <Common/situation_map_logging.h>
#include <Plugins/Buildings/bld_data_plugin_interface.h>
@@ -4,7 +4,7 @@
#include "building_ownership.h"
#include <utility>
#include <Map/map.h>
#include <Lts/Viewer/SituationMap/Map/map.h>
#include <Map/object_factory.h>
#include <MapObjects/cube.h>
@@ -6,7 +6,7 @@
#include "plugin_provider.h"
#include <Map/situation_map_types.h>
#include <Lts/Viewer/SituationMap/Map/situation_map_types.h>
#include <Common/situation_map_logging.h>
#include <Plugins/CentralEffectSimulation/ces_data_plugin_interface.h>
@@ -7,7 +7,7 @@
#include <AreaEffectSimulation/Utils/polygons.h>
#include <GuezIedManagement/gim_dtc.h>
#include <LtsCoordTrans/lts_coord_trans.h>
#include <Map/map.h>
#include <Lts/Viewer/SituationMap/Map/map.h>
#include <ParticipantManagement/Data/ppm_data_plugin.h>
#include <ProjectDataManagement/pdm_dtc.h>
@@ -8,7 +8,7 @@
#include <LtsCoordTrans/lts_coord_trans.h>
#include <AreaEffectSimulation/Utils/polygons.h>
#include <ParticipantManagement/ppm.hpp>
#include <Map/map.h>
#include <Lts/Viewer/SituationMap/Map/map.h>
#define ADD_UNIQUE_MAP_ID_TO_NOTIFIY(uniqueMapId) addUniqueMapIdToNotifiy(uniqueMapId, __FILE__, __LINE__)
@@ -4,7 +4,7 @@
#include "emergency_call_to_map.h"
#include <Map/object_factory.h>
#include <Map/map.h>
#include <Lts/Viewer/SituationMap/Map/map.h>
#include <PluginInterfaces/gui_plugin_interface.h>
#include <Common/LtsAppDescriptor/lts_app_descriptor.h>
@@ -8,7 +8,7 @@
#include <LtsCoordTrans/lts_coord_trans.h>
#include <AreaEffectSimulation/Utils/polygons.h>
#include <ParticipantManagement/ppm.hpp>
#include <Map/map.h>
#include <Lts/Viewer/SituationMap/Map/map.h>
@@ -6,7 +6,7 @@
#include <utility>
#include "pdm_handler.h"
#include <Map/object_factory.h>
#include <Map/map.h>
#include <Lts/Viewer/SituationMap/Map/map.h>
#include <LtsCoordTrans/lts_coord_trans.h>
#include <LtsUtilsCore/outdated_position.h>
@@ -4,7 +4,7 @@
#include "mounting_point_to_map.h"
#include <utility>
#include <Map/map.h>
#include <Lts/Viewer/SituationMap/Map/map.h>
#include <Map/object_factory.h>
#include <Map/layer_factory.h>
@@ -2,7 +2,7 @@
#include "ncontamination_to_map.h"
#include <Map/map.h>
#include <Lts/Viewer/SituationMap/Map/map.h>
#include <Map/object_factory.h>
namespace SituationMap
@@ -2,7 +2,7 @@
#include "off_route_to_map.h"
#include <Map/map.h>
#include <Lts/Viewer/SituationMap/Map/map.h>
#include <Map/object_factory.h>
#include <Map/layer_factory.h>
@@ -5,7 +5,7 @@
#include <utility>
#include "pdm_handler.h"
#include <Map/map.h>
#include <Lts/Viewer/SituationMap/Map/map.h>
#include <Map/object_factory.h>
#include <Map/layer_factory.h>
#include <Map/party_id_to_color_functor.h>
@@ -5,7 +5,7 @@
#include <Map/situation_map_types.h>
#include <Lts/Viewer/SituationMap/Map/situation_map_types.h>
@@ -3,7 +3,7 @@
#pragma once
#include <Map/situation_map_types.h>
#include <Lts/Viewer/SituationMap/Map/situation_map_types.h>
#include <Viewer/LtsDataView/abstract_display_widget.h>
@@ -4,7 +4,7 @@
#pragma once
#include <Map/map.h>
#include <Lts/Viewer/SituationMap/Map/map.h>
#include <Symbology/symbol_result.h>
#include <Common/situation_map_logging.h>
#include <LtsWidgets/lts_abstract_table_model.h>
@@ -4,7 +4,7 @@
#include "sitmapdds_export.h"
#include <Map/map.h>
#include <Lts/Viewer/SituationMap/Map/map.h>
#include <LtsWidgets/lts_dialog.h>
#include <Common/situation_map_logging.h>
@@ -4,7 +4,7 @@
#pragma once
#include <Common/situation_map_logging.h>
#include <Map/map.h>
#include <Lts/Viewer/SituationMap/Map/map.h>
#include <QAbstractTableModel>
#include <LtsSession/lts_session.h>
@@ -12,7 +12,7 @@
#include <Common/situation_map_logging.h>
#include <Map/map.h>
#include <Lts/Viewer/SituationMap/Map/map.h>
@@ -9,7 +9,7 @@
#include <Common/situation_map_logging.h>
#include <LtsSession/lts_session.h>
#include <Map/map.h>
#include <Lts/Viewer/SituationMap/Map/map.h>
class QToolButton;
@@ -5,8 +5,8 @@
#include "sitmapdds_export.h"
#include <Map/map.h>
#include <Map/viewpoint2D.h>
#include <Lts/Viewer/SituationMap/Map/map.h>
#include <Lts/Viewer/SituationMap/Map/viewpoint2D.h>
#include "AdapterDds/adapter_dds.h"
@@ -7,7 +7,7 @@
#include <Common/situation_map_logging.h>
#include <Map/generic_object_factory.h>
#include <Map/map.h>
#include <Lts/Viewer/SituationMap/Map/map.h>
#include <Map/map_initializer.h>
#include <Map/object_factory.h>
#include <Map/party_id_to_color_functor.h>
@@ -4,7 +4,7 @@
#include "terrain_profile_handler.h"
#include <LtsSession/lts_session.h>
#include <Map/map.h>
#include <Lts/Viewer/SituationMap/Map/map.h>
#include <Map/terrain_profile.h>
#include <Utils/terrain_profile_dialog.h>
@@ -17,6 +17,9 @@ SET(styleplugintest_UICS
Ui/stylePluginTestUi.ui
)
# Qt6 Autouic search path for UI files in subdirectories
set(CMAKE_AUTOUIC_SEARCH_PATHS ${CMAKE_CURRENT_SOURCE_DIR}/Ui)
NGL_WRAP_UI(styleplugintest_SRCS ${styleplugintest_UICS})
NGL_ADD_LIBRARY2(WS NO_TRANSLATION stylePluginTest SHARED ${styleplugintest_SRCS} ${styleplugintest_UICS})
NGL_TARGET_LINK_LIBRARIES(stylePluginTest
@@ -29,7 +29,7 @@
#include <QNetworkRequest>
#include <QNetworkReply>
#include <QUrl>
#include <QWebSocket>
#include <QtWebSockets/QWebSocket>
#include <QLocale>
#include <QTimer>
#include <QFileSystemWatcher>
@@ -34,7 +34,7 @@
#include <QNetworkRequest>
#include <QNetworkReply>
#include <QUrl>
#include <QWebSocket>
#include <QtWebSockets/QWebSocket>
#include <QLocale>
#include <QTimer>
#include <QFileSystemWatcher>
@@ -31,7 +31,7 @@
#include <QNetworkRequest>
#include <QNetworkReply>
#include <QUrl>
#include <QWebSocket>
#include <QtWebSockets/QWebSocket>
#include <QLocale>
#include <QTimer>
#include <QTemporaryDir>
@@ -15,7 +15,7 @@
#include <QJsonValue>
#include <QTimer>
#include <QUrlQuery>
#include <QWebSocket>
#include <QtWebSockets/QWebSocket>
namespace TimeLineManagement
{