Compare commits

..
Author SHA1 Message Date
berrux-dev d327c66c46 Close bld/OSG floor: OSG 3.4.1 from source + port osgQt to Qt6 + wire BgViewer dtEntity
Migrate BuildingViewer (16 files: DDS members, m_logger inits, QOpenGLWidget); gui:3:bld.info + gui:3:bdv now load
2026-10-24 19:32:52 +02:00
berrux-dev 8e9594d25c Close ppm.msdl/ppm.saab floors: re-implement MSDL/SAAB import without Qt XmlPatterns
Qt6::Xml (QDomDocument) + xmllint schema check; MSDL links XercesC + xsdc++ tree classes; both moved into GROUP12
2026-10-24 19:31:04 +02:00
berrux-dev 3924b1e72b externel dependency 2026-10-23 16:28:08 +02:00
berrux-dev fb3e91ea4b Close Schusstafel + KDChart plugin floors: cesPluginGeoPairing/OreOnlineReportsGuiPlugin in GROUP12 (presence-gated), image bakes KDChart
DDS member fixes (GeoPairing, OnlineReports charts/dialogs); FindKDChart/FindSchusstafel find-module wiring
2026-10-22 13:16:23 +02:00
berrux-dev e067c21b0d Enable Codification/OHP/PlanEditor/OrgChart plugin groups (G12 225); harden new_docker_build.sh
First-build fixes (DDS members, Qt6 transitive WebChannel/PrintSupport drops, logger init, Qt5 guard); script: log_warn, BUILD_WLS default ON, Poppler image+APT, XmlPatterns 6.0 wording
2026-10-21 13:50:10 +02:00
berrux-dev 131a6714cf Restore BZip2 in nglcompression (legacy REQUIRED it)
Define HAVE_BZIP2 so the real impl compiles instead of the stub; link libbz2; nglcomp_test green
2026-10-21 10:18:32 +02:00
1313 changed files with 2029 additions and 97042 deletions

No files matched your search

+4 -26
View File
@@ -27,11 +27,9 @@ RUN apt-get update && \
libpq-dev \
libbz2-dev \
libboost-all-dev \
libglib2.0-dev \
libxml2-dev \
libssl-dev \
libcurl4-openssl-dev \
libkf6texttemplate-dev && \
libcurl4-openssl-dev && \
rm -rf /var/lib/apt/lists/*
# Install Qt 6.10.2 via aqtinstall
@@ -54,7 +52,6 @@ RUN git clone --depth 1 https://github.com/MEONMedical/Log4Qt.git /tmp/log4qt &&
-DBUILD_SHARED_LIBS=ON .. && \
cmake --build . -- -j$(nproc) && \
cmake --install . && \
sed -i 's/return (mThreshold <= level);/return (mThreshold.load() <= level);/' /usr/local/include/log4qt/appenderskeleton.h && \
rm -rf /tmp/log4qt
# Create minimal CMake config for Log4Qt
@@ -84,27 +81,8 @@ ENV QT_QPA_PLATFORM=offscreen
# Configure git for containerized environments
RUN git config --global --add safe.directory "*"
# Configure internal SCM repository for external dependencies
RUN echo "deb [trusted=yes] http://remote-repo.sl.defence-elec.de:8081/repository/external-rpms/general/ ./" > /etc/apt/sources.list.d/scm-external.list
# Install external dependencies from DEB packages
RUN apt-get update && apt-get install -y --no-install-recommends \
libavs-dev \
libarcgis-dev \
libbuildingmodels-dev \
libgeographiclib-dev \
libschusstafel-dev \
libdtentity-dev \
librti-connext-dds-7.7.0-dev \
libtmsif-dev \
&& rm -rf /var/lib/apt/lists/*
# Setup RTI Connext license (included in DEB package)
ENV RTI_LICENSE_FILE=/opt/rti_connext_dds-7.7.0/rti_license.dat
ENV RTI_CONNEXT_HOME=/opt/rti_connext_dds-7.7.0
ENV NDDSHOME=/opt/rti_connext_dds-7.7.0
ENV PATH=/opt/rti_connext_dds-7.7.0/bin:$PATH
ENV LD_LIBRARY_PATH=/opt/rti_connext_dds-7.7.0/lib/x64Linux4gcc7.3.0:$LD_LIBRARY_PATH
ENV CMAKE_PREFIX_PATH=/opt/rti_connext_dds-7.7.0/lib/cmake:$CMAKE_PREFIX_PATH
# Setup RTI Connext license (developer license file)
COPY rti_license.dat /root/rti_license.dat
ENV RTI_LICENSE_FILE=/root/rti_license.dat
WORKDIR /workspace
+1
View File
@@ -1,4 +1,5 @@
# export MIGRATE_PIPELINE_ROOT="/home/torsten/sandbox/qt6-migration-pipeline"
export MIGRATE_PIPELINE_ROOT="/home/nkana/repo/qt6-migration-pipeline"
export CLAUDE_CODE_MAX_OUTPUT_TOKENS=16000
export LANG=C.UTF-8
export LC_ALL=C.UTF-8
+39 -34
View File
@@ -18,10 +18,6 @@ ENDIF()
IF(POLICY CMP0072)
CMAKE_POLICY(SET CMP0072 NEW) # cmake >= 3.11.0 - prefer libOpenGL.so over legacy libGL.so
ENDIF()
# Set policy CMP0111 unconditionally - imported targets require location property
IF(POLICY CMP0111)
CMAKE_POLICY(SET CMP0111 NEW)
ENDIF()
IF(NOT DEFINED CMAKE_INSTALL_PREFIX)
@@ -44,11 +40,6 @@ MESSAGE(STATUS "LTS Version: ${LTS_VERSION_MAJOR}.${LTS_VERSION_MINOR}.${LTS_VER
# Enable CTest integration for unit tests
include(CTest)
# Set RPATH to find libraries in build directory
SET(CMAKE_BUILD_RPATH "${CMAKE_BINARY_DIR}/lib")
SET(CMAKE_INSTALL_RPATH "${CMAKE_BINARY_DIR}/lib")
SET(CMAKE_BUILD_RPATH_USE_ORIGIN ON)
function(NGL_ADD_SUBDIR_GUARDED subdir)
if(MIGRATE_MODULE STREQUAL "")
add_subdirectory(${subdir})
@@ -219,8 +210,12 @@ OPTION(BUILD_PLUGINS_PLANEDITOR "Build PlanEditor plugin (requires Qt6 WebEngine
OPTION(BUILD_PLUGINS_ONLINEHELP "Build OnlineHelp plugin (requires Qt6 WebEngine)" OFF)
OPTION(BUILD_PLUGINS_SERVICEMONITOR "Build ServiceMonitor plugin (requires Qt6 WebEngine)" OFF)
OPTION(BUILD_PLUGINS_PARTICIPANT_ORG_CHART "Build ParticipantOrgChart (requires Qt6 WebEngine)" OFF)
OPTION(BUILD_PLUGINS_MSDL "Build MSDL module (requires Qt6 XmlPatterns)" OFF)
OPTION(BUILD_PLUGINS_SAAB "Build Saab module (requires Qt6 XmlPatterns)" OFF)
# MSDL/Saab no longer require Qt XmlPatterns (removed in Qt 6.0): their import
# code was re-implemented with Qt6::Xml (QDomDocument) for the schema check plus
# the external xmllint step for real XSD validation; MSDL additionally links
# XercesC + uses xsdc++-generated tree classes (needs libxerces-c-dev + xsdcxx).
OPTION(BUILD_PLUGINS_MSDL "Build MSDL module (needs XercesC + xsdc++)" OFF)
OPTION(BUILD_PLUGINS_SAAB "Build Saab module (Qt6::Xml only)" OFF)
OPTION(BUILD_RTI "Build RTI Connext DDS dependent modules" OFF)
OPTION(BUILD_VIEWER_ONLY "Build only Viewer module (no RTI required)" OFF)
# Add Lts/ include path globally for QosProfile and other Lts headers
@@ -263,19 +258,13 @@ IF(WIN32)
ELSE()
# Linux: ArcGIS SDK Pfad konfigurieren (nur wenn BUILD_ARCGIS=ON)
IF(BUILD_ARCGIS)
# Use environment variable ARCGIS_ROOT if set, otherwise check relative to source dir, then Docker/host paths
# Use environment variable ARCGIS_ROOT if set, otherwise default to /workspace/external/... (Docker) or host path
IF(DEFINED ENV{ARCGIS_ROOT})
SET(ARCGIS_SDK_DIR "$ENV{ARCGIS_ROOT}" CACHE STRING "ArcGIS Runtime SDK for Qt directory")
ELSEIF(EXISTS "${CMAKE_SOURCE_DIR}/external/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk")
SET(ARCGIS_SDK_DIR "${CMAKE_SOURCE_DIR}/external/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk" CACHE STRING "ArcGIS Runtime SDK for Qt directory")
ELSEIF(DEFINED ENV{DOCKER_MOUNT_ROOT})
SET(ARCGIS_SDK_DIR "$ENV{DOCKER_MOUNT_ROOT}/external/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk" CACHE STRING "ArcGIS Runtime SDK for Qt directory")
ELSEIF(EXISTS "/repo/external/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk")
SET(ARCGIS_SDK_DIR "/repo/external/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk" CACHE STRING "ArcGIS Runtime SDK for Qt directory")
ELSEIF(EXISTS "/workspace/external/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk")
SET(ARCGIS_SDK_DIR "/workspace/external/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk" CACHE STRING "ArcGIS Runtime SDK for Qt directory")
ELSE()
SET(ARCGIS_SDK_DIR "" CACHE STRING "ArcGIS Runtime SDK for Qt directory")
SET(ARCGIS_SDK_DIR "/repo/external/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk" CACHE STRING "ArcGIS Runtime SDK for Qt directory")
ENDIF()
IF(EXISTS "${ARCGIS_SDK_DIR}")
LIST(APPEND CMAKE_PREFIX_PATH "${ARCGIS_SDK_DIR}")
@@ -295,6 +284,12 @@ ENDIF()
SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
INCLUDE(FindLibraryWithDebug)
# Find ArcGIS SDK globally if BUILD_ARCGIS is enabled
# This creates ArcGIS::ArcGIS target for all modules to use
IF(BUILD_ARCGIS)
FIND_PACKAGE(ArcGIS REQUIRED)
ENDIF()
ENABLE_TESTING()
INCLUDE(CTest)
CONFIGURE_FILE(CTestCustom.ctest ${CMAKE_BINARY_DIR}/CTestCustom.ctest COPYONLY)
@@ -344,7 +339,7 @@ endif()
# server uses QWebSocketServer; LtsWebSocket/httq enable their real websocket
# paths via QT6_WEBSOCKETS_AVAILABLE when the module is found).
find_package(Qt6 6.2 COMPONENTS Concurrent Core LinguistTools Network
Multimedia Sql SerialPort Test Xml Positioning Svg WebSockets PrintSupport OpenGL OpenGLWidgets QUIET)
Multimedia Sql SerialPort Test Xml Positioning Svg WebSockets PrintSupport OpenGL QUIET)
if(Qt6_FOUND)
# Skip GUI find_package - it fails without OpenGL. We'll create manual targets below.
@@ -354,7 +349,7 @@ endif()
# If Qt6 not found yet, try with full component list including OpenGL
if(NOT Qt6_FOUND)
find_package(Qt6 6.2 COMPONENTS Concurrent Core LinguistTools Network OpenGL OpenGLWidgets PrintSupport
find_package(Qt6 6.2 COMPONENTS Concurrent Core LinguistTools Network OpenGL PrintSupport
Multimedia Sql Svg SerialPort Test UiTools WebSockets WebEngineCore WebEngineWidgets
Widgets Xml Positioning QUIET)
if(Qt6_FOUND AND OpenGL_FOUND)
@@ -369,6 +364,27 @@ if(NOT Qt6_FOUND)
message(STATUS "Found Qt6 (minimal): ${Qt6Core_VERSION}")
endif()
# MSDL/Saab import libs (gated by BUILD_PLUGINS_MSDL / BUILD_PLUGINS_SAAB) no
# longer use Qt XmlPatterns (QXmlSchema/QXmlSchemaValidator), which was removed
# in Qt 6.0. They were re-implemented with Qt6::Xml (QDomDocument) for the
# schema well-formedness check plus the external xmllint step for real XSD
# validation; MSDL additionally links XercesC and uses xsdc++-generated tree
# classes. No Qt6::XmlPatterns lookup is needed any more.
# Qt6::WebChannel (consumed by PpmOrgChartGuiPlugin's QWebChannel page setup):
# in Qt5 Qt5::WebEngineWidgets transitively linked Qt5::WebChannel (Qt5's
# webengine depended on webchannel), but Qt6 dropped that dependency, so the
# module must be found and linked explicitly. Separate QUIET find - never let
# a missing optional component flip Qt6_FOUND off.
if(NOT TARGET Qt6::WebChannel)
find_package(Qt6 6.2 COMPONENTS WebChannel QUIET)
if(Qt6WebChannel_FOUND)
message(STATUS "Found Qt6WebChannel")
else()
message(STATUS "Qt6WebChannel not found (PpmOrgChartGuiPlugin requires it; keep BUILD_PLUGINS_PARTICIPANT_ORG_CHART OFF)")
endif()
endif()
# Manual Qt6 configuration - create imported targets for available libraries
if(NOT TARGET Qt6::Core)
find_package(Qt6 6.2 COMPONENTS Core REQUIRED)
@@ -724,12 +740,6 @@ endif()
MESSAGE(STATUS "Qt version is ${Qt6Core_VERSION}, GUI available: ${QT6_GUI_AVAILABLE}")
# Find ArcGIS SDK after Qt6 is configured
# This creates ArcGIS::ArcGIS target for all modules to use
IF(BUILD_ARCGIS)
FIND_PACKAGE(ArcGIS REQUIRED)
ENDIF()
#
# RTI Connext DDS - manuelle Konfiguration da keine CMake Config Files vorhanden
#
@@ -737,15 +747,10 @@ IF(BUILD_RTI)
# Support environment variable override, otherwise use relative path from repo root
IF(DEFINED ENV{DDS_PATH})
SET(RTI_INSTALL_DIR "$ENV{DDS_PATH}" CACHE PATH "RTI Connext DDS installation directory")
ELSEIF(DEFINED ENV{DOCKER_MOUNT_ROOT})
# Use DOCKER_MOUNT_ROOT environment variable if set (supports both /repo and /workspace)
SET(RTI_INSTALL_DIR "$ENV{DOCKER_MOUNT_ROOT}/external/rti_connext_dds-7.7.0" CACHE PATH "RTI Connext DDS installation directory")
ELSE()
# In Docker container: /repo/external/rti_connext_dds-7.7.0 (current) or /workspace/external/rti_connext_dds-7.7.0 (old)
# In Docker container: /workspace/external/rti_connext_dds-7.7.0
# On host: ${CMAKE_SOURCE_DIR}/../../../external/rti_connext_dds-7.7.0
IF(EXISTS "/repo/external/rti_connext_dds-7.7.0")
SET(RTI_INSTALL_DIR "/repo/external/rti_connext_dds-7.7.0" CACHE PATH "RTI Connext DDS installation directory")
ELSEIF(EXISTS "/workspace/external/rti_connext_dds-7.7.0")
IF(EXISTS "/workspace/external/rti_connext_dds-7.7.0")
SET(RTI_INSTALL_DIR "/workspace/external/rti_connext_dds-7.7.0" CACHE PATH "RTI Connext DDS installation directory")
ELSEIF(EXISTS "${CMAKE_SOURCE_DIR}/../../../external/rti_connext_dds-7.7.0")
SET(RTI_INSTALL_DIR "${CMAKE_SOURCE_DIR}/../../../external/rti_connext_dds-7.7.0" CACHE PATH "RTI Connext DDS installation directory")
@@ -256,8 +256,7 @@ cd build4 && ctest --output-on-failure
### Path Configuration
- **Working Directory:** `/home/torsten/sandbox/qt6-migration-pipeline`
- **Docker Mount Root:** `/repo` (configurable via `--docker-mount-root` or `DOCKER_MOUNT_ROOT` env var)
- **Docker Container Path:** `${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus`
- **Docker Container Path:** `/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus`
- **Test Executables:** `build4/bin/<Configuration>/`
---
@@ -192,7 +192,7 @@ int main(int argc, char **argv) // TODO: json strings to lower
NGLApplication app(argc, argv);
app.createLogger("opApp");
QApplication::setQuitOnLastWindowClosed(false); // we are cool enough to handle it ourselves 8)
// Qt::AA_UseHighDpiPixmaps: no-op since Qt6 (high-DPI pixmaps are always enabled)
QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
QNetworkProxy::setApplicationProxy(QNetworkProxy()); // do NOT use proxies anywhere!
NGL::LoggerHandler *lh = NGL::LoggerHandler::getLoggerHandler();
@@ -23,7 +23,7 @@ int main(int argc, char **argv)
QNetworkProxy::setApplicationProxy(QNetworkProxy());
NGLApplication app(argc, argv);
app.createLogger("SRP");
// Qt::AA_UseHighDpiPixmaps: no-op since Qt6 (high-DPI pixmaps are always enabled)
app.setAttribute(Qt::AA_UseHighDpiPixmaps);
SituationReplay::ConnectionParams connParams;
connParams.domainId = 1;
@@ -50,7 +50,7 @@ int main(int argc, char **argv)
app.createLogger("THP", "log4cxx_thp_viewer.props");
app.setOrganizationName(QStringLiteral("RME"));
app.setApplicationName(QStringLiteral("thp_viewer"));
// Qt::AA_UseHighDpiPixmaps: no-op since Qt6 (high-DPI pixmaps are always enabled)
app.setAttribute(Qt::AA_UseHighDpiPixmaps);
QDir::setSearchPaths(QLatin1String("icon"), QStringList(QLatin1String(":/style/")));
Q_INIT_RESOURCE(rme_light_style);
@@ -258,7 +258,7 @@ void ThpViewer::onLinkClicked(const QUrl &url)
const QString path = url.path();
const QString lpath = path.toLower();
// Use QStringView for efficient string operations
// Qt6: QStringRef/QString::splitRef were removed; QStringView::split provides zero-copy access
const QStringView ext = QStringView{lpath}.split(QLatin1Char('.')).last();
const QStringView ext2Chars = ext.left(2);
@@ -32,6 +32,7 @@ public:
bool needsToBeOpenedExternally(const QUrl &url)
{
const QString lpath = url.toString();
// Qt6: QStringRef/QString::splitRef and QString::midRef were removed; use QStringView
const QStringView ext = QStringView{lpath}.split(QLatin1Char('.')).last();
const QStringView ext2Chars = ext.left(2);
if (ext == QLatin1String("html") &&
@@ -295,7 +295,8 @@ bool LtsPluginLoader::loadPlugins(PluginType requestedPluginType,
}
const QString jsonIid = iid.value().toString().toLower(); // LOWERCASE ! (pun intended)
// Use QStringView for efficient string operations
// Qt6: QStringRef/QString::splitRef were removed; QStringView::split
// provides the same zero-copy tokenization.
const QList<QStringView> iidParameters = QStringView{jsonIid}.split(QLatin1Char(':'));
DEBUG_LOG(logger) << "Plugin " << absoluteFilePath << " provides iid '" << jsonIid;
@@ -48,9 +48,7 @@ IF(BUILD_RTI)
${CMAKE_BINARY_DIR}/Lts/DDS
)
# ddscore target generates core_dtc_types.h
IF(TARGET ddscore)
ADD_DEPENDENCIES(LtsSessionDataDds ddscore)
ENDIF()
ADD_DEPENDENCIES(LtsSessionDataDds ddscore)
NGL_TARGET_LINK_DIRECTORIES(LtsSessionDataDds
PRIVATE
${RTI_LIB_DIR}
@@ -161,7 +161,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(LtsWidgets
NGL_TARGET_LINK_LIBRARIES(LtsWidgets
PRIVATE
Qt6::Network # for QHostInfo - for portability
$<IF:$<TARGET_EXISTS:Qt6::Svg>,Qt6::Svg,>
Qt6::Svg
ngltools
ngltranslator
NGLLogger
@@ -39,9 +39,7 @@
#include <QtWidgets/QPushButton>
#include <QtWidgets/QScrollArea>
#include <QScroller>
#ifdef QT_SVG_LIB
#include <QtSvg/QSvgRenderer>
#endif
#include <QSvgRenderer>
#include <QtCore/QTimer>
#include <QtWidgets/QToolButton>
#include <QtCore/QPropertyAnimation>
@@ -401,7 +399,6 @@ void LtsBaseLayoutWidget::showEvent(QShowEvent *event)
{
const QSize s(QSize(rendererSizeHint.height(), rendererSizeHint.height()) * dpr);
// RDE SPLITTER LEFT
#ifdef QT_SVG_LIB
QSvgRenderer svgRenderer;
QPixmap pixmap(s);
pixmap.fill(Qt::transparent);
@@ -413,9 +410,6 @@ void LtsBaseLayoutWidget::showEvent(QShowEvent *event)
pixmap.setDevicePixelRatio(dpr);
m_ui->lbRdeSplitterLeft->setPixmap(pixmap);
#else
qWarning() << "QSvgRenderer not available - skipping SVG rendering for splitter";
#endif
}
{
@@ -64,7 +64,7 @@ void LtsColumnFilterProxyModel::setColumnStringFilter(const QString &newFilterSt
}
}
beginFilterChange();
endFilterChange();
endFilterChange();
}
void LtsColumnFilterProxyModel::setColumnDataFilter(const QVariant &newFilterData, int column)
@@ -92,7 +92,7 @@ void LtsColumnFilterProxyModel::setColumnDataFilter(const QVariant &newFilterDat
}
}
beginFilterChange();
endFilterChange();
endFilterChange();
}
@@ -141,7 +141,7 @@ void LtsColumnFilterProxyModel::setRecursiveFilteringEnabled(bool recursive)
return;
m_bRecursiveFiltering = recursive;
beginFilterChange();
endFilterChange();
endFilterChange();
}
bool LtsColumnFilterProxyModel::recursiveFilteringEnabled() const
@@ -1,5 +1,4 @@
#include "lts_msec_date_time_edit.h"
#include <QTimeZone>
namespace LtsWidgets
@@ -24,12 +24,11 @@ ADD_SUBDIRECTORY(Routing)
ADD_SUBDIRECTORY(Core)
# During stepwise migration, add placeholder CTest entries after the
# real DdsUnitTests subdir so the test-suite can use real targets when
# internal codegen/RTI targets are available, and fall back to placeholders
# only when they are not.
# During stepwise migration, add placeholder CTest entries before the
# real DdsUnitTests subdir so the test-suite shows migration status even
# when internal codegen targets are not yet available.
ADD_SUBDIRECTORY(DdsUnitTestsPlaceholder)
IF(BUILD_RTI)
ADD_SUBDIRECTORY(DdsUnitTests)
ENDIF()
ADD_SUBDIRECTORY(DdsUnitTestsPlaceholder)
@@ -5,22 +5,14 @@
#
# ddsftc - Changed from INTERFACE to STATIC library to fix source path issues
# When INTERFACE libraries provide sources, CMake compiles them in the consuming
# target's directory context, causing path resolution issues with relative paths
ADD_LIBRARY(ddsftc STATIC
${CMAKE_CURRENT_SOURCE_DIR}/generic_ftc.h
${CMAKE_CURRENT_SOURCE_DIR}/generic_ftc.cpp
${CMAKE_CURRENT_SOURCE_DIR}/generic_ftc_impl.h
${CMAKE_CURRENT_SOURCE_DIR}/generic_ftc_threading.h
${CMAKE_CURRENT_SOURCE_DIR}/generic_ftc_threading.cpp
)
# ddsftc
ADD_LIBRARY(ddsftc INTERFACE)
TARGET_INCLUDE_DIRECTORIES(ddsftc
PUBLIC
INTERFACE
${CMAKE_CURRENT_SOURCE_DIR}/../../
)
TARGET_LINK_LIBRARIES(ddsftc
PUBLIC
INTERFACE
Qt6::Core
$<IF:$<TARGET_EXISTS:ddscore>,ddscore,>
ddsgen
@@ -30,12 +22,21 @@ TARGET_LINK_LIBRARIES(ddsftc
)
IF(BUILD_RTI)
TARGET_LINK_LIBRARIES(ddsftc
PUBLIC
INTERFACE
ddsfts_connext
RTI::nddsc
RTI::nddscpp2
)
ENDIF()
SET(SRCS
${CMAKE_CURRENT_SOURCE_DIR}/generic_ftc.h
${CMAKE_CURRENT_SOURCE_DIR}/generic_ftc.cpp
${CMAKE_CURRENT_SOURCE_DIR}/generic_ftc_impl.h
${CMAKE_CURRENT_SOURCE_DIR}/generic_ftc_threading.h
${CMAKE_CURRENT_SOURCE_DIR}/generic_ftc_threading.cpp
)
TARGET_SOURCES(ddsftc INTERFACE ${SRCS})
# ddsftccore
@@ -430,9 +430,12 @@ private:
INFO_LOG(m_logger) << "#receiveReply for " << TopicNameHelper::replyTopicTypeName();
// QueuedConnection to make sure the data is handled in the correct Qt (main) thread
request.replySlot.invoke(m_objToInform, Qt::QueuedConnection,
// Qt6: QMetaMethod::invoke takes QMetaMethodArgument; pass the
// registered topic type name like Q_ARG does, but with the
// runtime name (ReplyTopic is a template parameter).
QtPrivate::Invoke::argument<ReplyTopic>(TopicNameHelper::replyTopicTypeName(), reply.data()),
Q_ARG(int, request.uniqueId),
Q_ARG(bool, !inProgress));
Q_ARG(bool, !inProgress)); // finished yes/no
}
else
{
@@ -125,7 +125,8 @@ class Shot
Shot(const int32_t id, const osg::Vec3d& shooterPos, const osg::Vec3d& targetPos, int buildingIdSrc,
int rommNumberSrc, int buildingIdDst, int rommNumberDst, int lineType, const osg::Vec4& color,
unsigned int duration_s, unsigned int durationMax_s, double simTimeCreated)
: mId(id), mShooterPos(shooterPos), mTargetPos(targetPos), mBuildingIdSrc(buildingIdSrc),
: m_logger(BuildingViewer::getLogger("Shot")), mId(id), mShooterPos(shooterPos),
mTargetPos(targetPos), mBuildingIdSrc(buildingIdSrc),
mRoomNumberSrc(rommNumberSrc), mBuildingIdDst(buildingIdDst), mRoomNumberDst(rommNumberDst),
mLineType(lineType), mColor(color), mDuration_s(duration_s), m_DurationMax_s(durationMax_s),
mSimTimeCreated(simTimeCreated)
@@ -180,6 +180,7 @@ CtrlImpl::CtrlImpl(dtEntity::EntityManager &em, QWidget *parentWidget)
, mPaused(false)
, mNonRealtimeMode(false)
, mFrameRate(30)
, m_logger(BuildingViewer::getLogger("CtrlImpl"))
{
if (!mEntityManager->GetES(mMapSystem) ||
!mEntityManager->GetES(mPlayerSystem))
@@ -3,7 +3,7 @@
#include <QtWidgets/QApplication>
#include <QtWidgets/QVBoxLayout>
#include <QtCore/QEvent>
#include <QGLWidget>
#include <QtOpenGLWidgets/QOpenGLWidget>
#include <QWindow>
#include <dtEntity/log.h>
@@ -176,7 +176,7 @@ void ViewWidget::viewModeChanged()
bool ViewWidget::isOpenGlWindowExposed() const
{
QGLWidget *gl = qobject_cast<QGLWidget*>(m_pView);
QOpenGLWidget *gl = qobject_cast<QOpenGLWidget*>(m_pView);
if (!gl || !gl->windowHandle())
return false;
return gl->windowHandle()->isExposed();
@@ -4,7 +4,6 @@
#include <osg/Material>
#include <osg/BlendFunc>
#include <osg/BlendColor>
#include <QStringView>
#include <QtCore/QVector>
namespace VCtrl
@@ -87,10 +86,11 @@ void SplitVisitor::apply(osg::Group &node)
for (unsigned int i = 0; i < node.getNumDescriptions(); ++i)
{
QString descr = QString::fromStdString(node.getDescription(i));
const QVector<QStringView> descprt = QStringView(descr).split(QLatin1Char(';'));
for (const QStringView &prt : descprt)
// Qt6: QStringRef removed; split()/splitRef() both return QVector<QString>
const QVector<QString> descprt = descr.split(QLatin1Char(';'));
for (const QString &prt : descprt)
{
const QVector<QStringView> items = prt.split(QLatin1Char('='));
const QVector<QString> items = prt.split(QLatin1Char('='));
if (items.size() == 2 && items[0] == QLatin1String("base_height"))
h = items[1].toFloat();
}
@@ -113,6 +113,7 @@ if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(BuildingViewerCommon
PRIVATE
Qt6::OpenGL
Qt6::OpenGLWidgets
${OPENGL_LIBRARIES}
${BGVIEWER_DTENTITYOSG_LIBRARY}
${BGVIEWER_DTENTITY_LIBRARY}
@@ -126,6 +127,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(BuildingViewerCommon
${CMAKE_CURRENT_SOURCE_DIR}/BgViewer/viewerCtrl
${CMAKE_CURRENT_SOURCE_DIR}/../share
${OSG_INCLUDE_DIR}
${BGVIEWER_INCLUDE_DIR}
)
IF (NOT WIN32)
@@ -3,6 +3,7 @@
#include "bdv_communication_interface_internal.h"
#include <ParticipantManagement/ppm_translation.h>
#include <NGLLogger/NGLLoggerBootstrap.h>
#include <QtCore/QTimer>
#include <cassert>
#include <utility>
@@ -29,7 +30,8 @@ static inline std::string createRoomNumberString(int roomNumber)
}
CommunicationInterfaceInternal::CommunicationInterfaceInternal(VCtrl::ViewerInterface* pviewerInterface)
: m_pviewerInterface(pviewerInterface)
: m_pviewerInterface(pviewerInterface),
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("BuildingViewer.CommunicationInterfaceInternal"))
{
assert(m_pviewerInterface);
}
@@ -203,10 +205,10 @@ void CommunicationInterfaceInternal::setTeamConfiguration(const QMap<qint32, Par
for (const ParticipantManagement::Party& party : parties)
{
BdvParty bdvParty;
bdvParty.id = party.id();
bdvParty.name = ParticipantManagement::trPartyName(party.name());
bdvParty.id = party.id;
bdvParty.name = ParticipantManagement::trPartyName(party.name);
const uint32_t argb = party.color();
const uint32_t argb = party.color;
bdvParty.color.w = (((argb >> 24) & 0xff) / 255.);
bdvParty.color.x = (((argb >> 16) & 0xff) / 255.);
bdvParty.color.y = (((argb >> 8) & 0xff) / 255.);
@@ -256,9 +258,9 @@ void CommunicationInterfaceInternal::systemSetMountingPoint(const Infrastructure
{
int buildingId = data.buildingId();
const QString& mountingPointName = filename;
double x = data.relPosition().offsetX();
double y = data.relPosition().offsetY();
double z = data.relPosition().offsetZ();
double x = data.relPosition().offsetX;
double y = data.relPosition().offsetY;
double z = data.relPosition().offsetZ;
const std::string buildingIdStr = createBuildingIdString(buildingId);
@@ -446,7 +448,8 @@ static inline bool isPlayerId(const std::string& playerIdString, int* playerId)
const QString playerIdQString(QString::fromStdString(playerIdString));
bool bOk = false;
if (playerIdQString.startsWith(QLatin1String(PLAYER_PREFIX)))
*playerId = playerIdQString.midRef(QLatin1String(PLAYER_PREFIX).size()).toInt(&bOk);
// Qt6: QString::midRef removed; mid() returns the same substring by value.
*playerId = playerIdQString.mid(QLatin1String(PLAYER_PREFIX).size()).toInt(&bOk);
return bOk;
}
@@ -10,6 +10,7 @@
#include <LtsAppManager/lts_app_manager.h>
#include <LtsPluginManager/lts_plugin_manager.h>
#include <LtsSession/lts_session.h>
#include <NGLLogger/NGLLoggerBootstrap.h>
#include <QtCore/QDir>
#include <QtWidgets/QMessageBox>
#include <ngltools/ngltools_filesystem.h>
@@ -22,7 +23,8 @@ static char* argv_dummy[] = {(char*)"Dummy"};
BgViewerController::BgViewerController(QObject* parent)
: QObject(parent), m_mainloop(argc_dummy, argv_dummy, nullptr), m_widgetStolen(false), m_comIfc(nullptr),
m_pBgViewerDDSController(nullptr), m_bgvApp(nullptr), m_tickTimer(new QTimer(this))
m_pBgViewerDDSController(nullptr), m_bgvApp(nullptr), m_tickTimer(new QTimer(this)),
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("BuildingViewer.BgViewerController"))
{
m_tickTimer->setInterval(1000 / 25);
connect(m_tickTimer, &QTimer::timeout, this, [this]() { m_mainloop.tick(); });
@@ -322,11 +322,11 @@ void BuildingViewerDdsController::uninitialize()
QPointF BuildingViewerDdsController::toRelativePosition(const Core::GeoPosition& geoPos) const
{
if (std::isnan(geoPos.lon()) || std::isnan(geoPos.lat()) || qIsNull(geoPos.lon()) || qIsNull(geoPos.lat()))
if (std::isnan(geoPos.lon) || std::isnan(geoPos.lat) || qIsNull(geoPos.lon) || qIsNull(geoPos.lat))
return {};
LtsCoordTrans::UtmCoordinate coord(
LtsCoordTrans::UtmCoordinate::fromGeographic(geoPos.lon(), geoPos.lat(), m_baseCoordinate.zone));
LtsCoordTrans::UtmCoordinate::fromGeographic(geoPos.lon, geoPos.lat, m_baseCoordinate.zone));
return coord.relativeTo(m_baseCoordinate);
}
@@ -335,7 +335,7 @@ LtsUtils::QPoint3D BuildingViewerDdsController::toRelative3D(const Core::GeoPosi
const auto ret = toRelativePosition(geoPos);
if (ret.isNull())
return {};
return LtsUtils::QPoint3D(ret.x(), ret.y(), geoPos.z());
return LtsUtils::QPoint3D(ret.x(), ret.y(), geoPos.z);
}
bool BuildingViewerDdsController::clear()
@@ -371,12 +371,12 @@ bool BuildingViewerDdsController::calcBaseCoordinate(
if (!bAtLeasOneFound)
{
bAtLeasOneFound = true;
geoPosition = mse.geoPosition();
geoPosition = mse.geoPosition;
}
else
{
geoPosition.lat() = std::min(geoPosition.lat(), mse.geoPosition().lat());
geoPosition.lon() = std::min(geoPosition.lon(), mse.geoPosition().lon());
geoPosition.lat = std::min(geoPosition.lat, mse.geoPosition.lat);
geoPosition.lon = std::min(geoPosition.lon, mse.geoPosition.lon);
}
}
if (!bAtLeasOneFound)
@@ -384,7 +384,7 @@ bool BuildingViewerDdsController::calcBaseCoordinate(
WARNING_LOG(m_logger) << "No building available in exercise " << m_exerciseId;
return false;
}
m_baseCoordinate = LtsCoordTrans::UtmCoordinate::fromGeographic(geoPosition.lon(), geoPosition.lat());
m_baseCoordinate = LtsCoordTrans::UtmCoordinate::fromGeographic(geoPosition.lon, geoPosition.lat);
return true;
}
@@ -422,11 +422,11 @@ bool BuildingViewerDdsController::writeBuildingDataToXML(const QString& modelPat
const auto bi = BuildingInfo::fromJson(ele.toObject());
if (!bi.isValid())
continue;
mse.id(bi.id);
mse.angle(bi.angleDegree);
mse.geoPosition(Core::GeoPosition(bi.position.x(), bi.position.y(), bi.position.z()));
mse.name(bi.name.toStdString());
mseMap.insert(mse.id(), mse);
mse.id = bi.id;
mse.angle = bi.angleDegree;
mse.geoPosition = Core::GeoPosition(bi.position.x(), bi.position.y(), bi.position.z());
mse.name = bi.name.toStdString();
mseMap.insert(mse.id, mse);
}
}
else
@@ -435,17 +435,17 @@ bool BuildingViewerDdsController::writeBuildingDataToXML(const QString& modelPat
const auto mMap = m_ismDtc->mainStructureElements();
for (const auto& mse : mMap)
{
if (mse.modelId() == 0)
if (mse.modelId == 0)
continue;
if (!m_ismDtc->isElementAssignedToExercise(mse, m_exerciseId))
{
DEBUG_LOG(m_logger)
<< "Not writing mse with id " << mse.id()
<< "Not writing mse with id " << mse.id
<< " to building xml file since it is not assigned to the current exercise which has id "
<< m_exerciseId;
continue;
}
mseMap.insert(mse.id(), mse);
mseMap.insert(mse.id, mse);
}
}
INFO_LOG(m_logger) << getSessionInfo()
@@ -460,7 +460,7 @@ bool BuildingViewerDdsController::writeBuildingDataToXML(const QString& modelPat
QXmlStreamWriter sw(&f);
sw.setAutoFormatting(true);
sw.setAutoFormattingIndent(2);
sw.setCodec("UTF-8");
// Qt6: QXmlStreamWriter::setCodec removed; it writes UTF-8 by default.
sw.writeStartDocument(QStringLiteral("1.0"), true);
sw.writeStartElement(QStringLiteral("MetaData"));
{
@@ -478,28 +478,28 @@ bool BuildingViewerDdsController::writeBuildingDataToXML(const QString& modelPat
for (const InfrastructureManagement::MainStructureElement& mse : std::as_const(mseMap))
{
m_knownBuildings += mse.id();
m_knownBuildings += mse.id;
sw.writeStartElement(QStringLiteral("Model"));
sw.writeAttribute(QStringLiteral("Type"), QStringLiteral("House"));
{
const QString name(QString::fromStdString(mse.name()));
const QString name(QString::fromStdString(mse.name));
sw.writeStartElement(QStringLiteral("Description"));
sw.writeAttribute(QStringLiteral("Name"), name);
sw.writeEndElement();
sw.writeStartElement(QStringLiteral("Feature"));
sw.writeAttribute(QStringLiteral("Id"), BuildingViewer::databaseId2FeatureId(mse.id()));
sw.writeAttribute(QStringLiteral("Id"), BuildingViewer::databaseId2FeatureId(mse.id));
sw.writeEndElement();
sw.writeStartElement(QStringLiteral("Orientation"));
sw.writeAttribute(QStringLiteral("Angle"), QString::number(360 - mse.angle()));
sw.writeAttribute(QStringLiteral("Angle"), QString::number(360 - mse.angle));
sw.writeEndElement();
const QPointF offset(toRelativePosition(mse.geoPosition()));
const QPointF offset(toRelativePosition(mse.geoPosition));
sw.writeStartElement(QStringLiteral("Position"));
sw.writeAttribute(QStringLiteral("X"), QString::number(offset.x(), 'f', 13));
sw.writeAttribute(QStringLiteral("Y"), QString::number(offset.y(), 'f', 13));
sw.writeAttribute(QStringLiteral("Z"), QString::number(mse.geoPosition().z(), 'f', 13));
sw.writeAttribute(QStringLiteral("Z"), QString::number(mse.geoPosition.z, 'f', 13));
sw.writeEndElement();
sw.writeStartElement(QStringLiteral("File"));
sw.writeAttribute(QStringLiteral("Name"), name + QStringLiteral(".flt"));
@@ -552,7 +552,7 @@ void BuildingViewerDdsController::onReplayChanged(const SituationReplay::SitRepl
{
Q_UNUSED(modType)
switch (srp.state())
switch (srp.state)
{
case SituationReplay::SrpState::Stopped:
m_connection->setSimuationPace(1.0);
@@ -560,7 +560,7 @@ void BuildingViewerDdsController::onReplayChanged(const SituationReplay::SitRepl
break;
case SituationReplay::SrpState::Started:
case SituationReplay::SrpState::Resumed:
m_connection->setSimuationPace(srp.pace());
m_connection->setSimuationPace(srp.pace);
break;
case SituationReplay::SrpState::Paused:
@@ -629,7 +629,7 @@ void BuildingViewerDdsController::handleMountingPoint(const InfrastructureManage
return;
}
QVector3D position(mp.relPosition().offsetX(), mp.relPosition().offsetY(), mp.relPosition().offsetZ());
QVector3D position(mp.relPosition().offsetX, mp.relPosition().offsetY, mp.relPosition().offsetZ);
QString strfeatureID = BuildingViewer::databaseId2FeatureId(mp.buildingId());
QString strMountingPointID = strfeatureID + QStringLiteral("_MountingPoint_") + QString::number(mountingPointId);
@@ -712,7 +712,7 @@ void BuildingViewerDdsController::setCurrentTrainingAreaMap(const QString& model
bool BuildingViewerDdsController::isValidParticipant(const ParticipantManagement::Participant& participant) const
{
if (participant.id() == 0)
if (participant.id == 0)
{
if (m_logger.isDebugEnabled())
DEBUG_LOG(m_logger) << getSessionInfo()
@@ -720,32 +720,32 @@ bool BuildingViewerDdsController::isValidParticipant(const ParticipantManagement
return false;
}
if (participant.isDeleted())
if (participant.isDeleted)
{
DEBUG_LOG(m_logger) << getSessionInfo() << "isValidParticipant: Not handling participant with id "
<< participant.id() << " since it is marked as 'deleted'";
<< participant.id << " since it is marked as 'deleted'";
return false;
}
if (m_session == nullptr)
return false;
if (!m_session->isVisibleParty(participant.partyId()))
if (!m_session->isVisibleParty(participant.partyId))
{
DEBUG_LOG(m_logger) << getSessionInfo() << "isValidParticipant: Not handling participant with id "
<< participant.id() << " since it is not visible for party with id "
<< participant.partyId();
<< participant.id << " since it is not visible for party with id "
<< participant.partyId;
return false;
}
if (!m_ppmDtc)
return false;
ParticipantManagement::TypeClass tc = m_ppmDtc->type(participant.typeId()).typeClass();
ParticipantManagement::TypeClass tc = m_ppmDtc->type(participant.typeId).typeClass;
if (tc == ParticipantManagement::TypeClass::SupportUnit || tc == ParticipantManagement::TypeClass::Unit)
{
DEBUG_LOG(m_logger) << getSessionInfo() << "isValidParticipant: Not handling participant with id "
<< participant.id() << " since its type is 'SupportUnit', 'Unit' or 'Structure'";
<< participant.id << " since its type is 'SupportUnit', 'Unit' or 'Structure'";
return false;
}
@@ -787,7 +787,7 @@ void BuildingViewerDdsController::createParticipants()
auto cb = [this, &positionMap, sizeL](const ParticipantManagement::Participant& part) {
if (!isValidParticipant(part))
return;
createParticipant(part, positionMap.value(part.id()), sizeL);
createParticipant(part, positionMap.value(part.id), sizeL);
};
m_ppmDtc->participants(cb);
@@ -826,7 +826,7 @@ void BuildingViewerDdsController::onBoobyTrapChanged(const AreaEffectSimulation:
switch (modType)
{
case DataModification::eModified:
deleteParticipant(990000 + boobyTrap.id());
deleteParticipant(990000 + boobyTrap.id);
Q_FALLTHROUGH();
case DataModification::eAdded: {
int sizeL = LtsUtils::OperatorSettings::getInstance()
@@ -836,7 +836,7 @@ void BuildingViewerDdsController::onBoobyTrapChanged(const AreaEffectSimulation:
break;
}
case DataModification::eRemoved: {
deleteParticipant(990000 + boobyTrap.id());
deleteParticipant(990000 + boobyTrap.id);
break;
}
}
@@ -851,17 +851,17 @@ void BuildingViewerDdsController::onParticipantChanged(const ParticipantManageme
switch (modType)
{
case DataModification::eModified:
deleteParticipant(participant.id());
deleteParticipant(participant.id);
Q_FALLTHROUGH();
case DataModification::eAdded: {
int sizeL = LtsUtils::OperatorSettings::getInstance()
->value(QStringLiteral("BgViewer"), QStringLiteral("PlayerSymbolSize"), 20)
.toInt();
createParticipant(participant, m_ppmDtc->participantPosition(participant.id()), sizeL);
createParticipant(participant, m_ppmDtc->participantPosition(participant.id), sizeL);
break;
}
case DataModification::eRemoved: {
deleteParticipant(participant.id());
deleteParticipant(participant.id);
break;
}
}
@@ -878,8 +878,8 @@ void BuildingViewerDdsController::onDynParticipantChanged(const ParticipantManag
case DataModification::eAdded:
case DataModification::eModified:
if (m_ppmDtc)
createParticipant(m_ppmDtc->participant(data.participantId()),
m_ppmDtc->participantPosition(data.participantId()), sizeL);
createParticipant(m_ppmDtc->participant(data.participantId),
m_ppmDtc->participantPosition(data.participantId), sizeL);
break;
case DataModification::eRemoved: {
break;
@@ -890,12 +890,12 @@ void BuildingViewerDdsController::onDynParticipantChanged(const ParticipantManag
void BuildingViewerDdsController::onHitLineInfoChanged(const ParticipantManagement::HitLineInfo& hli,
DataModification modType)
{
DEBUG_LOG(m_logger) << "X 0000 onHitLineInfoChanged id=" << hli.id();
DEBUG_LOG(m_logger) << "X 0000 onHitLineInfoChanged id=" << hli.id;
if (modType == DataModification::eRemoved)
{
DEBUG_LOG(m_logger) << "onHitLineInfoChanged removeHit id=" << hli.id();
m_connection->removeRoomHit(hli.id());
DEBUG_LOG(m_logger) << "onHitLineInfoChanged removeHit id=" << hli.id;
m_connection->removeRoomHit(hli.id);
return;
}
@@ -903,24 +903,24 @@ void BuildingViewerDdsController::onHitLineInfoChanged(const ParticipantManageme
return;
m_ppmDtc->waitForHistoricalDataParticipant();
const ParticipantManagement::Participant& partSrc = m_ppmDtc->participant(hli.originatorParticipantId());
const ParticipantManagement::Participant& partDst = m_ppmDtc->participant(hli.injuryParticipantId());
if (partSrc.id() == 0 || partDst.id() == 0)
const ParticipantManagement::Participant& partSrc = m_ppmDtc->participant(hli.originatorParticipantId);
const ParticipantManagement::Participant& partDst = m_ppmDtc->participant(hli.injuryParticipantId);
if (partSrc.id == 0 || partDst.id == 0)
{
ERROR_LOG(m_logger) << "no knownn part: " << partSrc.id() << " dst: " << partDst.id();
ERROR_LOG(m_logger) << "no knownn part: " << partSrc.id << " dst: " << partDst.id;
return;
}
const QString& strFeatureID = BuildingViewer::databaseId2FeatureId(hli.injuryBuildingId());
const QString& strFeatureID = BuildingViewer::databaseId2FeatureId(hli.injuryBuildingId);
if (!m_viewerInterface->isViewOpen(strFeatureID.toStdString()))
{
DEBUG_LOG(m_logger) << "building not opened: hli.buildingId()=" << hli;
return;
}
if (hli.injuryBuildingId() != 0)
if (hli.injuryBuildingId != 0)
{
auto itBuildingHit = m_buildingHits.constFind(hli.injuryBuildingId());
auto itBuildingHit = m_buildingHits.constFind(hli.injuryBuildingId);
if (itBuildingHit != m_buildingHits.constEnd())
{
const QVector<BuildingHit>& bHits = itBuildingHit.value();
@@ -929,14 +929,14 @@ void BuildingViewerDdsController::onHitLineInfoChanged(const ParticipantManageme
for (const BuildingHit& bh : bHits)
{
const bool testFlag = (bh.chargeTypeId == hli.chargeTypeId() &&
bh.originatorParticipantId == hli.originatorParticipantId() &&
hli.sampleTime() - m_hitlineDuration_ms < bh.sampleTime);
const bool testFlag = (bh.chargeTypeId == hli.chargeTypeId &&
bh.originatorParticipantId == hli.originatorParticipantId &&
hli.sampleTime - m_hitlineDuration_ms < bh.sampleTime);
DEBUG_LOG(m_logger) << "testFlag " << testFlag;
if (bh.chargeTypeId == hli.chargeTypeId() &&
bh.originatorParticipantId == hli.originatorParticipantId() &&
hli.sampleTime() - m_hitlineDuration_ms < bh.sampleTime)
if (bh.chargeTypeId == hli.chargeTypeId &&
bh.originatorParticipantId == hli.originatorParticipantId &&
hli.sampleTime - m_hitlineDuration_ms < bh.sampleTime)
return;
}
}
@@ -950,32 +950,32 @@ void BuildingViewerDdsController::onHitLineInfoChanged(const ParticipantManageme
DEBUG_LOG(m_logger) << "onHitLineInfoChanged createPlayerSymbols";
createPlayerSymbols(partDst, sizeL);
LtsUtils::QPoint3D originatorSrc = toRelative3D(hli.originatorPos());
LtsUtils::QPoint3D injuryDest = toRelative3D(hli.injuryPos());
LtsUtils::QPoint3D originatorSrc = toRelative3D(hli.originatorPos);
LtsUtils::QPoint3D injuryDest = toRelative3D(hli.injuryPos);
DEBUG_LOG(m_logger) << "onHitLineInfoChanged playerHit"
<< " hli.originatorPos() z=" << hli.originatorPos().z()
<< " hli.injuryPos() z=" << hli.injuryPos().z() << " Src=" << originatorSrc.x() << "/"
<< " hli.originatorPos() z=" << hli.originatorPos.z
<< " hli.injuryPos() z=" << hli.injuryPos.z << " Src=" << originatorSrc.x() << "/"
<< originatorSrc.y() << "/" << originatorSrc.z() << " Dest= " << injuryDest.x() << "/"
<< injuryDest.y() << "/" << injuryDest.z()
<< " hli.originatorBuildingId=" << hli.originatorBuildingId()
<< " hli.originatorRoomId=" << hli.originatorRoomId()
<< " hli.injuryBuildingId=" << hli.injuryBuildingId()
<< " hli.injuryRoomId=" << hli.injuryRoomId();
<< " hli.originatorBuildingId=" << hli.originatorBuildingId
<< " hli.originatorRoomId=" << hli.originatorRoomId
<< " hli.injuryBuildingId=" << hli.injuryBuildingId
<< " hli.injuryRoomId=" << hli.injuryRoomId;
DEBUG_LOG(m_logger) << "Before z-correction:"
<< " Src=" << originatorSrc.x() << "/" << originatorSrc.y() << "/" << originatorSrc.z()
<< " Dest= " << injuryDest.x() << "/" << injuryDest.y() << "/" << injuryDest.z();
double zAddOriginator = m_buildingHeight.value(hli.originatorBuildingId(), 0);
double zAddInjury = m_buildingHeight.value(hli.injuryBuildingId(), 0);
double zAddOriginator = m_buildingHeight.value(hli.originatorBuildingId, 0);
double zAddInjury = m_buildingHeight.value(hli.injuryBuildingId, 0);
DEBUG_LOG(m_logger) << "z-correction: zAddOriginator=" << zAddOriginator;
DEBUG_LOG(m_logger) << "z-correction: zAddInjury=" << zAddInjury;
if (hli.originatorBuildingId() <= 0)
if (hli.originatorBuildingId <= 0)
zAddOriginator = zAddInjury;
if (hli.injuryBuildingId() <= 0)
if (hli.injuryBuildingId <= 0)
zAddInjury = zAddOriginator;
originatorSrc.setZ(originatorSrc.z() + zAddInjury);
@@ -988,54 +988,55 @@ void BuildingViewerDdsController::onHitLineInfoChanged(const ParticipantManageme
int buildingIdSrc = -1;
int roomNumberSrc = -1;
{
auto itId2Number = m_roomId2RoomNumber.constFind(hli.originatorBuildingId());
auto itId2Number = m_roomId2RoomNumber.constFind(hli.originatorBuildingId);
if (itId2Number != m_roomId2RoomNumber.constEnd())
{
const auto& mapRooms = itId2Number.value();
const auto itRoom = mapRooms.constFind(hli.originatorRoomId());
const auto itRoom = mapRooms.constFind(hli.originatorRoomId);
if (itRoom != mapRooms.constEnd())
{
buildingIdSrc = hli.originatorBuildingId();
buildingIdSrc = hli.originatorBuildingId;
roomNumberSrc = itRoom.value();
}
else
WARNING_LOG(m_logger) << "onHitLineInfoChanged: Room id can not be mapped! Building id: "
<< hli.injuryBuildingId() << ", originatorRoomId: " << hli.originatorRoomId();
<< hli.injuryBuildingId << ", originatorRoomId: " << hli.originatorRoomId;
}
}
int buildingIdDst = -1;
int roomNumberDst = -1;
{
auto itId2Number = m_roomId2RoomNumber.constFind(hli.injuryBuildingId());
auto itId2Number = m_roomId2RoomNumber.constFind(hli.injuryBuildingId);
if (itId2Number != m_roomId2RoomNumber.constEnd())
{
const auto& mapRooms = itId2Number.value();
const auto itRoom = mapRooms.constFind(hli.injuryRoomId());
const auto itRoom = mapRooms.constFind(hli.injuryRoomId);
if (itRoom != mapRooms.constEnd())
{
buildingIdDst = hli.injuryBuildingId();
buildingIdDst = hli.injuryBuildingId;
roomNumberDst = itRoom.value();
}
else
WARNING_LOG(m_logger) << "onHitLineInfoChanged: Room id can not be mapped! Building id: "
<< hli.injuryBuildingId() << ", room id: " << hli.injuryRoomId();
<< hli.injuryBuildingId << ", room id: " << hli.injuryRoomId;
}
}
DEBUG_LOG(m_logger) << "After translate buildingId, roomId:"
<< " hli.originatorBuildingId=" << hli.originatorBuildingId() << " -> " << buildingIdSrc
<< " hli.originatorRoomId=" << hli.originatorRoomId() << " -> " << roomNumberSrc
<< " hli.injuryBuildingId=" << hli.injuryBuildingId() << " -> " << buildingIdDst
<< " hli.injuryRoomId=" << hli.injuryBuildingId() << " -> " << roomNumberDst
<< " hli.sampleTime=" << hli.sampleTime();
<< " hli.originatorBuildingId=" << hli.originatorBuildingId << " -> " << buildingIdSrc
<< " hli.originatorRoomId=" << hli.originatorRoomId << " -> " << roomNumberSrc
<< " hli.injuryBuildingId=" << hli.injuryBuildingId << " -> " << buildingIdDst
<< " hli.injuryRoomId=" << hli.injuryBuildingId << " -> " << roomNumberDst
<< " hli.sampleTime=" << hli.sampleTime;
int lineType = 2;
m_pdmDtc->chargeType(hli.chargeTypeId());
m_pdmDtc->chargeType(hli.chargeTypeId);
lineType = m_pdmDtc->getChargeTypeSpecialProperty(hli.chargeTypeId(), 0, 0);
// DDS enums are enum class; lineType is int.
lineType = static_cast<int>(m_pdmDtc->getChargeTypeSpecialProperty(hli.chargeTypeId, 0, 0));
m_connection->playerHit(hli.id(), partSrc.id(), partDst.id(), originatorSrc, injuryDest, buildingIdSrc,
roomNumberSrc, buildingIdDst, roomNumberDst, lineType, hli.sampleTime());
m_connection->playerHit(hli.id, partSrc.id, partDst.id, originatorSrc, injuryDest, buildingIdSrc,
roomNumberSrc, buildingIdDst, roomNumberDst, lineType, hli.sampleTime);
}
void BuildingViewerDdsController::onPartyChanged(const ParticipantManagement::Party& party, DataModification modType)
@@ -1046,7 +1047,7 @@ void BuildingViewerDdsController::onPartyChanged(const ParticipantManagement::Pa
int sizeL = LtsUtils::OperatorSettings::getInstance()
->value(QStringLiteral("BgViewer"), QStringLiteral("PlayerSymbolSize"), 20)
.toInt();
updatePlayerSymbols(sizeL, party.id());
updatePlayerSymbols(sizeL, party.id);
syncTeams();
}
@@ -1063,35 +1064,35 @@ void BuildingViewerDdsController::onPositionChanged(const ParticipantManagement:
int buildingID = -1;
int roomNumber = -1;
auto itId2Number = m_roomId2RoomNumber.constFind(position.buildingId());
auto itId2Number = m_roomId2RoomNumber.constFind(position.buildingId);
if (itId2Number != m_roomId2RoomNumber.constEnd())
{
const auto& mapRooms = itId2Number.value();
const auto itRoom = mapRooms.constFind(position.roomId());
const auto itRoom = mapRooms.constFind(position.roomId);
if (itRoom != mapRooms.constEnd())
{
buildingID = position.buildingId();
buildingID = position.buildingId;
roomNumber = itRoom.value();
}
else
{
WARNING_LOG(m_logger) << "onPositionChanged: Room id can not be mapped! Building id: "
<< position.buildingId() << ", room id: " << position.roomId();
<< position.buildingId << ", room id: " << position.roomId;
}
}
if ((roomNumber < 0) && (buildingID <= 0) && (position.buildingId() > 0) &&
(position.reportingSource() == Core::PositionReportingSource::Ops ||
position.reportingSource() == Core::PositionReportingSource::Wls))
if ((roomNumber < 0) && (buildingID <= 0) && (position.buildingId > 0) &&
(position.reportingSource == Core::PositionReportingSource::Ops ||
position.reportingSource == Core::PositionReportingSource::Wls))
{
buildingID = position.buildingId();
buildingID = position.buildingId;
}
const int playerId = position.participantId();
const int playerId = position.participantId;
auto it = m_lastPositionTime.find(playerId);
if (it == m_lastPositionTime.end())
{
m_lastPositionTime.insert(playerId, position.sampleTime());
m_lastPositionTime.insert(playerId, position.sampleTime);
if (isOutdatedPosition(position))
m_connection->setPlayerVisible(playerId, false);
}
@@ -1099,7 +1100,7 @@ void BuildingViewerDdsController::onPositionChanged(const ParticipantManagement:
{
if (isOutdatedPosition(it.value()) && !isOutdatedPosition(position))
m_connection->setPlayerVisible(playerId, true);
it.value() = position.sampleTime();
it.value() = position.sampleTime;
}
if (buildingID <= 0 && roomNumber <= 0)
@@ -1118,8 +1119,8 @@ void BuildingViewerDdsController::onPositionChanged(const ParticipantManagement:
return;
}
m_connection->playerPlace(position.participantId(), toRelative3D(position.pos()), buildingID, roomNumber,
position.reportingSource());
m_connection->playerPlace(position.participantId, toRelative3D(position.pos), buildingID, roomNumber,
position.reportingSource);
}
void BuildingViewerDdsController::onParticipantGearEventChanged(const ParticipantManagement::ParticipantGearEvent& data,
@@ -1129,12 +1130,12 @@ void BuildingViewerDdsController::onParticipantGearEventChanged(const Participan
{
case DataModification::eAdded:
case DataModification::eModified: {
m_participantGearEvents[data.participantId()] = data.sampleTime();
m_participantGearEvents[data.participantId] = data.sampleTime;
break;
}
case DataModification::eRemoved: {
const int playerId = data.participantId();
const int playerId = data.participantId;
m_participantGearEvents.remove(playerId);
m_connection->playerUpdatePlayerSymbol(playerId, buildPlayerSymbolFilePath(playerId, cColorSymbolId));
break;
@@ -1158,44 +1159,44 @@ void BuildingViewerDdsController::createParticipant(const ParticipantManagement:
createPlayerSymbols(participant, sizeL);
m_connection->playerCreate(participant.id(), participant.partyId(), buildPlayerSymbolFilePath(participant.id()),
toRelative3D(position.pos()), position.buildingId(),
m_roomId2RoomNumber.value(position.buildingId()).value(position.roomId()),
position.reportingSource());
m_connection->playerCreate(participant.id, participant.partyId, buildPlayerSymbolFilePath(participant.id),
toRelative3D(position.pos), position.buildingId,
m_roomId2RoomNumber.value(position.buildingId).value(position.roomId),
position.reportingSource);
const bool isOutdated = isOutdatedPosition(position);
const int participantId = participant.id();
const int participantId = participant.id;
const bool isValid =
(position.buildingId() > 0 && m_roomId2RoomNumber.value(position.buildingId()).value(position.roomId()) > 0);
(position.buildingId > 0 && m_roomId2RoomNumber.value(position.buildingId).value(position.roomId) > 0);
m_connection->setPlayerVisible(participantId, (!isOutdated && isValid));
m_lastPositionTime.insert(participantId, position.sampleTime());
m_lastPositionTime.insert(participantId, position.sampleTime);
}
void BuildingViewerDdsController::createBoobyTrap(const AreaEffectSimulation::BoobyTrap& trap, int sizeL)
{
if (trap.effectStateId() != AreaEffectSimulation::AesEffectState::EsActivated &&
trap.effectStateId() != AreaEffectSimulation::AesEffectState::EsPrepared)
if (trap.effectStateId != AreaEffectSimulation::AesEffectState::EsActivated &&
trap.effectStateId != AreaEffectSimulation::AesEffectState::EsPrepared)
return;
ParticipantManagement::Participant participant;
if (trap.partyId().has_value())
participant.partyId() = trap.partyId().get();
participant.designator() = trap.name();
participant.designator() = trap.name();
participant.id() = trap.id() + 990000;
participant.sampleTime() = trap.sampleTime();
participant.symbol() = "AP6D|CMPL|10011500002104000000";
if (trap.partyId.has_value())
participant.partyId = trap.partyId.get();
participant.designator = trap.name;
participant.designator = trap.name;
participant.id = trap.id + 990000;
participant.sampleTime = trap.sampleTime;
participant.symbol = "AP6D|CMPL|10011500002104000000";
createPlayerSymbols(participant, sizeL);
Core::GeoPosition pos;
pos.lat() = trap.impactPosition().lat();
pos.lon() = trap.impactPosition().lon();
pos.lat = trap.impactPosition.lat;
pos.lon = trap.impactPosition.lon;
DEBUG_LOG(m_logger) << "Try create Booby trap with id " << trap.id() << " internal id " << participant.id();
DEBUG_LOG(m_logger) << "Try create Booby trap with pos " << pos.lat() << " " << pos.lon();
m_connection->playerCreate(participant.id(), participant.partyId(), buildPlayerSymbolFilePath(participant.id()),
DEBUG_LOG(m_logger) << "Try create Booby trap with id " << trap.id << " internal id " << participant.id;
DEBUG_LOG(m_logger) << "Try create Booby trap with pos " << pos.lat << " " << pos.lon;
m_connection->playerCreate(participant.id, participant.partyId, buildPlayerSymbolFilePath(participant.id),
toRelative3D(pos), -1, -1, Core::PositionReportingSource::External);
m_connection->setPlayerVisible(participant.id(), true);
m_connection->setPlayerVisible(participant.id, true);
}
void BuildingViewerDdsController::updatePlayerSymbols(const int sizeL, const int forParty)
@@ -1207,7 +1208,7 @@ void BuildingViewerDdsController::updatePlayerSymbols(const int sizeL, const int
if (!isValidParticipant(participant))
return;
if (forParty == -1 || participant.partyId() == forParty)
if (forParty == -1 || participant.partyId == forParty)
createPlayerSymbols(participant, sizeL);
};
m_ppmDtc->participants(cb);
@@ -1219,9 +1220,9 @@ void BuildingViewerDdsController::createPlayerSymbols(const ParticipantManagemen
SymbolInfo symbolinfo;
for (int i = 0; i < m_vecFlashColors.size(); ++i)
{
Q_ASSERT(participant.id() != 0);
symbolinfo.participantId = participant.id();
symbolinfo.strPathToSymbolFile = buildPlayerSymbolFilePath(participant.id(), i);
Q_ASSERT(participant.id != 0);
symbolinfo.participantId = participant.id;
symbolinfo.strPathToSymbolFile = buildPlayerSymbolFilePath(participant.id, i);
symbolinfo.color = m_vecFlashColors.at(i);
symbolinfo.useThisSymbolNow = !symbolinfo.color.isValid();
createSymbolResultWatcher(participant, symbolinfo, sizeL);
@@ -1304,7 +1305,7 @@ void BuildingViewerDdsController::reCheckHitLine()
for (const auto& hli : hitMap)
{
if (hli.sampleTime() < (m_session->partitionTime() - 3000))
if (hli.sampleTime < (m_session->partitionTime() - 3000))
onBuildingHitLineInfoChanged(hli, DataModification::eAdded);
}
}
@@ -1332,17 +1333,17 @@ void BuildingViewerDdsController::updateBuildingRoomNames(
const InfrastructureManagement::MainStructureElement& building)
{
const std::vector<InfrastructureManagement::StructureElement>& vecElements = building.elements();
const std::vector<InfrastructureManagement::StructureElement>& vecElements = building.elements;
int32_t buildingDatabaseId = building.id();
int32_t buildingDatabaseId = building.id;
QString featureID = BuildingViewer::databaseId2FeatureId(buildingDatabaseId);
for (const auto& se : vecElements)
{
if (se.structureElementTypeId() == InfrastructureManagement::StructureElementType::Building)
m_connection->excSetBuildingDisplayName(featureID, QString::fromStdString(se.displayName()));
if (se.structureElementTypeId() == InfrastructureManagement::StructureElementType::Room)
m_connection->excSetRoomDisplayName(featureID, QString::number(se.mountingPointId()),
QString::fromStdString(se.displayName()));
if (se.structureElementTypeId == InfrastructureManagement::StructureElementType::Building)
m_connection->excSetBuildingDisplayName(featureID, QString::fromStdString(se.displayName));
if (se.structureElementTypeId == InfrastructureManagement::StructureElementType::Room)
m_connection->excSetRoomDisplayName(featureID, QString::number(se.mountingPointId),
QString::fromStdString(se.displayName));
}
}
@@ -1429,25 +1430,25 @@ void BuildingViewerDdsController::onBuildingStateChanged(const Buildings::Buildi
return;
QMap<int, int> roomDestructions;
for (const Buildings::RoomState& rs : data.roomStates())
for (const Buildings::RoomState& rs : data.roomStates)
{
roomDestructions.insert(rs.mountingPointId(), rs.damagePercent());
roomDestructions.insert(rs.mountingPointId, rs.damagePercent);
}
m_connection->buildingHit(data.id(), data.id(), data.damagePercent(), roomDestructions);
m_connection->buildingHit(data.id, data.id, data.damagePercent, roomDestructions);
}
void BuildingViewerDdsController::onBuildingHitLineInfoChanged(const Buildings::BuildingHitLineInfo& hli,
DataModification modType)
{
int topidId = static_cast<int>(hli.id());
int topidId = static_cast<int>(hli.id);
DEBUG_LOG(m_logger) << "onBuildingHitLineInfoChanged: " << hli;
const QString& strFeatureID = BuildingViewer::databaseId2FeatureId(hli.buildingId());
const QString& strFeatureID = BuildingViewer::databaseId2FeatureId(hli.buildingId);
if (!m_viewerInterface->isViewOpen(strFeatureID.toStdString()))
{
DEBUG_LOG(m_logger) << "building not opened: hli.buildingId()=" << hli.buildingId();
DEBUG_LOG(m_logger) << "building not opened: hli.buildingId()=" << hli.buildingId;
return;
}
@@ -1457,28 +1458,28 @@ void BuildingViewerDdsController::onBuildingHitLineInfoChanged(const Buildings::
if (isRemove)
{
DEBUG_LOG(m_logger) << "onBuildingHitLineInfoChanged: remove ";
QVector<BuildingHit>& bhl = m_buildingHits[hli.buildingId()];
QVector<BuildingHit>& bhl = m_buildingHits[hli.buildingId];
auto it = std::find_if(bhl.begin(), bhl.end(), [hli](const BuildingHit& bh) { return (bh.id == hli.id()); });
auto it = std::find_if(bhl.begin(), bhl.end(), [hli](const BuildingHit& bh) { return (bh.id == hli.id); });
if (it != bhl.end())
{
DEBUG_LOG(m_logger) << "bhl.erase(it)";
bhl.erase(it);
}
m_connection->removeRoomHit(hli.id());
m_connection->removeRoomHit(hli.id);
return;
}
else
{
BuildingHit bh;
bh.id = hli.id();
bh.sampleTime = hli.sampleTime();
bh.originatorParticipantId = hli.originatorParticipantId();
bh.chargeTypeId = hli.chargeTypeId();
bh.id = hli.id;
bh.sampleTime = hli.sampleTime;
bh.originatorParticipantId = hli.originatorParticipantId;
bh.chargeTypeId = hli.chargeTypeId;
bool contains = false;
for (const auto& it : m_buildingHits[hli.buildingId()])
for (const auto& it : m_buildingHits[hli.buildingId])
{
if (it.id == bh.id)
contains = true;
@@ -1486,13 +1487,13 @@ void BuildingViewerDdsController::onBuildingHitLineInfoChanged(const Buildings::
if (!contains)
{
m_buildingHits[hli.buildingId()].push_back(bh);
m_buildingHits[hli.buildingId].push_back(bh);
}
}
int lineType = 2;
m_connection->roomHit(topidId, hli.originatorParticipantId(), hli.buildingId(), hli.hitOnRoomId(),
toRelative3D(hli.originatorPos()), lineType, isRemove ? 0 : hli.sampleTime());
m_connection->roomHit(topidId, hli.originatorParticipantId, hli.buildingId, hli.hitOnRoomId,
toRelative3D(hli.originatorPos), lineType, isRemove ? 0 : hli.sampleTime);
}
void BuildingViewerDdsController::onCleanupBuildingHitlines()
@@ -1509,33 +1510,33 @@ void BuildingViewerDdsController::onCleanupBuildingHitlines()
void BuildingViewerDdsController::onMainStructureElementChanged(
const InfrastructureManagement::MainStructureElement& mse, DataModification modType)
{
if (!isBuildingKnown(mse.id()))
if (!isBuildingKnown(mse.id))
return;
switch (modType)
{
case DataModification::eAdded:
case DataModification::eModified: {
if (mse.modelId() != 0 && m_ismDtc->isElementAssignedToExercise(mse, m_exerciseId))
if (mse.modelId != 0 && m_ismDtc->isElementAssignedToExercise(mse, m_exerciseId))
{
DEBUG_LOG(m_logger) << "m_buildingHeight.insert id=" << mse.id() << " z=" << mse.geoPosition().z();
m_buildingHeight.insert(mse.id(), mse.geoPosition().z());
DEBUG_LOG(m_logger) << "m_buildingHeight.insert id=" << mse.id << " z=" << mse.geoPosition.z;
m_buildingHeight.insert(mse.id, mse.geoPosition.z);
QHash<int, int> roomId2RoomNumber;
for (const InfrastructureManagement::StructureElement& se : mse.elements())
for (const InfrastructureManagement::StructureElement& se : mse.elements)
{
if (se.structureElementTypeId() != InfrastructureManagement::StructureElementType::Room)
if (se.structureElementTypeId != InfrastructureManagement::StructureElementType::Room)
continue;
roomId2RoomNumber[se.id()] = se.mountingPointId();
roomId2RoomNumber[se.id] = se.mountingPointId;
}
m_roomId2RoomNumber[mse.id()] = roomId2RoomNumber;
m_roomId2RoomNumber[mse.id] = roomId2RoomNumber;
updateBuildingRoomNames(mse);
}
break;
}
case DataModification::eRemoved:
m_roomId2RoomNumber.remove(mse.id());
m_buildingHeight.remove(mse.id());
m_roomId2RoomNumber.remove(mse.id);
m_buildingHeight.remove(mse.id);
break;
}
}
@@ -89,7 +89,7 @@ class BuildingViewerDdsController : public QObject
inline bool isOutdatedPosition(const ParticipantManagement::ParticipantPosition& position) const
{
return position.participantId() <= 0 || isOutdatedPosition(position.sampleTime());
return position.participantId <= 0 || isOutdatedPosition(position.sampleTime);
}
bool calcBaseCoordinate(const QMap<qint32, InfrastructureManagement::MainStructureElement>& mseMap);
@@ -22,7 +22,8 @@ int32_t featureId2DatabaseId(const QString &strFeatureId)
if (!strFeatureId.startsWith(gStrFeatureIdPrefix))
return -1;
bool isOk = false;
int32_t buildingDatabaseId = strFeatureId.midRef(gStrFeatureIdPrefix.size()).toInt(&isOk);
// Qt6: QString::midRef removed; mid() returns the same substring by value.
int32_t buildingDatabaseId = strFeatureId.mid(gStrFeatureIdPrefix.size()).toInt(&isOk);
return isOk ? buildingDatabaseId : -1;
}
}
@@ -4,6 +4,7 @@
#include "bdv_edit_item.h"
#include "ui_bdv_building_edit.h"
#include <NGLLogger/NGLLoggerBootstrap.h>
#include <Buildings/bld.hpp>
#include <Buildings/bld_ftc.h>
@@ -16,7 +17,8 @@ namespace BuildingViewer
{
BuildingEdit::BuildingEdit(QWidget* parent)
: LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::OkApplyCancel),
m_requestHelper(new LtsUtils::RequestHelper(this)), m_ui(new Ui::BuildingEdit)
m_requestHelper(new LtsUtils::RequestHelper(this)), m_ui(new Ui::BuildingEdit),
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("BuildingViewer.BuildingEdit"))
{
m_ui->setupUi(this);
@@ -69,7 +71,7 @@ bool BuildingEdit::init(int32_t buildingDatabaseId,
m_bldFtc = bldFtc;
InfrastructureManagement::MainStructureElement building = m_ismDtc->mainStructureElement(m_buildingDatabaseId);
m_buildingId = building.id();
m_buildingId = building.id;
buildModel();
m_buildingName = m_model->getBuildingName();
@@ -158,14 +160,14 @@ bool BuildingEdit::apply()
{
m_requestHelper->addRequest([this, fortifyFactors]() {
Buildings::SetFortifyFactorRequest fortifyRequest;
fortifyRequest.buildingId(m_buildingDatabaseId);
fortifyRequest.buildingId = m_buildingDatabaseId;
fortifyRequest.fortifyFactors().reserve(fortifyFactors.size());
fortifyRequest.fortifyFactors.reserve(fortifyFactors.size());
for (const auto& e : fortifyFactors)
{
DEBUG_LOG(m_logger) << "push_back= databaseId=" << e.structureElementId()
<< " fortifyFactor=" << e.fortifyFactor();
fortifyRequest.fortifyFactors().push_back(
fortifyRequest.fortifyFactors.push_back(
Buildings::FortifyFactor(e.structureElementId(), e.fortifyFactor()));
}
@@ -184,12 +186,12 @@ bool BuildingEdit::apply()
for (const auto& treeItem : displayNames)
{
for (const auto& room : building.elements())
for (const auto& room : building.elements)
{
if (room.id() == treeItem.structureElementId())
if (room.id == treeItem.structureElementId())
{
auto copy = room;
copy.displayName(treeItem.displayName().toStdString());
copy.displayName = treeItem.displayName().toStdString();
vecModifiedRooms.push_back(copy);
break;
}
@@ -231,7 +233,7 @@ void BuildingEdit::slotMainStructureElementChanged(const InfrastructureManagemen
if (modType == DataModification::eRemoved)
return;
if (mse.id() == m_buildingDatabaseId)
if (mse.id == m_buildingDatabaseId)
{
slotHandleExternalDdsChange();
@@ -243,7 +245,7 @@ void BuildingEdit::slotBuildingStateChanged(const Buildings::BuildingState& stat
if (modType == DataModification::eRemoved)
return;
if (state.id() == m_buildingDatabaseId)
if (state.id == m_buildingDatabaseId)
{
slotHandleExternalDdsChange();
@@ -265,11 +267,11 @@ bool BuildingEdit::sendBuildingStateRequest(ProjectDataManagement::Vulnerability
buildings.resize(1);
Buildings::SetBuildingStatesRequest requestData;
building.buildingId(m_buildingId);
building.roomIds().set(structureElementIds);
building.buildingId = m_buildingId;
building.roomIds.set(structureElementIds);
buildings[0] = building;
requestData.buildings(buildings);
requestData.vulnerabilityState(state);
requestData.buildings = buildings;
requestData.vulnerabilityState = state;
DEBUG_LOG(m_logger) << Q_FUNC_INFO << "currentData: " << state;
@@ -17,11 +17,13 @@ namespace BuildingViewer
BuildingEditModel::BuildingEditModel(QObject* parent,
const std::shared_ptr<InfrastructureManagement::Interface::Dtc>& ismDtc,
const std::shared_ptr<Buildings::Interface::Dtc>& bldDtc)
: NGLTreeModel(parent, new NGLTreeItem(QVariant()), ,
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()){
: NGLTreeModel(parent, new NGLTreeItem(QVariant()), {
tr("Selected Building"), QStringLiteral("Name (DEBUG)"),
QStringLiteral("MountingPointId (DEBUG)"), QStringLiteral("StructureElementId (DEBUG)"),
tr("Fortify Factor"), tr("Damage Percent")}),
// m_logger moved out of the NGLTreeModel(...) call (it is a member init);
// getNGLLogger() returns the INGLLogger& the reference member binds to.
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("BuildingViewer.BuildingEditModel")),
m_ismDtc(ismDtc), m_bldDtc(bldDtc), m_buildingName(QString())
{
}
@@ -125,11 +127,11 @@ bool BuildingEditModel::init(int32_t mseId)
int rootId = 0;
qint32 mapId = 0;
const std::vector<InfrastructureManagement::StructureElement>& vecElements = building.elements();
const std::vector<InfrastructureManagement::StructureElement>& vecElements = building.elements;
for (const auto& se : vecElements)
{
DEBUG_LOG(m_logger) << "se: " << se;
if (se.structureElementTypeId() == InfrastructureManagement::StructureElementType::Building)
if (se.structureElementTypeId == InfrastructureManagement::StructureElementType::Building)
{
BuildingViewer::TreeItem rootItemBuilding(se);
rootName = rootItemBuilding.name();
@@ -142,12 +144,12 @@ bool BuildingEditModel::init(int32_t mseId)
for (const auto& se : vecElements)
{
DEBUG_LOG(m_logger) << "se: =" << se;
if (se.structureElementTypeId() == InfrastructureManagement::StructureElementType::Floor)
if (se.structureElementTypeId == InfrastructureManagement::StructureElementType::Floor)
{
BuildingViewer::TreeItem itemRoom(se);
itemRoom.setSuperior(rootId);
lookupFloorId2TreeId[se.id()] = mapId;
lookupFloorId2TreeId[se.id] = mapId;
treemap[mapId++] = itemRoom;
}
}
@@ -158,20 +160,20 @@ bool BuildingEditModel::init(int32_t mseId)
auto bs = m_bldDtc->buildingState(mseId);
QMap<int32_t, Buildings::RoomState> roomStates;
for (const auto& e : bs.roomStates())
roomStates[e.id()] = e;
for (const auto& e : bs.roomStates)
roomStates[e.id] = e;
for (const auto& se : vecElements)
{
if (se.structureElementTypeId() == InfrastructureManagement::StructureElementType::Room)
if (se.structureElementTypeId == InfrastructureManagement::StructureElementType::Room)
{
double fortifyFactor = 1.0;
qint32 damagePercent = bs.damagePercent();
if (roomStates.contains(se.id()))
qint32 damagePercent = bs.damagePercent;
if (roomStates.contains(se.id))
{
fortifyFactor = roomStates[se.id()].fortifyFactor();
damagePercent = roomStates[se.id()].damagePercent();
fortifyFactor = roomStates[se.id].fortifyFactor;
damagePercent = roomStates[se.id].damagePercent;
}
BuildingViewer::TreeItem itemRoom(se, fortifyFactor, damagePercent);
@@ -179,13 +181,13 @@ bool BuildingEditModel::init(int32_t mseId)
try
{
int32_t floorID = se.path()[1];
int32_t floorID = se.path[1];
itemRoom.setSuperior(lookupFloorId2TreeId[floorID]);
}
catch (const std::out_of_range& e)
{
WARNING_LOG(m_logger) << "Caught exception while trying to get superior id for building " << rootName
<< " with room with mounting point id: " << se.mountingPointId() << ": "
<< " with room with mounting point id: " << se.mountingPointId << ": "
<< e.what();
return false;
}
@@ -1,6 +1,7 @@
#include "bdv_thread_video_exporter.h"
#include <NGLLogger/NGLLoggerBootstrap.h>
#include "bdv_replay_handler.h"
@@ -11,7 +12,9 @@
namespace BuildingViewer
{
VideoExporter::VideoExporter(QObject* parent) : QObject(parent)
VideoExporter::VideoExporter(QObject* parent)
: QObject(parent),
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("BuildingViewer.VideoExporter"))
{
DEBUG_LOG(m_logger) << "ThreadVideoExporter has been created";
}
@@ -1,6 +1,7 @@
#include "bdv_topic_replay_interface.h"
#include <NGLLogger/NGLLoggerBootstrap.h>
#include "bdv_replay_handler.h"
#include "bdv_thread_video_exporter.h"
@@ -26,7 +27,8 @@ namespace BuildingViewer
{
TopicReplayInterface::TopicReplayInterface(BgViewerController* bgvController, LtsSession::LtsSession* session)
: m_bgvController(bgvController), m_session(session)
: m_bgvController(bgvController), m_session(session),
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("BuildingViewer.TopicReplayInterface"))
{
session->getForeignGuiInterface<SituationReplay::ForeignGuiInterface>(m_replayIfc);
}
@@ -240,20 +242,20 @@ bool TopicReplayInterface::exportBuildings(const QVector<int>& buildingIds) cons
for (const int buildingId : buildingIds)
{
const auto mse = ismDtc->mainStructureElement(buildingId);
if (mse.id() != buildingId)
if (mse.id != buildingId)
{
WARNING_LOG(m_logger) << "Could not find MainStructureElement for building with id " << buildingId
<< " - skipping";
continue;
}
const QString fnIve = QString::fromStdString(mse.name()) + QStringLiteral(".flt.ive");
const QString fnXml = QString::fromStdString(mse.name()) + QStringLiteral(".flt.xml");
const QString fnIve = QString::fromStdString(mse.name) + QStringLiteral(".flt.ive");
const QString fnXml = QString::fromStdString(mse.name) + QStringLiteral(".flt.xml");
if (!copyFile(fnIve, modelPath, outputPath) || !copyFile(fnXml, modelPath, outputPath))
return false;
bi.name = QString::fromStdString(mse.name());
bi.position = LtsUtils::QPoint3D(mse.geoPosition().lon(), mse.geoPosition().lat(), mse.geoPosition().z());
bi.angleDegree = mse.angle();
bi.id = mse.id();
bi.name = QString::fromStdString(mse.name);
bi.position = LtsUtils::QPoint3D(mse.geoPosition.lon, mse.geoPosition.lat, mse.geoPosition.z);
bi.angleDegree = mse.angle;
bi.id = mse.id;
knownBuildings += bi;
}
@@ -2,6 +2,7 @@
#include "bdv_viewer_data_dialog.h"
#include <NGLLogger/NGLLoggerBootstrap.h>
#include "ui_bdv_viewer_data_dialog.h"
#include <LtsSession/lts_session_data.h>
@@ -12,6 +13,7 @@ namespace BuildingViewer
BgViewerDataViewDialog::BgViewerDataViewDialog(QWidget *parent)
: LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly)
, m_ui(new Ui::BgViewerDataViewDialog)
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("BuildingViewer.BgViewerDataViewDialog"))
{
m_ui->setupUi(this);
@@ -2,6 +2,7 @@
#include "bdv_viewer_data_view.h"
#include <NGLLogger/NGLLoggerBootstrap.h>
#include "ui_bdv_viewer_data_view.h"
#include "bdv_viewer_data_model.h"
@@ -15,6 +16,7 @@ BgViewerDataView::BgViewerDataView(QWidget *parent)
: QWidget(parent)
, m_ui(new Ui::BgViewerDataView)
, m_pModel(new BgViewerDataViewModel(this))
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("BuildingViewer.BgViewerDataView"))
{
m_ui->setupUi(this);
@@ -64,20 +64,20 @@ bool AssignCodificationDataTable::init(const std::shared_ptr<CodificationManagem
for (const ParticipantManagement::Party& party : std::as_const(userVisibleParties))
{
if (party.id() != 2 && party.id() != 3)
if (party.id != 2 && party.id != 3)
continue;
QString partyName;
if (party.id() == 2)
if (party.id == 2)
partyName = tr("OPFOR:");
else if (party.id() == 3)
else if (party.id == 3)
partyName = tr("BLUFOR:");
else
partyName = ParticipantManagement::trPartyName(party.name());
partyName = ParticipantManagement::trPartyName(party.name);
m_ui->partyLayout->addWidget(new QLabel(partyName, this), i, 0, 1, 1);
LtsWidgets::LtsComboBox* cb = new LtsWidgets::LtsComboBox(this);
cb->setProperty(QLatin1String("partyId").data(), party.id());
cb->setProperty(QLatin1String("partyId").data(), party.id);
m_tableVec.append(cb);
cb->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Preferred);
cb->addItem(QStringLiteral("---"), 0);
@@ -88,7 +88,7 @@ bool AssignCodificationDataTable::init(const std::shared_ptr<CodificationManagem
m_model->data(m_model->index(row, CodificationDataOverviewModel::Id), Qt::DisplayRole));
DEBUG_LOG(m_logger)
<< "Init Combobox[" << row << "]: PartyId: " << party.id() << " Identifier: "
<< "Init Combobox[" << row << "]: PartyId: " << party.id << " Identifier: "
<< m_model->data(m_model->index(row, CodificationDataOverviewModel::Identifier), Qt::DisplayRole)
.toString()
<< " CodTabId: "
@@ -105,7 +105,7 @@ bool AssignCodificationDataTable::init(const std::shared_ptr<CodificationManagem
.toInt();
DEBUG_LOG(m_logger) << "Assignment[" << row << "]: assignedPartyId: " << assignedPartyId;
if (party.id() == assignedPartyId)
if (party.id == assignedPartyId)
{
tableId =
m_model->data(m_model->index(row, CodificationDataOverviewModel::Id), Qt::DisplayRole).toInt();
@@ -121,12 +121,12 @@ void MountingPoint::init() {
}
QString MountingPoint::name() const {
// codegen exposes 'name' as public member
// Qt6: legacy codegen exposed name() as a method; new codegen exposes 'name' as a public member.
return QString::fromStdString(m_data.name);
}
QString MountingPoint::fileName() const {
// codegen exposes 'name' as public member
// Qt6: legacy codegen exposed name() as a method; new codegen exposes 'name' as a public member.
return QString::fromStdString(m_data.name);
}
@@ -84,17 +84,17 @@ void DetailedChartModel::onDynamicParticipantDataChanged(const ParticipantManage
{
Q_UNUSED(modType);
const ParticipantManagement::StateInformation &stateInfo = m_config.ppmDtc->youngestStateInformation(data.stateHistory());
const ParticipantManagement::StateInformation &stateInfo = m_config.ppmDtc->youngestStateInformation(data.stateHistory);
if (!m_config.participantIds.contains(data.participantId()) ||
stateInfo.vulnerabilityState() > ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill)
if (!m_config.participantIds.contains(data.participantId) ||
stateInfo.vulnerabilityState > ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill)
return;
for (auto it = m_participantStates.begin(); it != m_participantStates.end(); ++it)
it.value() -= data.participantId();
it.value() -= data.participantId;
m_participantStates[stateInfo.vulnerabilityState()] += data.participantId();
m_participantStates[stateInfo.vulnerabilityState] += data.participantId;
emit dataChanged(index(0, 0), index(rowCount() - 1, columnCount() - 1));
}
@@ -113,7 +113,7 @@ DetailedChartModel::DetailedChartModel(const AbstractChartModel::ChartConfig &co
auto cb = [this](const ParticipantManagement::DynamicParticipantData & data)
{
if (!m_config.participantIds.contains(data.participantId()))
if (!m_config.participantIds.contains(data.participantId))
return;
onDynamicParticipantDataChanged(data, DataModification::eAdded);
};
@@ -56,18 +56,18 @@ void SimpleChartModel::onDynamicParticipantDataChanged(const ParticipantManageme
{
Q_UNUSED(modType);
if (!m_config.participantIds.contains(data.participantId()))
if (!m_config.participantIds.contains(data.participantId))
return;
const ParticipantManagement::StateInformation &stateInfo = m_config.ppmDtc->youngestStateInformation(data.stateHistory());
const ParticipantManagement::StateInformation &stateInfo = m_config.ppmDtc->youngestStateInformation(data.stateHistory);
DEBUG_LOG(m_logger) << "Participant id = " << data.participantId();
DEBUG_LOG(m_logger) << "State Info Vulnerability = " << stateInfo.vulnerabilityState();
DEBUG_LOG(m_logger) << "Participant id = " << data.participantId;
DEBUG_LOG(m_logger) << "State Info Vulnerability = " << static_cast<int>(stateInfo.vulnerabilityState);
if (stateInfo.vulnerabilityState() < ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill)
setCombatReady(data.participantId());
if (stateInfo.vulnerabilityState < ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill)
setCombatReady(data.participantId);
else
setKilled(data.participantId());
setKilled(data.participantId);
emit dataChanged(index(0, 0), index(rowCount() - 1, columnCount() - 1));
}
@@ -76,7 +76,7 @@ SimpleChartModel::SimpleChartModel(const AbstractChartModel::ChartConfig &config
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
auto cb = [this](const ParticipantManagement::DynamicParticipantData & data)
{
if (!m_config.participantIds.contains(data.participantId()))
if (!m_config.participantIds.contains(data.participantId))
return;
onDynamicParticipantDataChanged(data, DataModification::eAdded);
};
@@ -160,10 +160,10 @@ bool CreateReportDialog::apply()
{
ParticipantManagement::ParticipantData data = m_participantModel->getParticipantData(index);
if (data.id() != 0 &&
data.equipmentNumber().has_value() &&
typeIds.contains(data.typeId()))
participantIds.insert(data.id());
if (data.id != 0 &&
data.equipmentNumber.has_value() &&
typeIds.contains(data.typeId))
participantIds.insert(data.id);
}
@@ -54,7 +54,7 @@ ReportDialog::ReportDialog(const AbstractChartModel::ChartConfig &config, QWidge
for (int32_t participantId :config.participantIds)
{
ParticipantManagement::Participant participant = config.ppmDtc->participant(participantId);
ParticipantManagement::TypeClass typeClass = config.ppmDtc->type(participant.typeId()).typeClass();
ParticipantManagement::TypeClass typeClass = config.ppmDtc->type(participant.typeId).typeClass;
participantIdsByTypeClass[typeClass] += participantId;
}
@@ -22,7 +22,7 @@ bool TypeModel::init()
{
m_ppmDtc->types([this](const ParticipantManagement::Type &type)
{
if (m_ppmDtc->isTypeInUse(type.id()))
if (m_ppmDtc->isTypeInUse(type.id))
insertRow(type);
});
@@ -33,7 +33,7 @@ int TypeModel::getTypeId(const QModelIndex &index) const
{
if (!indexIsValid(index))
return -1;
return m_vecData.at(index.row()).id();
return m_vecData.at(index.row()).id;
}
QVariant TypeModel::data(const QModelIndex &index, int role) const
@@ -46,9 +46,9 @@ QVariant TypeModel::data(const QModelIndex &index, int role) const
switch (index.column())
{
case 0:
return ParticipantManagement::toString(entry.typeClass());
return ParticipantManagement::toString(entry.typeClass);
case 1:
return QString::fromStdString(entry.name());
return QString::fromStdString(entry.name);
}
return QVariant();
}
@@ -56,8 +56,8 @@ QVariant TypeModel::data(const QModelIndex &index, int role) const
bool TypeModel::isFiltered(const ParticipantManagement::Type &data, DataModification modType) const
{
Q_UNUSED(modType);
return (data.typeClass() == ParticipantManagement::TypeClass::Unit ||
data.typeClass() == ParticipantManagement::TypeClass::SupportUnit);
return (data.typeClass == ParticipantManagement::TypeClass::Unit ||
data.typeClass == ParticipantManagement::TypeClass::SupportUnit);
}
}
@@ -91,7 +91,10 @@ ADD_INTERFACE_LIBRARY(PpmDataPluginInterface
svcPpmCommon
)
IF(Qt5WebEngineWidgets_VERSION VERSION_GREATER 5.7.9)
# Qt6 Migration: legacy guarded on Qt5WebEngineWidgets_VERSION > 5.7.9; the
# Qt6 equivalent is that the Qt6::WebEngineWidgets target exists (consumer
# plugins are additionally gated by BUILD_PLUGINS_PARTICIPANT_ORG_CHART).
IF(TARGET Qt6::WebEngineWidgets)
#
# Combat Power Gui Plugin Interface
#
@@ -6,7 +6,7 @@
#
ADD_SUBDIRECTORY(Common)
# MSDL requires XmlPatterns - skip for Qt6 migration baseline
# MSDL re-implemented without Qt XmlPatterns (Qt6::Xml + XercesC/xsdc++ + xmllint)
IF(BUILD_PLUGINS_MSDL)
ADD_SUBDIRECTORY(MSDL)
ENDIF()
@@ -21,7 +21,7 @@ ADD_SUBDIRECTORY(ParticipantSelection)
ADD_SUBDIRECTORY(ParticipantTemplates)
ADD_SUBDIRECTORY(PartyEdit)
ADD_SUBDIRECTORY(PpmComboBox)
# Saab requires XmlPatterns - skip for Qt6 migration baseline
# Saab re-implemented without Qt XmlPatterns (Qt6::Xml only)
IF(BUILD_PLUGINS_SAAB)
ADD_SUBDIRECTORY(Saab)
ENDIF()
@@ -79,6 +79,9 @@ INSTALL_SHARED_FILES(zwmsmsdl_SRCS
WS
)
# .ui files live in the ui/ subdirectory; tell AUTOUIC where to find them
set(CMAKE_AUTOUIC_SEARCH_PATHS ${CMAKE_CURRENT_SOURCE_DIR}/ui)
NGL_WRAP_UI(zwmsmsdl_SRCS ${zwmsmsdl_UICS})
NGL_ADD_LIBRARY2(WS zwmsmsdl SHARED ${zwmsmsdl_SRCS} ${zwmsmsdl_UICS} ${zwmsmsdl_IDLS})
NGL_TARGET_INCLUDE_DIRECTORIES(zwmsmsdl
@@ -93,7 +96,6 @@ if(QT6_GUI_AVAILABLE)
PRIVATE
${Qt6_Gui}
Qt6::Xml
Qt6::XmlPatterns
XercesC::XercesC
PUBLIC
svcPpmCommon
@@ -184,7 +184,7 @@ msdl_1::MilitaryScenarioType::ForceSides_type Private::createTagForceSides(const
for (const ParticipantManagement::Party &party : mapForces)
{
if (party.id() == 0 || party.id() == 1)
if (party.id == 0 || party.id == 1)
continue;
QString obHaStr = QUuid::createUuid().toString();
@@ -202,7 +202,7 @@ msdl_1::MilitaryScenarioType::ForceSides_type Private::createTagForceSides(const
const ParticipantManagement::Party &party = itForce.value();
msdl_1::ForceSideType::ObjectHandle_type obHaTy(strUUID.toStdString().c_str());
msdl_1::ForceSideType::ForceSideName_type foSiNaTy(party.name().c_str());
msdl_1::ForceSideType::ForceSideName_type foSiNaTy(party.name.c_str());
msdl_1::ForceSideType foSiTy(obHaTy, foSiNaTy);
@@ -218,7 +218,7 @@ msdl_1::MilitaryScenarioType::ForceSides_type Private::createTagForceSides(const
ParticipantManagement::Role role = itRelationship.value().role();
ParticipantManagement::Role role = itRelationship.value().role;
msdl_1::ForceSideType::Associations_type::Association_type::Relationship_type relType = msdl_1::ForceSideType::Associations_type::Association_type::Relationship_type::UNK;
if (role == ParticipantManagement::Role::Enemy)
@@ -238,7 +238,7 @@ msdl_1::MilitaryScenarioType::ForceSides_type Private::createTagForceSides(const
foSiTy.Associations(asType);
foSiSe.push_back(foSiTy);
mapForceHandles[party.id()] = strUUID;
mapForceHandles[party.id] = strUUID;
}
return foType;
@@ -315,7 +315,7 @@ msdl_1::MilitaryScenarioType::Organizations_type::Units_type Private::createTagU
QString obHaStr = QUuid::createUuid().toString();
obHaStr = obHaStr.mid(1, obHaStr.size() - 2);
mapParticipantsUUIDs[participant.id()] = obHaStr.toStdString();
mapParticipantsUUIDs[participant.id] = obHaStr.toStdString();
}
unitsType unitsTy;
@@ -326,16 +326,16 @@ msdl_1::MilitaryScenarioType::Organizations_type::Units_type Private::createTagU
for (const ParticipantManagement::Participant &participant : mapParticipants)
{
if (participant.partyId() != it.key())
if (participant.partyId != it.key())
continue;
if (participant.isDeleted())
if (participant.isDeleted)
continue;
forceRelationDataType foReDaTy;
forceRelationChoiceType foReChTy = forceRelationChoiceType::FORCE_SIDE;
if (participant.superiorId() == 0)
if (participant.superiorId == 0)
{
foReChTy = forceRelationChoiceType::FORCE_SIDE;
@@ -346,12 +346,12 @@ msdl_1::MilitaryScenarioType::Organizations_type::Units_type Private::createTagU
{
foReChTy = forceRelationChoiceType::UNIT;
msdl_1::CommandRelationType::CommandingSuperiorHandle_type handle(mapParticipantsUUIDs.value(participant.superiorId()));
msdl_1::CommandRelationType::CommandingSuperiorHandle_type handle(mapParticipantsUUIDs.value(participant.superiorId));
forceRelationDataType::CommandRelation_type cmdRelation(handle, msdl_1::CommandRelationType::CommandRelationshipType_type::TACON);
foReDaTy.CommandRelation(cmdRelation);
}
unitType::ObjectHandle_type unObHaTy(mapParticipantsUUIDs.value(participant.id()));
unitType::ObjectHandle_type unObHaTy(mapParticipantsUUIDs.value(participant.id));
unitType::SymbolIdentifier_type syIdTy = "S--------------";
relationsType::ForceRelation_type foReTy(foReChTy, foReDaTy);
@@ -360,7 +360,7 @@ msdl_1::MilitaryScenarioType::Organizations_type::Units_type Private::createTagU
unitType unitTy(unObHaTy, syIdTy, reTy);
unitTy.SymbolIdentifier(syIdTy);
unitType::Name_type naTy(participant.designator().c_str());
unitType::Name_type naTy(participant.designator.c_str());
unitTy.Name(naTy);
unSe.push_back(unitTy);
@@ -389,16 +389,16 @@ msdl_1::MilitaryScenarioType::Organizations_type::Equipment_type Private::create
for (const ParticipantManagement::Participant &participant : mapParticipants)
{
if (participant.partyId() != partyId)
if (participant.partyId != partyId)
continue;
if (participant.isDeleted())
if (participant.isDeleted)
continue;
ownerDataType::UnitOwnerHandle_type foOwHaTy;
foOwHaTy = mapParticipantsUUIDs.value(participant.id()).c_str();
foOwHaTy = mapParticipantsUUIDs.value(participant.id).c_str();
ownerDataType owDaTy;
owDaTy.UnitOwnerHandle(foOwHaTy);
@@ -409,11 +409,11 @@ msdl_1::MilitaryScenarioType::Organizations_type::Equipment_type Private::create
auto vecDISEntities = mapTypes.value(participant.typeId()).disEntities();
auto vecDISEntities = mapTypes.value(participant.typeId).disEntities;
if (!vecDISEntities.size())
{
WARNING_LOG(logger) << "Participant id " << participant.id()
<< " belongs to a type id " << participant.typeId() << " which has no DIS id! Skipping export of participant!";
WARNING_LOG(logger) << "Participant id " << participant.id
<< " belongs to a type id " << participant.typeId << " which has no DIS id! Skipping export of participant!";
continue;
}
@@ -425,9 +425,9 @@ msdl_1::MilitaryScenarioType::Organizations_type::Equipment_type Private::create
coordDataType::GCC_type::X_type x(mapParticipantPositions[participant.id()].pos().lon());
coordDataType::GCC_type::X_type y(mapParticipantPositions[participant.id()].pos().lat());
coordDataType::GCC_type::Z_type z(mapParticipantPositions[participant.id()].pos().z());
coordDataType::GCC_type::X_type x(mapParticipantPositions[participant.id].pos.lon);
coordDataType::GCC_type::X_type y(mapParticipantPositions[participant.id].pos.lat);
coordDataType::GCC_type::Z_type z(mapParticipantPositions[participant.id].pos.z);
coordDataType::GCC_type utTy(x, y, z);
coordDataType coDaTy;
@@ -459,7 +459,7 @@ msdl_1::MilitaryScenarioType::Organizations_type::Equipment_type Private::create
eqItTy.ObjectHandle(eqObHaTy);
equipItemType::Name_type naTy(mapEquipment.value(mapTypes.value(participant.typeId()).equipmentTypeId()).name());
equipItemType::Name_type naTy(mapEquipment.value(mapTypes.value(participant.typeId).equipmentTypeId).name);
eqItTy.Name(naTy);
eqItTy.SymbolIdentifier(syIdTy);
@@ -22,21 +22,21 @@ ScenarioDataDialog::ScenarioDataDialog(QWidget *parent,
connect(mUi->m_pushButton_Cancel, &QPushButton::clicked, this, &ScenarioDataDialog::onButtonCancel);
ExerciseManagement::Exercise exercise = exmDtc->exercise(pSession->exerciseId());
mUi->m_lineEdit_ExerciseDescription->setText(LtsUtils::OperatorSettings::getInstance()->value(QStringLiteral("MSDL"), QStringLiteral("exerciseDescription"), QString::fromStdString(exercise.description())).toString());
mUi->m_lineEdit_ExerciseDescription->setText(LtsUtils::OperatorSettings::getInstance()->value(QStringLiteral("MSDL"), QStringLiteral("exerciseDescription"), QString::fromStdString(exercise.description)).toString());
QString strName(QString::fromStdString(exercise.name()));
QString strName(QString::fromStdString(exercise.name));
strName.remove(QLatin1Char(' '));
mUi->m_lineEdit_ExerciseName->setText(LtsUtils::OperatorSettings::getInstance()->value(QStringLiteral("MSDL"), QStringLiteral("exerciseName"), strName).toString());
mUi->m_lineEdit_Domain->setText(LtsUtils::OperatorSettings::getInstance()->value(QStringLiteral("MSDL"), QStringLiteral("exerciseDomain"), QString::fromStdString(exercise.partitionName())).toString());
mUi->m_lineEdit_Domain->setText(LtsUtils::OperatorSettings::getInstance()->value(QStringLiteral("MSDL"), QStringLiteral("exerciseDomain"), QString::fromStdString(exercise.partitionName)).toString());
mUi->m_lineEdit_Version->setText(LtsUtils::OperatorSettings::getInstance()->value(QStringLiteral("MSDL"), QStringLiteral("exerciseVersion"), QString()).toString());
mUi->m_lineEdit_Purpose->setText(LtsUtils::OperatorSettings::getInstance()->value(QStringLiteral("MSDL"), QStringLiteral("exercisePurpose"), QString()).toString());
OperatorManagement::User user = opmDtc->user(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
mUi->m_lineEdit_Type->setText(LtsUtils::OperatorSettings::getInstance()->value(QStringLiteral("MSDL"), QStringLiteral("pocType"), QString::fromStdString(user.description())).toString());
mUi->m_lineEdit_AuthorName->setText(LtsUtils::OperatorSettings::getInstance()->value(QStringLiteral("MSDL"), QStringLiteral("pocAuthor"), QString::fromStdString(user.name())).toString());
mUi->m_lineEdit_Type->setText(LtsUtils::OperatorSettings::getInstance()->value(QStringLiteral("MSDL"), QStringLiteral("pocType"), QString::fromStdString(user.description)).toString());
mUi->m_lineEdit_AuthorName->setText(LtsUtils::OperatorSettings::getInstance()->value(QStringLiteral("MSDL"), QStringLiteral("pocAuthor"), QString::fromStdString(user.name)).toString());
mUi->m_lineEdit_Organization->setText(LtsUtils::OperatorSettings::getInstance()->value(QStringLiteral("MSDL"), QStringLiteral("pocOrganization"), QString()).toString());
mUi->m_lineEdit_Email->setText(LtsUtils::OperatorSettings::getInstance()->value(QStringLiteral("MSDL"), QStringLiteral("pocEmail"), QString()).toString());
mUi->m_lineEdit_Telephone->setText(LtsUtils::OperatorSettings::getInstance()->value(QStringLiteral("MSDL"), QStringLiteral("pocTelephone"), QString()).toString());
@@ -17,12 +17,9 @@
#include <QtCore/QUuid>
#include <QtCore/QTextStream>
#include <QtCore/QUrl>
#include <QAbstractMessageHandler>
#include <QtXml/QDomDocument>
#include <QMimeData>
#include <QtCore/QProcess>
#include <QtXmlPatterns/QXmlSchema>
#include <QtXmlPatterns/QXmlSchemaValidator>
#include <ngltools/ngltools_filesystem.h>
#include <Common/participant_dis_helper.h>
@@ -89,17 +86,17 @@ ImportMsdl::ImportMsdl(ParticipantManagement::ParticipantEditModel *pModel, cons
for (const ParticipantManagement::Type &type : std::as_const(m_mapTypes))
{
for (const auto &disId : type.disEntities())
for (const auto &disId : type.disEntities)
{
QString strMSDL_DISId = ParticipantManagement::DIS::convertDISTypeInteger2MSDLString(disId);
if (m_mapMSDL_DIS_2TypeId.find(strMSDL_DISId) != m_mapMSDL_DIS_2TypeId.end())
{
WARNING_LOG(mLogger) << "DIS id \"" << strMSDL_DISId << "\" which is assigned to type id \"" << type.id() << "\" is already assigned to type id \"" << m_mapMSDL_DIS_2TypeId[strMSDL_DISId] << "\"";
WARNING_LOG(mLogger) << "DIS id \"" << strMSDL_DISId << "\" which is assigned to type id \"" << type.id << "\" is already assigned to type id \"" << m_mapMSDL_DIS_2TypeId[strMSDL_DISId] << "\"";
continue;
}
m_mapMSDL_DIS_2TypeId[strMSDL_DISId] = type.id();
m_mapMSDL_DIS_2TypeId[strMSDL_DISId] = type.id;
}
}
}
@@ -286,13 +283,14 @@ bool ImportMsdl::schemaValidation()
return false;
}
QXmlSchema schema;
msdl::SchemaMessageHandler smh;
schema.setMessageHandler(&smh);
schema.load(&schemaFile, QUrl::fromLocalFile(schemaFile.fileName()));
// Qt6: Qt XmlPatterns (QXmlSchema) was removed. Check the schema file is
// well-formed XML via Qt6::Xml (QDomDocument); the external xmllint step below
// performs the full schema/instance validation.
QDomDocument schemaDoc;
schemaDoc.setContent(&schemaFile, false);
if (!schema.isValid())
if (schemaDoc.documentElement().isNull())
{
LtsWidgets::LtsMessageDialog::showMessage(this, tr("Schema is invalid"));
return false;
@@ -322,16 +320,6 @@ bool ImportMsdl::schemaValidation()
#endif
QXmlSchemaValidator validator(schema);
if (false )
{
#ifdef LTS_DEBUG
LtsWidgets::LtsMessageDialog::showMessage(this, tr("Instance document is invalid"));
#endif
return false;
}
return true;
}
@@ -341,17 +329,14 @@ ParticipantManagement::ParticipantData ImportMsdl::createParticipant(const MSDLP
ParticipantManagement::ParticipantData p;
p.designator(unit.m_designator.toStdString());
p.tacticalIdentifier(unit.m_tacticalIdentifier.toStdString());
p.designator = unit.m_designator.toStdString();
p.tacticalIdentifier = unit.m_tacticalIdentifier.toStdString();
p.equipmentNumber = 0;
p.assignState = ParticipantManagement::ParticipantAssignState::HandoutExcon;
p.equipmentNumber() = 0;
p.assignState() = ParticipantManagement::ParticipantAssignState::HandoutExcon;
p.symbol(m_mapTypes[unit.m_mappedTypeId].symbol());
p.typeId(unit.m_mappedTypeId);
p.symbol = m_mapTypes[unit.m_mappedTypeId].symbol;
p.typeId = unit.m_mappedTypeId;
return p;
}
@@ -370,7 +355,7 @@ void ImportMsdl::insertParty(const MSDLParty &party)
{
ParticipantManagement::ParticipantData newParty;
newParty.designator(party.m_forceSideName.toStdString());
newParty.designator = party.m_forceSideName.toStdString();
createNode(newParty, m_indexRoot, party.m_ownHandle);
}
@@ -753,7 +738,7 @@ void ImportMsdl::mapParticipant2Type(MSDLParticipant &participant, qint32 mapped
{
m_mapMSDL_DIS_2TypeId[participant.m_DISTypeMSDL] = mappedTypeId;
m_mapTypes[mappedTypeId].disEntities().push_back(ParticipantManagement::DIS::convertMSDLString2Integer(participant.m_DISTypeMSDL));
m_mapTypes[mappedTypeId].disEntities.push_back(ParticipantManagement::DIS::convertMSDLString2Integer(participant.m_DISTypeMSDL));
m_setTouchedTypes.insert(mappedTypeId);
}
}
@@ -182,18 +182,3 @@ void ImportMsdlShow::slotCustomContextMenuActionTriggered(QAction *ac)
}
void SchemaMessageHandler::handleMessage(QtMsgType type,
const QString &description,
const QUrl &identifier,
const QSourceLocation &sourceLocation)
{
ERROR_LOG(mLogger) << "type: " << type << " desc: " << description;
if (identifier.isValid())
ERROR_LOG(mLogger) << "identifier: " << identifier.toString();
if (!sourceLocation.isNull())
ERROR_LOG(mLogger) << "sourceLocation: "
<< sourceLocation.uri().toString()
<< " line: " << sourceLocation.line()
<< " column: " << sourceLocation.column()
;
}
@@ -4,7 +4,6 @@
#pragma once
#include <QtXml/QDomDocument>
#include <QtXmlPatterns/QAbstractMessageHandler>
#include <nglwidgets/ngldialog.h>
#include "msdl_logging.h"
@@ -13,23 +12,6 @@
namespace msdl
{
class SchemaMessageHandler : public QAbstractMessageHandler
{
Q_OBJECT
public:
explicit SchemaMessageHandler(QObject *parent = nullptr)
: QAbstractMessageHandler(parent)
, mLogger(getLogger("SchemaMessageHandler"))
{}
protected:
void handleMessage(QtMsgType type,
const QString &description,
const QUrl &identifier = QUrl(),
const QSourceLocation &sourceLocation = QSourceLocation()) override;
private:
LOGGER_T mLogger;
};
class ImportMsdlShow : public NGLDialog
{
Q_OBJECT
@@ -26,13 +26,13 @@ MappingDialog::MappingDialog(QWidget *parent, bool typeClassIsUnit, const QStrin
for (const ParticipantManagement::Type &type : std::as_const(m_mapTypes))
{
if (!m_offerDatabaseEntriesWithoutDISType && (type.disEntities().size() == 0))
if (!m_offerDatabaseEntriesWithoutDISType && (type.disEntities.size() == 0))
{
WARNING_LOG(mLogger) << "Type id " << type.id() << " does not have assigned DIS types! Type cannot be used when importing MSDL data!";
WARNING_LOG(mLogger) << "Type id " << type.id << " does not have assigned DIS types! Type cannot be used when importing MSDL data!";
continue;
}
const ParticipantManagement::TypeClass typeClassId = type.typeClass();
const ParticipantManagement::TypeClass typeClassId = type.typeClass;
if (typeClassIsUnit)
{
@@ -49,7 +49,7 @@ MappingDialog::MappingDialog(QWidget *parent, bool typeClassIsUnit, const QStrin
}
for (const auto &typeclass : setTypeClasses)
mUi->m_ltsComboBox_typeClass->addItem(ParticipantManagement::toString(typeclass), typeclass);
mUi->m_ltsComboBox_typeClass->addItem(ParticipantManagement::toString(typeclass), static_cast<int>(typeclass));
slotClassTypeChanged();
@@ -68,21 +68,21 @@ void MappingDialog::slotClassTypeChanged()
{
mUi->m_ltsComboBox_type->clear();
int currentClass = mUi->m_ltsComboBox_typeClass->currentData().toInt();
ParticipantManagement::TypeClass currentClass = static_cast<ParticipantManagement::TypeClass>(mUi->m_ltsComboBox_typeClass->currentData().toInt());
for (const ParticipantManagement::Type &type : std::as_const(m_mapTypes))
{
if (type.typeClass() != currentClass)
if (type.typeClass != currentClass)
continue;
if (!m_offerDatabaseEntriesWithoutDISType && (type.disEntities().size() == 0))
if (!m_offerDatabaseEntriesWithoutDISType && (type.disEntities.size() == 0))
{
WARNING_LOG(mLogger) << "Type id " << type.id() << " does not have assigned DIS types! Type cannot be used when importing MSDL data!";
WARNING_LOG(mLogger) << "Type id " << type.id << " does not have assigned DIS types! Type cannot be used when importing MSDL data!";
continue;
}
mUi->m_ltsComboBox_type->addItem(QString::fromStdString(type.name()), type.id());
mUi->m_ltsComboBox_type->addItem(QString::fromStdString(type.name), type.id);
}
}
@@ -122,6 +122,6 @@ bool MappingDialog::autoMapAllUnmappedElements() const
int32_t MappingDialog::getMappedTypeId() const
{
int index = mUi->m_ltsComboBox_type->currentData().toInt();
return m_mapTypes[index].id();
return m_mapTypes[index].id;
}
}
@@ -3,7 +3,7 @@
#include "ppm_msdl_edit.h"
#include "ui_ppm_msdl_edit.h"
#include "msdl/msdl_import.h"
#include "msdl_export.h"
#include "msdl/msdl_export.h"
#include <QtGui/QAction>
#include <AdvancedSymbology/asb_data_plugin_interface.h>
@@ -18,6 +18,7 @@ namespace ParticipantManagement
{
MSDLEdit::MSDLEdit(LtsSession::LtsSession *session, QWidget *parent)
: LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::OkApplyCancel)
, m_logger(getLogger("MSDLEdit"))
, m_actionRemove(nullptr)
, m_actionEdit(nullptr)
, m_ppmDtc(nullptr)
@@ -44,6 +44,9 @@ if(QT6_GUI_AVAILABLE)
${Qt6_Widgets}
Qt6::WebEngineCore
Qt6::WebEngineWidgets
# Qt6 Migration: Qt5::WebEngineWidgets transitively linked Qt5::WebChannel;
# Qt6 dropped that dependency, so link the module explicitly.
Qt6::WebChannel
LtsSession
NGLLogger
PUBLIC
@@ -2,6 +2,7 @@
#include "participant_org_chart.h"
#include "ui_participant_org_chart.h"
#include <NGLLogger/NGLLoggerBootstrap.h>
#include <QtWebEngineCore/QWebEngineSettings>
#include <Symbology/symbol_data_to_render_role.h>
@@ -16,9 +17,9 @@ namespace ParticipantManagement
inline bool compareState(const StateInformation &a,
const StateInformation &b)
{
if (a.stateTime() != b.stateTime())
return a.stateTime() < b.stateTime();
return a.vulnerabilityState() < b.vulnerabilityState();
if (a.stateTime != b.stateTime)
return a.stateTime < b.stateTime;
return a.vulnerabilityState < b.vulnerabilityState;
}
LtsParticipantsOrgChart::LtsParticipantsOrgChart(QWidget *parent)
@@ -32,6 +33,7 @@ LtsParticipantsOrgChart::LtsParticipantsOrgChart(QWidget *parent)
, m_dtc(nullptr)
, m_asbItc(nullptr)
, m_ui(new Ui::LtsParticipantsOrgChart)
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
{
m_ui->setupUi(this);
}
@@ -137,16 +139,16 @@ void LtsParticipantsOrgChart::loadParty(int partyId)
for (const ParticipantManagement::Participant &part : participantMap)
{
if (part.isDeleted() || part.partyId() != m_partyId)
if (part.isDeleted || part.partyId != m_partyId)
continue;
if (part.superiorId() == 0)
if (part.superiorId == 0)
{
root = part;
break;
}
}
if (root.inferiorIds().size() == 0)
if (root.inferiorIds.size() == 0)
{
m_dataSource = preDefThing;
m_ui->wevOrgChart->reload();
@@ -166,10 +168,10 @@ void LtsParticipantsOrgChart::loadParty(int partyId)
connect(m_participantOrgChart_MimeDataHelper.data(), &ParticipantOrgChart_MimeDataHelper::finished,
this, &LtsParticipantsOrgChart::onParticipantOrgChart_MimeDataHelperFinished);
m_participantOrgChart_MimeDataHelper->run(root.id(),
m_participantOrgChart_MimeDataHelper->run(root.id,
false,
AdvancedSymbology::roleToRole<>(m_dtc->party(m_partyId).role()),
QColor::fromRgb(QRgb(m_dtc->party(m_partyId).color())),
AdvancedSymbology::roleToRole<>(m_dtc->party(m_partyId).role),
QColor::fromRgb(QRgb(m_dtc->party(m_partyId).color)),
m_useSymData);
}
@@ -231,10 +233,10 @@ bool LtsParticipantsOrgChart::loadTemplate(int templateRootId)
connect(m_participantOrgChart_MimeDataHelper.data(), &ParticipantOrgChart_MimeDataHelper::finished,
this, &LtsParticipantsOrgChart::onParticipantOrgChart_MimeDataHelperFinished);
m_participantOrgChart_MimeDataHelper->run(root.templateId(),
m_participantOrgChart_MimeDataHelper->run(root.templateId,
false,
AdvancedSymbology::roleToRole<>(m_dtc->party(m_partyId).role()),
QColor::fromRgb(QRgb(m_dtc->party(m_partyId).color())),
AdvancedSymbology::roleToRole<>(m_dtc->party(m_partyId).role),
QColor::fromRgb(QRgb(m_dtc->party(m_partyId).color)),
false);
return true;
@@ -258,8 +260,8 @@ void LtsParticipantsOrgChart::updateParticipant(int participantId)
helper->run(participantId,
true,
AdvancedSymbology::roleToRole<>(m_dtc->party(m_partyId).role()),
QColor::fromRgb(QRgb(m_dtc->party(m_partyId).color())),
AdvancedSymbology::roleToRole<>(m_dtc->party(m_partyId).role),
QColor::fromRgb(QRgb(m_dtc->party(m_partyId).color)),
m_useSymData);
}
@@ -301,8 +303,7 @@ void LtsParticipantsOrgChart::getWholeHierarchy()
WebNofitifier::WebNofitifier(QObject *parent) : QObject(parent)
, m_currentJsonString(QString())
, m_updateString(QString())
, m_updateTimer(new QTimer(this)),
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
, m_updateTimer(new QTimer(this)) {
connect(m_updateTimer, &QTimer::timeout, this, &WebNofitifier::onTimerTick);
}
@@ -97,7 +97,6 @@ signals:
private:
NGL::INGLLogger &m_logger;
int m_partyId;
bool m_useSymData;
bool m_isMenuEnabled;
@@ -114,6 +113,8 @@ NGL::INGLLogger &m_logger;
std::shared_ptr<ParticipantManagement::Interface::Dtc> m_dtc;
std::shared_ptr<AdvancedSymbology::ForeignDataInterface> m_asbItc;
Ui::LtsParticipantsOrgChart *m_ui;
NGL::INGLLogger &m_logger;
};
}
@@ -3,7 +3,7 @@
#include "ppm_saab_edit.h"
#include "ui_ppm_saab_edit.h"
#include "saab/saab_import.h"
#include "saab_export.h"
#include "saab/saab_export.h"
#include <QtGui/QAction>
#include <AdvancedSymbology/asb_data_plugin_interface.h>
@@ -18,6 +18,7 @@ namespace ParticipantManagement
{
SAABEdit::SAABEdit(LtsSession::LtsSession *session, QWidget *parent)
: LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::OkApplyCancel)
, m_logger(getLogger("SAABEdit"))
, m_actionRemove(nullptr)
, m_actionEdit(nullptr)
, m_ppmDtc(nullptr)
@@ -43,6 +43,9 @@ SET(zwmssaab_UICS
ui/saab_mapping_dialog.ui
)
# .ui files live in the ui/ subdirectory; tell AUTOUIC where to find them
set(CMAKE_AUTOUIC_SEARCH_PATHS ${CMAKE_CURRENT_SOURCE_DIR}/ui)
NGL_WRAP_UI(zwmssaab_SRCS ${zwmssaab_UICS})
NGL_ADD_LIBRARY2(WS zwmssaab SHARED ${zwmssaab_SRCS} ${zwmssaab_UICS} ${zwmssaab_IDLS})
NGL_TARGET_INCLUDE_DIRECTORIES(zwmssaab
@@ -55,7 +58,6 @@ if(QT6_GUI_AVAILABLE)
PRIVATE
${Qt6_Gui}
Qt6::Xml
Qt6::XmlPatterns
PUBLIC
svcPpmCommon
LtsUtilsSettings
@@ -45,6 +45,7 @@ ExportSaab::ExportSaab(LtsSession::LtsSession *session, const std::shared_ptr<Pa
, m_session(session)
, m_configFile(nullptr)
, m_ui(new Ui_SAABExport)
, m_logger(saab::getLogger("ExportSaab"))
{
m_ui->setupUi(this);
@@ -369,13 +370,13 @@ void ExportSaab::writeExercise(QXmlStreamWriter *writer) const
using namespace XmlStrings;
writer->writeStartElement(SAAB_EXERCISE());
writer->writeAttribute(SAAB_ID(), QUuid(l, m_currentExercise.id(), w2, b1, b2, b3, b4, b5, b6, b7, GuidContext::GuidExercise).toString(QUuid::WithoutBraces));
writer->writeAttribute(SAAB_ID(), QUuid(l, m_currentExercise.id, w2, b1, b2, b3, b4, b5, b6, b7, GuidContext::GuidExercise).toString(QUuid::WithoutBraces));
writer->writeTextElement(SAAB_EXPORT_TIME(), toSaabTime(m_session->partitionTime()));
writer->writeTextElement(SAAB_PLANNED_START_TIME(), toSaabTime(m_currentExercise.beginTime()));
writer->writeTextElement(SAAB_PLANNED_STOP_TIME(), toSaabTime(m_currentExercise.endTime()));
writer->writeTextElement(SAAB_DESIGNATION(), QString::fromStdString(m_currentExercise.name()));
writer->writeTextElement(SAAB_DESCRIPTION(), QString::fromStdString(m_currentExercise.description()));
writer->writeTextElement(SAAB_PLANNED_START_TIME(), toSaabTime(m_currentExercise.beginTime));
writer->writeTextElement(SAAB_PLANNED_STOP_TIME(), toSaabTime(m_currentExercise.endTime));
writer->writeTextElement(SAAB_DESIGNATION(), QString::fromStdString(m_currentExercise.name));
writer->writeTextElement(SAAB_DESCRIPTION(), QString::fromStdString(m_currentExercise.description));
writer->writeTextElement(SAAB_WIND_SPEED(), QStringLiteral("0"));
writer->writeTextElement(SAAB_WIND_DIRECTION(), QStringLiteral("0"));
writer->writeEmptyElement(SAAB_EVALUATION_PACKAGE_FILE_NAME());
@@ -420,13 +421,13 @@ SaabPlayer *ExportSaab::toSaabPlayer(const ParticipantManagement::Party &party,
result = new SaabUnit;
result->symbol = m_mapPartyToForce.value(party.id()).symbolCode;
static_cast<SaabUnit *>(result)->unitSize = m_mapPartyToForce.value(party.id()).echelonCode;
result->designation = QString::fromStdString(party.name());
result->symbol = m_mapPartyToForce.value(party.id).symbolCode;
static_cast<SaabUnit *>(result)->unitSize = m_mapPartyToForce.value(party.id).echelonCode;
result->designation = QString::fromStdString(party.name);
result->trashcan = false;
result->isExternalPlayer = true;
result->force = m_mapPartyToForce.value(party.id()).forceCode;
result->guid = QUuid(l, m_currentExercise.id(), w2, static_cast<uchar>(party.id()), b2, b3, b4, b5, b6, b7, GuidContext::GuidParty).toString(QUuid::WithoutBraces);
result->force = m_mapPartyToForce.value(party.id).forceCode;
result->guid = QUuid(l, m_currentExercise.id, w2, static_cast<uchar>(party.id), b2, b3, b4, b5, b6, b7, GuidContext::GuidParty).toString(QUuid::WithoutBraces);
QList<int> keys = remainingParticipants.keys();
@@ -438,7 +439,7 @@ SaabPlayer *ExportSaab::toSaabPlayer(const ParticipantManagement::Party &party,
ParticipantManagement::Participant participant = remainingParticipants.value(key);
if (!(participant.partyId() == party.id() && participant.superiorId() == 0))
if (!(participant.partyId == party.id && participant.superiorId == 0))
continue;
SaabPlayer *player = toSaabPlayer(participant, remainingParticipants);
@@ -454,26 +455,26 @@ SaabPlayer *ExportSaab::toSaabPlayer(const ParticipantManagement::Party &party,
SaabPlayer *ExportSaab::toSaabPlayer(const ParticipantManagement::Participant &participant, QMap<int, ParticipantManagement::Participant> &remainingParticipants)
{
if (participant.isDeleted())
if (participant.isDeleted)
{
DEBUG_LOG(m_logger) << "Participant with id " << participant.id() << " id deleted --> skipping";
DEBUG_LOG(m_logger) << "Participant with id " << participant.id << " id deleted --> skipping";
return nullptr;
}
if (participant.externalId())
if (participant.externalId)
{
DEBUG_LOG(m_logger) << "Particpant with id " << participant.id() << " has external ID set to " << participant.externalId() << " --> not being exported.";
DEBUG_LOG(m_logger) << "Particpant with id " << participant.id << " has external ID set to " << participant.externalId << " --> not being exported.";
return nullptr;
}
SaabPlayer *result;
ParticipantManagement::Type type = m_types.value(participant.typeId());
ParticipantManagement::Type type = m_types.value(participant.typeId);
if (!m_mapTypeToSaabSymbol.contains(type.id()))
if (!m_mapTypeToSaabSymbol.contains(type.id))
mapType(type);
switch (type.typeClass())
switch (type.typeClass)
{
case ParticipantManagement::TypeClass::SupportEntity:
result = new SaabOcPlayer;
@@ -491,9 +492,9 @@ SaabPlayer *ExportSaab::toSaabPlayer(const ParticipantManagement::Participant &p
{
result = new SaabUnit;
DEBUG_LOG(m_logger) << "Reading unit with " << participant.inferiorIds().size() << " inferiors";
DEBUG_LOG(m_logger) << "Reading unit with " << participant.inferiorIds.size() << " inferiors";
for (int32_t id : participant.inferiorIds())
for (int32_t id : participant.inferiorIds)
{
SaabPlayer *player = toSaabPlayer(remainingParticipants.value(id), remainingParticipants);
@@ -509,7 +510,7 @@ SaabPlayer *ExportSaab::toSaabPlayer(const ParticipantManagement::Participant &p
if (!static_cast<SaabUnit *>(result)->inferiors.size())
{
DEBUG_LOG(m_logger) << "Unit " << participant.id() << " has no inferiors.";
DEBUG_LOG(m_logger) << "Unit " << participant.id << " has no inferiors.";
return nullptr;
}
@@ -519,11 +520,11 @@ SaabPlayer *ExportSaab::toSaabPlayer(const ParticipantManagement::Participant &p
case ParticipantManagement::TypeClass::Aircraft:
case ParticipantManagement::TypeClass::Unknown:
default:
DEBUG_LOG(m_logger) << "Type " << participant.typeId() << " is not supported.";
DEBUG_LOG(m_logger) << "Type " << participant.typeId << " is not supported.";
return nullptr;
}
QString symbol = m_mapTypeToSaabSymbol.value(type.id());
QString symbol = m_mapTypeToSaabSymbol.value(type.id);
if (typeid(*result) == typeid(SaabUnit))
{
@@ -535,22 +536,22 @@ SaabPlayer *ExportSaab::toSaabPlayer(const ParticipantManagement::Participant &p
else
result->symbol = symbol;
result->designation = QString::fromStdString(participant.designator());
result->trashcan = participant.isDeleted();
result->designation = QString::fromStdString(participant.designator);
result->trashcan = participant.isDeleted;
result->rank = QStringLiteral("OF1");
result->isExternalPlayer = true;
if (participant.equipmentNumber().has_value())
result->simulatorId = participant.equipmentNumber().get();
result->force = m_mapPartyToForce.value(participant.partyId()).forceCode;
result->guid = QUuid(participant.id(), m_currentExercise.id(), w2, static_cast<uchar>(participant.partyId()), b2, b3, b4, b5, b6, b7, GuidContext::GuidParticipant).toString(QUuid::WithoutBraces);
if (participant.equipmentNumber.has_value())
result->simulatorId = participant.equipmentNumber.get();
result->force = m_mapPartyToForce.value(participant.partyId).forceCode;
result->guid = QUuid(participant.id, m_currentExercise.id, w2, static_cast<uchar>(participant.partyId), b2, b3, b4, b5, b6, b7, GuidContext::GuidParticipant).toString(QUuid::WithoutBraces);
return result;
}
ParticipantManagement::Participant ExportSaab::rootParticipant(const ParticipantManagement::Participant &participant, const QMap<int, ParticipantManagement::Participant> &participants) const
{
if (participant.superiorId())
return rootParticipant(participants.value(participant.superiorId()), participants);
if (participant.superiorId)
return rootParticipant(participants.value(participant.superiorId), participants);
return participant;
}
@@ -563,10 +564,10 @@ void ExportSaab::mapType(const ParticipantManagement::Type &type)
{
using namespace ParticipantManagement;
MapType dialog(ParticipantManagement::trTypeName(type.name()),
MapType dialog(ParticipantManagement::trTypeName(type.name),
m_mapEchelons,
m_mapSymbols,
type.typeClass() == TypeClass::Unit || type.typeClass() == TypeClass::SupportUnit,
type.typeClass == TypeClass::Unit || type.typeClass == TypeClass::SupportUnit,
this);
dialog.exec();
@@ -579,19 +580,19 @@ void ExportSaab::mapType(const ParticipantManagement::Type &type)
saabTypeStr.append(dialog.echelonCode());
}
m_mapTypeToSaabSymbol.insert(type.id(), saabTypeStr);
m_mapTypeToSaabSymbol.insert(type.id, saabTypeStr);
}
void ExportSaab::mapPartyToForce(const ParticipantManagement::Party &party)
{
MapParty dialog(QString::fromStdString(party.name()), m_mapForces, m_mapEchelons, m_mapSymbols, this);
MapParty dialog(QString::fromStdString(party.name), m_mapForces, m_mapEchelons, m_mapSymbols, this);
dialog.exec();
if (dialog.isSkipped())
return;
m_mapPartyToForce.insert(party.id(), { m_mapForces.take(dialog.force()), dialog.echelonCode(), dialog.symbolCode() });
m_mapPartyToForce.insert(party.id, { m_mapForces.take(dialog.force()), dialog.echelonCode(), dialog.symbolCode() });
}
}
@@ -166,17 +166,16 @@ ParticipantManagement::ParticipantData ImportSaab::createParticipant(SaabPlayer
p.tacticalIdentifier(player->designation.toStdString());
p.tacticalIdentifier = player->designation.toStdString();
p.equipmentNumber(player->simulatorId != INT_MIN ? player->simulatorId : 0);
p.assignState() = ParticipantManagement::ParticipantAssignState::HandoutExcon;
p.equipmentNumber = (player->simulatorId != INT_MIN ? player->simulatorId : 0);
p.assignState = ParticipantManagement::ParticipantAssignState::HandoutExcon;
if (player->simulatorId != INT_MIN)
p.externalId(player->simulatorId);
p.externalId = player->simulatorId;
p.symbol(m_mapTypes[player->mappedTypeId].symbol());
p.typeId(player->mappedTypeId);
p.symbol = m_mapTypes[player->mappedTypeId].symbol;
p.typeId = player->mappedTypeId;
return p;
}
@@ -192,7 +191,7 @@ void ImportSaab::insertParty(SaabUnit *party)
{
ParticipantManagement::ParticipantData newParty;
newParty.designator(party->designation.toStdString());
newParty.designator = party->designation.toStdString();
createNode(newParty, m_indexRoot, party);
}
@@ -182,18 +182,3 @@ void ImportSaabShow::slotCustomContextMenuActionTriggered(QAction *ac)
}
void SchemaMessageHandler::handleMessage(QtMsgType type,
const QString &description,
const QUrl &identifier,
const QSourceLocation &sourceLocation)
{
ERROR_LOG(mLogger) << "type: " << type << " desc: " << description;
if (identifier.isValid())
ERROR_LOG(mLogger) << "identifier: " << identifier.toString();
if (!sourceLocation.isNull())
ERROR_LOG(mLogger) << "sourceLocation: "
<< sourceLocation.uri().toString()
<< " line: " << sourceLocation.line()
<< " column: " << sourceLocation.column()
;
}
@@ -4,7 +4,6 @@
#pragma once
#include <QtXml/QDomDocument>
#include <QtXmlPatterns/QAbstractMessageHandler>
#include <nglwidgets/ngldialog.h>
#include "saab_logging.h"
@@ -13,25 +12,6 @@
namespace saab
{
class SchemaMessageHandler : public QAbstractMessageHandler
{
Q_OBJECT
public:
explicit SchemaMessageHandler(QObject *parent = nullptr)
: QAbstractMessageHandler(parent)
, mLogger(getLogger("SchemaMessageHandler"))
{}
~SchemaMessageHandler()
{}
protected:
void handleMessage(QtMsgType type,
const QString &description,
const QUrl &identifier = QUrl(),
const QSourceLocation &sourceLocation = QSourceLocation());
private:
LOGGER_T mLogger;
};
class ImportSaabShow : public NGLDialog
{
Q_OBJECT
@@ -26,16 +26,16 @@ MappingDialog::MappingDialog(QWidget *parent, bool typeClassIsUnit, const QStrin
for (const ParticipantManagement::Type &type : std::as_const(m_mapTypes))
{
if (!m_offerDatabaseEntriesWithoutDISType && (type.disEntities().size() == 0))
if (!m_offerDatabaseEntriesWithoutDISType && (type.disEntities.size() == 0))
{
WARNING_LOG(mLogger) << "Type id " << type.id() << " does not have assigned DIS types! Type cannot be used when importing SAAB data!";
WARNING_LOG(mLogger) << "Type id " << type.id << " does not have assigned DIS types! Type cannot be used when importing SAAB data!";
continue;
}
if (type.isDeleted())
if (type.isDeleted)
continue;
const ParticipantManagement::TypeClass typeClassId = type.typeClass();
const ParticipantManagement::TypeClass typeClassId = type.typeClass;
if (typeClassId == ParticipantManagement::TypeClass::Unknown ||
typeClassId == ParticipantManagement::TypeClass::Vessel ||
@@ -57,7 +57,7 @@ MappingDialog::MappingDialog(QWidget *parent, bool typeClassIsUnit, const QStrin
}
for (const auto &typeclass : setTypeClasses)
mUi->m_ltsComboBox_typeClass->addItem(ParticipantManagement::toString(typeclass), typeclass);
mUi->m_ltsComboBox_typeClass->addItem(ParticipantManagement::toString(typeclass), static_cast<int>(typeclass));
slotClassTypeChanged();
@@ -76,24 +76,24 @@ void MappingDialog::slotClassTypeChanged()
{
mUi->m_ltsComboBox_type->clear();
int currentClass = mUi->m_ltsComboBox_typeClass->currentData().toInt();
ParticipantManagement::TypeClass currentClass = static_cast<ParticipantManagement::TypeClass>(mUi->m_ltsComboBox_typeClass->currentData().toInt());
for (const ParticipantManagement::Type &type : std::as_const(m_mapTypes))
{
if(type.isDeleted())
if(type.isDeleted)
continue;
if (type.typeClass() != currentClass)
if (type.typeClass != currentClass)
continue;
if (!m_offerDatabaseEntriesWithoutDISType && (type.disEntities().size() == 0))
if (!m_offerDatabaseEntriesWithoutDISType && (type.disEntities.size() == 0))
{
WARNING_LOG(mLogger) << "Type id " << type.id() << " does not have assigned DIS types! Type cannot be used when importing SAAB data!";
WARNING_LOG(mLogger) << "Type id " << type.id << " does not have assigned DIS types! Type cannot be used when importing SAAB data!";
continue;
}
mUi->m_ltsComboBox_type->addItem(QString::fromStdString(type.name()), type.id());
mUi->m_ltsComboBox_type->addItem(QString::fromStdString(type.name), type.id);
}
}
@@ -126,6 +126,6 @@ bool MappingDialog::skipAllUnmappedElements() const
int32_t MappingDialog::getMappedTypeId() const
{
int index = mUi->m_ltsComboBox_type->currentData().toInt();
return m_mapTypes[index].id();
return m_mapTypes[index].id;
}
}
@@ -75,6 +75,9 @@ if(QT6_GUI_AVAILABLE)
LtsSessionData
NGLLogger
Qt6::Xml
# Qt6 Migration: Qt5::WebEngineWidgets transitively linked Qt5::PrintSupport
# (plan_editor.cpp includes <QtPrintSupport/QPrintDialog>); Qt6 dropped that.
Qt6::PrintSupport
ngltranslator
PUBLIC
@@ -23,7 +23,7 @@
#include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
#include <flm_data_plugin_interface.h>
#include <Plugins/FileManagement/flm_data_plugin_interface.h>
#include <FileManagement/flm_explorer_gui_plugin_interface.h>
#include <ParticipantManagement/ppm_data_plugin_interface.h>
@@ -475,9 +475,9 @@ bool InterfaceImpl::fmsCreatePlan(bool clearGeometryModel)
FileManagement::FileContent fc = m_internal->m_flmDtc->fileContent(fileId);
m_internal->m_currentFolderId = fc.folderId();
m_internal->m_currentFolderId = fc.folderId;
m_internal->m_currentFileId = fileId;
m_internal->m_currentNameOfPlan = QString::fromStdString(fc.name());
m_internal->m_currentNameOfPlan = QString::fromStdString(fc.name);
QFileInfo fileInfo(m_internal->m_currentNameOfPlan);
m_internal->m_planEditor->setNameOfPlan(fileInfo.baseName());
@@ -511,7 +511,7 @@ bool InterfaceImpl::fmsModifyPlan(int fileId, bool saveAs)
}
FileManagement::FileContent fileContent = m_internal->m_flmDtc->fileContent(fileId);
bool differentUser = fileContent.operatorId() != LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
bool differentUser = fileContent.operatorId != LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
if (saveAs || differentUser)
{
@@ -527,8 +527,8 @@ bool InterfaceImpl::fmsModifyPlan(int fileId, bool saveAs)
}
QString nameOfPlan = QString::fromStdString(fileContent.name());
m_internal->m_currentFolderId = fileContent.folderId();
QString nameOfPlan = QString::fromStdString(fileContent.name);
m_internal->m_currentFolderId = fileContent.folderId;
m_internal->m_currentNameOfPlan = nameOfPlan;
m_internal->m_currentFileId = fileId;
@@ -592,7 +592,7 @@ void InterfaceImpl::fmsReadPlan()
m_internal->m_planEditor->onPlanReset();
FileManagement::FileContent fc = m_internal->m_flmDtc->fileContent(fileId);
QString nameOfPlan = QString::fromStdString(fc.name());
QString nameOfPlan = QString::fromStdString(fc.name);
if (content.size() == 0)
{
@@ -606,8 +606,8 @@ void InterfaceImpl::fmsReadPlan()
m_internal->m_planEditor->setPlan(content);
m_internal->m_currentNameOfPlan = nameOfPlan;
m_internal->m_currentFolderId = fc.folderId();
m_internal->m_currentFileId = fc.id();
m_internal->m_currentFolderId = fc.folderId;
m_internal->m_currentFileId = fc.id;
QFileInfo fileInfo(m_internal->m_currentNameOfPlan);
m_internal->m_planEditor->setNameOfPlan(fileInfo.baseName());
@@ -650,7 +650,7 @@ void InterfaceImpl::fmsImportPlan()
if (fileId > 0)
{
FileManagement::FileContent fc = m_internal->m_flmDtc->fileContent(fileId);
QString nameOfPlan = QString::fromStdString(fc.name());
QString nameOfPlan = QString::fromStdString(fc.name);
if (content.size() == 0)
{
ERROR_LOG(m_logger) << "Error plan [" << nameOfPlan << "] is empty";
@@ -690,7 +690,7 @@ bool InterfaceImpl::fmsWritePlan(bool saveAs)
FileManagement::FileContent planFileContent;
if (m_internal->m_flmDtc->getFile(FileManagement::FileType::TacticalPlan, m_internal->m_currentFolderId, m_internal->m_currentNameOfPlan, planFileContent))
m_internal->m_currentFileId = planFileContent.id();
m_internal->m_currentFileId = planFileContent.id;
}
if (saveAs || (m_internal->m_currentFileId <= 0))
@@ -726,7 +726,7 @@ void InterfaceImpl::fmsDeletePlan()
if (fileId > 0)
{
FileManagement::FileContent fc = m_internal->m_flmDtc->fileContent(fileId);
QString nameOfPlan = QString::fromStdString(fc.name());
QString nameOfPlan = QString::fromStdString(fc.name);
LtsWidgets::Button doIt = LtsWidgets::LtsMessageDialog::showMessage(
m_session->baseLayout()
@@ -753,7 +753,7 @@ void InterfaceImpl::fmsDeletePlan()
void InterfaceImpl::onPlanContentChanged(const FileManagement::FileContent &data, DataModification modType)
{
if (data.fileType() != FileManagement::FileType::TacticalPlan)
if (data.fileType != FileManagement::FileType::TacticalPlan)
return;
switch (modType)
@@ -761,7 +761,7 @@ void InterfaceImpl::onPlanContentChanged(const FileManagement::FileContent &data
case DataModification::eModified :
break;
case DataModification::eRemoved :
if (m_internal->m_currentFileId == data.id())
if (m_internal->m_currentFileId == data.id)
m_internal->m_currentFileId = -1;
break;
@@ -780,7 +780,7 @@ void InterfaceImpl::onIterateParticipantsSidc()
auto gatherUpSidc = [&participantSidcsInUse](const ParticipantManagement::Participant & data)
{
const QString &sidcCode = QString::fromStdString(data.symbol());
const QString &sidcCode = QString::fromStdString(data.symbol);
if (AdvancedSymbology::SidcCodec::isEncoded(sidcCode))
{
@@ -822,7 +822,7 @@ void InterfaceImpl::readSymbolFavouritesRequest(const QString &favName, QString
return;
}
int fileId = fileContent.id();
int fileId = fileContent.id;
QByteArray content;
if (!m_internal->m_flmGui->loadContent(fileId, content, true))
@@ -929,23 +929,23 @@ void InterfaceImpl::storeSymbolFavouritesRequest(const QString &favName, const Q
LtsWidgets::LtsMessageDialog::showMessage(m_session->baseLayout(), msg, m_internal->m_messageBoxTitle);
return;
}
if (!m_internal->m_flmGui->saveContent(favContent.id(), favXMLContent.toUtf8(), QString()))
if (!m_internal->m_flmGui->saveContent(favContent.id, favXMLContent.toUtf8(), QString()))
ERROR_LOG(m_logger) << "Cannot save symbol favourites in library";
}
else
{
favContent.name(favName.toStdString());
favContent.isTemplate(false);
favContent.isUsedBy(false);
favContent.usedBy(0);
favContent.folderId(folderId);
favContent.fileStatus(FileManagement::FileStatus::Valid);
favContent.fileCategory(FileManagement::FileCategory::Global);
favContent.fileType(FileManagement::FileType::OperatorFavourite);
favContent.exerciseId();
favContent.phaseId();
favContent.lastModified(QDateTime::currentMSecsSinceEpoch());
favContent.operatorId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
favContent.name = favName.toStdString();
favContent.isTemplate = false;
favContent.isUsedBy = false;
favContent.usedBy = 0;
favContent.folderId = folderId;
favContent.fileStatus = FileManagement::FileStatus::Valid;
favContent.fileCategory = FileManagement::FileCategory::Global;
favContent.fileType = FileManagement::FileType::OperatorFavourite;
favContent.exerciseId = 0;
favContent.phaseId = 0;
favContent.lastModified = QDateTime::currentMSecsSinceEpoch();
favContent.operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
ERROR_LOG(m_logger) << "New file content = " << favXMLContent;
@@ -6,7 +6,7 @@
#include <PluginInterfaces/gui_plugin_interface.h>
#include <Lts/Common/ProjectConfig/project_defines.h>
#include <PlanEditor/PlanEditorPlugin/plan_editor_gui_plugin_interface.h>
#include <flm_data_plugin_interface.h>
#include <Plugins/FileManagement/flm_data_plugin_interface.h>
#include <QtCore/QObject>
@@ -33,7 +33,7 @@ namespace VWM
namespace
{
// Ensure QPoint3D meta-type is registered for queued connections
// Q_DECLARE_METATYPE is sufficient for custom types
// Qt6: Q_DECLARE_METATYPE is sufficient, no need for qRegisterMetaTypeStreamOperators
static const bool point3dRegistered = []() {
return true;
}();
@@ -23,7 +23,7 @@ TypeStruct::TypeStruct(const rpr2::EntityTypeStruct &eis)
TypeStruct TypeStruct::fromString(const QString &string)
{
const QVector<QStringView> sl = QStringView(string).split(QLatin1Char('.'));
const QVector<QStringRef> sl = string.splitRef(QLatin1Char('.'));
TypeStruct ts;
bool bOk;
@@ -104,7 +104,8 @@ void AVSocket::onConnectToAVS()
this, &AVSocket::onDisconnected);
connect(m_avsSocket, &QTcpSocket::connected,
this, [this] {m_bErrorInTcpComWarnedOnce = false;});
// errorOccurred signal replaces error() getter/signal
// Qt6: QAbstractSocket::error() (the getter/signal overload pair) was
// replaced by the errorOccurred signal.
connect(m_avsSocket, &QAbstractSocket::errorOccurred,
this, &AVSocket::onError);
connect(m_avsSocket, &QTcpSocket::readyRead,
@@ -136,24 +136,24 @@ void GeoPairing::calculateAirFire(const QByteArray &transparentData,
while (i.hasNext())
{
i.next();
SInt32 vulnerabilityState = i.value().vulnerabilityState;
Float64 lat = i.value().pos().lat() * 180 / M_PI;
Float64 lon = i.value().pos().lon() * 180 / M_PI;
SInt32 vulnerabilityState = static_cast<SInt32>(i.value().vulnerabilityState);
Float64 lat = i.value().pos.lat * 180 / M_PI;
Float64 lon = i.value().pos.lon * 180 / M_PI;
DEBUG_LOG(m_logger) << "GeoPairing::calculateAirFire"
<< "\nl_Updater->update : " << i.key()
<< "\n: participantId=" << i.value().participantId()
<< "\n participantTypeId= " << i.value().participantTypeId()
<< "\n: participantId=" << i.value().participantId
<< "\n participantTypeId= " << i.value().participantTypeId
<< "\n pos lat=" << lat
<< "\n lon=" << lon
<< "\n alt=" << i.value().pos().z()
<< "\n posTime=" << i.value().sampleTime()
<< "\n alt=" << i.value().pos.z
<< "\n posTime=" << i.value().sampleTime
<< "\n state=" << i.value().vulnerabilityState
<< "\n state (SInt32)=" << vulnerabilityState;
l_Updater->update(i.value().participantId(),
l_Updater->update(i.value().participantId,
lat,
lon,
i.value().pos().z(),
i.value().sampleTime() / 1000, //s
i.value().pos.z,
i.value().sampleTime / 1000, //s
vulnerabilityState);
}
@@ -225,7 +225,7 @@ void GeoPairing::calculateAirFire(const QByteArray &transparentData,
if (l_TargetFound != l_CachedTrackingState || l_TimeoutPassed)
{
// prepare response for player
m_reportTarget.playerId = i.value().participantId();
m_reportTarget.playerId = i.value().participantId;
m_reportTarget.sendData.clear();
m_reportTarget.sendData.append(0xEB); // Report Target Detection
@@ -843,11 +843,11 @@ bool GeoPairing::geoPairingData(const std::shared_ptr<N_Ballistic::BallisticServ
while (i.hasNext())
{
i.next();
DEBUG_LOG(m_logger) << i.key() << ": participantId=" << i.value().participantId()
<< " participantTypeId= " << i.value().participantTypeId()
<< " pos lat=" << i.value().pos().lat()
<< " pos lon=" << i.value().pos().lon()
<< " z=" << i.value().pos().z();
DEBUG_LOG(m_logger) << i.key() << ": participantId=" << i.value().participantId
<< " participantTypeId= " << i.value().participantTypeId
<< " pos lat=" << i.value().pos.lat
<< " pos lon=" << i.value().pos.lon
<< " z=" << i.value().pos.z;
}
@@ -94,6 +94,7 @@ bool HandlerMainStructureElement::init()
}
// add structure elements to global map for lookup (e.g. in 'add Footprints to MSE objects')
// Qt6: QMap::unite removed -> merge manually (unite semantics: overwrite existing keys)
for (ObjectMainStructureElement *objMse : std::as_const(m_objectMainStructureElementMap))
{
const auto &seMap = objMse->getStructureElements();
@@ -29,9 +29,6 @@ SET(SRCS_common
# these build-dir paths, so the copies are gone rather than kept for forbidden
# OFF variants.
# Define target name early for use in subsequent macros
SET(PDM_COMMON_TARGET svcPdmCommon)
# Add current binary dir to include path for generated headers
NGL_TARGET_INCLUDE_DIRECTORIES(${PDM_COMMON_TARGET}
PUBLIC
@@ -101,6 +98,7 @@ IF(BUILD_RTI)
ENDIF()
# Create svcPdmCommon library with common sources
SET(PDM_COMMON_TARGET svcPdmCommon)
NGL_ADD_LIBRARY(AAR SV WS HLA ${PDM_COMMON_TARGET} SHARED ${SRCS_common})
generate_export_header(${PDM_COMMON_TARGET}
EXPORT_FILE_NAME "${CMAKE_CURRENT_BINARY_DIR}/svcpdmcommon_export.h"
@@ -1,28 +1,28 @@
-- all available service idl files
${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/build-rti-on/Lts/DDS/Core/core.idl
${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/build-rti-on/Lts/DDS/Core/core_enums.idl
${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/DDS/Core/core.xml
${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/pdm.idl
${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/pdm_enums.idl
${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/pdm_service.xml
${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/bld.idl
${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/bld_enums.idl
${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/bld_service.xml
${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/tab.idl
${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/tab_enums.idl
${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/tab_service.xml
${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/taboc.idl
${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/taboc_enums.idl
${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/taboc_service.xml
${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/gna.idl
${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/gna_enums.idl
${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/gna_service.xml
${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/cmo.idl
${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/cmo_enums.idl
${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/cmo_service.xml
${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/whg.idl
${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/whg_enums.idl
${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/whg_service.xml
${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/tgt.idl
${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/tgt_enums.idl
${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/tgt_service.xml
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/build-rti-on/Lts/DDS/Core/core.idl
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/build-rti-on/Lts/DDS/Core/core_enums.idl
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/DDS/Core/core.xml
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/pdm.idl
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/pdm_enums.idl
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/pdm_service.xml
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/bld.idl
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/bld_enums.idl
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/bld_service.xml
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/tab.idl
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/tab_enums.idl
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/tab_service.xml
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/taboc.idl
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/taboc_enums.idl
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/taboc_service.xml
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/gna.idl
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/gna_enums.idl
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/gna_service.xml
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/cmo.idl
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/cmo_enums.idl
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/cmo_service.xml
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/whg.idl
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/whg_enums.idl
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/whg_service.xml
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/tgt.idl
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/tgt_enums.idl
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/tgt_service.xml
@@ -487,7 +487,8 @@ void DataManager::onNotification(const QString &name, QSqlDriver::NotificationSo
const QString triggerNameEx0 = triggerName(0);
if (name.contains(triggerNameEx0))
{
// Extract name after trigger prefix
// Qt6: QStringRef removed; QString::mid returns a QString with the
// same substring semantics.
QString name_ = name.mid(triggerNameEx0.size() + 1);
int exerciseId = name_.toInt();
int participantId = payload.toInt();
@@ -1,123 +0,0 @@
<?xml version="1.0" ?>
<STREIF>
<Header>
<Group>
<Name>Dummy_Bld</Name>
<ModelId Id="1000" />
<BBox_Min Z="0.000" Y="0.000" X="0.000" />
<BBox_Max Z="1.000" Y="1.000" X="1.000" />
<Group>
<Name>FOOTPRINT</Name>
<BBox_Min Z="0.000" Y="0.000" X="0.000" />
<BBox_Max Z="0.000" Y="1.000" X="1.000" />
<Polygon>
<Name>p12916</Name>
<Vertex>
<Name>p12916/V1</Name>
<Coord X="0.000" Y="0.000" Z="0.000" />
</Vertex>
<Vertex>
<Name>p12916/V2</Name>
<Coord X="1.000" Y="0.000" Z="0.000" />
</Vertex>
<Vertex>
<Name>p12916/V3</Name>
<Coord X="1.000" Y="1.000" Z="0.000" />
</Vertex>
<Vertex>
<Name>p12916/V4</Name>
<Coord X="0.000" Y="1.000" Z="0.000" />
</Vertex>
</Polygon>
</Group>
<External_Reference>
<Name>Announcement_AP_1</Name>
<SubId ID="26001" />
<Model NAME="EGCU.flt" />
<Coord Z="0.723" Y="0.500" X="0.500" />
<Dir Z="0.000" Y="0.910" X="0.000" />
</External_Reference>
<External_Reference>
<Name>OutdoorVideo_AP_1</Name>
<SubId ID="13001" />
<Model NAME="EGCU.flt" />
<Coord Z="2.723" Y="0.500" X="0.500" />
<Dir Z="0.000" Y="0.910" X="0.000" />
</External_Reference>
<Group>
<Name>floor_1</Name>
<Comment>base_height=0.00</Comment>
<Switch>
<Name>SW_room_101</Name>
<SubId ID="2101" />
<Group>
<Name>undest_room_101</Name>
<BBox_Min Z="0.000" Y="0.000" X="0.000" />
<BBox_Max Z="1.000" Y="1.000" X="1.000" />
<Group>
<Name>FOOTPRINT</Name>
<BBox_Min Z="0.000" Y="0.000" X="0.000" />
<BBox_Max Z="0.000" Y="1.000" X="1.000" />
<Polygon>
<Name>p12916_1</Name>
<Vertex>
<Name>p12916_1/V1</Name>
<Coord X="0.000" Y="0.000" Z="0.000" />
</Vertex>
<Vertex>
<Name>p12916_1/V2</Name>
<Coord X="1.000" Y="0.000" Z="0.000" />
</Vertex>
<Vertex>
<Name>p12916_1/V3</Name>
<Coord X="1.000" Y="1.000" Z="0.000" />
</Vertex>
<Vertex>
<Name>p12916_1/V4</Name>
<Coord X="0.000" Y="1.000" Z="0.000" />
</Vertex>
</Polygon>
</Group>
</Group>
</Switch>
</Group>
<Group>
<Name>floor_2</Name>
<Comment>base_height=4</Comment>
<Switch>
<Name>SW_room_102</Name>
<SubId ID="2102" />
<Group>
<Name>undest_room_108</Name>
<BBox_Min Z="0.950" Y="0.000" X="0.000" />
<BBox_Max Z="1.000" Y="1.000" X="1.000" />
<Group>
<Name>FOOTPRINT</Name>
<BBox_Min Z="1.000" Y="0.000" X="0.000" />
<BBox_Max Z="1.000" Y="1.000" X="1.000" />
<Polygon>
<Name>p10562_2</Name>
<Vertex>
<Name>p10562_2/V1</Name>
<Coord X="0.000" Y="0.000" Z="1.000" />
</Vertex>
<Vertex>
<Name>p10562_2/V2</Name>
<Coord X="1.000" Y="0.000" Z="1.000" />
</Vertex>
<Vertex>
<Name>p10562_2/V3</Name>
<Coord X="1.000" Y="1.000" Z="1.000" />
</Vertex>
<Vertex>
<Name>p10562_2/V4</Name>
<Coord X="0.000" Y="1.000" Z="1.000" />
</Vertex>
</Polygon>
</Group>
</Group>
</Switch>
</Group>
</Group>
</Header>
</STREIF>
@@ -1,92 +0,0 @@
-- cameras (mounting_point_type_id = 4)
INSERT INTO ism.ism_asset (id, name, hostname, mounting_point_type_id, barcode, properties, asset_state_id)
VALUES (10, 'CAM_UBEICE0001', 'UBEICE0001', 4, null, '{"type": "vapix", "hasMicrophone": true}', 0),
(11, 'CAM_UBEICE0002', 'UBEICE0056', 4, null, '{"type": "vapix", "hasMicrophone": true}', 0);
-- cameras (mounting_point_type_id = 3)
INSERT INTO ism.ism_asset (id, name, hostname, mounting_point_type_id, barcode, properties, asset_state_id)
VALUES (15, 'CAM_UBEOCE0001', 'UBEOCE0001', 3, null, '{"type": "vapix"}', 0);
-- IPS IN (mounting_point_type_id = 6)
INSERT INTO ism.ism_asset (id, name, mounting_point_type_id, properties, asset_state_id, barcode)
VALUES (20, 'IPS-IN_2101', 6, '{"opticalCode":2101}', 0, null);
INSERT INTO ism.ism_asset (id, name, mounting_point_type_id, properties, asset_state_id, barcode)
VALUES (21, 'IPS-IN_2102', 6, '{"opticalCode":2102}', 0, null);
INSERT INTO ism.ism_asset (id, name, mounting_point_type_id, properties, asset_state_id, barcode)
VALUES (22, 'IPS-IN_2103', 6, '{"opticalCode":2103}', 0, null);
INSERT INTO ism.ism_asset (id, name, mounting_point_type_id, properties, asset_state_id, barcode)
VALUES (23, 'IPS-IN_2104', 6, '{"opticalCode":2104}', 0, null);
INSERT INTO ism.ism_asset (id, name, mounting_point_type_id, properties, asset_state_id, barcode)
VALUES (24, 'IPS-IN_2105', 6, '{"opticalCode":2105}', 0, null);
INSERT INTO ism.ism_asset (id, name, mounting_point_type_id, properties, asset_state_id, barcode)
VALUES (25, 'IPS-IN_2106', 6, '{"opticalCode":2106}', 0, null);
INSERT INTO ism.ism_asset (id, name, mounting_point_type_id, properties, asset_state_id, barcode)
VALUES (26, 'IPS-IN_2107', 6, '{"opticalCode":2107}', 0, null);
INSERT INTO ism.ism_asset (id, name, mounting_point_type_id, properties, asset_state_id, barcode)
VALUES (27, 'IPS-IN_2201', 6, '{"opticalCode":2201}', 0, null);
INSERT INTO ism.ism_asset (id, name, mounting_point_type_id, properties, asset_state_id, barcode)
VALUES (28, 'IPS-IN_2202', 6, '{"opticalCode":2202}', 0, null);
INSERT INTO ism.ism_asset (id, name, mounting_point_type_id, properties, asset_state_id, barcode)
VALUES (29, 'IPS-IN_2203', 6, '{"opticalCode":2203}', 0, null);
INSERT INTO ism.ism_asset (id, name, mounting_point_type_id, properties, asset_state_id, barcode)
VALUES (30, 'IPS-IN_2204', 6, '{"opticalCode":2204}', 0, null);
INSERT INTO ism.ism_asset (id, name, mounting_point_type_id, properties, asset_state_id, barcode)
VALUES (31, 'IPS-IN_2205', 6, '{"opticalCode":2205}', 0, null);
INSERT INTO ism.ism_asset (id, name, mounting_point_type_id, properties, asset_state_id, barcode)
VALUES (32, 'IPS-IN_2206', 6, '{"opticalCode":2206}', 0, null);
INSERT INTO ism.ism_asset (id, name, mounting_point_type_id, properties, asset_state_id, barcode)
VALUES (33, 'IPS-IN_2207', 6, '{"opticalCode":2207}', 0, null);
-- IPS OUT (mounting_point_type_id = 5)
INSERT INTO ism.ism_asset (id, name, mounting_point_type_id, properties, asset_state_id, barcode)
VALUES (40, 'IPS-OUT_1001', 5, '{"opticalCode":1001}', 0, null);
INSERT INTO ism.ism_asset (id, name, mounting_point_type_id, properties, asset_state_id, barcode)
VALUES (41, 'IPS-OUT_1002', 5, '{"opticalCode":1002}', 0, null);
INSERT INTO ism.ism_asset (id, name, mounting_point_type_id, properties, asset_state_id, barcode)
VALUES (42, 'IPS-OUT_1003', 5, '{"opticalCode":1003}', 0, null);
INSERT INTO ism.ism_asset (id, name, mounting_point_type_id, properties, asset_state_id, barcode)
VALUES (43, 'IPS-OUT_1004', 5, '{"opticalCode":1004}', 0, null);
INSERT INTO ism.ism_asset (id, name, mounting_point_type_id, properties, asset_state_id, barcode)
VALUES (44, 'IPS-OUT_1005', 5, '{"opticalCode":1005}', 0, null);
INSERT INTO ism.ism_asset (id, name, mounting_point_type_id, properties, asset_state_id, barcode)
VALUES (45, 'IPS-OUT_1006', 5, '{"opticalCode":1006}', 0, null);
INSERT INTO ism.ism_asset (id, name, mounting_point_type_id, properties, asset_state_id, barcode)
VALUES (46, 'IPS-OUT_1007', 5, '{"opticalCode":1007}', 0, null);
INSERT INTO ism.ism_asset (id, name, mounting_point_type_id, properties, asset_state_id, barcode)
VALUES (47, 'IPS-OUT_1008', 5, '{"opticalCode":1008}', 0, null);
INSERT INTO ism.ism_asset (id, name, mounting_point_type_id, properties, asset_state_id, barcode)
VALUES (48, 'IPS-OUT_1009', 5, '{"opticalCode":1008}', 0, null);
INSERT INTO ism.ism_asset (id, name, mounting_point_type_id, properties, asset_state_id, barcode)
VALUES (49, 'IPS-OUT_1010', 5, '{"opticalCode":1008}', 0, null);
INSERT INTO ism.ism_asset (id, name, mounting_point_type_id, properties, asset_state_id, barcode)
VALUES (50, 'IPS-OUT_1011', 5, '{"opticalCode":1008}', 0, null);
INSERT INTO ism.ism_asset (id, name, mounting_point_type_id, properties, asset_state_id, barcode)
VALUES (81, 'IPS-OUT_3001', 5, '{"opticalCode":1008}', 0, null);
-- BuildingSensorModule (mounting_point_type_id =1)
INSERT INTO ism.ism_asset (id, name, mounting_point_type_id, barcode, hostname, properties, asset_state_id)
VALUES (51, 'BSM_0001', 1, 'BC_BSM_0001', 'UBEBSM0018', '{"port":10001}', 0);
INSERT INTO ism.ism_asset (id, name, mounting_point_type_id, barcode, hostname, properties, asset_state_id)
VALUES (52, 'BSM_0002', 1, 'BC_BSM_0002', 'UBEBSM0222', '{"port":10001}', 0);
INSERT INTO ism.ism_asset (id, name, mounting_point_type_id, barcode, hostname, properties, asset_state_id)
VALUES (53, 'BSM_0003', 1, 'BC_BSM_0003', 'UBEBSM0001', '{"port":10001}', 0);
-- EGCU (mounting_point_type_id = 12)
INSERT INTO ism.ism_asset (id, name, hostname, mounting_point_type_id, barcode, properties, asset_state_id)
VALUES (60, 'UBECU0001', 'UBEOSGU0001', 12, null, '{"effects": [], "password": "mout11de", "username": "katar", "scenarios": [{"id": 1, "damage": 50}], "hitSoundVolume": 100, "fireSoundVolume": 100, "activationSoundVolume": 100}', 0);
-- AnnouncementUnit (mounting_point_type_id =10)
INSERT INTO ism.ism_asset (id, name, mounting_point_type_id, barcode, hostname, properties, asset_state_id)
VALUES (70, 'OCU_0001', 10, null, 'UBEOCU0010', '{"type": "vapix"}', 0);
INSERT INTO ism.ism_asset (id, name, mounting_point_type_id, barcode, hostname, properties, asset_state_id)
VALUES (71, 'ICU_0001', 10, null, 'UBEICU0020', '{"type": "vapix"}', 0);
@@ -1,44 +0,0 @@
mounts=(
"\"CAM_UBEICE0001\" \"bldg_56_ref - CAMERA_IN_AP_1\""
"\"CAM_UBEICE0002\" \"bldg_56_ref - CAMERA_IN_AP_2\""
"\"BSM_0001\" \"bldg_56_ref - REF_MOD_AP_1\""
"\"BSM_0002\" \"bldg_56_ref - REF_MOD_AP_2\""
"\"BSM_0003\" \"bldg_56_ref - REF_MOD_AP_3\""
"\"UBECU0001\" \"bldg_56_ref - BDI_P_1\""
"\"IPS-OUT_1001\" \"bldg_56_ref - IPS_OUT_AP_1\""
"\"IPS-OUT_1002\" \"bldg_56_ref - IPS_OUT_AP_2\""
"\"IPS-OUT_1003\" \"bldg_56_ref - IPS_OUT_AP_3\""
"\"IPS-OUT_1004\" \"bldg_56_ref - IPS_OUT_AP_4\""
"\"IPS-OUT_1005\" \"bldg_56_ref - IPS_OUT_AP_5\""
"\"IPS-OUT_1006\" \"bldg_56_ref - IPS_OUT_AP_6\""
"\"IPS-OUT_1007\" \"bldg_56_ref - IPS_OUT_AP_7\""
"\"IPS-OUT_1008\" \"bldg_56_ref - IPS_OUT_AP_8\""
"\"IPS-OUT_1009\" \"bldg_56_ref - IPS_OUT_AP_9\""
"\"IPS-OUT_1010\" \"bldg_56_ref - IPS_OUT_AP_10\""
"\"IPS-OUT_1011\" \"bldg_56_ref - IPS_OUT_AP_11\""
"\"IPS-OUT_3001\" \"bldg_56_ref - IPS_OUT_AP_12\""
"\"IPS-IN_2101\" \"bldg_56_ref - IPS_IN_AP_1\""
"\"IPS-IN_2102\" \"bldg_56_ref - IPS_IN_AP_2\""
"\"IPS-IN_2103\" \"bldg_56_ref - IPS_IN_AP_3\""
"\"IPS-IN_2104\" \"bldg_56_ref - IPS_IN_AP_4\""
"\"IPS-IN_2105\" \"bldg_56_ref - IPS_IN_AP_5\""
"\"IPS-IN_2106\" \"bldg_56_ref - IPS_IN_AP_6\""
"\"IPS-IN_2107\" \"bldg_56_ref - IPS_IN_AP_7\""
"\"IPS-IN_2201\" \"bldg_56_ref - IPS_IN_AP_8\""
"\"IPS-IN_2202\" \"bldg_56_ref - IPS_IN_AP_10\""
"\"IPS-IN_2203\" \"bldg_56_ref - IPS_IN_AP_11\""
"\"IPS-IN_2204\" \"bldg_56_ref - IPS_IN_AP_12\""
"\"IPS-IN_2205\" \"bldg_56_ref - IPS_IN_AP_13\""
"\"IPS-IN_2206\" \"bldg_56_ref - IPS_IN_AP_14\""
"\"IPS-IN_2207\" \"bldg_56_ref - IPS_IN_AP_15\""
)
rm /tmp/moutall.sh
for i in "${mounts[@]}"; do
CMD="/shd/CTC/SV/mounting/ism_client.py mount "$i""
echo $CMD >> /tmp/moutall.sh
done
chmod +x /tmp/moutall.sh
/tmp/moutall.sh
@@ -1,20 +0,0 @@
ism_client.py benötigt python3 und ein weiteres Modul, welches nicht im Standardumfang enthalten ist.
Dieses Modul kann man sich in eine virtuelle python-Umgebung (virtual env oder kurz venv) installieren.
Das Skript mounting_hack.sh geht davon aus, dass diese python-venv in ~/venv3 lokalisiert ist.
1. Virtuelle Umgebung anlegen:
$ python3 -m venv ~/venv3
2. venv aktivieren
$ source ~/venv3/bin/activate
3. Dependencies installieren.
$ https_proxy=http://<user>:<password>@proxy-rde:8080 pip install -r requirements.txt
4. Optional: Deaktivieren der venv
$ deactivate
Das Skript mounting_hack.sh kann aufgerufen werden, ohne zuvor die venv zu aktivieren.
Will man das python-Skript ism_client.py selbst direkt aufrufen, muss man zuvor die
venv wie oben unter 2 beschrieben aktivieren.
@@ -1 +0,0 @@
websocket-client==0.46.0
@@ -1,46 +0,0 @@
#
# CMakeLists.txt for Lts/Tests (Qt6 Migration)
#
# This module provides database initialization scripts and test data.
# It does NOT build any binaries - only installs files and provides
# manual targets for database initialization.
#
# Manual targets (not part of automatic build):
# make db - Create production database (guez)
# make test-db - Create test database with exercise data
# make ahtc-db - Create AHTC database
# make ahtc-test-db - Create AHTC test database
# make qatar-db - Create Qatar database
# make l400p2-db - Create L400P2 database
# make demo-db - Create Demo database
# make commaster-db - Create ComMaster database
#
# Add subdirectory for database initialization scripts
if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/DatabaseInitialisation")
add_subdirectory(DatabaseInitialisation)
else()
message(STATUS "Skipping Lts/Tests/DatabaseInitialisation - directory not found")
endif()
# Install Bt56Test files
if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/Bt56Test")
install(DIRECTORY Bt56Test/
DESTINATION share/Lts/tests/Bt56Test
FILES_MATCHING PATTERN "*.py" PATTERN "*.sql" PATTERN "*.xml"
PATTERN "*.txt" PATTERN "*.sh" PATTERN "*.flt")
endif()
# Install Schnoeggersburg files
if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/Schnoeggersburg")
install(DIRECTORY Schnoeggersburg/
DESTINATION share/Lts/tests/Schnoeggersburg
FILES_MATCHING PATTERN "*.csv")
endif()
# Install lts-cc.conf template
if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../lts-cc.conf")
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../lts-cc.conf"
DESTINATION share/Lts/tests
RENAME lts-cc.conf.template)
endif()
@@ -1,12 +0,0 @@
cd AhtcSymbols
(pwd-> TDS-source/Lts/Tests/DatabaseInitialisation/AhtcSymbols)
This dir should contain 'ahtc_typen.unl'
python3 ./ahtcSymbols2Sql.py . ./ahtc_typen.unl ..
output 1: -> ./ahtc_flm_symbols.sql -> cp ..
output 2: -> ../insert_ppm_values_types_with_symbols.sql -> mv ../insert_ppm_values_types_with_symbols.sql ../insert_ppm_values_types.sql
@@ -1,339 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE symbol SYSTEM "symbole.dtd">
<symbol version="1.0" id="0" dimen="undefined" affil="undefined" bcdab="undefined" command_level="undefined" mob="undefined">
<name>Nichts</name>
<text1 maxdatalength="4"><data align="center"></data></text1>
<graphic scale="1.0">
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
<point x="-0.672584503566" y="0.0725845035699999" />
<point x="-0.47" y="-0.1300000000000001" />
</ellipse>
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
<point x="0.30741549643" y="0.9725845035660001" />
<point x="0.5100000000000001" y="0.77" />
</ellipse>
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
<point x="0.0974154964300002" y="0.6325845035659999" />
<point x="0.30000000000000004" y="0.4300000000000001" />
</ellipse>
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
<point x="0.39741549643000024" y="-0.3274154964300003" />
<point x="0.6000000000000001" y="-0.5300000000000001" />
</ellipse>
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
<point x="-0.5225845035700001" y="1.2225845035660001" />
<point x="-0.31999999999999995" y="1.02" />
</ellipse>
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
<point x="-0.13258450356999987" y="-0.7174154964300001" />
<point x="0.06999999999999994" y="-0.9199999999999999" />
</ellipse>
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
<point x="-0.1825845035699999" y="1.362584503566" />
<point x="0.01999999999999993" y="1.16" />
</ellipse>
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
<point x="-0.28148261009000014" y="-1.1285173899099998" />
<point x="-0.009999999999999966" y="-1.4000000000000001" />
</ellipse>
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
<point x="-0.6525845035660001" y="-0.45741549643" />
<point x="-0.45" y="-0.6600000000000001" />
</ellipse>
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
<point x="-0.1825845035699999" y="0.44258450357" />
<point x="0.01999999999999993" y="0.24000000000000005" />
</ellipse>
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
<point x="0.2774154964300003" y="1.152584503566" />
<point x="0.4800000000000001" y="0.9500000000000001" />
</ellipse>
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
<point x="-0.1825845035699999" y="0.44258450357" />
<point x="0.01999999999999993" y="0.24000000000000005" />
</ellipse>
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
<point x="0.2674154964300001" y="0.772584503566" />
<point x="0.47" y="0.57" />
</ellipse>
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
<point x="0.18741549643000008" y="0.702584503566" />
<point x="0.3899999999999999" y="0.5" />
</ellipse>
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
<point x="-0.0025845035699997966" y="0.5725845035700001" />
<point x="0.2" y="0.36999999999999994" />
</ellipse>
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
<point x="-0.08258450356999987" y="0.50258450357" />
<point x="0.11999999999999994" y="0.30000000000000004" />
</ellipse>
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
<point x="-0.31258450356999995" y="0.35258450357" />
<point x="-0.10999999999999997" y="0.15000000000000002" />
</ellipse>
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
<point x="-0.56258450357" y="0.19258450356999984" />
<point x="-0.36" y="-0.010000000000000142" />
</ellipse>
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
<point x="-0.752584503566" y="-0.047415496430000204" />
<point x="-0.55" y="-0.25" />
</ellipse>
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
<point x="-0.742584503566" y="-0.31741549643000017" />
<point x="-0.54" y="-0.5199999999999999" />
</ellipse>
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
<point x="-0.56258450357" y="-0.5374154964300001" />
<point x="-0.36" y="-0.7399999999999999" />
</ellipse>
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
<point x="-0.31258450356999995" y="-0.6674154964300002" />
<point x="-0.10999999999999997" y="-0.87" />
</ellipse>
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
<point x="0.047415496430000204" y="-0.6874154964300001" />
<point x="0.25" y="-0.8899999999999999" />
</ellipse>
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
<point x="0.30741549643" y="-0.4474154964300002" />
<point x="0.5100000000000001" y="-0.65" />
</ellipse>
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
<point x="-0.44258450357" y="1.302584503566" />
<point x="-0.24000000000000005" y="1.1" />
</ellipse>
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
<point x="0.1474154964300002" y="1.2725845035660002" />
<point x="0.35000000000000003" y="1.07" />
</ellipse>
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
<point x="-0.43258450357000006" y="0.2925845035699998" />
<point x="-0.2300000000000001" y="0.09000000000000004" />
</ellipse>
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
<point x="-0.7625845035659999" y="-0.15741549643" />
<point x="-0.5599999999999999" y="-0.36000000000000015" />
</ellipse>
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
<point x="0.1774154964300003" y="-0.5874154964300001" />
<point x="0.3800000000000001" y="-0.7899999999999999" />
</ellipse>
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
<point x="-0.41258450357" y="-0.6274154964300003" />
<point x="-0.20999999999999996" y="-0.8300000000000001" />
</ellipse>
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
<point x="0.2974154964300002" y="1.102584503566" />
<point x="0.5" y="0.9" />
</ellipse>
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
<point x="-0.022584503569999904" y="1.352584503566" />
<point x="0.18000000000000008" y="1.1500000000000001" />
</ellipse>
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
<point x="-0.26258450356999996" y="1.352584503566" />
<point x="-0.05999999999999997" y="1.1500000000000001" />
</ellipse>
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
<point x="-0.36258450356999994" y="0.31258450356999995" />
<point x="-0.15999999999999998" y="0.10999999999999997" />
</ellipse>
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
<point x="-0.24258450356999983" y="0.38258450357000007" />
<point x="-0.040000000000000036" y="0.18000000000000008" />
</ellipse>
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
<point x="-0.49258450357000005" y="0.24258450356999983" />
<point x="-0.29000000000000004" y="0.040000000000000036" />
</ellipse>
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
<point x="-0.712584503566" y="0.01258450356999994" />
<point x="-0.51" y="-0.18999999999999986" />
</ellipse>
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
<point x="-0.6225845035659999" y="0.13258450356999987" />
<point x="-0.41999999999999993" y="-0.06999999999999994" />
</ellipse>
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
<point x="-0.7325845035659999" y="-0.3774154964300003" />
<point x="-0.5300000000000001" y="-0.5800000000000001" />
</ellipse>
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
<point x="-0.752584503566" y="-0.24741549643000021" />
<point x="-0.55" y="-0.45" />
</ellipse>
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
<point x="-0.50258450357" y="-0.5774154964300003" />
<point x="-0.30000000000000004" y="-0.7800000000000001" />
</ellipse>
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
<point x="0.25741549643" y="-0.5074154964300001" />
<point x="0.4600000000000002" y="-0.7100000000000002" />
</ellipse>
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
<point x="0.12741549643000027" y="-0.6474154964300003" />
<point x="0.33000000000000007" y="-0.8500000000000001" />
</ellipse>
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
<point x="-0.040000000000000036" y="-0.72" />
<point x="0.16000000000000014" y="-0.9199999999999999" />
</ellipse>
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
<point x="-0.22258450356999993" y="-0.7174154964300001" />
<point x="-0.01999999999999993" y="-0.9199999999999999" />
</ellipse>
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
<point x="-0.54258450357" y="1.162584503566" />
<point x="-0.3400000000000001" y="0.96" />
</ellipse>
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
<point x="-0.34258450357000003" y="1.352584503566" />
<point x="-0.14000000000000004" y="1.1500000000000001" />
</ellipse>
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
<point x="-0.08258450356999987" y="1.352584503566" />
<point x="0.11999999999999994" y="1.1500000000000001" />
</ellipse>
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
<point x="0.047415496430000204" y="1.3225845035660002" />
<point x="0.25" y="1.1199999999999999" />
</ellipse>
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
<point x="0.31741549643000017" y="1.052584503566" />
<point x="0.5199999999999999" y="0.8500000000000001" />
</ellipse>
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
<point x="0.21999999999999995" y="1.2300000000000002" />
<point x="0.41000000000000014" y="1.02" />
</ellipse>
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
<point x="-0.3225845035700001" y="-0.6874154964300001" />
<point x="-0.11999999999999994" y="-0.8899999999999999" />
</ellipse>
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
<point x="0.3774154964300003" y="-0.3774154964300003" />
<point x="0.5800000000000001" y="-0.5800000000000001" />
</ellipse>
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
<point x="-0.7625845035659999" y="-0.0974154964300002" />
<point x="-0.5599999999999999" y="-0.30000000000000004" />
</ellipse>
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
<point x="-0.35258450357" y="0.3225845035700001" />
<point x="-0.15000000000000002" y="0.11999999999999994" />
</ellipse>
</graphic>
</symbol>
@@ -1,51 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE symbol SYSTEM "symbole.dtd">
<symbol version="1.0" id="1" dimen="undefined" affil="undefined" bcdab="undefined" command_level="undefined" mob="undefined">
<name>ABC Aufkl Trp</name>
<text1 maxdatalength="4"><data align="center"></data></text1>
<graphic scale="1.5">
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
<point x="-0.25" y="1.2000000000000002" />
<point x="0.25" y="0.7000000000000001" />
</ellipse>
<rect rotate="0.0" linewidth="0.125" linestyle="solid" fill="0">
<point x="-1.5" y="0.5" />
<point x="1.5" y="-1.5" />
</rect>
<line rotate="0.0" linewidth="0.0625" linestyle="solid">
<point x="-1.4900000000000002" y="-1.49" />
<point x="1.5100000000000002" y="0.51" />
</line>
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
<point x="0.30000000000000004" y="0.25" />
<point x="0.9" y="-0.35000000000000003" />
</ellipse>
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
<point x="-0.9" y="0.25" />
<point x="-0.30000000000000004" y="-0.35000000000000003" />
</ellipse>
<line rotate="0.0" linewidth="0.0625" linestyle="solid">
<point x="0.45" y="0.15000000000000002" />
<point x="-0.5750000000000001" y="-1.175" />
</line>
<line rotate="0.0" linewidth="0.0625" linestyle="solid">
<point x="-0.45" y="0.15000000000000002" />
<point x="0.6000000000000001" y="-1.2000000000000002" />
</line>
</graphic>
</symbol>
@@ -1,63 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE symbol SYSTEM "symbole.dtd">
<symbol version="1.0" id="2" dimen="undefined" affil="undefined" bcdab="undefined" command_level="undefined" mob="undefined">
<name>ABC Aufkl Zg</name>
<text1 maxdatalength="4"><data align="center"></data></text1>
<graphic scale="2.5">
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
<point x="-0.9" y="1.2000000000000002" />
<point x="-0.4" y="0.7000000000000001" />
</ellipse>
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
<point x="-0.25" y="1.2000000000000002" />
<point x="0.25" y="0.7000000000000001" />
</ellipse>
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
<point x="0.4" y="1.2000000000000002" />
<point x="0.9" y="0.7000000000000001" />
</ellipse>
<rect rotate="0.0" linewidth="0.125" linestyle="solid" fill="0">
<point x="-1.5" y="0.5" />
<point x="1.5" y="-1.5" />
</rect>
<line rotate="0.0" linewidth="0.0625" linestyle="solid">
<point x="-1.4900000000000002" y="-1.49" />
<point x="1.5100000000000002" y="0.51" />
</line>
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
<point x="0.30000000000000004" y="0.25" />
<point x="0.9" y="-0.35000000000000003" />
</ellipse>
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
<point x="-0.9" y="0.25" />
<point x="-0.30000000000000004" y="-0.35000000000000003" />
</ellipse>
<line rotate="0.0" linewidth="0.0625" linestyle="solid">
<point x="0.45" y="0.15000000000000002" />
<point x="-0.5750000000000001" y="-1.175" />
</line>
<line rotate="0.0" linewidth="0.0625" linestyle="solid">
<point x="-0.45" y="0.15000000000000002" />
<point x="0.6000000000000001" y="-1.2000000000000002" />
</line>
</graphic>
</symbol>
@@ -1,28 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE symbol SYSTEM "symbole.dtd">
<symbol version="1.0" id="4" dimen="undefined" affil="undefined" bcdab="undefined" command_level="undefined" mob="undefined">
<name>Anh MiV</name>
<text1 maxdatalength="4"><data align="center"></data></text1>
<graphic scale="1.0">
<ellipse rotate="0.0" linewidth="0.125" linestyle="solid" fill="0" closed="1" start="0.0" extent="360.0">
<point x="-1.4000000000000001" y="-0.6000000000000001" />
<point x="-0.6000000000000001" y="-1.4000000000000001" />
</ellipse>
<polygon rotate="0.0" linewidth="0.125" linestyle="solid" fill="0" closed="0">
<point x="-1.59" y="-0.30000000000000004" />
<point x="0.21000000000000016" y="-0.30000000000000004" />
<point x="1.3100000000000003" y="-1.4000000000000001" />
</polygon>
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
<point x="0.8" y="-0.2" />
<point x="1.4000000000000001" y="-0.8" />
</ellipse>
</graphic>
</symbol>
@@ -1,40 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE symboltable SYSTEM "symbole.dtd">
<symbol version="2.0" id="0x00000008" dimen="air_space" affil="neutral" transformed="0" bcdab="undefined" command_level="undefined" headquarter="false" mob="undefined" vehicle="undefined" intrinsicmob="undefined" arming="undefined" >
<name>Armored Observation Vehicle</name>
<app6class classname="BOMBER" classhierarchy="1.X.2.1.1.1" classcodeid="S*A*MFB---*****" />
<text3 maxdatalength="6">
<data align="center"></data>
<data align="center"></data>
<data align="center"></data>
</text3>
<graphic scale="1.5">
<line transform="true" rotate="0" linewidth="0.125" linestyle="solid">
<point x="0.9" y="0.9"/>
<point x="0.9" y="-1.59"/>
</line>
<line transform="true" rotate="0" linewidth="0.125" linestyle="solid">
<point x="-0.9" y="0.9"/>
<point x="-0.9" y="-1.59"/>
</line>
<polygon transform="true" rotate="0" linewidth="0.125" linestyle="solid" closed="0" fill="0">
<point x="-0.92" y="0.2"/>
<point x="-0.01" y="0.81"/>
<point x="0.9" y="0.2"/>
</polygon>
<polygon transform="true" rotate="0" linewidth="0.125" linestyle="solid" closed="0" fill="0">
<point x="-0.93" y="-1.41"/>
<point x="-0.01" y="-0.78"/>
<point x="0.91" y="-1.41"/>
</polygon>
<ellipse transform="true" rotate="0" linewidth="0.00625" linestyle="solid" closed="1" start="0" extent="360" fill="1">
<point x="-0.15" y="-0.15"/>
<point x="0.15" y="-0.45"/>
</ellipse>
<polygon transform="true" rotate="0" linewidth="0.0625" linestyle="solid" closed="1" fill="0">
<point x="-0.45" y="-0.6"/>
<point x="0" y="0.2"/>
<point x="0.45" y="-0.6"/>
</polygon>
</graphic>
</symbol>
@@ -1,27 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE symbol SYSTEM "symbole.dtd">
<symbol version="1.0" id="10" dimen="undefined" affil="undefined" bcdab="undefined" command_level="undefined" mob="undefined">
<name>BergeTrp</name>
<text1 maxdatalength="4"><data align="center"></data></text1>
<graphic scale="1.5">
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
<point x="-0.25" y="1.2000000000000002" />
<point x="0.25" y="0.7000000000000001" />
</ellipse>
<rect rotate="0.0" linewidth="0.125" linestyle="solid" fill="0">
<point x="-1.5" y="0.5" />
<point x="1.5" y="-1.5" />
</rect>
<ellipse rotate="0.0" linewidth="0.125" linestyle="solid" fill="0" closed="0" start="180.0" extent="180.0">
<point x="-0.8" y="0.5" />
<point x="0.8" y="-0.8" />
</ellipse>
</graphic>
</symbol>
@@ -1,39 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE symbol SYSTEM "symbole.dtd">
<symbol version="1.0" id="11" dimen="undefined" affil="undefined" bcdab="undefined" command_level="undefined" mob="undefined">
<name>BPz B&uuml;ffel</name>
<text1 maxdatalength="4"><data align="center"></data></text1>
<graphic scale="1.5">
<line rotate="0.0" linewidth="0.125" linestyle="solid">
<point x="0.9" y="0.9" />
<point x="0.9" y="-1.5899999999999999" />
</line>
<line rotate="0.0" linewidth="0.125" linestyle="solid">
<point x="-0.9" y="0.9" />
<point x="-0.9" y="-1.5899999999999999" />
</line>
<line rotate="0.0" linewidth="0.125" linestyle="solid">
<point x="-0.9" y="0.6000000000000001" />
<point x="0.9" y="0.61" />
</line>
<ellipse rotate="0.0" linewidth="0.125" linestyle="solid" fill="0" closed="0" start="180.0" extent="180.0">
<point x="-0.9" y="1.3" />
<point x="0.9" y="-0.0" />
</ellipse>
<line rotate="0.0" linewidth="0.125" linestyle="solid">
<point x="-0.91" y="-0.9899999999999999" />
<point x="0.8899999999999999" y="-0.9899999999999999" />
</line>
</graphic>
</symbol>
@@ -1,41 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE symboltable SYSTEM "symbole.dtd">
<symbol version="2.0" id="0x0000000C" dimen="land_units" affil="neutral" transformed="0" bcdab="undefined" command_level="undefined" headquarter="false" mob="undefined" vehicle="undefined" intrinsicmob="undefined" arming="undefined" >
<name>Armored Bridgelayer</name>
<app6class classname="" classhierarchy="" classcodeid="" />
<text3 maxdatalength="6">
<data align="center"></data>
<data align="center"></data>
<data align="center"></data>
</text3>
<graphic scale="1.5">
<line transform="true" rotate="0" linewidth="0.125" linestyle="solid">
<point x="0.9" y="0.9"/>
<point x="0.9" y="-1.59"/>
</line>
<line transform="true" rotate="0" linewidth="0.125" linestyle="solid">
<point x="-0.9" y="0.9"/>
<point x="-0.9" y="-1.59"/>
</line>
<line transform="true" rotate="0" linewidth="0.125" linestyle="solid">
<point x="-0.9" y="0.4"/>
<point x="0.9" y="0.41"/>
</line>
<polygon transform="true" rotate="0" linewidth="0.0625" linestyle="solid" closed="0" fill="0">
<point x="-0.4" y="0.1"/>
<point x="-0.2" y="-0.1"/>
<point x="-0.2" y="-0.6"/>
<point x="-0.4" y="-0.8"/>
</polygon>
<polygon transform="true" rotate="0" linewidth="0.0625" linestyle="solid" closed="0" fill="0">
<point x="0.4" y="-0.8"/>
<point x="0.2" y="-0.6"/>
<point x="0.2" y="-0.1"/>
<point x="0.4" y="0.1"/>
</polygon>
<line transform="true" rotate="0" linewidth="0.125" linestyle="solid">
<point x="-0.9" y="-1.1"/>
<point x="0.9" y="-1.1"/>
</line>
</graphic>
</symbol>
@@ -1,43 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE symboltable SYSTEM "symbole.dtd">
<symbol version="2.0" id="0x0000000F" dimen="land_equipment" affil="unknown" transformed="0" bcdab="squad" command_level="cl_section" headquarter="false" mob="undefined" vehicle="undefined" intrinsicmob="undefined" arming="undefined" >
<name>Armored BN CP Vehicle</name>
<app6class classname="" classhierarchy="" classcodeid="" />
<text3 maxdatalength="6">
<data align="center"></data>
<data align="center"></data>
<data align="center"></data>
</text3>
<graphic scale="1.5">
<polygon transform="true" rotate="0" linewidth="0.125" linestyle="solid" closed="1" fill="0">
<point x="-0.78" y="0.6"/>
<point x="-0.98" y="0.44"/>
<point x="-1.1" y="0.19"/>
<point x="-1.1" y="0.01"/>
<point x="-0.98" y="-0.24"/>
<point x="-0.78" y="-0.4"/>
<point x="0.78" y="-0.4"/>
<point x="0.98" y="-0.24"/>
<point x="1.1" y="0.01"/>
<point x="1.1" y="0.19"/>
<point x="0.98" y="0.44"/>
<point x="0.78" y="0.6"/>
</polygon>
<rect transform="true" rotate="0" linewidth="0.125" linestyle="solid" fill="0">
<point x="-1.5" y="1.1"/>
<point x="1.5" y="-0.9"/>
</rect>
<line transform="true" rotate="0" linewidth="0.125" linestyle="solid">
<point x="0.3" y="1.59"/>
<point x="0.3" y="1.1"/>
</line>
<line transform="true" rotate="0" linewidth="0.125" linestyle="solid">
<point x="-0.3" y="1.59"/>
<point x="-0.3" y="1.1"/>
</line>
<line transform="true" rotate="0" linewidth="0.125" linestyle="solid">
<point x="-1.5" y="-0.9"/>
<point x="-1.49" y="-1.59"/>
</line>
</graphic>
</symbol>
@@ -1,12 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE symboltable SYSTEM "symbole.dtd">
<symbol version="1.0" id="0x00000012" dimen="land_equipment" affil="friend" transformed="0" bcdab="undefined" command_level="undefined" mob="undefined" vehicle="util_vehicle_armored" intrinsicmob="wheel_all_terrain" arming="undefined">
<name>SP Armored AAD Gun</name>
<misc class="lightC" />
<misc class="arm_heavy" />
<text1 maxdatalength="4">
<data align="center"></data>
</text1>
<graphic scale="1.5">
</graphic>
</symbol>
@@ -1,10 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE symboltable SYSTEM "symbole.dtd">
<symbol version="1.0" id="0x00000015" dimen="land_equipment" affil="friend" transformed="0" bcdab="undefined" command_level="undefined" mob="undefined" vehicle="util_vehicleA" intrinsicmob="wheel_all_terrain" arming="missile">
<name>SP Armored AAD Missile</name>
<text1 maxdatalength="4">
<data align="center"></data>
</text1>
<graphic scale="1.5">
</graphic>
</symbol>
@@ -1,41 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE symbol SYSTEM "symbole.dtd">
<symbol version="1.0" id="22" dimen="undefined" affil="undefined" bcdab="undefined" command_level="undefined" mob="undefined">
<name>FlaRak Stinger</name>
<text1 maxdatalength="4"><data align="center"></data></text1>
<graphic scale="1.0">
<polygon rotate="0.0" linewidth="0.125" linestyle="solid" fill="0" closed="0">
<point x="-0.57" y="0.05" />
<point x="-0.009999999999999966" y="0.72" />
<point x="0.55" y="0.05" />
</polygon>
<polygon rotate="0.0" linewidth="0.125" linestyle="solid" fill="0" closed="0">
<point x="-0.5800000000000001" y="0.6400000000000001" />
<point x="-0.009999999999999966" y="1.33" />
<point x="0.5600000000000002" y="0.6400000000000001" />
</polygon>
<ellipse rotate="0.0" linewidth="0.125" linestyle="solid" fill="1" closed="0" start="0.0" extent="180.0">
<point x="-0.7000000000000001" y="-0.9" />
<point x="0.7000000000000001" y="-2.29" />
</ellipse>
<line rotate="0.0" linewidth="0.125" linestyle="solid">
<point x="0.7000000000000001" y="-1.5" />
<point x="-0.7000000000000001" y="-1.49" />
</line>
<line rotate="0.0" linewidth="0.125" linestyle="solid">
<point x="0.0" y="1.2000000000000002" />
<point x="0.0" y="-0.9500000000000001" />
</line>
</graphic>
</symbol>
@@ -1,63 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE symbol SYSTEM "symbole.dtd">
<symbol version="1.0" id="24" dimen="undefined" affil="undefined" bcdab="undefined" command_level="undefined" mob="undefined">
<name>Flt Trp</name>
<text1 maxdatalength="4"><data align="center"></data></text1>
<graphic scale="1.5">
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
<point x="-0.25" y="1.3" />
<point x="0.25" y="0.8" />
</ellipse>
<rect rotate="0.0" linewidth="0.125" linestyle="solid" fill="0">
<point x="-1.5" y="0.5" />
<point x="1.5" y="-1.5" />
</rect>
<line rotate="0.0" linewidth="0.125" linestyle="solid">
<point x="-0.4" y="-0.55" />
<point x="-1.0" y="-0.55" />
</line>
<line rotate="0.0" linewidth="0.125" linestyle="solid">
<point x="1.1" y="-0.30000000000000004" />
<point x="0.5" y="-0.30000000000000004" />
</line>
<line rotate="0.0" linewidth="0.125" linestyle="solid">
<point x="0.8" y="0.1" />
<point x="0.8" y="-1.2000000000000002" />
</line>
<line rotate="0.0" linewidth="0.125" linestyle="solid">
<point x="-1.0" y="0.1" />
<point x="-1.0" y="-1.2000000000000002" />
</line>
<line rotate="0.0" linewidth="0.125" linestyle="solid">
<point x="-0.4" y="-0.0" />
<point x="-1.0" y="-0.0" />
</line>
<line rotate="0.0" linewidth="0.125" linestyle="solid">
<point x="-0.1" y="0.1" />
<point x="-0.1" y="-1.2000000000000002" />
</line>
<line rotate="0.0" linewidth="0.125" linestyle="solid">
<point x="0.5" y="-1.1" />
<point x="-0.1" y="-1.1" />
</line>
</graphic>
</symbol>
@@ -1,27 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE symbol SYSTEM "symbole.dtd">
<symbol version="1.0" id="25" dimen="undefined" affil="undefined" bcdab="undefined" command_level="undefined" mob="undefined">
<name>Flugabwehrwaffe</name>
<text1 maxdatalength="4"><data align="center"></data></text1>
<graphic scale="1.0">
<line rotate="0.0" linewidth="0.125" linestyle="solid">
<point x="0.0" y="1.2000000000000002" />
<point x="0.0" y="-0.9" />
</line>
<ellipse rotate="0.0" linewidth="0.125" linestyle="solid" fill="1" closed="0" start="0.0" extent="180.0">
<point x="-0.7000000000000001" y="-0.9" />
<point x="0.7000000000000001" y="-2.25" />
</ellipse>
<line rotate="0.0" linewidth="0.125" linestyle="solid">
<point x="0.7000000000000001" y="-1.5" />
<point x="-0.7000000000000001" y="-1.49" />
</line>
</graphic>
</symbol>
@@ -1,47 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE symboltable SYSTEM "symbole.dtd">
<symbol version="1.0" id="0x0000001B" dimen="land_units" affil="friend" transformed="0" bcdab="undefined" command_level="undefined" mob="undefined" vehicle="undefined" intrinsicmob="undefined" arming="undefined">
<name>Paratroop BN</name>
<text1 maxdatalength="4">
<data align="center"></data>
</text1>
<graphic scale="3.5">
<rect transform="true" rotate="0" linewidth="0.125" linestyle="solid" fill="0">
<point x="-1.5" y="0.982759"/>
<point x="1.5" y="-1.01724"/>
</rect>
<line transform="true" rotate="0" linewidth="0.125" linestyle="solid">
<point x="0.3" y="1.53103"/>
<point x="0.3" y="0.931034"/>
</line>
<line transform="true" rotate="0" linewidth="0.125" linestyle="solid">
<point x="-0.3" y="1.54828"/>
<point x="-0.3" y="0.948276"/>
</line>
<line transform="true" rotate="0" linewidth="0.125" linestyle="solid">
<point x="1.5" y="0.948276"/>
<point x="0.4" y="0.248276"/>
</line>
<line transform="true" rotate="0" linewidth="0.125" linestyle="solid">
<point x="-0.3" y="-0.217241"/>
<point x="-1.49" y="-1.00724"/>
</line>
<line transform="true" rotate="0" linewidth="0.125" linestyle="solid">
<point x="-1.5" y="0.982759"/>
<point x="-0.4" y="0.282759"/>
</line>
<line transform="true" rotate="0" linewidth="0.125" linestyle="solid">
<point x="0.208621" y="-0.134483"/>
<point x="1.49862" y="-1.02448"/>
</line>
<ellipse transform="true" rotate="0" linewidth="0.125" linestyle="solid" closed="0" start="0" extent="180" fill="0">
<point x="-0.41" y="0.506552"/>
<point x="0.4" y="-0.300115"/>
</ellipse>
<polygon transform="true" rotate="0" linewidth="0.125" linestyle="solid" closed="1" fill="0">
<point x="-0.41" y="0.12046"/>
<point x="0.4" y="0.12046"/>
<point x="-0.005" y="-0.686207"/>
</polygon>
</graphic>
</symbol>
@@ -1,64 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE symbol SYSTEM "symbole.dtd">
<symbol version="1.0" id="29" dimen="undefined" affil="undefined" bcdab="undefined" command_level="undefined" mob="undefined">
<name>FschJgGrp</name>
<text1 maxdatalength="4"><data align="center"></data></text1>
<graphic scale="2.0">
<rect rotate="0.0" linewidth="0.125" linestyle="solid" fill="0">
<point x="-1.5" y="0.5" />
<point x="1.5" y="-1.5" />
</rect>
<line rotate="0.0" linewidth="0.125" linestyle="solid">
<point x="1.5" y="0.5" />
<point x="0.4" y="-0.2" />
</line>
<line rotate="0.0" linewidth="0.125" linestyle="solid">
<point x="-0.30000000000000004" y="-0.7000000000000001" />
<point x="-1.4900000000000002" y="-1.49" />
</line>
<line rotate="0.0" linewidth="0.125" linestyle="solid">
<point x="-1.5" y="0.5" />
<point x="-0.4" y="-0.2" />
</line>
<line rotate="0.0" linewidth="0.125" linestyle="solid">
<point x="0.2" y="-0.6000000000000001" />
<point x="1.49" y="-1.49" />
</line>
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
<point x="-0.7000000000000001" y="1.2000000000000002" />
<point x="-0.2" y="0.7000000000000001" />
</ellipse>
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
<point x="0.2" y="1.2000000000000002" />
<point x="0.7000000000000001" y="0.7000000000000001" />
</ellipse>
<ellipse rotate="0.0" linewidth="0.125" linestyle="solid" fill="0" closed="0" start="0.0" extent="180.0">
<point x="-0.41" y="0.10999999999999997" />
<point x="0.4" y="-0.6966666666700001" />
</ellipse>
<polygon rotate="0.0" linewidth="0.125" linestyle="solid" fill="0" closed="1">
<point x="-0.41" y="-0.2933333333300002" />
<point x="0.4" y="-0.2933333333300002" />
<point x="-0.005000000000000071" y="-1.1" />
</polygon>
</graphic>
</symbol>
@@ -1,43 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE symboltable SYSTEM "symbole.dtd">
<symbol version="1.0" id="0x0000001F" dimen="land_units" affil="friend" transformed="0" bcdab="undefined" command_level="company" mob="undefined" vehicle="undefined" intrinsicmob="undefined" arming="undefined">
<name>Paratroop CO</name>
<text1 maxdatalength="4">
<data align="center"></data>
</text1>
<graphic scale="3">
<rect transform="true" rotate="0" linewidth="0.125" linestyle="solid" fill="0">
<point x="-1.5" y="0.5"/>
<point x="1.5" y="-1.5"/>
</rect>
<line transform="true" rotate="0" linewidth="0.125" linestyle="solid">
<point x="0" y="1.1"/>
<point x="0" y="0.5"/>
</line>
<line transform="true" rotate="0" linewidth="0.125" linestyle="solid">
<point x="1.5" y="0.5"/>
<point x="0.4" y="-0.2"/>
</line>
<line transform="true" rotate="0" linewidth="0.125" linestyle="solid">
<point x="-0.3" y="-0.7"/>
<point x="-1.49" y="-1.49"/>
</line>
<line transform="true" rotate="0" linewidth="0.125" linestyle="solid">
<point x="-1.5" y="0.5"/>
<point x="-0.4" y="-0.2"/>
</line>
<line transform="true" rotate="0" linewidth="0.125" linestyle="solid">
<point x="0.2" y="-0.6"/>
<point x="1.49" y="-1.49"/>
</line>
<ellipse transform="true" rotate="0" linewidth="0.125" linestyle="solid" closed="0" start="0" extent="180" fill="0">
<point x="-0.41" y="0.11"/>
<point x="0.4" y="-0.696667"/>
</ellipse>
<polygon transform="true" rotate="0" linewidth="0.125" linestyle="solid" closed="1" fill="0">
<point x="-0.41" y="-0.293333"/>
<point x="0.4" y="-0.293333"/>
<point x="-0.005" y="-1.1"/>
</polygon>
</graphic>
</symbol>
@@ -1,82 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE symbol SYSTEM "symbole.dtd">
<symbol version="1.0" id="33" dimen="undefined" affil="undefined" bcdab="undefined" command_level="undefined" mob="undefined">
<name>FschJgKpF&uuml;Grp</name>
<text1 maxdatalength="4"><data align="center"></data></text1>
<graphic scale="2.0">
<rect rotate="0.0" linewidth="0.125" linestyle="solid" fill="0">
<point x="-1.5" y="0.5" />
<point x="1.5" y="-1.5" />
</rect>
<line rotate="0.0" linewidth="0.125" linestyle="solid">
<point x="0.0" y="0.6000000000000001" />
<point x="0.0" y="-0.0" />
</line>
<line rotate="0.0" linewidth="0.125" linestyle="solid">
<point x="-1.5" y="0.4" />
<point x="1.49" y="0.4" />
</line>
<line rotate="0.0" linewidth="0.125" linestyle="solid">
<point x="-1.5" y="0.30000000000000004" />
<point x="1.49" y="0.30000000000000004" />
</line>
<line rotate="0.0" linewidth="0.125" linestyle="solid">
<point x="-0.2" y="-0.8" />
<point x="-1.4900000000000002" y="-1.49" />
</line>
<line rotate="0.0" linewidth="0.125" linestyle="solid">
<point x="1.49" y="0.30000000000000004" />
<point x="0.4" y="-0.4" />
</line>
<line rotate="0.0" linewidth="0.125" linestyle="solid">
<point x="-1.4900000000000002" y="0.30000000000000004" />
<point x="-0.4" y="-0.4" />
</line>
<line rotate="0.0" linewidth="0.125" linestyle="solid">
<point x="0.2" y="-0.7000000000000001" />
<point x="1.49" y="-1.49" />
</line>
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
<point x="-0.7000000000000001" y="1.2000000000000002" />
<point x="-0.2" y="0.7000000000000001" />
</ellipse>
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
<point x="0.2" y="1.2000000000000002" />
<point x="0.7000000000000001" y="0.7000000000000001" />
</ellipse>
<ellipse rotate="0.0" linewidth="0.125" linestyle="solid" fill="0" closed="0" start="0.0" extent="180.0">
<point x="-0.41" y="-0.18999999999999986" />
<point x="0.4" y="-0.8633333333300002" />
</ellipse>
<polygon rotate="0.0" linewidth="0.125" linestyle="solid" fill="0" closed="1">
<point x="-0.41" y="-0.5266666666699997" />
<point x="0.4" y="-0.5266666666699997" />
<point x="-0.005000000000000071" y="-1.2000000000000002" />
</polygon>
</graphic>
</symbol>
@@ -1,51 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE symboltable SYSTEM "symbole.dtd">
<symbol version="1.0" id="0x00000023" dimen="land_units" affil="friend" transformed="0" bcdab="undefined" command_level="undefined" mob="undefined" vehicle="undefined" intrinsicmob="undefined" arming="undefined">
<name>Paratroop PLT</name>
<text1 maxdatalength="4">
<data align="center"></data>
</text1>
<graphic scale="2.5">
<rect transform="true" rotate="0" linewidth="0.125" linestyle="solid" fill="0">
<point x="-1.5" y="0.982759"/>
<point x="1.5" y="-1.01724"/>
</rect>
<line transform="true" rotate="0" linewidth="0.125" linestyle="solid">
<point x="1.5" y="0.965517"/>
<point x="0.4" y="0.265517"/>
</line>
<line transform="true" rotate="0" linewidth="0.125" linestyle="solid">
<point x="-0.3" y="-0.217241"/>
<point x="-1.49" y="-1.00724"/>
</line>
<line transform="true" rotate="0" linewidth="0.125" linestyle="solid">
<point x="-1.5" y="0.965517"/>
<point x="-0.4" y="0.265517"/>
</line>
<line transform="true" rotate="0" linewidth="0.125" linestyle="solid">
<point x="0.2" y="-0.134483"/>
<point x="1.49" y="-1.02448"/>
</line>
<ellipse transform="true" rotate="0" linewidth="0.00625" linestyle="solid" closed="1" start="0" extent="360" fill="1">
<point x="-0.9" y="1.59655"/>
<point x="-0.4" y="1.09655"/>
</ellipse>
<ellipse transform="true" rotate="0" linewidth="0.00625" linestyle="solid" closed="1" start="0" extent="360" fill="1">
<point x="0.4" y="1.59655"/>
<point x="0.9" y="1.09655"/>
</ellipse>
<ellipse transform="true" rotate="0" linewidth="0.00625" linestyle="solid" closed="1" start="0" extent="360" fill="1">
<point x="-0.25" y="1.59655"/>
<point x="0.25" y="1.09655"/>
</ellipse>
<ellipse transform="true" rotate="0" linewidth="0.125" linestyle="solid" closed="0" start="0" extent="180" fill="0">
<point x="-0.41" y="0.523793"/>
<point x="0.4" y="-0.282874"/>
</ellipse>
<polygon transform="true" rotate="0" linewidth="0.125" linestyle="solid" closed="1" fill="0">
<point x="-0.41" y="0.137701"/>
<point x="0.4" y="0.137701"/>
<point x="-0.005" y="-0.668966"/>
</polygon>
</graphic>
</symbol>
@@ -1,76 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE symbol SYSTEM "symbole.dtd">
<symbol version="1.0" id="37" dimen="undefined" affil="undefined" bcdab="undefined" command_level="undefined" mob="undefined">
<name>FschJgZgTrp</name>
<text1 maxdatalength="4"><data align="center"></data></text1>
<graphic scale="2.0">
<rect rotate="0.0" linewidth="0.125" linestyle="solid" fill="0">
<point x="-1.5" y="0.5" />
<point x="1.5" y="-1.5" />
</rect>
<line rotate="0.0" linewidth="0.125" linestyle="solid">
<point x="-0.2" y="-0.8" />
<point x="-1.4900000000000002" y="-1.49" />
</line>
<line rotate="0.0" linewidth="0.125" linestyle="solid">
<point x="1.49" y="0.30000000000000004" />
<point x="0.4" y="-0.4" />
</line>
<line rotate="0.0" linewidth="0.125" linestyle="solid">
<point x="-1.4900000000000002" y="0.30000000000000004" />
<point x="-0.4" y="-0.4" />
</line>
<line rotate="0.0" linewidth="0.125" linestyle="solid">
<point x="0.2" y="-0.7000000000000001" />
<point x="1.49" y="-1.49" />
</line>
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
<point x="-0.25" y="1.2000000000000002" />
<point x="0.25" y="0.7000000000000001" />
</ellipse>
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
<point x="-0.55" y="0.35000000000000003" />
<point x="-0.25" y="0.05" />
</ellipse>
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
<point x="0.25" y="0.35000000000000003" />
<point x="0.55" y="0.05" />
</ellipse>
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
<point x="-0.15000000000000002" y="0.35000000000000003" />
<point x="0.15000000000000002" y="0.05" />
</ellipse>
<ellipse rotate="0.0" linewidth="0.125" linestyle="solid" fill="0" closed="0" start="0.0" extent="180.0">
<point x="-0.41" y="-0.18999999999999986" />
<point x="0.4" y="-0.8633333333300002" />
</ellipse>
<polygon rotate="0.0" linewidth="0.125" linestyle="solid" fill="0" closed="1">
<point x="-0.41" y="-0.5266666666699997" />
<point x="0.4" y="-0.5266666666699997" />
<point x="-0.005000000000000071" y="-1.2000000000000002" />
</polygon>
</graphic>
</symbol>
@@ -1,29 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE symbol SYSTEM "symbole.dtd">
<symbol version="1.0" id="45" dimen="undefined" affil="undefined" bcdab="undefined" command_level="undefined" mob="undefined">
<name>F&uuml;FuPz M113</name>
<text1 maxdatalength="4"><data align="center"></data></text1>
<graphic scale="1.5">
<polygon rotate="0.0" linewidth="0.125" linestyle="solid" fill="0" closed="1">
<point x="-0.9" y="0.81" />
<point x="0.9" y="0.81" />
<point x="0.9" y="-1.49" />
<point x="-0.9" y="-1.49" />
</polygon>
<line rotate="0.0" linewidth="0.0625" linestyle="solid">
<point x="-0.5" y="-1.5" />
<point x="-0.5" y="0.8" />
</line>
<line rotate="0.0" linewidth="0.0625" linestyle="solid">
<point x="0.5" y="-1.5" />
<point x="0.5" y="0.8" />
</line>
</graphic>
</symbol>
Loaded 100 of 1313 files, more files were not shown because too many files have changed in this diff. Show more