sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-08 00:05:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

move catch block to QgsQuickUtils::transformPoint since it can be invoced from qml

Browse Source
This commit is contained in:
Peter Petrik 2021-01-13 10:33:24 +01:00 committed by Nyall Dawson
parent 1ed818e264
commit 8d240ecd4d
4 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/quickgui/attributes/qgsquickattributeformmodelbase.cpp
View File

@ -19,8 +19,6 @@
#include "qgsquickattributeformmodelbase.h" #include "qgsquickattributeformmodelbase.h"
#include "qgsquickattributeformmodel.h" #include "qgsquickattributeformmodel.h"
#include <qgsvectorlayerutils.h> #include <qgsvectorlayerutils.h>
#include "qgsattributeeditorcontainer.h"
#include "qgsattributeeditorfield.h"
/// @cond PRIVATE /// @cond PRIVATE

1
src/quickgui/attributes/qgsquickattributeformmodelbase.h
View File

@ -32,7 +32,6 @@
#include "qgseditformconfig.h" #include "qgseditformconfig.h"
#include "qgsexpressioncontext.h" #include "qgsexpressioncontext.h"
#include "qgsattributeeditorcontainer.h"
#include "qgis_quick.h" #include "qgis_quick.h"
#include "qgsquickattributemodel.h" #include "qgsquickattributemodel.h"

13
src/quickgui/qgsquickpositionkit.cpp
View File

@ -139,19 +139,12 @@ void QgsQuickPositionKit::updateProjectedPosition()
return; return;
QgsPointXY srcPoint = QgsPointXY( mPosition.x(), mPosition.y() ); QgsPointXY srcPoint = QgsPointXY( mPosition.x(), mPosition.y() );
QgsPointXY projectedPositionXY = srcPoint; QgsPointXY projectedPositionXY = QgsQuickUtils::transformPoint(
try
{
projectedPositionXY = QgsQuickUtils::transformPoint(
positionCRS(), positionCRS(),
mMapSettings->destinationCrs(), mMapSettings->destinationCrs(),
mMapSettings->transformContext(), mMapSettings->transformContext(),
srcPoint ); srcPoint
} );
catch ( const QgsCsException & )
{
QgsDebugMsg( QStringLiteral( "Failed to transform GPS position: " ) + srcPoint.toString() );
}
QgsPoint projectedPosition( projectedPositionXY ); QgsPoint projectedPosition( projectedPositionXY );
projectedPosition.addZValue( mPosition.z() ); projectedPosition.addZValue( mPosition.z() );

15
src/quickgui/qgsquickutils.cpp
View File

@ -68,10 +68,21 @@ QgsPointXY QgsQuickUtils::transformPoint( const QgsCoordinateReferenceSystem &sr
const QgsCoordinateTransformContext &context, const QgsCoordinateTransformContext &context,
const QgsPointXY &srcPoint ) const QgsPointXY &srcPoint )
{ {
QgsCoordinateTransform mTransform( srcCrs, destCrs, context ); try
QgsPointXY pt = mTransform.transform( srcPoint ); {
QgsCoordinateTransform ct( srcCrs, destCrs, context );
if ( ct.isValid() )
{
const QgsPointXY pt = ct.transform( srcPoint );
return pt; return pt;
} }
}
catch ( QgsCsException &cse )
{
Q_UNUSED( cse )
}
return srcPoint;
}
double QgsQuickUtils::screenUnitsToMeters( QgsQuickMapSettings *mapSettings, int baseLengthPixels ) double QgsQuickUtils::screenUnitsToMeters( QgsQuickMapSettings *mapSettings, int baseLengthPixels )
{ {