Skip to content

Commit

Permalink
Fix some use of direct project key read when getter should be used
Browse files Browse the repository at this point in the history
  • Loading branch information
nyalldawson committed Mar 14, 2017
1 parent 0ecba44 commit 1e5f649
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 6 deletions.
3 changes: 1 addition & 2 deletions python/plugins/processing/algs/qgis/ExportGeometryInfo.py
Expand Up @@ -112,8 +112,7 @@ def processAlgorithm(self, feedback):
# 2 - ellipsoidal # 2 - ellipsoidal


if method == 2: if method == 2:
ellips = QgsProject.instance().readEntry('Measure', '/Ellipsoid', ellips = QgsProject.instance().ellipsoid()
'NONE')[0]
crs = layer.crs().srsid() crs = layer.crs().srsid()
elif method == 1: elif method == 1:
mapCRS = iface.mapCanvas().mapSettings().destinationCrs() mapCRS = iface.mapCanvas().mapSettings().destinationCrs()
Expand Down
3 changes: 1 addition & 2 deletions python/plugins/processing/algs/qgis/FieldsCalculator.py
Expand Up @@ -100,8 +100,7 @@ def processAlgorithm(self, feedback):
da = QgsDistanceArea() da = QgsDistanceArea()
da.setSourceCrs(layer.crs()) da.setSourceCrs(layer.crs())
da.setEllipsoidalMode(True) da.setEllipsoidalMode(True)
da.setEllipsoid(QgsProject.instance().readEntry( da.setEllipsoid(QgsProject.instance().ellipsoid())
'Measure', '/Ellipsoid', GEO_NONE)[0])
exp.setGeomCalculator(da) exp.setGeomCalculator(da)
exp.setDistanceUnits(QgsProject.instance().distanceUnits()) exp.setDistanceUnits(QgsProject.instance().distanceUnits())
exp.setAreaUnits(QgsProject.instance().areaUnits()) exp.setAreaUnits(QgsProject.instance().areaUnits())
Expand Down
3 changes: 1 addition & 2 deletions python/plugins/processing/algs/qgis/FieldsMapper.py
Expand Up @@ -104,8 +104,7 @@ def processAlgorithm(self, feedback):
da = QgsDistanceArea() da = QgsDistanceArea()
da.setSourceCrs(layer.crs()) da.setSourceCrs(layer.crs())
da.setEllipsoidalMode(True) da.setEllipsoidalMode(True)
da.setEllipsoid(QgsProject.instance().readEntry( da.setEllipsoid(QgsProject.instance().ellipsoid())
'Measure', '/Ellipsoid', GEO_NONE)[0])


exp_context = layer.createExpressionContext() exp_context = layer.createExpressionContext()


Expand Down

0 comments on commit 1e5f649

Please sign in to comment.