sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-01 00:46:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Change to using UnitTypes, part deux

Browse Source
This commit is contained in:
Magnus Homann 2012-08-30 08:54:20 +02:00
parent 9ac57906f3
commit e78dc23a5a
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/app/qgsmaptoolidentify.cpp
View File

@ -392,17 +392,7 @@ void QgsMapToolIdentify::convertMeasurement( QgsDistanceArea &calc, double &meas
// Get the units for display
QSettings settings;
QString myDisplayUnitsTxt = settings.value( "/qgis/measure/displayunits", "meters" ).toString();
QGis::UnitType displayUnits;
if ( myDisplayUnitsTxt == "feet" )
{
displayUnits = QGis::Feet;
}
else
{
displayUnits = QGis::Meters;
}
QGis::UnitType displayUnits = QGis::fromLiteral( settings.value( "/qgis/measure/displayunits", QGis::toLiteral( QGis::Meters ) ).toString() );
calc.convertMeasurement( measure, myUnits, displayUnits, isArea );
u = myUnits;

6
src/app/qgsoptions.cpp
View File

@ -298,8 +298,8 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WFlags fl ) :
}
// Set the units for measuring
QString myUnitsTxt = QGis::fromLiteral( settings.value( "/qgis/measure/displayunits", QGis::toLiteral( QGis::Meters ) ).toString() );
if ( myUnitsTxt == QGis::Feet )
QGis::UnitType myDisplayUnits = QGis::fromLiteral( settings.value( "/qgis/measure/displayunits", QGis::toLiteral( QGis::Meters ) ).toString() );
if ( myDisplayUnits == QGis::Feet )
{
radFeet->setChecked( true );
}
@ -948,7 +948,7 @@ void QgsOptions::saveOptions()
}
else
{
settings.setValue( "/qgis/measure/displayunits", QGis::toLiteral( QGis::Feet ) );
settings.setValue( "/qgis/measure/displayunits", QGis::toLiteral( QGis::Meters ) );
}
QString angleUnitString = "degrees";