Qt6 Migration: Complete migration with DDS/RTI support and build validation
Major Changes:
- Merged latest Qt5 devel content from dlbo (292 files changed, 7 new dirs)
- Consolidated forward-declarations and include folders
- Removed unneeded modules per Niklas' repo check list
Build System Fixes:
- Fixed CMake VERSION_GREATER syntax in ParticipantManagement/CMakeLists.txt
- Added VLC packages (libvlc-dev, vlc-plugin-base) to docker_build.sh
- Added PostgreSQL dev packages (libpq-dev, postgresql-server-dev-all) to Dockerfile
- Fixed locale warnings (ANSI_X3.4-1968 → C.UTF-8)
- Fixed ArcGIS SDK path warnings when BUILD_ARCGIS=OFF
Code Generation Fixes:
- Fixed IDL enum collisions (PortType→CorePortType/DdsutPortType, PdmEventType)
- Fixed Grantlee template svc_translation.cpp.grantlee:
- Changed {{ idl_enum.name }}_def:: to {{ idl_enum.name }}::
- Fixed .underlying() calls for C++11 scoped enums (enum class)
- Removed generated files from repo (moc_*, *_dtc.h, *_ftc.h)
Validation:
- BUILD_RTI=ON: SUCCESS
- BUILD_RTI=OFF: SUCCESS
- C++17 standard maintained for RTI 7.7 compatibility
- Ubuntu 26.04 Docker environment verified
Remaining Warnings (expected):
- BgViewer, KDChart, KDReports, Poppler-Qt6 not found (optional features)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
18662 files changed
+4115092
-5435
No files matched your search
+15
-5
@@ -40,19 +40,19 @@ AbstractFiringStrategy::~AbstractFiringStrategy()
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
|
||||
}
|
||||
|
||||
void AbstractFiringStrategy::calculateDispersionTrajectory()
|
||||
bool AbstractFiringStrategy::calculateDispersionTrajectory()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "calculateDispersionTrajectory";
|
||||
// 1. Neuen Zielpunkt berechnen
|
||||
|
||||
const auto &intendendTrajectory = m_effector->intendendTrajectory();
|
||||
const auto intendendTrajectory = m_effector->intendendTrajectory();
|
||||
|
||||
// sanity check:
|
||||
if (intendendTrajectory.size() < 2)
|
||||
{
|
||||
ERROR_LOG(m_logger) << LOGFUNCTION
|
||||
<< " size of intendendTrajectory not sufficiant, size=" << intendendTrajectory.size();
|
||||
return;
|
||||
return false;
|
||||
}
|
||||
|
||||
LtsUtils::QPoint3D newTarget = intendendTrajectory.last().position;
|
||||
@@ -66,6 +66,16 @@ void AbstractFiringStrategy::calculateDispersionTrajectory()
|
||||
|
||||
// 2. Neue Trajektorie berechnen
|
||||
m_transformedTrajectory = TrajectoryTransform::transformToNewTarget(intendendTrajectory, newTarget);
|
||||
|
||||
// sanity check:
|
||||
if (m_transformedTrajectory.size() < 2)
|
||||
{
|
||||
ERROR_LOG(m_logger) << LOGFUNCTION
|
||||
<< " size of m_transformedTrajectory not sufficiant, size=" << m_transformedTrajectory.size();
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
std::vector<Core::GeoPositionRelativeTime> AbstractFiringStrategy::buildTrajectoryGeometry(const QVector<TrajectoryPoint> &relativeTrajectory)
|
||||
@@ -135,7 +145,7 @@ int AbstractFiringStrategy::sendChargeEffect(const TrajectoryTimeAware &trajecto
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "sendChargeEffect";
|
||||
|
||||
const auto &trajGeometry = trajectoryTimeAware.geometry();
|
||||
const auto trajGeometry = trajectoryTimeAware.geometry();
|
||||
|
||||
// sanity check:
|
||||
if (trajGeometry.size() < 2)
|
||||
@@ -165,7 +175,7 @@ int AbstractFiringStrategy::sendChargeEffect(const TrajectoryTimeAware &trajecto
|
||||
chargeEffect.trajectoryTimeAware(trajectoryTimeAware);
|
||||
|
||||
const auto &reply = m_effector->mainHandler()->chargeEffectHandler()->createChargeEffect(chargeEffect);
|
||||
DEBUG_LOG(m_logger) << "reply.id=" << reply.id() << ", str:" << reply.str() << ", uniqueId:" << reply.uniqueId();
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " reply.id=" << reply.id() << ", str:" << reply.str() << ", uniqueId:" << reply.uniqueId();
|
||||
return reply.id();
|
||||
}
|
||||
|
||||
|
||||
+3
-3
@@ -21,7 +21,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <AreaEffectSimulation/logger.h>
|
||||
#include <QtCore/QObject>
|
||||
#include <QObject>
|
||||
#include <Core/core.hpp>
|
||||
#include <QJsonObject>
|
||||
|
||||
@@ -44,7 +44,7 @@ public:
|
||||
explicit AbstractFiringStrategy(ObjectEffector *parent);
|
||||
virtual ~AbstractFiringStrategy();
|
||||
|
||||
virtual void doFiring() = 0;
|
||||
virtual bool doFiring() = 0;
|
||||
|
||||
Q_SIGNALS:
|
||||
// Has to be emitted in doFiring() implementation!
|
||||
@@ -52,7 +52,7 @@ Q_SIGNALS:
|
||||
|
||||
protected:
|
||||
// methods:
|
||||
void calculateDispersionTrajectory();
|
||||
bool calculateDispersionTrajectory();
|
||||
std::vector<Core::GeoPositionRelativeTime> buildTrajectoryGeometry(const QVector<TrajectoryPoint> &trajectory);
|
||||
TrajectoryTimeAware buildTrajectoryTimeAware(const std::vector<Core::GeoPositionRelativeTime> &trajectoryGeometry, qint64 curTime, int index = 0);
|
||||
|
||||
|
||||
+35
-4
@@ -29,19 +29,50 @@ DefaultFiringStrategy::~DefaultFiringStrategy()
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
|
||||
}
|
||||
|
||||
void DefaultFiringStrategy::doFiring()
|
||||
bool DefaultFiringStrategy::doFiring()
|
||||
{
|
||||
calculateDispersionTrajectory();
|
||||
// 1: calculateDispersionTrajectory
|
||||
if (!calculateDispersionTrajectory())
|
||||
{
|
||||
ERROR_LOG(m_logger) << LOGFUNCTION << " Error on calculateDispersionTrajectory";
|
||||
return false;
|
||||
}
|
||||
|
||||
if (m_transformedTrajectory.size() < 2)
|
||||
{
|
||||
ERROR_LOG(m_logger) << LOGFUNCTION << " transformedTrajectory is not sufficiant"
|
||||
<< ", m_transformedTrajectory.size()" << m_transformedTrajectory.size();
|
||||
return false;
|
||||
}
|
||||
|
||||
// 2: getStartTime
|
||||
const qint64 trajectoryStartTime = getStartTime();
|
||||
|
||||
const auto &geometry = buildTrajectoryGeometry(m_transformedTrajectory);
|
||||
const auto &trajTimeAware = buildTrajectoryTimeAware(geometry, trajectoryStartTime);
|
||||
// 3a buildTrajectoryGeometry
|
||||
const auto geometry = buildTrajectoryGeometry(m_transformedTrajectory);
|
||||
|
||||
// 3b: buildTrajectoryTimeAware
|
||||
const auto trajTimeAware = buildTrajectoryTimeAware(geometry, trajectoryStartTime);
|
||||
// to be bullet-proof:
|
||||
if (trajTimeAware.geometry().size() < 2)
|
||||
{
|
||||
ERROR_LOG(m_logger) << LOGFUNCTION << " trajTimeAware is empty";
|
||||
return false;
|
||||
}
|
||||
|
||||
// 4: sendChargeEffect
|
||||
const int chargeEffectId = sendChargeEffect(trajTimeAware);
|
||||
if (chargeEffectId < 0)
|
||||
{
|
||||
ERROR_LOG(m_logger) << LOGFUNCTION << " sendChargeEffect failed";
|
||||
return false;
|
||||
}
|
||||
|
||||
// 5: signalFired
|
||||
emit signalFired(m_effector->participantId(), m_effector->aesItemId(), {chargeEffectId});
|
||||
|
||||
DEBUG_LOG(m_logger) << "created ChargeEffectId: " << chargeEffectId;
|
||||
return true;
|
||||
}
|
||||
|
||||
} //namespace AreaEffectSimulation
|
||||
+1
-1
@@ -22,7 +22,7 @@ public:
|
||||
explicit DefaultFiringStrategy(ObjectEffector *effector);
|
||||
virtual ~DefaultFiringStrategy();
|
||||
|
||||
void doFiring() override;
|
||||
bool doFiring() override;
|
||||
|
||||
}; // class DefaultFiringStrategy
|
||||
} // namespace AreaEffectSimulation
|
||||
+30
-6
@@ -19,7 +19,7 @@
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QJsonValue>
|
||||
#include <QtGui/QTransform>
|
||||
#include <QTransform>
|
||||
|
||||
namespace AreaEffectSimulation
|
||||
{
|
||||
@@ -32,35 +32,57 @@ Dm72FiringStrategy::Dm72FiringStrategy(ObjectEffector *effector)
|
||||
DEBUG_LOG(m_logger) << "using Dm72FiringStrategy";
|
||||
}
|
||||
|
||||
void Dm72FiringStrategy::doFiring()
|
||||
bool Dm72FiringStrategy::doFiring()
|
||||
{
|
||||
m_transformedTrajectory = TrajectoryTransform::transformToNewTarget(m_effector->intendendTrajectory(), m_impactPoints.at(m_impactPointIndex++));
|
||||
|
||||
if (m_transformedTrajectory.size() < 2)
|
||||
{
|
||||
ERROR_LOG(m_logger) << LOGFUNCTION << " transformedTrajectory is not sufficiant"
|
||||
<< ", m_transformedTrajectory.size()" << m_transformedTrajectory.size();
|
||||
return false;
|
||||
}
|
||||
|
||||
if (m_impactPointIndex >= m_impactPoints.size())
|
||||
m_impactPointIndex = 0;
|
||||
|
||||
const qint64 trajectoryStartTime = getStartTime();
|
||||
|
||||
const auto &geometry = buildTrajectoryGeometry(m_transformedTrajectory);
|
||||
const auto &trajTimeAware = buildTrajectoryTimeAware(geometry, trajectoryStartTime);
|
||||
const auto geometry = buildTrajectoryGeometry(m_transformedTrajectory);
|
||||
const auto trajTimeAware = buildTrajectoryTimeAware(geometry, trajectoryStartTime);
|
||||
|
||||
QJsonObject props{{QStringLiteral("effectDurationMsec"), m_effectDurationMsec}};
|
||||
const int chargeEffectId = sendChargeEffect(trajTimeAware, props);
|
||||
if (chargeEffectId < 0)
|
||||
{
|
||||
ERROR_LOG(m_logger) << LOGFUNCTION << " sendChargeEffect failed";
|
||||
return false;
|
||||
}
|
||||
|
||||
emit signalFired(m_effector->participantId(), m_effector->aesItemId(), {chargeEffectId});
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
void Dm72FiringStrategy::init()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " START"
|
||||
<< ", m_effector->participantId=" << m_effector->participantId()
|
||||
<< ", m_effector->aesItemId=" << m_effector->aesItemId();
|
||||
|
||||
using namespace AdlerJson;
|
||||
using namespace LtsCoordTrans;
|
||||
|
||||
m_impactPointIndex = 0;
|
||||
m_impactPoints.clear();
|
||||
|
||||
bool bOk;
|
||||
bool bOk = false;
|
||||
WirkmittelFeuerkommandoRakete wirkmittel;
|
||||
const QJsonObject properties = QJsonDocument::fromJson(QByteArray::fromStdString(m_effector->effectorData().properties())).object();
|
||||
|
||||
const std::string propertiesStdStr = m_effector->effectorData().properties();
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " START" << ", propertiesStdStr= '" << propertiesStdStr << "'";
|
||||
|
||||
const QJsonObject properties = QJsonDocument::fromJson(QByteArray::fromStdString(propertiesStdStr)).object();
|
||||
const Core::GeoPosition geoStartPos = participantPosition(m_effector->participantId());
|
||||
const UtmCoordinate utmStartPos = UtmCoordinate::fromGeographic(geoStartPos.lon(), geoStartPos.lat());
|
||||
|
||||
@@ -99,6 +121,8 @@ void Dm72FiringStrategy::init()
|
||||
}
|
||||
|
||||
DEBUG_LOG(m_logger) << "Got " << m_impactPoints.size() << " impact points";
|
||||
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
|
||||
}
|
||||
|
||||
QVector<QPointF> Dm72FiringStrategy::mineLayingCentroids() const
|
||||
|
||||
+1
-1
@@ -24,7 +24,7 @@ class Dm72FiringStrategy : public AbstractFiringStrategy
|
||||
public:
|
||||
explicit Dm72FiringStrategy(ObjectEffector *effector);
|
||||
|
||||
void doFiring() override final;
|
||||
bool doFiring() final;
|
||||
|
||||
private: // methods
|
||||
void init();
|
||||
|
||||
+9
-3
@@ -36,7 +36,7 @@ GmlrsFiringStrategy::~GmlrsFiringStrategy()
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
|
||||
}
|
||||
|
||||
void GmlrsFiringStrategy::doFiring()
|
||||
bool GmlrsFiringStrategy::doFiring()
|
||||
{
|
||||
m_transformedTrajectory = TrajectoryTransform::transformToNewTarget(m_effector->intendendTrajectory(), m_impactPoints.at(m_impactPointIndex++));
|
||||
|
||||
@@ -45,12 +45,18 @@ void GmlrsFiringStrategy::doFiring()
|
||||
|
||||
const qint64 trajectoryStartTime = getStartTime();
|
||||
|
||||
const auto &geometry = buildTrajectoryGeometry(m_transformedTrajectory);
|
||||
const auto &trajTimeAware = buildTrajectoryTimeAware(geometry, trajectoryStartTime);
|
||||
const auto geometry = buildTrajectoryGeometry(m_transformedTrajectory);
|
||||
const auto trajTimeAware = buildTrajectoryTimeAware(geometry, trajectoryStartTime);
|
||||
|
||||
const int chargeEffectId = sendChargeEffect(trajTimeAware);
|
||||
if (chargeEffectId < 0)
|
||||
{
|
||||
ERROR_LOG(m_logger) << LOGFUNCTION << " sendChargeEffect failed";
|
||||
return false;
|
||||
}
|
||||
|
||||
emit signalFired(m_effector->participantId(), m_effector->aesItemId(), {chargeEffectId});
|
||||
return true;
|
||||
}
|
||||
|
||||
void GmlrsFiringStrategy::init()
|
||||
|
||||
+1
-1
@@ -28,7 +28,7 @@ public:
|
||||
explicit GmlrsFiringStrategy(ObjectEffector *effector);
|
||||
virtual ~GmlrsFiringStrategy();
|
||||
|
||||
void doFiring() override;
|
||||
bool doFiring() override;
|
||||
|
||||
private: // methods
|
||||
void init();
|
||||
|
||||
+23
-12
@@ -35,7 +35,7 @@ SmartFiringStrategy::~SmartFiringStrategy()
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
|
||||
}
|
||||
|
||||
void SmartFiringStrategy::doFiring()
|
||||
bool SmartFiringStrategy::doFiring()
|
||||
{
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
|
||||
|
||||
@@ -59,13 +59,19 @@ void SmartFiringStrategy::doFiring()
|
||||
// convert from intendendTrajectory (relativ) to TRAJECTORY_TYPE (absolute)
|
||||
// The TrajectorySplitter needs TRAJECTORY_TYPE
|
||||
// using TRAJECTORY_TYPE = std::vector<Core::GeoPositionRelativeTime>;
|
||||
const auto &intendendTrajectory = m_effector->intendendTrajectory();
|
||||
const auto &trajGeometry = buildTrajectoryGeometry(intendendTrajectory);
|
||||
const auto intendendTrajectory = m_effector->intendendTrajectory();
|
||||
const auto trajGeometry = buildTrajectoryGeometry(intendendTrajectory);
|
||||
if (trajGeometry.size() < 2)
|
||||
{
|
||||
ERROR_LOG(m_logger) << LOGFUNCTION << " transformedTrajectory is not sufficiant"
|
||||
<< ", size=" << trajGeometry.size();
|
||||
return false;
|
||||
}
|
||||
|
||||
// split and avoid copying:
|
||||
const TrajectorySplitter<std::vector<Core::GeoPositionRelativeTime>> splitter(trajGeometry);
|
||||
const auto &trajGeo1 = splitter.getTrajectory1();
|
||||
const auto &trajGeo2 = splitter.getTrajectory2();
|
||||
const auto trajGeo1 = splitter.getTrajectory1();
|
||||
const auto trajGeo2 = splitter.getTrajectory2();
|
||||
|
||||
DEBUG_LOG(m_logger) << "splitter: " << " intendendTrajectory.size = " << intendendTrajectory.size();
|
||||
DEBUG_LOG(m_logger) << "splitter: " << " trajGeometry.size = " << trajGeometry.size();
|
||||
@@ -76,27 +82,32 @@ void SmartFiringStrategy::doFiring()
|
||||
//
|
||||
// and second, process both Trajectories/Impacts
|
||||
//
|
||||
|
||||
// ToDo: Check, how oftem signalFired should be fired?
|
||||
QVector<int> chargeEffectIds;
|
||||
if (trajGeo1.size() > 2)
|
||||
{
|
||||
const auto &trajTimeAware = buildTrajectoryTimeAware(trajGeo1, trajectoryStartTime, 0);
|
||||
const auto trajTimeAware = buildTrajectoryTimeAware(trajGeo1, trajectoryStartTime, 0);
|
||||
const int chargeEffectId = sendChargeEffect(trajTimeAware);
|
||||
chargeEffectIds << chargeEffectId;
|
||||
if (chargeEffectId < 0)
|
||||
WARNING_LOG(m_logger) << LOGFUNCTION << " sendChargeEffect failed";
|
||||
else
|
||||
chargeEffectIds << chargeEffectId;
|
||||
DEBUG_LOG(m_logger) << "Trajectory1 - created ChargeEffectId: " << chargeEffectId;
|
||||
}
|
||||
if (trajGeo2.size() > 2)
|
||||
{
|
||||
const auto &trajTimeAware = buildTrajectoryTimeAware(trajGeo2, trajectoryStartTime, 1);
|
||||
const auto trajTimeAware = buildTrajectoryTimeAware(trajGeo2, trajectoryStartTime, 1);
|
||||
const int chargeEffectId = sendChargeEffect(trajTimeAware);
|
||||
chargeEffectIds << chargeEffectId;
|
||||
if (chargeEffectId < 0)
|
||||
WARNING_LOG(m_logger) << LOGFUNCTION << " sendChargeEffect failed";
|
||||
else
|
||||
chargeEffectIds << chargeEffectId;
|
||||
DEBUG_LOG(m_logger) << "Trajectory2 - created ChargeEffectId: " << chargeEffectId;
|
||||
}
|
||||
if (chargeEffectIds.size())
|
||||
if (!chargeEffectIds.empty())
|
||||
emit signalFired(m_effector->participantId(), m_effector->aesItemId(), chargeEffectIds);
|
||||
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
|
||||
return true;
|
||||
}
|
||||
|
||||
} // namespace AreaEffectSimulation
|
||||
+1
-1
@@ -27,7 +27,7 @@ public:
|
||||
explicit SmartFiringStrategy(ObjectEffector *effector);
|
||||
virtual ~SmartFiringStrategy();
|
||||
|
||||
void doFiring() override;
|
||||
bool doFiring() override;
|
||||
|
||||
private: // methods
|
||||
|
||||
|
||||
+3
-3
@@ -13,11 +13,11 @@
|
||||
|
||||
// AES
|
||||
#include <AreaEffectSimulation/Utils/polygons.h>
|
||||
#include <Core/function_reply_object.h>
|
||||
#include <DDS/Core/function_reply_object.h>
|
||||
#include <Core/core.hpp>
|
||||
|
||||
|
||||
#include <QtCore/QTimer>
|
||||
#include <QTimer>
|
||||
#include <QDebug>
|
||||
|
||||
#include <iostream>
|
||||
@@ -142,7 +142,7 @@ void ModuleTestLimits::testAirSupports()
|
||||
const auto &items = m_aesDtc->explosionClusters();
|
||||
for (const auto &item : qAsConst(items))
|
||||
{
|
||||
if (item.effectStateId() == AesEffectState::EsPrepared && item.isCentral() && m_pdmDtc->gearClassFromChargeTypeId(item.chargeStruct().chargeTypeId()) == ProjectDataManagement::GearClass::GearClass_AirSupport)
|
||||
if (item.effectStateId() == AesEffectState::EsPrepared && item.isCentral() && m_pdmDtc->gearClassFromChargeTypeId(item.chargeStruct().chargeTypeId()) == ProjectDataManagement::GearClass::AirSupport)
|
||||
++counter;
|
||||
}
|
||||
|
||||
|
||||
@@ -9,11 +9,11 @@
|
||||
#include "aes_dts.h"
|
||||
#include "aes_fts.h"
|
||||
|
||||
#include <Core/pacemaker.h>
|
||||
#include <Core/core_dtc.h>
|
||||
#include <DDS/Core/pacemaker.h>
|
||||
#include <DDS/Core/core_dtc.h>
|
||||
#include <TrainingAreaBase/tab_dtc.h>
|
||||
#include <QtCore/QCoreApplication>
|
||||
#include <QtCore/QThread>
|
||||
#include <QCoreApplication>
|
||||
#include <QThread>
|
||||
|
||||
namespace AreaEffectSimulation
|
||||
{
|
||||
|
||||
@@ -9,8 +9,8 @@
|
||||
#include <DDS/DDSConnector/dds_connector.h>
|
||||
#include <AreaEffectSimulation/aes_dts.h>
|
||||
#include <AreaEffectSimulation/aes_fts.h>
|
||||
#include <Core/core_dtc.h>
|
||||
#include <Core/topic_lock_master.h>
|
||||
#include <DDS/Core/core_dtc.h>
|
||||
#include <DDS/Core/topic_lock_master.h>
|
||||
#include <ProjectDataManagement/pdm_dtc.h>
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
#include <TrainingAreaBase/tab_ftc.h>
|
||||
@@ -20,7 +20,7 @@
|
||||
#include <InfrastructureManagement/ism_dtc.h>
|
||||
|
||||
#include "logger.h"
|
||||
#include <QtCore/QDateTime>
|
||||
#include <QDateTime>
|
||||
#include <QElapsedTimer>
|
||||
|
||||
namespace Core
|
||||
|
||||
+4
-2
@@ -133,9 +133,11 @@ Core::FunctionReplyObject HandlerChargeAdministration::consumeCharge(int chargeT
|
||||
ParticipantManagement::ConnectState connectState = m_mainHandler->dds()->ppmDtc()->saaConnectedState(partyId);
|
||||
DEBUG_LOG(m_logger) << "connectState: " << connectState;
|
||||
|
||||
if (m_mainHandler->dds()->ppmDtc()->isPartyAdlerVerbund(partyId) && connectState == ParticipantManagement::ConnectState::Connected)
|
||||
if (m_mainHandler->dds()->ppmDtc()->isPartyAdlerVerbund(partyId) && connectState == ParticipantManagement::ConnectState::Connected
|
||||
&& m_mainHandler->dds()->pdmDtc()->isAdlerChargeType(chargeTypeId))
|
||||
effectSource = ProjectDataManagement::EffectSource::ES_ADLER;
|
||||
else if (!m_mainHandler->dds()->ppmDtc()->isPartyAdlerVerbund(partyId) && connectState == ParticipantManagement::ConnectState::Connected)
|
||||
else if (!m_mainHandler->dds()->ppmDtc()->isPartyAdlerVerbund(partyId) && connectState == ParticipantManagement::ConnectState::Connected
|
||||
&& m_mainHandler->dds()->pdmDtc()->isAdlerChargeType(chargeTypeId))
|
||||
effectSource = ProjectDataManagement::EffectSource::ES_ADLER_STANDALONE;
|
||||
|
||||
DEBUG_LOG(m_logger) << "effectSource: " << effectSource;
|
||||
|
||||
@@ -37,7 +37,7 @@
|
||||
#include <Trajectory/trajectory_generator.h>
|
||||
|
||||
#include <DDS/DDSConnector/dds_connector.h>
|
||||
#include <Core/pacemaker.h>
|
||||
#include <DDS/Core/pacemaker.h>
|
||||
#include <ngldb/db_service_handler.h>
|
||||
|
||||
#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
|
||||
|
||||
+4
-4
@@ -7,11 +7,11 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <QtCore/QMap>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QMap>
|
||||
#include <QObject>
|
||||
#include <QTimer>
|
||||
|
||||
#include <Core/core.hpp>
|
||||
#include <DDS/Core/core.hpp>
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
#include "logger.h"
|
||||
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QtCore/QObject>
|
||||
#include <QtGui/QPolygonF>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QObject>
|
||||
#include <QPolygonF>
|
||||
#include <QTimer>
|
||||
|
||||
#include "aes_enums.hpp"
|
||||
#include "main_handler.h"
|
||||
#include "special_area_provider.h"
|
||||
|
||||
#include "logger.h"
|
||||
#include <Core/function_reply_object.h>
|
||||
#include <DDS/Core/function_reply_object.h>
|
||||
#include <ProjectDataManagement/pdm_dtc.h>
|
||||
#include <Trajectory/trajectory_generator.h>
|
||||
|
||||
@@ -360,7 +360,7 @@ template <typename T> class ObjectBaseTmpl : public ObjectBase
|
||||
if (static_cast<MineClass::type>(m_mainHandler->dds()->pdmDtc()->mineClass(m_data.chargeTypeId, m_data.igniterTypeId, m_data.igniterFunctionId)) == MineClass::VirtualSingle)
|
||||
return true;
|
||||
|
||||
if (m_mainHandler->dds()->pdmDtc()->gearClassFromChargeTypeId(m_data.chargeTypeId) == ProjectDataManagement::GearClass::GearClass_AirSupport)
|
||||
if (m_mainHandler->dds()->pdmDtc()->gearClassFromChargeTypeId(m_data.chargeTypeId) == ProjectDataManagement::GearClass::AirSupport)
|
||||
return true;
|
||||
|
||||
// Laser-Guidable Weapons must always be calculated by CES
|
||||
|
||||
+2
-2
@@ -7,10 +7,10 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <QtCore/QObject>
|
||||
#include <QObject>
|
||||
|
||||
#include "object_base.h"
|
||||
#include <Core/function_reply_object.h>
|
||||
#include <DDS/Core/function_reply_object.h>
|
||||
#include <AreaEffectSimulation/aes_db.h>
|
||||
|
||||
|
||||
|
||||
+2
-2
@@ -7,11 +7,11 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QtCore/QObject>
|
||||
#include <QObject>
|
||||
|
||||
#include "logger.h"
|
||||
|
||||
#include <Core/function_reply_object.h>
|
||||
#include <DDS/Core/function_reply_object.h>
|
||||
#include <aes_db.h>
|
||||
#include <aes_dtc.h>
|
||||
#include <aes_ftc.h>
|
||||
|
||||
+10
-3
@@ -183,11 +183,17 @@ void ObjectEffector::onEffectorFired()
|
||||
if (m_firingStrategy == nullptr)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Not possible to fire. No firing strategy specified.";
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
m_firingStrategy->doFiring();
|
||||
const bool bDoFiringSuccess = m_firingStrategy->doFiring();
|
||||
if (!bDoFiringSuccess)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "doFiring failed"
|
||||
<< ", participantId=" << m_participantId
|
||||
<< ", aesItemId=" << m_aesItemId
|
||||
<< ", intendendTrajectory().size()=" << this->intendendTrajectory().size();
|
||||
}
|
||||
}
|
||||
|
||||
// Anhand der EX-L39 Streuungsdaten wird eine Trajektorie für diesen
|
||||
@@ -209,7 +215,8 @@ void ObjectEffector::setIndendedTrajectory(const std::vector<Core::RelativePosit
|
||||
|
||||
void ObjectEffector::setEffectorData(const EffectorData &effectorData)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "setEffectorData";
|
||||
DEBUG_LOG(m_logger) << "setEffectorData" << ", effectorData.properties() = '" << effectorData.properties() << "'";
|
||||
|
||||
m_effectorData = effectorData;
|
||||
setIndendedTrajectory(effectorData.trajectoryRelative());
|
||||
delete m_firingStrategy;
|
||||
|
||||
@@ -7,10 +7,10 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <QtCore/QObject>
|
||||
#include <QObject>
|
||||
|
||||
#include "object_base.h"
|
||||
#include <Core/function_reply_object.h>
|
||||
#include <DDS/Core/function_reply_object.h>
|
||||
#include <AreaEffectSimulation/aes_db.h>
|
||||
|
||||
|
||||
|
||||
Reference in new issue
Block a user