Merge pull request #219 from homann/measure_cleanup

Measure cleanup and fix #5156

Author: homann

src/app/qgsdecorationscalebar.cpp

@@ -23,6 +23,7 @@ email                : sbr00pwb@users.sourceforge.net
 
 #include "qgsdecorationscalebardialog.h"
 
+#include "qgis.h"
 #include "qgisapp.h"
 #include "qgslogger.h"
 #include "qgsmapcanvas.h"
@@ -119,6 +120,7 @@ void QgsDecorationScaleBar::render( QPainter * theQPainter )
   //projections) and that just confuses the rest of the code in this
   //function, so force to a positive number.
   double myMapUnitsPerPixelDouble = qAbs( canvas->mapUnitsPerPixel() );
+  double myActualSize = mPreferredSize;
 
   // Exit if the canvas width is 0 or layercount is 0 or QGIS will freeze
   int myLayerCount = canvas->layerCount();
@@ -131,9 +133,25 @@ void QgsDecorationScaleBar::render( QPainter * theQPainter )
     // Hard coded sizes
     int myMajorTickSize = 8;
     int myTextOffsetX = 3;
-    double myActualSize = mPreferredSize;
     int myMargin = 20;
 
+    QSettings settings;
+    QGis::UnitType myPreferredUnits = QGis::fromLiteral( settings.value( "/qgis/measure/displayunits", QGis::toLiteral( QGis::Meters ) ).toString() );
+    QGis::UnitType myMapUnits = canvas->mapUnits();
+
+    // Adjust units meter/feet or vice versa
+    if ( myMapUnits == QGis::Meters && myPreferredUnits == QGis::Feet )
+    {
+      // From meter to feet
+      myMapUnits = QGis::Feet;
+      myMapUnitsPerPixelDouble /= 0.3084;
+    }
+    else if ( myMapUnits == QGis::Feet && myPreferredUnits == QGis::Meters )
+    {
+      // From feet to meter
+      myMapUnits = QGis::Meters;
+      myMapUnitsPerPixelDouble *= 0.3084;
+    }
     //Calculate size of scale bar for preferred number of map units
     double myScaleBarWidth = mPreferredSize / myMapUnitsPerPixelDouble;
 
@@ -164,7 +182,6 @@ void QgsDecorationScaleBar::render( QPainter * theQPainter )
     }
 
     //Get type of map units and set scale bar unit label text
-    QGis::UnitType myMapUnits = canvas->mapUnits();
     QString myScaleBarUnitLabel;
     switch ( myMapUnits )
     {

src/app/qgsdecorationscalebar.h

@@ -21,6 +21,7 @@ email                : sbr00pwb@users.sourceforge.net
 #ifndef QGSCALEBARPLUGIN
 #define QGSCALEBARPLUGIN
 
+#include "qgis.h"
 #include "qgsdecorationitem.h"
 
 class QPainter;

src/app/qgsdisplayangle.cpp

@@ -14,58 +14,64 @@
  ***************************************************************************/
 
 #include "qgsdisplayangle.h"
+#include "qgsmapcanvas.h"
+#include "qgslogger.h"
+
 #include <QSettings>
 #include <cmath>
 
-QgsDisplayAngle::QgsDisplayAngle( QWidget * parent, Qt::WindowFlags f ): QDialog( parent, f )
+QgsDisplayAngle::QgsDisplayAngle( QgsMapToolMeasureAngle * tool, Qt::WFlags f )
+    : QDialog( tool->canvas()->topLevelWidget(), f ), mTool( tool )
 {
   setupUi( this );
   QSettings settings;
-  int s = settings.value( "/qgis/measure/projectionEnabled", "2" ).toInt();
-  if ( s == 2 )
-    mcbProjectionEnabled->setCheckState( Qt::Checked );
-  else
-    mcbProjectionEnabled->setCheckState( Qt::Unchecked );
 
-  connect( mcbProjectionEnabled, SIGNAL( stateChanged( int ) ),
-           this, SLOT( changeState() ) );
-  connect( mcbProjectionEnabled, SIGNAL( stateChanged( int ) ),
-           this, SIGNAL( changeProjectionEnabledState() ) );
+  // Update whenever the canvas has refreshed. Maybe more often than needed,
+  // but at least every time any canvas related settings changes
+  connect( mTool->canvas(), SIGNAL( mapCanvasRefreshed() ),
+           this, SLOT( updateSettings() ) );
+
+  updateSettings();
 }
 
 QgsDisplayAngle::~QgsDisplayAngle()
 {
 
 }
 
-bool QgsDisplayAngle::projectionEnabled()
+
+void QgsDisplayAngle::setValueInRadians( double value )
+{
+  mValue = value;
+  updateUi();
+}
+
+void QgsDisplayAngle::updateSettings()
 {
-  return mcbProjectionEnabled->isChecked();
+  emit changeProjectionEnabledState();
 }
 
-void QgsDisplayAngle::setValueInRadians( double value )
+void QgsDisplayAngle::updateUi()
 {
+
   QSettings settings;
   QString unitString = settings.value( "/qgis/measure/angleunits", "degrees" ).toString();
+  int decimals = settings.value( "/qgis/measure/decimalplaces", "3" ).toInt();
+
   if ( unitString == "degrees" )
   {
-    mAngleLineEdit->setText( tr( "%1 degrees" ).arg( value * 180 / M_PI ) );
+    mAngleLineEdit->setText( tr( "%1 degrees" ).arg( QLocale::system().toString( mValue * 180 / M_PI ),
+                             'f', decimals ) );
   }
   else if ( unitString == "radians" )
   {
-    mAngleLineEdit->setText( tr( "%1 radians" ).arg( value ) );
+    mAngleLineEdit->setText( tr( "%1 radians" ).arg( QLocale::system().toString( mValue ),
+                             'f', decimals ) );
+
   }
   else if ( unitString == "gon" )
   {
-    mAngleLineEdit->setText( tr( "%1 gon" ).arg( value / M_PI * 200 ) );
+    mAngleLineEdit->setText( tr( "%1 gon" ).arg( QLocale::system().toString( mValue / M_PI * 200 ),
+                             'f', decimals ) );
   }
 }
-
-void QgsDisplayAngle::changeState()
-{
-  QSettings settings;
-  if ( mcbProjectionEnabled->isChecked() )
-    settings.setValue( "/qgis/measure/projectionEnabled", 2 );
-  else
-    settings.setValue( "/qgis/measure/projectionEnabled", 0 );
-}

src/app/qgsdisplayangle.h

@@ -16,6 +16,7 @@
 #ifndef QGSDISPLAYANGLE_H
 #define QGSDISPLAYANGLE_H
 
+#include "qgsmaptoolmeasureangle.h"
 #include "ui_qgsdisplayanglebase.h"
 
 /**A class that displays results of angle measurements with the proper unit*/
@@ -24,20 +25,29 @@ class QgsDisplayAngle: public QDialog, private Ui::QgsDisplayAngleBase
     Q_OBJECT
 
   public:
-    QgsDisplayAngle( QWidget * parent = 0, Qt::WindowFlags f = 0 );
+    QgsDisplayAngle( QgsMapToolMeasureAngle * tool = 0, Qt::WindowFlags f = 0 );
     ~QgsDisplayAngle();
     /**Sets the measured angle value (in radians). The value is going to
       be converted to degrees / gon automatically if necessary*/
     void setValueInRadians( double value );
 
-    bool projectionEnabled();
-
   signals:
     void changeProjectionEnabledState();
 
   private slots:
-    void changeState();
 
+    //! When any external settings change
+    void updateSettings();
+
+  private:
+    //! pointer to tool which owns this dialog
+    QgsMapToolMeasureAngle * mTool;
+
+    //! The value we're showing
+    double mValue;
+
+    //! Updates UI according to user settings.
+    void updateUi();
 };
 
 #endif // QGSDISPLAYANGLE_H

src/app/qgsmaptoolfeatureaction.cpp

@@ -15,7 +15,6 @@
 
 #include "qgsmaptoolfeatureaction.h"
 
-#include "qgsdistancearea.h"
 #include "qgsfeature.h"
 #include "qgsfield.h"
 #include "qgsgeometry.h"
@@ -111,7 +110,6 @@ bool QgsMapToolFeatureAction::doAction( QgsVectorLayer *layer, int x, int y )
   // load identify radius from settings
   QSettings settings;
   double identifyValue = settings.value( "/Map/identifyRadius", QGis::DEFAULT_IDENTIFY_RADIUS ).toDouble();
-  QString ellipsoid = settings.value( "/qgis/measure/ellipsoid", "WGS84" ).toString();
 
   if ( identifyValue <= 0.0 )
     identifyValue = QGis::DEFAULT_IDENTIFY_RADIUS;

src/app/qgsmaptoolidentify.cpp

@@ -204,7 +204,7 @@ bool QgsMapToolIdentify::identifyVectorLayer( QgsVectorLayer *layer, int x, int
   // load identify radius from settings
   QSettings settings;
   double identifyValue = settings.value( "/Map/identifyRadius", QGis::DEFAULT_IDENTIFY_RADIUS ).toDouble();
-  QString ellipsoid = settings.value( "/qgis/measure/ellipsoid", "WGS84" ).toString();
+  QString ellipsoid = settings.value( "/qgis/measure/ellipsoid", GEO_NONE ).toString();
 
   if ( identifyValue <= 0.0 )
     identifyValue = QGis::DEFAULT_IDENTIFY_RADIUS;
@@ -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;

src/app/qgsmaptoolmeasureangle.cpp

@@ -85,7 +85,7 @@ void QgsMapToolMeasureAngle::canvasReleaseEvent( QMouseEvent * e )
   {
     if ( mResultDisplay == NULL )
     {
-      mResultDisplay = new QgsDisplayAngle( mCanvas->topLevelWidget() );
+      mResultDisplay = new QgsDisplayAngle( this );
       QObject::connect( mResultDisplay, SIGNAL( rejected() ), this, SLOT( stopMeasuring() ) );
       QObject::connect( mResultDisplay, SIGNAL( changeProjectionEnabledState() ),
                         this, SLOT( changeProjectionEnabledState() ) );
@@ -180,10 +180,18 @@ void QgsMapToolMeasureAngle::changeProjectionEnabledState()
 void QgsMapToolMeasureAngle::configureDistanceArea()
 {
   QSettings settings;
-  QString ellipsoidId = settings.value( "/qgis/measure/ellipsoid", "WGS84" ).toString();
+  QString ellipsoidId = settings.value( "/qgis/measure/ellipsoid", GEO_NONE ).toString();
   mDa.setSourceCrs( mCanvas->mapRenderer()->destinationCrs().srsid() );
   mDa.setEllipsoid( ellipsoidId );
-  mDa.setEllipsoidalMode( mResultDisplay->projectionEnabled() ); // FIXME (not when proj is turned off)
+  // Only use ellipsoidal calculation when project wide transformation is enabled.
+  if ( mCanvas->mapRenderer()->hasCrsTransformEnabled() )
+  {
+    mDa.setEllipsoidalMode( true );
+  }
+  else
+  {
+    mDa.setEllipsoidalMode( false );
+  }
 }
 
 

src/app/qgsmaptoolmeasureangle.h

@@ -32,7 +32,7 @@ class QgsMapToolMeasureAngle: public QgsMapTool
     QgsMapToolMeasureAngle( QgsMapCanvas* canvas );
     ~QgsMapToolMeasureAngle();
 
-    //! Mouse move event for overriding
+    //! Mouse move event for overridingqgs
     void canvasMoveEvent( QMouseEvent * e );
 
     //! Mouse release event for overriding