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
+33
-32
@@ -18,6 +18,7 @@ namespace GuezIedManagement {
|
||||
|
||||
InfoDialog::InfoDialog(int iedEntityId, QWidget *parent)
|
||||
: LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly)
|
||||
, m_logger(getLogger("IedInfoDialog"))
|
||||
, m_iedEntityId(iedEntityId)
|
||||
, m_session(nullptr)
|
||||
, m_dtc(nullptr)
|
||||
@@ -68,84 +69,84 @@ bool InfoDialog::init(LtsSession::LtsSession *session,
|
||||
|
||||
void InfoDialog::retranslate()
|
||||
{
|
||||
translate(m_ui, QString::number(m_dtc->ied(m_iedEntityId).equipmentNumber()), false, tr("IED"));
|
||||
translate(m_ui, QString::number(m_dtc->ied(m_iedEntityId).equipmentNumber), false, tr("IED"));
|
||||
}
|
||||
|
||||
void InfoDialog::showIedInfos()
|
||||
{
|
||||
Ied ied = m_dtc->ied(m_iedEntityId);
|
||||
|
||||
m_ui->lblEquipmentNumber->setText(QString::number(ied.equipmentNumber()));
|
||||
m_ui->lblParty->setText(ParticipantManagement::trPartyName(m_ppmDtc->party(ied.partyId()).name()));
|
||||
m_ui->lblDesignator->setText(QString::fromStdString(ied.name()));
|
||||
m_ui->lblEquipmentNumber->setText(QString::number(ied.equipmentNumber));
|
||||
m_ui->lblParty->setText(ParticipantManagement::trPartyName(m_ppmDtc->party(ied.partyId).name));
|
||||
m_ui->lblDesignator->setText(QString::fromStdString(ied.name));
|
||||
|
||||
setPosition(m_dtc->iedPosition(m_iedEntityId));
|
||||
|
||||
m_ui->lblExplosiveForce->setText(QString::number(ied.explosiveForce()));
|
||||
m_ui->lblTriggerRemote->setEnabled(ied.remoteTrigger());
|
||||
m_ui->lblTriggerButton->setEnabled(ied.switchTrigger());
|
||||
m_ui->lblTriggerLightbarrier->setEnabled(ied.lightBarrierTrigger());
|
||||
m_ui->lblTriggerWire->setEnabled(ied.tautWireTrigger());
|
||||
m_ui->lblExplosiveForce->setText(QString::number(ied.explosiveForce));
|
||||
m_ui->lblTriggerRemote->setEnabled(ied.remoteTrigger);
|
||||
m_ui->lblTriggerButton->setEnabled(ied.switchTrigger);
|
||||
m_ui->lblTriggerLightbarrier->setEnabled(ied.lightBarrierTrigger);
|
||||
m_ui->lblTriggerWire->setEnabled(ied.tautWireTrigger);
|
||||
|
||||
if (ied.pyrotechnics())
|
||||
if (ied.pyrotechnics)
|
||||
m_ui->lblPyrotechnics->setText(tr("Active"));
|
||||
else
|
||||
m_ui->lblPyrotechnics->setText(tr("Inactive"));
|
||||
|
||||
m_ui->lblState->setText(GuezIedManagement::toString(ied.tacticalState()));
|
||||
m_ui->lblState->setText(GuezIedManagement::toString(ied.tacticalState));
|
||||
|
||||
m_ui->tbwBit->setRowCount(0);
|
||||
if (ied.electronicsError().underlying() != IedError::NoError)
|
||||
if (ied.electronicsError != IedError::NoError)
|
||||
{
|
||||
QTableWidgetItem *device = new QTableWidgetItem(tr("Electronics"));
|
||||
QTableWidgetItem *error = new QTableWidgetItem(GuezIedManagement::toString(ied.electronicsError()));
|
||||
QTableWidgetItem *error = new QTableWidgetItem(GuezIedManagement::toString(ied.electronicsError));
|
||||
addTbwBitEntry(device, error);
|
||||
}
|
||||
if (ied.pyrotechnics1Error().underlying() != IedError::NoError)
|
||||
if (ied.pyrotechnics1Error != IedError::NoError)
|
||||
{
|
||||
QTableWidgetItem *device = new QTableWidgetItem(tr("Pyrotechnics 1"));
|
||||
QTableWidgetItem *error = new QTableWidgetItem(GuezIedManagement::toString(ied.pyrotechnics1Error()));
|
||||
QTableWidgetItem *error = new QTableWidgetItem(GuezIedManagement::toString(ied.pyrotechnics1Error));
|
||||
addTbwBitEntry(device, error);
|
||||
}
|
||||
if (ied.pyrotechnics2Error().underlying() != IedError::NoError)
|
||||
if (ied.pyrotechnics2Error != IedError::NoError)
|
||||
{
|
||||
QTableWidgetItem *device = new QTableWidgetItem(tr("Pyrotechnics 2"));
|
||||
QTableWidgetItem *error = new QTableWidgetItem(GuezIedManagement::toString(ied.pyrotechnics2Error()));
|
||||
QTableWidgetItem *error = new QTableWidgetItem(GuezIedManagement::toString(ied.pyrotechnics2Error));
|
||||
addTbwBitEntry(device, error);
|
||||
}
|
||||
if (ied.pyrotechnics3Error().underlying() != IedError::NoError)
|
||||
if (ied.pyrotechnics3Error != IedError::NoError)
|
||||
{
|
||||
QTableWidgetItem *device = new QTableWidgetItem(tr("Pyrotechnics 3"));
|
||||
QTableWidgetItem *error = new QTableWidgetItem(GuezIedManagement::toString(ied.pyrotechnics3Error()));
|
||||
QTableWidgetItem *error = new QTableWidgetItem(GuezIedManagement::toString(ied.pyrotechnics3Error));
|
||||
addTbwBitEntry(device, error);
|
||||
}
|
||||
|
||||
if ((ied.electronicsError().underlying() == IedError::NoError) &&
|
||||
(ied.pyrotechnics1Error().underlying() == IedError::NoError) &&
|
||||
(ied.pyrotechnics2Error().underlying() == IedError::NoError) &&
|
||||
(ied.pyrotechnics3Error().underlying() == IedError::NoError))
|
||||
if ((ied.electronicsError == IedError::NoError) &&
|
||||
(ied.pyrotechnics1Error == IedError::NoError) &&
|
||||
(ied.pyrotechnics2Error == IedError::NoError) &&
|
||||
(ied.pyrotechnics3Error == IedError::NoError))
|
||||
{
|
||||
QTableWidgetItem *device = new QTableWidgetItem(tr("no Errors"));
|
||||
addTbwBitEntry(device, nullptr);
|
||||
}
|
||||
|
||||
const QColor &color = QColor::fromRgb(QRgb(m_ppmDtc->party(ied.partyId()).color()));
|
||||
const AdvancedSymbology::Role &role = AdvancedSymbology::roleToRole<>(m_ppmDtc->party(ied.partyId()).role());
|
||||
updateIcon(color, role, ied.tacticalState(), QString::fromStdString(ied.symbol()));
|
||||
const QColor &color = QColor::fromRgb(QRgb(m_ppmDtc->party(ied.partyId).color));
|
||||
const AdvancedSymbology::Role &role = AdvancedSymbology::roleToRole<>(m_ppmDtc->party(ied.partyId).role);
|
||||
updateIcon(color, role, ied.tacticalState, QString::fromStdString(ied.symbol));
|
||||
}
|
||||
|
||||
void InfoDialog::setPosition(const IedPosition &pos)
|
||||
{
|
||||
if (std::isnan(pos.position().lon()) || std::isnan(pos.position().lat()))
|
||||
if (std::isnan(pos.position.lon) || std::isnan(pos.position.lat))
|
||||
m_ui->lblPosition->setText(tr("Invalid Position"));
|
||||
else
|
||||
m_ui->lblPosition->setText(LtsCoordTrans::mgrsFromGeographic(pos.position().lon(), pos.position().lat()));
|
||||
m_ui->lblPosition->setText(LtsCoordTrans::mgrsFromGeographic(pos.position.lon, pos.position.lat));
|
||||
}
|
||||
|
||||
|
||||
AdvancedSymbology::Injury guezIedStateToInjury(const GuezIedManagement::IedTacticalState &iedState)
|
||||
{
|
||||
switch (iedState.underlying())
|
||||
switch (iedState)
|
||||
{
|
||||
case GuezIedManagement::IedTacticalState::Active:
|
||||
return AdvancedSymbology::Injury::NoInjury;
|
||||
@@ -170,7 +171,7 @@ void updateIedPyro(const GuezIedManagement::IedTacticalState &iedStateIn,
|
||||
if (injuryInOut != AdvancedSymbology::Injury::TotalKill)
|
||||
return;
|
||||
|
||||
switch (iedStateIn.underlying())
|
||||
switch (iedStateIn)
|
||||
{
|
||||
case GuezIedManagement::IedTacticalState::Unknown:
|
||||
case GuezIedManagement::IedTacticalState::NotActive:
|
||||
@@ -231,7 +232,7 @@ void InfoDialog::onIedChanged(const Ied &data, DataModification modType)
|
||||
{
|
||||
Q_UNUSED(modType);
|
||||
|
||||
if (data.id() != m_iedEntityId)
|
||||
if (data.id != m_iedEntityId)
|
||||
return;
|
||||
|
||||
showIedInfos();
|
||||
@@ -239,7 +240,7 @@ void InfoDialog::onIedChanged(const Ied &data, DataModification modType)
|
||||
|
||||
void InfoDialog::onIedPositionChanged(const IedPosition &data, DataModification modType)
|
||||
{
|
||||
if (data.id() != m_iedEntityId || modType == DataModification::eRemoved)
|
||||
if (data.id != m_iedEntityId || modType == DataModification::eRemoved)
|
||||
return;
|
||||
|
||||
setPosition(data);
|
||||
|
||||
Reference in new issue
Block a user