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
@@ -60,13 +60,13 @@ bool CustomViewTechnicalArea::init(const QModelIndex &idx)
 bool CustomViewTechnicalArea::calculateIcon(const AreaEffectSimulation::TechnicalArea &tecArea, const QColor &color)
 {
  Database::AesTechnicalArea tecOut;
-  tecOut.position = QPointF(tecArea.area().cornerBottomLeft().lon(),
-                            tecArea.area().cornerBottomLeft().lat());
-  tecOut.width = tecArea.area().width();
-  tecOut.length = tecArea.area().height();
+  tecOut.position = QPointF(tecArea.area.cornerBottomLeft.lon,
+                            tecArea.area.cornerBottomLeft.lat);
+  tecOut.width = tecArea.area.width;
+  tecOut.length = tecArea.area.height;

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

@@ -81,15 +81,15 @@ void TechnicalAreaEdit::enableUiElements(bool enable)
  m_ui->sbWidth->setEnabled(enable);
  m_ui->pbClear->setEnabled(enable);
  m_ui->leIdentifier->setEnabled(enable || isOnlyNameModifiable());
-  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->technicalArea(m_aesItem.id());
+    auto baseData = m_dtc->technicalArea(m_aesItem.id);
    setData(baseData, false);
    __unchange__();
    if (name != m_ui->leIdentifier->text())
@@ -136,19 +136,19 @@ void TechnicalAreaEdit::setData(const TechnicalArea &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->sbWidth->setValue(area.area().width());
-  m_ui->sbHeight->setValue(area.area().height());
+  m_ui->leIdentifier->setText(QString::fromStdString(area.name));
+  m_ui->sbWidth->setValue(area.area.width);
+  m_ui->sbHeight->setValue(area.area.height);

-  QPointF bottomLeft(area.area().cornerBottomLeft().lon(), area.area().cornerBottomLeft().lat());
-  QPointF centerpoint = Polygons::bottomLeft2CenterPoint(bottomLeft, area.area().width(), area.area().height(), 0.0);
+  QPointF bottomLeft(area.area.cornerBottomLeft.lon, area.area.cornerBottomLeft.lat);
+  QPointF centerpoint = Polygons::bottomLeft2CenterPoint(bottomLeft, area.area.width, area.area.height, 0.0);
  if (!centerpoint.isNull())
    m_ui->positionEdit->setCoordinate(centerpoint);

-  m_ui->cbType->setCurrentIndex(m_ui->cbType->findData(area.type().underlying()));
+  m_ui->cbType->setCurrentIndex(m_ui->cbType->findData(static_cast<int>(area.type)));
 }

 inline void TechnicalAreaEdit::fillCbx()
@@ -161,9 +161,9 @@ inline void TechnicalAreaEdit::fillCbx()


  m_ui->cbType->clear();
-  m_ui->cbType->addItem(AreaEffectSimulation::toString(AesTechnicalAreaType::TatMout), AesTechnicalAreaType::TatMout);
+  m_ui->cbType->addItem(AreaEffectSimulation::toString(AesTechnicalAreaType::TatMout), static_cast<int>(AesTechnicalAreaType::TatMout));
  if ( enableSoundZones )
-    m_ui->cbType->addItem(AreaEffectSimulation::toString(AesTechnicalAreaType::TatSoundZone), AesTechnicalAreaType::TatSoundZone);
+    m_ui->cbType->addItem(AreaEffectSimulation::toString(AesTechnicalAreaType::TatSoundZone), static_cast<int>(AesTechnicalAreaType::TatSoundZone));
  
  
  
@@ -211,7 +211,7 @@ bool TechnicalAreaEdit::apply()
                                                      0.0));
  const Core::GeoPosition2D bottomLeftGeo(bottomLeft.x(), bottomLeft.y());
  const Area                area(bottomLeftGeo, m_ui->sbWidth->value(), m_ui->sbHeight->value(), 0.0);
-  const TechnicalAreaModifyRequest req(m_aesItem.id(),
+  const TechnicalAreaModifyRequest req(m_aesItem.id,
                                       name,
                                       area,
                                       type);
@@ -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 <QtGui/QPolygonF>

@@ -27,7 +27,7 @@ public:

  QString dialogIdentifier() const override
  {
-    return m_aesItem.id() <= 0 ? QStringLiteral("AddTechnicalArea")  : QStringLiteral("EditTechnicalArea%1").arg(m_aesItem.id());
+    return m_aesItem.id <= 0 ? QStringLiteral("AddTechnicalArea")  : QStringLiteral("EditTechnicalArea%1").arg(m_aesItem.id);
  }
  bool init(int areaId, 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_technical_area_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
 {
@@ -45,12 +45,12 @@ QVariant TechnicalAreasModel::data(const QModelIndex &idx, int role) const
  if (role == Qt::DisplayRole && idx.column() == BcChargeType)
  {
    const TechnicalArea &ta = m_vecData.at(idx.row());
-    return AreaEffectSimulation::toString(ta.type());
+    return AreaEffectSimulation::toString(ta.type);
  }
  if (role == Qt::DisplayRole && idx.column() == BcEffectState)
  {
    const TechnicalArea &ta = m_vecData.at(idx.row());
-    return AreaEffectSimulation::toString(ta.effectStateId());
+    return AreaEffectSimulation::toString(ta.effectStateId);
  }
  return AesGuiBaseModel::data(idx, role);
 }
@@ -3,7 +3,7 @@

 #pragma once

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

 namespace LtsSession