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:
1718 files changed
+126739
-18495
No files matched your search
+5
-3
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "asm_handler.h"
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
|
||||
#include <QtCore/QJsonArray>
|
||||
#include <QtCore/QJsonDocument>
|
||||
@@ -15,6 +16,7 @@ AsmHandler::AsmHandler(QObject *parent)
|
||||
, m_dtcAsm(nullptr)
|
||||
, m_ftcAsm(nullptr)
|
||||
, m_exerciseId(-1)
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
|
||||
{}
|
||||
|
||||
bool AsmHandler::init(MainDispatcher* mainDispatcher)
|
||||
@@ -40,12 +42,12 @@ void AsmHandler::modifyAssetAdlerProperties(int assetId, bool isSaaConnected)
|
||||
WARNING_LOG(m_logger)<<">> modify asset properties: set exerciseId: "<<m_exerciseId<<" assetName: "<<assetId;
|
||||
|
||||
AssetManagement::Asset asset = m_dtcAsm->asset(assetId);
|
||||
if (asset.id() <= 0)
|
||||
if (asset.id <= 0)
|
||||
return;
|
||||
|
||||
QJsonObject assetPropsObj = QJsonDocument::fromJson(asset.properties().c_str()).object();
|
||||
QJsonObject assetPropsObj = QJsonDocument::fromJson(asset.properties.c_str()).object();
|
||||
assetPropsObj[QStringLiteral("exerciseId")] = isSaaConnected ? m_exerciseId : -1;
|
||||
asset.properties(QJsonDocument(assetPropsObj).toJson().toStdString());
|
||||
asset.properties = QJsonDocument(assetPropsObj).toJson().toStdString();
|
||||
m_ftcAsm->assetModifyRequest(asset);
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user