lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Complete Qt6 migration: full clean build green across groups G1-G12 incl. runtime plugin set

Browse Source 
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:
berrux-dev committed 2026-10-20 09:36:57 +02:00
1 parent eb1d949edc
commit 815e16368e
1718 files changed
+126739 -18495
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/FunctionalArea/CustomView/aes_functional_area.cpp
+5 -5
View File
@@ -66,13 +66,13 @@ bool CustomViewFunctionalArea::init(const QModelIndex &idx)
bool CustomViewFunctionalArea::calculateIcon(const FunctionalArea &funcArea, const QColor &color)
{
Database::AesFunctionalArea funcOut;
funcOut.width = funcArea.area().width();
funcOut.length = funcArea.area().height();
funcOut.position = QPointF(funcArea.area().cornerBottomLeft().lon(),
funcArea.area().cornerBottomLeft().lat());
funcOut.width = funcArea.area.width;
funcOut.length = funcArea.area.height;
funcOut.position = QPointF(funcArea.area.cornerBottomLeft.lon,
funcArea.area.cornerBottomLeft.lat);
QPolygonF poly = AreaEffectSimulation::Polygons::functionalArea(funcOut);
Qt::BrushStyle bStyle = PixmapLabel::checkForBrushStyle(funcArea.effectStateId());
Qt::BrushStyle bStyle = PixmapLabel::checkForBrushStyle(funcArea.effectStateId);
const auto pix = Polygons::pixmapFromPolygon(PixmapLabel::geographic2Utm(poly), color, ICON_RESOLUTION, bStyle);
m_ui->lblIcon->setPixmap(pix);
qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/FunctionalArea/aes_functional_area_edit.cpp
+84 -84
View File
@@ -163,7 +163,7 @@ void FunctionalAreaEdit::enableUiElements(bool enable)
const FunctionalAreaType type = m_functionalAreaTypes.value(m_ui->cbFunctionalAreaType->currentData().toInt());
if (type.supplyMode() == AesOperatingMode::OmWaitingTime)
if (type.supplyMode == AesOperatingMode::OmWaitingTime)
{
DEBUG_LOG(m_logger) << "SUPPLY-MODE";
m_ui->sbDecontaminationMinutes->setEnabled(false);
@@ -209,24 +209,24 @@ void FunctionalAreaEdit::enableUiElements(bool enable)
m_ui->sbWidth->setEnabled(enable);
const bool deconAvailable = type.deconMode() != AesOperatingMode::OmNotAvailable;
const bool maintAvailable = type.maintMode() != AesOperatingMode::OmNotAvailable;
const bool medicAvailable = type.medicMode() != AesOperatingMode::OmNotAvailable;
const bool deconAvailable = type.deconMode != AesOperatingMode::OmNotAvailable;
const bool maintAvailable = type.maintMode != AesOperatingMode::OmNotAvailable;
const bool medicAvailable = type.medicMode != AesOperatingMode::OmNotAvailable;
m_ui->cbDecontamination->setEnabled(enable && deconAvailable);
m_ui->cbMaintenance->setEnabled(enable && maintAvailable);
m_ui->cbMedical->setEnabled(enable && medicAvailable);
m_ui->sbDecontaminationMinutes->setEnabled((m_ui->cbDecontamination->currentIndex() == AesOperatingMode::OmWaitingTime) && enable && deconAvailable);
m_ui->sbMaintanenceMinutes->setEnabled((m_ui->cbMaintenance->currentIndex() == AesOperatingMode::OmWaitingTime) && enable && maintAvailable);
m_ui->sbMedicalMinutes->setEnabled((m_ui->cbMedical->currentIndex() == AesOperatingMode::OmWaitingTime) && enable && medicAvailable);
m_ui->sbDecontaminationMinutes->setEnabled((m_ui->cbDecontamination->currentIndex() == static_cast<int>(AesOperatingMode::OmWaitingTime)) && enable && deconAvailable);
m_ui->sbMaintanenceMinutes->setEnabled((m_ui->cbMaintenance->currentIndex() == static_cast<int>(AesOperatingMode::OmWaitingTime)) && enable && maintAvailable);
m_ui->sbMedicalMinutes->setEnabled((m_ui->cbMedical->currentIndex() == static_cast<int>(AesOperatingMode::OmWaitingTime)) && enable && medicAvailable);
m_ui->sbSupplyMinutes->setEnabled(false);
m_ui->sbSupplyMinutes->setValue(0);
m_ui->cbSupply->setCurrentIndex(0);
setVisableFaButtons();
}
const bool isGenericFunctionalArea = type.id() == 0;
const bool symbolAvailable = type.pointSymbol().empty();
const bool isGenericFunctionalArea = type.id == 0;
const bool symbolAvailable = type.pointSymbol.empty();
m_ui->pbClear->setEnabled(enable);
m_ui->leIdentifier->setEnabled(enable || isOnlyNameModifiable());
@@ -244,18 +244,18 @@ void FunctionalAreaEdit::enableUiElements(bool enable)
m_ui->pbClearPointSymbol->setEnabled(isGenericFunctionalArea);
if (m_aesItem.effectStateId() == AesEffectState::EsExpired)
if (m_aesItem.effectStateId == AesEffectState::EsExpired)
{
m_ui->leIdentifier->setText(QString::fromStdString(m_aesItem.name()));
m_ui->leIdentifier->setText(QString::fromStdString(m_aesItem.name));
__unchange__();
DEBUG_LOG(m_logger) << "setUnchangeable()";
setUnchangeable();
disableButtons(true);
}
if (m_aesItem.effectStateId() == AesEffectState::EsActivated)
if (m_aesItem.effectStateId == AesEffectState::EsActivated)
{
QString name = m_ui->leIdentifier->text();
auto baseData = m_dtc->functionalArea(m_aesItem.id());
auto baseData = m_dtc->functionalArea(m_aesItem.id);
DEBUG_LOG(m_logger) << "init: setData";
setData(baseData, false);
__unchange__();
@@ -279,7 +279,7 @@ bool FunctionalAreaEdit::init(int areaId, bool copy,
m_ui->cbFunctionalAreaType->clear();
m_functionalAreaTypes = m_dtc->functionalAreaTypes();
for (const auto &type : std::as_const(m_functionalAreaTypes))
m_ui->cbFunctionalAreaType->addItem(AreaEffectSimulation::trFunctionalAreaTypeName(type.name()), type.id());
m_ui->cbFunctionalAreaType->addItem(AreaEffectSimulation::trFunctionalAreaTypeName(type.name), type.id);
bool editable = LtsSessionData::LtsSessionData::getInstance()->hasOperatorRight(OperatorRights::FunctionalAreasEdit) ||
m_session->app() == LtsAppDescriptor::App::OC;
@@ -326,36 +326,36 @@ void FunctionalAreaEdit::setData(const FunctionalArea &area, bool copy)
m_aesItem = area;
if (copy)
{
m_aesItem.id(0);
m_aesItem.effectStateId(AreaEffectSimulation::AesEffectState::get_default());
m_aesItem.id = 0;
m_aesItem.effectStateId = AreaEffectSimulation::AesEffectState::EsUnknown;
}
m_ui->leIdentifier->setText(QString::fromStdString(area.name()));
m_ui->dteEffectStart->setMsecsSinceEpoch(area.effectStart().is_set() ? area.effectStart().get() : 0);
m_ui->sbDurationMinutes->setValue(area.effectDuration() / 1000 / 60);
m_ui->sbWidth->setValue(area.area().width());
m_ui->sbHeight->setValue(area.area().height());
m_ui->cbParty->setCurrentIndex(m_ui->cbParty->findData(area.partyId().is_set() ? area.partyId().get() : 0));
m_ui->leIdentifier->setText(QString::fromStdString(area.name));
m_ui->dteEffectStart->setMsecsSinceEpoch(area.effectStart.has_value() ? area.effectStart.get() : 0);
m_ui->sbDurationMinutes->setValue(area.effectDuration / 1000 / 60);
m_ui->sbWidth->setValue(area.area.width);
m_ui->sbHeight->setValue(area.area.height);
m_ui->cbParty->setCurrentIndex(m_ui->cbParty->findData(area.partyId.has_value() ? area.partyId.get() : 0));
const QPointF bottomLeft(area.area().cornerBottomLeft().lon(), area.area().cornerBottomLeft().lat());
const QPointF centerpoint = Polygons::bottomLeft2CenterPoint(bottomLeft, area.area().width(), area.area().height(), 0.0);
const QPointF bottomLeft(area.area.cornerBottomLeft.lon, area.area.cornerBottomLeft.lat);
const QPointF centerpoint = Polygons::bottomLeft2CenterPoint(bottomLeft, area.area.width, area.area.height, 0.0);
if (!bottomLeft.isNull())
m_ui->positionEdit->setCoordinate(centerpoint);
m_ui->cbDecontamination->setCurrentIndex(m_ui->cbDecontamination->findData(area.deconMode().underlying()));
m_ui->cbMaintenance->setCurrentIndex(m_ui->cbMaintenance->findData(area.maintMode().underlying()));
m_ui->cbMedical->setCurrentIndex(m_ui->cbMedical->findData(area.medicMode().underlying()));
m_ui->cbDecontamination->setCurrentIndex(m_ui->cbDecontamination->findData(static_cast<int>(area.deconMode)));
m_ui->cbMaintenance->setCurrentIndex(m_ui->cbMaintenance->findData(static_cast<int>(area.maintMode)));
m_ui->cbMedical->setCurrentIndex(m_ui->cbMedical->findData(static_cast<int>(area.medicMode)));
m_ui->sbDecontaminationMinutes->setValue(area.deconTime() / (1000 * 60));
m_ui->sbMaintanenceMinutes->setValue(area.maintTime() / (1000 * 60));
m_ui->sbMedicalMinutes->setValue(area.medicTime() / (1000 * 60));
m_ui->sbSupplyMinutes->setValue(area.supplyTime() / (1000 * 60));
m_ui->sbDecontaminationMinutes->setValue(area.deconTime / (1000 * 60));
m_ui->sbMaintanenceMinutes->setValue(area.maintTime / (1000 * 60));
m_ui->sbMedicalMinutes->setValue(area.medicTime / (1000 * 60));
m_ui->sbSupplyMinutes->setValue(area.supplyTime / (1000 * 60));
m_ui->cbFunctionalAreaType->setCurrentIndex(m_ui->cbFunctionalAreaType->findData(area.functionalAreaTypeId()));
m_ui->cbFunctionalAreaType->setCurrentIndex(m_ui->cbFunctionalAreaType->findData(area.functionalAreaTypeId));
if (m_aesItem.participantId().is_set())
if (m_aesItem.participantId.has_value())
{
int participantId = m_aesItem.participantId().get();
int participantId = m_aesItem.participantId.get();
DEBUG_LOG(m_logger) << "ParticipantId = " << participantId;
QVector<int> participants;
participants.append(participantId);
@@ -363,13 +363,13 @@ void FunctionalAreaEdit::setData(const FunctionalArea &area, bool copy)
}
if (area.pointSymbol().is_set())
if (area.pointSymbol.has_value())
{
m_sidc = QString::fromStdString(area.pointSymbol().get());
m_sidc = QString::fromStdString(area.pointSymbol.get());
onChangeSymbol(m_sidc);
}
if ((m_aesItem.effectStateId() == AesEffectState::EsActivated)
|| (m_aesItem.effectStateId() == AesEffectState::EsExpired))
if ((m_aesItem.effectStateId == AesEffectState::EsActivated)
|| (m_aesItem.effectStateId == AesEffectState::EsExpired))
{
DEBUG_LOG(m_logger) << "setUnchangeable";
disableButtons(true);
@@ -394,19 +394,19 @@ void FunctionalAreaEdit::fillCbx()
QString byOperator = tr("by operator");
QString bytimeout = tr("by wait time");
m_ui->cbDecontamination->addItem(unused, AesOperatingMode::OmNotUsed);
m_ui->cbDecontamination->addItem(byOperator, AesOperatingMode::OmObserver);
m_ui->cbDecontamination->addItem(bytimeout, AesOperatingMode::OmWaitingTime);
m_ui->cbDecontamination->addItem(unused, static_cast<int>(AesOperatingMode::OmNotUsed));
m_ui->cbDecontamination->addItem(byOperator, static_cast<int>(AesOperatingMode::OmObserver));
m_ui->cbDecontamination->addItem(bytimeout, static_cast<int>(AesOperatingMode::OmWaitingTime));
m_ui->cbMaintenance->addItem(unused, AesOperatingMode::OmNotUsed);
m_ui->cbMaintenance->addItem(byOperator, AesOperatingMode::OmObserver);
m_ui->cbMaintenance->addItem(bytimeout, AesOperatingMode::OmWaitingTime);
m_ui->cbMaintenance->addItem(unused, static_cast<int>(AesOperatingMode::OmNotUsed));
m_ui->cbMaintenance->addItem(byOperator, static_cast<int>(AesOperatingMode::OmObserver));
m_ui->cbMaintenance->addItem(bytimeout, static_cast<int>(AesOperatingMode::OmWaitingTime));
m_ui->cbMedical->addItem(unused, AesOperatingMode::OmNotUsed);
m_ui->cbMedical->addItem(byOperator, AesOperatingMode::OmObserver);
m_ui->cbMedical->addItem(bytimeout, AesOperatingMode::OmWaitingTime);
m_ui->cbMedical->addItem(unused, static_cast<int>(AesOperatingMode::OmNotUsed));
m_ui->cbMedical->addItem(byOperator, static_cast<int>(AesOperatingMode::OmObserver));
m_ui->cbMedical->addItem(bytimeout, static_cast<int>(AesOperatingMode::OmWaitingTime));
m_ui->cbSupply->addItem(bytimeout, AesOperatingMode::OmWaitingTime);
m_ui->cbSupply->addItem(bytimeout, static_cast<int>(AesOperatingMode::OmWaitingTime));
if (curIdxDeconCbx >= 0)
@@ -450,47 +450,47 @@ void FunctionalAreaEdit::onRectData(const QPointF &centerPoint, double width, do
void FunctionalAreaEdit::onCbxIdxDeconChanged()
{
m_ui->sbDecontaminationMinutes->setEnabled(AesOperatingMode::OmWaitingTime == m_ui->cbDecontamination->currentData().toInt());
m_ui->sbDecontaminationMinutes->setEnabled(static_cast<int>(AesOperatingMode::OmWaitingTime) == m_ui->cbDecontamination->currentData().toInt());
}
void FunctionalAreaEdit::onCbxIdxMaintChanged()
{
m_ui->sbMaintanenceMinutes->setEnabled(AesOperatingMode::OmWaitingTime == m_ui->cbMaintenance->currentData().toInt());
m_ui->sbMaintanenceMinutes->setEnabled(static_cast<int>(AesOperatingMode::OmWaitingTime) == m_ui->cbMaintenance->currentData().toInt());
}
void FunctionalAreaEdit::onCbxIdxMedicChanged()
{
m_ui->sbMedicalMinutes->setEnabled(AesOperatingMode::OmWaitingTime == m_ui->cbMedical->currentData().toInt());
m_ui->sbMedicalMinutes->setEnabled(static_cast<int>(AesOperatingMode::OmWaitingTime) == m_ui->cbMedical->currentData().toInt());
}
void FunctionalAreaEdit::onCbxIdxSupplyChanged()
{
m_ui->sbSupplyMinutes->setEnabled(AesOperatingMode::OmWaitingTime == m_ui->cbSupply->currentData().toInt());
m_ui->sbSupplyMinutes->setEnabled(static_cast<int>(AesOperatingMode::OmWaitingTime) == m_ui->cbSupply->currentData().toInt());
}
void FunctionalAreaEdit::onCbxIdxFunctionalAreaTypeChanged()
{
const FunctionalAreaType type = m_functionalAreaTypes.value(m_ui->cbFunctionalAreaType->currentData().toInt());
DEBUG_LOG(m_logger) << "onCbxIdxFunctionalAreaTypeChanged"
<< " type.id=" << type.id()
<< " name=" << type.name();
if (type.id() != 0)
<< " type.id=" << type.id
<< " name=" << type.name;
if (type.id != 0)
{
if (type.id() == 7)
if (type.id == 7)
{
m_ui->sbSupplyMinutes->setValue(type.supplyTime());
m_ui->sbSupplyMinutes->setValue(type.supplyTime);
m_ui->cbSupply->setCurrentIndex(0);
}
else
{
m_sidc = QString::fromStdString(type.pointSymbol());
m_sidc = QString::fromStdString(type.pointSymbol);
onChangeSymbol(m_sidc);
m_ui->sbDecontaminationMinutes->setValue(type.deconTime());
m_ui->sbMaintanenceMinutes->setValue(type.maintTime());
m_ui->sbMedicalMinutes->setValue(type.medicTime());
m_ui->cbDecontamination->setCurrentIndex(m_ui->cbDecontamination->findData(type.deconMode() == AesOperatingMode::OmNotAvailable ? AesOperatingMode::OmNotUsed : type.deconMode().underlying()));
m_ui->cbMaintenance->setCurrentIndex(m_ui->cbMaintenance->findData(type.maintMode() == AesOperatingMode::OmNotAvailable ? AesOperatingMode::OmNotUsed : type.maintMode().underlying()));
m_ui->cbMedical->setCurrentIndex(m_ui->cbMedical->findData(type.medicMode() == AesOperatingMode::OmNotAvailable ? AesOperatingMode::OmNotUsed : type.medicMode().underlying()));
m_ui->sbDecontaminationMinutes->setValue(type.deconTime);
m_ui->sbMaintanenceMinutes->setValue(type.maintTime);
m_ui->sbMedicalMinutes->setValue(type.medicTime);
m_ui->cbDecontamination->setCurrentIndex(m_ui->cbDecontamination->findData(static_cast<int>(type.deconMode == AesOperatingMode::OmNotAvailable ? AesOperatingMode::OmNotUsed : type.deconMode)));
m_ui->cbMaintenance->setCurrentIndex(m_ui->cbMaintenance->findData(static_cast<int>(type.maintMode == AesOperatingMode::OmNotAvailable ? AesOperatingMode::OmNotUsed : type.maintMode)));
m_ui->cbMedical->setCurrentIndex(m_ui->cbMedical->findData(static_cast<int>(type.medicMode == AesOperatingMode::OmNotAvailable ? AesOperatingMode::OmNotUsed : type.medicMode)));
}
}
enableUiElements(true);
@@ -569,7 +569,7 @@ void FunctionalAreaEdit::onChangeSymbol(const QString &sidc)
std::shared_ptr<ParticipantManagement::Interface::Dtc> ppmDtc;
m_session->getDtc<ParticipantManagement::DataInterface>(ppmDtc);
if (ppmDtc)
symDataToRender.fillColor = ppmDtc->party(partyId).color();
symDataToRender.fillColor = ppmDtc->party(partyId).color;
else
WARNING_LOG(m_logger) << "no ppmDtc";
}
@@ -614,17 +614,17 @@ bool FunctionalAreaEdit::apply()
int playerId = 0;
const auto pointSymbol = m_sidc.toStdString();
AesOperatingMode deconMode = static_cast<AesOperatingMode>(m_ui->cbDecontamination->currentData().toInt());
int deconTime = (AesOperatingMode::OmWaitingTime == m_ui->cbDecontamination->currentData().toInt()) ? 1000 * 60 * m_ui->sbDecontaminationMinutes->value() : 0;
int deconTime = (static_cast<int>(AesOperatingMode::OmWaitingTime) == m_ui->cbDecontamination->currentData().toInt()) ? 1000 * 60 * m_ui->sbDecontaminationMinutes->value() : 0;
AesOperatingMode maintMode = static_cast<AesOperatingMode>(m_ui->cbMaintenance->currentData().toInt());
int maintTime = (AesOperatingMode::OmWaitingTime == m_ui->cbMaintenance->currentData().toInt()) ? 1000 * 60 * m_ui->sbMaintanenceMinutes->value() : 0;
int maintTime = (static_cast<int>(AesOperatingMode::OmWaitingTime) == m_ui->cbMaintenance->currentData().toInt()) ? 1000 * 60 * m_ui->sbMaintanenceMinutes->value() : 0;
AesOperatingMode medicMode = static_cast<AesOperatingMode>(m_ui->cbMedical->currentData().toInt());
int medicTime = (AesOperatingMode::OmWaitingTime == m_ui->cbMedical->currentData().toInt()) ? 1000 * 60 * m_ui->sbMedicalMinutes->value() : 0;
int medicTime = (static_cast<int>(AesOperatingMode::OmWaitingTime) == m_ui->cbMedical->currentData().toInt()) ? 1000 * 60 * m_ui->sbMedicalMinutes->value() : 0;
AesOperatingMode supplyMode = static_cast<AesOperatingMode>(m_ui->cbSupply->currentData().toInt());
if ( functionalAreaType != 7 )
supplyMode = AesOperatingMode::OmNotUsed;
int supplyTime = (AesOperatingMode::OmWaitingTime == m_ui->cbSupply->currentData().toInt()) ? 1000 * 60 * m_ui->sbSupplyMinutes->value() : 0;
int supplyTime = (static_cast<int>(AesOperatingMode::OmWaitingTime) == m_ui->cbSupply->currentData().toInt()) ? 1000 * 60 * m_ui->sbSupplyMinutes->value() : 0;
AesOperatingMode notfightMode = static_cast<AesOperatingMode>(m_ui->cbMedical->currentData().toInt());
int notfightTime = (AesOperatingMode::OmWaitingTime == m_ui->cbMedical->currentData().toInt()) ? 1000 * 60 * m_ui->sbMedicalMinutes->value() : 0;
int notfightTime = (static_cast<int>(AesOperatingMode::OmWaitingTime) == m_ui->cbMedical->currentData().toInt()) ? 1000 * 60 * m_ui->sbMedicalMinutes->value() : 0;
if ( functionalAreaType == 7 )
{
deconMode = AesOperatingMode::OmNotUsed;
@@ -652,12 +652,12 @@ bool FunctionalAreaEdit::apply()
if (supplyMode == AesOperatingMode::OmWaitingTime)
{
partyId = 0;
playerId = m_participant.id();
playerId = m_participant.id;
}
FunctionalAreaModifyRequest req(m_aesItem.id(),
FunctionalAreaModifyRequest req(m_aesItem.id,
name,
LtsUtils::toOptional(effectStart),
LtsUtils::toOptional(static_cast<int64_t>(effectStart)),
duration,
chargeType,
area,
@@ -679,7 +679,7 @@ bool FunctionalAreaEdit::apply()
m_requestHelper->addRequest([this, req, functionalAreaType]()
{
DEBUG_LOG(m_logger) << "addRequest m_aesItem.id()=" << m_aesItem.id()
DEBUG_LOG(m_logger) << "addRequest m_aesItem.id()=" << m_aesItem.id
<< " functionalAreaType=" << functionalAreaType
<< " area=" << req;
return m_ftc->functionalAreaModifyRequest(req, this);
@@ -774,7 +774,7 @@ void FunctionalAreaEdit::onParticipantClicked()
{
ParticipantManagement::ParticipantSelection *ps = new ParticipantManagement::ParticipantSelection(m_session, this);
ps->init();
ps->setParticipantSelected(m_participant.partyId(), m_participant.id());
ps->setParticipantSelected(m_participant.partyId, m_participant.id);
connect(ps, &ParticipantManagement::ParticipantSelection::selectedParticipants, this, &FunctionalAreaEdit::onParticipant);
ps->exec();
@@ -792,12 +792,12 @@ void FunctionalAreaEdit::onParticipant(const QVector<int> &participants)
m_participant = m_ppmDtc->participant(participants[0]);
QString lblHierarchy = m_ppmDtc->hierarchyFromParticipant(m_participant.id());
QString lblParticipantType = ParticipantManagement::trTypeName(m_ppmDtc->type(m_participant.typeId()).name());
QString lblHierarchy = m_ppmDtc->hierarchyFromParticipant(m_participant.id);
QString lblParticipantType = ParticipantManagement::trTypeName(m_ppmDtc->type(m_participant.typeId).name);
int functionalAreaType = m_ui->cbFunctionalAreaType->currentData().toInt();
DEBUG_LOG(m_logger) << "m_participant.id=" << m_participant.id()
<< " designator=" << m_participant.designator()
<< " tacticalIdentifier=" << m_participant.tacticalIdentifier()
DEBUG_LOG(m_logger) << "m_participant.id=" << m_participant.id
<< " designator=" << m_participant.designator
<< " tacticalIdentifier=" << m_participant.tacticalIdentifier
<< " lblHierarchy=" << lblHierarchy
<< " lblHierarchy.isVisable=" << m_ui->lblHierarchy->isVisible()
<< " lblParticipantType=" << lblParticipantType
@@ -816,14 +816,14 @@ void FunctionalAreaEdit::onParticipant(const QVector<int> &participants)
<< " property=" << propertyStrType.join(QStringLiteral("|"));
m_ui->lblHierarchy->show();
m_ui->lblHierarchy->setText(m_ppmDtc->hierarchyFromParticipant(m_participant.id()));
m_ui->lblHierarchy->setText(m_ppmDtc->hierarchyFromParticipant(m_participant.id));
m_ui->lblParticipantType->show();
m_ui->lblParticipantType->setText(ParticipantManagement::trTypeName(m_ppmDtc->type(m_participant.typeId()).name()));
m_ui->lblParticipantType->setText(ParticipantManagement::trTypeName(m_ppmDtc->type(m_participant.typeId).name));
m_ui->lblEquipmentNumber->show();
dds::core::optional<int32_t> eqId = m_participant.equipmentNumber();
dds::core::optional<int32_t> eqId = m_participant.equipmentNumber;
if (eqId.is_set())
if (eqId.has_value())
{
QString id = QString::number(eqId.get());
m_ui->lblEquipmentNumber->setText(id);
qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/FunctionalArea/aes_functional_area_edit.h
+2 -2
View File
@@ -3,7 +3,7 @@
#pragma once
#include <AreaEffectSimulation/Base/aes_base_edit.h>
#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_edit.h>
#include <AreaEffectSimulation/aes_ftc.h>
#include <AdvancedSymbology/asb_data_plugin_interface.h>
#include <ParticipantManagement/ppm_data_plugin_interface.h>
@@ -38,7 +38,7 @@ public:
QString dialogIdentifier() const override
{
return m_aesItem.id() <= 0 ? QStringLiteral("AddFunctionalArea") : QStringLiteral("EditFunctionalArea%1").arg(m_aesItem.id());
return m_aesItem.id <= 0 ? QStringLiteral("AddFunctionalArea") : QStringLiteral("EditFunctionalArea%1").arg(m_aesItem.id);
}
bool init(int areaId, bool copy, LtsSession::LtsSession *session);
qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/FunctionalArea/aes_functional_area_gui_plugin.h
+1 -1
View File
@@ -3,7 +3,7 @@
#pragma once
#include <AreaEffectSimulation/Base/aes_base_gui_plugin.h>
#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_gui_plugin.h>
#include "aes_functional_area_gui_plugin_interface.h"
namespace AreaEffectSimulation
qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/FunctionalArea/aes_functional_area_list.h
+2 -2
View File
@@ -3,8 +3,8 @@
#pragma once
#include <AreaEffectSimulation/Base/aes_itemlist.h>
#include <AreaEffectSimulation/Base/aes_base_model.h>
#include <Plugins/AreaEffectSimulation/Gui/Base/aes_itemlist.h>
#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.h>
namespace AreaEffectSimulation
{
qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/FunctionalArea/aes_functional_areas_model.cpp
+2 -2
View File
@@ -37,8 +37,8 @@ QVariant FunctionalAreasModel::data(const QModelIndex &index, int role) const
{
case ColType:
{
auto fat = m_aesDtc->functionalAreaType(functionalArea.functionalAreaTypeId());
return trFunctionalAreaTypeName(fat.name());
auto fat = m_aesDtc->functionalAreaType(functionalArea.functionalAreaTypeId);
return trFunctionalAreaTypeName(fat.name);
}
default:
break;
qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/FunctionalArea/aes_functional_areas_model.h
+1 -1
View File
@@ -3,7 +3,7 @@
#pragma once
#include <AreaEffectSimulation/Base/aes_base_model.h>
#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.h>
namespace LtsSession
{