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
+9
-9
@@ -29,7 +29,7 @@ PlanTimeLineDialog::PlanTimeLineDialog(LtsSession::LtsSession *session, const QS
|
||||
, m_ui(new Ui::PlanTimeLineDialog)
|
||||
, m_logger(getLogger(QStringLiteral("PlanTimeLineDialog")))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " ";
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " ";
|
||||
|
||||
m_ui->setupUi(this);
|
||||
|
||||
@@ -52,7 +52,7 @@ PlanTimeLineDialog::~PlanTimeLineDialog()
|
||||
|
||||
bool PlanTimeLineDialog::init(const std::shared_ptr<InfrastructureManagement::Interface::Dtc> &dtc, const std::shared_ptr<Interface::Ftc> &ftc, const std::shared_ptr<ForeignDataInterface> &dataInterface, InfrastructureManagement::ForeignResourceManagementGuiInterface *ismGuiIfc)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Start init FileManagementDialogWidget...";
|
||||
DEBUG_LOG() << "Start init FileManagementDialogWidget...";
|
||||
|
||||
m_dtc = dtc;
|
||||
m_ftc = ftc;
|
||||
@@ -68,7 +68,7 @@ bool PlanTimeLineDialog::init(const std::shared_ptr<InfrastructureManagement::In
|
||||
|
||||
if (!bRet)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Could not enable DTC/FTC from ISM";
|
||||
ERROR_LOG() << "Could not enable DTC/FTC from ISM";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -85,7 +85,7 @@ bool PlanTimeLineDialog::init(const std::shared_ptr<InfrastructureManagement::In
|
||||
m_model = new PlanTimelineModel(m_ui->timeline->view(), this);
|
||||
if (!m_model->initModel(m_dtc, m_dataIfc))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Could not init model";
|
||||
ERROR_LOG() << "Could not init model";
|
||||
delete m_model;
|
||||
m_model = nullptr;
|
||||
return false;
|
||||
@@ -133,7 +133,7 @@ void PlanTimeLineDialog::setScheduleId(const int scheduleId)
|
||||
return;
|
||||
}
|
||||
|
||||
DEBUG_LOG(m_logger) << "ism_plan_tln_dialog: setScheduleId = " << m_scheduleId;
|
||||
DEBUG_LOG() << "ism_plan_tln_dialog: setScheduleId = " << m_scheduleId;
|
||||
|
||||
ismIfc->setScheduleId(m_scheduleId);
|
||||
|
||||
@@ -158,7 +158,7 @@ void PlanTimeLineDialog::onLoad()
|
||||
int scheduleId = m_model->getScheduleIdOfItem(m_selectedItem);
|
||||
if (scheduleId == -1)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "onLoad failed: Could not find model for selected item:" << m_selectedItem;
|
||||
ERROR_LOG() << "onLoad failed: Could not find model for selected item:" << m_selectedItem;
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -231,7 +231,7 @@ void PlanTimeLineDialog::onApply()
|
||||
int seId = m_model->getScheduleIdOfItem(itemId);
|
||||
if (seId == -1)
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Could not find schedule for item id:" << itemId;
|
||||
WARNING_LOG() << "Could not find schedule for item id:" << itemId;
|
||||
continue;
|
||||
}
|
||||
InfrastructureManagement::MainSchedule mse = m_dtc->mainSchedule(seId);
|
||||
@@ -311,13 +311,13 @@ void PlanTimeLineDialog::updateTimeLine()
|
||||
|
||||
if (m_scheduleId == -1)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Invalid schedule id: timeline update aborted!";
|
||||
ERROR_LOG() << "Invalid schedule id: timeline update aborted!";
|
||||
return;
|
||||
}
|
||||
|
||||
if (m_model!= nullptr && !m_model->updateModel())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Invalid model!";
|
||||
ERROR_LOG() << "Invalid model!";
|
||||
return;
|
||||
}
|
||||
resizeView();
|
||||
|
||||
+7
-8
@@ -19,13 +19,12 @@ PlanTimelineModel::PlanTimelineModel(TimelineView *tlv, QObject *parent)
|
||||
, m_endTime(m_startTime + (LtsTimeline::ZoomFactor::OneDay))
|
||||
, m_scheduleId(-1)
|
||||
, m_tlv(tlv)
|
||||
, m_logger(getLogger("PlanTimeLineModel"))
|
||||
{
|
||||
}
|
||||
|
||||
bool PlanTimelineModel::initModel(const std::shared_ptr<InfrastructureManagement::Interface::Dtc> &dtc, const std::shared_ptr<ForeignDataInterface> &dataInterface)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Start init FileManagement timeline model...";
|
||||
DEBUG_LOG() << "Start init FileManagement timeline model...";
|
||||
|
||||
if (m_dtc == dtc)
|
||||
return true;
|
||||
@@ -43,17 +42,17 @@ bool PlanTimelineModel::initModel(const std::shared_ptr<InfrastructureManagement
|
||||
|
||||
if (!bRet)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Could not enable ISM DTC Main schedule or Structure elements";
|
||||
ERROR_LOG() << "Could not enable ISM DTC Main schedule or Structure elements";
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!setModel())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Could not set timeline model";
|
||||
ERROR_LOG() << "Could not set timeline model";
|
||||
return false;
|
||||
}
|
||||
|
||||
INFO_LOG(m_logger) << "initModel successful";
|
||||
INFO_LOG() << "initModel successful";
|
||||
|
||||
return true;
|
||||
}
|
||||
@@ -63,7 +62,7 @@ bool PlanTimelineModel::setModel()
|
||||
{
|
||||
if (m_scheduleId == -1)
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Invalid scheduleId " << m_scheduleId;
|
||||
WARNING_LOG() << "Invalid scheduleId " << m_scheduleId;
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -103,12 +102,12 @@ bool PlanTimelineModel::setModel()
|
||||
}
|
||||
catch (const std::exception &e)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "## Unable to add item or track to model. Exception: " << e.what();
|
||||
ERROR_LOG() << "## Unable to add item or track to model. Exception: " << e.what();
|
||||
return false;
|
||||
}
|
||||
}
|
||||
else
|
||||
WARNING_LOG(m_logger) << "Time start/end not set for schedule id " << mse.id();
|
||||
WARNING_LOG() << "Time start/end not set for schedule id " << mse.id();
|
||||
}
|
||||
return true;
|
||||
|
||||
|
||||
Reference in new issue
Block a user