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
+11
-11
@@ -74,14 +74,14 @@ bool CustomViewExplosion::init(const QModelIndex &idx)
|
||||
bool CustomViewExplosion::calculateIcon(const ExplosionArea &area, const QColor &color)
|
||||
{
|
||||
Database::AesExplosionArea ea;
|
||||
ea.impactPosition = QPointF(area.area().cornerBottomLeft().lon(),
|
||||
area.area().cornerBottomLeft().lat());
|
||||
ea.rotationAngle = area.area().rotation();
|
||||
ea.impactWidth = area.area().width();
|
||||
ea.impactLength = area.area().height();
|
||||
ea.impactPosition = QPointF(area.area.cornerBottomLeft.lon,
|
||||
area.area.cornerBottomLeft.lat);
|
||||
ea.rotationAngle = area.area.rotation;
|
||||
ea.impactWidth = area.area.width;
|
||||
ea.impactLength = area.area.height;
|
||||
|
||||
QPolygonF poly = AreaEffectSimulation::Polygons::explosionArea(ea);
|
||||
Qt::BrushStyle bStyle = PixmapLabel::checkForBrushStyle(area.effectStateId());
|
||||
Qt::BrushStyle bStyle = PixmapLabel::checkForBrushStyle(area.effectStateId);
|
||||
const auto pix = Polygons::pixmapFromPolygon(PixmapLabel::geographic2Utm(poly), color, ICON_RESOLUTION, bStyle);
|
||||
m_ui->lblIcon->setPixmap(pix);
|
||||
|
||||
@@ -91,17 +91,17 @@ bool CustomViewExplosion::calculateIcon(const ExplosionArea &area, const QColor
|
||||
bool CustomViewExplosion::calculateIcon(const ExplosionSingle &single, const QColor &color)
|
||||
{
|
||||
Database::AesExplosionSingle es;
|
||||
es.impactPosition = QPointF(single.impactPosition().lon(), single.impactPosition().lat());
|
||||
es.impactPosition = QPointF(single.impactPosition.lon, single.impactPosition.lat);
|
||||
|
||||
std::shared_ptr<ProjectDataManagement::Interface::Dtc> pdmDtc;
|
||||
if (!m_session->getDtc<ProjectDataManagement::DataInterface>(pdmDtc))
|
||||
return false;
|
||||
|
||||
double radius = pdmDtc->impactRadius(single.chargeStruct().chargeTypeId(),
|
||||
single.chargeStruct().igniterTypeId(),
|
||||
single.chargeStruct().igniterFunctionId());
|
||||
double radius = pdmDtc->impactRadius(single.chargeStruct.chargeTypeId,
|
||||
single.chargeStruct.igniterTypeId,
|
||||
single.chargeStruct.igniterFunctionId);
|
||||
QPolygonF poly = AreaEffectSimulation::Polygons::explosionSingle(es, radius);
|
||||
Qt::BrushStyle bStyle = PixmapLabel::checkForBrushStyle(single.effectStateId());
|
||||
Qt::BrushStyle bStyle = PixmapLabel::checkForBrushStyle(single.effectStateId);
|
||||
const auto pix = Polygons::pixmapFromPolygon(PixmapLabel::geographic2Utm(poly), color, ICON_RESOLUTION, bStyle);
|
||||
m_ui->lblIcon->setPixmap(pix);
|
||||
|
||||
|
||||
Reference in new issue
Block a user