lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
- 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
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptEditor/pre_script_dialog.cpp
+106 -107
View File
@@ -144,7 +144,6 @@ ScriptDialog::ScriptDialog(const QString &menuGroup, QWidget *parent)
, m_scriptRunning(false)
, m_bTimerTickRecursionGuard(false)
, m_isPlayTopicMethodStillRunning(false)
, m_logger(getLogger("ScriptDialogDialog"))
{
m_ui->setupUi(this);
@@ -310,7 +309,7 @@ void ScriptDialog::slotTrackEntryDeleted(const int topicId)
if (m_currentTopicEditor != nullptr && m_currentTopicEditor->topicId() == topicId)
{
ERROR_LOG(m_logger) << "slotTrackEntryDeleted" << topicId << "editor" << m_currentTopicEditor->topicId();
ERROR_LOG() << "slotTrackEntryDeleted" << topicId << "editor" << m_currentTopicEditor->topicId();
m_currentTopicEditor->deleteLater();
m_currentTopicEditor = nullptr;
}
@@ -348,7 +347,7 @@ void ScriptDialog::slotEditEntry(const int topicId)
}
}
ERROR_LOG(m_logger) << "could not find coresponding track entry with id " << topicId;
ERROR_LOG() << "could not find coresponding track entry with id " << topicId;
}
@@ -409,7 +408,7 @@ void ScriptDialog::startEssentialsViewStage2(const Core::ReplayPartition &replay
if (m_essentialsViewSession == nullptr)
{
WARNING_LOG(m_logger) << "no session for m_essentialsViewSession";
WARNING_LOG() << "no session for m_essentialsViewSession";
LtsWidgets::LtsMessageDialog::showMessage(this, tr("Essentials View was not properly initialized"), tr("Essentials View Session"));
m_essentialsViewApp->deleteLater();
m_essentialsViewApp = nullptr;
@@ -434,13 +433,13 @@ void ScriptDialog::startEssentialsViewStage2(const Core::ReplayPartition &replay
connect(m_essentialsViewSession, &LtsSession::LtsSession::destroyed, applyFilterPtr, [applyFilter]() { delete applyFilter; });
sitMapFilterIfc->setApplyFilter(applyFilter);
DEBUG_LOG(m_logger) << "set filter topic editor's flt ifc to essentials view's flt ifc";
DEBUG_LOG() << "set filter topic editor's flt ifc to essentials view's flt ifc";
}
else
WARNING_LOG(m_logger) << "cannot set filter topic editor's flt ifc to essentials view's flt ifc - cannot find topic editor";
WARNING_LOG() << "cannot set filter topic editor's flt ifc to essentials view's flt ifc - cannot find topic editor";
}
else
WARNING_LOG(m_logger) << "cannot set filter topic editor's flt ifc to essentials view's flt ifc - cannot find essentials view's flt ifc";
WARNING_LOG() << "cannot set filter topic editor's flt ifc to essentials view's flt ifc - cannot find essentials view's flt ifc";
}
@@ -459,13 +458,13 @@ void ScriptDialog::startEssentialsViewStage2(const Core::ReplayPartition &replay
sitMapFilterGuiIfc->setSitMapGuiIfc(nullptr);
});
DEBUG_LOG(m_logger) << "set sit map filter gui ifc's sit map gui ifc to essential view's sit map gui ifc";
DEBUG_LOG() << "set sit map filter gui ifc's sit map gui ifc to essential view's sit map gui ifc";
}
else
WARNING_LOG(m_logger) << "unable to initialize situation map filter gui plugin - sit map filter gui ifc";
WARNING_LOG() << "unable to initialize situation map filter gui plugin - sit map filter gui ifc";
}
else
WARNING_LOG(m_logger) << "unable to initialize situation map filter gui plugin - sit map gui ifc missing!";
WARNING_LOG() << "unable to initialize situation map filter gui plugin - sit map gui ifc missing!";
}
@@ -479,13 +478,13 @@ void ScriptDialog::startEssentialsViewStage2(const Core::ReplayPartition &replay
thisSrpGuiIfc->setSrpIfc(m_essentialsViewsSrpGuiIfc.get());
connect(m_essentialsViewSession, &LtsSession::LtsSession::destroyed, this, [thisSrpGuiIfc]() { thisSrpGuiIfc->setSrpIfc(nullptr); });
connect(m_essentialsViewSession, &LtsSession::LtsSession::signalClose, this, [this]() { m_essentialsViewsSrpGuiIfc = nullptr; });
DEBUG_LOG(m_logger) << "set srp gui ifc's srp gui ifc to essential view's srp gui ifc";
DEBUG_LOG() << "set srp gui ifc's srp gui ifc to essential view's srp gui ifc";
}
else
WARNING_LOG(m_logger) << "unable to initialize srp gui plugin - this srp gui ifc missing!";
WARNING_LOG() << "unable to initialize srp gui plugin - this srp gui ifc missing!";
}
else
WARNING_LOG(m_logger) << "unable to initialize srp gui plugin - essentials view's srp gui ifc missing!";
WARNING_LOG() << "unable to initialize srp gui plugin - essentials view's srp gui ifc missing!";
@@ -497,10 +496,10 @@ void ScriptDialog::startEssentialsViewStage2(const Core::ReplayPartition &replay
{
thisPlanOverlayGuiIfc->setForeignPlanOverlaysGuiIfc(essentialsViewPlanOverlaysGuiIfc.get());
connect(m_essentialsViewSession, &LtsSession::LtsSession::destroyed, this, [thisPlanOverlayGuiIfc]() { thisPlanOverlayGuiIfc->setForeignPlanOverlaysGuiIfc(nullptr); });
WARNING_LOG(m_logger) << "set this plan overlay's own gui ifc to essential view's plan overlays gui ifc";
WARNING_LOG() << "set this plan overlay's own gui ifc to essential view's plan overlays gui ifc";
}
else
WARNING_LOG(m_logger) << "unable to initialize plan overlays gui plugin - essential view's plan overlays gui ifc missing!";
WARNING_LOG() << "unable to initialize plan overlays gui plugin - essential view's plan overlays gui ifc missing!";
std::shared_ptr<SituationMap::ForeignGuiInterface> essentialsViewSitMapGuiIfc;
@@ -508,13 +507,13 @@ void ScriptDialog::startEssentialsViewStage2(const Core::ReplayPartition &replay
{
thisPlanOverlayGuiIfc->setForeignSitMapGuiIfc(essentialsViewSitMapGuiIfc.get());
connect(m_essentialsViewSession, &LtsSession::LtsSession::destroyed, this, [thisPlanOverlayGuiIfc]() { thisPlanOverlayGuiIfc->setForeignSitMapGuiIfc(nullptr); });
DEBUG_LOG(m_logger) << "set this plan overlay's sitMap gui ifc to essential view's sitMap gui ifc";
DEBUG_LOG() << "set this plan overlay's sitMap gui ifc to essential view's sitMap gui ifc";
}
else
WARNING_LOG(m_logger) << "unable to initialize sitMap gui plugin - essential view's sitMap gui ifc missing!";
WARNING_LOG() << "unable to initialize sitMap gui plugin - essential view's sitMap gui ifc missing!";
}
else
WARNING_LOG(m_logger) << "unable to initialize plan overlay gui plugin - this plan overlay gui ifc missing!";
WARNING_LOG() << "unable to initialize plan overlay gui plugin - this plan overlay gui ifc missing!";
@@ -522,10 +521,10 @@ void ScriptDialog::startEssentialsViewStage2(const Core::ReplayPartition &replay
if (m_essentialsViewSession->getForeignGuiInterface<BuildingViewer::ForeignGuiInterface>(bgvIfc))
{
bgvIfc->initTopicEditor();
DEBUG_LOG(m_logger) << "set bgv gui ifc's session";
DEBUG_LOG() << "set bgv gui ifc's session";
}
else
WARNING_LOG(m_logger) << "unable to set bgv gui ifc's session - essentials view's bgv ifc missing!";
WARNING_LOG() << "unable to set bgv gui ifc's session - essentials view's bgv ifc missing!";
});
}
@@ -568,7 +567,7 @@ void ScriptDialog::slotStartEssentialsView()
this, [this, replayId, t]()
{
int tries = t->property("tries").toInt();
INFO_LOG(m_logger) << "try # " << tries;
INFO_LOG() << "try # " << tries;
Core::ReplayPartition replay = m_coreDtc->replayPartition(replayId);
@@ -671,7 +670,7 @@ void ScriptDialog::slotSetTopicPosition(QWidget *previewWidget, int ignoreTopicF
if (thaRealTe == nullptr)
{
ERROR_LOG(m_logger) << "te not found: " << topicId;
ERROR_LOG() << "te not found: " << topicId;
return;
}
@@ -876,7 +875,7 @@ void ScriptDialog::getPresentationContent()
if (contentList.size() < 1)
{
WARNING_LOG(m_logger) << "No content for Script Id = " << m_scriptId;
WARNING_LOG() << "No content for Script Id = " << m_scriptId;
setUnchangeable(false);
return;
}
@@ -890,7 +889,7 @@ void ScriptDialog::getPresentationContent()
auto tea = m_trackEntryAssignments.constFind(QString::fromStdString(content.presentationTopicType()));
if (tea == m_trackEntryAssignments.constEnd())
{
ERROR_LOG(m_logger) << "Invalid content for type " << QString::fromStdString(content.presentationTopicType());
ERROR_LOG() << "Invalid content for type " << QString::fromStdString(content.presentationTopicType());
continue;
}
@@ -904,7 +903,7 @@ void ScriptDialog::getPresentationContent()
if (!m_ui->widget->addTopic(te))
{
WARNING_LOG(m_logger) << "couldn't load topic #" << te->m_topicId;
WARNING_LOG() << "couldn't load topic #" << te->m_topicId;
delete te;
}
}
@@ -921,13 +920,13 @@ void ScriptDialog::getPresentationContent()
m_requestHelper = new LtsUtils::RequestHelper(this);
DEBUG_LOG(m_logger) << "waiting for script content..";
DEBUG_LOG() << "waiting for script content..";
if (!m_requestHelper->startSingleRequest([this]()
{
return m_ftc->getPresentationContentRequest(GetPresentationContentRequest(m_scriptId), this);
}, handlePresentationContent))
{
ERROR_LOG(m_logger) << "Cannot retrieve Presentation Content for ScriptId = " << m_scriptId;
ERROR_LOG() << "Cannot retrieve Presentation Content for ScriptId = " << m_scriptId;
setUnchangeable(false);
}
@@ -1020,7 +1019,7 @@ void ScriptDialog::startReplaySession()
if (replayId < 1)
{
ERROR_LOG(m_logger) << "replayId < 1";
ERROR_LOG() << "replayId < 1";
initFailed(__LINE__);
return;
}
@@ -1059,7 +1058,7 @@ void ScriptDialog::startReplaySession()
if (rp.id() != replayId)
{
ERROR_LOG(m_logger) << "Script Player: replay ids do not match!!! cannot start app";
ERROR_LOG() << "Script Player: replay ids do not match!!! cannot start app";
initFailed(__LINE__);
return;
}
@@ -1069,7 +1068,7 @@ void ScriptDialog::startReplaySession()
if (m_replaySession == nullptr)
{
ERROR_LOG(m_logger) << "m_replaySession == nullptr";
ERROR_LOG() << "m_replaySession == nullptr";
initFailed(__LINE__);
return;
}
@@ -1093,11 +1092,11 @@ void ScriptDialog::startReplaySession()
QString result(resultList.join(QStringLiteral("<br> - ")));
if (r && !result.isEmpty())
WARNING_LOG(m_logger) << "At least one optional widget & control interface failed to load: " << result;
WARNING_LOG() << "At least one optional widget & control interface failed to load: " << result;
if (!r)
{
ERROR_LOG(m_logger) << "At least one widget & control interface failed to load: " << result;
ERROR_LOG() << "At least one widget & control interface failed to load: " << result;
initFailed(__LINE__);
return;
}
@@ -1116,7 +1115,7 @@ void ScriptDialog::startReplaySession()
m_requestHelper->deleteLater();
m_requestHelper = nullptr;
ERROR_LOG(m_logger) << "replayPartitionCreateRequest failed";
ERROR_LOG() << "replayPartitionCreateRequest failed";
initFailed(__LINE__);
};
@@ -1294,7 +1293,7 @@ void ScriptDialog::createSitMapApp()
if (m_sitMapApp == nullptr)
{
LtsSessionData::LtsSessionData::getInstance()->setDebugFlagValue(QStringLiteral("DoNotCreateInstant.ReplayControl"), oldFlagValue);
ERROR_LOG(m_logger) << "createApp returned nullptr for m_sitMapApp";
ERROR_LOG() << "createApp returned nullptr for m_sitMapApp";
initFailed(__LINE__);
return;
}
@@ -1352,7 +1351,7 @@ void ScriptDialog::createSitMapApp()
}
else
{
ERROR_LOG(m_logger) << "setting SitMapFilterIfc's SitMapPtr to this SitMapIfc failed, because the SitMapFilterIfc could not be found !!";
ERROR_LOG() << "setting SitMapFilterIfc's SitMapPtr to this SitMapIfc failed, because the SitMapFilterIfc could not be found !!";
initFailed(__LINE__);
return;
}
@@ -1367,14 +1366,14 @@ void ScriptDialog::createSitMapApp()
}
else
{
ERROR_LOG(m_logger) << "setting ReplayControlIfc's SitMapPtr to this SitMapIfc failed, because the ReplayControlIfc could not be found !!";
ERROR_LOG() << "setting ReplayControlIfc's SitMapPtr to this SitMapIfc failed, because the ReplayControlIfc could not be found !!";
initFailed(__LINE__);
return;
}
}
else
{
ERROR_LOG(m_logger) << "setting SitMapFilterIfc's SitMapPtr to this SitMapIfc failed, because the SitMapIfc could not be found !!";
ERROR_LOG() << "setting SitMapFilterIfc's SitMapPtr to this SitMapIfc failed, because the SitMapIfc could not be found !!";
initFailed(__LINE__);
return;
}
@@ -1398,23 +1397,23 @@ void ScriptDialog::createSitMapApp()
if (m_replaySession->getForeignGuiInterface<SituationMap::ScriptFilterForeignGuiInterface>(sitMapFilterGuiIfc))
{
sitMapFilterGuiIfc->setApplyFilter(applyFilter);
DEBUG_LOG(m_logger) << "set sit map filter ifc's apply filter";
DEBUG_LOG() << "set sit map filter ifc's apply filter";
}
else
WARNING_LOG(m_logger) << "cannot set sit map filter ifc's apply filter - cannot find filter topic's ifc";
WARNING_LOG() << "cannot set sit map filter ifc's apply filter - cannot find filter topic's ifc";
std::shared_ptr<SituationReplay::ForeignGuiInterface> sitRepIfc;
if (m_replaySession->getForeignGuiInterface<SituationReplay::ForeignGuiInterface>(sitRepIfc))
{
sitRepIfc->setApplyFilter(applyFilter);
DEBUG_LOG(m_logger) << "set sit replay ifc's apply filter";
DEBUG_LOG() << "set sit replay ifc's apply filter";
}
else
WARNING_LOG(m_logger) << "cannot set sit replay ifc's apply filter - cannot find filter topic's ifc";
WARNING_LOG() << "cannot set sit replay ifc's apply filter - cannot find filter topic's ifc";
}
else
WARNING_LOG(m_logger) << "cannot set sit map filter ifc's apply filter - cannot find map's flt ifc";
WARNING_LOG() << "cannot set sit map filter ifc's apply filter - cannot find map's flt ifc";
}
@@ -1430,14 +1429,14 @@ void ScriptDialog::createSitMapApp()
}
else
{
DEBUG_LOG(m_logger) << "setting planOverlayIfc's SitMapPtr to this SitMapIfc failed, because the SitMapIfc could not be found !!";
DEBUG_LOG() << "setting planOverlayIfc's SitMapPtr to this SitMapIfc failed, because the SitMapIfc could not be found !!";
initFailed(__LINE__);
return;
}
}
else
{
DEBUG_LOG(m_logger) << "setting planOverlayIfc's SitMapPtr to this SitMapIfc failed, because the SitMapFilterIfc could not be found !!";
DEBUG_LOG() << "setting planOverlayIfc's SitMapPtr to this SitMapIfc failed, because the SitMapFilterIfc could not be found !!";
initFailed(__LINE__);
return;
}
@@ -1452,14 +1451,14 @@ void ScriptDialog::createSitMapApp()
thisMrkIfc->setScriptsMrkIfc(sitMapMrkIfc.get());
else
{
DEBUG_LOG(m_logger) << "setting mrkIfc redirection failed - sitMap mrkIfc not found !";
DEBUG_LOG() << "setting mrkIfc redirection failed - sitMap mrkIfc not found !";
initFailed(__LINE__);
return;
}
}
else
{
DEBUG_LOG(m_logger) << "setting mrkIfc redirection failed - this mrkIfc not found !";
DEBUG_LOG() << "setting mrkIfc redirection failed - this mrkIfc not found !";
initFailed(__LINE__);
return;
}
@@ -1472,7 +1471,7 @@ void ScriptDialog::createSitMapApp()
}
else
{
ERROR_LOG(m_logger) << "could not start situation map app !!";
ERROR_LOG() << "could not start situation map app !!";
initFailed(__LINE__);
return;
}
@@ -1480,7 +1479,7 @@ void ScriptDialog::createSitMapApp()
}
else
{
ERROR_LOG(m_logger) << "Failed to start Situation App!";
ERROR_LOG() << "Failed to start Situation App!";
initFailed(__LINE__);
return;
}
@@ -1609,7 +1608,7 @@ bool ScriptDialog::apply()
return false;
else
{
ERROR_LOG(m_logger) << "Creating a copy of script " << m_scriptId;
ERROR_LOG() << "Creating a copy of script " << m_scriptId;
m_scriptId = 0;
name = tr("Copy of ")+ name;
}
@@ -1771,7 +1770,7 @@ int ScriptDialog::nextTopicTime() const
auto nextTopicIter = topicMap.upperBound(m_positionTime);
if (nextTopicIter == topicMap.constEnd())
{
DEBUG_LOG(m_logger) << "There is no next topic!";
DEBUG_LOG() << "There is no next topic!";
return -1;
}
@@ -1807,7 +1806,7 @@ void ScriptDialog::slotPlayUntilNextTopic()
if (topicTime < 0)
{
DEBUG_LOG(m_logger) << "There is no next topic to play until!";
DEBUG_LOG() << "There is no next topic to play until!";
return;
}
@@ -1819,7 +1818,7 @@ int ScriptDialog::previousTopicTime() const
{
if (m_topicMap.isEmpty())
{
DEBUG_LOG(m_logger) << "There are no topics while checking for previous topic!";
DEBUG_LOG() << "There are no topics while checking for previous topic!";
return -1;
}
@@ -1839,7 +1838,7 @@ int ScriptDialog::previousTopicTime() const
if (prevTopicIter == topicMap.constBegin())
{
DEBUG_LOG(m_logger) << "There is no previous topic! (1)";
DEBUG_LOG() << "There is no previous topic! (1)";
return -1;
}
@@ -1847,7 +1846,7 @@ int ScriptDialog::previousTopicTime() const
if (prevTopicIter == topicMap.constEnd())
{
DEBUG_LOG(m_logger) << "There is no previous topic! (2)";
DEBUG_LOG() << "There is no previous topic! (2)";
return -1;
}
@@ -1899,7 +1898,7 @@ Screen *ScriptDialog::getProjectionWidget(const ScriptDialog::ProjectionWidget &
ScriptDialog::ProjectionWidget ScriptDialog::identifyProjectionWidget(TrackEntry *topic) const
{
DEBUG_LOG(m_logger) << "identifyProjectionWidget: channel name: " << topic->m_channelName << ", filter parent channel name: " << topic->m_filterParentChannel;
DEBUG_LOG() << "identifyProjectionWidget: channel name: " << topic->m_channelName << ", filter parent channel name: " << topic->m_filterParentChannel;
if (topic->m_channelName == QStringLiteral("Screen 2"))
return ProjectionWidget::Screen2;
@@ -1938,7 +1937,7 @@ bool ScriptDialog::_tryAddTopic(TrackEntryType trackEntryType,
{
if (!ta.m_topicEditorIfc->initTopicEditor())
{
ERROR_LOG(m_logger) << "Cannot add topic type " << typeName << " since 'initTopicEditor' failed";
ERROR_LOG() << "Cannot add topic type " << typeName << " since 'initTopicEditor' failed";
resultList.append(typeName);
return false;
}
@@ -2018,14 +2017,14 @@ void ScriptDialog::setReplayWidgetPosition(PlayingTopic *playingTopic)
if (projectionWidget == nullptr)
{
ERROR_LOG(m_logger) << "screen for topic #" << playingTopic->topic->m_topicId << " not found";
ERROR_LOG() << "screen for topic #" << playingTopic->topic->m_topicId << " not found";
return;
}
int projectionWidth = projectionWidget->width();
int projectionHeight = projectionWidget->height();
DEBUG_LOG(m_logger) << "projection w: " << projectionWidth << ", h: " << projectionHeight;
DEBUG_LOG() << "projection w: " << projectionWidth << ", h: " << projectionHeight;
TrackEntry *topic = playingTopic->topic;
@@ -2049,7 +2048,7 @@ void ScriptDialog::setReplayWidgetPosition(PlayingTopic *playingTopic)
if (replayWidget == nullptr)
{
WARNING_LOG(m_logger) << "no replay widget for topic" << topic->m_topicId;
WARNING_LOG() << "no replay widget for topic" << topic->m_topicId;
return;
}
@@ -2058,7 +2057,7 @@ void ScriptDialog::setReplayWidgetPosition(PlayingTopic *playingTopic)
|| (topic->x < 0 || topic->w < 0 || topic->y < 0 || topic->h < 0))
{
replayWidget->setGeometry(x, y, projectionWidth, projectionHeight);
ERROR_LOG(m_logger) << "set geo of replay widget !! #1 x" << x << "y" << y;
ERROR_LOG() << "set geo of replay widget !! #1 x" << x << "y" << y;
}
else
{
@@ -2070,7 +2069,7 @@ void ScriptDialog::setReplayWidgetPosition(PlayingTopic *playingTopic)
replayWidget->setGeometry(x + qRound(projectionX), y + qRound(projectionY), qRound(projectionW), qRound(projectionH));
}
DEBUG_LOG(m_logger) << "final widget geo: " << replayWidget->geometry().x()
DEBUG_LOG() << "final widget geo: " << replayWidget->geometry().x()
<< ", " << replayWidget->geometry().y()
<< ", " << replayWidget->geometry().width()
<< ", " << replayWidget->geometry().height();
@@ -2090,7 +2089,7 @@ void ScriptDialog::setReplayWidgetFreestanding(PlayingTopic *playingTopic, bool
if (projectionWidget == nullptr)
{
ERROR_LOG(m_logger) << "screen for topic #" << playingTopic->topic->m_topicId << " not found";
ERROR_LOG() << "screen for topic #" << playingTopic->topic->m_topicId << " not found";
return;
}
@@ -2146,7 +2145,7 @@ void ScriptDialog::avsVisibilityHack(QWidget *parentForScreen, bool visible)
QPoint pos(m_currentTopicDesigner->parentWidget()->mapToGlobal(geo.topLeft()));
widget->setGeometry(QRect(pos, s));
ERROR_LOG(m_logger) << "geo x" << widget->geometry().x() << "geo y" << widget->geometry().y() << "geo h" << widget->geometry().height() << "geo w" << widget->geometry().width();
ERROR_LOG() << "geo x" << widget->geometry().x() << "geo y" << widget->geometry().y() << "geo h" << widget->geometry().height() << "geo w" << widget->geometry().width();
widget->setWindowFlags(Qt::FramelessWindowHint);
@@ -2175,7 +2174,7 @@ void ScriptDialog::avsVisibilityHack(QWidget *parentForScreen, bool visible)
m_currentTopicDesigner->setParent(widget);
m_currentTopicDesigner->show();
ERROR_LOG(m_logger) << "made freestanding";
ERROR_LOG() << "made freestanding";
}
}
@@ -2220,7 +2219,7 @@ void ScriptDialog::setFreestanding(bool freestanding, const ProjectionWidget &pw
case ProjectionWidget::Unknown:
{
ERROR_LOG(m_logger) << "trying to set freestanding with unknown projection widget - cannot set freestanding";
ERROR_LOG() << "trying to set freestanding with unknown projection widget - cannot set freestanding";
return;
}
}
@@ -2244,7 +2243,7 @@ bool ScriptDialog::isScreenFreestanding(const ProjectionWidget &pw) const
case ProjectionWidget::Screen2:
return m_currentlyFreestandingTopicsScreen2;
case ProjectionWidget::Unknown:
ERROR_LOG(m_logger) << "projection widget unknown";
ERROR_LOG() << "projection widget unknown";
return false;
}
return true;
@@ -2287,7 +2286,7 @@ void ScriptDialog::addReplayWidget(PlayingTopic *playingTopic, QWidget *replayWi
case ProjectionWidget::Unknown:
{
ERROR_LOG(m_logger) << "projection widget unknown - cannot add replay widget";
ERROR_LOG() << "projection widget unknown - cannot add replay widget";
return;
}
}
@@ -2306,7 +2305,7 @@ bool ScriptDialog::enableFireEventFlash(bool enable)
if (m_sitMapSession->getForeignGuiInterface<SituationMap::ForeignGuiInterface>(sitMapIfc))
success = sitMapIfc->enableFireEventFlashing(enable);
else
WARNING_LOG(m_logger) << LOGFUNCTION << " Cannot execute enableFireEventFlashing with enable=" << enable;
WARNING_LOG() << Q_FUNC_INFO << " Cannot execute enableFireEventFlashing with enable=" << enable;
return success;
}
@@ -2339,11 +2338,11 @@ void ScriptDialog::playTopic(TrackEntry *topic)
for (const TopicAssignment &ta : std::as_const(m_trackEntryAssignments))
{
DEBUG_LOG(m_logger) << LOGFUNCTION << " ta.m_topicName = " << ta.m_topicName;
DEBUG_LOG() << Q_FUNC_INFO << " ta.m_topicName = " << ta.m_topicName;
if (topic->m_type == ta.m_trackEntryType)
{
DEBUG_LOG(m_logger) << LOGFUNCTION << " createInterface";
DEBUG_LOG() << Q_FUNC_INFO << " createInterface";
playingTopic->topicTypeName = ta.m_topicName;
playingTopic->trackEntryType = ta.m_trackEntryType;
@@ -2353,17 +2352,17 @@ void ScriptDialog::playTopic(TrackEntry *topic)
if (playingTopic->topicTypeName.isEmpty() || playingTopic->topicReplayIfc == nullptr)
{
WARNING_LOG(m_logger) << "Topic could not be assigned!! type name: " << playingTopic->topicTypeName << "replay ifc: " << (void *)playingTopic->topicReplayIfc;
WARNING_LOG() << "Topic could not be assigned!! type name: " << playingTopic->topicTypeName << "replay ifc: " << (void *)playingTopic->topicReplayIfc;
return;
}
DEBUG_LOG(m_logger) << LOGFUNCTION << " playingTopic->trackEntryType " << playingTopic->trackEntryType;
DEBUG_LOG() << Q_FUNC_INFO << " playingTopic->trackEntryType " << playingTopic->trackEntryType;
if (playingTopic->trackEntryType == TrackEntryType::SituationMap ||
playingTopic->trackEntryType == TrackEntryType::Situation)
{
DEBUG_LOG(m_logger) << LOGFUNCTION << " addReplayWidget";
DEBUG_LOG() << Q_FUNC_INFO << " addReplayWidget";
m_sitMapSession->baseLayout()->setAutoFillBackground(true);
addReplayWidget(playingTopic, m_sitMapSession->baseLayout());
@@ -2371,33 +2370,33 @@ void ScriptDialog::playTopic(TrackEntry *topic)
if (sitMapIfc || m_sitMapSession->getForeignGuiInterface<SituationMap::ForeignGuiInterface>(sitMapIfc))
sitMapIfc->forceUpdate();
else
WARNING_LOG(m_logger) << "Cannot force update on Situation Map - map might be stuck!";
WARNING_LOG() << "Cannot force update on Situation Map - map might be stuck!";
if (playingTopic->trackEntryType == TrackEntryType::Situation)
{
DEBUG_LOG(m_logger) << LOGFUNCTION << " Situation -> ENable FireEventFlashing";
DEBUG_LOG() << Q_FUNC_INFO << " Situation -> ENable FireEventFlashing";
if (!enableFireEventFlash(true))
WARNING_LOG(m_logger) << LOGFUNCTION << " Cannot enableFireEventFlashing at Situation Map";
WARNING_LOG() << Q_FUNC_INFO << " Cannot enableFireEventFlashing at Situation Map";
}
}
else
{
DEBUG_LOG(m_logger) << LOGFUNCTION << " non-sitmap";
DEBUG_LOG() << Q_FUNC_INFO << " non-sitmap";
if (playingTopic->trackEntryType == TrackEntryType::Snapshot)
{
DEBUG_LOG(m_logger) << LOGFUNCTION << " Snapshot -> DISable FireEventFlashing";
DEBUG_LOG() << Q_FUNC_INFO << " Snapshot -> DISable FireEventFlashing";
if (!enableFireEventFlash(false))
WARNING_LOG(m_logger) << LOGFUNCTION << " Cannot disableFireEventFlashing at Situation Map";
WARNING_LOG() << Q_FUNC_INFO << " Cannot disableFireEventFlashing at Situation Map";
}
else if (playingTopic->trackEntryType == TrackEntryType::SituationReplay)
{
DEBUG_LOG(m_logger) << LOGFUNCTION << " SituationReplay -> ENable FireEventFlashing";
DEBUG_LOG() << Q_FUNC_INFO << " SituationReplay -> ENable FireEventFlashing";
if (!enableFireEventFlash(true))
WARNING_LOG(m_logger) << LOGFUNCTION << " Cannot enableFireEventFlashing at Situation Map";
WARNING_LOG() << Q_FUNC_INFO << " Cannot enableFireEventFlashing at Situation Map";
}
@@ -2425,14 +2424,14 @@ void ScriptDialog::playTopic(TrackEntry *topic)
}
}
else
WARNING_LOG(m_logger) << "topic #" << playingTopic->topic->m_topicId << " has no widget to show on presentation screen";
WARNING_LOG() << "topic #" << playingTopic->topic->m_topicId << " has no widget to show on presentation screen";
}
if (topic->m_detailData.isEmpty())
{
WARNING_LOG(m_logger) << "Note: Topic id " << topic->m_topicId << " has no JSON data";
WARNING_LOG() << "Note: Topic id " << topic->m_topicId << " has no JSON data";
}
@@ -2448,7 +2447,7 @@ void ScriptDialog::playTopic(TrackEntry *topic)
if (!playingTopic->topicReplayIfc->playbackInit(obj))
{
WARNING_LOG(m_logger) << "Playing topic # " << topic->m_topicId << " playback init failed! Playback of this topic failed!";
WARNING_LOG() << "Playing topic # " << topic->m_topicId << " playback init failed! Playback of this topic failed!";
return;
}
@@ -2466,9 +2465,9 @@ void ScriptDialog::playTopic(TrackEntry *topic)
});
}
DEBUG_LOG(m_logger) << "playbackStart at offset" << m_positionTime - topic->m_startTime;
DEBUG_LOG() << "playbackStart at offset" << m_positionTime - topic->m_startTime;
if (!playingTopic->topicReplayIfc->playbackStart(m_positionTime - topic->m_startTime ))
WARNING_LOG(m_logger) << "Playing topic # " << topic->m_topicId << " playback start failed! Playback of this topic failed!";
WARNING_LOG() << "Playing topic # " << topic->m_topicId << " playback start failed! Playback of this topic failed!";
m_journal.journalList.append(new NextTopicJournal(m_positionTime, playingTopic->isFilter, playingTopic->topicTypeName, topic->m_length));
}
@@ -2560,7 +2559,7 @@ void ScriptDialog::slotTimerTick()
if (m_positionTime >= topic->m_startTime && m_positionTime < (topic->m_startTime + topic->m_length))
{
DEBUG_LOG(m_logger) << "Playing topic id " << topic->m_topicId << " with description " << topic->m_description;
DEBUG_LOG() << "Playing topic id " << topic->m_topicId << " with description " << topic->m_description;
playTopic(topic);
}
}
@@ -2592,7 +2591,7 @@ void ScriptDialog::slotTimerTick()
int realFilterTime = filterTe->m_startTime;
if (m_positionTime >= (realFilterTime + 1) && m_positionTime <= (realFilterTime + filterTe->m_length))
{
DEBUG_LOG(m_logger) << "Playing filter topic id " << filterTe->m_topicId << " with description " << filterTe->m_description;
DEBUG_LOG() << "Playing filter topic id " << filterTe->m_topicId << " with description " << filterTe->m_description;
playTopic(filterTe);
@@ -2721,10 +2720,10 @@ void ScriptDialog::slotPlay()
{
if (playingTopic->topicReplayIfc != nullptr && m_ignoreTopicForReplay != playingTopic->topic->m_topicId)
{
DEBUG_LOG(m_logger) << "playbackStart (resume) at offset" << m_positionTime - playingTopic->topic->m_startTime;
DEBUG_LOG() << "playbackStart (resume) at offset" << m_positionTime - playingTopic->topic->m_startTime;
if (!playingTopic->topicReplayIfc->playbackStart(m_positionTime - playingTopic->topic->m_startTime
))
WARNING_LOG(m_logger) << "Playing topic # " << playingTopic->topic->m_topicId << " playback start failed! Re-playback of this topic failed!";
WARNING_LOG() << "Playing topic # " << playingTopic->topic->m_topicId << " playback start failed! Re-playback of this topic failed!";
}
@@ -2732,15 +2731,15 @@ void ScriptDialog::slotPlay()
if (playingTopic->trackEntryType == TrackEntryType::Snapshot)
{
DEBUG_LOG(m_logger) << LOGFUNCTION << " Snapshot -> DISable FireEventFlashing";
DEBUG_LOG() << Q_FUNC_INFO << " Snapshot -> DISable FireEventFlashing";
if (!enableFireEventFlash(false))
WARNING_LOG(m_logger) << LOGFUNCTION << " Cannot disableFireEventFlashing at Situation Map";
WARNING_LOG() << Q_FUNC_INFO << " Cannot disableFireEventFlashing at Situation Map";
}
else if (playingTopic->trackEntryType == TrackEntryType::SituationReplay)
{
DEBUG_LOG(m_logger) << LOGFUNCTION << " Snapshot -> ENable FireEventFlashing";
DEBUG_LOG() << Q_FUNC_INFO << " Snapshot -> ENable FireEventFlashing";
if (!enableFireEventFlash(true))
WARNING_LOG(m_logger) << LOGFUNCTION << " Cannot enableFireEventFlashing at Situation Map";
WARNING_LOG() << Q_FUNC_INFO << " Cannot enableFireEventFlashing at Situation Map";
}
@@ -2793,7 +2792,7 @@ void ScriptDialog::slotPause()
if (m_sitMapSession->getForeignGuiInterface<SituationMap::ForeignGuiInterface>(sitMapIfc))
sitMapIfc->enableFireEventFlashing(false);
else
WARNING_LOG(m_logger) << "Cannot update sit map fire event flashing";
WARNING_LOG() << "Cannot update sit map fire event flashing";
}
@@ -2848,7 +2847,7 @@ void ScriptDialog::stop(bool ended, bool ignoreFireEventFlashing)
if (m_sitMapSession->getForeignGuiInterface<SituationMap::ForeignGuiInterface>(sitMapIfc))
sitMapIfc->enableFireEventFlashing(true);
else
WARNING_LOG(m_logger) << "Cannot update sit map fire event flashing";
WARNING_LOG() << "Cannot update sit map fire event flashing";
}
}
@@ -2867,7 +2866,7 @@ void ScriptDialog::pausePlayingTopics()
{
if (playingTopic->topicReplayIfc != nullptr)
{
DEBUG_LOG(m_logger) << "Pause topic: " << playingTopic->topicTypeName;
DEBUG_LOG() << "Pause topic: " << playingTopic->topicTypeName;
playingTopic->topicReplayIfc->playbackPause();
QString status = tr("Currently paused topic '%1' %2")
@@ -2876,7 +2875,7 @@ void ScriptDialog::pausePlayingTopics()
m_ui->lwStatus->addItem(status);
}
else
DEBUG_LOG(m_logger) << "Topic not paused: " << playingTopic->topicTypeName;
DEBUG_LOG() << "Topic not paused: " << playingTopic->topicTypeName;
}
}
@@ -2935,7 +2934,7 @@ void ScriptDialog::initProjectionWidget(Screen **pointerToWidgetPointer)
{
if (static_cast<QObject *>(*pointerToWidgetPointer) == sender())
*pointerToWidgetPointer = nullptr;
INFO_LOG(m_logger) << "a projection windows was destroyed";
INFO_LOG() << "a projection windows was destroyed";
});
*pointerToWidgetPointer = projWindow;
@@ -2952,7 +2951,7 @@ void ScriptDialog::fillTopicVector()
for (const LtsScriptTimeline::TrackEntry *trackEntry : std::as_const(m_topicVector))
{
DEBUG_LOG(m_logger) << "m_topicVector index=" << trackEntry->index
DEBUG_LOG() << "m_topicVector index=" << trackEntry->index
<< " topicId=" << trackEntry->m_topicId
<< " type=" << trackEntry->m_type;
@@ -2976,7 +2975,7 @@ void ScriptDialog::fillTopicVector()
for (const FilterTopic &filterTopic : std::as_const(m_filterTopicVector))
{
const LtsScriptTimeline::TrackEntry *trackEntry = filterTopic.filterTopic;
DEBUG_LOG(m_logger) << "m_filterTopicVector mainTopicId=" << filterTopic.mainTopicId
DEBUG_LOG() << "m_filterTopicVector mainTopicId=" << filterTopic.mainTopicId
<< " index=" << trackEntry->index
<< " topicId=" << trackEntry->m_topicId
<< " type=" << trackEntry->m_type
@@ -3092,7 +3091,7 @@ void ScriptDialog::exportPresentationContent(const Core::FunctionReply &baseRepl
if (contentList.size() < 1)
{
ERROR_LOG(m_logger) << "No Presentation Content for Script Id " << reply.id();
ERROR_LOG() << "No Presentation Content for Script Id " << reply.id();
LtsWidgets::LtsMessageDialog::showMessage(this, tr("No presentation content, nothing to export!"));
return;
}
@@ -3107,7 +3106,7 @@ void ScriptDialog::exportPresentationContent(const Core::FunctionReply &baseRepl
if (!topicStringToType(QString::fromStdString(content.presentationTopicType()), tet) || tet == TrackEntryType::INVALID)
{
ERROR_LOG(m_logger) << "Topic ignored at export - invalid topic type for presentation's content id " << content.id();
ERROR_LOG() << "Topic ignored at export - invalid topic type for presentation's content id " << content.id();
continue;
}
#ifndef EXPORT_BDV_TOPIC_AS_JSON
@@ -3133,7 +3132,7 @@ void ScriptDialog::exportPresentationContent(const Core::FunctionReply &baseRepl
eVSession()->baseLayout()->focusTab(pBaseGuiIfc->menuGroup(), QStringLiteral("bdvShowBdv"), LtsWidgets::LayoutArea::eMainTab);
}
else
ERROR_LOG(m_logger) << "Fetching ForeignGuiInterface of BuildingViewer failed!";
ERROR_LOG() << "Fetching ForeignGuiInterface of BuildingViewer failed!";
}
@@ -3245,7 +3244,7 @@ void ScriptDialog::slotLoadScript()
std::shared_ptr<OperatorManagement::Interface::Dtc> opmDtc;
if (!m_exerciseSession->getDtc<OperatorManagement::DataInterface>(opmDtc))
{
ERROR_LOG(m_logger) << "opm dtc missing for script chooser ...";
ERROR_LOG() << "opm dtc missing for script chooser ...";
return;
}
@@ -3298,7 +3297,7 @@ void ScriptDialog::slotExportScript()
return;
QString exportPath = TakeHomePackageGenerator::ExportProcess::exportPath(m_exerciseSession->exerciseId()) + QString::number(m_scriptId);
DEBUG_LOG(m_logger) << "exportPath: " << exportPath;
DEBUG_LOG() << "exportPath: " << exportPath;
QDir dir(exportPath);
if (!dir.exists())
@@ -3316,7 +3315,7 @@ void ScriptDialog::slotExportScript()
if (dir.exists() && !dir.isEmpty())
{
INFO_LOG(m_logger) << "slotExportScript: dir.exists() && !dir.isEmpty()" ;
INFO_LOG() << "slotExportScript: dir.exists() && !dir.isEmpty()" ;
LtsWidgets::Button button = LtsWidgets::LtsMessageDialog::showMessage(this,
tr("Specified folder already exists and is not empty. Do you want to overwrite this folder?"),
tr("Information: %1").arg(dir.absolutePath()),
qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptEditor/pre_script_dialog.h
+2 -5
View File
@@ -226,7 +226,7 @@ private:
if (!m_exerciseSession->interfaceFromGui<TopicEditorInterface>(topicEditorIfc))
{
ERROR_LOG(m_logger) << "getTopicEditorIfc failed: Cannot add topic type "
ERROR_LOG() << "getTopicEditorIfc failed: Cannot add topic type "
<< LtsScriptTimeline::trackEntryTypeName(trackEntryType)
<< " because topic editor ifc is missing.";
return nullptr;
@@ -243,7 +243,7 @@ private:
if (!m_replaySession->interfaceFromGui<TopicReplayInterface>(topicReplayFactory))
{
ERROR_LOG(m_logger) << "getTopicIfcFactory failed: Cannot add topic type "
ERROR_LOG() << "getTopicIfcFactory failed: Cannot add topic type "
<< LtsScriptTimeline::trackEntryTypeName(trackEntryType)
<< " because topic ifc factory is missing.";
return nullptr;
@@ -358,9 +358,6 @@ private:
bool m_scriptRunning;
bool m_bTimerTickRecursionGuard;
bool m_isPlayTopicMethodStillRunning;
LOGGER_T m_logger;
private slots:
void slotEditEntry(const int topicId);
void slotTrackEntrySelectionChanged(LtsScriptTimeline::TrackEntry *);