Merge pull request #3404 from DelazJ/patch-13

Keep base units as default behavior (fix #15434)
qgis · Aug 23, 2016 · dfff9dd · dfff9dd
2 parents 6475fd2 + 2040cdf
commit dfff9dd
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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
@@ -673,15 +673,15 @@ 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 );
 }
 
 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 );
 }