From 2040cdf29f2758a759672eded8b680e47d2c1841 Mon Sep 17 00:00:00 2001 From: Harrissou Sant-anna Date: Wed, 17 Aug 2016 17:05:59 +0200 Subject: [PATCH] Keep base units as default behavior (fix #15434) --- src/app/qgsmeasuredialog.cpp | 2 +- src/app/qgsoptions.cpp | 2 +- src/gui/qgsmaptoolidentify.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/qgsmeasuredialog.cpp b/src/app/qgsmeasuredialog.cpp index 0d4ce20266ba..fa0144e5c1fa 100644 --- a/src/app/qgsmeasuredialog.cpp +++ b/src/app/qgsmeasuredialog.cpp @@ -249,7 +249,7 @@ void QgsMeasureDialog::saveWindowLocation() QString QgsMeasureDialog::formatDistance( double distance, bool convertUnits ) const { QSettings settings; - bool baseUnit = settings.value( "/qgis/measure/keepbaseunit", false ).toBool(); + bool baseUnit = settings.value( "/qgis/measure/keepbaseunit", true ).toBool(); if ( convertUnits ) distance = convertLength( distance, mDistanceUnits ); diff --git a/src/app/qgsoptions.cpp b/src/app/qgsoptions.cpp index 524196843d4f..8d42f5e0a4f3 100644 --- a/src/app/qgsoptions.cpp +++ b/src/app/qgsoptions.cpp @@ -507,7 +507,7 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WindowFlags fl ) mDecimalPlacesSpinBox->setValue( decimalPlaces ); // set if base unit of measure tool should be changed - bool baseUnit = mSettings->value( "qgis/measure/keepbaseunit", false ).toBool(); + bool baseUnit = mSettings->value( "qgis/measure/keepbaseunit", true ).toBool(); if ( baseUnit ) { mKeepBaseUnitCheckBox->setChecked( true ); diff --git a/src/gui/qgsmaptoolidentify.cpp b/src/gui/qgsmaptoolidentify.cpp index 1fc686489300..72dfb245bf02 100644 --- a/src/gui/qgsmaptoolidentify.cpp +++ b/src/gui/qgsmaptoolidentify.cpp @@ -673,7 +673,7 @@ QgsUnitTypes::AreaUnit QgsMapToolIdentify::displayAreaUnits() const QString QgsMapToolIdentify::formatDistance( double distance ) const { QSettings settings; - bool baseUnit = settings.value( "/qgis/measure/keepbaseunit", false ).toBool(); + bool baseUnit = settings.value( "/qgis/measure/keepbaseunit", true ).toBool(); return QgsDistanceArea::formatDistance( distance, 3, displayDistanceUnits(), baseUnit ); } @@ -681,7 +681,7 @@ QString QgsMapToolIdentify::formatDistance( double distance ) const QString QgsMapToolIdentify::formatArea( double area ) const { QSettings settings; - bool baseUnit = settings.value( "/qgis/measure/keepbaseunit", false ).toBool(); + bool baseUnit = settings.value( "/qgis/measure/keepbaseunit", true ).toBool(); return QgsDistanceArea::formatArea( area, 3, displayAreaUnits(), baseUnit ); }