Enable Codification/OHP/PlanEditor/OrgChart plugin groups (G12 225); harden new_docker_build.sh

First-build fixes (DDS members, Qt6 transitive WebChannel/PrintSupport drops, logger init, Qt5 guard); script: log_warn, BUILD_WLS default ON, Poppler image+APT, XmlPatterns 6.0 wording
This commit is contained in:
berrux-dev committed 2026-10-21 13:50:10 +02:00
1 parent 131a6714cf
commit e067c21b0d
11 files changed
+278 -61

No files matched your search

@@ -44,6 +44,9 @@ if(QT6_GUI_AVAILABLE)
${Qt6_Widgets}
Qt6::WebEngineCore
Qt6::WebEngineWidgets
# Qt6 Migration: Qt5::WebEngineWidgets transitively linked Qt5::WebChannel;
# Qt6 dropped that dependency, so link the module explicitly.
Qt6::WebChannel
LtsSession
NGLLogger
PUBLIC
@@ -2,6 +2,7 @@
#include "participant_org_chart.h"
#include "ui_participant_org_chart.h"
#include <NGLLogger/NGLLoggerBootstrap.h>
#include <QtWebEngineCore/QWebEngineSettings>
#include <Symbology/symbol_data_to_render_role.h>
@@ -16,9 +17,9 @@ namespace ParticipantManagement
inline bool compareState(const StateInformation &a,
const StateInformation &b)
{
if (a.stateTime() != b.stateTime())
return a.stateTime() < b.stateTime();
return a.vulnerabilityState() < b.vulnerabilityState();
if (a.stateTime != b.stateTime)
return a.stateTime < b.stateTime;
return a.vulnerabilityState < b.vulnerabilityState;
}
LtsParticipantsOrgChart::LtsParticipantsOrgChart(QWidget *parent)
@@ -32,6 +33,7 @@ LtsParticipantsOrgChart::LtsParticipantsOrgChart(QWidget *parent)
, m_dtc(nullptr)
, m_asbItc(nullptr)
, m_ui(new Ui::LtsParticipantsOrgChart)
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
{
m_ui->setupUi(this);
}
@@ -137,16 +139,16 @@ void LtsParticipantsOrgChart::loadParty(int partyId)
for (const ParticipantManagement::Participant &part : participantMap)
{
if (part.isDeleted() || part.partyId() != m_partyId)
if (part.isDeleted || part.partyId != m_partyId)
continue;
if (part.superiorId() == 0)
if (part.superiorId == 0)
{
root = part;
break;
}
}
if (root.inferiorIds().size() == 0)
if (root.inferiorIds.size() == 0)
{
m_dataSource = preDefThing;
m_ui->wevOrgChart->reload();
@@ -166,10 +168,10 @@ void LtsParticipantsOrgChart::loadParty(int partyId)
connect(m_participantOrgChart_MimeDataHelper.data(), &ParticipantOrgChart_MimeDataHelper::finished,
this, &LtsParticipantsOrgChart::onParticipantOrgChart_MimeDataHelperFinished);
m_participantOrgChart_MimeDataHelper->run(root.id(),
m_participantOrgChart_MimeDataHelper->run(root.id,
false,
AdvancedSymbology::roleToRole<>(m_dtc->party(m_partyId).role()),
QColor::fromRgb(QRgb(m_dtc->party(m_partyId).color())),
AdvancedSymbology::roleToRole<>(m_dtc->party(m_partyId).role),
QColor::fromRgb(QRgb(m_dtc->party(m_partyId).color)),
m_useSymData);
}
@@ -231,10 +233,10 @@ bool LtsParticipantsOrgChart::loadTemplate(int templateRootId)
connect(m_participantOrgChart_MimeDataHelper.data(), &ParticipantOrgChart_MimeDataHelper::finished,
this, &LtsParticipantsOrgChart::onParticipantOrgChart_MimeDataHelperFinished);
m_participantOrgChart_MimeDataHelper->run(root.templateId(),
m_participantOrgChart_MimeDataHelper->run(root.templateId,
false,
AdvancedSymbology::roleToRole<>(m_dtc->party(m_partyId).role()),
QColor::fromRgb(QRgb(m_dtc->party(m_partyId).color())),
AdvancedSymbology::roleToRole<>(m_dtc->party(m_partyId).role),
QColor::fromRgb(QRgb(m_dtc->party(m_partyId).color)),
false);
return true;
@@ -258,8 +260,8 @@ void LtsParticipantsOrgChart::updateParticipant(int participantId)
helper->run(participantId,
true,
AdvancedSymbology::roleToRole<>(m_dtc->party(m_partyId).role()),
QColor::fromRgb(QRgb(m_dtc->party(m_partyId).color())),
AdvancedSymbology::roleToRole<>(m_dtc->party(m_partyId).role),
QColor::fromRgb(QRgb(m_dtc->party(m_partyId).color)),
m_useSymData);
}
@@ -301,8 +303,7 @@ void LtsParticipantsOrgChart::getWholeHierarchy()
WebNofitifier::WebNofitifier(QObject *parent) : QObject(parent)
, m_currentJsonString(QString())
, m_updateString(QString())
, m_updateTimer(new QTimer(this)),
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
, m_updateTimer(new QTimer(this)) {
connect(m_updateTimer, &QTimer::timeout, this, &WebNofitifier::onTimerTick);
}
@@ -97,7 +97,6 @@ signals:
private:
NGL::INGLLogger &m_logger;
int m_partyId;
bool m_useSymData;
bool m_isMenuEnabled;
@@ -114,6 +113,8 @@ NGL::INGLLogger &m_logger;
std::shared_ptr<ParticipantManagement::Interface::Dtc> m_dtc;
std::shared_ptr<AdvancedSymbology::ForeignDataInterface> m_asbItc;
Ui::LtsParticipantsOrgChart *m_ui;
NGL::INGLLogger &m_logger;
};
}