Adds immediate migration results in progress
This commit is contained in:
2102 files changed
+17482
-15071
No files matched your search
+1
-1
@@ -25,7 +25,7 @@ bool AesHandler::init(MainDispatcher* mainDispatcher)
|
||||
|
||||
if (!m_ftcAes->enableAirSupportImpactModify())
|
||||
{
|
||||
ERROR_LOG() << "Can not enableAirSupportImpactModify ";
|
||||
ERROR_LOG(m_logger) << "Can not enableAirSupportImpactModify ";
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
+1
@@ -33,6 +33,7 @@ public:
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
std::shared_ptr<AreaEffectSimulation::Interface::Ftc> m_ftcAes;
|
||||
std::shared_ptr<ParticipantManagement::Interface::Dtc> m_dtcPpm;
|
||||
LtsUtils::RequestHelper *m_requestHelper;
|
||||
|
||||
+4
-5
@@ -8,17 +8,16 @@
|
||||
namespace ApHlaJson
|
||||
{
|
||||
|
||||
DdsHandler::DdsHandler(int domainId, int exerciseId)
|
||||
: m_ddsConnector(new DDSConnector::DdsConnector(domainId, IDL::PartitionType::Exercise, exerciseId))
|
||||
{
|
||||
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_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
|
||||
}
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
|
||||
+1
@@ -31,6 +31,7 @@ public:
|
||||
}
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
|
||||
std::shared_ptr<Core::Pacemaker> m_pacemaker;
|
||||
};
|
||||
|
||||
+4
-4
@@ -67,7 +67,7 @@ bool HlaDispatcher::canSendData() const
|
||||
|
||||
void HlaDispatcher::onWebSocketConnected()
|
||||
{
|
||||
INFO_LOG() << "WebSocket connected";
|
||||
INFO_LOG(m_logger) << "WebSocket connected";
|
||||
QWebSocket *ws = qobject_cast<QWebSocket *>(sender());
|
||||
m_sendToHla->onWebSocketConnected(ws);
|
||||
m_webSocketReconnectTimer->stop();
|
||||
@@ -76,7 +76,7 @@ void HlaDispatcher::onWebSocketConnected()
|
||||
|
||||
void HlaDispatcher::onWebsocketDisconnected()
|
||||
{
|
||||
INFO_LOG() << "Hla socket disconnected";
|
||||
INFO_LOG(m_logger) << "Hla socket disconnected";
|
||||
m_sendToHla->onWebSocketDisconnected();
|
||||
|
||||
emit connectionState(QString::fromUtf8(name()), false);
|
||||
@@ -95,7 +95,7 @@ void HlaDispatcher::onWebSocketError()
|
||||
if (!m_webSocket)
|
||||
return;
|
||||
if (!m_bWarnedOnce)
|
||||
WARNING_LOG() << "Error connecting to " << webSocketUrl().toString() << ": " << m_webSocket->errorString();
|
||||
WARNING_LOG(m_logger) << "Error connecting to " << webSocketUrl().toString() << ": " << m_webSocket->errorString();
|
||||
m_webSocket->close();
|
||||
m_webSocketReconnectTimer->start(5000);
|
||||
m_bWarnedOnce = true;
|
||||
@@ -106,7 +106,7 @@ void HlaDispatcher::onWebSocketError()
|
||||
void HlaDispatcher::onTextMessageReceived(const QByteArray &message)
|
||||
{
|
||||
|
||||
INFO_LOG() << "Text Message received: " << message;
|
||||
INFO_LOG(m_logger) << "Text Message received: " << message;
|
||||
|
||||
m_recvFromHla->handleTelegram(message);
|
||||
}
|
||||
|
||||
+2
@@ -50,8 +50,10 @@ Q_SIGNALS:
|
||||
void broadcastTelegramsRequest(int equipmentNumber, int broadcastIndex, int resetCounter);
|
||||
void hlaTelegramReceived(const TrainingAreaBase::TetraIcd::TrainingAreaTelegram *tele);
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
QUrl webSocketUrl() const;
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
std::shared_ptr<TrainingAreaBase::RecvFromTab> m_recvFromTabCb;
|
||||
std::shared_ptr<HlaHandlerRx> m_recvFromHla;
|
||||
std::shared_ptr<HlaHandlerTx> m_sendToHla;
|
||||
|
||||
+9
-10
@@ -16,15 +16,14 @@ HlaHandlerRx::HlaHandlerRx(const std::shared_ptr<TrainingAreaBase::RecvFromTab>
|
||||
const std::shared_ptr<TrainingAreaBase::TxMixin> &sendToTabCb,
|
||||
HlaDispatcher *dispatcher,
|
||||
AesHandler* aesHandler,
|
||||
PpmHandler* ppmHandler)
|
||||
: m_rxHandler(recvFromTabCb)
|
||||
PpmHandler* ppmHandler) : m_rxHandler(recvFromTabCb)
|
||||
, m_txHandler(sendToTabCb)
|
||||
, m_dispatcher(dispatcher)
|
||||
, m_bWarnedOnce(false)
|
||||
, m_bWarnedOnceTx(false)
|
||||
, m_aesHandler(aesHandler)
|
||||
, m_ppmHandler(ppmHandler)
|
||||
{}
|
||||
, m_ppmHandler(ppmHandler),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
|
||||
|
||||
bool HlaHandlerRx::handleTelegram(const QByteArray &baJson)
|
||||
{
|
||||
@@ -38,12 +37,12 @@ bool HlaHandlerRx::handleTelegram(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 false;
|
||||
}
|
||||
const QJsonObject data = obj.value(QStringLiteral("data")).toObject();
|
||||
if(typeId.toInt() != 21)
|
||||
ERROR_LOG() << "Telegram before filter: " << baJson;
|
||||
ERROR_LOG(m_logger) << "Telegram before filter: " << baJson;
|
||||
try
|
||||
{
|
||||
QJsonValue header = data[QStringLiteral("header")];
|
||||
@@ -57,7 +56,7 @@ bool HlaHandlerRx::handleTelegram(const QByteArray &baJson)
|
||||
return false;
|
||||
}
|
||||
if(typeId.toInt() != 21)
|
||||
ERROR_LOG() << "Telegram after filter: " << baJson;
|
||||
ERROR_LOG(m_logger) << "Telegram after filter: " << baJson;
|
||||
switch (typeId.toInt())
|
||||
{
|
||||
case Constraints<ProxyConnectionState>::id():
|
||||
@@ -110,7 +109,7 @@ bool HlaHandlerRx::handleTelegram(const QByteArray &baJson)
|
||||
}
|
||||
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 false;
|
||||
}
|
||||
return true;
|
||||
@@ -130,7 +129,7 @@ void HlaHandlerRx::rxData(const T &data)
|
||||
{
|
||||
if (!m_bWarnedOnce)
|
||||
{
|
||||
ERROR_LOG() << "No RecvFromTab available";
|
||||
ERROR_LOG(m_logger) << "No RecvFromTab available";
|
||||
m_bWarnedOnce = true;
|
||||
}
|
||||
return;
|
||||
@@ -146,7 +145,7 @@ void HlaHandlerRx::txData(const T &data)
|
||||
{
|
||||
if (!m_bWarnedOnceTx)
|
||||
{
|
||||
ERROR_LOG() << "No RecvFromTab available";
|
||||
ERROR_LOG(m_logger) << "No RecvFromTab available";
|
||||
m_bWarnedOnceTx = true;
|
||||
}
|
||||
return;
|
||||
|
||||
+2
@@ -31,12 +31,14 @@ public:
|
||||
Q_SIGNALS:
|
||||
void participantConnectionState(int equipmentNumber, bool dataCommunicationPossible);
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
template<typename T>
|
||||
void rxData(const T &data);
|
||||
|
||||
template<typename T>
|
||||
void txData(const T &data);
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
bool checkExercise(int equipmentNumber) const;
|
||||
|
||||
std::shared_ptr<TrainingAreaBase::RecvFromTab> m_rxHandler;
|
||||
|
||||
+2
-2
@@ -296,7 +296,7 @@ bool HlaHandlerTx::txData(const TrainingAreaBase::TetraIcd::SelectiveReammunitio
|
||||
|
||||
void HlaHandlerTx::onParticipantConnectionState(int equipmentNumber, bool dataCommunicationPossible)
|
||||
{
|
||||
INFO_LOG() << "onParticipantConnectionState - " << equipmentNumber
|
||||
INFO_LOG(m_logger) << "onParticipantConnectionState - " << equipmentNumber
|
||||
<< ", communication possible: " << dataCommunicationPossible;
|
||||
if (equipmentNumber == -1)
|
||||
m_dataCommunicationPossible.clear();
|
||||
@@ -308,7 +308,7 @@ void HlaHandlerTx::onGenericTelegram(const QJsonObject &telegram)
|
||||
if (!m_webSocket || !m_bHlaConnectedToExternalSystem)
|
||||
return;
|
||||
const QByteArray ba = QJsonDocument(telegram).toJson(QJsonDocument::Compact);
|
||||
DEBUG_LOG() << "Sending tele: " << ba;
|
||||
DEBUG_LOG(m_logger) << "Sending tele: " << ba;
|
||||
m_webSocket->sendTextMessage(QString::fromUtf8(ba));
|
||||
}
|
||||
|
||||
|
||||
+2
@@ -74,8 +74,10 @@ public slots:
|
||||
void onGenericTelegram(const QJsonObject &telegram);
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
bool sendToTx(const TrainingAreaBase::TetraIcd::TrainingAreaTelegram *data, bool bForce = false);
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
QHash<int, bool> m_dataCommunicationPossible;
|
||||
TrainingAreaBase::Plugin::DataProvider *m_pdp;
|
||||
PpmHandler* m_ppmHandler;
|
||||
|
||||
+1
-1
@@ -23,7 +23,7 @@ MainDispatcher::MainDispatcher(TrainingAreaBase::Plugin::DataProvider *pdp,
|
||||
, m_domainId(pdp->domainId())
|
||||
, m_exerciseId(pdp->exerciseId())
|
||||
{
|
||||
INFO_LOG() << "ApHla started, Domain Id: " << m_domainId << " ExerciseId: " << m_exerciseId;
|
||||
INFO_LOG(m_logger) << "ApHla started, Domain Id: " << m_domainId << " ExerciseId: " << m_exerciseId;
|
||||
}
|
||||
|
||||
MainDispatcher::~MainDispatcher()
|
||||
|
||||
+1
@@ -61,6 +61,7 @@ public:
|
||||
const char *name() const override { return tr_lts("dds", "ApHlaJson"); }
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
HlaDispatcher *m_hlaDispatcher;
|
||||
|
||||
std::shared_ptr<TrainingAreaBase::RecvFromTab> m_recvFromTabCb;
|
||||
|
||||
+1
@@ -61,6 +61,7 @@ public:
|
||||
bool txData(const TrainingAreaBase::TetraIcd::SelectiveReammunition &data) override;
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
template <typename T>
|
||||
bool sendToTxMixin(const T *data);
|
||||
private:
|
||||
|
||||
+5
-6
@@ -10,9 +10,8 @@ namespace ApHlaJson
|
||||
{
|
||||
|
||||
|
||||
PdmHandler::PdmHandler(QObject *parent)
|
||||
: QObject(parent)
|
||||
{}
|
||||
PdmHandler::PdmHandler(QObject *parent) : QObject(parent),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
|
||||
|
||||
bool PdmHandler::init(MainDispatcher* mainDispatcher)
|
||||
{
|
||||
@@ -20,7 +19,7 @@ bool PdmHandler::init(MainDispatcher* mainDispatcher)
|
||||
|
||||
if (!m_dtcPdm->enableChargeType())
|
||||
{
|
||||
ERROR_LOG() << "Can not read data from Pdm";
|
||||
ERROR_LOG(m_logger) << "Can not read data from Pdm";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -36,7 +35,7 @@ bool PdmHandler::init(MainDispatcher* mainDispatcher)
|
||||
|
||||
void PdmHandler::getChargeTypes()
|
||||
{
|
||||
DEBUG_LOG() << "Get Charge Types";
|
||||
DEBUG_LOG(m_logger) << "Get Charge Types";
|
||||
QJsonObject obj;
|
||||
QJsonArray dataArray;
|
||||
obj[QStringLiteral("type")] = QStringLiteral("ApacheHlaSendChargeTypes");
|
||||
@@ -46,7 +45,7 @@ void PdmHandler::getChargeTypes()
|
||||
QMap<qint32, ProjectDataManagement::ChargeType> chargeTypes = m_dtcPdm->chargeTypes();
|
||||
QMap<qint32, ProjectDataManagement::GearType> gearTypes = m_dtcPdm->gearTypes();
|
||||
QMap<qint32, ProjectDataManagement::GearTypeChargeType> gearTypeChargeTypes = m_dtcPdm->gearTypeChargeTypes();
|
||||
DEBUG_LOG() << "Fetched " << chargeTypes.size() << " ChargeTypes to send to WebSocket. Ommiting those without DIS-Entity though.";
|
||||
DEBUG_LOG(m_logger) << "Fetched " << chargeTypes.size() << " ChargeTypes to send to WebSocket. Ommiting those without DIS-Entity though.";
|
||||
|
||||
for(const ProjectDataManagement::ChargeType &charge : chargeTypes)
|
||||
{
|
||||
|
||||
+1
@@ -29,6 +29,7 @@ public slots:
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
std::shared_ptr<ProjectDataManagement::Interface::Dtc> m_dtcPdm;
|
||||
};
|
||||
|
||||
|
||||
+3
-4
@@ -11,9 +11,8 @@ namespace ApHlaJson
|
||||
|
||||
|
||||
|
||||
PpmHandler::PpmHandler(QObject *parent)
|
||||
: QObject(parent)
|
||||
{}
|
||||
PpmHandler::PpmHandler(QObject *parent) : QObject(parent),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
|
||||
|
||||
bool PpmHandler::init(MainDispatcher* mainDispatcher)
|
||||
{
|
||||
@@ -24,7 +23,7 @@ bool PpmHandler::init(MainDispatcher* mainDispatcher)
|
||||
|
||||
if (!m_dtcPpm->enableParticipant() || !m_dtcPpm->enableDynamicParticipantData() || !m_dtcPpm->enableParticipantPosition())
|
||||
{
|
||||
ERROR_LOG() << "Can not read data from Ppm";
|
||||
ERROR_LOG(m_logger) << "Can not read data from Ppm";
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
+1
@@ -35,6 +35,7 @@ private slots:
|
||||
void onDynamicParticipantDataChanged(const ParticipantManagement::DynamicParticipantData &data, DataModification modType);
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
std::shared_ptr<ParticipantManagement::Interface::Dtc> m_dtcPpm;
|
||||
QHash<int, int> m_participantIdsByEqNo;
|
||||
};
|
||||
|
||||
Reference in new issue
Block a user