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
+9
-7
@@ -1,6 +1,7 @@
|
||||
|
||||
|
||||
#include "evl_dialog.h"
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
|
||||
#include "evl_edit_dialog.h"
|
||||
#include "evl_element_dialog.h"
|
||||
@@ -20,6 +21,7 @@ CriteriumDialog::CriteriumDialog(const QString& menuGroup, LtsSession::LtsSessio
|
||||
m_proxyModel(new CriteriumFilterModel(this)), m_session(session), m_ui(new Ui::CriteriumDialog),
|
||||
m_menuGroup(menuGroup), m_ownEvaluationElements(ownEvlElements),
|
||||
m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "CriteriumDialog ctor";
|
||||
m_ui->setupUi(this);
|
||||
@@ -51,7 +53,7 @@ void CriteriumDialog::enaDisa()
|
||||
int selected = m_ui->widget->selectedRows().size();
|
||||
|
||||
const QModelIndex srcIdx = m_ui->widget->currentIndex();
|
||||
int operatorId = m_model->getRowData(srcIdx.row()).operatorId();
|
||||
int operatorId = m_model->getRowData(srcIdx.row()).operatorId;
|
||||
|
||||
if (m_currentOperatorId == operatorId)
|
||||
m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Load, true && selected == 1);
|
||||
@@ -92,7 +94,7 @@ void CriteriumDialog::slotEdit()
|
||||
DEBUG_LOG(m_logger) << "CriteriumDialog::slotEdit";
|
||||
|
||||
const QModelIndex srcIdx = m_ui->widget->currentIndex();
|
||||
editCriterium(m_model->getRowData(srcIdx.row()).id());
|
||||
editCriterium(m_model->getRowData(srcIdx.row()).id);
|
||||
}
|
||||
|
||||
void CriteriumDialog::slotRemove()
|
||||
@@ -102,8 +104,8 @@ void CriteriumDialog::slotRemove()
|
||||
if (!selIndex.isValid())
|
||||
return;
|
||||
|
||||
Core::RemoveElementRequest req(m_model->getRowData(selIndex.row()).id());
|
||||
DEBUG_LOG(m_logger) << "Removing criterium id = " << req.id();
|
||||
Core::RemoveElementRequest req(m_model->getRowData(selIndex.row()).id);
|
||||
DEBUG_LOG(m_logger) << "Removing criterium id = " << req.id;
|
||||
m_requestHelper->startSingleRequest([req, this]() { return m_ftc->evlCriteriumRemoveRequest(req, this); });
|
||||
|
||||
if (m_requestHelper->failed())
|
||||
@@ -116,7 +118,7 @@ void CriteriumDialog::slotEditElements()
|
||||
if (!selIndex.isValid())
|
||||
return;
|
||||
|
||||
int criteriumId = m_model->getRowData(selIndex.row()).id();
|
||||
int criteriumId = m_model->getRowData(selIndex.row()).id;
|
||||
addDialog(LtsWidgets::initDialog(new ElementDialog(), criteriumId, m_exerciseId, m_menuGroup, m_dtc, m_ftc,
|
||||
m_exmDtc, m_avmDataIfc, m_fltParticipantIfc, m_fltAesIfc,
|
||||
m_fltBuildingComponentIfc, m_session),
|
||||
@@ -165,8 +167,8 @@ bool CriteriumDialog::init(
|
||||
for (auto i = criteria.constBegin(); i != criteria.constEnd(); ++i)
|
||||
{
|
||||
const EvaluationCriterium& p = (*i);
|
||||
DEBUG_LOG(m_logger) << "Criterium: id = " << p.id() << ", name = " << p.name().c_str()
|
||||
<< ", desc = " << p.description().c_str();
|
||||
DEBUG_LOG(m_logger) << "Criterium: id = " << p.id << ", name = " << p.name.c_str()
|
||||
<< ", desc = " << p.description.c_str();
|
||||
}
|
||||
|
||||
connect(m_ui->widget, &LtsDataView::LtsDataView::signalSelectionChanged, this, &CriteriumDialog::enaDisa,
|
||||
|
||||
Reference in new issue
Block a user