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
+14
-15
@@ -45,7 +45,6 @@ SituationReplayEditor::SituationReplayEditor(
|
||||
, m_markerModel(markerModel)
|
||||
, m_applyFilter(applyFilter)
|
||||
, m_ui(new Ui::SituationReplayEditor)
|
||||
, m_logger(getLogger("SituationReplayEditor"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
m_ui->lblDuration->setText(QStringLiteral(" - "));
|
||||
@@ -113,12 +112,12 @@ SituationReplayEditor::SituationReplayEditor(
|
||||
|
||||
if ((*m_essentialsViewsSrpIfc) != nullptr)
|
||||
{
|
||||
WARNING_LOG(m_logger) << "essentials view available - using srp replay control widget as editor!";
|
||||
WARNING_LOG() << "essentials view available - using srp replay control widget as editor!";
|
||||
onAddReplayControlWidget();
|
||||
}
|
||||
else
|
||||
{
|
||||
WARNING_LOG(m_logger) << "essentials view not available - using traditional editor";
|
||||
WARNING_LOG() << "essentials view not available - using traditional editor";
|
||||
}
|
||||
|
||||
setOnlineHelpFilename(QStringLiteral("Script_Editor-Add_Situation_Replay_Topic"));
|
||||
@@ -134,7 +133,7 @@ SituationReplayEditor::~SituationReplayEditor()
|
||||
|
||||
void SituationReplayEditor::updateInternalData()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION;
|
||||
DEBUG_LOG() << Q_FUNC_INFO;
|
||||
|
||||
if (m_firstUpdate)
|
||||
{
|
||||
@@ -182,7 +181,7 @@ void SituationReplayEditor::updateInternalData()
|
||||
|
||||
void SituationReplayEditor::updateInternalLength()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION;
|
||||
DEBUG_LOG() << Q_FUNC_INFO;
|
||||
qint64 end = calculateEnd(m_ui->dteStartTime->msecsSinceEpoch(), m_topicData.duration, m_ui->sbSpeed->value(), true);
|
||||
bool hasChanges = hasUnsavedChanges();
|
||||
m_ui->dteEndTime->setMsecsSinceEpoch(end);
|
||||
@@ -227,19 +226,19 @@ qint64 SituationReplayEditor::calculateEnd(qint64 startTime, int lengthInSeconds
|
||||
else
|
||||
result /= speed;
|
||||
result += startTime;
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " result = " << result;
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " result = " << result;
|
||||
return result;
|
||||
}
|
||||
|
||||
qint64 SituationReplayEditor::calculateDuration(qint64 startTime, qint64 endTime, double speed)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " startTime=" << startTime << " endTime=" << endTime << " speed=" << speed;
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " startTime=" << startTime << " endTime=" << endTime << " speed=" << speed;
|
||||
qint64 duration = endTime - startTime;
|
||||
double result = duration;
|
||||
result /= speed;
|
||||
qint64 result2 = result;
|
||||
result2 += 500;
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " result = " << result2;
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " result = " << result2;
|
||||
return result2;
|
||||
}
|
||||
|
||||
@@ -257,7 +256,7 @@ void SituationReplayEditor::setMapSettings(const QByteArray &mapSettings)
|
||||
|
||||
if (parseError.error != QJsonParseError::NoError)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "map settings not valid json at" << parseError.errorString();
|
||||
ERROR_LOG() << "map settings not valid json at" << parseError.errorString();
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -272,7 +271,7 @@ void SituationReplayEditor::setMapFilter(const QByteArray &mapFilter)
|
||||
|
||||
if (parseError.error != QJsonParseError::NoError)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "filter settings not valid json at" << parseError.errorString();
|
||||
ERROR_LOG() << "filter settings not valid json at" << parseError.errorString();
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -346,7 +345,7 @@ bool SituationReplayEditor::apply2()
|
||||
m_ui->lblDuration->setText(QStringLiteral(" - "));
|
||||
else
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " setText length = " << duration;
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " setText length = " << duration;
|
||||
m_ui->lblDuration->setText(tr("%1 sec").arg(m_topicDuration));
|
||||
}
|
||||
}
|
||||
@@ -464,7 +463,7 @@ void SituationReplayEditor::onMarkerSelected(const QModelIndex &idx)
|
||||
|
||||
if (marker.id() <= 0)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "marker has id 0";
|
||||
ERROR_LOG() << "marker has id 0";
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -478,13 +477,13 @@ void SituationReplayEditor::onMarkerSelected(const QModelIndex &idx)
|
||||
|
||||
void SituationReplayEditor::onChangesMade()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION;
|
||||
DEBUG_LOG() << Q_FUNC_INFO;
|
||||
|
||||
qint64 start = m_ui->dteStartTime->msecsSinceEpoch();
|
||||
qint64 end = m_ui->dteEndTime->msecsSinceEpoch();
|
||||
double speed = m_ui->sbSpeed->value();
|
||||
qint64 duration = calculateDuration(start, end, speed) / 1000;
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " duration = " << duration;
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " duration = " << duration;
|
||||
|
||||
if (duration < 0)
|
||||
m_ui->lblDuration->setText(QStringLiteral(" - "));
|
||||
@@ -494,7 +493,7 @@ void SituationReplayEditor::onChangesMade()
|
||||
m_topicData.duration = duration;
|
||||
m_ui->widget->previewer()->setTopicData(m_topicData);
|
||||
m_ui->lblDuration->setText(tr("%1 sec").arg(m_topicDuration));
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " setText duration = " << duration;
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " setText duration = " << duration;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
-2
@@ -81,8 +81,6 @@ private:
|
||||
bool m_firstUpdate{true};
|
||||
|
||||
Ui::SituationReplayEditor *m_ui{nullptr};
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user