move catch block to QgsQuickUtils::transformPoint since it can be inv…

…oced from qml
qgis · Jan 13, 2021 · 8d240ec · 8d240ec
1 parent 1ed818e
commit 8d240ec
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 19 deletions.
diff --git a/src/quickgui/attributes/qgsquickattributeformmodelbase.cpp b/src/quickgui/attributes/qgsquickattributeformmodelbase.cpp
@@ -19,8 +19,6 @@
 #include "qgsquickattributeformmodelbase.h"
 #include "qgsquickattributeformmodel.h"
 #include <qgsvectorlayerutils.h>
-#include "qgsattributeeditorcontainer.h"
-#include "qgsattributeeditorfield.h"
 
 /// @cond PRIVATE
 

diff --git a/src/quickgui/attributes/qgsquickattributeformmodelbase.h b/src/quickgui/attributes/qgsquickattributeformmodelbase.h
@@ -32,7 +32,6 @@
 
 #include "qgseditformconfig.h"
 #include "qgsexpressioncontext.h"
-#include "qgsattributeeditorcontainer.h"
 
 #include "qgis_quick.h"
 #include "qgsquickattributemodel.h"

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

diff --git a/src/quickgui/qgsquickutils.cpp b/src/quickgui/qgsquickutils.cpp
@@ -68,9 +68,20 @@ QgsPointXY QgsQuickUtils::transformPoint( const QgsCoordinateReferenceSystem &sr
     const QgsCoordinateTransformContext &context,
     const QgsPointXY &srcPoint )
 {
-  QgsCoordinateTransform mTransform( srcCrs, destCrs, context );
-  QgsPointXY pt = mTransform.transform( srcPoint );
-  return pt;
+  try
+  {
+    QgsCoordinateTransform ct( srcCrs, destCrs, context );
+    if ( ct.isValid() )
+    {
+      const QgsPointXY pt = ct.transform( srcPoint );
+      return pt;
+    }
+  }
+  catch ( QgsCsException &cse )
+  {
+    Q_UNUSED( cse )
+  }
+  return srcPoint;
 }
 
 double QgsQuickUtils::screenUnitsToMeters( QgsQuickMapSettings *mapSettings, int baseLengthPixels )