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

@@ -44,7 +44,6 @@ AsmEditTrainingAreaDialog::AsmEditTrainingAreaDialog(QWidget *parent)
, m_ui(new Ui::AsmEditTrainingAreaDialog)
, m_requestHelper(new LtsUtils::RequestHelper(this))
, m_menuGroup()
, m_logger(getLogger("AssetManangementEditDialog"))
{
m_ui->setupUi(this);
}
@@ -71,12 +70,12 @@ bool AsmEditTrainingAreaDialog::init(LtsSession::LtsSessionDataDds *session,
m_session = session;
if (!m_session->getDtc<AssetManagement::DataInterface>(m_asmDtc))
{
ERROR_LOG(m_logger) << "AsmEditTrainingAreaDialog::init() Could not enable DTC from ASM";
ERROR_LOG() << "AsmEditTrainingAreaDialog::init() Could not enable DTC from ASM";
return false;
}
if(!m_session->getFtc<AssetManagement::DataInterface>(m_asmFtc))
{
ERROR_LOG(m_logger) << "AsmEditTrainingAreaDialog::init() Could not enable FTC from ASM";
ERROR_LOG() << "AsmEditTrainingAreaDialog::init() Could not enable FTC from ASM";
return false;
}
m_asmFtc->enableTrainingAreaRemove(true);
@@ -86,7 +85,7 @@ bool AsmEditTrainingAreaDialog::init(LtsSession::LtsSessionDataDds *session,
if (!sitMapGuiIfc)
{
ERROR_LOG(m_logger) << LOGFUNCTION << " Invalid shared_ptr sitMapGuiIfc!";
ERROR_LOG() << Q_FUNC_INFO << " Invalid shared_ptr sitMapGuiIfc!";
return false;
}
@@ -94,7 +93,7 @@ bool AsmEditTrainingAreaDialog::init(LtsSession::LtsSessionDataDds *session,
AssetManagement::TrainingArea ta = AssetManagement::TrainingArea();
if(trainingAreaId == 0)
{
DEBUG_LOG(m_logger) << LOGFUNCTION << " New training area ";
DEBUG_LOG() << Q_FUNC_INFO << " New training area ";
ta.id() = 0;
ta.name() = QStringLiteral("newArea").toStdString();
ta.width() = 12800;
@@ -106,12 +105,12 @@ bool AsmEditTrainingAreaDialog::init(LtsSession::LtsSessionDataDds *session,
ta = m_asmDtc->trainingArea(trainingAreaId);
if(ta.id()<= 0)
{
ERROR_LOG(m_logger) << LOGFUNCTION << " training area not valid id: "<< trainingAreaId;
ERROR_LOG() << Q_FUNC_INFO << " training area not valid id: "<< trainingAreaId;
return false;
}
m_dialogTitle = tr("Edit Training Area: %1").arg(QString::fromStdString(ta.name()));
DEBUG_LOG(m_logger) << LOGFUNCTION << " edit training area " <<trainingAreaId;
DEBUG_LOG() << Q_FUNC_INFO << " edit training area " <<trainingAreaId;
}
m_trainingArea = ta;
@@ -184,7 +183,7 @@ void AsmEditTrainingAreaDialog::getPosition()
m_sitMapGuiIfc->getCoordinate(this, SLOT(onCoordinate(QPointF)), nullptr);
break;
case SituationMap::MapMode::Undefined:
ERROR_LOG(m_logger) << LOGFUNCTION << " ModeMode == Undefined ";
ERROR_LOG() << Q_FUNC_INFO << " ModeMode == Undefined ";
break;
}
@@ -203,7 +202,7 @@ void AsmEditTrainingAreaDialog::onRectData(const QPointF &centerPoint, double wi
m_trainingArea.width() = width;
m_trainingArea.bottomLeft() = convert(btmLeft);
DEBUG_LOG(m_logger) << "Pos X: " << centerPoint.x() << " Y: " << centerPoint.y() << " W: " << width << " H: " << height;
DEBUG_LOG() << "Pos X: " << centerPoint.x() << " Y: " << centerPoint.y() << " W: " << width << " H: " << height;
showPreviewObject();
}
@@ -236,7 +235,7 @@ void AsmEditTrainingAreaDialog::onCoordinate(const QPointF &centerPoint)
m_trainingArea.width() = width;
m_trainingArea.bottomLeft() = convert(btmLeft);
DEBUG_LOG(m_logger) << "Pos X: " << centerPoint.x() << " Y: " << centerPoint.y() << " W: " << width << " H: " << height;
DEBUG_LOG() << "Pos X: " << centerPoint.x() << " Y: " << centerPoint.y() << " W: " << width << " H: " << height;
showPreviewObject();
@@ -246,10 +245,10 @@ void AsmEditTrainingAreaDialog::onCoordinate(const QPointF &centerPoint)
void AsmEditTrainingAreaDialog::onEditClicked()
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START Editing..";
TRACE_LOG() << Q_FUNC_INFO << " START Editing..";
if (!m_sitMapGuiIfc || m_trainingArea.id() < 0)
{
ERROR_LOG(m_logger) << "onEditClicked: sitMapGuiIfc or trainingArea_id: "<<m_trainingArea.id()<<" invalid! ";
ERROR_LOG() << "onEditClicked: sitMapGuiIfc or trainingArea_id: "<<m_trainingArea.id()<<" invalid! ";
return;
}
@@ -264,7 +263,7 @@ void AsmEditTrainingAreaDialog::onEditClicked()
m_ui->sbWidth->value(),
m_ui->sbHeight->value());
TRACE_LOG(m_logger) << LOGFUNCTION << " END Edit";
TRACE_LOG() << Q_FUNC_INFO << " END Edit";
onSelectionChanged();
@@ -280,7 +279,7 @@ void AsmEditTrainingAreaDialog::showPreviewObject()
{
if (!m_sitMapGuiIfc || m_previewPolygon.size() == 0)
{
TRACE_LOG(m_logger) << " AsmEditTrainingAreaDialog::showPreviewObject(): m_sitMapGuiIfc invalid or polygon empty ";
TRACE_LOG() << " AsmEditTrainingAreaDialog::showPreviewObject(): m_sitMapGuiIfc invalid or polygon empty ";
return;
}
m_sitMapGuiIfc->displayPreviewObject(this, m_previewPolygon, true);
@@ -293,7 +292,7 @@ QPointF AsmEditTrainingAreaDialog::getCentPos(TrainingArea ta)
ta.bottomLeft().lat());
QPointF centerPoint = utmCoordinate.geographic((ta.width() / 2.0), ta.height() / 2.0);
TRACE_LOG(m_logger) << LOGFUNCTION << " coord: x: "<< centerPoint.x() <<" y: "<< centerPoint.y();
TRACE_LOG() << Q_FUNC_INFO << " coord: x: "<< centerPoint.x() <<" y: "<< centerPoint.y();
return centerPoint;
}
@@ -307,7 +306,7 @@ bool AsmEditTrainingAreaDialog::apply()
if(!m_asmFtc)
{
ERROR_LOG(m_logger) << LOGFUNCTION << " Can not retrieve AssetManagement::FTC";
ERROR_LOG() << Q_FUNC_INFO << " Can not retrieve AssetManagement::FTC";
return false;
}
double height = m_ui->sbHeight->value();
@@ -326,7 +325,7 @@ bool AsmEditTrainingAreaDialog::apply()
return m_asmFtc->trainingAreaModifyRequest(req, this);
});
TRACE_LOG(m_logger) << LOGFUNCTION << " scucess=" << success;
TRACE_LOG() << Q_FUNC_INFO << " scucess=" << success;
return success;
}
@@ -347,7 +346,7 @@ QPolygonF AsmEditTrainingAreaDialog::getTrainingArea(const TrainingArea &ta)
QPolygonF polygonF;
if(!m_asmDtc)
{
ERROR_LOG(m_logger) << " m_asmDtc is not valid!";
ERROR_LOG() << " m_asmDtc is not valid!";
return{};
}
AssetManagement::TrainingArea ddsTrainingArea = ta;
@@ -74,7 +74,6 @@ private:
QString m_dialogTitle{};
QString m_menuGroup;
LOGGER_T m_logger;
QString m_trainingAreaName{};
AssetManagement::TrainingArea m_trainingArea;
std::shared_ptr<SituationMap::ForeignGuiInterface> m_sitMapGuiIfc;
@@ -25,7 +25,6 @@ AsmTrainingAreaDialog::AsmTrainingAreaDialog(const QString &menuGroup, QWidget *
, m_session(nullptr)
, m_menuGroup(menuGroup)
, m_requestHelper(new LtsUtils::RequestHelper(this))
, m_logger(getLogger("AsmTrainingAreaDialog"))
{
m_ui->setupUi(this);
setOnlineHelpFilename(QStringLiteral("Asset_Management-Training_Area"));
@@ -64,19 +63,19 @@ bool AsmTrainingAreaDialog::init(LtsSession::LtsSessionDataDds *session, const s
if (!m_session->getDtc<AssetManagement::DataInterface>(m_asmDtc))
{
ERROR_LOG(m_logger) << "Could not enable DTC from ASM";
ERROR_LOG() << "Could not enable DTC from ASM";
return false;
}
if(!m_session->getFtc<AssetManagement::DataInterface>(m_asmFtc))
{
ERROR_LOG(m_logger) << "Could not enable FTC from ASM";
ERROR_LOG() << "Could not enable FTC from ASM";
return false;
}
m_sitMapGuiIfc = sitMapGuiIfc;
if(!m_sitMapGuiIfc)
{
ERROR_LOG(m_logger) << "m_sitMapGuiIfc is invalid ";
ERROR_LOG() << "m_sitMapGuiIfc is invalid ";
return false;
}
bool bRet = true;
@@ -87,11 +86,11 @@ bool AsmTrainingAreaDialog::init(LtsSession::LtsSessionDataDds *session, const s
if(!bRet)
{
ERROR_LOG(m_logger) << "Could not enable dtc or ftc from ASM";
ERROR_LOG() << "Could not enable dtc or ftc from ASM";
return false;
}
INFO_LOG(m_logger) << "Ftc && Dtc enabled from ASM";
INFO_LOG() << "Ftc && Dtc enabled from ASM";
delete m_model;
m_model = new AsmTrainingAreaDialogModel(this);
@@ -135,12 +134,12 @@ void AsmTrainingAreaDialog::onAddTrainingArea()
addDialog(dialog, m_menuGroup, identifier, LtsWidgets::LayoutArea::eDialogTab);
}
TRACE_LOG(m_logger) << LOGFUNCTION << " adding temp training Area ";
TRACE_LOG() << Q_FUNC_INFO << " adding temp training Area ";
}
void AsmTrainingAreaDialog::onRemoveTrainingArea()
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START" ;
TRACE_LOG() << Q_FUNC_INFO << " START" ;
QModelIndexList indexList = m_ui->trainingAreaView->selectedRows();
if (indexList.size() == 0)
return;
@@ -148,7 +147,7 @@ void AsmTrainingAreaDialog::onRemoveTrainingArea()
TrainingArea req = m_model->getRowData(indexList.front().row());
if (req.id() < 0)
{
ERROR_LOG(m_logger) << LOGFUNCTION << " invalid id:bt"<< req.id();
ERROR_LOG() << Q_FUNC_INFO << " invalid id:bt"<< req.id();
return;
}
if (!m_viewedTaIds.contains(req.id()))
@@ -158,7 +157,7 @@ void AsmTrainingAreaDialog::onRemoveTrainingArea()
return m_asmFtc->trainingAreaRemoveRequest(TrainingAreaRemoveRequest(req.id()), this);
});
TRACE_LOG(m_logger) << LOGFUNCTION << " success = " << success;
TRACE_LOG() << Q_FUNC_INFO << " success = " << success;
}
else
{
@@ -166,7 +165,7 @@ void AsmTrainingAreaDialog::onRemoveTrainingArea()
tr("Cannot remove currently edited Training Area"));
}
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " END";
}
void AsmTrainingAreaDialog::onEditTrainingArea()
@@ -177,7 +176,7 @@ void AsmTrainingAreaDialog::onEditTrainingArea()
TrainingArea taItem = m_model->getRowData(indexList.front().row());
if (taItem.id() < 0)
{
ERROR_LOG(m_logger) << "onEditTrainingArea invalid id = "<< taItem.id();
ERROR_LOG() << "onEditTrainingArea invalid id = "<< taItem.id();
return;
}
@@ -206,16 +205,16 @@ void AsmTrainingAreaDialog::onEditTrainingArea()
void AsmTrainingAreaDialog::onSelectionChanged()
{
enaDisa();
DEBUG_LOG(m_logger) << "onSelectionChanged() called !";
DEBUG_LOG() << "onSelectionChanged() called !";
const QModelIndex curIdx = m_ui->trainingAreaView->currentIndex();
if (!curIdx.isValid())
return;
AssetManagement::TrainingArea taItem = m_model->getRowData(curIdx.row());
DEBUG_LOG(m_logger) << "onSelectionChanged() selected training area id: "<<taItem.id();
DEBUG_LOG() << "onSelectionChanged() selected training area id: "<<taItem.id();
if(taItem.id() < 0)
{
ERROR_LOG(m_logger) << "onEditTrainingArea invalid id"<< taItem.id();
ERROR_LOG() << "onEditTrainingArea invalid id"<< taItem.id();
return;
}
@@ -237,13 +236,13 @@ QPolygonF AsmTrainingAreaDialog::getTrainingArea(int trainingAreaId)
{
if(!m_asmDtc)
{
ERROR_LOG(m_logger) << LOGFUNCTION << " m_asmDtc is not valid!";
ERROR_LOG() << Q_FUNC_INFO << " m_asmDtc is not valid!";
return {};
}
const AssetManagement::TrainingArea &ddsTrainingArea = m_asmDtc->trainingArea(trainingAreaId);
if (ddsTrainingArea.id() != trainingAreaId)
{
ERROR_LOG(m_logger) << LOGFUNCTION << " TrainingArea not found, trainingAreaId = " << trainingAreaId;
ERROR_LOG() << Q_FUNC_INFO << " TrainingArea not found, trainingAreaId = " << trainingAreaId;
return {};
}
@@ -281,7 +280,7 @@ void AsmTrainingAreaDialog::showAllTrainingAreas()
for (int row = 0; row < rowCount; ++row)
{
const TrainingArea &currentArea = m_model->getRowData(row);
INFO_LOG(m_logger) << " row = " << row << " ; currentArea = " << currentArea;
INFO_LOG() << " row = " << row << " ; currentArea = " << currentArea;
const QPolygonF &poly = getTrainingArea(currentArea);
polyVec.append(poly);
}
@@ -293,7 +292,7 @@ void AsmTrainingAreaDialog::showPreviewObject()
{
if (!this->m_sitMapGuiIfc || m_previewPolygon.size() == 0)
{
TRACE_LOG(m_logger) << " showPreviewObject(): m_sitMapGuiIfc invalid or polygon empty ";
TRACE_LOG() << " showPreviewObject(): m_sitMapGuiIfc invalid or polygon empty ";
return;
}
this->m_sitMapGuiIfc->displayPreviewObject(this, m_previewPolygon, true);
@@ -65,7 +65,6 @@ private:
std::shared_ptr<AssetManagement::Interface::Dtc> m_asmDtc;
std::shared_ptr<AssetManagement::Interface::Ftc> m_asmFtc;
LtsUtils::RequestHelper *m_requestHelper;
LOGGER_T m_logger;
QPolygonF m_previewPolygon;
std::shared_ptr<SituationMap::ForeignGuiInterface> m_sitMapGuiIfc;
QSet<int> m_viewedTaIds{};
@@ -14,7 +14,6 @@ AsmTrainingAreaDialogModel::AsmTrainingAreaDialogModel(QObject *parent)
parent)
,m_asmDtc(nullptr)
,m_logger(getLogger("AsmTrainingAreaDialogModel"))
{}
AsmTrainingAreaDialogModel::~AsmTrainingAreaDialogModel()
@@ -35,7 +34,7 @@ bool AsmTrainingAreaDialogModel::initModel(const std::shared_ptr<Interface::Dtc>
});
} else {
WARNING_LOG(m_logger) << LOGFUNCTION << " no m_asmDtc";
WARNING_LOG() << Q_FUNC_INFO << " no m_asmDtc";
}
return true;
@@ -36,7 +36,6 @@ public:
private:
bool m_hideRemoved;
std::shared_ptr<Interface::Dtc> m_asmDtc;
LOGGER_T m_logger;
};
}