Adds immediate migration results in progress
This commit is contained in:
2102 files changed
+17482
-15071
No files matched your search
@@ -36,6 +36,8 @@ private Q_SLOTS:
|
||||
void onAirSupportImpact(AreaEffectSimulation::AirSupportImpactModifyRequest asi, int equipmentNumber);
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
NgsHandler *m_ngsHandler;
|
||||
std::shared_ptr<AreaEffectSimulation::Interface::Dtc> m_dtcAes;
|
||||
std::shared_ptr<AreaEffectSimulation::Interface::Ftc> m_ftcAes;
|
||||
|
||||
+5
-6
@@ -9,11 +9,10 @@
|
||||
namespace HighLevelArchitecture
|
||||
{
|
||||
|
||||
DdsHandler::DdsHandler(int domainId, int exerciseId)
|
||||
: m_ddsConnector(new DDSConnector::DdsConnector(domainId, IDL::PartitionType::Exercise, exerciseId))
|
||||
, m_exerciseHasHlaConnection(false)
|
||||
{
|
||||
DEBUG_LOG() << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
|
||||
DdsHandler::DdsHandler(int domainId, int exerciseId) : m_ddsConnector(new DDSConnector::DdsConnector(domainId, IDL::PartitionType::Exercise, exerciseId))
|
||||
, m_exerciseHasHlaConnection(false),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
|
||||
}
|
||||
|
||||
DdsHandler::~DdsHandler()
|
||||
@@ -27,7 +26,7 @@ bool DdsHandler::init(const QStringList &qosFileList)
|
||||
{
|
||||
if (!m_ddsConnector->init(qosFileList))
|
||||
{
|
||||
ERROR_LOG() << "Error initializing dds connections - aborting";
|
||||
ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
@@ -32,8 +32,10 @@ public:
|
||||
Q_SIGNALS:
|
||||
void exerciseHlaStateChanged(bool bHlaEnabled);
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
void onExerciseChanged(const ExerciseManagement::Exercise &ex, DataModification modType);
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
|
||||
std::shared_ptr<Core::Pacemaker> m_pacemaker;
|
||||
std::shared_ptr<ExerciseManagement::Interface::Dtc> m_dtcExm;
|
||||
|
||||
+4
-5
@@ -13,10 +13,9 @@
|
||||
namespace HighLevelArchitecture
|
||||
{
|
||||
|
||||
MainHandler::MainHandler(QObject *parent)
|
||||
: QObject(parent)
|
||||
, m_exerciseId(0)
|
||||
{}
|
||||
MainHandler::MainHandler(QObject *parent) : QObject(parent)
|
||||
, m_exerciseId(0),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
|
||||
|
||||
MainHandler::~MainHandler()
|
||||
{
|
||||
@@ -31,7 +30,7 @@ bool MainHandler::init(int domainId, int exerciseId)
|
||||
m_ddsHandler = std::make_shared<DdsHandler>(domainId, exerciseId);
|
||||
if (!m_ddsHandler->init())
|
||||
{
|
||||
ERROR_LOG() << "Could not init DDS handler";
|
||||
ERROR_LOG(m_logger) << "Could not init DDS handler";
|
||||
return false;
|
||||
}
|
||||
connect(m_ddsHandler.get(), &DdsHandler::exerciseHlaStateChanged,
|
||||
|
||||
@@ -26,6 +26,7 @@ public:
|
||||
private Q_SLOTS:
|
||||
void onExerciseHlaStateChanged(bool bHlaEnabled);
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
std::shared_ptr<DdsHandler> m_ddsHandler;
|
||||
std::shared_ptr<NgsHandler> m_ngsHandler;
|
||||
std::shared_ptr<WebSocketHandler> m_wsHandler;
|
||||
|
||||
+21
-22
@@ -127,8 +127,7 @@ static inline rpr2::SpatialStruct spatialStructFromWorldLocation(const rpr2::Wor
|
||||
|
||||
|
||||
|
||||
NgsConnector::NgsConnector(const QString &fedName, NgsHandler *ngsHandler)
|
||||
: m_ngsHandler(ngsHandler)
|
||||
NgsConnector::NgsConnector(const QString &fedName, NgsHandler *ngsHandler) : m_ngsHandler(ngsHandler)
|
||||
, m_fedName(fedName)
|
||||
, m_swadmin(&ngs::SimulatedWorldAPI::getSimulatedWorldAdmin())
|
||||
, m_master(nullptr)
|
||||
@@ -144,8 +143,8 @@ NgsConnector::NgsConnector(const QString &fedName, NgsHandler *ngsHandler)
|
||||
, m_iaWeaponFireCallback(new ObserverWeaponFireCBNotifier())
|
||||
, m_bInitialized(false)
|
||||
, m_bCanPublishData(false)
|
||||
, m_timer(new QTimer(this))
|
||||
{
|
||||
, m_timer(new QTimer(this)),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
connect(m_timer, &QTimer::timeout,
|
||||
this, &NgsConnector::go);
|
||||
connect(m_playerCallback, &PlayerCallback::firstTick,
|
||||
@@ -212,7 +211,7 @@ bool NgsConnector::initialize(ngs::IObserver::ProtocolType protocol, const QStri
|
||||
}
|
||||
catch (const ngs::NGSSimWorldException &e)
|
||||
{
|
||||
ERROR_LOG() << "caught exception during init (getIFederationMaster): " << e.print();
|
||||
ERROR_LOG(m_logger) << "caught exception during init (getIFederationMaster): " << e.print();
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -227,7 +226,7 @@ bool NgsConnector::initialize(ngs::IObserver::ProtocolType protocol, const QStri
|
||||
}
|
||||
catch (const NGSException &e)
|
||||
{
|
||||
ERROR_LOG() << "caught exception during init (createFederation): " << e.print();
|
||||
ERROR_LOG(m_logger) << "caught exception during init (createFederation): " << e.print();
|
||||
return false;
|
||||
}
|
||||
player = &m_swadmin->getIPlayer(m_fedName.toStdString(), playerName.toStdString(), *m_playerCallback, Settings::swConfFileName().toLatin1().data(), Settings::fomIdentifier().toStdString(), Settings::rtiIdentifier().toStdString());
|
||||
@@ -277,22 +276,22 @@ void NgsConnector::subscribeAtNgs()
|
||||
m_enitityNumberCounter = 1;
|
||||
m_eventCount = 1;
|
||||
|
||||
INFO_LOG() << "Subscribe at NGS - Human Objects";
|
||||
INFO_LOG(m_logger) << "Subscribe at NGS - Human Objects";
|
||||
rpr2::IObserverHumanObjClass &humanObjClass = m_somPlayer->getObserverHumanObjClass(*m_humanCallback);
|
||||
humanObjClass.subscribeAllAttributes();
|
||||
humanObjClass.subscribe();
|
||||
|
||||
INFO_LOG() << "Subscribe at NGS - GroundVehicle Objects";
|
||||
INFO_LOG(m_logger) << "Subscribe at NGS - GroundVehicle Objects";
|
||||
rpr2::IObserverGroundVehicleObjClass &groundVehicleObjClass = m_somPlayer->getObserverGroundVehicleObjClass(*m_groundVehicleCallback);
|
||||
groundVehicleObjClass.subscribeAllAttributes();
|
||||
groundVehicleObjClass.subscribe();
|
||||
|
||||
INFO_LOG() << "Subscribe at NGS - LongBowApache Objects";
|
||||
INFO_LOG(m_logger) << "Subscribe at NGS - LongBowApache Objects";
|
||||
rpr2::IObserverLongBowApacheObjClass &longBowApacheObjClass = m_somPlayer->getObserverLongBowApacheObjClass(*m_longBowApacheCallback);
|
||||
longBowApacheObjClass.subscribeAllAttributes();
|
||||
longBowApacheObjClass.subscribe();
|
||||
|
||||
INFO_LOG() << "Subscribe at NGS - Designator Objects";
|
||||
INFO_LOG(m_logger) << "Subscribe at NGS - Designator Objects";
|
||||
rpr2::IObserverDesignatorObjClass &designatorObjClass = m_somPlayer->getObserverDesignatorObjClass(*m_designatorCallback);
|
||||
designatorObjClass.subscribeAllAttributes();
|
||||
designatorObjClass.subscribe();
|
||||
@@ -321,35 +320,35 @@ void NgsConnector::unsubscribeFromNgs()
|
||||
|
||||
if (m_somPlayer)
|
||||
{
|
||||
INFO_LOG() << "Unsubscribe at NGS - Human Objects";
|
||||
INFO_LOG(m_logger) << "Unsubscribe at NGS - Human Objects";
|
||||
rpr2::IObserverHumanObjClass &humanObjClass = m_somPlayer->getObserverHumanObjClass(*m_humanCallback);
|
||||
humanObjClass.unsubscribe();
|
||||
|
||||
INFO_LOG() << "Unsubscribe at NGS - GroundVehicle Objects";
|
||||
INFO_LOG(m_logger) << "Unsubscribe at NGS - GroundVehicle Objects";
|
||||
rpr2::IObserverGroundVehicleObjClass &groundVehicleObjClass = m_somPlayer->getObserverGroundVehicleObjClass(*m_groundVehicleCallback);
|
||||
groundVehicleObjClass.unsubscribe();
|
||||
|
||||
INFO_LOG() << "Unsubscribe at NGS - LongBowApache Objects";
|
||||
INFO_LOG(m_logger) << "Unsubscribe at NGS - LongBowApache Objects";
|
||||
rpr2::IObserverLongBowApacheObjClass &longBowApacheObjClass = m_somPlayer->getObserverLongBowApacheObjClass(*m_longBowApacheCallback);
|
||||
longBowApacheObjClass.unsubscribe();
|
||||
|
||||
INFO_LOG() << "Unsubscribe at NGS - Designator Objects";
|
||||
INFO_LOG(m_logger) << "Unsubscribe at NGS - Designator Objects";
|
||||
rpr2::IObserverDesignatorObjClass &designatorObjectClass = m_somPlayer->getObserverDesignatorObjClass(*m_designatorCallback);
|
||||
designatorObjectClass.unsubscribe();
|
||||
|
||||
INFO_LOG() << "Unsubscribe at NGS - Engagement Reply Interaction";
|
||||
INFO_LOG(m_logger) << "Unsubscribe at NGS - Engagement Reply Interaction";
|
||||
rpr2::IObserverEngagementReplyIntClass &enr = m_somPlayer->getObserverEngagementReplyIntClass(*m_iaEngagementReplyCallback);
|
||||
enr.unsubscribe();
|
||||
|
||||
INFO_LOG() << "Unsubscribe at NGS - Event Report Interaction";
|
||||
INFO_LOG(m_logger) << "Unsubscribe at NGS - Event Report Interaction";
|
||||
rpr2::IObserverEventReportIntClass &evr = m_somPlayer->getObserverEventReportIntClass(*m_iaEventReportCallback);
|
||||
evr.unsubscribe();
|
||||
|
||||
INFO_LOG() << "Unsubscribe at NGS - Munition Detonation Interaction";
|
||||
INFO_LOG(m_logger) << "Unsubscribe at NGS - Munition Detonation Interaction";
|
||||
rpr2::IObserverMunitionDetonationIntClass &md = m_somPlayer->getObserverMunitionDetonationIntClass(*m_iaMunitionDetonationCallback);
|
||||
md.unsubscribe();
|
||||
|
||||
INFO_LOG() << "Unsubscribe at NGS - Weapon Fire Interaction";
|
||||
INFO_LOG(m_logger) << "Unsubscribe at NGS - Weapon Fire Interaction";
|
||||
rpr2::IObserverWeaponFireIntClass &wf = m_somPlayer->getObserverWeaponFireIntClass(*m_iaWeaponFireCallback);
|
||||
wf.unsubscribe();
|
||||
}
|
||||
@@ -515,7 +514,7 @@ bool NgsConnector::sendData(int eqNo, const QByteArray& data, int requestIdentif
|
||||
vds.NumberOfLongLongs__A__Padding__A__DatumValue.resize(data.size() / 8 + 1);
|
||||
vds.DatumLengthInBits = 8 * data.size();
|
||||
|
||||
TRACE_LOG() << "--> Data. Receiver: " << eqNo << ", ReqID: " << requestIdentifier << ", Data: " << data;
|
||||
TRACE_LOG(m_logger) << "--> Data. Receiver: " << eqNo << ", ReqID: " << requestIdentifier << ", Data: " << data;
|
||||
|
||||
for (unsigned int i=0; i< vds.NumberOfLongLongs__A__Padding__A__DatumValue.size(); ++i)
|
||||
{
|
||||
@@ -682,11 +681,11 @@ void NgsConnector::go()
|
||||
}
|
||||
catch (const NGSException &ex)
|
||||
{
|
||||
ERROR_LOG() << "NGS Exception caught in Event Loop" << ex.print();
|
||||
ERROR_LOG(m_logger) << "NGS Exception caught in Event Loop" << ex.print();
|
||||
}
|
||||
catch (const std::exception &e)
|
||||
{
|
||||
ERROR_LOG() << "Standard Exception caught in Event Loop: " << e.what();
|
||||
ERROR_LOG(m_logger) << "Standard Exception caught in Event Loop: " << e.what();
|
||||
}
|
||||
catch (...)
|
||||
{
|
||||
@@ -1499,7 +1498,7 @@ void NgsConnector::onNewMunitionDetonation(const rpr2::IObserverMunitionDetonati
|
||||
|
||||
const auto &objectIdentifier = interaction.getEventIdentifier().IssuingObjectIdentifier;
|
||||
int eqId = getEquipmentNoByRTIObjectId(objectIdentifier.ID);
|
||||
DEBUG_LOG() << "Engagement Reply, Issuer: " << eqId;
|
||||
DEBUG_LOG(m_logger) << "Engagement Reply, Issuer: " << eqId;
|
||||
if (m_playerMap.contains(eqId) || objectIdentifier.ID == std::to_string(IdentifierStruct(0).toInt64()))
|
||||
return;
|
||||
|
||||
|
||||
+1
@@ -232,6 +232,7 @@ signals:
|
||||
void laserDesignation(const TrainingAreaBase::LaserDesignation &event);
|
||||
|
||||
protected:
|
||||
NGL::INGLLogger &m_logger;
|
||||
void subscribeAtNgs();
|
||||
void unsubscribeFromNgs();
|
||||
|
||||
|
||||
+8
-9
@@ -14,10 +14,9 @@
|
||||
namespace HighLevelArchitecture
|
||||
{
|
||||
|
||||
NgsHandler::NgsHandler(QObject *parent)
|
||||
: QObject(parent)
|
||||
, m_ddsHandler(nullptr)
|
||||
{}
|
||||
NgsHandler::NgsHandler(QObject *parent) : QObject(parent)
|
||||
, m_ddsHandler(nullptr),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
|
||||
|
||||
NgsHandler::~NgsHandler()
|
||||
{
|
||||
@@ -39,7 +38,7 @@ bool NgsHandler::init(const std::shared_ptr<DdsHandler> &ddsHandler)
|
||||
|
||||
ngs::IObserver::ProtocolType protocol = Settings::hlaProtocol();
|
||||
|
||||
INFO_LOG() << "Protocol = " << protToStr.value(protocol, QStringLiteral("UNKNOWN"));
|
||||
INFO_LOG(m_logger) << "Protocol = " << protToStr.value(protocol, QStringLiteral("UNKNOWN"));
|
||||
|
||||
m_ngsConnector =
|
||||
|
||||
@@ -61,9 +60,9 @@ void NgsHandler::onFirstTickFinished()
|
||||
m_ppmHandler = std::make_shared<PpmHandler>(this);
|
||||
m_aesHandler = std::make_shared<AesHandler>(this);
|
||||
if (!m_ppmHandler->init())
|
||||
ERROR_LOG() << "Could not init ppm handler - not able to publish participants to HLA";
|
||||
ERROR_LOG(m_logger) << "Could not init ppm handler - not able to publish participants to HLA";
|
||||
if (!m_aesHandler->init())
|
||||
ERROR_LOG() << "Could not init ppm handler - not able to publish area effect simulations to HLA";
|
||||
ERROR_LOG(m_logger) << "Could not init ppm handler - not able to publish area effect simulations to HLA";
|
||||
|
||||
connect(m_ppmHandler.get(), &PpmHandler::externalEquipmentNumberAdded,
|
||||
this, &NgsHandler::externalEquipmentNumberAdded);
|
||||
@@ -89,11 +88,11 @@ void NgsHandler::initSocketReaders()
|
||||
sr->start();
|
||||
connect(sr, &SocketReader::newData, this, &NgsHandler::onNewSocketReaderData);
|
||||
m_socketReaders.append(sr);
|
||||
INFO_LOG() << "SocketReader with ID " << sd.hlaRequestIdentifier << " connected";
|
||||
INFO_LOG(m_logger) << "SocketReader with ID " << sd.hlaRequestIdentifier << " connected";
|
||||
}
|
||||
else
|
||||
{
|
||||
ERROR_LOG() << "Could not initialize SocketReader " << sd.hlaRequestIdentifier;
|
||||
ERROR_LOG(m_logger) << "Could not initialize SocketReader " << sd.hlaRequestIdentifier;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -49,6 +49,7 @@ private slots:
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
void initSocketReaders();
|
||||
void deInitSocketReaders();
|
||||
|
||||
|
||||
+8
-8
@@ -82,7 +82,7 @@ bool PpmHandler::init()
|
||||
m_dtsTab->enableEquipmentGearAssignment())
|
||||
)
|
||||
{
|
||||
ERROR_LOG() << "Enabling TAB DTS Data-Topics failed.";
|
||||
ERROR_LOG(m_logger) << "Enabling TAB DTS Data-Topics failed.";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -172,7 +172,7 @@ void PpmHandler::onDynamicParticipantDataChanged(const ParticipantManagement::Dy
|
||||
int equipmentNo = getEquipmentNo(data.participantId());
|
||||
if (equipmentNo == 0)
|
||||
{
|
||||
ERROR_LOG() << "Could not find EquipmentNo for Participant " << data.participantId() << ". Cannot send Dynamic Participant Data Modification to HLA.";
|
||||
ERROR_LOG(m_logger) << "Could not find EquipmentNo for Participant " << data.participantId() << ". Cannot send Dynamic Participant Data Modification to HLA.";
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -235,7 +235,7 @@ void PpmHandler::onDynamicParticipantDataChanged(const ParticipantManagement::Dy
|
||||
|
||||
void PpmHandler::onParticipantChanged(const ParticipantManagement::Participant &data, DataModification modType)
|
||||
{
|
||||
DEBUG_LOG() << "onParticipantChanged: " << data;
|
||||
DEBUG_LOG(m_logger) << "onParticipantChanged: " << data;
|
||||
switch (modType)
|
||||
{
|
||||
case DataModification::eAdded:
|
||||
@@ -314,7 +314,7 @@ void PpmHandler::onParticipantChanged(const ParticipantManagement::Participant &
|
||||
|
||||
void PpmHandler::onParticipantPositionChanged(const ParticipantManagement::ParticipantPosition &data, DataModification modType)
|
||||
{
|
||||
DEBUG_LOG() << "onParticipantPositionChanged: " << data;
|
||||
DEBUG_LOG(m_logger) << "onParticipantPositionChanged: " << data;
|
||||
switch (modType)
|
||||
{
|
||||
case DataModification::eAdded:
|
||||
@@ -404,7 +404,7 @@ void PpmHandler::onChargeTypeChanged(const ProjectDataManagement::ChargeType &da
|
||||
|
||||
void PpmHandler::startPublishToNgs()
|
||||
{
|
||||
INFO_LOG() << "Recreating all players from scratch due to structure / exercise change";
|
||||
INFO_LOG(m_logger) << "Recreating all players from scratch due to structure / exercise change";
|
||||
|
||||
|
||||
m_createdParticipantIds.clear();
|
||||
@@ -413,7 +413,7 @@ void PpmHandler::startPublishToNgs()
|
||||
|
||||
|
||||
|
||||
INFO_LOG() << "(Re)Adding all players, size: " << m_partData.size();
|
||||
INFO_LOG(m_logger) << "(Re)Adding all players, size: " << m_partData.size();
|
||||
|
||||
for (const ParticipantManagement::Participant &participant : std::as_const(m_partData))
|
||||
createParticipant(participant);
|
||||
@@ -474,7 +474,7 @@ rpr2::DetonationResultCodeEnum8::ET PpmHandler::rpr2DetonationResultFromPercenta
|
||||
|
||||
void PpmHandler::participantVulnerabilityStateRequest(const TrainingAreaBase::TetraIcd::DemandVulnerabilityStateChange &request)
|
||||
{
|
||||
DEBUG_LOG() << "Participant Vulnerability State Request";
|
||||
DEBUG_LOG(m_logger) << "Participant Vulnerability State Request";
|
||||
|
||||
rpr2::DetonationResultCodeEnum8::ET resCode = rpr2DetonationResultFromVulnerabilityState(request.reqestedState);
|
||||
m_ngsHandler->ngsConnector()->sendMunitionDetonation(request.header.equipmentNumber,
|
||||
@@ -503,7 +503,7 @@ void PpmHandler::createParticipant(const ParticipantManagement::Participant &par
|
||||
|
||||
if (!m_ngsHandler->ngsConnector()->canPublishData())
|
||||
{
|
||||
WARNING_LOG() << "Can not publish data ... :(";
|
||||
WARNING_LOG(m_logger) << "Can not publish data ... :(";
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -90,6 +90,7 @@ public slots:
|
||||
void participantCesHitInformationRequest(const TrainingAreaBase::TetraIcd::CesHitInformation &request);
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
void createParticipant(const ParticipantManagement::Participant &participant);
|
||||
bool createHuman(const ParticipantManagement::Participant &participant);
|
||||
bool createGroundVehicle(const ParticipantManagement::Participant &participant);
|
||||
@@ -113,6 +114,7 @@ private:
|
||||
static rpr2::DetonationResultCodeEnum8::ET rpr2DetonationResultFromPercentage(int percentage);
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
NgsHandler *m_ngsHandler;
|
||||
std::shared_ptr<ParticipantManagement::Interface::Dtc> m_dtcPpm;
|
||||
std::shared_ptr<ParticipantManagement::Interface::Ftc> m_ftcPpm;
|
||||
|
||||
+1
-1
@@ -22,6 +22,6 @@ void ObserverActionRequestCBNotifier::newActionRequestIntInstance(const rpr2::IO
|
||||
|
||||
void ObserverActionRequestCBNotifier::deleteInterface()
|
||||
{
|
||||
DEBUG_LOG() << "Delete Interface";
|
||||
DEBUG_LOG(m_logger) << "Delete Interface";
|
||||
|
||||
}
|
||||
+2
@@ -25,6 +25,8 @@ public:
|
||||
void deleteInterface() override;
|
||||
|
||||
protected:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
signals:
|
||||
|
||||
void newActionRequest(const rpr2::IObserverActionRequestIntInstance &interaction);
|
||||
|
||||
+1
-1
@@ -22,6 +22,6 @@ void ObserverDataCBNotifier::newDataIntInstance(const rpr2::IObserverDataIntInst
|
||||
|
||||
void ObserverDataCBNotifier::deleteInterface()
|
||||
{
|
||||
DEBUG_LOG() << "Delete Interface";
|
||||
DEBUG_LOG(m_logger) << "Delete Interface";
|
||||
|
||||
}
|
||||
+2
@@ -25,6 +25,8 @@ public:
|
||||
void deleteInterface() override;
|
||||
|
||||
protected:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
signals:
|
||||
|
||||
void newData(const rpr2::IObserverDataIntInstance &interaction);
|
||||
|
||||
+1
-1
@@ -23,6 +23,6 @@ void ObserverEngagementReplyCBNotifier::newEngagementReplyIntInstance(const rpr2
|
||||
|
||||
void ObserverEngagementReplyCBNotifier::deleteInterface()
|
||||
{
|
||||
DEBUG_LOG() << "Delete Interface";
|
||||
DEBUG_LOG(m_logger) << "Delete Interface";
|
||||
|
||||
}
|
||||
+2
@@ -25,6 +25,8 @@ public:
|
||||
void deleteInterface() override;
|
||||
|
||||
protected:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
signals:
|
||||
void newEngagementReply(const rpr2::IObserverEngagementReplyIntInstance &interaction);
|
||||
};
|
||||
|
||||
+1
-1
@@ -22,6 +22,6 @@ void ObserverEventReportCBNotifier::newEventReportIntInstance(const rpr2::IObser
|
||||
|
||||
void ObserverEventReportCBNotifier::deleteInterface()
|
||||
{
|
||||
DEBUG_LOG() << "Delete Interface";
|
||||
DEBUG_LOG(m_logger) << "Delete Interface";
|
||||
|
||||
}
|
||||
+2
@@ -25,6 +25,8 @@ public:
|
||||
void deleteInterface() override;
|
||||
|
||||
protected:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
signals:
|
||||
void newEventReport(const rpr2::IObserverEventReportIntInstance &interaction);
|
||||
};
|
||||
|
||||
+1
-1
@@ -17,6 +17,6 @@ void ObserverMunitionDetonationCBNotifier::newMunitionDetonationIntInstance(cons
|
||||
|
||||
void ObserverMunitionDetonationCBNotifier::deleteInterface()
|
||||
{
|
||||
DEBUG_LOG() << "Delete Interface";
|
||||
DEBUG_LOG(m_logger) << "Delete Interface";
|
||||
|
||||
}
|
||||
+2
@@ -24,6 +24,8 @@ public:
|
||||
void deleteInterface() override;
|
||||
|
||||
protected:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
signals:
|
||||
void newMunitionDetonation(const rpr2::IObserverMunitionDetonationIntInstance &interaction);
|
||||
};
|
||||
|
||||
+1
-1
@@ -23,6 +23,6 @@ void ObserverWeaponFireCBNotifier::newWeaponFireIntInstance(const rpr2::IObserve
|
||||
|
||||
void ObserverWeaponFireCBNotifier::deleteInterface()
|
||||
{
|
||||
DEBUG_LOG() << "Delete Interface";
|
||||
DEBUG_LOG(m_logger) << "Delete Interface";
|
||||
|
||||
}
|
||||
+2
@@ -25,6 +25,8 @@ public:
|
||||
void deleteInterface() override;
|
||||
|
||||
protected:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
signals:
|
||||
void newWeaponFire(const rpr2::IObserverWeaponFireIntInstance &interaction);
|
||||
};
|
||||
|
||||
+1
-1
@@ -25,7 +25,7 @@ public:
|
||||
|
||||
void deleteObjectInstance() override
|
||||
{
|
||||
DEBUG_LOG() << "deleteObjectInstance";
|
||||
DEBUG_LOG(m_logger) << "deleteObjectInstance";
|
||||
if (m_pCB && m_pIObject)
|
||||
m_pCB->deleteObjectInstance(*m_pIObject);
|
||||
delete this;
|
||||
|
||||
+7
-8
@@ -12,17 +12,16 @@
|
||||
|
||||
namespace HighLevelArchitecture {
|
||||
|
||||
SocketReader::SocketReader(QObject *parent)
|
||||
: QThread(parent)
|
||||
SocketReader::SocketReader(QObject *parent) : QThread(parent)
|
||||
, m_socket(new QTcpSocket(this))
|
||||
, m_hlaRequestIdentifier(0)
|
||||
.getNGLLogger("SocketReader"))
|
||||
{
|
||||
.getNGLLogger("SocketReader")),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
}
|
||||
|
||||
bool SocketReader::init(const QString &host, quint16 port, int hlaRequestIdentifier)
|
||||
{
|
||||
DEBUG_LOG() << "SR " << hlaRequestIdentifier << ": Trying to establish connection to " << host << ":" << port;
|
||||
DEBUG_LOG(m_logger) << "SR " << hlaRequestIdentifier << ": Trying to establish connection to " << host << ":" << port;
|
||||
|
||||
m_hlaRequestIdentifier = hlaRequestIdentifier;
|
||||
connect(m_socket, SIGNAL(readyRead()), this, SLOT(onReadyRead()));
|
||||
@@ -49,9 +48,9 @@ void SocketReader::onReadyRead()
|
||||
|
||||
|
||||
|
||||
DEBUG_LOG() << "SR "<< m_hlaRequestIdentifier << ": Data received, transmitting";
|
||||
DEBUG_LOG(m_logger) << "SR "<< m_hlaRequestIdentifier << ": Data received, transmitting";
|
||||
QByteArray ba(m_socket->readAll());
|
||||
TRACE_LOG() << "SR "<< m_hlaRequestIdentifier << ": Data contents: " << ba.constData();
|
||||
TRACE_LOG(m_logger) << "SR "<< m_hlaRequestIdentifier << ": Data contents: " << ba.constData();
|
||||
emit newData(ba, m_hlaRequestIdentifier);
|
||||
}
|
||||
|
||||
@@ -75,7 +74,7 @@ void SocketReader::onSocketError(const QAbstractSocket::SocketError &error)
|
||||
}
|
||||
}
|
||||
|
||||
ERROR_LOG() << "SR "<< m_hlaRequestIdentifier << ": Socket Error: " << errorValue;
|
||||
ERROR_LOG(m_logger) << "SR "<< m_hlaRequestIdentifier << ": Socket Error: " << errorValue;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -26,6 +26,7 @@ signals:
|
||||
void newData(const QByteArray &content, int id);
|
||||
|
||||
protected:
|
||||
NGL::INGLLogger &m_logger;
|
||||
QTcpSocket *m_socket;
|
||||
int m_hlaRequestIdentifier;
|
||||
private slots:
|
||||
|
||||
+14
-15
@@ -15,12 +15,11 @@
|
||||
namespace HighLevelArchitecture
|
||||
{
|
||||
|
||||
WebSocketHandler::WebSocketHandler(int exerciseId, MainHandler *mainHandler, QObject *parent)
|
||||
: QObject(parent)
|
||||
WebSocketHandler::WebSocketHandler(int exerciseId, MainHandler *mainHandler, QObject *parent) : QObject(parent)
|
||||
, m_webSocketServer(new QWebSocketServer(QStringLiteral("WLS"), QWebSocketServer::NonSecureMode, this))
|
||||
, m_mainHandler(mainHandler)
|
||||
, m_exerciseId(exerciseId)
|
||||
{}
|
||||
, m_exerciseId(exerciseId),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
|
||||
|
||||
WebSocketHandler::~WebSocketHandler()
|
||||
{
|
||||
@@ -32,7 +31,7 @@ bool WebSocketHandler::init(quint16 listenPort)
|
||||
{
|
||||
if (!m_webSocketServer->listen(QHostAddress::Any, listenPort))
|
||||
{
|
||||
WARNING_LOG() << "Can not listen on port " << listenPort << " - aborting";
|
||||
WARNING_LOG(m_logger) << "Can not listen on port " << listenPort << " - aborting";
|
||||
return false;
|
||||
}
|
||||
connect(m_webSocketServer, &QWebSocketServer::newConnection,
|
||||
@@ -51,7 +50,7 @@ bool WebSocketHandler::sendTelegramInternal(const TrainingAreaBase::TetraIcd::Tr
|
||||
|
||||
|
||||
const QString jsonStr = QString::fromUtf8(QJsonDocument(obj).toJson(QJsonDocument::Compact));
|
||||
DEBUG_LOG() << "jsonStr: " << jsonStr;
|
||||
DEBUG_LOG(m_logger) << "jsonStr: " << jsonStr;
|
||||
|
||||
bool bOk = false;
|
||||
for (auto wsw : std::as_const(m_webSockets))
|
||||
@@ -68,12 +67,12 @@ void WebSocketHandler::sendHlaConnectionState()
|
||||
TrainingAreaBase::TetraIcd::ProxyConnectionState connState;
|
||||
connState.connectedToSystem = m_mainHandler->isConnectedToHla();
|
||||
sendTelegram(&connState, m_exerciseId);
|
||||
DEBUG_LOG() << "sendHlaConnectionState, isConnected: " << connState.connectedToSystem;
|
||||
DEBUG_LOG(m_logger) << "sendHlaConnectionState, isConnected: " << connState.connectedToSystem;
|
||||
}
|
||||
|
||||
void WebSocketHandler::sendParticipantConnectionStates()
|
||||
{
|
||||
DEBUG_LOG() << "sendParticipantConnectionStates";
|
||||
DEBUG_LOG(m_logger) << "sendParticipantConnectionStates";
|
||||
TrainingAreaBase::TetraIcd::WlsParticipantsConnectionState partConnState;
|
||||
partConnState.equipmentNumber = -1;
|
||||
partConnState.dataCommunicationPossible = false;
|
||||
@@ -81,7 +80,7 @@ void WebSocketHandler::sendParticipantConnectionStates()
|
||||
|
||||
if (!m_mainHandler->isConnectedToHla())
|
||||
{
|
||||
INFO_LOG() << "We are (not) yet connected to HLA - don't send participant connection states";
|
||||
INFO_LOG(m_logger) << "We are (not) yet connected to HLA - don't send participant connection states";
|
||||
return;
|
||||
}
|
||||
const auto externalEquipmentNumbers = m_mainHandler->ngsHandler()->ppmHandler()->externalEquipmentNumbers();
|
||||
@@ -117,7 +116,7 @@ void WebSocketHandler::onNewConnection()
|
||||
QWebSocket *ws = m_webSocketServer->nextPendingConnection();
|
||||
if (!ws)
|
||||
return;
|
||||
DEBUG_LOG() << "New websocket connection from " << ws->peerAddress().toString() << ":" << ws->peerPort();
|
||||
DEBUG_LOG(m_logger) << "New websocket connection from " << ws->peerAddress().toString() << ":" << ws->peerPort();
|
||||
auto wsw = std::make_shared<WebSocketWrapper>(ws);
|
||||
|
||||
connect(wsw.get(), &WebSocketWrapper::textMessageReceived,
|
||||
@@ -132,11 +131,11 @@ void WebSocketHandler::onTextMessageReceived(const QByteArray &baJson)
|
||||
{
|
||||
using namespace TrainingAreaBase::TetraIcd;
|
||||
|
||||
TRACE_LOG() << "WebSocketHandler::onTextMessageReceived: " << baJson;
|
||||
TRACE_LOG(m_logger) << "WebSocketHandler::onTextMessageReceived: " << baJson;
|
||||
WebSocketWrapper *wsw = qobject_cast<WebSocketWrapper *>(sender());
|
||||
if (!wsw)
|
||||
{
|
||||
ERROR_LOG() << "Internal error - sender is no WebSocketWrapper";
|
||||
ERROR_LOG(m_logger) << "Internal error - sender is no WebSocketWrapper";
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -156,7 +155,7 @@ void WebSocketHandler::onTextMessageReceived(const QByteArray &baJson)
|
||||
const QJsonValue typeId = obj.value(QStringLiteral("typeId"));
|
||||
if (!typeId.isDouble())
|
||||
{
|
||||
ERROR_LOG() << "Can not read type id: " << baJson;
|
||||
ERROR_LOG(m_logger) << "Can not read type id: " << baJson;
|
||||
return;
|
||||
}
|
||||
const QJsonObject data = obj.value(QStringLiteral("data")).toObject();
|
||||
@@ -185,14 +184,14 @@ void WebSocketHandler::onTextMessageReceived(const QByteArray &baJson)
|
||||
emit vulnerabilityStateRequest(DemandVulnerabilityStateChange::fromJson(data));
|
||||
break;
|
||||
default:
|
||||
WARNING_LOG() << "Handler for telegram Id " << typeId.toInt()
|
||||
WARNING_LOG(m_logger) << "Handler for telegram Id " << typeId.toInt()
|
||||
<< " not yet implemented (" << baJson << ")";
|
||||
return;
|
||||
}
|
||||
}
|
||||
catch (const std::exception &e)
|
||||
{
|
||||
WARNING_LOG() << "Could not parse json: " << e.what() << " (" << baJson << ")";
|
||||
WARNING_LOG(m_logger) << "Could not parse json: " << e.what() << " (" << baJson << ")";
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
+3
@@ -54,6 +54,7 @@ public Q_SLOTS:
|
||||
void onExternalEquipmentNumberRemoved(int equipNo);
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
void sendDataCommunicationState(int equipNo, bool bIsAvailable);
|
||||
bool sendTelegramInternal(const TrainingAreaBase::TetraIcd::TrainingAreaTelegram *data,
|
||||
const QString &type, int exerciseId);
|
||||
@@ -62,6 +63,7 @@ private Q_SLOTS:
|
||||
void onWebSocketDisconnected();
|
||||
void onTextMessageReceived(const QByteArray &baJson);
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
QWebSocketServer *m_webSocketServer;
|
||||
QVector<std::shared_ptr<WebSocketWrapper>> m_webSockets;
|
||||
MainHandler *m_mainHandler;
|
||||
@@ -85,6 +87,7 @@ Q_SIGNALS:
|
||||
private Q_SLOTS:
|
||||
void onTextMessageReceived(const QString &data);
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
QWebSocket *m_webSocket;
|
||||
int m_exerciseId;
|
||||
};
|
||||
|
||||
Reference in new issue
Block a user