Adds immediate migration results in progress

This commit is contained in:
torsten committed 2026-08-19 11:18:24 +02:00
1 parent 8453e104c5
commit 3bb6e89496
2102 files changed
+17482 -15071

No files matched your search

@@ -43,7 +43,7 @@ bool CombatPower::init(const std::shared_ptr<ParticipantManagement::Interface::D
{
if (!dtc || !asbIfc || !ppmGuiCbxIfc)
{
ERROR_LOG() << "Could not load all interfaces needed";
ERROR_LOG(m_logger) << "Could not load all interfaces needed";
return false;
}
m_dtc = dtc;
@@ -67,7 +67,7 @@ bool CombatPower::init(const std::shared_ptr<ParticipantManagement::Interface::D
if (idx >= 0)
m_ui->cbParty->setCurrentIndex(idx);
DEBUG_LOG() << "Init CombatPower - parties: " << m_ui->cbParty->count();
DEBUG_LOG(m_logger) << "Init CombatPower - parties: " << m_ui->cbParty->count();
onPartyChanged();
m_ui->vLay->addWidget(m_orgChart);
return true;
@@ -75,7 +75,7 @@ bool CombatPower::init(const std::shared_ptr<ParticipantManagement::Interface::D
void CombatPower::onPartyChanged()
{
DEBUG_LOG() << "onPartyChanged - parties: " << m_ui->cbParty->count();
DEBUG_LOG(m_logger) << "onPartyChanged - parties: " << m_ui->cbParty->count();
if (s_preselectedParty == -1)
m_ui->cbParty->setCurrentIndex(s_preselectedParty);
s_preselectedParty = m_ui->cbParty->currentData().toUInt();
@@ -91,7 +91,7 @@ void CombatPower::onOpenInfo(int id)
void CombatPower::onUpdateParticipant(const Participant &data, DataModification modType)
{
DEBUG_LOG() << "onUpdateParticipant - parties: " << m_ui->cbParty->count();
DEBUG_LOG(m_logger) << "onUpdateParticipant - parties: " << m_ui->cbParty->count();
if (data.partyId() != m_ui->cbParty->currentData().toInt())
return;
if (modType == DataModification::eModified)
@@ -102,7 +102,7 @@ void CombatPower::onUpdateParticipant(const Participant &data, DataModification
void CombatPower::onUpdateDynamicParticipantData(const DynamicParticipantData &data, DataModification modType)
{
DEBUG_LOG() << "onUpdateDynamicParticipantData - parties: " << m_ui->cbParty->count();
DEBUG_LOG(m_logger) << "onUpdateDynamicParticipantData - parties: " << m_ui->cbParty->count();
if (m_dtc->participant(data.participantId()).partyId() != m_ui->cbParty->currentData().toInt())
return;
if (modType == DataModification::eModified)
@@ -42,6 +42,7 @@ private slots:
void onUpdateParticipant(const Participant &data, DataModification modType);
private:
NGL::INGLLogger &m_logger;
void retranslate() override;
ParticipantManagement::LtsParticipantsOrgChart *m_orgChart;
@@ -47,7 +47,9 @@ OrgChartMain::OrgChartMain(LtsSession::LtsSession *session
OrgChartMain::~OrgChartMain()
{
#ifdef BUILD_RTI
m_topicLockHanderData.disconnect();
#endif
m_orgChart->setParent(nullptr);
m_orgChart->deleteLater();
@@ -62,11 +64,11 @@ void OrgChartMain::retranslate()
void OrgChartMain::fillComboBoxes()
{
TRACE_LOG() << Q_FUNC_INFO << " START";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
if (!m_isTemplate)
m_ppmGuiCbxIfc->fillPartyComboBox(m_ui->cbParty);
DEBUG_LOG() << "Init OrgChartMain - parties: " << m_ui->cbParty->count() << " is template? " << m_isTemplate;
DEBUG_LOG(m_logger) << "Init OrgChartMain - parties: " << m_ui->cbParty->count() << " is template? " << m_isTemplate;
}
void OrgChartMain::updateButtonMimeData()
@@ -99,7 +101,7 @@ void OrgChartMain::updateButtonMimeData()
QColor OrgChartMain::currentPartyColor()
{
TRACE_LOG() << Q_FUNC_INFO << " START";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
QColor color = AdvancedSymbology::SymbolDataToRender::unknownColor();
int partyId = -1;
@@ -109,7 +111,7 @@ QColor OrgChartMain::currentPartyColor()
if (partyId > 0)
color = QColor::fromRgb(QRgb(m_dtc->party(partyId).color()));
TRACE_LOG() << Q_FUNC_INFO << " color=" << color.name()
TRACE_LOG(m_logger) << Q_FUNC_INFO << " color=" << color.name()
<< " (partyId = " << partyId << ")"
<< " (m_asSupportService=" << m_asSupportService << ")"
<< " (m_ui->cbParty->isVisible()=" << m_ui->cbParty->isVisible() << ")";
@@ -118,7 +120,7 @@ QColor OrgChartMain::currentPartyColor()
AdvancedSymbology::Role OrgChartMain::currentPartyRole()
{
TRACE_LOG() << Q_FUNC_INFO << " START";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
AdvancedSymbology::Role role = AdvancedSymbology::Role::Unknown;
@@ -129,7 +131,7 @@ AdvancedSymbology::Role OrgChartMain::currentPartyRole()
if (partyId > 0)
role = AdvancedSymbology::roleToRole<>(m_dtc->party(partyId).role());
TRACE_LOG() << Q_FUNC_INFO << " role=" << role
TRACE_LOG(m_logger) << Q_FUNC_INFO << " role=" << role
<< " (partyId = " << partyId << ")"
<< " (m_asSupportService=" << m_asSupportService << ")"
<< " (m_ui->cbParty->isVisible()=" << m_ui->cbParty->isVisible() << ")";
@@ -147,7 +149,7 @@ bool OrgChartMain::init(const std::shared_ptr<ParticipantManagement::Interface::
{
if (!dtc || !ftc || !ppmGuiCbxIfc || !asbIfc)
{
ERROR_LOG() << "Could not load all interfaces needed";
ERROR_LOG(m_logger) << "Could not load all interfaces needed";
return false;
}
m_dtc = dtc;
@@ -171,7 +173,9 @@ bool OrgChartMain::init(const std::shared_ptr<ParticipantManagement::Interface::
return false;
connect(m_dtc.get(), &Interface::Dtc::participantChanged, this, &OrgChartMain::onUpdateParticipant, Qt::UniqueConnection);
#ifdef BUILD_RTI
initTopicLockHandler();
#endif
m_ui->vLay->addWidget(m_orgChart);
if (m_session->partitionType() != IDL::PartitionType::Global)
@@ -181,7 +185,7 @@ bool OrgChartMain::init(const std::shared_ptr<ParticipantManagement::Interface::
this,
&OrgChartMain::onPartyChanged, Qt::UniqueConnection);
m_ppmGuiCbxIfc->fillPartyComboBox(m_ui->cbParty);
DEBUG_LOG() << "Init OrgChartMain - parties: " << m_ui->cbParty->count();
DEBUG_LOG(m_logger) << "Init OrgChartMain - parties: " << m_ui->cbParty->count();
onPartyChanged();
}
else
@@ -194,13 +198,14 @@ bool OrgChartMain::init(const std::shared_ptr<ParticipantManagement::Interface::
return initButtons();
}
#ifdef BUILD_RTI
void OrgChartMain::initTopicLockHandler()
{
std::shared_ptr<Core::Interface::Ftc> coreFtc;
if (!m_session->createTopicClient<Core::Interface::Ftc>(coreFtc))
{
ERROR_LOG() << Q_FUNC_INFO << " create coreFtc failed";
ERROR_LOG(m_logger) << Q_FUNC_INFO << " create coreFtc failed";
return;
}
coreFtc->enableAll();
@@ -212,7 +217,7 @@ void OrgChartMain::initTopicLockHandler()
void OrgChartMain::onLockDataChanged()
{
DEBUG_LOG() << Q_FUNC_INFO << " START";
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START";
m_ui->cbParty->setEnabled(true);
@@ -223,7 +228,7 @@ void OrgChartMain::onLockDataChanged()
if (m_topicLockedBy.isEmpty())
{
DEBUG_LOG() << Q_FUNC_INFO << " READ-WRITE";
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " READ-WRITE";
setUnchangeable(false);
m_orgChart->setDisabled(false);
@@ -231,7 +236,7 @@ void OrgChartMain::onLockDataChanged()
else
{
DEBUG_LOG() << Q_FUNC_INFO << " READ-ONLY";
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " READ-ONLY";
setUnchangeable(true);
m_orgChart->setDisabled(true);
@@ -239,7 +244,7 @@ void OrgChartMain::onLockDataChanged()
retranslate();
}
#endif
bool OrgChartMain::loadTemplate(int templateRootId, bool isSupport)
{
@@ -323,7 +328,7 @@ bool OrgChartMain::initButtons()
return true;
for (const ParticipantManagement::TemplateParticipant &templateData : std::as_const(templates))
{
DEBUG_LOG() << Q_FUNC_INFO << " templateId = " << templateData.templateId()
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " templateId = " << templateData.templateId()
<< " typeId = " << templateData.typeId()
<< " designator= " << templateData.designator().c_str()
<< " tactIdent= " << templateData.tacticalIdentifier().c_str();
@@ -363,7 +368,7 @@ bool OrgChartMain::initButtons()
m_templateMimeDataHelpers[icon] = mimeDataHelper;
if (!mimeDataHelper->init(icon, templateId, m_dtc, AdvancedSymbology::SymbolDictionary::defaultSymbologyType()))
{
ERROR_LOG() << Q_FUNC_INFO << " init failed"
ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed"
<< " (m_ui->cbParty->isVisible() " << m_ui->cbParty->isVisible() << ")";
continue;
}
@@ -553,14 +558,15 @@ void OrgChartMain::onPartyChanged()
__unchange__();
DEBUG_LOG() << "onPartyChanged - parties: " << m_ui->cbParty->count();
DEBUG_LOG(m_logger) << "onPartyChanged - parties: " << m_ui->cbParty->count();
m_party = m_ui->cbParty->currentData().toInt();
DEBUG_LOG() << " OrgChartMain::onPartyChanged()!!! -> newPartyId" << m_party;
DEBUG_LOG(m_logger) << " OrgChartMain::onPartyChanged()!!! -> newPartyId" << m_party;
m_ui->cbParty->setEnabled(false);
#ifdef BUILD_RTI
if (m_topicLockHanderData.isLocked())
{
@@ -573,6 +579,7 @@ void OrgChartMain::onPartyChanged()
topicInfo.setEntity(m_party);
topicInfo.setValid();
m_topicLockHanderData.slotTryLock(topicInfo);
#endif
if (m_orgChart)
m_orgChart->loadParty(m_party);
@@ -644,7 +651,7 @@ void OrgChartMain::onDelete(const QString &data)
void OrgChartMain::onUpdateItem(const QModelIndex &parent, const ParticipantData &editData)
{
TRACE_LOG() << Q_FUNC_INFO << " START";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
Q_UNUSED(parent);
@@ -17,7 +17,9 @@
#include <LtsWidgets/lts_dialog.h>
#include <LtsSession/lts_session.h>
#ifdef BUILD_RTI
#include <LtsSession/lts_session_lock_handler.h>
#endif
#include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
#include <QPointer>
@@ -50,13 +52,16 @@ public:
, bool useSymData = true
, bool asSupportService = false
, int templateId = -1);
#ifdef BUILD_RTI
void initTopicLockHandler();
#endif
void onModifyParticipantDataReply(const Core::FunctionReplyObject &replyObject) override final { m_requestHelper->requestReply(replyObject); }
void onModifyTemplateDataReply(const Core::FunctionReplyObject &replyObject) override final { m_requestHelper->requestReply(replyObject); }
bool loadTemplate(int templateRootId, bool isSupport = false);
private:
NGL::INGLLogger &m_logger;
void retranslate() override;
bool initButtons();
QByteArray getMimeData(const Type &type, const QImage &image);
@@ -80,9 +85,12 @@ private slots:
void onReload();
void onUpdateParticipant(const Participant &data, DataModification modType);
#ifdef BUILD_RTI
void onLockDataChanged();
#endif
private:
NGL::INGLLogger &m_logger;
ParticipantManagement::LtsParticipantsOrgChart *m_orgChart;
std::shared_ptr<ParticipantManagement::Interface::Dtc> m_dtc;
std::shared_ptr<ParticipantManagement::Interface::Ftc> m_ftc;
@@ -98,9 +106,9 @@ private:
QMap<QPointer<LtsWidgets::LtsDragIcon>, QPointer<OrgChartMain_MimeDataHelper>> m_templateMimeDataHelpers;
#ifdef BUILD_RTI
LtsSession::TopicLockHanderData m_topicLockHanderData;
#endif
bool m_useSymData;
bool m_asSupportService;
@@ -12,16 +12,16 @@ namespace ParticipantManagement
OrgChartMain_MimeDataHelper::OrgChartMain_MimeDataHelper(QObject *parent)
: QObject(parent)
{
TRACE_LOG() << Q_FUNC_INFO << "START";
TRACE_LOG() << Q_FUNC_INFO << "END";
TRACE_LOG(m_logger) << Q_FUNC_INFO << "START";
TRACE_LOG(m_logger) << Q_FUNC_INFO << "END";
}
OrgChartMain_MimeDataHelper::~OrgChartMain_MimeDataHelper()
{
TRACE_LOG() << Q_FUNC_INFO << "START";
TRACE_LOG(m_logger) << Q_FUNC_INFO << "START";
delete m_bulkRendererFindImage;
TRACE_LOG() << Q_FUNC_INFO << "END";
TRACE_LOG(m_logger) << Q_FUNC_INFO << "END";
}
bool OrgChartMain_MimeDataHelper::init(LtsWidgets::LtsDragIcon *widget,
@@ -29,14 +29,14 @@ bool OrgChartMain_MimeDataHelper::init(LtsWidgets::LtsDragIcon *widget,
const std::shared_ptr<Interface::Dtc> &dtc,
AdvancedSymbology::SymbologyType symbologyType)
{
TRACE_LOG() << Q_FUNC_INFO << "START";
TRACE_LOG(m_logger) << Q_FUNC_INFO << "START";
m_templateId = templateId;
m_symbologyType = symbologyType;
if (!widget)
{
ERROR_LOG() << Q_FUNC_INFO << "no widget";
ERROR_LOG(m_logger) << Q_FUNC_INFO << "no widget";
return false;
}
m_widget = widget;
@@ -44,18 +44,18 @@ bool OrgChartMain_MimeDataHelper::init(LtsWidgets::LtsDragIcon *widget,
if (!dtc)
{
ERROR_LOG() << "Could not load all interfaces needed";
ERROR_LOG(m_logger) << "Could not load all interfaces needed";
return false;
}
m_dtc = dtc;
TRACE_LOG() << Q_FUNC_INFO << "END";
TRACE_LOG(m_logger) << Q_FUNC_INFO << "END";
return true;
}
void OrgChartMain_MimeDataHelper::run(AdvancedSymbology::Role role, const QColor &color)
{
TRACE_LOG() << Q_FUNC_INFO << "START"
TRACE_LOG(m_logger) << Q_FUNC_INFO << "START"
<< " m_symbologyType = " << m_symbologyType
<< " role = " << role
<< " color = " << color.name();
@@ -65,7 +65,7 @@ void OrgChartMain_MimeDataHelper::run(AdvancedSymbology::Role role, const QColor
if (!m_dtc)
{
ERROR_LOG() << "Could not load all interfaces needed";
ERROR_LOG(m_logger) << "Could not load all interfaces needed";
return;
}
@@ -83,12 +83,12 @@ void OrgChartMain_MimeDataHelper::run(AdvancedSymbology::Role role, const QColor
m_bulkRendererFindImage->run();
TRACE_LOG() << Q_FUNC_INFO << "END";
TRACE_LOG(m_logger) << Q_FUNC_INFO << "END";
}
void OrgChartMain_MimeDataHelper::prepareBulkRenderer(int templateId)
{
TRACE_LOG() << Q_FUNC_INFO << "START"
TRACE_LOG(m_logger) << Q_FUNC_INFO << "START"
<< " templateId= " << templateId;
const TemplateParticipant &tPart = m_dtc->templateParticipant(templateId);
@@ -96,7 +96,7 @@ void OrgChartMain_MimeDataHelper::prepareBulkRenderer(int templateId)
const AdvancedSymbology::SymbolDataToRender &symDataToRender =
symbolDataToRender(QString::fromStdString(tPart.symbol()));
DEBUG_LOG() << Q_FUNC_INFO << " addRequest for templateId = " << templateId << ": "
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " addRequest for templateId = " << templateId << ": "
<< " tPart = " << tPart
<< " symDataToRender=" << symDataToRender.toString();
@@ -112,7 +112,7 @@ void OrgChartMain_MimeDataHelper::prepareBulkRenderer(int templateId)
prepareBulkRenderer(infId);
}
TRACE_LOG() << Q_FUNC_INFO << "END";
TRACE_LOG(m_logger) << Q_FUNC_INFO << "END";
}
QJsonObject OrgChartMain_MimeDataHelper::getMimeData(int templateId)
@@ -141,7 +141,7 @@ QJsonObject OrgChartMain_MimeDataHelper::getMimeData(int templateId)
const AdvancedSymbology::SymbolDataToRender &symDataToRender =
symbolDataToRender(QString::fromStdString(tPart.symbol()));
DEBUG_LOG() << Q_FUNC_INFO << " getResult for templateId = " << templateId
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " getResult for templateId = " << templateId
<< " symDataToRender=" << symDataToRender.toString();
QSharedPointer<AdvancedSymbology::SymbolResultWatcher> watcher =
@@ -157,7 +157,7 @@ QJsonObject OrgChartMain_MimeDataHelper::getMimeData(int templateId)
.arg(QString::fromLatin1(data.toBase64()));
retObj.insert(QStringLiteral("image"), imageAdd);
} else {
ERROR_LOG() << Q_FUNC_INFO << " getResult failed! "
ERROR_LOG(m_logger) << Q_FUNC_INFO << " getResult failed! "
<< " templateId = " << templateId
<< " symDataToRender=" << symDataToRender.toString();
}
@@ -189,10 +189,10 @@ AdvancedSymbology::SymbolDataToRender OrgChartMain_MimeDataHelper::symbolDataToR
void OrgChartMain_MimeDataHelper::onRenderingFinished()
{
TRACE_LOG() << Q_FUNC_INFO << "START, bulkRendererFindImage->size: " << m_bulkRendererFindImage->size();
TRACE_LOG(m_logger) << Q_FUNC_INFO << "START, bulkRendererFindImage->size: " << m_bulkRendererFindImage->size();
const QJsonObject &obj = getMimeData(m_templateId);
DEBUG_LOG() << Q_FUNC_INFO << " m_templateId =" << m_templateId
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " m_templateId =" << m_templateId
<< " obj.size = " << obj.size()
<< " size2 = " << QJsonDocument(obj).toJson().size();
@@ -202,7 +202,7 @@ void OrgChartMain_MimeDataHelper::onRenderingFinished()
m_widget->setEnabled(true);
}
TRACE_LOG() << Q_FUNC_INFO << "END";
TRACE_LOG(m_logger) << Q_FUNC_INFO << "END";
}
}
@@ -41,6 +41,8 @@ protected slots:
void onRenderingFinished();
private:
NGL::INGLLogger &m_logger;
void prepareBulkRenderer(int templateId);
QJsonObject getMimeData(int templateId);
AdvancedSymbology::SymbolDataToRender symbolDataToRender(const QString &sidc);
@@ -127,7 +127,7 @@ bool LtsParticipantsOrgChart::init(const std::shared_ptr<ParticipantManagement::
void LtsParticipantsOrgChart::loadParty(int partyId)
{
TRACE_LOG() << "loadParty " << partyId;
TRACE_LOG(m_logger) << "loadParty " << partyId;
m_partyId = partyId;
const QMap<qint32, ParticipantManagement::Participant> participantMap = m_dtc->participants();
@@ -159,7 +159,7 @@ void LtsParticipantsOrgChart::loadParty(int partyId)
m_participantOrgChart_MimeDataHelper = new ParticipantOrgChart_MimeDataHelper(this);
if (!m_participantOrgChart_MimeDataHelper->init(m_dtc, AdvancedSymbology::SymbolDictionary::defaultSymbologyType(), true))
{
ERROR_LOG() << Q_FUNC_INFO << " init failed";
ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed";
return;
}
@@ -175,7 +175,7 @@ void LtsParticipantsOrgChart::loadParty(int partyId)
void LtsParticipantsOrgChart::onParticipantOrgChart_MimeDataHelperFinished()
{
TRACE_LOG() << Q_FUNC_INFO << " START";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
QString preDefThing = QLatin1String(" var datascource = ");
@@ -205,13 +205,13 @@ void LtsParticipantsOrgChart::onParticipantOrgChart_MimeDataHelperFinished()
m_ui->wevOrgChart->reload();
}
TRACE_LOG() << Q_FUNC_INFO << " END";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
}
bool LtsParticipantsOrgChart::loadTemplate(int templateRootId)
{
TRACE_LOG() << Q_FUNC_INFO << " START";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
ParticipantManagement::TemplateParticipant root = m_dtc->templateParticipant(templateRootId);
if (m_ui->wevOrgChart->page()->url().toString() == QLatin1String("about:blank"))
@@ -224,7 +224,7 @@ bool LtsParticipantsOrgChart::loadTemplate(int templateRootId)
m_participantOrgChart_MimeDataHelper = new ParticipantOrgChart_MimeDataHelper(this);
if (!m_participantOrgChart_MimeDataHelper->init(m_dtc, AdvancedSymbology::SymbolDictionary::defaultSymbologyType(), false))
{
ERROR_LOG() << Q_FUNC_INFO << " init failed";
ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed";
return false;
}
@@ -247,7 +247,7 @@ void LtsParticipantsOrgChart::updateParticipant(int participantId)
if (!helper->init(m_dtc, AdvancedSymbology::SymbolDictionary::defaultSymbologyType(), true))
{
ERROR_LOG() << Q_FUNC_INFO << " init failed";
ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed";
return;
}
@@ -265,24 +265,24 @@ void LtsParticipantsOrgChart::updateParticipant(int participantId)
void LtsParticipantsOrgChart::onSingleParticipantOrgChart_MimeDataHelperFinished()
{
TRACE_LOG() << Q_FUNC_INFO << " START";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
ParticipantOrgChart_MimeDataHelper *senderWatcher = qobject_cast<ParticipantOrgChart_MimeDataHelper*>(sender());
if (!senderWatcher)
{
ERROR_LOG() << Q_FUNC_INFO << " sender failed";
ERROR_LOG(m_logger) << Q_FUNC_INFO << " sender failed";
return;
}
const int participantId = senderWatcher->getParticipantId();
const QJsonObject &newJson = senderWatcher->getMimeDataResult();
DEBUG_LOG() << Q_FUNC_INFO << " sendUpdateString:"
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " sendUpdateString:"
<< " participantId=" << participantId;
emit sendUpdateString(participantId, newJson);
TRACE_LOG() << Q_FUNC_INFO << " END";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
}
@@ -298,12 +298,11 @@ void LtsParticipantsOrgChart::getWholeHierarchy()
WebNofitifier::WebNofitifier(QObject *parent)
: QObject(parent)
WebNofitifier::WebNofitifier(QObject *parent) : QObject(parent)
, m_currentJsonString(QString())
, m_updateString(QString())
, m_updateTimer(new QTimer(this))
{
, m_updateTimer(new QTimer(this)),
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
connect(m_updateTimer, &QTimer::timeout, this, &WebNofitifier::onTimerTick);
}
@@ -96,6 +96,8 @@ signals:
void sendUpdateString(int, const QJsonObject &);
private:
NGL::INGLLogger &m_logger;
int m_partyId;
bool m_useSymData;
bool m_isMenuEnabled;
@@ -13,40 +13,40 @@ namespace ParticipantManagement
ParticipantOrgChart_MimeDataHelper::ParticipantOrgChart_MimeDataHelper(QObject *parent)
: QObject(parent)
{
TRACE_LOG() << Q_FUNC_INFO << "START";
TRACE_LOG() << Q_FUNC_INFO << "END";
TRACE_LOG(m_logger) << Q_FUNC_INFO << "START";
TRACE_LOG(m_logger) << Q_FUNC_INFO << "END";
}
ParticipantOrgChart_MimeDataHelper::~ParticipantOrgChart_MimeDataHelper()
{
TRACE_LOG() << Q_FUNC_INFO << "START";
TRACE_LOG(m_logger) << Q_FUNC_INFO << "START";
delete m_bulkRendererFindImage;
delete m_bulkRendererFindBaseSymbol;
TRACE_LOG() << Q_FUNC_INFO << "END";
TRACE_LOG(m_logger) << Q_FUNC_INFO << "END";
}
bool ParticipantOrgChart_MimeDataHelper::init(const std::shared_ptr<Interface::Dtc> &dtc,
AdvancedSymbology::SymbologyType symbologyType, bool participantMode)
{
TRACE_LOG() << Q_FUNC_INFO << "START";
TRACE_LOG(m_logger) << Q_FUNC_INFO << "START";
m_symbologyType = symbologyType;
m_participantMode = participantMode;
if (!dtc)
{
ERROR_LOG() << "Could not load all interfaces needed";
ERROR_LOG(m_logger) << "Could not load all interfaces needed";
return false;
}
m_dtc = dtc;
TRACE_LOG() << Q_FUNC_INFO << "END";
TRACE_LOG(m_logger) << Q_FUNC_INFO << "END";
return true;
}
void ParticipantOrgChart_MimeDataHelper::run(int participantId, bool single, AdvancedSymbology::Role role, const QColor &color, bool useSymData)
{
TRACE_LOG() << Q_FUNC_INFO << "START"
TRACE_LOG(m_logger) << Q_FUNC_INFO << "START"
<< ", participantId=" << participantId
<< ", single=" << single
<< ", role=" << role
@@ -61,7 +61,7 @@ void ParticipantOrgChart_MimeDataHelper::run(int participantId, bool single, Adv
if (!m_dtc)
{
ERROR_LOG() << "Could not load all interfaces needed";
ERROR_LOG(m_logger) << "Could not load all interfaces needed";
return;
}
@@ -87,14 +87,14 @@ void ParticipantOrgChart_MimeDataHelper::run(int participantId, bool single, Adv
else
m_bulkRendererFindBaseSymbol->run();
TRACE_LOG() << Q_FUNC_INFO << "END"
TRACE_LOG(m_logger) << Q_FUNC_INFO << "END"
<< ", color=" << color.name()
<< ", useSymData" << useSymData;
}
bool ParticipantOrgChart_MimeDataHelper::prepareBulkRenderer(int participantId, bool single)
{
TRACE_LOG() << Q_FUNC_INFO << "START"
TRACE_LOG(m_logger) << Q_FUNC_INFO << "START"
<< ", participantId=" << participantId
<< ", single=" << single;
@@ -139,13 +139,13 @@ bool ParticipantOrgChart_MimeDataHelper::prepareBulkRenderer(int participantId,
for (int infId : inferior)
prepareBulkRenderer(infId, single);
TRACE_LOG() << Q_FUNC_INFO << "END";
TRACE_LOG(m_logger) << Q_FUNC_INFO << "END";
return true;
}
QJsonObject ParticipantOrgChart_MimeDataHelper::getMimeData(int participantId, bool single)
{
TRACE_LOG() << Q_FUNC_INFO << "START"
TRACE_LOG(m_logger) << Q_FUNC_INFO << "START"
<< ", participantId=" << participantId
<< ", single=" << single;
@@ -200,7 +200,7 @@ QJsonObject ParticipantOrgChart_MimeDataHelper::getMimeData(int participantId, b
.arg(QString::fromLatin1(data.toBase64()));
retObj.insert(QStringLiteral("image"), imageAdd);
} else {
ERROR_LOG() << Q_FUNC_INFO << " SymbolResultWatcher for 2nd recusion not found";
ERROR_LOG(m_logger) << Q_FUNC_INFO << " SymbolResultWatcher for 2nd recusion not found";
}
@@ -223,7 +223,7 @@ QJsonObject ParticipantOrgChart_MimeDataHelper::getMimeData(int participantId, b
QJsonObject ParticipantOrgChart_MimeDataHelper::getTemplateMimeData(int participantId, bool single)
{
TRACE_LOG() << Q_FUNC_INFO << "START"
TRACE_LOG(m_logger) << Q_FUNC_INFO << "START"
<< ", participantTemplateId=" << participantId
<< ", single=" << single;
@@ -278,7 +278,7 @@ QJsonObject ParticipantOrgChart_MimeDataHelper::getTemplateMimeData(int particip
.arg(QString::fromLatin1(data.toBase64()));
retObj.insert(QStringLiteral("image"), imageAdd);
} else {
ERROR_LOG() << Q_FUNC_INFO << " SymbolResultWatcher for 2nd recusion not found";
ERROR_LOG(m_logger) << Q_FUNC_INFO << " SymbolResultWatcher for 2nd recusion not found";
}
@@ -350,12 +350,12 @@ AdvancedSymbology::SymbolDataToRender ParticipantOrgChart_MimeDataHelper::symbol
void ParticipantOrgChart_MimeDataHelper::onRenderingFinished()
{
TRACE_LOG() << Q_FUNC_INFO << "START, bulkRendererFindImage->size: " << m_bulkRendererFindImage->size();
TRACE_LOG(m_logger) << Q_FUNC_INFO << "START, bulkRendererFindImage->size: " << m_bulkRendererFindImage->size();
if (m_participantMode)
m_mimeData = getMimeData(m_participantId, m_single);
else
m_mimeData = getTemplateMimeData(m_participantId, m_single);
DEBUG_LOG() << Q_FUNC_INFO
DEBUG_LOG(m_logger) << Q_FUNC_INFO
<< " m_participantId =" << m_participantId
<< " m_single = " << m_single
<< " m_mimeData.size = " << m_mimeData.size()
@@ -363,7 +363,7 @@ void ParticipantOrgChart_MimeDataHelper::onRenderingFinished()
emit finished();
TRACE_LOG() << Q_FUNC_INFO << "END";
TRACE_LOG(m_logger) << Q_FUNC_INFO << "END";
}
}
@@ -39,6 +39,8 @@ protected slots:
void onRenderingFinished();
private:
NGL::INGLLogger &m_logger;
bool prepareBulkRenderer(int participantId, bool single = false);
QJsonObject getMimeData(int participantId, bool single = false);
QJsonObject getTemplateMimeData(int participantId, bool single = false);