Fix missing transform context warnings on status bar coordinate display

nyalldawson · nyalldawson · commit 63d587c09883 · 2018-03-06T12:20:24.000+11:00
(cherry-picked from 55814b8)
diff --git a/src/app/qgsstatusbarcoordinateswidget.cpp b/src/app/qgsstatusbarcoordinateswidget.cpp
@@ -226,7 +226,7 @@ void QgsStatusBarCoordinatesWidget::showMouseCoordinates( const QgsPointXY &p )
     return;
   }
 
-  mLineEdit->setText( QgsCoordinateUtils::formatCoordinateForProject( p, mMapCanvas->mapSettings().destinationCrs(),
+  mLineEdit->setText( QgsCoordinateUtils::formatCoordinateForProject( QgsProject::instance(), p, mMapCanvas->mapSettings().destinationCrs(),
                       mMousePrecisionDecimalPlaces ) );
 
   ensureCoordinatesVisible();
diff --git a/src/core/qgscoordinateutils.cpp b/src/core/qgscoordinateutils.cpp
@@ -62,9 +62,12 @@ int QgsCoordinateUtils::calculateCoordinatePrecision( double mapUnitsPerPixel, c
   return dp;
 }
 
-QString QgsCoordinateUtils::formatCoordinateForProject( const QgsPointXY &point, const QgsCoordinateReferenceSystem &destCrs, int precision )
+QString QgsCoordinateUtils::formatCoordinateForProject( QgsProject *project, const QgsPointXY &point, const QgsCoordinateReferenceSystem &destCrs, int precision )
 {
-  QString format = QgsProject::instance()->readEntry( QStringLiteral( "PositionPrecision" ), QStringLiteral( "/DegreeFormat" ), QStringLiteral( "MU" ) );
+  if ( !project )
+    return QString();
+
+  QString format = project->readEntry( QStringLiteral( "PositionPrecision" ), QStringLiteral( "/DegreeFormat" ), QStringLiteral( "MU" ) );
 
   QgsPointXY geo = point;
   if ( format == QLatin1String( "DM" ) || format == QLatin1String( "DMS" ) || format == QLatin1String( "D" ) )
@@ -73,9 +76,7 @@ QString QgsCoordinateUtils::formatCoordinateForProject( const QgsPointXY &point,
     if ( destCrs.isValid() && !destCrs.isGeographic() )
     {
       // need to transform to geographic coordinates
-      Q_NOWARN_DEPRECATED_PUSH
-      QgsCoordinateTransform ct( destCrs, QgsCoordinateReferenceSystem( GEOSRID ) );
-      Q_NOWARN_DEPRECATED_POP
+      QgsCoordinateTransform ct( destCrs, QgsCoordinateReferenceSystem( GEOSRID ), project );
       try
       {
         geo = ct.transform( point );
diff --git a/src/core/qgscoordinateutils.h b/src/core/qgscoordinateutils.h
@@ -26,6 +26,7 @@
 
 class QgsPointXY;
 class QgsCoordinateReferenceSystem;
+class QgsProject;
 
 //not stable api - I plan on reworking this when QgsCoordinateFormatter lands in 2.16
 ///@cond NOT_STABLE_API
@@ -53,7 +54,12 @@ class CORE_EXPORT QgsCoordinateUtils
      */
     static int calculateCoordinatePrecision( double mapUnitsPerPixel, const QgsCoordinateReferenceSystem &mapCrs );
 
-    static QString formatCoordinateForProject( const QgsPointXY &point, const QgsCoordinateReferenceSystem &destCrs, int precision );
+    /**
+     * Formats a \a point coordinate for use with the specified \a project, respecting the project's
+     * coordinate display settings.
+     * \since QGIS 3.2
+     */
+    static QString formatCoordinateForProject( QgsProject *project, const QgsPointXY &point, const QgsCoordinateReferenceSystem &destCrs, int precision );
 
 };
 
diff --git a/src/gui/qgsmaptoolidentify.cpp b/src/gui/qgsmaptoolidentify.cpp
@@ -325,7 +325,7 @@ void QgsMapToolIdentify::closestVertexAttributes( const QgsAbstractGeometry &geo
 
 QString QgsMapToolIdentify::formatCoordinate( const QgsPointXY &canvasPoint ) const
 {
-  return QgsCoordinateUtils::formatCoordinateForProject( canvasPoint, mCanvas->mapSettings().destinationCrs(),
+  return QgsCoordinateUtils::formatCoordinateForProject( QgsProject::instance(), canvasPoint, mCanvas->mapSettings().destinationCrs(),
          mCoordinatePrecision );
 }
 

Original file line number	Diff line number	Diff line change
`@@ -226,7 +226,7 @@ void QgsStatusBarCoordinatesWidget::showMouseCoordinates( const QgsPointXY &p )`
`226`	`226`	`return;`
`227`	`227`	`}`
`228`	`228`
`229`		`- mLineEdit->setText( QgsCoordinateUtils::formatCoordinateForProject( p, mMapCanvas->mapSettings().destinationCrs(),`
	`229`	`+ mLineEdit->setText( QgsCoordinateUtils::formatCoordinateForProject( QgsProject::instance(), p, mMapCanvas->mapSettings().destinationCrs(),`
`230`	`230`	`mMousePrecisionDecimalPlaces ) );`
`231`	`231`
`232`	`232`	`ensureCoordinatesVisible();`
Original file line number	Diff line number	Diff line change
`@@ -62,9 +62,12 @@ int QgsCoordinateUtils::calculateCoordinatePrecision( double mapUnitsPerPixel, c`
`62`	`62`	`return dp;`
`63`	`63`	`}`
`64`	`64`
`65`		`-QString QgsCoordinateUtils::formatCoordinateForProject( const QgsPointXY &point, const QgsCoordinateReferenceSystem &destCrs, int precision )`
	`65`	`+QString QgsCoordinateUtils::formatCoordinateForProject( QgsProject *project, const QgsPointXY &point, const QgsCoordinateReferenceSystem &destCrs, int precision )`
`66`	`66`	`{`
`67`		`- QString format = QgsProject::instance()->readEntry( QStringLiteral( "PositionPrecision" ), QStringLiteral( "/DegreeFormat" ), QStringLiteral( "MU" ) );`
	`67`	`+ if ( !project )`
	`68`	`+ return QString();`
	`69`	`+`
	`70`	`+ QString format = project->readEntry( QStringLiteral( "PositionPrecision" ), QStringLiteral( "/DegreeFormat" ), QStringLiteral( "MU" ) );`
`68`	`71`
`69`	`72`	`QgsPointXY geo = point;`
`70`	`73`	`if ( format == QLatin1String( "DM" ) \|\| format == QLatin1String( "DMS" ) \|\| format == QLatin1String( "D" ) )`
`@@ -73,9 +76,7 @@ QString QgsCoordinateUtils::formatCoordinateForProject( const QgsPointXY &point,`
`73`	`76`	`if ( destCrs.isValid() && !destCrs.isGeographic() )`
`74`	`77`	`{`
`75`	`78`	`// need to transform to geographic coordinates`
`76`		`- Q_NOWARN_DEPRECATED_PUSH`
`77`		`- QgsCoordinateTransform ct( destCrs, QgsCoordinateReferenceSystem( GEOSRID ) );`
`78`		`- Q_NOWARN_DEPRECATED_POP`
	`79`	`+ QgsCoordinateTransform ct( destCrs, QgsCoordinateReferenceSystem( GEOSRID ), project );`
`79`	`80`	`try`
`80`	`81`	`{`
`81`	`82`	`geo = ct.transform( point );`
Original file line number	Diff line number	Diff line change
`@@ -325,7 +325,7 @@ void QgsMapToolIdentify::closestVertexAttributes( const QgsAbstractGeometry &geo`
`325`	`325`
`326`	`326`	`QString QgsMapToolIdentify::formatCoordinate( const QgsPointXY &canvasPoint ) const`
`327`	`327`	`{`
`328`		`- return QgsCoordinateUtils::formatCoordinateForProject( canvasPoint, mCanvas->mapSettings().destinationCrs(),`
	`328`	`+ return QgsCoordinateUtils::formatCoordinateForProject( QgsProject::instance(), canvasPoint, mCanvas->mapSettings().destinationCrs(),`
`329`	`329`	`mCoordinatePrecision );`
`330`	`330`	`}`
`331`	`331`