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
+6
-4
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "combat_power.h"
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
#include "ui_combat_power.h"
|
||||
|
||||
namespace ParticipantManagement
|
||||
@@ -16,6 +17,7 @@ CombatPower::CombatPower(QWidget *parent)
|
||||
, m_ppmGuiCbxIfc(nullptr)
|
||||
, m_ppmGuiInfoIfc(nullptr)
|
||||
, m_ui(new Ui::CombatPower)
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("CombatPower"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
|
||||
@@ -92,10 +94,10 @@ void CombatPower::onOpenInfo(int id)
|
||||
void CombatPower::onUpdateParticipant(const Participant &data, DataModification modType)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onUpdateParticipant - parties: " << m_ui->cbParty->count();
|
||||
if (data.partyId() != m_ui->cbParty->currentData().toInt())
|
||||
if (data.partyId != m_ui->cbParty->currentData().toInt())
|
||||
return;
|
||||
if (modType == DataModification::eModified)
|
||||
m_orgChart->updateParticipant(data.id());
|
||||
m_orgChart->updateParticipant(data.id);
|
||||
else
|
||||
onPartyChanged();
|
||||
}
|
||||
@@ -103,10 +105,10 @@ void CombatPower::onUpdateParticipant(const Participant &data, DataModification
|
||||
void CombatPower::onUpdateDynamicParticipantData(const DynamicParticipantData &data, DataModification modType)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onUpdateDynamicParticipantData - parties: " << m_ui->cbParty->count();
|
||||
if (m_dtc->participant(data.participantId()).partyId() != m_ui->cbParty->currentData().toInt())
|
||||
if (m_dtc->participant(data.participantId).partyId != m_ui->cbParty->currentData().toInt())
|
||||
return;
|
||||
if (modType == DataModification::eModified)
|
||||
m_orgChart->updateParticipant(data.participantId());
|
||||
m_orgChart->updateParticipant(data.participantId);
|
||||
else
|
||||
onPartyChanged();
|
||||
}
|
||||
|
||||
+106
-104
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "org_chart_main.h"
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
#include <utility>
|
||||
#include "ui_org_chart_main.h"
|
||||
#include <QtCore/QBuffer>
|
||||
@@ -34,6 +35,7 @@ OrgChartMain::OrgChartMain(LtsSession::LtsSession *session
|
||||
, m_isTemplate(false)
|
||||
, m_party(-1)
|
||||
, m_ui(new Ui::OrgChartMain)
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("OrgChartMain"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
m_buttonBox->getButton(LtsWidgets::DialogButton::Close)->hide();
|
||||
@@ -89,8 +91,8 @@ void OrgChartMain::updateButtonMimeData()
|
||||
if (partyId > 0)
|
||||
{
|
||||
AdvancedSymbology::SymbolDataToRender symDataToRender(symbolString);
|
||||
symDataToRender.role = AdvancedSymbology::roleToRole(m_dtc->party(m_party).role());
|
||||
symDataToRender.fillColor = QColor::fromRgb(QRgb(m_dtc->party(partyId).color()));
|
||||
symDataToRender.role = AdvancedSymbology::roleToRole(m_dtc->party(m_party).role);
|
||||
symDataToRender.fillColor = QColor::fromRgb(QRgb(m_dtc->party(partyId).color));
|
||||
symDataToRender.fillColorReplace = true;
|
||||
symbolWatcher->setSymbolResult(m_asbIfc->findImage(symDataToRender));
|
||||
}
|
||||
@@ -109,7 +111,7 @@ QColor OrgChartMain::currentPartyColor()
|
||||
partyId = m_ui->cbParty->currentData().toInt();
|
||||
|
||||
if (partyId > 0)
|
||||
color = QColor::fromRgb(QRgb(m_dtc->party(partyId).color()));
|
||||
color = QColor::fromRgb(QRgb(m_dtc->party(partyId).color));
|
||||
|
||||
TRACE_LOG(m_logger) << Q_FUNC_INFO << " color=" << color.name()
|
||||
<< " (partyId = " << partyId << ")"
|
||||
@@ -129,7 +131,7 @@ AdvancedSymbology::Role OrgChartMain::currentPartyRole()
|
||||
partyId = m_ui->cbParty->currentData().toInt();
|
||||
|
||||
if (partyId > 0)
|
||||
role = AdvancedSymbology::roleToRole<>(m_dtc->party(partyId).role());
|
||||
role = AdvancedSymbology::roleToRole<>(m_dtc->party(partyId).role);
|
||||
|
||||
TRACE_LOG(m_logger) << Q_FUNC_INFO << " role=" << role
|
||||
<< " (partyId = " << partyId << ")"
|
||||
@@ -281,12 +283,12 @@ bool OrgChartMain::initButtons()
|
||||
const QMap<qint32, Type> mapTypes = m_dtc->types();
|
||||
for (const Type &type : mapTypes)
|
||||
{
|
||||
if ((!m_asSupportService && (type.typeClass() == TypeClass::SupportUnit || type.typeClass() == TypeClass::SupportEntity))
|
||||
|| (m_asSupportService && (type.typeClass() != TypeClass::SupportUnit && type.typeClass() != TypeClass::SupportEntity)))
|
||||
if ((!m_asSupportService && (type.typeClass == TypeClass::SupportUnit || type.typeClass == TypeClass::SupportEntity))
|
||||
|| (m_asSupportService && (type.typeClass != TypeClass::SupportUnit && type.typeClass != TypeClass::SupportEntity)))
|
||||
continue;
|
||||
plAction.menuGroup = ParticipantManagement::toString(type.typeClass());
|
||||
plAction.identifier = QString::fromStdString(type.name()) + QString::number(type.equipmentTypeId());
|
||||
plAction.menuText = QString::fromStdString(type.name());
|
||||
plAction.menuGroup = ParticipantManagement::toString(type.typeClass);
|
||||
plAction.identifier = QString::fromStdString(type.name) + QString::number(type.equipmentTypeId);
|
||||
plAction.menuText = QString::fromStdString(type.name);
|
||||
plAction.directFunc = [](const LtsWidgets::PluginData &) { return; };
|
||||
|
||||
LtsWidgets::LtsDragIcon *icon = m_session->addAction(plAction);
|
||||
@@ -312,7 +314,7 @@ bool OrgChartMain::initButtons()
|
||||
}
|
||||
});
|
||||
|
||||
QString symbolString = QString::fromStdString(type.symbol());
|
||||
QString symbolString = QString::fromStdString(type.symbol);
|
||||
symbolWatcher->setSymbolResult(m_asbIfc->findPreview(symbolString));
|
||||
m_buttonMap.insert(icon, std::tuple<QString, AdvancedSymbology::SymbolResultWatcher *>(symbolString, mimeDataSymbolWatcher));
|
||||
}
|
||||
@@ -328,13 +330,13 @@ bool OrgChartMain::initButtons()
|
||||
return true;
|
||||
for (const ParticipantManagement::TemplateParticipant &templateData : std::as_const(templates))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " templateId = " << templateData.templateId()
|
||||
<< " typeId = " << templateData.typeId()
|
||||
<< " designator= " << templateData.designator().c_str()
|
||||
<< " tactIdent= " << templateData.tacticalIdentifier().c_str();
|
||||
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " templateId = " << templateData.templateId
|
||||
<< " typeId = " << templateData.typeId
|
||||
<< " designator= " << templateData.designator.c_str()
|
||||
<< " tactIdent= " << templateData.tacticalIdentifier.c_str();
|
||||
|
||||
const Type &type = m_dtc->type(templateData.typeId());
|
||||
const TypeClass &tc = type.typeClass();
|
||||
const Type &type = m_dtc->type(templateData.typeId);
|
||||
const TypeClass &tc = type.typeClass;
|
||||
if ((m_asSupportService &&
|
||||
(tc == TypeClass::SupportEntity || tc == TypeClass::SupportUnit))
|
||||
||
|
||||
@@ -344,22 +346,22 @@ bool OrgChartMain::initButtons()
|
||||
{
|
||||
|
||||
|
||||
plAction.identifier = QString::fromStdString(templateData.designator()) + QString::number(templateData.templateId());
|
||||
QString templateText = QString::fromStdString(templateData.designator());
|
||||
if (!templateText.isEmpty() && templateData.tacticalIdentifier().size() > 0)
|
||||
plAction.identifier = QString::fromStdString(templateData.designator) + QString::number(templateData.templateId);
|
||||
QString templateText = QString::fromStdString(templateData.designator);
|
||||
if (!templateText.isEmpty() && templateData.tacticalIdentifier.size() > 0)
|
||||
templateText.append(QStringLiteral(" / "));
|
||||
templateText.append(QString::fromStdString(templateData.tacticalIdentifier()));
|
||||
templateText.append(QString::fromStdString(templateData.tacticalIdentifier));
|
||||
|
||||
plAction.menuText = templateText;
|
||||
plAction.directFunc = [](const LtsWidgets::PluginData &) { return; };
|
||||
|
||||
const int templateId = templateData.templateId();
|
||||
const int templateId = templateData.templateId;
|
||||
LtsWidgets::LtsDragIcon *icon = m_session->addAction(plAction);
|
||||
|
||||
|
||||
AdvancedSymbology::SymbolResultWatcherQWidgetBase *symbolWatcher =
|
||||
new AdvancedSymbology::SymbolResultWatcherQWidget<LtsWidgets::LtsDragIcon>(icon);
|
||||
QString symbolString = QString::fromStdString(type.symbol());
|
||||
QString symbolString = QString::fromStdString(type.symbol);
|
||||
symbolWatcher->setSymbolResult(m_asbIfc->findPreview(symbolString));
|
||||
|
||||
|
||||
@@ -383,8 +385,8 @@ bool OrgChartMain::initButtons()
|
||||
int partyId = m_ui->cbParty->currentData().toInt();
|
||||
if (partyId > 0)
|
||||
{
|
||||
color = QColor::fromRgb(QRgb(m_dtc->party(partyId).color()));
|
||||
role = AdvancedSymbology::roleToRole<>(m_dtc->party(partyId).role());
|
||||
color = QColor::fromRgb(QRgb(m_dtc->party(partyId).color));
|
||||
role = AdvancedSymbology::roleToRole<>(m_dtc->party(partyId).role);
|
||||
}
|
||||
}
|
||||
mimeDataHelper->run(role, color);
|
||||
@@ -400,18 +402,18 @@ bool OrgChartMain::initButtons()
|
||||
QByteArray OrgChartMain::getMimeData(const Type &type, const QImage &image)
|
||||
{
|
||||
QJsonObject retObj;
|
||||
QString isUnit = (type.typeClass() == ParticipantManagement::TypeClass::Unit
|
||||
|| type.typeClass() == ParticipantManagement::TypeClass::SupportUnit)
|
||||
QString isUnit = (type.typeClass == ParticipantManagement::TypeClass::Unit
|
||||
|| type.typeClass == ParticipantManagement::TypeClass::SupportUnit)
|
||||
? QStringLiteral("true") : QString();
|
||||
|
||||
retObj.insert(QStringLiteral("name"), QString::fromStdString(type.name()));
|
||||
retObj.insert(QStringLiteral("title"), QString::fromStdString(type.name()));
|
||||
retObj.insert(QStringLiteral("typeId"), type.id());
|
||||
retObj.insert(QStringLiteral("symbol"), QString::fromStdString(type.symbol()));
|
||||
retObj.insert(QStringLiteral("name"), QString::fromStdString(type.name));
|
||||
retObj.insert(QStringLiteral("title"), QString::fromStdString(type.name));
|
||||
retObj.insert(QStringLiteral("typeId"), type.id);
|
||||
retObj.insert(QStringLiteral("symbol"), QString::fromStdString(type.symbol));
|
||||
retObj.insert(QStringLiteral("eqNr"), 0);
|
||||
retObj.insert(QStringLiteral("info"), QString());
|
||||
retObj.insert(QStringLiteral("sign"), QString());
|
||||
retObj.insert(QStringLiteral("tactIdentifier"), QString::fromStdString(type.name()));
|
||||
retObj.insert(QStringLiteral("tactIdentifier"), QString::fromStdString(type.name));
|
||||
retObj.insert(QStringLiteral("designator"), QString());
|
||||
retObj.insert(QStringLiteral("isUnit"), isUnit);
|
||||
retObj.insert(QStringLiteral("ddsId"), 0);
|
||||
@@ -435,27 +437,27 @@ QVector<ParticipantData> OrgChartMain::getDataOf(const QJsonObject &obj, int sup
|
||||
{
|
||||
QVector<ParticipantData> ret;
|
||||
ParticipantData pData;
|
||||
pData.designator() = obj.value(QStringLiteral("designator")).toString().toStdString();
|
||||
pData.designator = obj.value(QStringLiteral("designator")).toString().toStdString();
|
||||
if (obj.value(QStringLiteral("eqNr")).toInt() > 0)
|
||||
pData.equipmentNumber().set(obj.value(QStringLiteral("eqNr")).toInt());
|
||||
pData.equipmentNumber.set(obj.value(QStringLiteral("eqNr")).toInt());
|
||||
|
||||
pData.info() = obj.value(QStringLiteral("info")).toString().toStdString();
|
||||
pData.name() = obj.value(QStringLiteral("sign")).toString().toStdString();
|
||||
pData.modId(obj.value(QStringLiteral("id")).toInt());
|
||||
pData.id(obj.value(QStringLiteral("ddsId")).toInt() < 0 ? 0 : obj.value(QStringLiteral("ddsId")).toInt());
|
||||
pData.partyId(m_party);
|
||||
pData.superiorModId(superiorModId);
|
||||
pData.hierarchyNumber(hierarchyNr);
|
||||
pData.symbol() = obj.value(QStringLiteral("symbol")).toString().toStdString();
|
||||
pData.tacticalIdentifier() = obj.value(QStringLiteral("tactIdentifier")).toString().toStdString();
|
||||
pData.typeId(obj.value(QStringLiteral("typeId")).toInt());
|
||||
pData.info = obj.value(QStringLiteral("info")).toString().toStdString();
|
||||
pData.name = obj.value(QStringLiteral("sign")).toString().toStdString();
|
||||
pData.modId = obj.value(QStringLiteral("id")).toInt();
|
||||
pData.id = obj.value(QStringLiteral("ddsId")).toInt() < 0 ? 0 : obj.value(QStringLiteral("ddsId")).toInt();
|
||||
pData.partyId = m_party;
|
||||
pData.superiorModId = superiorModId;
|
||||
pData.hierarchyNumber = hierarchyNr;
|
||||
pData.symbol = obj.value(QStringLiteral("symbol")).toString().toStdString();
|
||||
pData.tacticalIdentifier = obj.value(QStringLiteral("tactIdentifier")).toString().toStdString();
|
||||
pData.typeId = obj.value(QStringLiteral("typeId")).toInt();
|
||||
if (obj.value(QStringLiteral("assignState")).toInt() >= 0)
|
||||
pData.assignState(static_cast<ParticipantAssignState>(obj.value(QStringLiteral("assignState")).toInt()));
|
||||
pData.assignState = static_cast<ParticipantAssignState>(obj.value(QStringLiteral("assignState")).toInt());
|
||||
QJsonArray arr = obj.value(QStringLiteral("children")).toArray();
|
||||
int hierarNr = 1;
|
||||
for (auto arrItem = arr.constBegin(); arrItem != arr.constEnd(); ++arrItem)
|
||||
{
|
||||
ret.append(getDataOf((*arrItem).toObject(), pData.modId(), hierarNr));
|
||||
ret.append(getDataOf((*arrItem).toObject(), pData.modId, hierarNr));
|
||||
hierarNr++;
|
||||
}
|
||||
ret.append(pData);
|
||||
@@ -466,24 +468,24 @@ QVector<TemplateData> OrgChartMain::getTemplateDataOf(const QJsonObject &obj, in
|
||||
{
|
||||
QVector<TemplateData> ret;
|
||||
TemplateData tData;
|
||||
tData.designator() = obj.value(QStringLiteral("designator")).toString().toStdString();
|
||||
tData.equipmentNumber(obj.value(QStringLiteral("eqNr")).toInt());
|
||||
tData.designator = obj.value(QStringLiteral("designator")).toString().toStdString();
|
||||
tData.equipmentNumber = obj.value(QStringLiteral("eqNr")).toInt();
|
||||
|
||||
tData.info() = obj.value(QStringLiteral("info")).toString().toStdString();
|
||||
tData.name() = obj.value(QStringLiteral("sign")).toString().toStdString();
|
||||
tData.modId(obj.value(QStringLiteral("id")).toInt());
|
||||
tData.info = obj.value(QStringLiteral("info")).toString().toStdString();
|
||||
tData.name = obj.value(QStringLiteral("sign")).toString().toStdString();
|
||||
tData.modId = obj.value(QStringLiteral("id")).toInt();
|
||||
if (obj.value(QStringLiteral("ddsId")).toInt() > 0)
|
||||
tData.templateId(obj.value(QStringLiteral("ddsId")).toInt());
|
||||
tData.superiorModId(superiorModId);
|
||||
tData.hierarchyNumber(hierarchyNr);
|
||||
tData.symbol() = obj.value(QStringLiteral("symbol")).toString().toStdString();
|
||||
tData.tacticalIdentifier() = obj.value(QStringLiteral("tactIdentifier")).toString().toStdString();
|
||||
tData.typeId(obj.value(QStringLiteral("typeId")).toInt());
|
||||
tData.templateId = obj.value(QStringLiteral("ddsId")).toInt();
|
||||
tData.superiorModId = superiorModId;
|
||||
tData.hierarchyNumber = hierarchyNr;
|
||||
tData.symbol = obj.value(QStringLiteral("symbol")).toString().toStdString();
|
||||
tData.tacticalIdentifier = obj.value(QStringLiteral("tactIdentifier")).toString().toStdString();
|
||||
tData.typeId = obj.value(QStringLiteral("typeId")).toInt();
|
||||
QJsonArray arr = obj.value(QStringLiteral("children")).toArray();
|
||||
int hierarNr = 1;
|
||||
for (auto arrItem = arr.constBegin(); arrItem != arr.constEnd(); ++arrItem)
|
||||
{
|
||||
ret.append(getTemplateDataOf((*arrItem).toObject(), tData.modId(), hierarNr));
|
||||
ret.append(getTemplateDataOf((*arrItem).toObject(), tData.modId, hierarNr));
|
||||
hierarNr++;
|
||||
}
|
||||
ret.append(tData);
|
||||
@@ -500,34 +502,34 @@ bool OrgChartMain::apply()
|
||||
ParticipantData OrgChartMain::convertFromJson(const QJsonObject &obj)
|
||||
{
|
||||
ParticipantData pData;
|
||||
pData.designator(obj.value(QStringLiteral("designator")).toString().toStdString());
|
||||
pData.tacticalIdentifier(obj.value(QStringLiteral("tactIdentifier")).toString().toStdString());
|
||||
pData.info(obj.value(QStringLiteral("info")).toString().toStdString());
|
||||
pData.equipmentNumber().set(obj.value(QStringLiteral("eqNr")).toInt());
|
||||
pData.typeId(obj.value(QStringLiteral("typeId")).toInt());
|
||||
pData.modId(obj.value(QStringLiteral("ddsId")).toInt());
|
||||
pData.name(obj.value(QStringLiteral("sign")).toString().toStdString());
|
||||
pData.partyId(m_party);
|
||||
pData.id(obj.value(QStringLiteral("ddsId")).toInt());
|
||||
pData.designator = obj.value(QStringLiteral("designator")).toString().toStdString();
|
||||
pData.tacticalIdentifier = obj.value(QStringLiteral("tactIdentifier")).toString().toStdString();
|
||||
pData.info = obj.value(QStringLiteral("info")).toString().toStdString();
|
||||
pData.equipmentNumber.set(obj.value(QStringLiteral("eqNr")).toInt());
|
||||
pData.typeId = obj.value(QStringLiteral("typeId")).toInt();
|
||||
pData.modId = obj.value(QStringLiteral("ddsId")).toInt();
|
||||
pData.name = obj.value(QStringLiteral("sign")).toString().toStdString();
|
||||
pData.partyId = m_party;
|
||||
pData.id = obj.value(QStringLiteral("ddsId")).toInt();
|
||||
if (obj.value(QStringLiteral("assignState")).toInt() >= 0)
|
||||
pData.assignState(static_cast<ParticipantAssignState>(obj.value(QStringLiteral("assignState")).toInt()));
|
||||
pData.symbol(obj.value(QStringLiteral("symbol")).toString().toStdString());
|
||||
pData.assignState = static_cast<ParticipantAssignState>(obj.value(QStringLiteral("assignState")).toInt());
|
||||
pData.symbol = obj.value(QStringLiteral("symbol")).toString().toStdString();
|
||||
return pData;
|
||||
}
|
||||
|
||||
TemplateData OrgChartMain::fromParticipantData(const ParticipantData &data)
|
||||
{
|
||||
TemplateData ret;
|
||||
ret.name() = data.name();
|
||||
ret.isDeleted(data.isDeleted());
|
||||
ret.modId(data.modId());
|
||||
ret.superiorModId(data.superiorModId());
|
||||
ret.equipmentNumber(data.hierarchyNumber());
|
||||
ret.info() = data.info();
|
||||
ret.symbol() = data.symbol();
|
||||
ret.tacticalIdentifier() = data.tacticalIdentifier();
|
||||
ret.templateId(ret.modId());
|
||||
ret.typeId(data.typeId());
|
||||
ret.name = data.name;
|
||||
ret.isDeleted = data.isDeleted;
|
||||
ret.modId = data.modId;
|
||||
ret.superiorModId = data.superiorModId;
|
||||
ret.equipmentNumber = data.hierarchyNumber;
|
||||
ret.info = data.info;
|
||||
ret.symbol = data.symbol;
|
||||
ret.tacticalIdentifier = data.tacticalIdentifier;
|
||||
ret.templateId = ret.modId;
|
||||
ret.typeId = data.typeId;
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -621,7 +623,7 @@ void OrgChartMain::onEdit(const QString &data)
|
||||
{
|
||||
m_session->addWidget(tab,
|
||||
group,
|
||||
QStringLiteral("Edit %1").arg(pData.modId()),
|
||||
QStringLiteral("Edit %1").arg(pData.modId),
|
||||
LtsWidgets::LayoutArea::eDialogTab);
|
||||
connect(tab, &ParticipantEditItemTab::updateItem, this, &OrgChartMain::onUpdateItem);
|
||||
}
|
||||
@@ -640,7 +642,7 @@ void OrgChartMain::onDelete(const QString &data)
|
||||
return;
|
||||
|
||||
ParticipantData pData = convertFromJson(obj);
|
||||
pData.isDeleted(true);
|
||||
pData.isDeleted = true;
|
||||
if (!m_isTemplate)
|
||||
m_participantsToDelete.append(pData);
|
||||
else
|
||||
@@ -656,26 +658,26 @@ void OrgChartMain::onUpdateItem(const QModelIndex &parent, const ParticipantData
|
||||
Q_UNUSED(parent);
|
||||
|
||||
QJsonObject obj;
|
||||
Type type = m_dtc->type(editData.typeId());
|
||||
Type type = m_dtc->type(editData.typeId);
|
||||
|
||||
QString isUnit = (type.typeClass() == ParticipantManagement::TypeClass::Unit
|
||||
|| type.typeClass() == ParticipantManagement::TypeClass::SupportUnit)
|
||||
QString isUnit = (type.typeClass == ParticipantManagement::TypeClass::Unit
|
||||
|| type.typeClass == ParticipantManagement::TypeClass::SupportUnit)
|
||||
? QStringLiteral("true") : QString();
|
||||
|
||||
QString name = QString::fromStdString(editData.designator()) + QLatin1Char(' ') + QString::fromStdString(editData.tacticalIdentifier());
|
||||
QString name = QString::fromStdString(editData.designator) + QLatin1Char(' ') + QString::fromStdString(editData.tacticalIdentifier);
|
||||
obj.insert(QStringLiteral("name"), name);
|
||||
obj.insert(QStringLiteral("designator"), QString::fromStdString(editData.designator()));
|
||||
obj.insert(QStringLiteral("tactIdentifier"), QString::fromStdString(editData.tacticalIdentifier()));
|
||||
obj.insert(QStringLiteral("info"), QString::fromStdString(editData.info()));
|
||||
obj.insert(QStringLiteral("sign"), QString::fromStdString(editData.name()));
|
||||
obj.insert(QStringLiteral("title"), QString::fromStdString(type.name()));
|
||||
obj.insert(QStringLiteral("typeId"), editData.typeId());
|
||||
obj.insert(QStringLiteral("symbol"), QString::fromStdString(editData.symbol()));
|
||||
obj.insert(QStringLiteral("eqNr"), editData.equipmentNumber().is_set() ? editData.equipmentNumber().get() : 0);
|
||||
obj.insert(QStringLiteral("designator"), QString::fromStdString(editData.designator));
|
||||
obj.insert(QStringLiteral("tactIdentifier"), QString::fromStdString(editData.tacticalIdentifier));
|
||||
obj.insert(QStringLiteral("info"), QString::fromStdString(editData.info));
|
||||
obj.insert(QStringLiteral("sign"), QString::fromStdString(editData.name));
|
||||
obj.insert(QStringLiteral("title"), QString::fromStdString(type.name));
|
||||
obj.insert(QStringLiteral("typeId"), editData.typeId);
|
||||
obj.insert(QStringLiteral("symbol"), QString::fromStdString(editData.symbol));
|
||||
obj.insert(QStringLiteral("eqNr"), editData.equipmentNumber.is_set() ? editData.equipmentNumber.get() : 0);
|
||||
obj.insert(QStringLiteral("isUnit"), isUnit);
|
||||
obj.insert(QStringLiteral("assignState"), editData.assignState().underlying());
|
||||
obj.insert(QStringLiteral("ddsId"), editData.id());
|
||||
obj.insert(QStringLiteral("id"), editData.modId());
|
||||
obj.insert(QStringLiteral("assignState"), static_cast<int>(editData.assignState));
|
||||
obj.insert(QStringLiteral("ddsId"), editData.id);
|
||||
obj.insert(QStringLiteral("id"), editData.modId);
|
||||
|
||||
|
||||
|
||||
@@ -694,21 +696,21 @@ void OrgChartMain::onUpdateItem(const QModelIndex &parent, const ParticipantData
|
||||
QString imageAdd = QStringLiteral("<img src=\"data:image/png;base64,%1\">")
|
||||
.arg(QString::fromLatin1(data.toBase64()));
|
||||
obj.insert(QStringLiteral("image"), imageAdd);
|
||||
m_orgChart->sendToOrgChart(editData.modId(), obj);
|
||||
m_orgChart->sendToOrgChart(editData.modId, obj);
|
||||
slotChangesMade();
|
||||
}
|
||||
});
|
||||
|
||||
if (m_ui->cbParty->isVisible())
|
||||
{
|
||||
AdvancedSymbology::SymbolDataToRender symDataToRender(QString::fromStdString(editData.symbol()));
|
||||
symDataToRender.role = AdvancedSymbology::roleToRole(m_dtc->party(m_party).role());
|
||||
symDataToRender.fillColor = QColor::fromRgb(QRgb(m_dtc->party(m_party).color()));
|
||||
AdvancedSymbology::SymbolDataToRender symDataToRender(QString::fromStdString(editData.symbol));
|
||||
symDataToRender.role = AdvancedSymbology::roleToRole(m_dtc->party(m_party).role);
|
||||
symDataToRender.fillColor = QColor::fromRgb(QRgb(m_dtc->party(m_party).color));
|
||||
symDataToRender.fillColorReplace = true;
|
||||
watcher->setSymbolResult(m_asbIfc->findImage(symDataToRender));
|
||||
}
|
||||
else
|
||||
watcher->setSymbolResult(m_asbIfc->findBaseSymbol(QString::fromStdString(editData.symbol())));
|
||||
watcher->setSymbolResult(m_asbIfc->findBaseSymbol(QString::fromStdString(editData.symbol)));
|
||||
}
|
||||
|
||||
void OrgChartMain::onNewHierarchy(const QString &data)
|
||||
@@ -727,7 +729,7 @@ void OrgChartMain::onNewHierarchy(const QString &data)
|
||||
return;
|
||||
|
||||
ModifyParticipantDataRequest req;
|
||||
LtsUtils::convert(sendTo, req.data());
|
||||
LtsUtils::convert(sendTo, req.data);
|
||||
m_requestHelper->addRequest([this, req]()
|
||||
{
|
||||
return m_ftc->modifyParticipantDataRequest(req, this);
|
||||
@@ -741,7 +743,7 @@ void OrgChartMain::onNewHierarchy(const QString &data)
|
||||
return;
|
||||
|
||||
ModifyTemplateDataRequest req;
|
||||
LtsUtils::convert(sendTo, req.data());
|
||||
LtsUtils::convert(sendTo, req.data);
|
||||
m_requestHelper->addRequest([this, req]()
|
||||
{
|
||||
return m_ftc->modifyTemplateDataRequest(req, this);
|
||||
@@ -773,10 +775,10 @@ void OrgChartMain::onReload()
|
||||
|
||||
void OrgChartMain::onUpdateParticipant(const Participant &data, DataModification modType)
|
||||
{
|
||||
if (data.partyId() != m_party)
|
||||
if (data.partyId != m_party)
|
||||
return;
|
||||
if (modType == DataModification::eModified)
|
||||
m_orgChart->updateParticipant(data.id());
|
||||
m_orgChart->updateParticipant(data.id);
|
||||
else
|
||||
onPartyChanged();
|
||||
}
|
||||
|
||||
+18
-16
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "org_chart_main_helper.h"
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
|
||||
#include <QtCore/QBuffer>
|
||||
|
||||
@@ -11,6 +12,7 @@ namespace ParticipantManagement
|
||||
|
||||
OrgChartMain_MimeDataHelper::OrgChartMain_MimeDataHelper(QObject *parent)
|
||||
: QObject(parent)
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("OrgChartMain_MimeDataHelper"))
|
||||
{
|
||||
TRACE_LOG(m_logger) << Q_FUNC_INFO << "START";
|
||||
TRACE_LOG(m_logger) << Q_FUNC_INFO << "END";
|
||||
@@ -94,7 +96,7 @@ void OrgChartMain_MimeDataHelper::prepareBulkRenderer(int templateId)
|
||||
const TemplateParticipant &tPart = m_dtc->templateParticipant(templateId);
|
||||
|
||||
const AdvancedSymbology::SymbolDataToRender &symDataToRender =
|
||||
symbolDataToRender(QString::fromStdString(tPart.symbol()));
|
||||
symbolDataToRender(QString::fromStdString(tPart.symbol));
|
||||
|
||||
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " addRequest for templateId = " << templateId << ": "
|
||||
<< " tPart = " << tPart
|
||||
@@ -105,9 +107,9 @@ void OrgChartMain_MimeDataHelper::prepareBulkRenderer(int templateId)
|
||||
|
||||
|
||||
|
||||
if (tPart.inferiorIds().is_set())
|
||||
if (tPart.inferiorIds.is_set())
|
||||
{
|
||||
const std::vector<int> &inferior = tPart.inferiorIds().get();
|
||||
const std::vector<int> &inferior = tPart.inferiorIds.get();
|
||||
for (int infId : inferior)
|
||||
prepareBulkRenderer(infId);
|
||||
}
|
||||
@@ -120,26 +122,26 @@ QJsonObject OrgChartMain_MimeDataHelper::getMimeData(int templateId)
|
||||
QJsonObject retObj;
|
||||
|
||||
const TemplateParticipant &tPart = m_dtc->templateParticipant(templateId);
|
||||
const Type &type = m_dtc->type(tPart.typeId());
|
||||
QString isUnit = (type.typeClass() == ParticipantManagement::TypeClass::Unit
|
||||
|| type.typeClass() == ParticipantManagement::TypeClass::SupportUnit)
|
||||
const Type &type = m_dtc->type(tPart.typeId);
|
||||
QString isUnit = (type.typeClass == ParticipantManagement::TypeClass::Unit
|
||||
|| type.typeClass == ParticipantManagement::TypeClass::SupportUnit)
|
||||
? QLatin1String("true") : QLatin1String("");
|
||||
|
||||
retObj.insert(QLatin1String("name"), QString::fromStdString(tPart.designator()));
|
||||
retObj.insert(QLatin1String("title"), QString::fromStdString(tPart.designator()));
|
||||
retObj.insert(QLatin1String("typeId"), tPart.typeId());
|
||||
retObj.insert(QLatin1String("symbol"), QString::fromStdString(tPart.symbol()));
|
||||
retObj.insert(QLatin1String("name"), QString::fromStdString(tPart.designator));
|
||||
retObj.insert(QLatin1String("title"), QString::fromStdString(tPart.designator));
|
||||
retObj.insert(QLatin1String("typeId"), tPart.typeId);
|
||||
retObj.insert(QLatin1String("symbol"), QString::fromStdString(tPart.symbol));
|
||||
retObj.insert(QLatin1String("eqNr"), 0);
|
||||
retObj.insert(QLatin1String("info"), QString::fromStdString(tPart.info()));
|
||||
retObj.insert(QLatin1String("sign"), QString::fromStdString(tPart.name()));
|
||||
retObj.insert(QLatin1String("tactIdentifier"), QString::fromStdString(tPart.tacticalIdentifier()));
|
||||
retObj.insert(QLatin1String("info"), QString::fromStdString(tPart.info));
|
||||
retObj.insert(QLatin1String("sign"), QString::fromStdString(tPart.name));
|
||||
retObj.insert(QLatin1String("tactIdentifier"), QString::fromStdString(tPart.tacticalIdentifier));
|
||||
retObj.insert(QLatin1String("isUnit"), isUnit);
|
||||
retObj.insert(QLatin1String("ddsId"), -1);
|
||||
retObj.insert(QLatin1String("id"), -1);
|
||||
retObj.insert(QLatin1String("assignState"), -1);
|
||||
|
||||
const AdvancedSymbology::SymbolDataToRender &symDataToRender =
|
||||
symbolDataToRender(QString::fromStdString(tPart.symbol()));
|
||||
symbolDataToRender(QString::fromStdString(tPart.symbol));
|
||||
|
||||
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " getResult for templateId = " << templateId
|
||||
<< " symDataToRender=" << symDataToRender.toString();
|
||||
@@ -165,11 +167,11 @@ QJsonObject OrgChartMain_MimeDataHelper::getMimeData(int templateId)
|
||||
|
||||
|
||||
|
||||
if (tPart.inferiorIds().is_set())
|
||||
if (tPart.inferiorIds.is_set())
|
||||
{
|
||||
QJsonArray arr;
|
||||
|
||||
const std::vector<int> &inferior = tPart.inferiorIds().get();
|
||||
const std::vector<int> &inferior = tPart.inferiorIds.get();
|
||||
for (int infId : inferior)
|
||||
arr.append(getMimeData(infId));
|
||||
retObj.insert(QLatin1String("children"), arr);
|
||||
|
||||
+3
-3
@@ -2,13 +2,13 @@
|
||||
|
||||
#include "participant_org_chart.h"
|
||||
#include "ui_participant_org_chart.h"
|
||||
#include <QtWebEngineWidgets/QWebEngineSettings>
|
||||
#include <QtWebEngineCore/QWebEngineSettings>
|
||||
|
||||
#include <Symbology/symbol_data_to_render_role.h>
|
||||
|
||||
#include <QtCore/QFile>
|
||||
#include <QtWebEngine/QtWebEngine>
|
||||
#include <QtWebEngineWidgets/QWebEnginePage>
|
||||
#include <QtWebEngineWidgets/QtWebEngineWidgets>
|
||||
#include <QtWebEngineCore/QWebEnginePage>
|
||||
#include <QtCore/QJsonArray>
|
||||
|
||||
namespace ParticipantManagement
|
||||
|
||||
+50
-48
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "participant_org_chart_helper.h"
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
|
||||
#include <QtCore/QBuffer>
|
||||
#include <QtCore/QJsonArray>
|
||||
@@ -12,6 +13,7 @@ namespace ParticipantManagement
|
||||
|
||||
ParticipantOrgChart_MimeDataHelper::ParticipantOrgChart_MimeDataHelper(QObject *parent)
|
||||
: QObject(parent)
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("ParticipantOrgChart_MimeDataHelper"))
|
||||
{
|
||||
TRACE_LOG(m_logger) << Q_FUNC_INFO << "START";
|
||||
TRACE_LOG(m_logger) << Q_FUNC_INFO << "END";
|
||||
@@ -104,19 +106,19 @@ bool ParticipantOrgChart_MimeDataHelper::prepareBulkRenderer(int participantId,
|
||||
if (m_participantMode)
|
||||
{
|
||||
const Participant &part = m_dtc->participant(participantId);
|
||||
if (part.id() != participantId)
|
||||
if (part.id != participantId)
|
||||
return false;
|
||||
inferior = part.inferiorIds();
|
||||
sidc = QString::fromStdString(part.symbol());
|
||||
inferior = part.inferiorIds;
|
||||
sidc = QString::fromStdString(part.symbol);
|
||||
}else
|
||||
{
|
||||
const TemplateParticipant &part = m_dtc->templateParticipant(participantId);
|
||||
if (part.templateId() != participantId)
|
||||
if (part.templateId != participantId)
|
||||
return false;
|
||||
|
||||
sidc = QString::fromStdString(part.symbol());
|
||||
if (part.inferiorIds().is_set())
|
||||
inferior = part.inferiorIds().get();
|
||||
sidc = QString::fromStdString(part.symbol);
|
||||
if (part.inferiorIds.is_set())
|
||||
inferior = part.inferiorIds.get();
|
||||
}
|
||||
|
||||
if (m_bulkRendererFindImage)
|
||||
@@ -150,33 +152,33 @@ QJsonObject ParticipantOrgChart_MimeDataHelper::getMimeData(int participantId, b
|
||||
<< ", single=" << single;
|
||||
|
||||
ParticipantManagement::Participant part = m_dtc->participant(participantId);
|
||||
if (part.id() != participantId)
|
||||
if (part.id != participantId)
|
||||
return QJsonObject();
|
||||
ParticipantManagement::Type type = m_dtc->type(part.typeId());
|
||||
ParticipantManagement::Type type = m_dtc->type(part.typeId);
|
||||
|
||||
int eqNr = part.equipmentNumber().is_set() ? part.equipmentNumber().get() : 0;
|
||||
QString isUnit = (type.typeClass() == ParticipantManagement::TypeClass::Unit
|
||||
|| type.typeClass() == ParticipantManagement::TypeClass::SupportUnit)
|
||||
int eqNr = part.equipmentNumber.is_set() ? part.equipmentNumber.get() : 0;
|
||||
QString isUnit = (type.typeClass == ParticipantManagement::TypeClass::Unit
|
||||
|| type.typeClass == ParticipantManagement::TypeClass::SupportUnit)
|
||||
? QLatin1String("true") : QString();
|
||||
|
||||
QJsonObject retObj;
|
||||
QString name = QString::fromStdString(part.designator()) + QLatin1Char(' ') + QString::fromStdString(part.tacticalIdentifier());
|
||||
QString name = QString::fromStdString(part.designator) + QLatin1Char(' ') + QString::fromStdString(part.tacticalIdentifier);
|
||||
retObj.insert(QLatin1String("name"), name);
|
||||
retObj.insert(QLatin1String("designator"), QString::fromStdString(part.designator()));
|
||||
retObj.insert(QLatin1String("tactIdentifier"), QString::fromStdString(part.tacticalIdentifier()));
|
||||
retObj.insert(QLatin1String("title"), QString::fromStdString(type.name()));
|
||||
retObj.insert(QLatin1String("info"), QString::fromStdString(part.info()));
|
||||
retObj.insert(QLatin1String("sign"), QString::fromStdString(part.name()));
|
||||
retObj.insert(QLatin1String("typeId"), part.typeId());
|
||||
retObj.insert(QLatin1String("symbol"), QString::fromStdString(part.symbol()));
|
||||
retObj.insert(QLatin1String("designator"), QString::fromStdString(part.designator));
|
||||
retObj.insert(QLatin1String("tactIdentifier"), QString::fromStdString(part.tacticalIdentifier));
|
||||
retObj.insert(QLatin1String("title"), QString::fromStdString(type.name));
|
||||
retObj.insert(QLatin1String("info"), QString::fromStdString(part.info));
|
||||
retObj.insert(QLatin1String("sign"), QString::fromStdString(part.name));
|
||||
retObj.insert(QLatin1String("typeId"), part.typeId);
|
||||
retObj.insert(QLatin1String("symbol"), QString::fromStdString(part.symbol));
|
||||
retObj.insert(QLatin1String("eqNr"), eqNr);
|
||||
retObj.insert(QLatin1String("isUnit"), isUnit);
|
||||
retObj.insert(QLatin1String("ddsId"), part.id());
|
||||
retObj.insert(QLatin1String("id"), part.id());
|
||||
retObj.insert(QLatin1String("assignState"), part.assignState().underlying());
|
||||
retObj.insert(QLatin1String("ddsId"), part.id);
|
||||
retObj.insert(QLatin1String("id"), part.id);
|
||||
retObj.insert(QLatin1String("assignState"), static_cast<int>(part.assignState));
|
||||
|
||||
|
||||
const QString &sidc = QString::fromStdString(part.symbol());
|
||||
const QString &sidc = QString::fromStdString(part.symbol);
|
||||
QSharedPointer<AdvancedSymbology::SymbolResultWatcher> watcher;
|
||||
|
||||
if (m_bulkRendererFindImage)
|
||||
@@ -206,11 +208,11 @@ QJsonObject ParticipantOrgChart_MimeDataHelper::getMimeData(int participantId, b
|
||||
|
||||
|
||||
|
||||
if (part.inferiorIds().size() > 0 && !single)
|
||||
if (part.inferiorIds.size() > 0 && !single)
|
||||
{
|
||||
QJsonArray arr;
|
||||
|
||||
const std::vector<int> &inferior = part.inferiorIds();
|
||||
const std::vector<int> &inferior = part.inferiorIds;
|
||||
for (int infId : inferior)
|
||||
arr.append(getMimeData(infId));
|
||||
retObj.insert(QLatin1String("children"), arr);
|
||||
@@ -228,33 +230,33 @@ QJsonObject ParticipantOrgChart_MimeDataHelper::getTemplateMimeData(int particip
|
||||
<< ", single=" << single;
|
||||
|
||||
ParticipantManagement::TemplateParticipant part = m_dtc->templateParticipant(participantId);
|
||||
if (part.templateId() != participantId)
|
||||
if (part.templateId != participantId)
|
||||
return QJsonObject();
|
||||
ParticipantManagement::Type type = m_dtc->type(part.typeId());
|
||||
ParticipantManagement::Type type = m_dtc->type(part.typeId);
|
||||
|
||||
int eqNr = part.equipmentNumber();
|
||||
QString isUnit = (type.typeClass() == ParticipantManagement::TypeClass::Unit
|
||||
|| type.typeClass() == ParticipantManagement::TypeClass::SupportUnit)
|
||||
int eqNr = part.equipmentNumber;
|
||||
QString isUnit = (type.typeClass == ParticipantManagement::TypeClass::Unit
|
||||
|| type.typeClass == ParticipantManagement::TypeClass::SupportUnit)
|
||||
? QLatin1String("true") : QString();
|
||||
|
||||
QJsonObject retObj;
|
||||
QString name = QString::fromStdString(part.designator()) + QLatin1Char(' ') + QString::fromStdString(part.tacticalIdentifier());
|
||||
QString name = QString::fromStdString(part.designator) + QLatin1Char(' ') + QString::fromStdString(part.tacticalIdentifier);
|
||||
retObj.insert(QLatin1String("name"), name);
|
||||
retObj.insert(QLatin1String("designator"), QString::fromStdString(part.designator()));
|
||||
retObj.insert(QLatin1String("tactIdentifier"), QString::fromStdString(part.tacticalIdentifier()));
|
||||
retObj.insert(QLatin1String("title"), QString::fromStdString(type.name()));
|
||||
retObj.insert(QLatin1String("info"), QString::fromStdString(part.info()));
|
||||
retObj.insert(QLatin1String("sign"), QString::fromStdString(part.name()));
|
||||
retObj.insert(QLatin1String("typeId"), part.typeId());
|
||||
retObj.insert(QLatin1String("symbol"), QString::fromStdString(part.symbol()));
|
||||
retObj.insert(QLatin1String("designator"), QString::fromStdString(part.designator));
|
||||
retObj.insert(QLatin1String("tactIdentifier"), QString::fromStdString(part.tacticalIdentifier));
|
||||
retObj.insert(QLatin1String("title"), QString::fromStdString(type.name));
|
||||
retObj.insert(QLatin1String("info"), QString::fromStdString(part.info));
|
||||
retObj.insert(QLatin1String("sign"), QString::fromStdString(part.name));
|
||||
retObj.insert(QLatin1String("typeId"), part.typeId);
|
||||
retObj.insert(QLatin1String("symbol"), QString::fromStdString(part.symbol));
|
||||
retObj.insert(QLatin1String("eqNr"), eqNr);
|
||||
retObj.insert(QLatin1String("isUnit"), isUnit);
|
||||
retObj.insert(QLatin1String("ddsId"), part.templateId());
|
||||
retObj.insert(QLatin1String("id"), part.templateId());
|
||||
retObj.insert(QLatin1String("ddsId"), part.templateId);
|
||||
retObj.insert(QLatin1String("id"), part.templateId);
|
||||
retObj.insert(QLatin1String("assignState"), -1);
|
||||
|
||||
|
||||
const QString &sidc = QString::fromStdString(part.symbol());
|
||||
const QString &sidc = QString::fromStdString(part.symbol);
|
||||
QSharedPointer<AdvancedSymbology::SymbolResultWatcher> watcher;
|
||||
|
||||
if (m_bulkRendererFindImage)
|
||||
@@ -284,11 +286,11 @@ QJsonObject ParticipantOrgChart_MimeDataHelper::getTemplateMimeData(int particip
|
||||
|
||||
|
||||
|
||||
if (part.inferiorIds().is_set() && part.inferiorIds().get().size() > 0 && !single)
|
||||
if (part.inferiorIds.is_set() && part.inferiorIds.get().size() > 0 && !single)
|
||||
{
|
||||
QJsonArray arr;
|
||||
|
||||
const std::vector<int> &inferior = part.inferiorIds().get();
|
||||
const std::vector<int> &inferior = part.inferiorIds.get();
|
||||
for (int infId : inferior)
|
||||
arr.append(getTemplateMimeData(infId));
|
||||
retObj.insert(QLatin1String("children"), arr);
|
||||
@@ -299,7 +301,7 @@ QJsonObject ParticipantOrgChart_MimeDataHelper::getTemplateMimeData(int particip
|
||||
|
||||
AdvancedSymbology::Injury ParticipantOrgChart_MimeDataHelper::stateToInjury(const ProjectDataManagement::VulnerabilityState &state)
|
||||
{
|
||||
switch (state.underlying())
|
||||
switch (state)
|
||||
{
|
||||
case ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady:
|
||||
case ProjectDataManagement::VulnerabilityState::VulnerabilityState_TemporarySeverance:
|
||||
@@ -334,10 +336,10 @@ AdvancedSymbology::SymbolDataToRender ParticipantOrgChart_MimeDataHelper::symbol
|
||||
AdvancedSymbology::SymbolDataToRender symDataToRender(sidc);
|
||||
|
||||
DynamicParticipantData dData = m_dtc->dynamicParticipantData(participantId);
|
||||
if (dData.participantId() == participantId && !m_isMenuEnabled)
|
||||
if (dData.participantId == participantId && !m_isMenuEnabled)
|
||||
{
|
||||
const StateInformation &lastState = m_dtc->youngestStateInformation(dData.stateHistory());
|
||||
symDataToRender.injury = stateToInjury(lastState.vulnerabilityState());
|
||||
const StateInformation &lastState = m_dtc->youngestStateInformation(dData.stateHistory);
|
||||
symDataToRender.injury = stateToInjury(lastState.vulnerabilityState);
|
||||
symDataToRender.injuryColor = Qt::black;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user