Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3924b1e72b | ||
|
|
fb3e91ea4b | ||
|
|
e067c21b0d | ||
|
|
131a6714cf |
No files matched your search
+4
-26
@@ -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,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
|
||||
@@ -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})
|
||||
@@ -263,19 +254,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 +280,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 +335,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 +345,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 +360,37 @@ if(NOT Qt6_FOUND)
|
||||
message(STATUS "Found Qt6 (minimal): ${Qt6Core_VERSION}")
|
||||
endif()
|
||||
|
||||
# Qt6::XmlPatterns (consumed by the MSDL/Saab import libs, gated by
|
||||
# BUILD_PLUGINS_MSDL / BUILD_PLUGINS_SAAB): the XmlPatterns module (its own
|
||||
# qtxmlpatterns repo) was removed in Qt 6.0 and never re-introduced, so no Qt 6
|
||||
# install carries it. It is NOT part of the component lists above (a missing
|
||||
# component there would flip Qt6_FOUND off and disable the whole GUI path).
|
||||
# Find it separately; when absent the two plugins must stay disabled - their
|
||||
# CMakeLists reference Qt6::XmlPatterns in link libraries and CMake errors at
|
||||
# generate time for an undefined namespaced target.
|
||||
if(NOT TARGET Qt6::XmlPatterns)
|
||||
find_package(Qt6XmlPatterns QUIET)
|
||||
if(Qt6XmlPatterns_FOUND)
|
||||
message(STATUS "Found Qt6XmlPatterns")
|
||||
else()
|
||||
message(STATUS "Qt6XmlPatterns not found (PpmMSDLGuiPlugin/PpmSAABGuiPlugin require it; keep BUILD_PLUGINS_MSDL/BUILD_PLUGINS_SAAB OFF)")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
# 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 +746,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 +753,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
|
||||
}
|
||||
|
||||
{
|
||||
|
||||
+3
-3
@@ -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
|
||||
{
|
||||
|
||||
+4
-4
@@ -4,7 +4,7 @@
|
||||
#include <osg/Material>
|
||||
#include <osg/BlendFunc>
|
||||
#include <osg/BlendColor>
|
||||
#include <QStringView>
|
||||
#include <QStringRef>
|
||||
#include <QtCore/QVector>
|
||||
|
||||
namespace VCtrl
|
||||
@@ -87,10 +87,10 @@ 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)
|
||||
const QVector<QStringRef> descprt = descr.splitRef(QLatin1Char(';'));
|
||||
for (const QStringRef &prt : descprt)
|
||||
{
|
||||
const QVector<QStringView> items = prt.split(QLatin1Char('='));
|
||||
const QVector<QStringRef> items = prt.split(QLatin1Char('='));
|
||||
if (items.size() == 2 && items[0] == QLatin1String("base_height"))
|
||||
h = items[1].toFloat();
|
||||
}
|
||||
|
||||
+7
-7
@@ -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();
|
||||
|
||||
+2
-2
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
+6
-6
@@ -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);
|
||||
};
|
||||
|
||||
+8
-8
@@ -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);
|
||||
};
|
||||
|
||||
+4
-4
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
|
||||
+1
-1
@@ -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;
|
||||
}
|
||||
|
||||
+6
-6
@@ -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
|
||||
#
|
||||
|
||||
+3
@@ -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
|
||||
|
||||
+17
-16
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
+2
-1
@@ -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;
|
||||
};
|
||||
|
||||
}
|
||||
@@ -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
|
||||
|
||||
+29
-29
@@ -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;
|
||||
|
||||
+1
-1
@@ -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>
|
||||
|
||||
|
||||
+1
-1
@@ -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;
|
||||
}();
|
||||
|
||||
+1
-1
@@ -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,
|
||||
|
||||
+16
-16
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
|
||||
+1
@@ -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"
|
||||
|
||||
+27
-27
@@ -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
|
||||
+2
-1
@@ -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
|
||||
|
||||
|
||||
|
||||
-339
@@ -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>
|
||||
|
||||
-51
@@ -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>
|
||||
|
||||
-63
@@ -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>
|
||||
|
||||
-28
@@ -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>
|
||||
|
||||
-40
@@ -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>
|
||||
-27
@@ -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>
|
||||
|
||||
-39
@@ -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ü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>
|
||||
|
||||
-41
@@ -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>
|
||||
-43
@@ -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>
|
||||
-12
@@ -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>
|
||||
-10
@@ -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>
|
||||
-41
@@ -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>
|
||||
|
||||
-63
@@ -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>
|
||||
|
||||
-27
@@ -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>
|
||||
|
||||
-47
@@ -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>
|
||||
-64
@@ -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>
|
||||
|
||||
-43
@@ -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>
|
||||
-82
@@ -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ü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>
|
||||
|
||||
-51
@@ -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>
|
||||
-76
@@ -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>
|
||||
|
||||
-29
@@ -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ü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>
|
||||
|
||||
-109
@@ -1,109 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE symbol SYSTEM "symbole.dtd">
|
||||
<symbol version="1.0" id="47" dimen="undefined" affil="undefined" bcdab="undefined" command_level="undefined" mob="undefined">
|
||||
<name>FUstgTrp</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.0625" linestyle="solid">
|
||||
<point x="-1.2000000000000002" y="-0.0" />
|
||||
<point x="-1.2000000000000002" y="-1.0" />
|
||||
</line>
|
||||
|
||||
|
||||
<line rotate="0.0" linewidth="0.0625" linestyle="solid">
|
||||
<point x="-0.65" y="-0.0" />
|
||||
<point x="-0.65" y="-0.7000000000000001" />
|
||||
</line>
|
||||
|
||||
|
||||
<line rotate="0.0" linewidth="0.0625" linestyle="solid">
|
||||
<point x="-0.25" y="-0.0" />
|
||||
<point x="-0.25" y="-0.7000000000000001" />
|
||||
</line>
|
||||
|
||||
|
||||
<ellipse rotate="0.0" linewidth="0.0625" linestyle="solid" fill="0" closed="0" start="0.0" extent="180.0">
|
||||
<point x="-0.05" y="-0.30000000000000004" />
|
||||
<point x="0.35000000000000003" y="-0.7000000000000001" />
|
||||
</ellipse>
|
||||
|
||||
|
||||
<polygon rotate="0.0" linewidth="0.0625" linestyle="solid" fill="0" closed="0">
|
||||
<point x="-0.05" y="-0.45" />
|
||||
<point x="0.0" y="-0.55" />
|
||||
<point x="0.1" y="-0.6000000000000001" />
|
||||
<point x="0.25" y="-0.6000000000000001" />
|
||||
<point x="0.30000000000000004" y="-0.65" />
|
||||
<point x="0.35000000000000003" y="-0.75" />
|
||||
</polygon>
|
||||
|
||||
|
||||
<ellipse rotate="0.0" linewidth="0.0625" linestyle="solid" fill="0" closed="0" start="180.0" extent="180.0">
|
||||
<point x="-0.05" y="-0.5" />
|
||||
<point x="0.35000000000000003" y="-0.9500000000000001" />
|
||||
</ellipse>
|
||||
|
||||
|
||||
<line rotate="0.0" linewidth="0.0625" linestyle="solid">
|
||||
<point x="-0.75" y="-0.05" />
|
||||
<point x="-1.2000000000000002" y="-0.05" />
|
||||
</line>
|
||||
|
||||
|
||||
<ellipse rotate="0.0" linewidth="0.0625" linestyle="solid" fill="0" closed="0" start="180.0" extent="180.0">
|
||||
<point x="-0.65" y="-0.30000000000000004" />
|
||||
<point x="-0.25" y="-0.9500000000000001" />
|
||||
</ellipse>
|
||||
|
||||
|
||||
<line rotate="0.0" linewidth="0.0625" linestyle="solid">
|
||||
<point x="0.6000000000000001" y="-0.0" />
|
||||
<point x="0.6000000000000001" y="-1.0" />
|
||||
</line>
|
||||
|
||||
|
||||
<line rotate="0.0" linewidth="0.0625" linestyle="solid">
|
||||
<point x="0.8" y="-0.25" />
|
||||
<point x="0.4" y="-0.25" />
|
||||
</line>
|
||||
|
||||
|
||||
<ellipse rotate="0.0" linewidth="0.0625" linestyle="solid" fill="0" closed="0" start="180.0" extent="180.0">
|
||||
<point x="0.8" y="-0.9" />
|
||||
<point x="1.2000000000000002" y="-1.3" />
|
||||
</ellipse>
|
||||
|
||||
|
||||
<line rotate="0.0" linewidth="0.0625" linestyle="solid">
|
||||
<point x="1.2000000000000002" y="-0.30000000000000004" />
|
||||
<point x="1.2000000000000002" y="-1.1500000000000001" />
|
||||
</line>
|
||||
|
||||
|
||||
<ellipse rotate="0.0" linewidth="0.0625" linestyle="solid" fill="0" closed="1" start="0.0" extent="360.0">
|
||||
<point x="0.8" y="-0.35000000000000003" />
|
||||
<point x="1.2000000000000002" y="-0.9500000000000001" />
|
||||
</ellipse>
|
||||
|
||||
|
||||
<line rotate="0.0" linewidth="0.0625" linestyle="solid">
|
||||
<point x="-0.8500000000000001" y="-0.45" />
|
||||
<point x="-1.2000000000000002" y="-0.45" />
|
||||
</line>
|
||||
|
||||
</graphic>
|
||||
</symbol>
|
||||
|
||||
-43
@@ -1,43 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE symbol SYSTEM "symbole.dtd">
|
||||
<symbol version="1.0" id="49" dimen="undefined" affil="undefined" bcdab="undefined" command_level="undefined" mob="undefined">
|
||||
<name>GebJgBtl</name>
|
||||
<text1 maxdatalength="4"><data align="center"></data></text1>
|
||||
<graphic scale="3.5">
|
||||
|
||||
<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.30000000000000004" y="1.1" />
|
||||
<point x="0.30000000000000004" y="0.5" />
|
||||
</line>
|
||||
|
||||
|
||||
<line rotate="0.0" linewidth="0.125" linestyle="solid">
|
||||
<point x="-0.30000000000000004" y="1.1" />
|
||||
<point x="-0.30000000000000004" y="0.5" />
|
||||
</line>
|
||||
|
||||
|
||||
<polygon rotate="0.0" linewidth="0.125" linestyle="solid" fill="0" closed="0">
|
||||
<point x="-1.4900000000000002" y="0.5" />
|
||||
<point x="1.5" y="-1.5" />
|
||||
<point x="0.005000000000000071" y="-0.5" />
|
||||
<point x="-1.4900000000000002" y="-1.5" />
|
||||
<point x="1.5" y="0.5" />
|
||||
</polygon>
|
||||
|
||||
|
||||
<polygon rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1">
|
||||
<point x="0.0" y="-1.0" />
|
||||
<point x="-0.30000000000000004" y="-1.4000000000000001" />
|
||||
<point x="0.30000000000000004" y="-1.4000000000000001" />
|
||||
</polygon>
|
||||
|
||||
</graphic>
|
||||
</symbol>
|
||||
|
||||
-61
@@ -1,61 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE symbol SYSTEM "symbole.dtd">
|
||||
<symbol version="1.0" id="50" dimen="undefined" affil="undefined" bcdab="undefined" command_level="undefined" mob="undefined">
|
||||
<name>GebJgBtlFüGrp</name>
|
||||
<text1 maxdatalength="4"><data align="center"></data></text1>
|
||||
<graphic scale="2.0">
|
||||
|
||||
<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>
|
||||
|
||||
|
||||
<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.30000000000000004" y="0.30000000000000004" />
|
||||
<point x="0.30000000000000004" y="-0.1" />
|
||||
</line>
|
||||
|
||||
|
||||
<line rotate="0.0" linewidth="0.125" linestyle="solid">
|
||||
<point x="1.5" y="0.30000000000000004" />
|
||||
<point x="-1.5" y="0.30000000000000004" />
|
||||
</line>
|
||||
|
||||
|
||||
<polygon rotate="0.0" linewidth="0.125" linestyle="solid" fill="0" closed="0">
|
||||
<point x="-1.5" y="0.15000000000000002" />
|
||||
<point x="1.5100000000000002" y="-1.4500000000000002" />
|
||||
<point x="0.005000000000000071" y="-0.65" />
|
||||
<point x="-1.5" y="-1.4500000000000002" />
|
||||
<point x="1.5100000000000002" y="0.15000000000000002" />
|
||||
</polygon>
|
||||
|
||||
|
||||
<line rotate="0.0" linewidth="0.125" linestyle="solid">
|
||||
<point x="-0.30000000000000004" y="0.30000000000000004" />
|
||||
<point x="-0.30000000000000004" y="-0.1" />
|
||||
</line>
|
||||
|
||||
|
||||
<polygon rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1">
|
||||
<point x="0.0" y="-1.0" />
|
||||
<point x="-0.30000000000000004" y="-1.4000000000000001" />
|
||||
<point x="0.30000000000000004" y="-1.4000000000000001" />
|
||||
</polygon>
|
||||
|
||||
</graphic>
|
||||
</symbol>
|
||||
|
||||
-53
@@ -1,53 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE symbol SYSTEM "symbole.dtd">
|
||||
<symbol version="1.0" id="51" dimen="undefined" affil="undefined" bcdab="undefined" command_level="undefined" mob="undefined">
|
||||
<name>GebJgBtlKdr</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="1">
|
||||
<point x="0.0" y="0.7000000000000001" />
|
||||
<point x="-1.1" y="-0.4" />
|
||||
<point x="0.0" y="-1.49" />
|
||||
<point x="1.1" y="-0.4" />
|
||||
</polygon>
|
||||
|
||||
|
||||
<polygon rotate="0.0" linewidth="0.125" linestyle="solid" fill="0" closed="0">
|
||||
<point x="-1.2000000000000002" y="-0.0" />
|
||||
<point x="0.0" y="1.1800000000000002" />
|
||||
<point x="1.2000000000000002" y="-0.0" />
|
||||
</polygon>
|
||||
|
||||
|
||||
<line rotate="0.0" linewidth="0.125" linestyle="solid">
|
||||
<point x="0.2" y="1.59" />
|
||||
<point x="0.2" y="1.0" />
|
||||
</line>
|
||||
|
||||
|
||||
<line rotate="0.0" linewidth="0.125" linestyle="solid">
|
||||
<point x="-0.2" y="1.59" />
|
||||
<point x="-0.2" y="0.9500000000000001" />
|
||||
</line>
|
||||
|
||||
|
||||
<polygon rotate="0.0" linewidth="0.0625" linestyle="solid" fill="0" closed="0">
|
||||
<point x="-0.55" y="0.15000000000000002" />
|
||||
<point x="0.55" y="-0.9500000000000001" />
|
||||
<point x="0.0" y="-0.4" />
|
||||
<point x="-0.55" y="-0.9500000000000001" />
|
||||
<point x="0.55" y="0.15000000000000002" />
|
||||
</polygon>
|
||||
|
||||
|
||||
<polygon rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1">
|
||||
<point x="0.0" y="-0.8" />
|
||||
<point x="0.30000000000000004" y="-1.1" />
|
||||
<point x="0.0" y="-1.4000000000000001" />
|
||||
<point x="-0.30000000000000004" y="-1.1" />
|
||||
</polygon>
|
||||
|
||||
</graphic>
|
||||
</symbol>
|
||||
|
||||
-16
@@ -1,16 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE symboltable SYSTEM "symbole.dtd">
|
||||
<symbol version="1.0" id="0x00000034" dimen="land_units" affil="friend" transformed="0" bcdab="section" command_level="company" mob="undefined" vehicle="undefined" intrinsicmob="undefined" arming="undefined">
|
||||
<name>Mountain Infantry SEC</name>
|
||||
<branch class="infantry" />
|
||||
<text1 maxdatalength="4">
|
||||
<data align="center"></data>
|
||||
</text1>
|
||||
<graphic scale="2">
|
||||
<polygon transform="true" rotate="0" linewidth="0.00625" linestyle="solid" closed="1" fill="1">
|
||||
<point x="0" y="-0.586207"/>
|
||||
<point x="-0.3" y="-0.986207"/>
|
||||
<point x="0.3" y="-0.986207"/>
|
||||
</polygon>
|
||||
</graphic>
|
||||
</symbol>
|
||||
-53
@@ -1,53 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE symbol SYSTEM "symbole.dtd">
|
||||
<symbol version="1.0" id="53" dimen="undefined" affil="undefined" bcdab="undefined" command_level="undefined" mob="undefined">
|
||||
<name>GebJgGrpFhr</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="1">
|
||||
<point x="0.0" y="0.7000000000000001" />
|
||||
<point x="-1.1" y="-0.4" />
|
||||
<point x="0.0" y="-1.49" />
|
||||
<point x="1.1" y="-0.4" />
|
||||
</polygon>
|
||||
|
||||
|
||||
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
|
||||
<point x="-0.6000000000000001" y="1.59" />
|
||||
<point x="-0.2" y="1.1900000000000002" />
|
||||
</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.59" />
|
||||
<point x="0.6000000000000001" y="1.1900000000000002" />
|
||||
</ellipse>
|
||||
|
||||
|
||||
<polygon rotate="0.0" linewidth="0.125" linestyle="solid" fill="0" closed="0">
|
||||
<point x="-1.2000000000000002" y="-0.05" />
|
||||
<point x="0.0" y="1.1900000000000002" />
|
||||
<point x="1.2000000000000002" y="-0.05" />
|
||||
</polygon>
|
||||
|
||||
|
||||
<polygon rotate="0.0" linewidth="0.0625" linestyle="solid" fill="0" closed="0">
|
||||
<point x="-0.55" y="0.15000000000000002" />
|
||||
<point x="0.55" y="-0.9500000000000001" />
|
||||
<point x="0.0" y="-0.4" />
|
||||
<point x="-0.55" y="-0.9500000000000001" />
|
||||
<point x="0.55" y="0.15000000000000002" />
|
||||
</polygon>
|
||||
|
||||
|
||||
<polygon rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1">
|
||||
<point x="0.0" y="-0.8" />
|
||||
<point x="0.30000000000000004" y="-1.1" />
|
||||
<point x="0.0" y="-1.4000000000000001" />
|
||||
<point x="-0.30000000000000004" y="-1.1" />
|
||||
</polygon>
|
||||
|
||||
</graphic>
|
||||
</symbol>
|
||||
|
||||
-37
@@ -1,37 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE symbol SYSTEM "symbole.dtd">
|
||||
<symbol version="1.0" id="56" dimen="undefined" affil="undefined" bcdab="undefined" command_level="undefined" mob="undefined">
|
||||
<name>GebJgKp</name>
|
||||
<text1 maxdatalength="4"><data align="center"></data></text1>
|
||||
<graphic scale="3.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="1.1" />
|
||||
<point x="0.0" y="0.5" />
|
||||
</line>
|
||||
|
||||
|
||||
<polygon rotate="0.0" linewidth="0.125" linestyle="solid" fill="0" closed="0">
|
||||
<point x="-1.4900000000000002" y="0.5" />
|
||||
<point x="1.5" y="-1.5" />
|
||||
<point x="0.005000000000000071" y="-0.5" />
|
||||
<point x="-1.4900000000000002" y="-1.5" />
|
||||
<point x="1.5" y="0.5" />
|
||||
</polygon>
|
||||
|
||||
|
||||
<polygon rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1">
|
||||
<point x="0.0" y="-1.0" />
|
||||
<point x="-0.30000000000000004" y="-1.4000000000000001" />
|
||||
<point x="0.30000000000000004" y="-1.4000000000000001" />
|
||||
</polygon>
|
||||
|
||||
</graphic>
|
||||
</symbol>
|
||||
|
||||
-47
@@ -1,47 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE symbol SYSTEM "symbole.dtd">
|
||||
<symbol version="1.0" id="57" dimen="undefined" affil="undefined" bcdab="undefined" command_level="undefined" mob="undefined">
|
||||
<name>GebJgKpChef</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="1">
|
||||
<point x="0.0" y="0.7000000000000001" />
|
||||
<point x="-1.1" y="-0.4" />
|
||||
<point x="0.0" y="-1.49" />
|
||||
<point x="1.1" y="-0.4" />
|
||||
</polygon>
|
||||
|
||||
|
||||
<line rotate="0.0" linewidth="0.125" linestyle="solid">
|
||||
<point x="0.0" y="1.59" />
|
||||
<point x="0.0" y="0.9900000000000001" />
|
||||
</line>
|
||||
|
||||
|
||||
<polygon rotate="0.0" linewidth="0.125" linestyle="solid" fill="0" closed="0">
|
||||
<point x="-1.1900000000000002" y="-0.0" />
|
||||
<point x="0.005000000000000071" y="1.1800000000000002" />
|
||||
<point x="1.2000000000000002" y="-0.0" />
|
||||
</polygon>
|
||||
|
||||
|
||||
<polygon rotate="0.0" linewidth="0.0625" linestyle="solid" fill="0" closed="0">
|
||||
<point x="-0.55" y="0.15000000000000002" />
|
||||
<point x="0.55" y="-0.9500000000000001" />
|
||||
<point x="0.0" y="-0.4" />
|
||||
<point x="-0.55" y="-0.9500000000000001" />
|
||||
<point x="0.55" y="0.15000000000000002" />
|
||||
</polygon>
|
||||
|
||||
|
||||
<polygon rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1">
|
||||
<point x="0.0" y="-0.8" />
|
||||
<point x="0.30000000000000004" y="-1.1" />
|
||||
<point x="0.0" y="-1.4000000000000001" />
|
||||
<point x="-0.30000000000000004" y="-1.1" />
|
||||
</polygon>
|
||||
|
||||
</graphic>
|
||||
</symbol>
|
||||
|
||||
-55
@@ -1,55 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE symbol SYSTEM "symbole.dtd">
|
||||
<symbol version="1.0" id="58" dimen="undefined" affil="undefined" bcdab="undefined" command_level="undefined" mob="undefined">
|
||||
<name>GebJgKpFüGrp</name>
|
||||
<text1 maxdatalength="4"><data align="center"></data></text1>
|
||||
<graphic scale="2.0">
|
||||
|
||||
<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>
|
||||
|
||||
|
||||
<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.30000000000000004" />
|
||||
<point x="0.0" y="-0.1" />
|
||||
</line>
|
||||
|
||||
|
||||
<line rotate="0.0" linewidth="0.125" linestyle="solid">
|
||||
<point x="1.5" y="0.30000000000000004" />
|
||||
<point x="-1.5" y="0.30000000000000004" />
|
||||
</line>
|
||||
|
||||
|
||||
<polygon rotate="0.0" linewidth="0.125" linestyle="solid" fill="0" closed="0">
|
||||
<point x="-1.5" y="0.15000000000000002" />
|
||||
<point x="1.5100000000000002" y="-1.4500000000000002" />
|
||||
<point x="0.005000000000000071" y="-0.65" />
|
||||
<point x="-1.5" y="-1.4500000000000002" />
|
||||
<point x="1.5100000000000002" y="0.15000000000000002" />
|
||||
</polygon>
|
||||
|
||||
|
||||
<polygon rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1">
|
||||
<point x="0.0" y="-1.0" />
|
||||
<point x="-0.30000000000000004" y="-1.4000000000000001" />
|
||||
<point x="0.30000000000000004" y="-1.4000000000000001" />
|
||||
</polygon>
|
||||
|
||||
</graphic>
|
||||
</symbol>
|
||||
|
||||
-47
@@ -1,47 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE symbol SYSTEM "symbole.dtd">
|
||||
<symbol version="1.0" id="63" dimen="undefined" affil="undefined" bcdab="undefined" command_level="undefined" mob="undefined">
|
||||
<name>GebJgTrpFhr</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="1">
|
||||
<point x="0.0" y="0.7000000000000001" />
|
||||
<point x="-1.1" y="-0.4" />
|
||||
<point x="0.0" y="-1.49" />
|
||||
<point x="1.1" y="-0.4" />
|
||||
</polygon>
|
||||
|
||||
|
||||
<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.59" />
|
||||
<point x="0.2" y="1.1900000000000002" />
|
||||
</ellipse>
|
||||
|
||||
|
||||
<polygon rotate="0.0" linewidth="0.0625" linestyle="solid" fill="0" closed="0">
|
||||
<point x="-0.55" y="0.15000000000000002" />
|
||||
<point x="0.55" y="-0.9500000000000001" />
|
||||
<point x="0.0" y="-0.4" />
|
||||
<point x="-0.55" y="-0.9500000000000001" />
|
||||
<point x="0.55" y="0.15000000000000002" />
|
||||
</polygon>
|
||||
|
||||
|
||||
<polygon rotate="0.0" linewidth="0.125" linestyle="solid" fill="0" closed="0">
|
||||
<point x="-1.25" y="-0.030000000000000072" />
|
||||
<point x="-0.009999999999999966" y="1.2000000000000002" />
|
||||
<point x="1.2300000000000002" y="-0.030000000000000072" />
|
||||
</polygon>
|
||||
|
||||
|
||||
<polygon rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1">
|
||||
<point x="0.0" y="-0.8" />
|
||||
<point x="0.30000000000000004" y="-1.1" />
|
||||
<point x="0.0" y="-1.4000000000000001" />
|
||||
<point x="-0.30000000000000004" y="-1.1" />
|
||||
</polygon>
|
||||
|
||||
</graphic>
|
||||
</symbol>
|
||||
|
||||
-49
@@ -1,49 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE symbol SYSTEM "symbole.dtd">
|
||||
<symbol version="1.0" id="65" dimen="undefined" affil="undefined" bcdab="undefined" command_level="undefined" mob="undefined">
|
||||
<name>GebJgZg</name>
|
||||
<text1 maxdatalength="4"><data align="center"></data></text1>
|
||||
<graphic scale="2.5">
|
||||
|
||||
<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>
|
||||
|
||||
|
||||
<polygon rotate="0.0" linewidth="0.125" linestyle="solid" fill="0" closed="0">
|
||||
<point x="-1.4900000000000002" y="0.5" />
|
||||
<point x="1.5" y="-1.5" />
|
||||
<point x="0.005000000000000071" y="-0.5" />
|
||||
<point x="-1.4900000000000002" y="-1.5" />
|
||||
<point x="1.5" y="0.5" />
|
||||
</polygon>
|
||||
|
||||
|
||||
<polygon rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1">
|
||||
<point x="0.0" y="-1.0" />
|
||||
<point x="-0.30000000000000004" y="-1.4000000000000001" />
|
||||
<point x="0.30000000000000004" 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.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.4" y="1.2000000000000002" />
|
||||
<point x="0.9" 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>
|
||||
|
||||
</graphic>
|
||||
</symbol>
|
||||
|
||||
-59
@@ -1,59 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE symbol SYSTEM "symbole.dtd">
|
||||
<symbol version="1.0" id="66" dimen="undefined" affil="undefined" bcdab="undefined" command_level="undefined" mob="undefined">
|
||||
<name>GebJgZgFhr</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="1">
|
||||
<point x="0.0" y="0.7000000000000001" />
|
||||
<point x="-1.1" y="-0.4" />
|
||||
<point x="0.0" y="-1.49" />
|
||||
<point x="1.1" y="-0.4" />
|
||||
</polygon>
|
||||
|
||||
|
||||
<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.59" />
|
||||
<point x="0.2" y="1.1900000000000002" />
|
||||
</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.59" />
|
||||
<point x="0.8" y="1.1900000000000002" />
|
||||
</ellipse>
|
||||
|
||||
|
||||
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
|
||||
<point x="-0.8" y="1.59" />
|
||||
<point x="-0.4" y="1.1900000000000002" />
|
||||
</ellipse>
|
||||
|
||||
|
||||
<polygon rotate="0.0" linewidth="0.125" linestyle="solid" fill="0" closed="0">
|
||||
<point x="-1.21" y="-0.0" />
|
||||
<point x="-0.005000000000000071" y="1.21" />
|
||||
<point x="1.2000000000000002" y="-0.0" />
|
||||
</polygon>
|
||||
|
||||
|
||||
<polygon rotate="0.0" linewidth="0.0625" linestyle="solid" fill="0" closed="0">
|
||||
<point x="-0.55" y="0.15000000000000002" />
|
||||
<point x="0.55" y="-0.9500000000000001" />
|
||||
<point x="0.0" y="-0.4" />
|
||||
<point x="-0.55" y="-0.9500000000000001" />
|
||||
<point x="0.55" y="0.15000000000000002" />
|
||||
</polygon>
|
||||
|
||||
|
||||
<polygon rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1">
|
||||
<point x="0.0" y="-0.8" />
|
||||
<point x="0.30000000000000004" y="-1.1" />
|
||||
<point x="0.0" y="-1.4000000000000001" />
|
||||
<point x="-0.30000000000000004" y="-1.1" />
|
||||
</polygon>
|
||||
|
||||
</graphic>
|
||||
</symbol>
|
||||
|
||||
-55
@@ -1,55 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE symbol SYSTEM "symbole.dtd">
|
||||
<symbol version="1.0" id="67" dimen="undefined" affil="undefined" bcdab="undefined" command_level="undefined" mob="undefined">
|
||||
<name>GebJgZgTrp</name>
|
||||
<text1 maxdatalength="4"><data align="center"></data></text1>
|
||||
<graphic scale="2.0">
|
||||
|
||||
<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.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.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.55" y="0.35000000000000003" />
|
||||
<point x="-0.25" y="0.05" />
|
||||
</ellipse>
|
||||
|
||||
|
||||
<polygon rotate="0.0" linewidth="0.125" linestyle="solid" fill="0" closed="0">
|
||||
<point x="-1.4900000000000002" y="0.5" />
|
||||
<point x="1.5" y="-1.5" />
|
||||
<point x="0.005000000000000071" y="-0.5" />
|
||||
<point x="-1.4900000000000002" y="-1.5" />
|
||||
<point x="1.5" y="0.5" />
|
||||
</polygon>
|
||||
|
||||
|
||||
<polygon rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1">
|
||||
<point x="0.0" y="-1.0" />
|
||||
<point x="-0.30000000000000004" y="-1.4000000000000001" />
|
||||
<point x="0.30000000000000004" y="-1.4000000000000001" />
|
||||
</polygon>
|
||||
|
||||
</graphic>
|
||||
</symbol>
|
||||
|
||||
-15
@@ -1,15 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE symbol SYSTEM "symbole.dtd">
|
||||
<symbol version="1.0" id="68" dimen="undefined" affil="undefined" bcdab="undefined" command_level="undefined" mob="undefined">
|
||||
<name>Gewehr G3</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="-1.6" />
|
||||
</line>
|
||||
|
||||
</graphic>
|
||||
</symbol>
|
||||
|
||||
-10
@@ -1,10 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE symboltable SYSTEM "symbole.dtd">
|
||||
<symbol version="1.0" id="0x00000045" dimen="land_equipment" affil="friend" transformed="0" bcdab="section" command_level="undefined" mob="undefined" vehicle="undefined" intrinsicmob="undefined" arming="undefined">
|
||||
<name>SEC Leader</name>
|
||||
<text1 maxdatalength="4">
|
||||
<data align="center"></data>
|
||||
</text1>
|
||||
<graphic scale="1">
|
||||
</graphic>
|
||||
</symbol>
|
||||
-40
@@ -1,40 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE symboltable SYSTEM "symbole.dtd">
|
||||
<symbol version="1.0" id="0x00000047" dimen="land_units" affil="friend" transformed="0" bcdab="platoon" command_level="undefined" mob="undefined" vehicle="undefined" intrinsicmob="undefined" arming="undefined">
|
||||
<name>Maintenance PLT</name>
|
||||
<text1 maxdatalength="4">
|
||||
<data align="center"></data>
|
||||
</text1>
|
||||
<graphic scale="2.5">
|
||||
<polygon transform="true" rotate="0" linewidth="0.125" linestyle="solid" closed="0" fill="0">
|
||||
<point x="0.848276" y="-0.341379"/>
|
||||
<point x="0.498276" y="-0.341379"/>
|
||||
<point x="0.148276" y="0.00862069"/>
|
||||
<point x="0.448276" y="0.358621"/>
|
||||
<point x="0.848276" y="0.358621"/>
|
||||
</polygon>
|
||||
<polygon transform="true" rotate="0" linewidth="0.125" linestyle="solid" closed="0" fill="0">
|
||||
<point x="-0.839655" y="0.358621"/>
|
||||
<point x="-0.489655" y="0.358621"/>
|
||||
<point x="-0.139655" y="0.00862069"/>
|
||||
<point x="-0.439655" y="-0.341379"/>
|
||||
<point x="-0.839655" y="-0.341379"/>
|
||||
</polygon>
|
||||
<line transform="true" rotate="0" linewidth="0.125" linestyle="solid">
|
||||
<point x="-0.198276" y="0.0258621"/>
|
||||
<point x="0.189655" y="0.0172414"/>
|
||||
</line>
|
||||
<line transform="true" rotate="0" linewidth="0.125" linestyle="solid">
|
||||
<point x="0.181034" y="-0.534483"/>
|
||||
<point x="0.181034" y="-0.534483"/>
|
||||
</line>
|
||||
<line transform="true" rotate="0" linewidth="0.125" linestyle="solid">
|
||||
<point x="0.181034" y="-0.517241"/>
|
||||
<point x="0.181034" y="-0.517241"/>
|
||||
</line>
|
||||
<line transform="true" rotate="0" linewidth="0.125" linestyle="solid">
|
||||
<point x="0.905172" y="-1.07759"/>
|
||||
<point x="0.905172" y="-1.07759"/>
|
||||
</line>
|
||||
</graphic>
|
||||
</symbol>
|
||||
-52
@@ -1,52 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE symbol SYSTEM "symbole.dtd">
|
||||
<symbol version="1.0" id="72" dimen="undefined" affil="undefined" bcdab="undefined" command_level="undefined" mob="undefined">
|
||||
<name>JaBo</name>
|
||||
<text1 maxdatalength="4"><data align="center"></data></text1>
|
||||
<graphic scale="2.0">
|
||||
|
||||
<ellipse rotate="0.0" linewidth="0.125" linestyle="solid" fill="0" closed="0" start="270.0" extent="180.0">
|
||||
<point x="0.45" y="0.2" />
|
||||
<point x="1.25" y="-0.4" />
|
||||
</ellipse>
|
||||
|
||||
|
||||
<ellipse rotate="0.0" linewidth="0.125" linestyle="solid" fill="0" closed="0" start="90.0" extent="180.0">
|
||||
<point x="-1.3" y="0.2" />
|
||||
<point x="-0.5" y="-0.4" />
|
||||
</ellipse>
|
||||
|
||||
|
||||
<line rotate="0.0" linewidth="0.125" linestyle="solid">
|
||||
<point x="-0.9500000000000001" y="0.2" />
|
||||
<point x="0.9" y="-0.4" />
|
||||
</line>
|
||||
|
||||
|
||||
<line rotate="0.0" linewidth="0.125" linestyle="solid">
|
||||
<point x="-0.9500000000000001" y="-0.4" />
|
||||
<point x="0.9" y="0.2" />
|
||||
</line>
|
||||
|
||||
|
||||
<ellipse rotate="0.0" linewidth="0.00625" linestyle="solid" fill="1" closed="1" start="0.0" extent="360.0">
|
||||
<point x="-0.35000000000000003" y="-0.9" />
|
||||
<point x="0.35000000000000003" y="-1.58" />
|
||||
</ellipse>
|
||||
|
||||
|
||||
<polygon rotate="0.0" linewidth="0.125" linestyle="solid" fill="0" closed="0">
|
||||
<point x="-0.75" y="0.65" />
|
||||
<point x="0.0" y="1.4000000000000001" />
|
||||
<point x="0.75" y="0.65" />
|
||||
</polygon>
|
||||
|
||||
|
||||
<line rotate="0.0" linewidth="0.125" linestyle="solid">
|
||||
<point x="0.0" y="1.35" />
|
||||
<point x="0.0" y="-1.2000000000000002" />
|
||||
</line>
|
||||
|
||||
</graphic>
|
||||
</symbol>
|
||||
|
||||
-11
@@ -1,11 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE symboltable SYSTEM "symbole.dtd">
|
||||
<symbol version="1.0" id="0x00000049" dimen="land_units" affil="friend" transformed="0" bcdab="battalion" command_level="undefined" mob="undefined" vehicle="undefined" intrinsicmob="undefined" arming="undefined">
|
||||
<name>Infantry BN</name>
|
||||
<branch class="infantry" />
|
||||
<text1 maxdatalength="4">
|
||||
<data align="center"></data>
|
||||
</text1>
|
||||
<graphic scale="3.5">
|
||||
</graphic>
|
||||
</symbol>
|
||||
-11
@@ -1,11 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE symboltable SYSTEM "symbole.dtd">
|
||||
<symbol version="1.0" id="0x0000004A" dimen="land_equipment" affil="friend" transformed="0" bcdab="battalion" command_level="undefined" mob="undefined" vehicle="undefined" intrinsicmob="undefined" arming="undefined">
|
||||
<name>Infantry BN CDR</name>
|
||||
<branch class="infantry" />
|
||||
<text1 maxdatalength="4">
|
||||
<data align="center"></data>
|
||||
</text1>
|
||||
<graphic scale="1.5">
|
||||
</graphic>
|
||||
</symbol>
|
||||
-14
@@ -1,14 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE symboltable SYSTEM "symbole.dtd">
|
||||
<symbol version="2.0" id="0x0000004C" dimen="land_units" affil="friend" transformed="0" bcdab="section" command_level="undefined" headquarter="false" mob="undefined" vehicle="undefined" intrinsicmob="undefined" arming="undefined" >
|
||||
<name>Infantry SEC</name>
|
||||
<app6class classname="" classhierarchy="" classcodeid="" />
|
||||
<branch class="branch_infantry" />
|
||||
<text3 maxdatalength="6">
|
||||
<data align="center"></data>
|
||||
<data align="center"></data>
|
||||
<data align="center"></data>
|
||||
</text3>
|
||||
<graphic scale="2">
|
||||
</graphic>
|
||||
</symbol>
|
||||
-11
@@ -1,11 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE symboltable SYSTEM "symbole.dtd">
|
||||
<symbol version="1.0" id="0x0000004D" dimen="land_equipment" affil="friend" transformed="0" bcdab="section" command_level="undefined" mob="undefined" vehicle="undefined" intrinsicmob="undefined" arming="undefined">
|
||||
<name>Infantry SEC Leader</name>
|
||||
<branch class="infantry" />
|
||||
<text1 maxdatalength="4">
|
||||
<data align="center"></data>
|
||||
</text1>
|
||||
<graphic scale="1">
|
||||
</graphic>
|
||||
</symbol>
|
||||
-11
@@ -1,11 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE symboltable SYSTEM "symbole.dtd">
|
||||
<symbol version="1.0" id="0x0000004E" dimen="land_units" affil="friend" transformed="0" bcdab="company" command_level="undefined" mob="undefined" vehicle="undefined" intrinsicmob="undefined" arming="undefined">
|
||||
<name>Infantry CO</name>
|
||||
<branch class="infantry" />
|
||||
<text1 maxdatalength="4">
|
||||
<data align="center"></data>
|
||||
</text1>
|
||||
<graphic scale="3">
|
||||
</graphic>
|
||||
</symbol>
|
||||
-11
@@ -1,11 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE symboltable SYSTEM "symbole.dtd">
|
||||
<symbol version="1.0" id="0x0000004F" dimen="land_equipment" affil="friend" transformed="0" bcdab="company" command_level="undefined" mob="undefined" vehicle="undefined" intrinsicmob="undefined" arming="undefined">
|
||||
<name>Infantry CO CDR</name>
|
||||
<branch class="infantry" />
|
||||
<text1 maxdatalength="4">
|
||||
<data align="center"></data>
|
||||
</text1>
|
||||
<graphic scale="1.5">
|
||||
</graphic>
|
||||
</symbol>
|
||||
-14
@@ -1,14 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE symboltable SYSTEM "symbole.dtd">
|
||||
<symbol version="2.0" id="0x00000050" dimen="land_units" affil="friend" transformed="0" bcdab="section" command_level="undefined" headquarter="false" mob="undefined" vehicle="undefined" intrinsicmob="undefined" arming="undefined" >
|
||||
<name>Infantry Company HQ Squad</name>
|
||||
<app6class classname="" classhierarchy="" classcodeid="" />
|
||||
<branch class="branch_infantry" />
|
||||
<text3 maxdatalength="6">
|
||||
<data align="center"></data>
|
||||
<data align="center"></data>
|
||||
<data align="center"></data>
|
||||
</text3>
|
||||
<graphic scale="2">
|
||||
</graphic>
|
||||
</symbol>
|
||||
-21
@@ -1,21 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE symboltable SYSTEM "symbole.dtd">
|
||||
<symbol version="1.0" id="0x00000051" dimen="land_units" affil="friend" transformed="0" bcdab="section" command_level="undefined" mob="undefined" vehicle="undefined" intrinsicmob="undefined" arming="undefined">
|
||||
<name>Infantry Antitank SEC</name>
|
||||
<branch class="infantry" />
|
||||
<text1 maxdatalength="4">
|
||||
<data align="center"></data>
|
||||
</text1>
|
||||
<graphic scale="2">
|
||||
<polygon transform="true" rotate="0" linewidth="0.0625" linestyle="solid" closed="0" fill="0">
|
||||
<point x="-0.351379" y="-0.575862"/>
|
||||
<point x="0.00362069" y="-0.215862"/>
|
||||
<point x="0.358621" y="-0.575862"/>
|
||||
</polygon>
|
||||
<polygon transform="true" rotate="0" linewidth="0.0625" linestyle="solid" closed="0" fill="0">
|
||||
<point x="-0.37" y="-0.844483"/>
|
||||
<point x="-0.005" y="-0.464483"/>
|
||||
<point x="0.36" y="-0.844483"/>
|
||||
</polygon>
|
||||
</graphic>
|
||||
</symbol>
|
||||
-23
@@ -1,23 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE symboltable SYSTEM "symbole.dtd">
|
||||
<symbol version="1.0" id="0x00000052" dimen="land_units" affil="friend" transformed="0" bcdab="section" command_level="undefined" mob="undefined" vehicle="undefined" intrinsicmob="undefined" arming="undefined">
|
||||
<name>Infantry Sniper SEC</name>
|
||||
<branch class="infantry" />
|
||||
<text1 maxdatalength="4">
|
||||
<data align="center"></data>
|
||||
</text1>
|
||||
<graphic scale="1.5">
|
||||
<line transform="true" rotate="0" linewidth="0.1" linestyle="solid">
|
||||
<point x="-0.0896552" y="-0.639655"/>
|
||||
<point x="-0.489655" y="-0.639655"/>
|
||||
</line>
|
||||
<line transform="true" rotate="0" linewidth="0.1" linestyle="solid">
|
||||
<point x="0.481034" y="-0.639655"/>
|
||||
<point x="0.0810345" y="-0.639655"/>
|
||||
</line>
|
||||
<line transform="true" rotate="90" linewidth="0.1" linestyle="solid">
|
||||
<point x="0.191379" y="-0.808621"/>
|
||||
<point x="-0.208621" y="-0.808621"/>
|
||||
</line>
|
||||
</graphic>
|
||||
</symbol>
|
||||
-11
@@ -1,11 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE symboltable SYSTEM "symbole.dtd">
|
||||
<symbol version="1.0" id="0x00000053" dimen="land_equipment" affil="friend" transformed="0" bcdab="squad" command_level="undefined" mob="undefined" vehicle="undefined" intrinsicmob="undefined" arming="undefined">
|
||||
<name>Infantry TM Leader</name>
|
||||
<branch class="infantry" />
|
||||
<text1 maxdatalength="4">
|
||||
<data align="center"></data>
|
||||
</text1>
|
||||
<graphic scale="1">
|
||||
</graphic>
|
||||
</symbol>
|
||||
-14
@@ -1,14 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE symboltable SYSTEM "symbole.dtd">
|
||||
<symbol version="2.0" id="0x00000054" dimen="land_units" affil="friend" transformed="0" bcdab="platoon" command_level="undefined" headquarter="false" mob="undefined" vehicle="undefined" intrinsicmob="undefined" arming="undefined" >
|
||||
<name>Infantry PLT</name>
|
||||
<app6class classname="" classhierarchy="" classcodeid="" />
|
||||
<branch class="branch_infantry" />
|
||||
<text3 maxdatalength="6">
|
||||
<data align="center"></data>
|
||||
<data align="center"></data>
|
||||
<data align="center"></data>
|
||||
</text3>
|
||||
<graphic scale="2.5">
|
||||
</graphic>
|
||||
</symbol>
|
||||
-11
@@ -1,11 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE symboltable SYSTEM "symbole.dtd">
|
||||
<symbol version="1.0" id="0x00000055" dimen="land_equipment" affil="friend" transformed="0" bcdab="platoon" command_level="undefined" mob="undefined" vehicle="undefined" intrinsicmob="undefined" arming="undefined">
|
||||
<name>Infantry PLT Leader</name>
|
||||
<branch class="infantry" />
|
||||
<text1 maxdatalength="4">
|
||||
<data align="center"></data>
|
||||
</text1>
|
||||
<graphic scale="1">
|
||||
</graphic>
|
||||
</symbol>
|
||||
-14
@@ -1,14 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE symboltable SYSTEM "symbole.dtd">
|
||||
<symbol version="2.0" id="0x00000056" dimen="land_units" affil="friend" transformed="0" bcdab="squad" command_level="undefined" headquarter="false" mob="undefined" vehicle="undefined" intrinsicmob="undefined" arming="undefined" >
|
||||
<name>Infantry PLT HQ</name>
|
||||
<app6class classname="" classhierarchy="" classcodeid="" />
|
||||
<branch class="branch_infantry" />
|
||||
<text3 maxdatalength="6">
|
||||
<data align="center"></data>
|
||||
<data align="center"></data>
|
||||
<data align="center"></data>
|
||||
</text3>
|
||||
<graphic scale="2">
|
||||
</graphic>
|
||||
</symbol>
|
||||
-10
@@ -1,10 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE symboltable SYSTEM "symbole.dtd">
|
||||
<symbol version="1.0" id="0x00000058" dimen="land_equipment" affil="friend" transformed="0" bcdab="company" command_level="undefined" mob="undefined" vehicle="undefined" intrinsicmob="undefined" arming="undefined">
|
||||
<name>CO CDR</name>
|
||||
<text1 maxdatalength="4">
|
||||
<data align="center"></data>
|
||||
</text1>
|
||||
<graphic scale="1.5">
|
||||
</graphic>
|
||||
</symbol>
|
||||
Loaded 100 of 1281 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user