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
+3
-3
@@ -65,10 +65,10 @@ bool CustomViewBoobyTrap::init(const QModelIndex &idx)
|
||||
|
||||
bool CustomViewBoobyTrap::calculateIcon(const BoobyTrap &bt, const QColor &color)
|
||||
{
|
||||
QPointF impactPosition = QPointF(bt.impactPosition().lon(), bt.impactPosition().lat());
|
||||
const QPolygonF poly = Polygons::circle(impactPosition, bt.triggerRadius());
|
||||
QPointF impactPosition = QPointF(bt.impactPosition.lon, bt.impactPosition.lat);
|
||||
const QPolygonF poly = Polygons::circle(impactPosition, bt.triggerRadius);
|
||||
|
||||
Qt::BrushStyle bStyle = PixmapLabel::checkForBrushStyle(bt.effectStateId());
|
||||
Qt::BrushStyle bStyle = PixmapLabel::checkForBrushStyle(bt.effectStateId);
|
||||
const auto pix = Polygons::pixmapFromPolygon(PixmapLabel::geographic2Utm(poly), color, ICON_RESOLUTION, bStyle);
|
||||
m_ui->lblIcon->setPixmap(pix);
|
||||
|
||||
|
||||
+7
-7
@@ -66,16 +66,16 @@ bool CustomViewOffRouteMine::init(const QModelIndex &idx)
|
||||
bool CustomViewOffRouteMine::calculateIcon(const OffRouteMine &orm, const QColor &color)
|
||||
{
|
||||
Database::AesOffRouteMine ormOut;
|
||||
ormOut.id = orm.id();
|
||||
ormOut.chargeTypeId = orm.chargeStruct().chargeTypeId();
|
||||
ormOut.effectStart = QDateTime::fromMSecsSinceEpoch(orm.effectStart().is_set() ? orm.effectStart().get() : 0);
|
||||
ormOut.impactPosition = QPointF(orm.area().cornerBottomLeft().lon(), orm.area().cornerBottomLeft().lat());
|
||||
if (orm.impactRadius().is_set())
|
||||
ormOut.impactRadius = orm.impactRadius().get();
|
||||
ormOut.id = orm.id;
|
||||
ormOut.chargeTypeId = orm.chargeStruct.chargeTypeId;
|
||||
ormOut.effectStart = QDateTime::fromMSecsSinceEpoch(orm.effectStart.has_value() ? orm.effectStart.get() : 0);
|
||||
ormOut.impactPosition = QPointF(orm.area.cornerBottomLeft.lon, orm.area.cornerBottomLeft.lat);
|
||||
if (orm.impactRadius.has_value())
|
||||
ormOut.impactRadius = orm.impactRadius.get();
|
||||
|
||||
const QPolygonF poly = AreaEffectSimulation::Polygons::offRouteMineArea(ormOut);
|
||||
|
||||
Qt::BrushStyle bStyle = PixmapLabel::checkForBrushStyle(orm.effectStateId());
|
||||
Qt::BrushStyle bStyle = PixmapLabel::checkForBrushStyle(orm.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