Qt6 Migration: DDS-Stubs, Logger-Fixes, Export-Header Korrekturen

- NGL_ADD_LIBRARY2: 87 CMakeLists.txt konvertiert für Export-Header Generierung
- 44 Export-Header Include-Pfade korrigiert (_export.h)
- 81 DDS-Stub-Header generiert (*_dtc.h, *_fts.h, *_dts.h, *_ftc.h)
- INGLLogger: Duplikat gelöscht, m_logger Member entfernt, variadische Makros
- Q_FUNC_INFO Redefinition behoben (Qt6 definiert bereits)
- FATAL_LOG Makro hinzugefügt
- InfrastructureManagement DDS-Stubs (ism.hpp, ism_enums.hpp, ism_ftc.h)
- FilterManagement DDS-Stubs (flt_ftc.h, flt_dts.h)
- AreaEffectSimulation DDS-Stubs (aes.hpp, aes_enums.hpp)
- SymbolAppearance Klasse vollständig definiert mit content() Methode
- BuildingComponentFilter Klasse definiert mit Copy-Konstruktor
- Ftc Factory: nullptr Return (abstract class)
- AesFilter Klasse in aes.hpp hinzugefügt
- Dtc Klasse in ppm.hpp mit participantChanged Signal
- AesType Enum: alle 15 At* Werte definiert
- AesEffectState_def: EsReceived hinzugefügt
- DataModification Enum: eAdded/eModified/eRemoved
- function_reply_object.h → core_types.h Include-Pfad (72 Dateien)
- Enum-Class-Streaming Template-Operator in INGLLogger.h
- ism_mounting_point.h: QImage → QtGui/QImage, QGuiApplication/QScreen
- ism_data_plugin_interface.h: QSet Include, Include-Reihenfolge
- QRegExp → QRegularExpression in tpm_js_parser.cpp
- .underlying() Aufrufe zu direktem Enum-Vergleich korrigiert
- Include-Pfade: aes.hpp in symbol_appearance_settings_impl.h und aes_display_filter_impl.h

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
torstenandCopilot committed 2026-08-19 06:06:24 +02:00
1 parent 010f91928a
commit b774f4035c
2785 files changed
+18754 -18316

No files matched your search

@@ -35,7 +35,6 @@ ParticipantMoveDialog::ParticipantMoveDialog(QWidget *parent)
, m_id(0)
, m_requestHelper(new LtsUtils::RequestHelper(this))
, m_polyline(QPolygonF())
, m_logger(getLogger("ParticipantMoveDialog"))
{
m_ui->setupUi(this);
m_ui->cbJump->hide();
@@ -135,7 +134,7 @@ void ParticipantMoveDialog::onSimulatedMovementChanged(const CentralEffectSimula
{
if (modType == DataModification::eRemoved || m_participantData.id() != data.participantId())
return;
INFO_LOG(m_logger) << "onSimulatedMovementChanged";
INFO_LOG() << "onSimulatedMovementChanged";
clearContent();
@@ -190,7 +189,7 @@ void ParticipantMoveDialog::onSimulatedMovementModifyReply(const Core::FunctionR
void ParticipantMoveDialog::retranslate()
{
translate(m_ui, QString::fromStdString(m_participantData.tacticalIdentifier()), false, tr("Waypoints"));
DEBUG_LOG(m_logger) << "retranslate";
DEBUG_LOG() << "retranslate";
}
void ParticipantMoveDialog::initTableHeader()
@@ -262,7 +261,7 @@ void ParticipantMoveDialog::onFocus()
void ParticipantMoveDialog::onGetPolyline()
{
DEBUG_LOG(m_logger) << LOGFUNCTION;
DEBUG_LOG() << Q_FUNC_INFO;
if (!m_sitMapGuiIfc)
return;
@@ -299,7 +298,7 @@ void ParticipantMoveDialog::onGetPolyline()
void ParticipantMoveDialog::onPolylineData(const QPolygonF &polyline)
{
DEBUG_LOG(m_logger) << LOGFUNCTION << " numberOfPoints: " << polyline.size();
DEBUG_LOG() << Q_FUNC_INFO << " numberOfPoints: " << polyline.size();
if (polyline.size() < 2)
return;
@@ -382,7 +381,7 @@ bool ParticipantMoveDialog::apply()
{
const SimulatedMovement req = requestContent();
INFO_LOG(m_logger) << "--- onApplyMessage() ";
INFO_LOG() << "--- onApplyMessage() ";
m_requestHelper->addRequest([this, req]()
{
@@ -396,7 +395,7 @@ bool ParticipantMoveDialog::apply()
Core::RemoveElementRequest req(m_id);
m_id = 0;
INFO_LOG(m_logger) << "--- onApplyMessage() ";
INFO_LOG() << "--- onApplyMessage() ";
m_requestHelper->addRequest([req, this]()
{
@@ -485,14 +484,14 @@ void ParticipantMoveDialog::onExportButtonClicked()
int fileId = m_flmGui->saveFileContent(this, FileManagement::FileType::Xml, m_session->exerciseId(), byteArray);
if (fileId > 0)
DEBUG_LOG(m_logger) << "Saved file with id = " << fileId;
DEBUG_LOG() << "Saved file with id = " << fileId;
else
ERROR_LOG(m_logger) << "Could not save file in library ";
ERROR_LOG() << "Could not save file in library ";
}
void ParticipantMoveDialog::onImportButtonClicked()
{
DEBUG_LOG(m_logger) << " onImportButtonClicked() ";
DEBUG_LOG() << " onImportButtonClicked() ";
QByteArray content;
int fileId = m_flmGui->loadFileContent(this, content, {FileManagement::FileType::Xml}, m_session->exerciseId(), FileManagement::toString(FileManagement::XmlType::CESParticipantMove));
@@ -512,7 +511,7 @@ void ParticipantMoveDialog::onImportButtonClicked()
{
SimulatedMovement req = jsonToSimulatedMovement(content);
INFO_LOG(m_logger) << "--- onImportButtonClicked() ";
INFO_LOG() << "--- onImportButtonClicked() ";
m_requestHelper->addRequest([this, req]()
{
@@ -40,7 +40,6 @@ ParticipantsMoveDialog::ParticipantsMoveDialog(const QString &menuGroup, QWidget
, m_menuGroup(menuGroup)
, m_requestHelper(new LtsUtils::RequestHelper(this))
, m_sitMapGuiIfc(nullptr)
, m_logger(getLogger("ParticipantsMoveDialog"))
{
m_ui->setupUi(this);
setUnchangeable();
@@ -113,14 +112,14 @@ bool ParticipantsMoveDialog::init(LtsSession::LtsSession *session,
std::shared_ptr<ExerciseManagement::Interface::Dtc> exmDtc;
if (!m_session->getDtc<ExerciseManagement::DataInterface>(exmDtc))
{
ERROR_LOG(m_logger) << "failed to get exmDtc ";
ERROR_LOG() << "failed to get exmDtc ";
return false;
}
std::shared_ptr<AssetManagement::Interface::Dtc> asmDtc;
if (!m_session->getDtc<AssetManagement::DataInterface>(asmDtc))
{
ERROR_LOG(m_logger) << "failed to get asmDtc ";
ERROR_LOG() << "failed to get asmDtc ";
return false;
}
@@ -131,13 +130,13 @@ bool ParticipantsMoveDialog::init(LtsSession::LtsSession *session,
AssetManagement::TrainingArea ta = asmDtc->trainingArea(exc.trainingAreaId());
if (ta.id() != exc.trainingAreaId())
{
ERROR_LOG(m_logger)<<" couldn't get Training Area with id: "<<exc.trainingAreaId();
ERROR_LOG()<<" couldn't get Training Area with id: "<<exc.trainingAreaId();
return false;
}
if (!m_session ->getDtc<AreaEffectSimulation::DataInterface>(m_aesDtc))
{
ERROR_LOG(m_logger)<<"failed to get aesDtc";
ERROR_LOG()<<"failed to get aesDtc";
return false;
}
@@ -212,7 +211,7 @@ void ParticipantsMoveDialog::onSelectionChanged()
return;
const ParticipantManagement::ParticipantData data(participantFromIndex(indexList.first()));
DEBUG_LOG(m_logger) << "ParticipantId: " << data.id();
DEBUG_LOG() << "ParticipantId: " << data.id();
m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Remove, data.isSimulated());
if (data.isSimulated() && m_participantDialogMap.contains(data.id()))
@@ -258,7 +257,7 @@ void ParticipantsMoveDialog::onSelectionChanged()
void ParticipantsMoveDialog::onModelChanged()
{
m_ui->dvParticipants->expandAll();
DEBUG_LOG(m_logger) << "onModelChanged";
DEBUG_LOG() << "onModelChanged";
}
void ParticipantsMoveDialog::onDoubleClicked()
@@ -283,7 +282,7 @@ void ParticipantsMoveDialog::onDoubleClicked()
return;
const ParticipantManagement::ParticipantData data(participantFromIndex(indexList.first()));
DEBUG_LOG(m_logger) << "ParticipantId: " << data.id();
DEBUG_LOG() << "ParticipantId: " << data.id();
if (!m_participantDialogMap.contains(data.id()))
{
@@ -336,7 +335,7 @@ void ParticipantsMoveDialog::onRemove()
return;
const ParticipantManagement::ParticipantData data(participantFromIndex(indexList.first()));
INFO_LOG(m_logger) << "onRemove ParticipantId: " << data.id();
INFO_LOG() << "onRemove ParticipantId: " << data.id();
delete m_participantDialogMap.value(data.id());
@@ -431,7 +430,7 @@ void ParticipantsMoveDialog::onGetCoordinate(QPointF coordinate)
const ParticipantManagement::ParticipantData participantData(participantFromIndex(indexList.first()));
INFO_LOG(m_logger) << LOGFUNCTION << "ParticipantId=" << participantData.id()
INFO_LOG() << Q_FUNC_INFO << "ParticipantId=" << participantData.id()
<< " EquipmentNr=" << participantData.equipmentNumber()
<< " onGetCoordinate x=" << coordinate.x() << " y=" << coordinate.y();
if (participantData.id() <= 0)
@@ -501,7 +500,7 @@ bool ParticipantsMoveDialog::isParticipantInUseForExplosionCluster(int id)
{
if (!m_aesDtc)
{
ERROR_LOG(m_logger)<<" m_aesDTC is not setted";
ERROR_LOG()<<" m_aesDTC is not setted";
return true;
}
@@ -659,7 +658,7 @@ void ParticipantsMoveDialog::setFormationAndPositioningUi(const ParticipantManag
m_formationProps.angle = std::fmod((mil2Deg(angleMil) + 90), 360);
DEBUG_LOG(m_logger)<<" angle in deg mil: "<<angleMil
DEBUG_LOG()<<" angle in deg mil: "<<angleMil
<<" -> degree: "<< mil2Deg(angleMil)<<" final position(°): "<<m_formationProps.angle;
}
@@ -674,7 +673,7 @@ void ParticipantsMoveDialog::setFormationAndPositioningUi(const ParticipantManag
const QPointF mgrsCoordinate = posEdit->coordinate();
if (mgrsCoordinate.isNull())
{
WARNING_LOG(m_logger)<<"MGRS Coordinates invalid!";
WARNING_LOG()<<"MGRS Coordinates invalid!";
LtsWidgets::LtsMessageDialog::showMessage(this, tr("Coordinates invalid!\nPlease check them and try again."));
return;
}
@@ -733,7 +732,7 @@ bool ParticipantsMoveDialog::getUnitPosition(int32_t participantId, Core::GeoPos
ParticipantManagement::UnitPosition up = m_ppmDtc->unitPosition(participantId);
if (up.participantId() != participantId)
{
ERROR_LOG(m_logger) << LOGFUNCTION << ", unitPosition failed for participantId=" << participantId;
ERROR_LOG() << Q_FUNC_INFO << ", unitPosition failed for participantId=" << participantId;
return false;
}
@@ -768,7 +767,7 @@ void ParticipantsMoveDialog::doSetSimulatedPositionRequest(const ParticipantMana
{
const ParticipantManagement::TypeClass tc = m_ppmDtc->type(participantData.typeId()).typeClass();
DEBUG_LOG(m_logger) << "ParticipantId=" << participantData.id()
DEBUG_LOG() << "ParticipantId=" << participantData.id()
<< " EquipmentNr=" << participantData.equipmentNumber()
<< " onGetCoordinate x=" << coordinate.x() << " y=" << coordinate.y()
<< ", tc=" << tc;
@@ -817,11 +816,11 @@ void ParticipantsMoveDialog::doSetSimulatedPositionRelativeRequest(const Partici
Core::GeoPosition unitPositionOut;
if (!getUnitPosition(participantId, unitPositionOut))
{
ERROR_LOG(m_logger) << LOGFUNCTION << ", getUnitPosition failed for participantId=" << participantId;
ERROR_LOG() << Q_FUNC_INFO << ", getUnitPosition failed for participantId=" << participantId;
return;
}
INFO_LOG(m_logger) << LOGFUNCTION << ", getUnitPosition for participantId=" << participantId
INFO_LOG() << Q_FUNC_INFO << ", getUnitPosition for participantId=" << participantId
<< ", unitPositionOut: lon=" << unitPositionOut.lon() << " - lat=" << unitPositionOut.lat();
LtsCoordTrans::UtmCoordinate curUnitPosUtm = LtsCoordTrans::UtmCoordinate::fromGeographic(unitPositionOut.lon(), unitPositionOut.lat());
@@ -830,7 +829,7 @@ void ParticipantsMoveDialog::doSetSimulatedPositionRelativeRequest(const Partici
if (offset.isNull())
{
ERROR_LOG(m_logger) << LOGFUNCTION << ", required offset is zero. not expected... return";
ERROR_LOG() << Q_FUNC_INFO << ", required offset is zero. not expected... return";
return;
}
@@ -839,7 +838,7 @@ void ParticipantsMoveDialog::doSetSimulatedPositionRelativeRequest(const Partici
req.positionOffsetX(offset.x());
req.positionOffsetY(offset.y());
DEBUG_LOG(m_logger) << "SetSimulatedPositionRelative = " << req;
DEBUG_LOG() << "SetSimulatedPositionRelative = " << req;
m_requestHelper->startSingleRequest([req, this]()
{
@@ -857,11 +856,11 @@ void ParticipantsMoveDialog::doSetSimulatedParticipantFormationRequest(const Par
Core::GeoPosition unitPositionOut;
if (!getUnitPosition(participantId, unitPositionOut))
{
ERROR_LOG(m_logger) << LOGFUNCTION << ", getUnitPosition failed for participantId=" << participantId;
ERROR_LOG() << Q_FUNC_INFO << ", getUnitPosition failed for participantId=" << participantId;
return;
}
INFO_LOG(m_logger) << LOGFUNCTION << ", getUnitPosition for participantId=" << participantId
INFO_LOG() << Q_FUNC_INFO << ", getUnitPosition for participantId=" << participantId
<< ", unitPositionOut: lon=" << unitPositionOut.lon() << " - lat=" << unitPositionOut.lat();
LtsCoordTrans::UtmCoordinate curUnitPosUtm = LtsCoordTrans::UtmCoordinate::fromGeographic(unitPositionOut.lon(), unitPositionOut.lat());
@@ -870,7 +869,7 @@ void ParticipantsMoveDialog::doSetSimulatedParticipantFormationRequest(const Par
if (offset.isNull())
{
ERROR_LOG(m_logger) << LOGFUNCTION << ", required offset is zero. not expected... return";
ERROR_LOG() << Q_FUNC_INFO << ", required offset is zero. not expected... return";
return;
}
@@ -13,14 +13,13 @@ ParticipantMoveModel::ParticipantMoveModel(QObject *parent,
const std::shared_ptr<ParticipantManagement::Interface::Dtc> &ppmDtc,
const std::shared_ptr<AdvancedSymbology::ForeignDataInterface> &asbIfc)
: ParticipantManagement::ParticipantEditModel(parent, ppmDtc, asbIfc)
, m_logger(getLogger("ParticipantMoveModel"))
{
m_titles += tr("Simulated");
connect(m_dtc.get(), &ParticipantManagement::Interface::Dtc::participantChanged,
this, &ParticipantMoveModel::onParticipantChanged);
DEBUG_LOG(m_logger) << "ParticipantMoveModel::ParticipantMoveModel";
DEBUG_LOG() << "ParticipantMoveModel::ParticipantMoveModel";
}
@@ -43,7 +42,7 @@ void ParticipantMoveModel::onParticipantChanged(const ParticipantManagement::Par
Q_UNUSED(modType)
if (data.partyId() != m_partyId)
return;
INFO_LOG(m_logger) << "onParticipantChanged isSimulated=" << data.isSimulated();
INFO_LOG() << "onParticipantChanged isSimulated=" << data.isSimulated();
onReinitModel(partyId());
emit newData();
}
@@ -57,7 +56,7 @@ bool ParticipantMoveModel::isSelectableBySimulation(const QModelIndex &index, bo
m_dtc->type(data.typeId()).typeClass() == ParticipantManagement::TypeClass_def::Unit)
isSimulatable = false;
DEBUG_LOG(m_logger) << "ParticipantId: " << data.id()
DEBUG_LOG() << "ParticipantId: " << data.id()
<< " isSimulated:" << data.isSimulated()
<< " equipmentNo:" << data.equipmentNumber()
<< " typeId=" << data.typeId()
@@ -30,7 +30,5 @@ signals:
private:
void onParticipantChanged(const ParticipantManagement::Participant &data, DataModification modType);
bool isSelectableBySimulation(const QModelIndex &index, bool *bIsSimulated = nullptr) const;
NGL::INGLLogger &m_logger;
};
}