From 1e5f64919d490a0407d81a50fdac2f3d4aa2e90d Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Tue, 14 Mar 2017 19:14:56 +1000 Subject: [PATCH] Fix some use of direct project key read when getter should be used --- python/plugins/processing/algs/qgis/ExportGeometryInfo.py | 3 +-- python/plugins/processing/algs/qgis/FieldsCalculator.py | 3 +-- python/plugins/processing/algs/qgis/FieldsMapper.py | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/python/plugins/processing/algs/qgis/ExportGeometryInfo.py b/python/plugins/processing/algs/qgis/ExportGeometryInfo.py index 0c61d742a08..d8a96afb668 100644 --- a/python/plugins/processing/algs/qgis/ExportGeometryInfo.py +++ b/python/plugins/processing/algs/qgis/ExportGeometryInfo.py @@ -112,8 +112,7 @@ class ExportGeometryInfo(GeoAlgorithm): # 2 - ellipsoidal if method == 2: - ellips = QgsProject.instance().readEntry('Measure', '/Ellipsoid', - 'NONE')[0] + ellips = QgsProject.instance().ellipsoid() crs = layer.crs().srsid() elif method == 1: mapCRS = iface.mapCanvas().mapSettings().destinationCrs() diff --git a/python/plugins/processing/algs/qgis/FieldsCalculator.py b/python/plugins/processing/algs/qgis/FieldsCalculator.py index d8b4bb5bceb..729c39e2f9f 100644 --- a/python/plugins/processing/algs/qgis/FieldsCalculator.py +++ b/python/plugins/processing/algs/qgis/FieldsCalculator.py @@ -100,8 +100,7 @@ class FieldsCalculator(GeoAlgorithm): da = QgsDistanceArea() da.setSourceCrs(layer.crs()) da.setEllipsoidalMode(True) - da.setEllipsoid(QgsProject.instance().readEntry( - 'Measure', '/Ellipsoid', GEO_NONE)[0]) + da.setEllipsoid(QgsProject.instance().ellipsoid()) exp.setGeomCalculator(da) exp.setDistanceUnits(QgsProject.instance().distanceUnits()) exp.setAreaUnits(QgsProject.instance().areaUnits()) diff --git a/python/plugins/processing/algs/qgis/FieldsMapper.py b/python/plugins/processing/algs/qgis/FieldsMapper.py index a3b83980e3e..b995bf1cc70 100644 --- a/python/plugins/processing/algs/qgis/FieldsMapper.py +++ b/python/plugins/processing/algs/qgis/FieldsMapper.py @@ -104,8 +104,7 @@ class FieldsMapper(GeoAlgorithm): da = QgsDistanceArea() da.setSourceCrs(layer.crs()) da.setEllipsoidalMode(True) - da.setEllipsoid(QgsProject.instance().readEntry( - 'Measure', '/Ellipsoid', GEO_NONE)[0]) + da.setEllipsoid(QgsProject.instance().ellipsoid()) exp_context = layer.createExpressionContext()