fix Warning
This commit is contained in:
1 parent
593c221d23
commit
8345470273
316 files changed
+1246
-929
No files matched your search
+12
-23
@@ -6,6 +6,7 @@
|
||||
*/
|
||||
|
||||
#include "polygons.h"
|
||||
#include <utility>
|
||||
#include "tne_algorithmen.h"
|
||||
|
||||
#include <aes.hpp>
|
||||
@@ -107,7 +108,7 @@ static QPolygonF utmToGeogrphic(const QPolygonF &polyUtm, const LtsCoordTrans::U
|
||||
{
|
||||
QPolygonF poly;
|
||||
poly.reserve(polyUtm.size());
|
||||
for (const QPointF &point : qAsConst(polyUtm))
|
||||
for (const QPointF &point : std::as_const(polyUtm))
|
||||
poly << base.geographic(point);
|
||||
return poly;
|
||||
}
|
||||
@@ -124,18 +125,6 @@ static const QString string4poly(const QPolygonF &poly)
|
||||
return QStringLiteral("%1 Values (%2)").arg(poly.count()).arg(pointString.join(QStringLiteral(" --- ")));
|
||||
}
|
||||
|
||||
static const QString string4poly(const QPair<QPolygonF, QVector<double>> &pair)
|
||||
{
|
||||
if (pair.first.isEmpty())
|
||||
return (QStringLiteral("Empty Polygon!"));
|
||||
int zone = LtsCoordTrans::UtmCoordinate::fromGeographic(pair.first[0]).zone;
|
||||
QStringList pointString;
|
||||
pointString.reserve(pair.first.size());
|
||||
for (int i = 0; i < pair.first.size(); ++i)
|
||||
pointString << LtsCoordTrans::UtmCoordinate::fromGeographic(pair.first[i], zone).mgrs() << QStringLiteral(" ") << QString::number(pair.second[i], 'f', 1);
|
||||
return QStringLiteral("%1 Values (%2)").arg(pair.first.count()).arg(pointString.join(QStringLiteral(" --- ")));
|
||||
}
|
||||
|
||||
QPolygonF circle(const QPointF ¢er, qreal radius, int steps)
|
||||
{
|
||||
const LtsCoordTrans::UtmCoordinate ¢erUtm = LtsCoordTrans::UtmCoordinate::fromGeographic(center);
|
||||
@@ -471,7 +460,7 @@ QVector<QPointF> effectClusterSingleExplosionsGAUSS(const Database::AesEffectClu
|
||||
|
||||
vec.reserve(impactCount);
|
||||
const QTransform trans(fromRotation(-effectCluster.rotationAngle)); // Compass, not mathematical!
|
||||
for (const QPointF &point : qAsConst(impactsGAUSS))
|
||||
for (const QPointF &point : std::as_const(impactsGAUSS))
|
||||
{
|
||||
QPointF p = impactPositionUtm.geographic(trans.map(point));
|
||||
DEBUG_LOG(logger) << "Point = " << p;
|
||||
@@ -547,7 +536,7 @@ QVector<QPointF> effectClusterSingleExplosionsGAUSS_Mtp(const Database::AesEffec
|
||||
|
||||
QVector<LtsCoordTrans::UtmCoordinate> mtps_asRealUtm;
|
||||
mtps_asRealUtm.reserve(mtps_asUtm.size());
|
||||
for (const QPointF &mtp_asUtm : qAsConst(mtps_asUtm))
|
||||
for (const QPointF &mtp_asUtm : std::as_const(mtps_asUtm))
|
||||
{
|
||||
// convert QPointF back to UtmCoordinate: pay attention to order!!!
|
||||
const LtsCoordTrans::UtmCoordinate mtpUtm(impactPositionUtm.zone, mtp_asUtm.x(), mtp_asUtm.y());
|
||||
@@ -586,7 +575,7 @@ QVector<QPointF> effectClusterSingleExplosionsGAUSS_Mtp(const Database::AesEffec
|
||||
|
||||
int idx = 0;
|
||||
const QTransform transform(fromRotation(-mtpRotationNorthDegree)); // Compass, not mathematical!
|
||||
for (const QPointF &point : qAsConst(impactsGAUSS))
|
||||
for (const QPointF &point : std::as_const(impactsGAUSS))
|
||||
{
|
||||
// which mtp:
|
||||
int mtpIdx = (idx++ % mtps_asUtm.size()); // modulo
|
||||
@@ -601,7 +590,7 @@ QVector<QPointF> effectClusterSingleExplosionsGAUSS_Mtp(const Database::AesEffec
|
||||
<< ", randomNumber=" << randomNumber << " singleWidthOut=" << singleWidthOut << " singleHeightOut=" << singleHeightOut
|
||||
<< " rot=" << explosionCluster.rotationAngle;
|
||||
|
||||
for (auto item : qAsConst(finalVec))
|
||||
for (auto item : std::as_const(finalVec))
|
||||
{
|
||||
const LtsCoordTrans::UtmCoordinate &utm = LtsCoordTrans::UtmCoordinate::fromGeographic(item);
|
||||
qCritical() << " TNE VERIFICATION: CHECK:"
|
||||
@@ -895,7 +884,7 @@ QVector<QPointF> explosionClusterSingleExplosionsGAUSS(const Database::AesExplos
|
||||
|
||||
vec.reserve(impactCount);
|
||||
const QTransform trans(fromRotation(-explosionCluster.rotationAngle)); // Compass, not mathematical!
|
||||
for (const QPointF &point : qAsConst(impactsGAUSS))
|
||||
for (const QPointF &point : std::as_const(impactsGAUSS))
|
||||
{
|
||||
QPointF p = impactPositionUtm.geographic(trans.map(point));
|
||||
DEBUG_LOG(logger) << "Point = " << p;
|
||||
@@ -972,7 +961,7 @@ QVector<QPointF> explosionClusterSingleExplosionsGAUSS_Mtp(const Database::AesEx
|
||||
|
||||
QVector<LtsCoordTrans::UtmCoordinate> mtps_asRealUtm;
|
||||
mtps_asRealUtm.reserve(mtps_asUtm.size());
|
||||
for (const QPointF &mtp_asUtm : qAsConst(mtps_asUtm))
|
||||
for (const QPointF &mtp_asUtm : std::as_const(mtps_asUtm))
|
||||
{
|
||||
// convert QPointF back to UtmCoordinate: pay attention to order!!!
|
||||
const LtsCoordTrans::UtmCoordinate mtpUtm(impactPositionUtm.zone, mtp_asUtm.x(), mtp_asUtm.y());
|
||||
@@ -1011,7 +1000,7 @@ QVector<QPointF> explosionClusterSingleExplosionsGAUSS_Mtp(const Database::AesEx
|
||||
|
||||
int idx = 0;
|
||||
const QTransform transform(fromRotation(-mtpRotationNorthDegree)); // Compass, not mathematical!
|
||||
for (const QPointF &point : qAsConst(impactsGAUSS))
|
||||
for (const QPointF &point : std::as_const(impactsGAUSS))
|
||||
{
|
||||
// which mtp:
|
||||
int mtpIdx = (idx++ % mtps_asUtm.size()); // modulo
|
||||
@@ -1026,7 +1015,7 @@ QVector<QPointF> explosionClusterSingleExplosionsGAUSS_Mtp(const Database::AesEx
|
||||
<< ", randomNumber=" << randomNumber << " singleWidthOut=" << singleWidthOut << " singleHeightOut=" << singleHeightOut
|
||||
<< " rot=" << explosionCluster.rotationAngle;
|
||||
|
||||
for (auto item : qAsConst(finalVec))
|
||||
for (auto item : std::as_const(finalVec))
|
||||
{
|
||||
const LtsCoordTrans::UtmCoordinate &utm = LtsCoordTrans::UtmCoordinate::fromGeographic(item);
|
||||
qCritical() << " TNE VERIFICATION: CHECK:"
|
||||
@@ -1673,7 +1662,7 @@ LtsUtils::QPoint3D calculateFiringUnitCenterNonRecursive(const std::shared_ptr<P
|
||||
int childCount = 0;
|
||||
LtsUtils::QPoint3D pos;
|
||||
|
||||
for (int childId : qAsConst(childIds))
|
||||
for (int childId : std::as_const(childIds))
|
||||
{
|
||||
const ParticipantManagement::ParticipantPosition &childPos = ppmDtc->participantPosition(childId);
|
||||
if (childPos.participantId != childId)
|
||||
@@ -1726,7 +1715,7 @@ std::vector<Core::GeoPosition2D> dangerAreaDefaultSegments(const QPointF ¢er
|
||||
// polyUtm = QTransform().rotate(0).map(polyUtm);
|
||||
LtsCoordTrans::UtmCoordinate impactPositionUtm = LtsCoordTrans::UtmCoordinate::fromGeographic(centerPos);
|
||||
const QPolygonF poly(utmToGeogrphic(polyUtm, impactPositionUtm));
|
||||
for (const auto &p : qAsConst(poly))
|
||||
for (const auto &p : std::as_const(poly))
|
||||
segments.push_back(Core::GeoPosition2D(p.x(), p.y()));
|
||||
|
||||
return segments;
|
||||
|
||||
Reference in new issue
Block a user