Fix some use of direct project key read when getter should be used

This commit is contained in:
Nyall Dawson 2017-03-14 19:14:56 +10:00
parent 0ecba446c5
commit 1e5f64919d
3 changed files with 3 additions and 6 deletions

View File

@ -112,8 +112,7 @@ class ExportGeometryInfo(GeoAlgorithm):
# 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()

View File

@ -100,8 +100,7 @@ class FieldsCalculator(GeoAlgorithm):
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())

View File

@ -104,8 +104,7 @@ class FieldsMapper(GeoAlgorithm):
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()