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
2026-10-20 09:36:57 +02:00
1 parent 2b957d1edb
commit 598fc2560e
@@ -66,19 +66,19 @@ bool CustomViewBCContamination::init(const QModelIndex &idx)
 bool CustomViewBCContamination::calculateIcon(const BCContamination &bcContamination, const QColor &color)
 {
  Database::AesBCContamination bcContaOut;
-  bcContaOut.id = bcContamination.id();
-  bcContaOut.chargeTypeId = bcContamination.chargeStruct().chargeTypeId();
-  bcContaOut.effectStart = QDateTime::fromMSecsSinceEpoch(bcContamination.effectStart().is_set() ? bcContamination.effectStart().get() : 0);
-  bcContaOut.impactPosition = QPointF(bcContamination.impactPosition().lon(), bcContamination.impactPosition().lat());
-  bcContaOut.impactRadius = bcContamination.impactRadius();
-  bcContaOut.propagationDirection = bcContamination.propagationDirection();
+  bcContaOut.id = bcContamination.id;
+  bcContaOut.chargeTypeId = bcContamination.chargeStruct.chargeTypeId;
+  bcContaOut.effectStart = QDateTime::fromMSecsSinceEpoch(bcContamination.effectStart.has_value() ? bcContamination.effectStart.get() : 0);
+  bcContaOut.impactPosition = QPointF(bcContamination.impactPosition.lon, bcContamination.impactPosition.lat);
+  bcContaOut.impactRadius = bcContamination.impactRadius;
+  bcContaOut.propagationDirection = bcContamination.propagationDirection;

  const QPolygonF poly = AreaEffectSimulation::Polygons::bcContamination(bcContaOut,
-                                                                         ProjectDataManagement::VolatilityType::get_default(),
-                                                                         bcContamination.impactRadius(),
+                                                                         ProjectDataManagement::VolatilityType::Unknown,
+                                                                         bcContamination.impactRadius,
                                                                         QDateTime::currentDateTime());

-  Qt::BrushStyle bStyle = PixmapLabel::checkForBrushStyle(bcContamination.effectStateId());
+  Qt::BrushStyle bStyle = PixmapLabel::checkForBrushStyle(bcContamination.effectStateId);
  const auto pix = Polygons::pixmapFromPolygon(PixmapLabel::geographic2Utm(poly), color, ICON_RESOLUTION, bStyle);
  m_ui->lblIcon->setPixmap(pix);

@@ -4,7 +4,7 @@
 #include "aes_bccontamination_info.h"
 #include "ui_aes_bccontamination_info.h"

-#include <AreaEffectSimulation/Base/InfoView/aes_base_info.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/InfoView/aes_base_info.h>
 #include <LtsSession/lts_session.h>
 #include <LtsCoordTrans/lts_coord_trans.h>
 #include <QtCore/QDateTime>
@@ -33,13 +33,13 @@ bool BCContaminationInfo::setData(const BCContamination *item)
 {
  m_ui->wBaseData->setData(item);

-  m_ui->lblImpactRadius->setText(QString::number(item->impactRadius()));
-  m_ui->lblImpactPosition->setText(LtsCoordTrans::mgrsFromGeographic(item->impactPosition().lon(), item->impactPosition().lat()));
-  m_ui->lblPropagationDirection->setText(tr("%1° = %2 mil").arg(item->propagationDirection(),               0, 'f', 2)
-                                         .arg(item->propagationDirection() * 6400 / 360.0, 0, 'f', 0));
-  m_ui->lblWindSpeed->setText(QString::number(item->windSpeed(), 'f', 2));
-  m_ui->lblWeatherTimestamp->setText(QDateTime::fromMSecsSinceEpoch(item->weatherTimestamp()).toString());
-  m_ui->lblWeatherPosition->setText(LtsCoordTrans::mgrsFromGeographic(item->weatherPosition().lon(), item->weatherPosition().lat()));
+  m_ui->lblImpactRadius->setText(QString::number(item->impactRadius));
+  m_ui->lblImpactPosition->setText(LtsCoordTrans::mgrsFromGeographic(item->impactPosition.lon, item->impactPosition.lat));
+  m_ui->lblPropagationDirection->setText(tr("%1° = %2 mil").arg(item->propagationDirection,               0, 'f', 2)
+                                         .arg(item->propagationDirection * 6400 / 360.0, 0, 'f', 0));
+  m_ui->lblWindSpeed->setText(QString::number(item->windSpeed, 'f', 2));
+  m_ui->lblWeatherTimestamp->setText(QDateTime::fromMSecsSinceEpoch(item->weatherTimestamp).toString());
+  m_ui->lblWeatherPosition->setText(LtsCoordTrans::mgrsFromGeographic(item->weatherPosition.lon, item->weatherPosition.lat));
  return true;
 }

@@ -69,8 +69,8 @@ BCContaminationEdit::BCContaminationEdit(const QString &menuGroup, bool isChemic

  
  
-  m_ui->cbWeather->addItem(toString(AesWeatherSource::AwsDynamic), AesWeatherSource::AwsDynamic);
-  m_ui->cbWeather->addItem(toString(AesWeatherSource::AwsStatic), AesWeatherSource::AwsStatic);
+  m_ui->cbWeather->addItem(toString(AesWeatherSource::AwsDynamic), static_cast<int>(AesWeatherSource::AwsDynamic));
+  m_ui->cbWeather->addItem(toString(AesWeatherSource::AwsStatic), static_cast<int>(AesWeatherSource::AwsStatic));

  LtsUtils::ProjectSettings *ps = LtsUtils::ProjectSettings::getInstance();
  const bool enableShowMeteoDataStations = ps->value(QStringLiteral("mdm"),
@@ -132,15 +132,15 @@ void BCContaminationEdit::enableUiElements(bool enable)

  m_ui->cbWeather->setEnabled(enable);
  m_ui->pbClear->setEnabled(enable);
-  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__();
  }
-  if (m_aesItem.effectStateId() == AesEffectState::EsActivated)
+  if (m_aesItem.effectStateId == AesEffectState::EsActivated)
  {
    QString name = m_ui->leIdentifier->text();
-    auto baseData = m_dtc->bCContamination(m_aesItem.id());
+    auto baseData = m_dtc->bCContamination(m_aesItem.id);
    setData(baseData, false);
    __unchange__();
    if (name != m_ui->leIdentifier->text())
@@ -193,8 +193,8 @@ bool BCContaminationEdit::init(int aesItemId, bool copy,

  auto cb = [this](const DangerAreaCorrelatedAesItem &item)
  {
-    if (item.aesItemId() == m_aesItem.id())
-      m_dangerAreaIds << item.dangerAreaId();
+    if (item.aesItemId == m_aesItem.id)
+      m_dangerAreaIds << item.dangerAreaId;
  };
  m_dtc->dangerAreaCorrelatedAesItems(cb);
  setPbDangerAreaText();
@@ -211,8 +211,8 @@ bool BCContaminationEdit::init(int aesItemId, bool copy,

  auto cbDangerArea = [this](const DangerArea  &data)
  {
-    if (data.effectStateId() != AesEffectState::EsRemoved && data.associatedAesId() == m_aesItem.id())
-      m_associatedDangerId = data.id();
+    if (data.effectStateId != AesEffectState::EsRemoved && data.associatedAesId == m_aesItem.id)
+      m_associatedDangerId = data.id;
  };
  m_dtc->dangerAreas(cbDangerArea);
  if (m_associatedDangerId)
@@ -229,7 +229,7 @@ void BCContaminationEdit::setPbDangerAreaText()
  sl.reserve(m_dangerAreaIds.size());
  for (int idx : std::as_const(m_dangerAreaIds))
  {
-    sl << QString::fromStdString(m_dtc->dangerArea(idx).name());
+    sl << QString::fromStdString(m_dtc->dangerArea(idx).name);
  }
  m_ui->pbDangerArea->setEnabled(sl.size());
  m_ui->pbDangerArea->setText(sl.join(QStringLiteral(", ")));
@@ -237,14 +237,14 @@ void BCContaminationEdit::setPbDangerAreaText()

 void BCContaminationEdit::onDangerAreaChanged(const DangerAreaCorrelatedAesItem &data, DataModification modType)
 {
-  if (data.aesItemId() != m_aesItem.id())
+  if (data.aesItemId != m_aesItem.id)
    return;

  if (modType == DataModification::eAdded)
-    m_dangerAreaIds += data.dangerAreaId();
+    m_dangerAreaIds += data.dangerAreaId;

  if (modType == DataModification::eRemoved)
-    m_dangerAreaIds -= data.dangerAreaId();
+    m_dangerAreaIds -= data.dangerAreaId;
  

  setPbDangerAreaText();
@@ -259,7 +259,7 @@ void BCContaminationEdit::onPbDangerAreaClicked()
  if (!m_session->getForeignGuiInterface<ForeignInfoGuiInterface>(infoGuiInterface))
    return;

-  LtsWidgets::LtsDialog *dialog = infoGuiInterface->showDangerAreaAesItemInfo(m_dangerAreaIds, {m_aesItem.id()});
+  LtsWidgets::LtsDialog *dialog = infoGuiInterface->showDangerAreaAesItemInfo(m_dangerAreaIds, {m_aesItem.id});

  addDialog(dialog, m_menuGroup, tr("Danger Areas for %1 %2").arg(m_isChemical ? tr("C-Contamination") : tr("B-Contamination"), m_ui->leIdentifier->text()), LtsWidgets::LayoutArea::eInfoTab);
 }
@@ -269,23 +269,23 @@ void BCContaminationEdit::setData(const BCContamination &contamination, bool cop
  m_aesItem = contamination;
  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(contamination.name()));
-  m_ui->dteEffectStart->setMsecsSinceEpoch(contamination.effectStart().is_set() ? contamination.effectStart().get() : 0);
-  m_ui->cbChargeType->setCurrentIndex(m_ui->cbChargeType->findData(contamination.chargeStruct().chargeTypeId()));  
-  m_ui->sbDurationHours->setValue(contamination.effectDuration() / 1000 / 60/ 60); 
-  m_ui->sbRadius->setValue(contamination.impactRadius());
-  m_ui->cbParty->setCurrentIndex(m_ui->cbParty->findData(contamination.partyId().is_set() ? contamination.partyId().get() : 0));
-  m_ui->cbWeather->setCurrentIndex(contamination.weatherSource().underlying());
+  m_ui->leIdentifier->setText(QString::fromStdString(contamination.name));
+  m_ui->dteEffectStart->setMsecsSinceEpoch(contamination.effectStart.has_value() ? contamination.effectStart.get() : 0);
+  m_ui->cbChargeType->setCurrentIndex(m_ui->cbChargeType->findData(contamination.chargeStruct.chargeTypeId));  
+  m_ui->sbDurationHours->setValue(contamination.effectDuration / 1000 / 60/ 60); 
+  m_ui->sbRadius->setValue(contamination.impactRadius);
+  m_ui->cbParty->setCurrentIndex(m_ui->cbParty->findData(contamination.partyId.has_value() ? contamination.partyId.get() : 0));
+  m_ui->cbWeather->setCurrentIndex(static_cast<int>(contamination.weatherSource));

-  QPointF impactPosition(contamination.impactPosition().lon(), contamination.impactPosition().lat());
+  QPointF impactPosition(contamination.impactPosition.lon, contamination.impactPosition.lat);
  if (!impactPosition.isNull())
    m_ui->positionEdit->setCoordinate(impactPosition);

-  m_ui->sbAltitude->setValue(contamination.upperOffset());
-  m_ui->cbLowerLimit->setChecked(qFuzzyIsNull(contamination.lowerOffset()));
+  m_ui->sbAltitude->setValue(contamination.upperOffset);
+  m_ui->cbLowerLimit->setChecked(qFuzzyIsNull(contamination.lowerOffset));

 }

@@ -341,9 +341,9 @@ bool BCContaminationEdit::apply()
  const Core::GeoPosition2D pos(p.x(), p.y());


-  const BCContaminationModifyRequest req(m_aesItem.id(),
+  const BCContaminationModifyRequest req(m_aesItem.id,
                                         name,
-                                         LtsUtils::toOptional(effectStart),
+                                         LtsUtils::toOptional(static_cast<int64_t>(effectStart)),
                                         duration,
                                         chargeType,
                                         pos,
@@ -354,18 +354,18 @@ bool BCContaminationEdit::apply()
                                         dds::core::optional<double>(),
                                         dds::core::optional<double>(),
                                         dds::core::optional<Core::GeoPosition2D>(),
-                                         dds::core::optional<rti::core::int64>(),
-                                         dds::core::optional<rti::core::int64>(),
+                                         dds::core::optional<int64_t>(),
+                                         dds::core::optional<int64_t>(),
                                         extrusionHeight,
                                         lowerOffset,
                                         m_ui->chbDangerArea->isChecked());

  INFO_LOG(m_logger) << "apply "
                     << " extrusionHeight=" << extrusionHeight
-                     << " req.upperOffset=" << req.upperOffset()
+                     << " req.upperOffset=" << req.upperOffset
                     << " lowerOf"
                        "fset=" << lowerOffset
-                     << " req.lowerOffset=" << req.lowerOffset();
+                     << " req.lowerOffset=" << req.lowerOffset;

  m_requestHelper->addRequest([this,req]()
  {
@@ -3,7 +3,7 @@

 #pragma once

-#include <AreaEffectSimulation/Base/aes_base_edit.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_edit.h>
 #include <ProjectDataManagement/pdm_gui_plugin_interface.h>


@@ -29,8 +29,8 @@ public:
  QString dialogIdentifier() const override
  {
    if (m_isChemical)
-      return m_aesItem.id() <= 0 ? QStringLiteral("AddCContamination") : QStringLiteral("EditCContamination%1").arg(m_aesItem.id());
-    return m_aesItem.id() <= 0 ? QStringLiteral("AddBContamination") : QStringLiteral("EditBContamination%1").arg(m_aesItem.id());
+      return m_aesItem.id <= 0 ? QStringLiteral("AddCContamination") : QStringLiteral("EditCContamination%1").arg(m_aesItem.id);
+    return m_aesItem.id <= 0 ? QStringLiteral("AddBContamination") : QStringLiteral("EditBContamination%1").arg(m_aesItem.id);
  }
  bool init(int aesItemId, bool copy, LtsSession::LtsSession *session);

@@ -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_bccontamination_gui_plugin_interface.h"

 namespace AreaEffectSimulation
@@ -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
 {
@@ -4,7 +4,7 @@
 #pragma once

 #include <QtCore/QSet>
-#include <AreaEffectSimulation/Base/aes_base_model.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.h>
 #include <ProjectDataManagement/pdm_enums.hpp>

 namespace LtsSession