Complete Qt6/rtiddsgen migration of residual Lts service sources
This commit is contained in:
86 files changed
+1235
-1128
No files matched your search
@@ -127,6 +127,11 @@ CODEGEN_SERVER_TOPICS(SRCS_server ${xml_FILE})
|
||||
CODEGEN_SQL(SRCS_server ${xml_FILE})
|
||||
|
||||
NGL_ADD_LIBRARY2(AAR SV svcGnaServer SHARED ${SRCS_server})
|
||||
# NGL_ADD_LIBRARY2 (unlike NGL_ADD_LIBRARY) does not define the
|
||||
# MAKE_<SYMBOL>_LIB compile guard, but the generated gna_[d|f]ts_impl.h
|
||||
# headers that this target compiles carry such a guard — same situation as
|
||||
# svcGnaClient, which defines MAKE_SVCGNACLIENT_LIB explicitly for the same reason.
|
||||
TARGET_COMPILE_DEFINITIONS(svcGnaServer PRIVATE MAKE_SVCGNASERVER_LIB)
|
||||
NGL_TARGET_LINK_LIBRARIES(svcGnaServer
|
||||
PRIVATE
|
||||
ddsfts
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
#include "dds_handler.h"
|
||||
#include <TrainingAreaBase/tab_dts.h>
|
||||
#include <DDS/DTS/generic_dts.h>
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
|
||||
namespace GuezNasat
|
||||
{
|
||||
@@ -12,7 +13,8 @@ namespace GuezNasat
|
||||
|
||||
|
||||
Participant2Dds::Participant2Dds(const dds::domain::DomainParticipant &domainParticipant, int exerciseId)
|
||||
: m_ddsConnector(new DDSConnector::DdsConnector(domainParticipant, IDL::PartitionType::Exercise, exerciseId))
|
||||
: m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
|
||||
, m_ddsConnector(new DDSConnector::DdsConnector(domainParticipant, IDL::PartitionType::Exercise, exerciseId))
|
||||
{
|
||||
m_ddsConnector->initPublisherSubscriber();
|
||||
m_ppmDtc = ParticipantManagement::Interface::Dtc::create(m_ddsConnector);
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
#include <ExerciseManagement/exm_dtc.h>
|
||||
#include <AreaEffectSimulation/aes_ftc.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
#include <ProjectDataManagement/pdm_dtc.h>
|
||||
#include <TrainingAreaBase/tab_dts.h>
|
||||
#include <QtCore/QHash>
|
||||
|
||||
@@ -33,6 +33,7 @@ NasatAircraft fromDb(const Database::NasatAircraft &db)
|
||||
HandlerNasatAircraft::HandlerNasatAircraft(Initialization *mainHandler)
|
||||
: QObject()
|
||||
, Interface::Fts::ModifyNasatAircraftRequestHandler(mainHandler->dds()->fts())
|
||||
, m_logger(getLogger("HandlerNasatAircraft"))
|
||||
, m_mainHandler(mainHandler)
|
||||
, m_dts(mainHandler->dds()->dts())
|
||||
, m_fts(mainHandler->dds()->fts())
|
||||
|
||||
+1
@@ -35,6 +35,7 @@ NasatAircraftParticipant fromDb(const Database::NasatAircraftParticipant &db)
|
||||
HandlerNasatAircraftParticipant::HandlerNasatAircraftParticipant(Initialization *mainHandler)
|
||||
: QObject()
|
||||
, Interface::Fts::ModifyNasatAircraftParticipantRequestHandler(mainHandler->dds()->fts())
|
||||
, m_logger(getLogger("HandlerNasatAircraftParticipant"))
|
||||
, m_mainHandler(mainHandler)
|
||||
, m_dts(mainHandler->dds()->dts())
|
||||
, m_fts(mainHandler->dds()->fts())
|
||||
|
||||
@@ -21,6 +21,7 @@ namespace GuezNasat
|
||||
{
|
||||
HandlerNasatImpact::HandlerNasatImpact(Initialization *mainHandler)
|
||||
: AreaEffectSimulation::Interface::Ftc::AirSupportImpactModifyReplyHandler()
|
||||
, m_logger(getLogger("HandlerNasatImpact"))
|
||||
, m_mainHandler(mainHandler)
|
||||
{
|
||||
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
|
||||
|
||||
@@ -15,7 +15,8 @@
|
||||
namespace GuezNasat
|
||||
{
|
||||
HandlerNasatNineLiner::HandlerNasatNineLiner(Initialization *mainHandler)
|
||||
: m_mainHandler(mainHandler)
|
||||
: m_logger(getLogger("HandlerNasatNineLiner"))
|
||||
, m_mainHandler(mainHandler)
|
||||
{}
|
||||
|
||||
bool HandlerNasatNineLiner::init() const
|
||||
@@ -38,8 +39,8 @@ static Nasat9Liner createDds9Liner(const NasatNineLiner &nasatNineLiner)
|
||||
nl.sampleTime = tsMSec;
|
||||
|
||||
if (nasatNineLiner.initialPointMode != 0)
|
||||
nl.initialPoint(Core::GeoPosition2D(LtsCoordTrans::deg2rad() * nasatNineLiner.initialPoint.lon,
|
||||
LtsCoordTrans::deg2rad() * nasatNineLiner.initialPoint.lat));
|
||||
nl.initialPoint = Core::GeoPosition2D(LtsCoordTrans::deg2rad() * nasatNineLiner.initialPoint.lon,
|
||||
LtsCoordTrans::deg2rad() * nasatNineLiner.initialPoint.lat);
|
||||
|
||||
if (nasatNineLiner.heading2InitialPointMode != Heading2InitialPointMode::Undefined)
|
||||
{
|
||||
@@ -60,9 +61,9 @@ static Nasat9Liner createDds9Liner(const NasatNineLiner &nasatNineLiner)
|
||||
if (nasatNineLiner.targetPositionMode != 0)
|
||||
{
|
||||
const auto z = nasatNineLiner.altitudeTargetMode != 0 ? nasatNineLiner.altitudeTarget : -1;
|
||||
nl.targetPosition(Core::GeoPosition(LtsCoordTrans::deg2rad() * nasatNineLiner.targetPosition.lon,
|
||||
LtsCoordTrans::deg2rad() * nasatNineLiner.targetPosition.lat,
|
||||
z));
|
||||
nl.targetPosition = Core::GeoPosition(LtsCoordTrans::deg2rad() * nasatNineLiner.targetPosition.lon,
|
||||
LtsCoordTrans::deg2rad() * nasatNineLiner.targetPosition.lat,
|
||||
z);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@@ -25,7 +25,8 @@ NasatAircraftParticipantEx::NasatAircraftParticipantEx()
|
||||
}
|
||||
|
||||
NasatAircraftParticipantEx::NasatAircraftParticipantEx(const NasatAircraftParticipant &nap, const std::shared_ptr<Participant2Dds> &publisher)
|
||||
: m_nap(nap)
|
||||
: m_logger(getLogger("NasatAircraftParticipantEx"))
|
||||
, m_nap(nap)
|
||||
, m_publisher(publisher)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START";
|
||||
|
||||
@@ -22,7 +22,7 @@ class AbstractSocketHandler;
|
||||
using DbHandler = NGLDB::DbServiceHandler<DatabaseInterface>;
|
||||
class HandlerCodificationData;
|
||||
|
||||
class GNA_SERVER_EXPORT Initialization final
|
||||
class SVCGNASERVER_EXPORT Initialization final
|
||||
{
|
||||
public:
|
||||
Initialization();
|
||||
|
||||
@@ -15,7 +15,7 @@ namespace GuezNasat
|
||||
{
|
||||
namespace Settings
|
||||
{
|
||||
GNA_SERVER_EXPORT void setIniFile(const QString &ini);
|
||||
SVCGNASERVER_EXPORT void setIniFile(const QString &ini);
|
||||
NGL::Settings *settings();
|
||||
quint16 socketListenPort();
|
||||
bool useWebSocket();
|
||||
|
||||
Reference in new issue
Block a user