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
+1
@@ -34,6 +34,7 @@ if(QT6_GUI_AVAILABLE)
|
||||
NGLLogger
|
||||
LtsSession
|
||||
svcAvmCommon
|
||||
AvmShared
|
||||
svcAsmCommon
|
||||
PreDataPluginInterface
|
||||
PrePresentationGuiPluginInterface
|
||||
|
||||
+20
-19
@@ -2,10 +2,11 @@
|
||||
|
||||
|
||||
#include "pre_dialog.h"
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
#include "ui_pre_dialog.h"
|
||||
|
||||
#include <PresentationManagement/Common/pre_edit_dialog.h>
|
||||
#include <PresentationManagement/Common/pre_model.h>
|
||||
#include <PresentationManagement/Gui/Common/pre_edit_dialog.h>
|
||||
#include <Plugins/PresentationManagement/Gui/Common/pre_model.h>
|
||||
#include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
|
||||
#include <LtsSession/lts_session_data.h>
|
||||
#include <LtsWidgets/lts_base_layout_widget.h>
|
||||
@@ -20,7 +21,7 @@ PresentationManagementDialog::PresentationManagementDialog(QWidget *parent)
|
||||
, m_ui(new Ui::PresentationManagementDialog)
|
||||
, m_dtc(nullptr)
|
||||
, m_ftc(nullptr)
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this)), m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "PresentationManagementDialog ctor";
|
||||
m_ui->setupUi(this);
|
||||
@@ -77,9 +78,9 @@ void PresentationManagementDialog::enaDisa()
|
||||
|
||||
m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Add, true);
|
||||
m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Edit, (selected == 1));
|
||||
m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Remove, (selected == 1 && pre.id() != m_loadedScriptId));
|
||||
m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Load, (selected == 1 && pre.id() != m_loadedScriptId && pre.fileStatus() == FileStatus::Valid) );
|
||||
m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Save, (selected == 1 && pre.fileStatus() == FileStatus::Deleted));
|
||||
m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Remove, (selected == 1 && pre.id != m_loadedScriptId));
|
||||
m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Load, (selected == 1 && pre.id != m_loadedScriptId && pre.fileStatus == FileStatus::Valid) );
|
||||
m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Save, (selected == 1 && pre.fileStatus == FileStatus::Deleted));
|
||||
}
|
||||
|
||||
void PresentationManagementDialog::slotAdd()
|
||||
@@ -105,7 +106,7 @@ void PresentationManagementDialog::slotEdit()
|
||||
PresentationEditDialog *dialog = new PresentationEditDialog(this);
|
||||
|
||||
|
||||
if (!dialog->init(m_model->getRowData(m_ui->widget->currentIndex().row()).id() , m_dtc, m_ftc, m_opmDtc))
|
||||
if (!dialog->init(m_model->getRowData(m_ui->widget->currentIndex().row()).id , m_dtc, m_ftc, m_opmDtc))
|
||||
{
|
||||
dialog->deleteLater();
|
||||
return;
|
||||
@@ -116,7 +117,7 @@ void PresentationManagementDialog::slotEdit()
|
||||
QObject::connect(dialog, &PresentationEditDialog::newScript, this, [this](int scriptId)
|
||||
{
|
||||
m_loadedScriptId = scriptId;
|
||||
QString scriptName = QString::fromStdString(m_dtc->presentation(scriptId).name());
|
||||
QString scriptName = QString::fromStdString(m_dtc->presentation(scriptId).name);
|
||||
m_session->baseLayout()->setCustomText(tr("Script: %1").arg(scriptName));
|
||||
});
|
||||
QObject::connect(dialog, &PresentationEditDialog::rejected, dialog, &PresentationEditDialog::deleteLater);
|
||||
@@ -131,8 +132,8 @@ void PresentationManagementDialog::slotRemove()
|
||||
if (!selIndex.isValid())
|
||||
return;
|
||||
|
||||
Core::RemoveElementRequest req(m_model->getRowData(selIndex.row()).id());
|
||||
DEBUG_LOG(m_logger) << "Removing presentation id = " << req.id();
|
||||
Core::RemoveElementRequest req(m_model->getRowData(selIndex.row()).id);
|
||||
DEBUG_LOG(m_logger) << "Removing presentation id = " << req.id;
|
||||
|
||||
m_requestHelper->startSingleRequest([req, this]()
|
||||
{
|
||||
@@ -164,15 +165,15 @@ void PresentationManagementDialog::changeStatus(const FileStatus &fs)
|
||||
|
||||
Presentation pre = m_model->getRowData(m_ui->widget->currentIndex().row());
|
||||
|
||||
if (pre.fileStatus() == fs)
|
||||
if (pre.fileStatus == fs)
|
||||
return;
|
||||
|
||||
PresentationChangeStatusRequest req;
|
||||
req.id(pre.id());
|
||||
req.fileStatus(fs);
|
||||
req.operatorId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
|
||||
req.lastModified(QDateTime::currentMSecsSinceEpoch());
|
||||
DEBUG_LOG(m_logger) << "Changing status for presentation id = " << pre.id();
|
||||
req.id = pre.id;
|
||||
req.fileStatus = fs;
|
||||
req.operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
|
||||
req.lastModified = QDateTime::currentMSecsSinceEpoch();
|
||||
DEBUG_LOG(m_logger) << "Changing status for presentation id = " << pre.id;
|
||||
m_requestHelper->startSingleRequest([this, req]()
|
||||
{
|
||||
return m_ftc->presentationChangeStatusRequest(PresentationChangeStatusRequest(req), this);
|
||||
@@ -205,7 +206,7 @@ bool PresentationManagementDialog::init(const ScriptsDialogMode &dlgMode,
|
||||
m_model = new PresentationManagementDialogModel(this);
|
||||
auto predicate = [](const PresentationManagement::Presentation & p)
|
||||
{
|
||||
return (!p.isDeleted());
|
||||
return (!p.isDeleted);
|
||||
};
|
||||
m_model->initModel(dtc, opmDtc, predicate);
|
||||
|
||||
@@ -221,7 +222,7 @@ bool PresentationManagementDialog::init(const ScriptsDialogMode &dlgMode,
|
||||
|
||||
const QMap<qint32, PresentationManagement::Presentation> presentations = dtc->presentations();
|
||||
for (const auto &p : presentations)
|
||||
DEBUG_LOG(m_logger) << "Presentation: id = " << p.id() << ", name = " << p.name().c_str() << ", desc = " << p.description().c_str();
|
||||
DEBUG_LOG(m_logger) << "Presentation: id = " << p.id << ", name = " << p.name.c_str() << ", desc = " << p.description.c_str();
|
||||
|
||||
connect(m_ui->widget, &LtsDataView::LtsDataView::signalSelectionChanged, this, &PresentationManagementDialog::enaDisa, Qt::UniqueConnection);
|
||||
|
||||
@@ -265,7 +266,7 @@ bool PresentationManagementDialog::init(const ScriptsDialogMode &dlgMode,
|
||||
void PresentationManagementDialog::slotSetScriptName(int scriptId)
|
||||
{
|
||||
m_loadedScriptId = scriptId;
|
||||
QString scriptName = QString::fromStdString(m_dtc->presentation(scriptId).name());
|
||||
QString scriptName = QString::fromStdString(m_dtc->presentation(scriptId).name);
|
||||
m_session->baseLayout()->setCustomText(tr("Script: %1").arg(scriptName));
|
||||
}
|
||||
|
||||
|
||||
+13
-11
@@ -2,11 +2,12 @@
|
||||
|
||||
|
||||
#include "pre_mobile_dialog.h"
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
#include "ui_pre_mobile_dialog.h"
|
||||
|
||||
#include <PresentationManagement/Common/pre_edit_dialog.h>
|
||||
#include <PresentationManagement/Common/pre_mobile_model.h>
|
||||
#include <AudioVideoManagement/AVMenuEdit/topic_replay.h>
|
||||
#include <PresentationManagement/Gui/Common/pre_edit_dialog.h>
|
||||
#include <PresentationManagement/Gui/Common/pre_mobile_model.h>
|
||||
#include <Plugins/AudioVideoManagement/Gui/AVMenuEdit/topic_replay.h>
|
||||
#include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
|
||||
#include <LtsSession/lts_session_data.h>
|
||||
#include <LtsScriptTimeline/track_entry_painters.h>
|
||||
@@ -37,6 +38,7 @@ PreMobileDialog::PreMobileDialog(QWidget *parent)
|
||||
, m_label(nullptr)
|
||||
, m_avScriptsCount(0)
|
||||
, m_avScriptsActualDone(0)
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "PreMobileDialog ctor";
|
||||
connect(&m_copyExercise, &DBAdministration::CopyExercise::copyDbFailed, this, &PreMobileDialog::onCopyDbFailed);
|
||||
@@ -168,7 +170,7 @@ bool PreMobileDialog::init(const std::shared_ptr<Interface::Dtc> &dtc,
|
||||
m_model = new PreMobileDialogModel(this);
|
||||
auto predicate = [](const PresentationManagement::Presentation & p)
|
||||
{
|
||||
return (!p.isDeleted());
|
||||
return (!p.isDeleted);
|
||||
};
|
||||
m_model->initModel(dtc, opmDtc, predicate);
|
||||
|
||||
@@ -186,7 +188,7 @@ bool PreMobileDialog::init(const std::shared_ptr<Interface::Dtc> &dtc,
|
||||
|
||||
const QMap<qint32, PresentationManagement::Presentation> presentations = dtc->presentations();
|
||||
for (const auto &p : presentations)
|
||||
DEBUG_LOG(m_logger) << "Presentation: id = " << p.id() << ", name = " << p.name().c_str() << ", desc = " << p.description().c_str();
|
||||
DEBUG_LOG(m_logger) << "Presentation: id = " << p.id << ", name = " << p.name.c_str() << ", desc = " << p.description.c_str();
|
||||
|
||||
connect(m_ui->widget, &LtsDataView::LtsDataView::signalSelectionChanged, this, &PreMobileDialog::enaDisa, Qt::UniqueConnection);
|
||||
|
||||
@@ -235,18 +237,18 @@ void PreMobileDialog::getAVScripts()
|
||||
void PreMobileDialog::onGetPresentationContentReply(const GetPresentationContentReply &reply)
|
||||
{
|
||||
m_requestHelper->requestReply(reply);
|
||||
if (!reply.errorString().empty())
|
||||
if (!reply.errorString.empty())
|
||||
return;
|
||||
handlePresentationContent(reply);
|
||||
}
|
||||
|
||||
void PreMobileDialog::handlePresentationContent(const GetPresentationContentReply &reply)
|
||||
{
|
||||
const auto &contentList = reply.content();
|
||||
const auto &contentList = reply.content;
|
||||
|
||||
if (contentList.empty())
|
||||
{
|
||||
WARNING_LOG(m_logger) << "No content for Script Id = " << reply.id();
|
||||
WARNING_LOG(m_logger) << "No content for Script Id = " << reply.id;
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -255,11 +257,11 @@ void PreMobileDialog::handlePresentationContent(const GetPresentationContentRepl
|
||||
|
||||
for (const auto &p : contentList)
|
||||
{
|
||||
QJsonObject attributes = QJsonDocument::fromJson(QByteArray::fromStdString(p.attributes())).object();
|
||||
QJsonObject attributes = QJsonDocument::fromJson(QByteArray::fromStdString(p.attributes)).object();
|
||||
|
||||
|
||||
if (p.presentationTopicType() == audioStr ||
|
||||
p.presentationTopicType() == videoStr )
|
||||
if (p.presentationTopicType == audioStr ||
|
||||
p.presentationTopicType == videoStr )
|
||||
{
|
||||
m_vecScripts.append(attributes);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user