sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-14 00:07:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Less usage of QgsProject::instance

Browse Source
This commit is contained in:
Matthias Kuhn 2018-11-16 12:41:44 +01:00
parent 98781da6b0
commit 06b5d7b318
No known key found for this signature in database
GPG Key ID: 7A7F1A1C90C3E6A7
2 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/core/qgscoordinateutils.cpp
View File

@ -24,15 +24,17 @@
#include "qgscoordinateformatter.h" #include "qgscoordinateformatter.h"
///@cond NOT_STABLE_API ///@cond NOT_STABLE_API
int QgsCoordinateUtils::calculateCoordinatePrecision( double mapUnitsPerPixel, const QgsCoordinateReferenceSystem &mapCrs ) int QgsCoordinateUtils::calculateCoordinatePrecision( double mapUnitsPerPixel, const QgsCoordinateReferenceSystem &mapCrs, QgsProject *project )
{ {
if ( !project )
project = QgsProject::instance();
// Get the display precision from the project settings // Get the display precision from the project settings
bool automatic = QgsProject::instance()->readBoolEntry( QStringLiteral( "PositionPrecision" ), QStringLiteral( "/Automatic" ) ); bool automatic = project->readBoolEntry( QStringLiteral( "PositionPrecision" ), QStringLiteral( "/Automatic" ) );
int dp = 0; int dp = 0;
if ( automatic ) if ( automatic )
{ {
QString format = QgsProject::instance()->readEntry( QStringLiteral( "PositionPrecision" ), QStringLiteral( "/DegreeFormat" ), QStringLiteral( "MU" ) ); QString format = project->readEntry( QStringLiteral( "PositionPrecision" ), QStringLiteral( "/DegreeFormat" ), QStringLiteral( "MU" ) );
bool formatGeographic = ( format == QLatin1String( "DM" ) || format == QLatin1String( "DMS" ) || format == QLatin1String( "D" ) ); bool formatGeographic = ( format == QLatin1String( "DM" ) || format == QLatin1String( "DMS" ) || format == QLatin1String( "D" ) );
// we can only calculate an automatic precision if one of these is true: // we can only calculate an automatic precision if one of these is true:
@ -49,11 +51,14 @@ int QgsCoordinateUtils::calculateCoordinatePrecision( double mapUnitsPerPixel, c
} }
else else
{ {
dp = format == QLatin1String( "D" ) ? 4 : 2; //guess sensible fallback if ( format == QLatin1String( "D" ) )
dp = 4;
else
dp = 2;
} }
} }
else else
dp = QgsProject::instance()->readNumEntry( QStringLiteral( "PositionPrecision" ), QStringLiteral( "/DecimalPlaces" ) ); dp = project->readNumEntry( QStringLiteral( "PositionPrecision" ), QStringLiteral( "/DecimalPlaces" ) );
// Keep dp sensible // Keep dp sensible
if ( dp < 0 ) if ( dp < 0 )

23
src/core/qgscoordinateutils.h
View File

@ -45,17 +45,20 @@ class CORE_EXPORT QgsCoordinateUtils
public: public:
/** /**
* Returns the precision to use for displaying coordinates to the user, respecting * Returns the precision to use for displaying coordinates in \a mapCrs to the user.
* the user's project settings. If the user has set the project to use "automatic" * It respects the user's \a project settings.
* precision, this function tries to calculate an optimal coordinate precision for a given * If the user has set the project to use "automatic" precision, this function tries
* map units per pixel by calculating the number of decimal places for the coordinates * to calculate an optimal coordinate precision for a given \a mapUnitsPerPixel by
* with the aim of always having enough decimal places to show the difference in position * calculating the number of decimal places for the coordinates with the aim of always
* between adjacent pixels. * having enough decimal places to show the difference in position between adjacent
* \param mapUnitsPerPixel number of map units per pixel * pixels.
* \param mapCrs CRS of map *
* \returns optimal number of decimal places for coordinates * \since QGIS 3.6 a new \a project parameter is available. Using the method without this
* a \a project paramter is deprecated and will be removed with QGIS 4.
* For backward compatibility, QgsProject.instance() will be used if the \a project
* parameter is not specified.
*/ */
Q_INVOKABLE static int calculateCoordinatePrecision( double mapUnitsPerPixel, const QgsCoordinateReferenceSystem &mapCrs ); Q_INVOKABLE static int calculateCoordinatePrecision( double mapUnitsPerPixel, const QgsCoordinateReferenceSystem &mapCrs, QgsProject *project = nullptr );
/** /**
* Formats a \a point coordinate for use with the specified \a project, respecting the project's * Formats a \a point coordinate for use with the specified \a project, respecting the project's