Adds immediate migration results in progress
This commit is contained in:
2102 files changed
+17482
-15071
No files matched your search
+1
-1
@@ -31,7 +31,7 @@ DataManager::DataManager(MainHandler *mainHandler)
|
||||
//---------------------------------------------------------------------------------------------------------
|
||||
void DataManager::servicePortsInformation(const QVector<Messages::ServicePortsInformation::ExerciseInformation> &exerciseInformation)
|
||||
{
|
||||
DEBUG_LOG() << "Got ServicePortsInformation from websocket";
|
||||
DEBUG_LOG(m_logger) << "Got ServicePortsInformation from websocket";
|
||||
|
||||
m_mainHandler->handlerBaseDownload()->handleServicePortsInformation(exerciseInformation);
|
||||
}
|
||||
|
||||
+4
-4
@@ -35,17 +35,17 @@ bool WebSocketInterfaceHandler::init()
|
||||
{
|
||||
cleanup();
|
||||
|
||||
DEBUG_LOG() << "Initialising DataManager";
|
||||
DEBUG_LOG(m_logger) << "Initialising DataManager";
|
||||
m_dataManager = new DataManager(m_mainHandler);
|
||||
DEBUG_LOG() << "... ok";
|
||||
DEBUG_LOG(m_logger) << "... ok";
|
||||
|
||||
m_messageFactory = new Messages::ClientMessageFactory(m_dataManager);
|
||||
m_webSocketClient = new LtsWebSocket::LtsWebSocketClient(m_messageFactory, this);
|
||||
|
||||
DEBUG_LOG() << "Connection signals and slots";
|
||||
DEBUG_LOG(m_logger) << "Connection signals and slots";
|
||||
connect(m_webSocketClient, &LtsWebSocket::LtsWebSocketClient::connected, this, &WebSocketInterfaceHandler::connected);
|
||||
connect(m_webSocketClient, &LtsWebSocket::LtsWebSocketClient::disconnected, this, &WebSocketInterfaceHandler::disconnected);
|
||||
DEBUG_LOG() << "... ok";
|
||||
DEBUG_LOG(m_logger) << "... ok";
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
+12
-13
@@ -16,16 +16,15 @@
|
||||
namespace OcSituationClient
|
||||
{
|
||||
|
||||
CentralAesByteReader::CentralAesByteReader(const QByteArray &data)
|
||||
: m_data(data)
|
||||
{}
|
||||
CentralAesByteReader::CentralAesByteReader(const QByteArray &data) : m_data(data),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
|
||||
|
||||
bool CentralAesByteReader::getRemoveMessage(size_t &pos, CentralAesByteReader::RemoveMessage &removeMessage) const
|
||||
{
|
||||
bool result = getAesItemId(pos, removeMessage.aesItemId);
|
||||
result &= getAesType(pos, removeMessage.aesType);
|
||||
|
||||
DEBUG_LOG() << "Got remove message:"
|
||||
DEBUG_LOG(m_logger) << "Got remove message:"
|
||||
<< "\naesItemId = " << removeMessage.aesItemId
|
||||
<< "\naesType = " << removeMessage.aesType;
|
||||
|
||||
@@ -50,7 +49,7 @@ bool CentralAesByteReader::getNContamination(size_t &pos, AreaEffectSimulation::
|
||||
|
||||
nContamination.weatherSource(AreaEffectSimulation::AesWeatherSource::AwsNoUpdate);
|
||||
|
||||
DEBUG_LOG() << "Got NContamination:"
|
||||
DEBUG_LOG(m_logger) << "Got NContamination:"
|
||||
<< "\nid = " << nContamination.id()
|
||||
<< "\nname = " << nContamination.name()
|
||||
<< "\neffectStart = " << nContamination.effectStart()
|
||||
@@ -83,7 +82,7 @@ bool CentralAesByteReader::getBCContamination(size_t &pos, AreaEffectSimulation:
|
||||
|
||||
bCContamination.weatherSource(AreaEffectSimulation::AesWeatherSource::AwsNoUpdate);
|
||||
|
||||
DEBUG_LOG() << "Got BCContamination:"
|
||||
DEBUG_LOG(m_logger) << "Got BCContamination:"
|
||||
<< "\nid = " << bCContamination.id()
|
||||
<< "\nname = " << bCContamination.name()
|
||||
<< "\neffectStart = " << bCContamination.effectStart()
|
||||
@@ -116,7 +115,7 @@ bool CentralAesByteReader::getExplosionArea(size_t &pos, AreaEffectSimulation::E
|
||||
result &= getAltitude(pos, explosionArea.altitude());
|
||||
result &= getPurpose(pos, explosionArea.purpose());
|
||||
|
||||
DEBUG_LOG() << "Got ExplosionArea:"
|
||||
DEBUG_LOG(m_logger) << "Got ExplosionArea:"
|
||||
<< "\nid = " << explosionArea.id()
|
||||
<< "\nname = " << explosionArea.name()
|
||||
<< "\neffectStart = " << explosionArea.effectStart()
|
||||
@@ -145,7 +144,7 @@ bool CentralAesByteReader::getExplosionSingle(size_t &pos, AreaEffectSimulation:
|
||||
result &= getAltitude(pos, explosionSingle.altitude());
|
||||
result &= getPurpose(pos, explosionSingle.purpose());
|
||||
|
||||
DEBUG_LOG() << "Got ExplosionSingle:"
|
||||
DEBUG_LOG(m_logger) << "Got ExplosionSingle:"
|
||||
<< "\nid = " << explosionSingle.id()
|
||||
<< "\nname = " << explosionSingle.name()
|
||||
<< "\neffectStart = " << explosionSingle.effectStart()
|
||||
@@ -174,7 +173,7 @@ bool CentralAesByteReader::getMineArea(size_t &pos, AreaEffectSimulation::MineAr
|
||||
result &= getIsCenterLine(pos, mineArea.isCenterLine());
|
||||
result &= getSegments(pos, mineArea.segments());
|
||||
|
||||
DEBUG_LOG() << "Got MineArea:"
|
||||
DEBUG_LOG(m_logger) << "Got MineArea:"
|
||||
<< "\nid = " << mineArea.id()
|
||||
<< "\nname = " << mineArea.name()
|
||||
<< "\neffectStart = " << mineArea.effectStart()
|
||||
@@ -212,7 +211,7 @@ bool CentralAesByteReader::getFunctionalArea(size_t &pos, AreaEffectSimulation::
|
||||
result &= getMedicMode(pos, functionalArea.medicMode());
|
||||
result &= getMedicTime(pos, functionalArea.medicTime());
|
||||
|
||||
DEBUG_LOG() << "Got MineArea:"
|
||||
DEBUG_LOG(m_logger) << "Got MineArea:"
|
||||
<< "\nid = " << functionalArea.id()
|
||||
<< "\nname = " << functionalArea.name()
|
||||
<< "\neffectStart = " << functionalArea.effectStart()
|
||||
@@ -246,7 +245,7 @@ bool CentralAesByteReader::getBoobyTrap(size_t &pos, AreaEffectSimulation::Booby
|
||||
result &= getOptionalNumber(pos, boobyTrap.effectStart(), &CentralAesByteReader::getEffectStart);
|
||||
result &= getOptionalNumber(pos, boobyTrap.partyId(), &CentralAesByteReader::getPartyId);
|
||||
|
||||
DEBUG_LOG() << "Got BoobyTrap:"
|
||||
DEBUG_LOG(m_logger) << "Got BoobyTrap:"
|
||||
<< "\nid = " << boobyTrap.id()
|
||||
<< "\nname = " << boobyTrap.name()
|
||||
<< "\neffectDuration = " << boobyTrap.effectDuration()
|
||||
@@ -273,7 +272,7 @@ bool CentralAesByteReader::getOffRouteMine(size_t &pos, AreaEffectSimulation::Of
|
||||
result &= getOptionalNumber(pos, offRouteMine.effectStart(), &CentralAesByteReader::getEffectStart);
|
||||
result &= getOptionalNumber(pos, offRouteMine.partyId(), &CentralAesByteReader::getPartyId);
|
||||
|
||||
DEBUG_LOG() << "Got OffRouteMine: "
|
||||
DEBUG_LOG(m_logger) << "Got OffRouteMine: "
|
||||
<< "\nid: " << offRouteMine.id()
|
||||
<< "\nname = " << offRouteMine.name()
|
||||
<< "\neffectDuration = " << offRouteMine.effectDuration()
|
||||
@@ -299,7 +298,7 @@ bool CentralAesByteReader::getExplosionCluster(size_t &pos, AreaEffectSimulation
|
||||
result &= getChargeTypeId(pos, explosionCluster.chargeStruct().chargeTypeId());
|
||||
result &= getPartyId(pos, explosionCluster.partyId());
|
||||
|
||||
DEBUG_LOG() << "Got ExplosionCluster:"
|
||||
DEBUG_LOG(m_logger) << "Got ExplosionCluster:"
|
||||
<< "\nid: " << explosionCluster.id()
|
||||
<< "\nname: " << explosionCluster.name()
|
||||
<< "\neffectStart: " << explosionCluster.effectStart()
|
||||
|
||||
@@ -16,14 +16,14 @@ namespace OcSituationClient
|
||||
DdsHandler::DdsHandler(int domainId, int exerciseId)
|
||||
: m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(domainId, IDL::PartitionType::Exercise, exerciseId))
|
||||
{
|
||||
DEBUG_LOG() << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
|
||||
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;
|
||||
}
|
||||
|
||||
@@ -40,7 +40,7 @@ bool DdsHandler::init(const QStringList &qosFileList)
|
||||
m_ddsFts = OcSituationClient::Interface::Fts::create(m_ddsConnector);
|
||||
|
||||
bRet &= m_ddsFts->enableAll();
|
||||
INFO_LOG() << "Fts initialised";
|
||||
INFO_LOG(m_logger) << "Fts initialised";
|
||||
|
||||
return bRet;
|
||||
}
|
||||
|
||||
@@ -40,6 +40,7 @@ public:
|
||||
qint64 currentPartitionTime() const;
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
|
||||
std::shared_ptr<Core::Pacemaker> m_pacemaker;
|
||||
std::shared_ptr<Core::TopicLockMaster> m_topicLockMaster;
|
||||
|
||||
+21
-21
@@ -38,7 +38,7 @@ bool HandlerOcAesData::init()
|
||||
// AES DTC enable
|
||||
if (!m_aesDtc->enableDangerArea())
|
||||
{
|
||||
ERROR_LOG() << "Enabling AES Data-Topics failed.";
|
||||
ERROR_LOG(m_logger) << "Enabling AES Data-Topics failed.";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -46,27 +46,27 @@ bool HandlerOcAesData::init()
|
||||
if (!m_aesFtc->enableDangerAreaModify() ||
|
||||
!m_aesFtc->enableDangerAreaRemove())
|
||||
{
|
||||
ERROR_LOG() << "Enabling AES Function-Topics failed.";
|
||||
ERROR_LOG(m_logger) << "Enabling AES Function-Topics failed.";
|
||||
return false;
|
||||
}
|
||||
|
||||
// GIM DTC enable
|
||||
if (!m_gimDtc->enableIed())
|
||||
{
|
||||
ERROR_LOG() << "Enabling GIM Data-Topics failed.";
|
||||
ERROR_LOG(m_logger) << "Enabling GIM Data-Topics failed.";
|
||||
return false;
|
||||
}
|
||||
// TAB DTS enable
|
||||
if (!m_tabDts->enableDefinitionIed())
|
||||
{
|
||||
ERROR_LOG() << "Enabling TAB DTS Data-Topics failed.";
|
||||
ERROR_LOG(m_logger) << "Enabling TAB DTS Data-Topics failed.";
|
||||
return false;
|
||||
}
|
||||
|
||||
// TABOC DTC enable
|
||||
if (!m_tabocDtc->enableSpecificsExercise())
|
||||
{
|
||||
ERROR_LOG() << "Enabling TABOC Data-Topics failed.";
|
||||
ERROR_LOG(m_logger) << "Enabling TABOC Data-Topics failed.";
|
||||
return false;
|
||||
}
|
||||
connect(m_tabocDtc.get(), &TrainingAreaBaseOC::Interface::Dtc::specificsExerciseChanged, this, &HandlerOcAesData::onSpecificsExerciseChanged);
|
||||
@@ -81,11 +81,11 @@ bool HandlerOcAesData::init()
|
||||
|
||||
void HandlerOcAesData::process(const QByteArray &data)
|
||||
{
|
||||
DEBUG_LOG() << "Compressed binary data: " << data.toHex(' ');
|
||||
DEBUG_LOG(m_logger) << "Compressed binary data: " << data.toHex(' ');
|
||||
|
||||
QByteArray uncompressed = MainHandler::tryUncompress(data, true);
|
||||
|
||||
DEBUG_LOG() << "Uncompressed binary data: " << uncompressed.toHex(' ');
|
||||
DEBUG_LOG(m_logger) << "Uncompressed binary data: " << uncompressed.toHex(' ');
|
||||
OcSituation::AesType aesType;
|
||||
LtsUtils::get1Byte(uncompressed, aesType);
|
||||
|
||||
@@ -109,7 +109,7 @@ void HandlerOcAesData::process(const QByteArray &data)
|
||||
}
|
||||
default:
|
||||
{
|
||||
WARNING_LOG() << "Aes type: " << aesType << " is currently not handled.";
|
||||
WARNING_LOG(m_logger) << "Aes type: " << aesType << " is currently not handled.";
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -117,23 +117,23 @@ void HandlerOcAesData::process(const QByteArray &data)
|
||||
void HandlerOcAesData::onDangerAreaModifyReply(const Core::FunctionReplyObject &reply)
|
||||
{
|
||||
if (reply.error())
|
||||
ERROR_LOG() << "Danger area modify failed: " << reply.translated();
|
||||
ERROR_LOG(m_logger) << "Danger area modify failed: " << reply.translated();
|
||||
else
|
||||
DEBUG_LOG() << "Danger area modify successfull. Id: " << reply.id();
|
||||
DEBUG_LOG(m_logger) << "Danger area modify successfull. Id: " << reply.id();
|
||||
}
|
||||
|
||||
void HandlerOcAesData::onDangerAreaRemoveReply(const Core::FunctionReplyObject &reply)
|
||||
{
|
||||
if (reply.error())
|
||||
ERROR_LOG() << "Danger area remove failed: " << reply.translated();
|
||||
ERROR_LOG(m_logger) << "Danger area remove failed: " << reply.translated();
|
||||
else
|
||||
DEBUG_LOG() << "Danger area remove successfull. Id: " << reply.id();
|
||||
DEBUG_LOG(m_logger) << "Danger area remove successfull. Id: " << reply.id();
|
||||
}
|
||||
|
||||
void HandlerOcAesData::handleDangerAreas(const QByteArray &data, size_t pos)
|
||||
{
|
||||
INFO_LOG() << "Got new danger area data";
|
||||
DEBUG_LOG() << "Binary data: " << data.toHex(' ');
|
||||
INFO_LOG(m_logger) << "Got new danger area data";
|
||||
DEBUG_LOG(m_logger) << "Binary data: " << data.toHex(' ');
|
||||
|
||||
QList<int> aesToBeDeleted = m_aesDtc->dangerAreas().keys();
|
||||
|
||||
@@ -170,7 +170,7 @@ void HandlerOcAesData::handleDangerAreas(const QByteArray &data, size_t pos)
|
||||
}
|
||||
req.segments(segments);
|
||||
|
||||
DEBUG_LOG() << (aesToBeDeleted.contains(req.id()) ? "Modifying " : "Creating ") << "danger area: " << req;
|
||||
DEBUG_LOG(m_logger) << (aesToBeDeleted.contains(req.id()) ? "Modifying " : "Creating ") << "danger area: " << req;
|
||||
|
||||
aesToBeDeleted.removeAll(req.id()); // item was created/modified -> does not need to be deleted
|
||||
req.id(req.id() * -1); // inverted id to mark as for oc
|
||||
@@ -183,7 +183,7 @@ void HandlerOcAesData::handleDangerAreas(const QByteArray &data, size_t pos)
|
||||
continue;
|
||||
if (m_aesDtc->dangerArea(id).effectStateId().underlying() > AreaEffectSimulation::AesEffectState::EsRemoved)
|
||||
{
|
||||
DEBUG_LOG() << "Removing danger area id: " << id;
|
||||
DEBUG_LOG(m_logger) << "Removing danger area id: " << id;
|
||||
m_aesFtc->dangerAreaRemoveRequest(Core::RemoveElementRequest(id), this);
|
||||
}
|
||||
}
|
||||
@@ -191,8 +191,8 @@ void HandlerOcAesData::handleDangerAreas(const QByteArray &data, size_t pos)
|
||||
|
||||
void HandlerOcAesData::handleIeds(const QByteArray &data, size_t pos)
|
||||
{
|
||||
INFO_LOG() << "Got new ied data";
|
||||
DEBUG_LOG() << "Binary data: " << data.toHex(' ');
|
||||
INFO_LOG(m_logger) << "Got new ied data";
|
||||
DEBUG_LOG(m_logger) << "Binary data: " << data.toHex(' ');
|
||||
|
||||
int cnt;
|
||||
LtsUtils::get1Byte(data, pos, cnt);
|
||||
@@ -224,7 +224,7 @@ void HandlerOcAesData::handleIeds(const QByteArray &data, size_t pos)
|
||||
LtsUtils::get3Byte(data, pos, y);
|
||||
def.position(relativeFromGeoPosition(x, y));
|
||||
|
||||
DEBUG_LOG() << "Publishing definition ied: " << def;
|
||||
DEBUG_LOG(m_logger) << "Publishing definition ied: " << def;
|
||||
|
||||
m_tabDts->publish(def);
|
||||
}
|
||||
@@ -232,8 +232,8 @@ void HandlerOcAesData::handleIeds(const QByteArray &data, size_t pos)
|
||||
|
||||
void HandlerOcAesData::handleIedPositions(const QByteArray &data, size_t pos)
|
||||
{
|
||||
INFO_LOG() << "Got new ied positions data";
|
||||
DEBUG_LOG() << "Binary data: " << data.toHex(' ');
|
||||
INFO_LOG(m_logger) << "Got new ied positions data";
|
||||
DEBUG_LOG(m_logger) << "Binary data: " << data.toHex(' ');
|
||||
|
||||
int cnt;
|
||||
LtsUtils::get1Byte(data, pos, cnt);
|
||||
|
||||
+29
-29
@@ -38,7 +38,7 @@ bool HandlerOcCentralAesData::init()
|
||||
|| !m_aesDtc->enableMineArea() || !m_aesDtc->enableFunctionalArea() || !m_aesDtc->enableBoobyTrap() || !m_aesDtc->enableOffRouteMine()
|
||||
|| !m_aesDtc->enableExplosionCluster())
|
||||
{
|
||||
ERROR_LOG() << "Enabling AES Data-Topics failed.";
|
||||
ERROR_LOG(m_logger) << "Enabling AES Data-Topics failed.";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -50,14 +50,14 @@ bool HandlerOcCentralAesData::init()
|
||||
|| !m_aesFtc->enableOffRouteMineModify() || !m_aesFtc->enableOffRouteMineRemove() || !m_aesFtc->enableExplosionClusterOcModify()
|
||||
|| !m_aesFtc->enableExplosionClusterRemove() || !m_aesFtc->enableMineAreaReferenceModify())
|
||||
{
|
||||
ERROR_LOG() << "Enabling AES Function-Topics failed.";
|
||||
ERROR_LOG(m_logger) << "Enabling AES Function-Topics failed.";
|
||||
return false;
|
||||
}
|
||||
|
||||
// TABOC DTS enable
|
||||
if (!m_tabocDts->enableCentralAesOverload())
|
||||
{
|
||||
ERROR_LOG() << "Enabling TABOC Data-Topics failed.";
|
||||
ERROR_LOG(m_logger) << "Enabling TABOC Data-Topics failed.";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -152,18 +152,18 @@ bool HandlerOcCentralAesData::init()
|
||||
connect(m_aesDtc.get(), &AreaEffectSimulation::Interface::Dtc::offRouteMineChanged, this, &HandlerOcCentralAesData::onOffRouteMineChanged);
|
||||
connect(m_aesDtc.get(), &AreaEffectSimulation::Interface::Dtc::explosionClusterChanged, this, &HandlerOcCentralAesData::onExplosionClusterChanged);
|
||||
|
||||
DEBUG_LOG() << "Initialisation HandlerOcCentralAesData succesful.";
|
||||
DEBUG_LOG(m_logger) << "Initialisation HandlerOcCentralAesData succesful.";
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
void HandlerOcCentralAesData::process(const QByteArray &data, bool bIsInitial)
|
||||
{
|
||||
DEBUG_LOG() << "Starting to parse central aes data.";
|
||||
DEBUG_LOG(m_logger) << "Starting to parse central aes data.";
|
||||
|
||||
if (bIsInitial)
|
||||
{
|
||||
DEBUG_LOG() << "Data is initial --> removing central aes items.";
|
||||
DEBUG_LOG(m_logger) << "Data is initial --> removing central aes items.";
|
||||
removeAllCentralAesItems();
|
||||
|
||||
if (!m_allCentralAesItems.isEmpty())
|
||||
@@ -176,7 +176,7 @@ void HandlerOcCentralAesData::process(const QByteArray &data, bool bIsInitial)
|
||||
|
||||
if (data.isEmpty())
|
||||
{
|
||||
ERROR_LOG() << "Got an empty QByteArray to decode.";
|
||||
ERROR_LOG(m_logger) << "Got an empty QByteArray to decode.";
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -189,7 +189,7 @@ void HandlerOcCentralAesData::process(const QByteArray &data, bool bIsInitial)
|
||||
centralAesOverload.hasOverload(centralAesItemsOverloaded);
|
||||
m_tabocDts->publish(centralAesOverload);
|
||||
|
||||
DEBUG_LOG() << "Central AesItems overloaded: " << centralAesItemsOverloaded;
|
||||
DEBUG_LOG(m_logger) << "Central AesItems overloaded: " << centralAesItemsOverloaded;
|
||||
// TODO: Further processing of overloaded info
|
||||
|
||||
QByteArray data2 = data;
|
||||
@@ -199,13 +199,13 @@ void HandlerOcCentralAesData::process(const QByteArray &data, bool bIsInitial)
|
||||
QByteArray uncompressed = MainHandler::tryUncompress(data2, m_bWithCompression);
|
||||
if (uncompressed.isEmpty())
|
||||
{
|
||||
INFO_LOG() << "Got an empty QByteArray after uncompression.";
|
||||
INFO_LOG(m_logger) << "Got an empty QByteArray after uncompression.";
|
||||
return;
|
||||
}
|
||||
|
||||
CentralAesByteReader reader(uncompressed);
|
||||
|
||||
TRACE_LOG() << "Uncompressed Data: " << uncompressed.toHex(' ');
|
||||
TRACE_LOG(m_logger) << "Uncompressed Data: " << uncompressed.toHex(' ');
|
||||
|
||||
size_t pos = 0;
|
||||
AreaEffectSimulation::AesType aesType;
|
||||
@@ -219,7 +219,7 @@ void HandlerOcCentralAesData::process(const QByteArray &data, bool bIsInitial)
|
||||
return;
|
||||
}
|
||||
|
||||
DEBUG_LOG() << "Got AesChangeType " << changeType;
|
||||
DEBUG_LOG(m_logger) << "Got AesChangeType " << changeType;
|
||||
|
||||
switch (changeType)
|
||||
{
|
||||
@@ -230,7 +230,7 @@ void HandlerOcCentralAesData::process(const QByteArray &data, bool bIsInitial)
|
||||
return;
|
||||
}
|
||||
|
||||
DEBUG_LOG() << "Got AesType " << aesType;
|
||||
DEBUG_LOG(m_logger) << "Got AesType " << aesType;
|
||||
|
||||
switch (aesType.underlying())
|
||||
{
|
||||
@@ -261,7 +261,7 @@ void HandlerOcCentralAesData::process(const QByteArray &data, bool bIsInitial)
|
||||
return;
|
||||
}
|
||||
else
|
||||
DEBUG_LOG() << "NContamination added/modified.";
|
||||
DEBUG_LOG(m_logger) << "NContamination added/modified.";
|
||||
|
||||
checkId(nContamination);
|
||||
|
||||
@@ -279,7 +279,7 @@ void HandlerOcCentralAesData::process(const QByteArray &data, bool bIsInitial)
|
||||
return;
|
||||
}
|
||||
else
|
||||
DEBUG_LOG() << "BCContamination added/modified.";
|
||||
DEBUG_LOG(m_logger) << "BCContamination added/modified.";
|
||||
|
||||
checkId(bCContamination);
|
||||
|
||||
@@ -297,7 +297,7 @@ void HandlerOcCentralAesData::process(const QByteArray &data, bool bIsInitial)
|
||||
return;
|
||||
}
|
||||
else
|
||||
DEBUG_LOG() << "ExplosionArea added/modified.";
|
||||
DEBUG_LOG(m_logger) << "ExplosionArea added/modified.";
|
||||
|
||||
checkId(explosionArea);
|
||||
|
||||
@@ -315,7 +315,7 @@ void HandlerOcCentralAesData::process(const QByteArray &data, bool bIsInitial)
|
||||
return;
|
||||
}
|
||||
else
|
||||
DEBUG_LOG() << "ExplosionSingle added/modified.";
|
||||
DEBUG_LOG(m_logger) << "ExplosionSingle added/modified.";
|
||||
|
||||
checkId(explosionSingle);
|
||||
|
||||
@@ -333,7 +333,7 @@ void HandlerOcCentralAesData::process(const QByteArray &data, bool bIsInitial)
|
||||
return;
|
||||
}
|
||||
else
|
||||
DEBUG_LOG() << "MineArea added/modified.";
|
||||
DEBUG_LOG(m_logger) << "MineArea added/modified.";
|
||||
|
||||
mineArea.distance() = 0.5;
|
||||
checkId(mineArea);
|
||||
@@ -352,7 +352,7 @@ void HandlerOcCentralAesData::process(const QByteArray &data, bool bIsInitial)
|
||||
return;
|
||||
}
|
||||
else
|
||||
DEBUG_LOG() << "FunctionalArea added/modified.";
|
||||
DEBUG_LOG(m_logger) << "FunctionalArea added/modified.";
|
||||
|
||||
checkId(functionalArea);
|
||||
|
||||
@@ -370,7 +370,7 @@ void HandlerOcCentralAesData::process(const QByteArray &data, bool bIsInitial)
|
||||
return;
|
||||
}
|
||||
else
|
||||
DEBUG_LOG() << "BoobyTrap added/modified.";
|
||||
DEBUG_LOG(m_logger) << "BoobyTrap added/modified.";
|
||||
|
||||
checkId(boobyTrap);
|
||||
|
||||
@@ -388,7 +388,7 @@ void HandlerOcCentralAesData::process(const QByteArray &data, bool bIsInitial)
|
||||
return;
|
||||
}
|
||||
else
|
||||
DEBUG_LOG() << "OffRouteMine added/modified.";
|
||||
DEBUG_LOG(m_logger) << "OffRouteMine added/modified.";
|
||||
|
||||
checkId(offRouteMine);
|
||||
|
||||
@@ -406,7 +406,7 @@ void HandlerOcCentralAesData::process(const QByteArray &data, bool bIsInitial)
|
||||
return;
|
||||
}
|
||||
else
|
||||
DEBUG_LOG() << "ExplosionCluster added/modified.";
|
||||
DEBUG_LOG(m_logger) << "ExplosionCluster added/modified.";
|
||||
|
||||
checkId(explosionCluster);
|
||||
|
||||
@@ -431,12 +431,12 @@ void HandlerOcCentralAesData::process(const QByteArray &data, bool bIsInitial)
|
||||
|
||||
if (!m_allCentralAesItems.contains(removeMessage.aesItemId))
|
||||
{
|
||||
INFO_LOG() << "Got remove message for unknown aesItemId " << removeMessage.aesItemId;
|
||||
INFO_LOG(m_logger) << "Got remove message for unknown aesItemId " << removeMessage.aesItemId;
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
DEBUG_LOG() << "Sending remove request: aesItemId = " << removeMessage.aesItemId << " ,aesType = " << removeMessage.aesType;
|
||||
DEBUG_LOG(m_logger) << "Sending remove request: aesItemId = " << removeMessage.aesItemId << " ,aesType = " << removeMessage.aesType;
|
||||
|
||||
tryRemoveAesItem(removeMessage.aesItemId, removeMessage.aesType);
|
||||
|
||||
@@ -445,7 +445,7 @@ void HandlerOcCentralAesData::process(const QByteArray &data, bool bIsInitial)
|
||||
}
|
||||
}
|
||||
|
||||
DEBUG_LOG() << "All central aes data parsed.";
|
||||
DEBUG_LOG(m_logger) << "All central aes data parsed.";
|
||||
}
|
||||
|
||||
void HandlerOcCentralAesData::removeAllCentralAesItems()
|
||||
@@ -522,7 +522,7 @@ void HandlerOcCentralAesData::tryRemoveAesItem(qint32 aesItemId, AreaEffectSimul
|
||||
case AesType::AtExplosionSingleCentralTrajectory:
|
||||
case AesType::AtBoobyTrapSecondary:
|
||||
case AesType::AtOffRouteMineSecondary:
|
||||
WARNING_LOG() << "Got false AesType: " << aesType.underlying() << " --> aborting.";
|
||||
WARNING_LOG(m_logger) << "Got false AesType: " << aesType.underlying() << " --> aborting.";
|
||||
break;
|
||||
case AesType::AtNContamination:
|
||||
removeAesItem(aesItemId, &AreaEffectSimulation::Interface::Ftc::nContaminationRemoveRequest);
|
||||
@@ -577,7 +577,7 @@ void HandlerOcCentralAesData::onExplosionClusterOcModifyReply(const Core::Functi
|
||||
void HandlerOcCentralAesData::onReply(const Core::FunctionReplyObject &reply) const
|
||||
{
|
||||
if (reply.error())
|
||||
ERROR_LOG() << reply.str();
|
||||
ERROR_LOG(m_logger) << reply.str();
|
||||
}
|
||||
|
||||
template <typename T> void HandlerOcCentralAesData::onAesItemChanged(const T &aesItem, DataModification modType, AreaEffectSimulation::AesType aesType)
|
||||
@@ -589,11 +589,11 @@ template <typename T> void HandlerOcCentralAesData::onAesItemChanged(const T &ae
|
||||
{
|
||||
case DataModification::eAdded:
|
||||
m_allCentralAesItems[aesItem.id()] = aesType;
|
||||
DEBUG_LOG() << "Added new AES Item: id=" << aesItem.id() << ", type=" << aesType;
|
||||
DEBUG_LOG(m_logger) << "Added new AES Item: id=" << aesItem.id() << ", type=" << aesType;
|
||||
break;
|
||||
case DataModification::eRemoved:
|
||||
m_allCentralAesItems.remove(aesItem.id());
|
||||
DEBUG_LOG() << "Removed AES Item with id=" << aesItem.id();
|
||||
DEBUG_LOG(m_logger) << "Removed AES Item with id=" << aesItem.id();
|
||||
break;
|
||||
case DataModification::eModified:
|
||||
default:
|
||||
@@ -615,7 +615,7 @@ void HandlerOcCentralAesData::removeAesItem(
|
||||
[this](const Core::FunctionReplyObject &replyObject)
|
||||
{
|
||||
if (replyObject.error())
|
||||
ERROR_LOG() << replyObject.str();
|
||||
ERROR_LOG(m_logger) << replyObject.str();
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@@ -70,7 +70,7 @@ bool HandlerOcData::init()
|
||||
// read all reset counter from database
|
||||
if (!m_dbHandler->select(dataVec))
|
||||
{
|
||||
ERROR_LOG() << "Error reading reset counter from database!";
|
||||
ERROR_LOG(m_logger) << "Error reading reset counter from database!";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -90,7 +90,7 @@ bool HandlerOcData::init()
|
||||
}
|
||||
default:
|
||||
{
|
||||
WARNING_LOG() << "Reset counter for aes type: " << data.aesTypeId << " read from db is not handled.";
|
||||
WARNING_LOG(m_logger) << "Reset counter for aes type: " << data.aesTypeId << " read from db is not handled.";
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -99,14 +99,14 @@ bool HandlerOcData::init()
|
||||
// EVL FTC enable
|
||||
if (!m_evlFtc->enableEvlSchemaModify())
|
||||
{
|
||||
ERROR_LOG() << "Enabling EVL Function-Topics failed.";
|
||||
ERROR_LOG(m_logger) << "Enabling EVL Function-Topics failed.";
|
||||
return false;
|
||||
}
|
||||
|
||||
// MSG DTC enable
|
||||
if (!m_msgDtc->enableOperatorMessage())
|
||||
{
|
||||
ERROR_LOG() << "Enabling MSG Data-Topics failed.";
|
||||
ERROR_LOG(m_logger) << "Enabling MSG Data-Topics failed.";
|
||||
return false;
|
||||
}
|
||||
connect(m_msgDtc.get(), &Messaging::Interface::Dtc::operatorMessageChanged, this, &HandlerOcData::onOperatorMessageChanged);
|
||||
@@ -115,41 +115,41 @@ bool HandlerOcData::init()
|
||||
if (!m_msgFtc->enableCreateOperatorMessage() ||
|
||||
!m_msgFtc->enableModifyOperatorMessage())
|
||||
{
|
||||
ERROR_LOG() << "Enabling MSG Function-Topics failed.";
|
||||
ERROR_LOG(m_logger) << "Enabling MSG Function-Topics failed.";
|
||||
return false;
|
||||
}
|
||||
|
||||
// OPM DTC enable
|
||||
if (!m_opmDtc->enableUser())
|
||||
{
|
||||
ERROR_LOG() << "Enabling OPM Data-Topics failed.";
|
||||
ERROR_LOG(m_logger) << "Enabling OPM Data-Topics failed.";
|
||||
return false;
|
||||
}
|
||||
|
||||
// OSS FTS enable
|
||||
if (!m_ossFts->enableSendEquipmentMessageOc())
|
||||
{
|
||||
ERROR_LOG() << "Enabling OSS Function-Topics failed.";
|
||||
ERROR_LOG(m_logger) << "Enabling OSS Function-Topics failed.";
|
||||
return false;
|
||||
}
|
||||
|
||||
// PPM DTC enable
|
||||
if (!m_ppmDtc->enableParticipant())
|
||||
{
|
||||
ERROR_LOG() << "Enabling PPM Data-Topics failed.";
|
||||
ERROR_LOG(m_logger) << "Enabling PPM Data-Topics failed.";
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!m_ppmDtc->waitForHistoricalDataParticipant(10000))
|
||||
{
|
||||
ERROR_LOG() << "Waiting for historical data PPM-participant failed.";
|
||||
ERROR_LOG(m_logger) << "Waiting for historical data PPM-participant failed.";
|
||||
return false;
|
||||
}
|
||||
|
||||
// TAB DTC enable
|
||||
if (!m_tabDtc->enableOcData())
|
||||
{
|
||||
ERROR_LOG() << "Enabling TAB Data-Topics failed.";
|
||||
ERROR_LOG(m_logger) << "Enabling TAB Data-Topics failed.";
|
||||
return false;
|
||||
}
|
||||
connect(m_tabDtc.get(), &TrainingAreaBase::Interface::Dtc::ocDataChanged, this, &HandlerOcData::onOcDataChanged);
|
||||
@@ -157,14 +157,14 @@ bool HandlerOcData::init()
|
||||
// TAB DTC enable
|
||||
if (!m_tabDtc->enableEquipmentPosition())
|
||||
{
|
||||
ERROR_LOG() << "Enabling TAB DTS Data-Topics failed.";
|
||||
ERROR_LOG(m_logger) << "Enabling TAB DTS Data-Topics failed.";
|
||||
return false;
|
||||
}
|
||||
|
||||
// TAB FTC enable
|
||||
if (!m_tabFtc->enableSendOcData())
|
||||
{
|
||||
ERROR_LOG() << "Enabling TAB Function-Topics failed.";
|
||||
ERROR_LOG(m_logger) << "Enabling TAB Function-Topics failed.";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -173,7 +173,7 @@ bool HandlerOcData::init()
|
||||
!m_tabocDtc->enableOwnPosition() ||
|
||||
!m_tabocDtc->enableSpecificsEquipment())
|
||||
{
|
||||
ERROR_LOG() << "Enabling TABOC Data-Topics failed.";
|
||||
ERROR_LOG(m_logger) << "Enabling TABOC Data-Topics failed.";
|
||||
return false;
|
||||
}
|
||||
connect(m_tabocDtc.get(), &TrainingAreaBaseOC::Interface::Dtc::ownPositionChanged, this, &HandlerOcData::onOwnPosition);
|
||||
@@ -187,21 +187,21 @@ bool HandlerOcData::init()
|
||||
// handler oc situation data
|
||||
if (!m_handlerOcSituationData->init())
|
||||
{
|
||||
ERROR_LOG() << "Initialising HandlerOcSituationData failed.";
|
||||
ERROR_LOG(m_logger) << "Initialising HandlerOcSituationData failed.";
|
||||
return false;
|
||||
}
|
||||
|
||||
// handler oc central aes data
|
||||
if (!m_handlerOcCentralAesData->init())
|
||||
{
|
||||
ERROR_LOG() << "Initialising HandlerOcCentralAesData failed.";
|
||||
ERROR_LOG(m_logger) << "Initialising HandlerOcCentralAesData failed.";
|
||||
return false;
|
||||
}
|
||||
|
||||
// Handler aes data
|
||||
if (!m_handlerOcAesData->init())
|
||||
{
|
||||
ERROR_LOG() << "Initialising HandlerOcAesData failed.";
|
||||
ERROR_LOG(m_logger) << "Initialising HandlerOcAesData failed.";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -211,40 +211,40 @@ bool HandlerOcData::init()
|
||||
connect(m_opmDtc.get(), &OperatorManagement::Interface::Dtc::userChanged,
|
||||
this, &HandlerOcData::onUserChanged);
|
||||
|
||||
DEBUG_LOG() << "Initialisation HandlerOcData succesful.";
|
||||
DEBUG_LOG(m_logger) << "Initialisation HandlerOcData succesful.";
|
||||
return true;
|
||||
}
|
||||
|
||||
void HandlerOcData::onEvlSchemaModifyReply(const Core::FunctionReplyObject &reply)
|
||||
{
|
||||
if (reply.error())
|
||||
ERROR_LOG() << "Schema could not be transmitted to EVL: " << reply.translated();
|
||||
ERROR_LOG(m_logger) << "Schema could not be transmitted to EVL: " << reply.translated();
|
||||
else
|
||||
DEBUG_LOG() << "Schema successfully transmitted to EVL!";
|
||||
DEBUG_LOG(m_logger) << "Schema successfully transmitted to EVL!";
|
||||
}
|
||||
|
||||
void HandlerOcData::onCreateOperatorMessageReply(const Core::FunctionReplyObject &reply)
|
||||
{
|
||||
if (reply.error())
|
||||
ERROR_LOG() << "Msg could not be created: " << reply.translated();
|
||||
ERROR_LOG(m_logger) << "Msg could not be created: " << reply.translated();
|
||||
else
|
||||
DEBUG_LOG() << "Msg created successfully!";
|
||||
DEBUG_LOG(m_logger) << "Msg created successfully!";
|
||||
}
|
||||
|
||||
void HandlerOcData::onModifyOperatorMessageReply(const Core::FunctionReplyObject &reply)
|
||||
{
|
||||
if (reply.error())
|
||||
ERROR_LOG() << "Msg could not be modified: " << reply.translated();
|
||||
ERROR_LOG(m_logger) << "Msg could not be modified: " << reply.translated();
|
||||
else
|
||||
DEBUG_LOG() << "Msg modified successfully!";
|
||||
DEBUG_LOG(m_logger) << "Msg modified successfully!";
|
||||
}
|
||||
|
||||
void HandlerOcData::onSendOcDataReply(const Core::FunctionReplyObject &reply)
|
||||
{
|
||||
if (reply.error())
|
||||
ERROR_LOG() << "Oc data could not be send: " << reply.translated();
|
||||
ERROR_LOG(m_logger) << "Oc data could not be send: " << reply.translated();
|
||||
else
|
||||
DEBUG_LOG() << "Oc data send successfully to TAB!";
|
||||
DEBUG_LOG(m_logger) << "Oc data send successfully to TAB!";
|
||||
}
|
||||
|
||||
void HandlerOcData::onOcDataChanged(const TrainingAreaBase::OcData &data, DataModification modType)
|
||||
@@ -297,7 +297,7 @@ void HandlerOcData::onOcDataChanged(const TrainingAreaBase::OcData &data, DataMo
|
||||
}
|
||||
default:
|
||||
{
|
||||
INFO_LOG() << "OC-data with telegram ID: " << telegramId << " is not handled by HandlerOcData OSC!";
|
||||
INFO_LOG(m_logger) << "OC-data with telegram ID: " << telegramId << " is not handled by HandlerOcData OSC!";
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -314,7 +314,7 @@ void HandlerOcData::onTechnicalStateSfmChanged(const TrainingAreaBaseOC::Technic
|
||||
m_licensed = data.licensed();
|
||||
if (data.licensed())
|
||||
{
|
||||
DEBUG_LOG() << "Newly licensed -> demanding situation / sending messages";
|
||||
DEBUG_LOG(m_logger) << "Newly licensed -> demanding situation / sending messages";
|
||||
demandSituation(true);
|
||||
sendNewMessages();
|
||||
}
|
||||
@@ -342,7 +342,7 @@ void HandlerOcData::onOperatorMessageChanged(const Messaging::OperatorMessage &d
|
||||
{
|
||||
if (DataModification::eRemoved == modType)
|
||||
return;
|
||||
DEBUG_LOG() << data.recipientId() << "new message changed is send" << data.isSend() << " id" << data.id() ;
|
||||
DEBUG_LOG(m_logger) << data.recipientId() << "new message changed is send" << data.isSend() << " id" << data.id() ;
|
||||
const int ownEqNo = m_tabocDtc->specificsEquipment(1).equipmentNumber();
|
||||
if (data.recipientId() > 0)
|
||||
{
|
||||
@@ -365,7 +365,7 @@ void HandlerOcData::onOperatorMessageChanged(const Messaging::OperatorMessage &d
|
||||
const auto participantEqNo = m_ppmDtc->participant(data.recipientId()).equipmentNumber();
|
||||
if (!participantEqNo.is_set())
|
||||
{
|
||||
WARNING_LOG() << "Recipient with id " << data.recipientId() << " has no equipment number set - can not send message";
|
||||
WARNING_LOG(m_logger) << "Recipient with id " << data.recipientId() << " has no equipment number set - can not send message";
|
||||
return;
|
||||
}
|
||||
LtsUtils::set2Byte(participantEqNo.get(), payload);
|
||||
@@ -384,7 +384,7 @@ void HandlerOcData::onOperatorMessageChanged(const Messaging::OperatorMessage &d
|
||||
TrainingAreaBase::SendOcDataRequest out;
|
||||
out.payload(LtsUtils::convert<std::vector<uint8_t>>(payload));
|
||||
|
||||
DEBUG_LOG() << "Sending operator message: " << data;
|
||||
DEBUG_LOG(m_logger) << "Sending operator message: " << data;
|
||||
|
||||
m_tabFtc->sendOcDataRequest(out, this);
|
||||
|
||||
@@ -399,7 +399,7 @@ void HandlerOcData::situationRequestCycleTimeout()
|
||||
|
||||
void HandlerOcData::onUserChanged(const OperatorManagement::User &data, DataModification modType)
|
||||
{
|
||||
TRACE_LOG() << Q_FUNC_INFO;
|
||||
TRACE_LOG(m_logger) << Q_FUNC_INFO;
|
||||
|
||||
if (modType != DataModification::eModified || data.id() == 99) // id 99 = Organisator
|
||||
return;
|
||||
@@ -408,7 +408,7 @@ void HandlerOcData::onUserChanged(const OperatorManagement::User &data, DataModi
|
||||
// user changes, we remember the user. now we are able to see, if the user logs out
|
||||
if (data.workstationId() != 0)
|
||||
{
|
||||
DEBUG_LOG() << "User " << data.name() << " logged in.";
|
||||
DEBUG_LOG(m_logger) << "User " << data.name() << " logged in.";
|
||||
|
||||
m_user = data;
|
||||
|
||||
@@ -419,11 +419,11 @@ void HandlerOcData::onUserChanged(const OperatorManagement::User &data, DataModi
|
||||
// or all applications are closed. now we have to stop situation data (if already requested) and forget the user.
|
||||
if (m_user.id() == data.id() && data.workstationId() == 0)
|
||||
{
|
||||
DEBUG_LOG() << "User " << m_user.name() << " logged out.";
|
||||
DEBUG_LOG(m_logger) << "User " << m_user.name() << " logged out.";
|
||||
|
||||
if (m_centerEquipmentId > 0 || m_position.is_set())
|
||||
{
|
||||
DEBUG_LOG() << "Stopping situation requests.";
|
||||
DEBUG_LOG(m_logger) << "Stopping situation requests.";
|
||||
|
||||
// stopping situation data
|
||||
m_centerEquipmentId = 0;
|
||||
@@ -473,7 +473,7 @@ void HandlerOcData::onSendEvaluationRequest(const rti::core::SampleIdentity &coo
|
||||
|
||||
void HandlerOcData::onSendDemandSituationRequest(const rti::core::SampleIdentity &cookie, const SendDemandSituationRequest &request)
|
||||
{
|
||||
DEBUG_LOG() << "New demand situation request from UI: " << request;
|
||||
DEBUG_LOG(m_logger) << "New demand situation request from UI: " << request;
|
||||
|
||||
m_centerEquipmentId = request.centerEquipmentId();
|
||||
m_radius = request.radius();
|
||||
@@ -532,14 +532,14 @@ void HandlerOcData::onSendEquipmentRegistrationRequest(const rti::core::SampleId
|
||||
TrainingAreaBase::SendOcDataRequest out;
|
||||
out.payload(LtsUtils::convert<std::vector<uint8_t>>(payload));
|
||||
m_tabFtc->sendOcDataRequest(out, this);
|
||||
DEBUG_LOG() << "try send out to OcData";
|
||||
DEBUG_LOG(m_logger) << "try send out to OcData";
|
||||
|
||||
m_fts->sendEquipmentRegistrationReply(cookie, Core::FunctionReplyObject());
|
||||
}
|
||||
|
||||
void HandlerOcData::demandEvaluationSchema(int schemaId)
|
||||
{
|
||||
INFO_LOG() << "Demand evaluation schema: " << schemaId;
|
||||
INFO_LOG(m_logger) << "Demand evaluation schema: " << schemaId;
|
||||
|
||||
QByteArray payload;
|
||||
|
||||
@@ -559,7 +559,7 @@ void HandlerOcData::demandSituation(bool initial)
|
||||
|
||||
if (m_centerEquipmentId < -1)
|
||||
{
|
||||
DEBUG_LOG() << "No situation requested as tlnId < -1!";
|
||||
DEBUG_LOG(m_logger) << "No situation requested as tlnId < -1!";
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -573,17 +573,17 @@ void HandlerOcData::demandSituation(bool initial)
|
||||
|
||||
if (m_centerEquipmentId == -1)
|
||||
{
|
||||
INFO_LOG() << "Last demand situation m_centerEquipmentId < -1!";
|
||||
INFO_LOG(m_logger) << "Last demand situation m_centerEquipmentId < -1!";
|
||||
|
||||
// PlayerId -2 setzen, damit keine weiteren Telegramme uebertragen werden
|
||||
m_centerEquipmentId = -2;
|
||||
}
|
||||
|
||||
if (m_centerEquipmentId > 0)
|
||||
INFO_LOG() << "Demand OC situation around m_centerEquipmentId: " << m_centerEquipmentId
|
||||
INFO_LOG(m_logger) << "Demand OC situation around m_centerEquipmentId: " << m_centerEquipmentId
|
||||
<< " radius: " << m_radius;
|
||||
else if (m_position.is_set())
|
||||
INFO_LOG() << "Demand OC situation around position: " << m_position.get()
|
||||
INFO_LOG(m_logger) << "Demand OC situation around position: " << m_position.get()
|
||||
<< " radius: " << m_radius;
|
||||
|
||||
QByteArray payload;
|
||||
@@ -628,7 +628,7 @@ void HandlerOcData::demandSituation(bool initial)
|
||||
|
||||
void HandlerOcData::demandAesItems(OcSituation::AesType aesType)
|
||||
{
|
||||
INFO_LOG() << "Demand aes items type: " << aesType;
|
||||
INFO_LOG(m_logger) << "Demand aes items type: " << aesType;
|
||||
QByteArray payload;
|
||||
|
||||
LtsUtils::set1Byte(OcSituation::TelegramId::DemandAesItems, payload);
|
||||
@@ -642,7 +642,7 @@ void HandlerOcData::demandAesItems(OcSituation::AesType aesType)
|
||||
|
||||
void HandlerOcData::sendNewMessages()
|
||||
{
|
||||
DEBUG_LOG() << "Sending operator messages that havn't been send yet.";
|
||||
DEBUG_LOG(m_logger) << "Sending operator messages that havn't been send yet.";
|
||||
|
||||
auto cb = [this](const Messaging::OperatorMessage & message)
|
||||
{
|
||||
@@ -667,7 +667,7 @@ void HandlerOcData::handleMessage(const QByteArray &data)
|
||||
out.recipientIds().push_back(ownParticipantId);
|
||||
else
|
||||
{
|
||||
ERROR_LOG() << "Receiver invalid, do not publish message.";
|
||||
ERROR_LOG(m_logger) << "Receiver invalid, do not publish message.";
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -691,7 +691,7 @@ void HandlerOcData::handleMessage(const QByteArray &data)
|
||||
}
|
||||
else
|
||||
{
|
||||
WARNING_LOG() << "Sender equipment number: " << tmp << " is unknown. Setting senderId to 0.";
|
||||
WARNING_LOG(m_logger) << "Sender equipment number: " << tmp << " is unknown. Setting senderId to 0.";
|
||||
out.senderId(0);
|
||||
}
|
||||
}
|
||||
@@ -713,7 +713,7 @@ void HandlerOcData::handleMessage(const QByteArray &data)
|
||||
out.message(msg.mid(idx + 1).constData());
|
||||
}
|
||||
|
||||
DEBUG_LOG() << "Got new message: " << out;
|
||||
DEBUG_LOG(m_logger) << "Got new message: " << out;
|
||||
|
||||
m_msgFtc->createOperatorMessageRequest(out, this);
|
||||
}
|
||||
@@ -733,7 +733,7 @@ void HandlerOcData::handleEvaluationSchema(const QByteArray &data)
|
||||
// set sendToTa true
|
||||
out.sendToTa(true);
|
||||
|
||||
DEBUG_LOG() << "Got new evaluation schema: ";
|
||||
DEBUG_LOG(m_logger) << "Got new evaluation schema: ";
|
||||
|
||||
m_evlFtc->evlSchemaModifyRequest(out, this);
|
||||
}
|
||||
@@ -787,14 +787,14 @@ void HandlerOcData::setResetCnt(OcSituation::AesType aesType, int resetCnt)
|
||||
}
|
||||
default:
|
||||
{
|
||||
WARNING_LOG() << "Setting reset counter for aes type: " << aesType << " is not handled.";
|
||||
WARNING_LOG(m_logger) << "Setting reset counter for aes type: " << aesType << " is not handled.";
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
// update db
|
||||
if (!m_dbHandler->update(data))
|
||||
ERROR_LOG() << "Error updating reset counter in db.";
|
||||
ERROR_LOG(m_logger) << "Error updating reset counter in db.";
|
||||
}
|
||||
|
||||
int HandlerOcData::getParticipantIdByEquipmentNumber(int eqNumber)
|
||||
@@ -802,7 +802,7 @@ int HandlerOcData::getParticipantIdByEquipmentNumber(int eqNumber)
|
||||
int partId = m_ppmDtc->participantIdByEquipmentNumber(eqNumber);
|
||||
|
||||
if (partId <= 0)
|
||||
ERROR_LOG() << "Couldn't find our own ID in ppm!";
|
||||
ERROR_LOG(m_logger) << "Couldn't find our own ID in ppm!";
|
||||
|
||||
return partId;
|
||||
}
|
||||
|
||||
@@ -43,6 +43,7 @@ public:
|
||||
bool init();
|
||||
|
||||
protected:
|
||||
NGL::INGLLogger &m_logger;
|
||||
void onEvlSchemaModifyReply(const Core::FunctionReplyObject &reply) override final;
|
||||
void onCreateOperatorMessageReply(const Core::FunctionReplyObject &reply) override final;
|
||||
void onModifyOperatorMessageReply(const Core::FunctionReplyObject &reply) override final;
|
||||
|
||||
+29
-29
@@ -49,14 +49,14 @@ bool HandlerOcSituationData::init()
|
||||
!m_ppmDtc->enableParty() ||
|
||||
!m_ppmDtc->enableType())
|
||||
{
|
||||
ERROR_LOG() << "Enabling PPM Data-Topics failed.";
|
||||
ERROR_LOG(m_logger) << "Enabling PPM Data-Topics failed.";
|
||||
return false;
|
||||
}
|
||||
|
||||
// PPM FTC enable
|
||||
if (!m_ppmFtc->enableModifyParticipantData())
|
||||
{
|
||||
ERROR_LOG() << "Enabling PPM Data-Topics failed.";
|
||||
ERROR_LOG(m_logger) << "Enabling PPM Data-Topics failed.";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -67,25 +67,25 @@ bool HandlerOcSituationData::init()
|
||||
!m_tabDts->enableParticipantSanitation() ||
|
||||
!m_tabDts->enableSpecialSensorData())
|
||||
{
|
||||
ERROR_LOG() << "Enabling TAB DTS Data-Topics failed.";
|
||||
ERROR_LOG(m_logger) << "Enabling TAB DTS Data-Topics failed.";
|
||||
return false;
|
||||
}
|
||||
|
||||
// TAOBOC DTC enable
|
||||
if (!m_tabocDtc->enableSpecificsEquipment())
|
||||
{
|
||||
ERROR_LOG() << "Enabling TABOC Data-Topics failed.";
|
||||
ERROR_LOG(m_logger) << "Enabling TABOC Data-Topics failed.";
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!m_tabocDts->enableParticipantsOverload())
|
||||
{
|
||||
ERROR_LOG() << "Enabling TABOC fts-Topics failed.";
|
||||
ERROR_LOG(m_logger) << "Enabling TABOC fts-Topics failed.";
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
DEBUG_LOG() << "Initialisation HandlerOcSituationData succesful.";
|
||||
DEBUG_LOG(m_logger) << "Initialisation HandlerOcSituationData succesful.";
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -93,7 +93,7 @@ void HandlerOcSituationData::process(const QByteArray &data, bool bIsInitial)
|
||||
{
|
||||
if (bIsInitial)
|
||||
{
|
||||
DEBUG_LOG() << "Processing initial situation data.";
|
||||
DEBUG_LOG(m_logger) << "Processing initial situation data.";
|
||||
|
||||
int ownEquipmentNumber = m_tabocDtc->specificsEquipment(1).equipmentNumber();
|
||||
int ownParticipantId = -1;
|
||||
@@ -115,7 +115,7 @@ void HandlerOcSituationData::process(const QByteArray &data, bool bIsInitial)
|
||||
m_participantId2EqId.clear();
|
||||
|
||||
if (ownParticipantId == -1)
|
||||
ERROR_LOG() << "Mapping of own participant id and equipment number is unknown.";
|
||||
ERROR_LOG(m_logger) << "Mapping of own participant id and equipment number is unknown.";
|
||||
else
|
||||
m_participantId2EqId.insert(ownParticipantId, ownEquipmentNumber);
|
||||
} // if
|
||||
@@ -160,15 +160,15 @@ void HandlerOcSituationData::onModifyParticipantDataReply(const Core::FunctionRe
|
||||
{
|
||||
if (!m_modifiyRequests.contains(reply.id()))
|
||||
{
|
||||
ERROR_LOG() << "Got a ModifyParticipantDataReply without matching ID!";
|
||||
ERROR_LOG(m_logger) << "Got a ModifyParticipantDataReply without matching ID!";
|
||||
return;
|
||||
}
|
||||
|
||||
if (reply.error())
|
||||
ERROR_LOG() << "ModifyParticipantDataRequest " << reply.id() << " could not be handled: " << reply.str();
|
||||
ERROR_LOG(m_logger) << "ModifyParticipantDataRequest " << reply.id() << " could not be handled: " << reply.str();
|
||||
else
|
||||
{
|
||||
DEBUG_LOG() << "ModifyParticipantDataRequest " << reply.id() << " handled successfully by PPM!";
|
||||
DEBUG_LOG(m_logger) << "ModifyParticipantDataRequest " << reply.id() << " handled successfully by PPM!";
|
||||
delete (m_modifiyRequests.value(reply.id()));
|
||||
m_modifiyRequests.remove(reply.id());
|
||||
sendTrainingAreaBaseData(); // send TAB data for new participants
|
||||
@@ -179,7 +179,7 @@ bool HandlerOcSituationData::decodeSituationData(const QByteArray &data)
|
||||
{
|
||||
if (data.isEmpty())
|
||||
{
|
||||
ERROR_LOG() << "Got an empty QByteArray to decode.";
|
||||
ERROR_LOG(m_logger) << "Got an empty QByteArray to decode.";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -190,7 +190,7 @@ bool HandlerOcSituationData::decodeSituationData(const QByteArray &data)
|
||||
participantsOverload.id(1);
|
||||
participantsOverload.hasOverload(participantOverloaded);
|
||||
m_tabocDts->publish(participantsOverload);
|
||||
DEBUG_LOG() << "publish overload: " << participantOverloaded;
|
||||
DEBUG_LOG(m_logger) << "publish overload: " << participantOverloaded;
|
||||
|
||||
QByteArray data2 = data;
|
||||
data2.remove(0, 1);
|
||||
@@ -203,13 +203,13 @@ bool HandlerOcSituationData::decodeSituationData(const QByteArray &data)
|
||||
QByteArray uncompressed = MainHandler::tryUncompress(data2, m_bWithCompression);
|
||||
if (uncompressed.isEmpty())
|
||||
{
|
||||
INFO_LOG() << "Got an empty QByteArray after uncompression.";
|
||||
INFO_LOG(m_logger) << "Got an empty QByteArray after uncompression.";
|
||||
return false;
|
||||
}
|
||||
|
||||
TRACE_LOG() << "Uncompressed Data: " << uncompressed.toHex(' ');
|
||||
TRACE_LOG(m_logger) << "Uncompressed Data: " << uncompressed.toHex(' ');
|
||||
|
||||
DEBUG_LOG() << " m_equipmentPositions size before decode: " << m_equipmentPositions.size()
|
||||
DEBUG_LOG(m_logger) << " m_equipmentPositions size before decode: " << m_equipmentPositions.size()
|
||||
<< " m_equipmentStates size before decode: " << m_equipmentStates.size()
|
||||
<< " m_equipmentOperationalStates size before decode: " << m_equipmentOperationalStates.size()
|
||||
<< " m_specialSensorData size before decode: " << m_specialSensorData.size();
|
||||
@@ -220,7 +220,7 @@ bool HandlerOcSituationData::decodeSituationData(const QByteArray &data)
|
||||
int modId = 1000000;
|
||||
while (getParticipantId(uncompressed, pos, participantId, modifiedFlag) && participantId != 0)
|
||||
{
|
||||
INFO_LOG() << "Participant: " << participantId << " is modified: " << modifiedFlag;
|
||||
INFO_LOG(m_logger) << "Participant: " << participantId << " is modified: " << modifiedFlag;
|
||||
|
||||
// outdated handling
|
||||
if (modifiedFlag == OcSituation::ModificationFlag::eNone)
|
||||
@@ -245,10 +245,10 @@ bool HandlerOcSituationData::decodeSituationData(const QByteArray &data)
|
||||
bRet = getVBG(uncompressed, pos, state, sanitaion, (modifiedFlag & OcSituation::ModificationFlag::eVBG) == OcSituation::ModificationFlag::eVBG);
|
||||
if (bRet)
|
||||
{
|
||||
DEBUG_LOG() << "Adding EquipmentState to internal map: " << state;
|
||||
DEBUG_LOG(m_logger) << "Adding EquipmentState to internal map: " << state;
|
||||
m_equipmentStates.insert(participantId, state);
|
||||
|
||||
DEBUG_LOG() << "Adding ParticipantSanitation to internal map: " << sanitaion;
|
||||
DEBUG_LOG(m_logger) << "Adding ParticipantSanitation to internal map: " << sanitaion;
|
||||
m_participantSanitations.insert(participantId, sanitaion);
|
||||
|
||||
}
|
||||
@@ -259,8 +259,8 @@ bool HandlerOcSituationData::decodeSituationData(const QByteArray &data)
|
||||
bRet = getState(uncompressed, pos, sensorData, opState, (modifiedFlag & OcSituation::ModificationFlag::eState) == OcSituation::ModificationFlag::eState);
|
||||
if (bRet)
|
||||
{
|
||||
DEBUG_LOG() << "Adding SpecialSensorData to internal map: " << sensorData;
|
||||
DEBUG_LOG() << "Adding EquipmentOperationalState to internal map: " << opState;
|
||||
DEBUG_LOG(m_logger) << "Adding SpecialSensorData to internal map: " << sensorData;
|
||||
DEBUG_LOG(m_logger) << "Adding EquipmentOperationalState to internal map: " << opState;
|
||||
m_specialSensorData.insert(participantId, sensorData);
|
||||
m_equipmentOperationalStates.insert(participantId, opState);
|
||||
}
|
||||
@@ -294,11 +294,11 @@ bool HandlerOcSituationData::decodeSituationData(const QByteArray &data)
|
||||
if (!m_participantData.contains(unitId)) // Adding Unit to participantData, if not already added
|
||||
{
|
||||
m_participantData.insert(unitId, m_ppmDtc->convertParticipantToParticipantData(m_participants.value(unitId)));
|
||||
DEBUG_LOG() << "Adding unit to m_participantData: " << m_participantData.value(unitId);
|
||||
DEBUG_LOG(m_logger) << "Adding unit to m_participantData: " << m_participantData.value(unitId);
|
||||
}
|
||||
|
||||
m_participantData.insert(participantId, participantData);
|
||||
DEBUG_LOG() << "Adding ParticipantData to internal map: " << participantData;
|
||||
DEBUG_LOG(m_logger) << "Adding ParticipantData to internal map: " << participantData;
|
||||
|
||||
if (participantData.equipmentNumber().is_set())
|
||||
m_participantId2EqId[participantId] = participantData.equipmentNumber().get();
|
||||
@@ -311,7 +311,7 @@ bool HandlerOcSituationData::decodeSituationData(const QByteArray &data)
|
||||
m_equipmentPositions.remove(participantId);
|
||||
}
|
||||
|
||||
DEBUG_LOG() << " m_equipmentPositions size after decode: " << m_equipmentPositions.size()
|
||||
DEBUG_LOG(m_logger) << " m_equipmentPositions size after decode: " << m_equipmentPositions.size()
|
||||
<< " m_equipmentStates size after decode: " << m_equipmentStates.size()
|
||||
<< " m_equipmentOperationalStates size after decode: " << m_equipmentOperationalStates.size()
|
||||
<< " m_specialSensorData size after decode: " << m_specialSensorData.size();
|
||||
@@ -323,7 +323,7 @@ void HandlerOcSituationData::sendParticipantData(int requestId)
|
||||
{
|
||||
if (m_modifiyRequests.contains(requestId))
|
||||
{
|
||||
WARNING_LOG() << "Resending modfiyParticipantDataRequest: " << requestId;
|
||||
WARNING_LOG(m_logger) << "Resending modfiyParticipantDataRequest: " << requestId;
|
||||
m_ppmFtc->modifyParticipantDataRequest(*m_modifiyRequests.value(requestId), this);
|
||||
return;
|
||||
}
|
||||
@@ -335,7 +335,7 @@ void HandlerOcSituationData::sendParticipantData(int requestId)
|
||||
m_modifiyRequests.insert(requestId, newRequest);
|
||||
m_participantData.clear();
|
||||
|
||||
INFO_LOG() << "Sending modfiyParticipantDataRequest: " << requestId;
|
||||
INFO_LOG(m_logger) << "Sending modfiyParticipantDataRequest: " << requestId;
|
||||
m_ppmFtc->modifyParticipantDataRequest(*newRequest, this);
|
||||
}
|
||||
|
||||
@@ -438,7 +438,7 @@ bool HandlerOcSituationData::getVBG(const QByteArray &buf, size_t &pos, Training
|
||||
if (!m_knownParties.contains(tmp))
|
||||
{
|
||||
|
||||
WARNING_LOG() << "Party: " << tmp << " unknown, setting equipmentState.originatorId() to "
|
||||
WARNING_LOG(m_logger) << "Party: " << tmp << " unknown, setting equipmentState.originatorId() to "
|
||||
<< Settings::unitOffset() + 1;
|
||||
//Sollte nicht passieren, doch falls ja gibt es goldene Kreuze beim Ausfall
|
||||
tmp = 1;
|
||||
@@ -510,7 +510,7 @@ bool HandlerOcSituationData::getStructure(const QByteArray &buf, size_t &pos, Pa
|
||||
participant.partyId(tmp);
|
||||
else
|
||||
{
|
||||
WARNING_LOG() << "Not setting new party: " << tmp << " for participant: " << participant.id() << " as the party is unknown -> do a base download.";
|
||||
WARNING_LOG(m_logger) << "Not setting new party: " << tmp << " for participant: " << participant.id() << " as the party is unknown -> do a base download.";
|
||||
bRet = false;
|
||||
}
|
||||
|
||||
@@ -519,7 +519,7 @@ bool HandlerOcSituationData::getStructure(const QByteArray &buf, size_t &pos, Pa
|
||||
if (m_participants.contains(tmp))
|
||||
participant.superiorModId(tmp);
|
||||
else
|
||||
WARNING_LOG() << "Not setting new superioir ID: " << tmp << " for participant: " << participant.id() << " as the superior is unknown -> do a base download.";
|
||||
WARNING_LOG(m_logger) << "Not setting new superioir ID: " << tmp << " for participant: " << participant.id() << " as the superior is unknown -> do a base download.";
|
||||
#endif
|
||||
|
||||
return bRet;
|
||||
|
||||
@@ -16,8 +16,7 @@
|
||||
namespace OcSituationClient
|
||||
{
|
||||
|
||||
MainHandler::MainHandler(QObject *parent)
|
||||
: QObject(parent)
|
||||
MainHandler::MainHandler(QObject *parent) : QObject(parent)
|
||||
, m_ddsHandler(nullptr)
|
||||
, m_handlerOcData(nullptr)
|
||||
, m_dbHandler(nullptr)
|
||||
@@ -35,8 +34,8 @@ MainHandler::MainHandler(QObject *parent)
|
||||
, m_tabDtc(nullptr)
|
||||
, m_tabFtc(nullptr)
|
||||
, m_tabocDtc(nullptr)
|
||||
, m_tabocDts(nullptr)
|
||||
{}
|
||||
, m_tabocDts(nullptr),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
|
||||
|
||||
MainHandler::~MainHandler()
|
||||
{
|
||||
@@ -66,89 +65,89 @@ bool MainHandler::init(int domainId, int exerciseId)
|
||||
|
||||
if (!m_dbHandler->init(exerciseId, Settings::settings()))
|
||||
{
|
||||
ERROR_LOG() << "Initialisation dbHandler failed.";
|
||||
ERROR_LOG(m_logger) << "Initialisation dbHandler failed.";
|
||||
return false;
|
||||
}
|
||||
DEBUG_LOG() << "Initialisation dbHandler succesful.";
|
||||
DEBUG_LOG(m_logger) << "Initialisation dbHandler succesful.";
|
||||
|
||||
// initialize DDS
|
||||
m_ddsHandler = std::make_shared<DdsHandler>(domainId, exerciseId);
|
||||
if (!m_ddsHandler->init())
|
||||
{
|
||||
ERROR_LOG() << "Initialisation ddsHandler failed.";
|
||||
ERROR_LOG(m_logger) << "Initialisation ddsHandler failed.";
|
||||
return false;
|
||||
}
|
||||
DEBUG_LOG() << "Initialisation ddsHandler succesful.";
|
||||
DEBUG_LOG(m_logger) << "Initialisation ddsHandler succesful.";
|
||||
|
||||
// create AES Dtc
|
||||
m_aesDtc = AreaEffectSimulation::Interface::Dtc::create(m_ddsHandler->dds());
|
||||
DEBUG_LOG() << "Created AES Dtc";
|
||||
DEBUG_LOG(m_logger) << "Created AES Dtc";
|
||||
|
||||
// create AES Ftc
|
||||
m_aesFtc = AreaEffectSimulation::Interface::Ftc::create(m_ddsHandler->dds());
|
||||
DEBUG_LOG() << "Created AES Ftc";
|
||||
DEBUG_LOG(m_logger) << "Created AES Ftc";
|
||||
|
||||
// create EVL Ftc
|
||||
m_evlFtc = Evaluations::Interface::Ftc::create(m_ddsHandler->dds());
|
||||
DEBUG_LOG() << "Created EVL Ftc";
|
||||
DEBUG_LOG(m_logger) << "Created EVL Ftc";
|
||||
|
||||
// create GIM Dtc
|
||||
m_gimDtc = GuezIedManagement::Interface::Dtc::create(m_ddsHandler->dds());
|
||||
DEBUG_LOG() << "Created GIM Dtc";
|
||||
DEBUG_LOG(m_logger) << "Created GIM Dtc";
|
||||
|
||||
// create MSG Dtc
|
||||
m_msgDtc = Messaging::Interface::Dtc::create(m_ddsHandler->dds());
|
||||
DEBUG_LOG() << "Created MSG Dtc";
|
||||
DEBUG_LOG(m_logger) << "Created MSG Dtc";
|
||||
|
||||
// create MSG Ftc
|
||||
m_msgFtc = Messaging::Interface::Ftc::create(m_ddsHandler->dds());
|
||||
DEBUG_LOG() << "Created MSG Ftc";
|
||||
DEBUG_LOG(m_logger) << "Created MSG Ftc";
|
||||
|
||||
// create OPM Dtc
|
||||
m_opmDtc = OperatorManagement::Interface::Dtc::create(m_ddsHandler->dds());
|
||||
DEBUG_LOG() << "Created OPM Dtc";
|
||||
DEBUG_LOG(m_logger) << "Created OPM Dtc";
|
||||
|
||||
// create OSS Dts
|
||||
m_ossDts = OcSituationServer::Interface::Dts::create(m_ddsHandler->dds());
|
||||
DEBUG_LOG() << "Created OSS Dts";
|
||||
DEBUG_LOG(m_logger) << "Created OSS Dts";
|
||||
|
||||
// create OSS Fts
|
||||
m_ossFts = OcSituationServer::Interface::Fts::create(m_ddsHandler->dds());
|
||||
DEBUG_LOG() << "Created OSS Fts";
|
||||
DEBUG_LOG(m_logger) << "Created OSS Fts";
|
||||
|
||||
// create PPM Dtc
|
||||
m_ppmDtc = ParticipantManagement::Interface::Dtc::create(m_ddsHandler->dds());
|
||||
DEBUG_LOG() << "Created PPM Dtc";
|
||||
DEBUG_LOG(m_logger) << "Created PPM Dtc";
|
||||
|
||||
// create PPM Ftc
|
||||
m_ppmFtc = ParticipantManagement::Interface::Ftc::create(m_ddsHandler->dds());
|
||||
DEBUG_LOG() << "Created PPM Ftc";
|
||||
DEBUG_LOG(m_logger) << "Created PPM Ftc";
|
||||
|
||||
// create TAB Dtc
|
||||
m_tabDtc = TrainingAreaBase::Interface::Dtc::create(m_ddsHandler->dds());
|
||||
DEBUG_LOG() << "Created TAB Dtc";
|
||||
DEBUG_LOG(m_logger) << "Created TAB Dtc";
|
||||
|
||||
// create TAB Dts
|
||||
m_tabDts = TrainingAreaBase::Interface::Dts::create(m_ddsHandler->dds());
|
||||
DEBUG_LOG() << "Created TAB Dts";
|
||||
DEBUG_LOG(m_logger) << "Created TAB Dts";
|
||||
|
||||
// create TAB Ftc
|
||||
m_tabFtc = TrainingAreaBase::Interface::Ftc::create(m_ddsHandler->dds());
|
||||
DEBUG_LOG() << "Created TAB Ftc";
|
||||
DEBUG_LOG(m_logger) << "Created TAB Ftc";
|
||||
|
||||
// create TABOC Dtc
|
||||
m_tabocDtc = TrainingAreaBaseOC::Interface::Dtc::create(m_ddsHandler->dds());
|
||||
DEBUG_LOG() << "Created TABOC Dtc";
|
||||
DEBUG_LOG(m_logger) << "Created TABOC Dtc";
|
||||
|
||||
// create TABOC Dts
|
||||
m_tabocDts = TrainingAreaBaseOC::Interface::Dts::create(m_ddsHandler->dds());
|
||||
DEBUG_LOG() << "Created TABOC Dts";
|
||||
DEBUG_LOG(m_logger) << "Created TABOC Dts";
|
||||
|
||||
// create handler oc-data
|
||||
m_handlerOcData = std::make_shared<HandlerOcData>(this, this);
|
||||
if (!m_handlerOcData->init())
|
||||
{
|
||||
ERROR_LOG() << "Initialisation HandlerOcData failed.";
|
||||
ERROR_LOG(m_logger) << "Initialisation HandlerOcData failed.";
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
@@ -84,6 +84,7 @@ public:
|
||||
return {};
|
||||
}
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
std::shared_ptr<DdsHandler> m_ddsHandler;
|
||||
std::shared_ptr<HandlerOcData> m_handlerOcData;
|
||||
std::shared_ptr<DbHandler> m_dbHandler;
|
||||
|
||||
Reference in new issue
Block a user