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:
2785 files changed
+18754
-18316
No files matched your search
+3
-4
@@ -19,7 +19,6 @@ MissionPlanDialog::MissionPlanDialog(const QString &menuGroup, QWidget *parent)
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_session(nullptr)
|
||||
, m_menuGroup(menuGroup)
|
||||
, m_logger(getLogger("MissionPlanDialog"))
|
||||
, m_ui(new Ui::MissionPlanDialog)
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
@@ -42,12 +41,12 @@ bool MissionPlanDialog::init(LtsSession::LtsSession *session)
|
||||
|
||||
if (!m_session->getDtc<ParticipantManagement::DataInterface>(m_ppmDtc))
|
||||
{
|
||||
ERROR_LOG(m_logger) << " failed to get ppmDtc";
|
||||
ERROR_LOG() << " failed to get ppmDtc";
|
||||
return false;
|
||||
}
|
||||
if (!m_session->getFtc<ParticipantManagement::DataInterface>(m_ppmFtc))
|
||||
{
|
||||
ERROR_LOG(m_logger) << " failed to get ppmFtc";
|
||||
ERROR_LOG() << " failed to get ppmFtc";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -144,7 +143,7 @@ MissionPlanDialog::WayPointsStatus MissionPlanDialog::wayPointCurrentStatus(cons
|
||||
return WayPointsStatus::Expired;
|
||||
|
||||
|
||||
WARNING_LOG(m_logger)<<" -- Status Wegpunktkette Abgebrochen muss definiert werden";
|
||||
WARNING_LOG()<<" -- Status Wegpunktkette Abgebrochen muss definiert werden";
|
||||
|
||||
return state;
|
||||
}
|
||||
|
||||
+13
-14
@@ -37,7 +37,6 @@ MissionPlanEdit::MissionPlanEdit(QWidget *parent)
|
||||
, m_ppmCbxGui(nullptr)
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_participantTimer(new QTimer(this))
|
||||
, m_logger(getLogger("MissionPlanEdit"))
|
||||
, m_ui(new Ui::MissionPlanEdit)
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
@@ -75,22 +74,22 @@ bool MissionPlanEdit::init(const int missionPlanId, LtsSession::LtsSessionDataDd
|
||||
|
||||
if (!m_session->getDtc<ProjectDataManagement::DataInterface>(m_pdmDtc))
|
||||
{
|
||||
ERROR_LOG(m_logger) << " failed to get pdmDtc";
|
||||
ERROR_LOG() << " failed to get pdmDtc";
|
||||
return false;
|
||||
}
|
||||
if (!m_session->getDtc<ParticipantManagement::DataInterface>(m_ppmDtc))
|
||||
{
|
||||
ERROR_LOG(m_logger) << " failed to get ppmDtc";
|
||||
ERROR_LOG() << " failed to get ppmDtc";
|
||||
return false;
|
||||
}
|
||||
if (!m_session->getFtc<ParticipantManagement::DataInterface>(m_ppmFtc))
|
||||
{
|
||||
ERROR_LOG(m_logger) << " failed to get ppmFtc";
|
||||
ERROR_LOG() << " failed to get ppmFtc";
|
||||
return false;
|
||||
}
|
||||
if (!m_session->getForeignGuiInterface<ParticipantManagement::ForeignGuiComboboxInterface>(m_ppmCbxGui))
|
||||
{
|
||||
ERROR_LOG(m_logger) << " failed to get ppmCbxGui";
|
||||
ERROR_LOG() << " failed to get ppmCbxGui";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -131,16 +130,16 @@ bool MissionPlanEdit::init(const int missionPlanId, LtsSession::LtsSessionDataDd
|
||||
const auto pId = m_ui->participantCBox->currentData().toInt();
|
||||
m_participant = m_ppmDtc->participant(pId);
|
||||
const auto dpd = m_ppmDtc->dynamicParticipantData(m_participant.id());
|
||||
DEBUG_LOG(m_logger) << "idx changed! pId: " << pId << ", m_participant.id(): " << m_participant.id() << ", dpd.participantId(): " << dpd.participantId();
|
||||
DEBUG_LOG() << "idx changed! pId: " << pId << ", m_participant.id(): " << m_participant.id() << ", dpd.participantId(): " << dpd.participantId();
|
||||
|
||||
if (dpd.participantId() < 1)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "no dynamic pdata yet for pId " << pId;
|
||||
ERROR_LOG() << "no dynamic pdata yet for pId " << pId;
|
||||
setReady(false);
|
||||
return;
|
||||
}
|
||||
|
||||
DEBUG_LOG(m_logger) << "calling onDynamicParticipantDataChanged !";
|
||||
DEBUG_LOG() << "calling onDynamicParticipantDataChanged !";
|
||||
onDynamicParticipantDataChanged(dpd, DataModification::eAdded);
|
||||
});
|
||||
connect(m_ppmDtc.get(), &ParticipantManagement::Interface::Dtc::dynamicParticipantDataChanged,
|
||||
@@ -218,11 +217,11 @@ void MissionPlanEdit::onDynamicParticipantDataChanged(const ParticipantManagemen
|
||||
{
|
||||
if (data.participantId() != m_participant.id() && data.participantId() != 0)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "### " << data.participantId() << " != " << m_participant.id() << " (" << (int)modType << ")";
|
||||
ERROR_LOG() << "### " << data.participantId() << " != " << m_participant.id() << " (" << (int)modType << ")";
|
||||
return;
|
||||
}
|
||||
|
||||
DEBUG_LOG(m_logger) << "### " << data.participantId() << " == " << m_participant.id() << " (" << (int)modType << ") !!!";
|
||||
DEBUG_LOG() << "### " << data.participantId() << " == " << m_participant.id() << " (" << (int)modType << ") !!!";
|
||||
|
||||
|
||||
|
||||
@@ -247,7 +246,7 @@ void MissionPlanEdit::onDynamicParticipantDataChanged(const ParticipantManagemen
|
||||
youngestState.stateTime(0);
|
||||
for (const auto &si : history)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "StateInformation "
|
||||
DEBUG_LOG() << "StateInformation "
|
||||
<< " time=" << si.stateTime()
|
||||
<< " vulnerabilityBits=" << si.vulnerabilityBits()
|
||||
<< " vulnerabilityKindId=" << si.vulnerabilityKindId();
|
||||
@@ -300,7 +299,7 @@ void MissionPlanEdit::onModifyMissionPlanReply(const Core::FunctionReplyObject &
|
||||
|
||||
void MissionPlanEdit::onSetMissionActionFulfilledReply(const Core::FunctionReplyObject &replyObject)
|
||||
{
|
||||
DEBUG_LOG(m_logger)<<" -- MissionPlanEdit - onSetMissionActionFulfilledReply: "<<replyObject.error();
|
||||
DEBUG_LOG()<<" -- MissionPlanEdit - onSetMissionActionFulfilledReply: "<<replyObject.error();
|
||||
}
|
||||
|
||||
QStringList MissionPlanEdit::tableColLabelList() const
|
||||
@@ -587,7 +586,7 @@ void MissionPlanEdit::setUASCharges()
|
||||
|
||||
if (!m_pdmDtc->isUasDroppable(chargeType.id(),0,0))
|
||||
continue;
|
||||
DEBUG_LOG(m_logger) << " fillCharges"
|
||||
DEBUG_LOG() << " fillCharges"
|
||||
<< ", id=" << chargeType.id()
|
||||
<< ", name= " << chargeType.name();
|
||||
|
||||
@@ -755,7 +754,7 @@ void MissionPlanEdit::onGetPolyline()
|
||||
|
||||
void MissionPlanEdit::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;
|
||||
|
||||
+1
-2
@@ -25,7 +25,6 @@ MissionPlanModel::MissionPlanModel(QObject *parent)
|
||||
tr("Aborted")},
|
||||
parent)
|
||||
, m_ppmDtc(nullptr)
|
||||
, m_logger(getLogger("MissionPlanModel"))
|
||||
{
|
||||
|
||||
}
|
||||
@@ -142,7 +141,7 @@ void MissionPlanModel::onMissionPlanChanged(const ParticipantManagement::Mission
|
||||
{
|
||||
const int id = data.id();
|
||||
int row = findRowForId(id);
|
||||
DEBUG_LOG(m_logger)<<"MISSION PLAN CHANGED id ( "<<data.id()<<" ) "<< modType;
|
||||
DEBUG_LOG()<<"MISSION PLAN CHANGED id ( "<<data.id()<<" ) "<< modType;
|
||||
switch (modType)
|
||||
{
|
||||
case DataModification::eModified:
|
||||
|
||||
Reference in new issue
Block a user