Adds immediate migration results
This commit is contained in:
2395 files changed
+357322
-2524
No files matched your search
@@ -12,11 +12,11 @@ NGL_ADD_LIBRARY2(LtsCoordTrans WS AAR SV HLA SHARED
|
||||
)
|
||||
NGL_TARGET_LINK_LIBRARIES(LtsCoordTrans
|
||||
PRIVATE
|
||||
Qt5::Core
|
||||
Qt6::Core
|
||||
)
|
||||
if (GeographicLib_FOUND)
|
||||
NGL_TARGET_LINK_LIBRARIES(LtsCoordTrans
|
||||
PRIVATE GeographicLib
|
||||
PRIVATE GeographicLib::GeographicLib_SHARED
|
||||
)
|
||||
else()
|
||||
message(STATUS "GeographicLib not found; building LtsCoordTrans without it")
|
||||
@@ -41,8 +41,8 @@ NGL_TARGET_LINK_LIBRARIES(ltsCoordWidget
|
||||
PRIVATE
|
||||
LtsCoordTrans
|
||||
PUBLIC
|
||||
Qt5::Core
|
||||
Qt5::Widgets
|
||||
Qt6::Core
|
||||
Qt6::Widgets
|
||||
)
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(ltsCoordWidget
|
||||
PUBLIC
|
||||
@@ -54,8 +54,8 @@ IF(TARGET LtsCoordTrans)
|
||||
FOREACH(_tool ${_tools})
|
||||
NGL_ADD_EXECUTABLE(ALL ${_tool} ${_tool}.cpp)
|
||||
NGL_TARGET_LINK_LIBRARIES(${_tool}
|
||||
Qt5::Core
|
||||
GeographicLib
|
||||
Qt6::Core
|
||||
GeographicLib::GeographicLib_SHARED
|
||||
)
|
||||
NGL_INSTALL_TARGET(${_tool})
|
||||
ENDFOREACH()
|
||||
@@ -76,8 +76,8 @@ IF(BUILD_TESTING AND TARGET LtsCoordTrans)
|
||||
)
|
||||
TARGET_LINK_LIBRARIES(lts_coord_trans_unit_test
|
||||
LtsCoordTrans
|
||||
Qt5::Test
|
||||
GeographicLib
|
||||
Qt6::Test
|
||||
GeographicLib::GeographicLib_SHARED
|
||||
)
|
||||
ADD_TEST(NAME lts_coord_trans_unit_test COMMAND $<TARGET_FILE:lts_coord_trans_unit_test>)
|
||||
ENDIF()
|
||||
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "lts_coord_trans.h"
|
||||
#include <utility>
|
||||
|
||||
#include <GeographicLib/Geocentric.hpp>
|
||||
#include <GeographicLib/UTMUPS.hpp>
|
||||
@@ -320,7 +321,7 @@ QStringList getMgrsSurroundingSquares(const QRectF &geoRect, const QSize &offset
|
||||
QVector<UtmCoordinate> mainUtmsWithOffset = getMgrsSquaresInternal(rectWithOffset);
|
||||
QStringList mainSquaresWithOffset;
|
||||
mainSquaresWithOffset.reserve(mainUtmsWithOffset.count());
|
||||
for (const auto &utm : qAsConst(mainUtmsWithOffset))
|
||||
for (const auto &utm : std::as_const(mainUtmsWithOffset))
|
||||
mainSquaresWithOffset.append(utm.mgrs(0));
|
||||
|
||||
|
||||
|
||||
+6
-5
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "lts_coord_trans_unit_test.h"
|
||||
#include <utility>
|
||||
#include "lts_coord_trans.h"
|
||||
#include <GeographicLib/Math.hpp>
|
||||
#include <QTest>
|
||||
@@ -408,23 +409,23 @@ void coordtrans_test::testMgrsSquaresWithSurrounding()
|
||||
|
||||
QStringList string1;
|
||||
string1.reserve(squares1.size());
|
||||
for (const LtsCoordTrans::UtmCoordinate &item : qAsConst(squares1))
|
||||
for (const LtsCoordTrans::UtmCoordinate &item : std::as_const(squares1))
|
||||
string1.append(item.mgrs(0));
|
||||
|
||||
QStringList string9;
|
||||
string9.reserve(squares9.size());
|
||||
for (const LtsCoordTrans::UtmCoordinate &item : qAsConst(squares9))
|
||||
for (const LtsCoordTrans::UtmCoordinate &item : std::as_const(squares9))
|
||||
string9.append(item.mgrs(0));
|
||||
|
||||
QStringList string33;
|
||||
string33.reserve(square33.size());
|
||||
for (const LtsCoordTrans::UtmCoordinate &item : qAsConst(square33))
|
||||
for (const LtsCoordTrans::UtmCoordinate &item : std::as_const(square33))
|
||||
string33.append(item.mgrs(0));
|
||||
|
||||
{
|
||||
QStringList surroundingStrings;
|
||||
surroundingStrings.reserve(squares9.size());
|
||||
for (const QString &str : qAsConst(string9))
|
||||
for (const QString &str : std::as_const(string9))
|
||||
if (!string1.contains(str))
|
||||
surroundingStrings.append(str);
|
||||
|
||||
@@ -434,7 +435,7 @@ void coordtrans_test::testMgrsSquaresWithSurrounding()
|
||||
{
|
||||
QStringList surroundingStrings;
|
||||
surroundingStrings.reserve(string33.size());
|
||||
for (const QString &str : qAsConst(string33))
|
||||
for (const QString &str : std::as_const(string33))
|
||||
if (!string1.contains(str))
|
||||
surroundingStrings.append(str);
|
||||
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "lts_coord_widget_p.h"
|
||||
#include <utility>
|
||||
|
||||
|
||||
namespace LtsCoordWidget
|
||||
@@ -188,7 +189,7 @@ void MgrsEdit::addMgrsSquare(const QString &newMgrsSquare)
|
||||
{
|
||||
QStringList squares = utmCoordsToList(LtsCoordTrans::defaultMgrsSquareWithOffsets());
|
||||
|
||||
for (const auto &sq : qAsConst(squares))
|
||||
for (const auto &sq : std::as_const(squares))
|
||||
if (!sl.contains(sq))
|
||||
sl.append(sq);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user