Complete Qt6 migration: full clean build green across groups G1-G12 incl. runtime plugin set
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:
1 parent
eb1d949edc
commit
815e16368e
1718 files changed
+126739
-18495
No files matched your search
+7
-5
@@ -9,6 +9,7 @@
|
||||
#include <LtsWidgets/lts_column_filter_proxy_model.h>
|
||||
#include <LtsWidgets/lts_overlay_loading.h>
|
||||
#include "ism_set_recording_dialog_requester.h"
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
@@ -23,10 +24,10 @@ namespace
|
||||
static inline InfrastructureManagement::StructureElement findMountingPoint(const InfrastructureManagement::MainStructureElement &building,
|
||||
const InfrastructureManagement::SimpleRecordingData &guiMountingPoint)
|
||||
{
|
||||
Q_ASSERT(guiMountingPoint.mainStructureElementId == building.id());
|
||||
for (const auto ¤tStructureElement : building.elements())
|
||||
Q_ASSERT(guiMountingPoint.mainStructureElementId == building.id);
|
||||
for (const auto ¤tStructureElement : building.elements)
|
||||
{
|
||||
if (currentStructureElement.id() == guiMountingPoint.id)
|
||||
if (currentStructureElement.id == guiMountingPoint.id)
|
||||
return currentStructureElement;
|
||||
}
|
||||
|
||||
@@ -41,6 +42,7 @@ namespace InfrastructureManagement
|
||||
|
||||
SetRecordingDialog::SetRecordingDialog(QWidget *parent)
|
||||
: LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::OkApplyCancel)
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
|
||||
, m_ui(new Ui::SetRecordingDialog)
|
||||
, m_ismDtc(nullptr)
|
||||
, m_ismFtc(nullptr)
|
||||
@@ -162,14 +164,14 @@ bool SetRecordingDialog::apply()
|
||||
const MainStructureElement &building = mse;
|
||||
StructureElement modifiedMountingPoint = findMountingPoint(building, affectedMountingPoint);
|
||||
|
||||
QJsonDocument propsDoc = QJsonDocument::fromJson(QByteArray::fromStdString(modifiedMountingPoint.properties()));
|
||||
QJsonDocument propsDoc = QJsonDocument::fromJson(QByteArray::fromStdString(modifiedMountingPoint.properties));
|
||||
QJsonObject propsObj;
|
||||
if (propsDoc.isObject())
|
||||
propsObj = propsDoc.object();
|
||||
|
||||
propsObj.insert(QLatin1String("record"), affectedMountingPoint.shallHaveRecordingOn);
|
||||
|
||||
modifiedMountingPoint.properties(QJsonDocument(propsObj).toJson(QJsonDocument::Compact).toStdString());
|
||||
modifiedMountingPoint.properties = QJsonDocument(propsObj).toJson(QJsonDocument::Compact).toStdString();
|
||||
modifiedElements[buildingId].push_back(modifiedMountingPoint);
|
||||
}
|
||||
|
||||
|
||||
+22
-20
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "ism_set_recording_dialog_model.h"
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
|
||||
#include <InfrastructureManagement/Shared/ism_mounting_point.h>
|
||||
#include <InfrastructureManagement/ism_translation.h>
|
||||
@@ -13,9 +14,10 @@
|
||||
namespace InfrastructureManagement
|
||||
{
|
||||
|
||||
SetRecordingDialogModel::SetRecordingDialogModel(QObject *parent) : NGLTreeModel(parent, new NGLTreeItem(QVariant()),,
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) { tr("Name") })
|
||||
SetRecordingDialogModel::SetRecordingDialogModel(QObject *parent)
|
||||
: NGLTreeModel(parent, new NGLTreeItem(QVariant()), { tr("Name") })
|
||||
, m_dtc(nullptr)
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
|
||||
{
|
||||
}
|
||||
|
||||
@@ -78,10 +80,10 @@ void SetRecordingDialogModel::initData()
|
||||
QMap<qint32, qint32> mapMse2groupId;
|
||||
for (auto it = mainStructEles.constBegin(); it != mainStructEles.constEnd(); ++it)
|
||||
{
|
||||
mapMse2groupId.insert(it.value().id(), it.value().groupId());
|
||||
for (const StructureElement ¤tElement : it.value().elements())
|
||||
mapMse2groupId.insert(it.value().id, it.value().groupId);
|
||||
for (const StructureElement ¤tElement : it.value().elements)
|
||||
{
|
||||
allStructureElements.insert(currentElement.id(), currentElement);
|
||||
allStructureElements.insert(currentElement.id, currentElement);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -92,16 +94,16 @@ void SetRecordingDialogModel::initData()
|
||||
{
|
||||
NGLTreeItem *item = nullptr;
|
||||
|
||||
if (it.value().structureElementTypeId() == StructureElementType::MountingPoint)
|
||||
if (it.value().structureElementTypeId == StructureElementType::MountingPoint)
|
||||
{
|
||||
if (it.value().mountingPointTypeId() != MountingPointType::IndoorCamera &&
|
||||
it.value().mountingPointTypeId() != MountingPointType::OutdoorCamera)
|
||||
if (it.value().mountingPointTypeId != MountingPointType::IndoorCamera &&
|
||||
it.value().mountingPointTypeId != MountingPointType::OutdoorCamera)
|
||||
continue;
|
||||
|
||||
item = new NGLTreeItem(QVariant::fromValue(toSimpleRecordingData(it.value())));
|
||||
}
|
||||
else
|
||||
item = new NGLTreeItem(QString::fromStdString(it.value().displayName()));
|
||||
item = new NGLTreeItem(QString::fromStdString(it.value().displayName));
|
||||
|
||||
|
||||
structEleIdToItem.insert(it.key(), item);
|
||||
@@ -130,16 +132,16 @@ void SetRecordingDialogModel::initData()
|
||||
for (auto it = structEleIdToItem.begin(); it != structEleIdToItem.end(); ++it)
|
||||
{
|
||||
StructureElement structureElement = allStructureElements.value(it.key());
|
||||
int32_t pathSize = structureElement.path().size();
|
||||
int32_t pathSize = structureElement.path.size();
|
||||
|
||||
NGLTreeItem *parent = mapGroup.value(defaultSectionId);
|
||||
if (pathSize > 1)
|
||||
{
|
||||
parent = structEleIdToItem.value(structureElement.path().at(pathSize - 2));
|
||||
parent = structEleIdToItem.value(structureElement.path.at(pathSize - 2));
|
||||
}
|
||||
else
|
||||
{
|
||||
const int sectionId = mapMse2groupId.value(structureElement.mainStructureElementId(), -1);
|
||||
const int sectionId = mapMse2groupId.value(structureElement.mainStructureElementId, -1);
|
||||
if(sectionId != -1)
|
||||
{
|
||||
parent = mapGroup.value(sectionId);
|
||||
@@ -248,22 +250,22 @@ SimpleRecordingData SetRecordingDialogModel::toSimpleRecordingData(const Structu
|
||||
SimpleRecordingData result;
|
||||
|
||||
QJsonParseError parseError;
|
||||
QJsonDocument doc = QJsonDocument::fromJson(QByteArray::fromStdString(mountingPoint.properties()), &parseError);
|
||||
QJsonDocument doc = QJsonDocument::fromJson(QByteArray::fromStdString(mountingPoint.properties), &parseError);
|
||||
if (parseError.error != QJsonParseError::NoError)
|
||||
result.hasRecordingOn = false;
|
||||
else
|
||||
result.hasRecordingOn = doc.object().value(QLatin1String("record")).toBool();
|
||||
|
||||
result.mainStructureElementId = mountingPoint.mainStructureElementId();
|
||||
result.mainStructureElementId = mountingPoint.mainStructureElementId;
|
||||
|
||||
if (mountingPoint.displayName().size())
|
||||
result.name = QString::fromStdString(mountingPoint.displayName());
|
||||
else if (mountingPoint.name().size())
|
||||
result.name = QString::fromStdString(mountingPoint.name());
|
||||
if (mountingPoint.displayName.size())
|
||||
result.name = QString::fromStdString(mountingPoint.displayName);
|
||||
else if (mountingPoint.name.size())
|
||||
result.name = QString::fromStdString(mountingPoint.name);
|
||||
else
|
||||
result.name = QStringLiteral("MP_%1").arg(mountingPoint.id());
|
||||
result.name = QStringLiteral("MP_%1").arg(mountingPoint.id);
|
||||
|
||||
result.id = mountingPoint.id();
|
||||
result.id = mountingPoint.id;
|
||||
result.shallHaveRecordingOn = result.hasRecordingOn;
|
||||
|
||||
return result;
|
||||
|
||||
Reference in new issue
Block a user