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

Complete Qt6 migration: full clean build green across groups G1-G12 incl. runtime plugin set

Browse Source 
new_docker_build.sh gains Group 12 (212 GUI/Data plugins); fixes LtsUtilsGuiDds visibility (LTO-stripped exports), LtsProjectionWorkstation unity name shadow, 6 unity-off dirs (dup file-scope statics, ddsftc INTERFACE sources) and reconfigures BUILD_FILTERMANAGEMENT/BUILD_PLUGINS_SERVICEMONITOR=ON
This commit is contained in:
berrux-dev committed 2026-10-20 09:36:57 +02:00
1 parent 2b957d1edb
commit 598fc2560e
1718 files changed
+126739 -18495
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/TopicEditor/evl_topic_editor_model.cpp
+18 -17
View File
@@ -1,6 +1,7 @@
#include "evl_topic_editor_model.h"
#include <NGLLogger/NGLLoggerBootstrap.h>
#include <Evaluations/evl_translation.h>
#include <QtCore/QDateTime>
@@ -11,9 +12,9 @@ namespace Evaluations
{
TopicEditorEvaluationModel::TopicEditorEvaluationModel(QObject* parent)
: NGLTreeModel(parent, new NGLTreeItem(QVariant()), ,
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()){tr("Id"), tr("Name"), tr("Weight"), tr("Start Time"),
tr("Situation"), tr("Video"), tr("Audio")})
: NGLTreeModel(parent, new NGLTreeItem(QVariant()), {tr("Id"), tr("Name"), tr("Weight"), tr("Start Time"),
tr("Situation"), tr("Video"), tr("Audio")})
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
{
}
@@ -57,15 +58,15 @@ QVariant TopicEditorEvaluationModel::data(const QModelIndex& index, int role) co
switch (index.column())
{
case NAME:
return QString::fromStdString(crt.name());
return QString::fromStdString(crt.name);
case ID:
return crt.id();
return crt.id;
default:
break;
}
}
else if (role == Qt::UserRole)
return crt.id();
return crt.id;
}
else if (item->data().canConvert<Evaluations::EvaluationElement>())
{
@@ -77,23 +78,23 @@ QVariant TopicEditorEvaluationModel::data(const QModelIndex& index, int role) co
switch (index.column())
{
case ID:
return elem.id();
return elem.id;
case NAME:
return QString::fromStdString(elem.note());
return QString::fromStdString(elem.note);
case WEIGHT:
return elem.rating();
return elem.rating;
case SITUATION:
return elem.situation() ? tr("Yes") : tr("No");
return elem.situation ? tr("Yes") : tr("No");
case AUDIO:
return elem.audio() ? tr("Yes") : tr("No");
return elem.audio ? tr("Yes") : tr("No");
case VIDEO:
return elem.video() ? tr("Yes") : tr("No");
return elem.video ? tr("Yes") : tr("No");
case START_TIME:
return QDateTime::fromMSecsSinceEpoch(elem.timestamp());
return QDateTime::fromMSecsSinceEpoch(elem.timestamp);
}
}
else if (role == Qt::UserRole)
return elem.id();
return elem.id;
}
return QVariant();
}
@@ -132,7 +133,7 @@ bool TopicEditorEvaluationModel::initModel(const std::shared_ptr<Interface::Dtc>
int parentId = 0;
EvaluationCriterium crit = iter.value();
if (crit.operatorId() != operatorId)
if (crit.operatorId != operatorId)
continue;
if (!parentItemIndexCache.contains(parentId))
@@ -157,7 +158,7 @@ bool TopicEditorEvaluationModel::initModel(const std::shared_ptr<Interface::Dtc>
iter2 != elemMap.constEnd(); ++iter2)
{
Evaluations::EvaluationElement elem = iter2.value();
if (elem.criteriumId() != criteriumId)
if (elem.criteriumId != criteriumId)
continue;
parentId = criteriumId + 10000;
@@ -175,7 +176,7 @@ bool TopicEditorEvaluationModel::initModel(const std::shared_ptr<Interface::Dtc>
QVariant data;
data.setValue(elem);
onInsertRow(rowPos, pIndex, data);
int elementId = elem.id();
int elementId = elem.id;
parentItemIndexCache.insert(elementId, index(rowPos, 0, pIndex));
DEBUG_LOG(m_logger) << "Added to tree (element id, parent id) : (" << elementId << ", " << parentId
<< ")";
qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/TopicEditor/topic_editor.cpp
+33 -31
View File
@@ -1,6 +1,7 @@
#include "topic_editor.h"
#include <NGLLogger/NGLLoggerBootstrap.h>
#include "ui_topic_editor.h"
@@ -19,6 +20,7 @@ namespace Evaluations
EvaluationTopicEditor::EvaluationTopicEditor(LtsSession::LtsSession* session, QWidget* parent)
: TopicEditorBase::TopicEditor(parent), m_session(session), m_ui(new Ui::EvaluationTopicEditor)
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
{
m_ui->setupUi(this);
init(m_ui->widget);
@@ -81,12 +83,12 @@ void EvaluationTopicEditor::updateInternalData()
m_ui->cbxOperator->setCurrentIndex(m_ui->cbxOperator->findData(m_operatorId));
m_model->initModel(m_evlDtc, m_operatorId);
m_evlElement.id(getTopicDataValue(QStringLiteral("elementId")).toDouble());
DEBUG_LOG(m_logger) << "element id = " << m_evlElement.id();
m_evlElement.timestamp(getTopicDataValue(QStringLiteral("start")).toDouble());
m_evlElement.situation(getTopicDataValue(QStringLiteral("situation")).toBool());
m_evlElement.audio(getTopicDataValue(QStringLiteral("audio")).toBool());
m_evlElement.video(getTopicDataValue(QStringLiteral("video")).toBool());
m_evlElement.id = getTopicDataValue(QStringLiteral("elementId")).toDouble();
DEBUG_LOG(m_logger) << "element id = " << m_evlElement.id;
m_evlElement.timestamp = getTopicDataValue(QStringLiteral("start")).toDouble();
m_evlElement.situation = getTopicDataValue(QStringLiteral("situation")).toBool();
m_evlElement.audio = getTopicDataValue(QStringLiteral("audio")).toBool();
m_evlElement.video = getTopicDataValue(QStringLiteral("video")).toBool();
selectElement();
}
@@ -100,8 +102,8 @@ void EvaluationTopicEditor::selectElement()
{
QModelIndex idx;
QItemSelectionModel* selectionModel = m_ui->trvEvaluations->selectionModel();
if (m_evlElement.id() > 0)
idx = m_model->getIndex(m_evlElement.id());
if (m_evlElement.id > 0)
idx = m_model->getIndex(m_evlElement.id);
if (idx.isValid())
selectionModel->setCurrentIndex(idx, QItemSelectionModel::SelectCurrent | QItemSelectionModel::Rows);
else
@@ -123,7 +125,7 @@ void EvaluationTopicEditor::initOperatorComboBox()
auto it =
std::find_if(evaluationCriteria.constBegin(), evaluationCriteria.constEnd(),
[this, operatorId](const EvaluationCriterium& ec) { return ec.operatorId() == operatorId; });
[this, operatorId](const EvaluationCriterium& ec) { return ec.operatorId == operatorId; });
if (it == evaluationCriteria.constEnd())
m_ui->cbxOperator->removeItem(index);
}
@@ -133,27 +135,27 @@ void EvaluationTopicEditor::initOperatorComboBox()
bool EvaluationTopicEditor::apply2()
{
setTopicDataProperty(QStringLiteral("operatorId"), m_operatorId);
setTopicDataProperty(QStringLiteral("elementId"), m_evlElement.id());
setTopicDataProperty(QStringLiteral("start"), m_evlElement.timestamp());
setTopicDataProperty(QStringLiteral("situation"), m_evlElement.situation());
setTopicDataProperty(QStringLiteral("audio"), m_evlElement.audio());
setTopicDataProperty(QStringLiteral("video"), m_evlElement.video());
setTopicDataProperty(QStringLiteral("elementId"), m_evlElement.id);
setTopicDataProperty(QStringLiteral("start"), static_cast<qint64>(m_evlElement.timestamp));
setTopicDataProperty(QStringLiteral("situation"), m_evlElement.situation);
setTopicDataProperty(QStringLiteral("audio"), m_evlElement.audio);
setTopicDataProperty(QStringLiteral("video"), m_evlElement.video);
DEBUG_LOG(m_logger) << "operator id = " << m_operatorId << ", element id = " << m_evlElement.id();
DEBUG_LOG(m_logger) << "timestamp: " << m_evlElement.timestamp();
DEBUG_LOG(m_logger) << "operator id = " << m_operatorId << ", element id = " << m_evlElement.id;
DEBUG_LOG(m_logger) << "timestamp: " << m_evlElement.timestamp;
if (m_evlElement.situation())
if (m_evlElement.situation)
{
TopicEditorBase::TopicData data;
data.topicType = TopicEditorBase::TopicType::Situation;
setTopicDataProperty(QStringLiteral("end"), m_evlElement.timestamp() + m_evlElement.duration() * 1000);
setTopicDataProperty(QStringLiteral("end"), static_cast<qint64>(m_evlElement.timestamp + m_evlElement.duration * 1000));
setTopicDataProperty(QStringLiteral("speed"), 1.0);
if (m_evlElement.situationContent())
if (m_evlElement.situationContent)
{
QJsonParseError error;
QJsonDocument doc(QJsonDocument::fromJson(
QString::fromStdString(m_evlElement.situationContent().get()).toUtf8(), &error));
QString::fromStdString(m_evlElement.situationContent.get()).toUtf8(), &error));
if (error.error == QJsonParseError::NoError)
{
@@ -166,7 +168,7 @@ bool EvaluationTopicEditor::apply2()
tr("The selected marker has invalid filter and/or map settings."));
}
data.duration = m_evlElement.duration();
data.duration = m_evlElement.duration;
data.properties = m_topicData.properties;
DEBUG_LOG(m_logger) << "topicData - properties: "
@@ -175,26 +177,26 @@ bool EvaluationTopicEditor::apply2()
emit topicEditorRequested(data);
}
if (m_evlElement.audio())
if (m_evlElement.audio)
{
TopicEditorBase::TopicData data;
data.topicType = TopicEditorBase::TopicType::Audio;
setTopicDataProperty(QStringLiteral("end"), m_evlElement.timestamp() + m_evlElement.duration() * 1000);
LtsUtils::JsonObject jsonObj = LtsUtils::JsonObject::fromJson(m_evlElement.audioContent().get());
setTopicDataProperty(QStringLiteral("end"), static_cast<qint64>(m_evlElement.timestamp + m_evlElement.duration * 1000));
LtsUtils::JsonObject jsonObj = LtsUtils::JsonObject::fromJson(m_evlElement.audioContent.get());
setTopicDataProperty(QStringLiteral("stream"), jsonObj.value<QString>("actualStream"));
data.duration = m_evlElement.duration();
data.duration = m_evlElement.duration;
data.properties = m_topicData.properties;
emit topicEditorRequested(data);
}
if (m_evlElement.video())
if (m_evlElement.video)
{
LtsUtils::JsonObject jsonObj = LtsUtils::JsonObject::fromJson(m_evlElement.videoContent().get());
LtsUtils::JsonObject jsonObj = LtsUtils::JsonObject::fromJson(m_evlElement.videoContent.get());
TopicEditorBase::TopicData data;
data.topicType = TopicEditorBase::TopicType::Video;
setTopicDataProperty(QStringLiteral("end"), m_evlElement.timestamp() + m_evlElement.duration() * 1000);
setTopicDataProperty(QStringLiteral("end"), static_cast<qint64>(m_evlElement.timestamp + m_evlElement.duration * 1000));
setTopicDataProperty(QStringLiteral("stream"), jsonObj.value<QString>("actualStream"));
data.duration = m_evlElement.duration();
data.duration = m_evlElement.duration;
data.properties = m_topicData.properties;
emit topicEditorRequested(data);
}
@@ -220,9 +222,9 @@ void EvaluationTopicEditor::onSelectionChanged(const QItemSelection& selected, c
QModelIndex index = m_ui->trvEvaluations->currentIndex();
m_evlElement = m_model->getEvaluationElement(index);
DEBUG_LOG(m_logger) << "element id = " << m_evlElement.id();
DEBUG_LOG(m_logger) << "element id = " << m_evlElement.id;
m_topicData.description = QString::number(m_evlElement.id());
m_topicData.description = QString::number(m_evlElement.id);
slotChangesMade();
}