Complete Qt6 migration: full clean build green across groups G1-G12 incl. runtime plugin set
new_docker_build.sh gains Group 12 (212 GUI/Data plugins); fixes LtsUtilsGuiDds visibility (LTO-stripped exports), LtsProjectionWorkstation unity name shadow, 6 unity-off dirs (dup file-scope statics, ddsftc INTERFACE sources) and reconfigures BUILD_FILTERMANAGEMENT/BUILD_PLUGINS_SERVICEMONITOR=ON
This commit is contained in:
1718 files changed
+126739
-18495
No files matched your search
+23
-23
@@ -163,15 +163,15 @@ void ChargeEffectEdit::onSelectionChanged()
|
||||
return;
|
||||
|
||||
const ParticipantManagement::ParticipantData data(m_participantModel->getParticipantData(m_ui->dvParticipants->selectedRows().first()));
|
||||
DEBUG_LOG(m_logger) << "ParticipantId: " << data.id();
|
||||
DEBUG_LOG(m_logger) << "ParticipantId: " << data.id;
|
||||
|
||||
if (m_ppmDtc->type(data.typeId()).typeClass() == ParticipantManagement::TypeClass::Unit)
|
||||
if (m_ppmDtc->type(data.typeId).typeClass == ParticipantManagement::TypeClass::Unit)
|
||||
return;
|
||||
|
||||
DEBUG_LOG(m_logger) << "typeClass: " << m_ppmDtc->type(data.typeId()).typeClass()
|
||||
<< " eqNr.isSet(): " << data.equipmentNumber().is_set();
|
||||
DEBUG_LOG(m_logger) << "typeClass: " << m_ppmDtc->type(data.typeId).typeClass
|
||||
<< " eqNr.isSet(): " << data.equipmentNumber.has_value();
|
||||
|
||||
if (data.equipmentNumber().is_set())
|
||||
if (data.equipmentNumber.has_value())
|
||||
{
|
||||
if (m_ui->cbChargeType->count())
|
||||
m_ui->pbPosition->setEnabled(true);
|
||||
@@ -216,8 +216,8 @@ void ChargeEffectEdit::onGetCoordinate(const QPointF &coordinate)
|
||||
|
||||
const int chargeTypeId = m_ui->cbChargeType->currentData().toInt();
|
||||
const int partyId = m_ui->cbParty->currentData().toInt();
|
||||
DEBUG_LOG(m_logger) << "ParticipantId=" << participantData.id()
|
||||
<< " EquipmentNr=" << participantData.equipmentNumber()
|
||||
DEBUG_LOG(m_logger) << "ParticipantId=" << participantData.id
|
||||
<< " EquipmentNr=" << participantData.equipmentNumber
|
||||
<< " partyId=" << partyId
|
||||
<< " chargeType=" << chargeTypeId
|
||||
<< " onGetCoordinate x=" << coordinate.x() << " y=" << coordinate.y();
|
||||
@@ -227,8 +227,8 @@ void ChargeEffectEdit::onGetCoordinate(const QPointF &coordinate)
|
||||
int gearType = 0;
|
||||
for (const auto >c : m_pdmDtc->gearTypeChargeTypes())
|
||||
{
|
||||
if (gtc.chargeTypeId() == chargeTypeId)
|
||||
gearType = gtc.gearTypeId();
|
||||
if (gtc.chargeTypeId == chargeTypeId)
|
||||
gearType = gtc.gearTypeId;
|
||||
}
|
||||
|
||||
const auto chargeType = m_pdmDtc->chargeType(chargeTypeId);
|
||||
@@ -240,25 +240,25 @@ void ChargeEffectEdit::onGetCoordinate(const QPointF &coordinate)
|
||||
ProjectDataManagement::StateChangeOriginator originatorTypeId;
|
||||
if (m_ui->cbPlayer->isChecked())
|
||||
{
|
||||
id = participantData.id();
|
||||
originatorTypeId = ProjectDataManagement::StateChangeOriginator::Participant;
|
||||
id = participantData.id;
|
||||
originatorTypeId = ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Participant;
|
||||
}
|
||||
else
|
||||
{
|
||||
id = partyId;
|
||||
originatorTypeId = ProjectDataManagement::StateChangeOriginator::Party;
|
||||
originatorTypeId = ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Party;
|
||||
}
|
||||
|
||||
|
||||
request.name(chargeType.shortName());
|
||||
request.chargeTypeId(chargeTypeId);
|
||||
request.igniterTypeId(0);
|
||||
request.gearTypeId(gearType);
|
||||
request.originatorId(id);
|
||||
request.originatorTypeId(originatorTypeId);
|
||||
request.effectDuration(1000);
|
||||
request.effectStart(m_session->partitionTime() + 6000);
|
||||
request.position(Core::GeoPosition(coordinate.x(), coordinate.y(), 0.0));
|
||||
request.name = chargeType.shortName;
|
||||
request.chargeTypeId = chargeTypeId;
|
||||
request.igniterTypeId = 0;
|
||||
request.gearTypeId = gearType;
|
||||
request.originatorId = id;
|
||||
request.originatorTypeId = originatorTypeId;
|
||||
request.effectDuration = 1000;
|
||||
request.effectStart = m_session->partitionTime() + 6000;
|
||||
request.position = Core::GeoPosition(coordinate.x(), coordinate.y(), 0.0);
|
||||
|
||||
m_requestHelper->addRequest([this,request]()
|
||||
{
|
||||
@@ -288,10 +288,10 @@ void ChargeEffectEdit::fillCharges()
|
||||
|
||||
for (const auto &charge : m_pdmDtc->chargeTypes())
|
||||
{
|
||||
if(!m_pdmDtc->isVirtuallyFireable(charge.id()))
|
||||
if(!m_pdmDtc->isVirtuallyFireable(charge.id))
|
||||
continue;
|
||||
|
||||
m_ui->cbChargeType->addItem(QString::fromStdString(charge.name()), charge.id());
|
||||
m_ui->cbChargeType->addItem(QString::fromStdString(charge.name), charge.id);
|
||||
}
|
||||
m_ui->cbChargeType->setEnabled(m_ui->cbChargeType->count() > 1);
|
||||
}
|
||||
|
||||
+3
-2
@@ -3,9 +3,10 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <AreaEffectSimulation/Base/aes_base_edit.h>
|
||||
#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_edit.h>
|
||||
#include <AreaEffectSimulation/aes_ftc.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
#include <AdvancedSymbology/asb_data_plugin_interface.h>
|
||||
#include <ParticipantManagement/ppm_gui_combobox_plugin_interface.h>
|
||||
#include <ParticipantManagement/ppm_data_plugin_interface.h>
|
||||
@@ -36,7 +37,7 @@ public:
|
||||
|
||||
QString dialogIdentifier() const override
|
||||
{
|
||||
return m_aesItem.id() <= 0 ? QStringLiteral("AddChargeEffect") : QStringLiteral("EditChargeEffect%1").arg(m_aesItem.id());
|
||||
return m_aesItem.id <= 0 ? QStringLiteral("AddChargeEffect") : QStringLiteral("EditChargeEffect%1").arg(m_aesItem.id);
|
||||
}
|
||||
bool init(int areaId, bool copy, LtsSession::LtsSession *session);
|
||||
void onChargeEffectModifyReply(const Core::FunctionReplyObject &replyObject) override final { onAesItemModifyReply(replyObject); }
|
||||
|
||||
+1
-1
@@ -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_charge_effect_gui_plugin_interface.h"
|
||||
|
||||
namespace AreaEffectSimulation
|
||||
|
||||
Reference in new issue
Block a user