lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adds immediate migration results in progress

Browse Source
This commit is contained in:
torsten committed 2026-08-19 11:18:24 +02:00
1 parent 8453e104c5
commit 3bb6e89496
2102 files changed
+17482 -15071
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/handler_minelayer_data.cpp
+19 -19
View File
@@ -42,7 +42,7 @@ bool HandlerMinelayerData::init()
bool ret = m_aesFtc->enableMineAreaModifyFromCtaData();
if (!ret)
{
ERROR_LOG() << "AesFtc Can not enable MineAreaCreateFromCtaData()";
ERROR_LOG(m_logger) << "AesFtc Can not enable MineAreaCreateFromCtaData()";
return false;
}
@@ -54,7 +54,7 @@ bool HandlerMinelayerData::init()
ret &= m_tabDtc->enableMinelayerThrowerData();
if (!ret)
{
ERROR_LOG() << "TabDtc Can not ebale Data";
ERROR_LOG(m_logger) << "TabDtc Can not ebale Data";
return false;
}
@@ -67,7 +67,7 @@ bool HandlerMinelayerData::init()
ret &= m_ppmDtc->enableParticipant();
if (!ret)
{
ERROR_LOG() << "PpmDtc Can not enable Participant Data";
ERROR_LOG(m_logger) << "PpmDtc Can not enable Participant Data";
return false;
}
@@ -106,12 +106,12 @@ void HandlerMinelayerData::onSpecialSensorDataChanged(const TrainingAreaBase::Sp
// old code copied from zssi_wi_Empfaenger.cpp
/*
if ( checkeTelegrammZeit(telegramm_rt.gps_zeit.gps_zeit) ) {
ERROR_LOG() << QStringLiteral("Keine plausible gps_zeit !! gps_zeit=%1").arg(telegramm_rt.gps_zeit.gps_zeit);
ERROR_LOG(m_logger) << QStringLiteral("Keine plausible gps_zeit !! gps_zeit=%1").arg(telegramm_rt.gps_zeit.gps_zeit);
return;
}
if ( checkeKoordinaten(telegramm_rt.gps_pos)!=0 ) {
ERROR_LOG() << QStringLiteral("Keine plausible gps_pos !! pos_x=%1 Keine plausible gps_pos !! pos_y=%2").arg(telegramm_rt.gps_pos.utm_ostwert).arg(telegramm_rt.gps_pos.utm_nordwert);
ERROR_LOG(m_logger) << QStringLiteral("Keine plausible gps_pos !! pos_x=%1 Keine plausible gps_pos !! pos_y=%2").arg(telegramm_rt.gps_pos.utm_ostwert).arg(telegramm_rt.gps_pos.utm_nordwert);
return;
}
*/
@@ -122,7 +122,7 @@ void HandlerMinelayerData::onSpecialSensorDataChanged(const TrainingAreaBase::Sp
interne_datenbasis_Fahrspur.eintrag_container(key_intern, daten_intern);
INFO_LOG() << "Inserted new lane data into old interne_datenbasis_Fahrspur succesfully! Lane data:" << data;
INFO_LOG(m_logger) << "Inserted new lane data into old interne_datenbasis_Fahrspur succesfully! Lane data:" << data;
// end old code
}
@@ -153,15 +153,15 @@ void HandlerMinelayerData::onMinelayerTrailerData(const TrainingAreaBase::Minela
// old code copied from zssi_wi_Empfaenger.cpp
/*
INFO_LOG() << log_tr("Telegramm 'SONDERSENSORIK_MIVANH_VERLEGEDATEN' empfangen");
INFO_LOG(m_logger) << log_tr("Telegramm 'SONDERSENSORIK_MIVANH_VERLEGEDATEN' empfangen");
if ( checkeTelegrammZeit(telegramm_rt.gps_zeit.gps_zeit) ) {
ERROR_LOG() << log_tr("Keine plausible gps_zeit !! gps_zeit=%1").arg(telegramm_rt.gps_zeit.gps_zeit);
ERROR_LOG(m_logger) << log_tr("Keine plausible gps_zeit !! gps_zeit=%1").arg(telegramm_rt.gps_zeit.gps_zeit);
return;
}
if ( checkeKoordinaten(telegramm_rt.gps_pos)!=0 ) {
ERROR_LOG() << log_tr("Keine plausible gps_pos !! pos_x=%1 Keine plausible gps_pos !! pos_y=%2").arg(telegramm_rt.gps_pos.utm_ostwert).arg(telegramm_rt.gps_pos.utm_nordwert);
ERROR_LOG(m_logger) << log_tr("Keine plausible gps_pos !! pos_x=%1 Keine plausible gps_pos !! pos_y=%2").arg(telegramm_rt.gps_pos.utm_ostwert).arg(telegramm_rt.gps_pos.utm_nordwert);
return;
}
*/
@@ -172,7 +172,7 @@ void HandlerMinelayerData::onMinelayerTrailerData(const TrainingAreaBase::Minela
if (daten_intern.daten.verlegedaten.anzahl_verlegter_minen > 1200)
{
WARNING_LOG() << QStringLiteral("Anzahl_verlegter_minen = %1, wird auf 1200 zurueckgesetzt").arg(daten_intern.daten.verlegedaten.anzahl_verlegter_minen);
WARNING_LOG(m_logger) << QStringLiteral("Anzahl_verlegter_minen = %1, wird auf 1200 zurueckgesetzt").arg(daten_intern.daten.verlegedaten.anzahl_verlegter_minen);
daten_intern.daten.verlegedaten.anzahl_verlegter_minen = 1200;
}
@@ -182,7 +182,7 @@ void HandlerMinelayerData::onMinelayerTrailerData(const TrainingAreaBase::Minela
interne_datenbasis_Verlegedaten.eintrag_container(
key_intern, daten_intern);
INFO_LOG() << "Inserted new minelayertrailer data into old interne_datenbasis_Verlegedaten succesfully! Minelayerthrower data:" << data;
INFO_LOG(m_logger) << "Inserted new minelayertrailer data into old interne_datenbasis_Verlegedaten succesfully! Minelayerthrower data:" << data;
}
}
@@ -197,19 +197,19 @@ void HandlerMinelayerData::onMinelayerThrowerData(const TrainingAreaBase::Minela
/*
if ( checkeTelegrammZeit(telegramm_rt.gps_zeit.gps_zeit) ) {
ERROR_LOG() << log_tr("Keine plausible gps_zeit !! gps_zeit=%1").arg(telegramm_rt.gps_zeit.gps_zeit);
ERROR_LOG(m_logger) << log_tr("Keine plausible gps_zeit !! gps_zeit=%1").arg(telegramm_rt.gps_zeit.gps_zeit);
return;
}
if ( checkeKoordinaten(telegramm_rt.gps_pos) !=0 ) {
ERROR_LOG() << log_tr("Keine plausible gps_pos !! pos_x=%1 Keine plausible gps_pos !! pos_y=%2").arg(telegramm_rt.gps_pos.utm_ostwert).arg(telegramm_rt.gps_pos.utm_nordwert);
ERROR_LOG(m_logger) << log_tr("Keine plausible gps_pos !! pos_x=%1 Keine plausible gps_pos !! pos_y=%2").arg(telegramm_rt.gps_pos.utm_ostwert).arg(telegramm_rt.gps_pos.utm_nordwert);
return;
}
*/
if (daten_intern.daten.verlegedaten.anzahl_verlegter_minen > 1200)
{
WARNING_LOG() << QStringLiteral("Anzahl_verlegter_minen = %1, wird auf 1200 zurueckgesetzt").arg(daten_intern.daten.verlegedaten.anzahl_verlegter_minen);
WARNING_LOG(m_logger) << QStringLiteral("Anzahl_verlegter_minen = %1, wird auf 1200 zurueckgesetzt").arg(daten_intern.daten.verlegedaten.anzahl_verlegter_minen);
daten_intern.daten.verlegedaten.anzahl_verlegter_minen = 1200;
}
@@ -228,7 +228,7 @@ void HandlerMinelayerData::onMinelayerThrowerData(const TrainingAreaBase::Minela
key_intern, daten_intern);
}
INFO_LOG() << "Inserted new minelayerthrower data into old interne_datenbasis_Verlegedaten succesfully! Minelayerthrower data:" << data;
INFO_LOG(m_logger) << "Inserted new minelayerthrower data into old interne_datenbasis_Verlegedaten succesfully! Minelayerthrower data:" << data;
}
}
@@ -328,7 +328,7 @@ void HandlerMinelayerData::onSendMinefield(const wirkfeld_minensperre_rt &minefi
}
outData.segments(segVec);
INFO_LOG() << "Sending new minefield from generator to AES: " << outData;
INFO_LOG(m_logger) << "Sending new minefield from generator to AES: " << outData;
// request create mine area from aes
m_aesFtc->mineAreaModifyFromCtaDataRequest(outData, this);
@@ -337,16 +337,16 @@ void HandlerMinelayerData::onSendMinefield(const wirkfeld_minensperre_rt &minefi
void HandlerMinelayerData::onStartMinefieldInterpreter()
{
INFO_LOG() << "Starting minefield interpreter ...";
INFO_LOG(m_logger) << "Starting minefield interpreter ...";
m_minefieldInterpreter->processData();
}
void HandlerMinelayerData::onMineAreaModifyFromCtaDataReply(const Core::FunctionReplyObject &replyObject)
{
if (replyObject.error())
ERROR_LOG() << "Error inserting minefield via AES->FTC";
ERROR_LOG(m_logger) << "Error inserting minefield via AES->FTC";
else
INFO_LOG() << "Got onMineAreaCreateFromCtaDataReply reply with id " << replyObject.id();
INFO_LOG(m_logger) << "Got onMineAreaCreateFromCtaDataReply reply with id " << replyObject.id();
}
}