measure_ellipsoid.diff

         //! Show the help for the dialog
         void on_buttonBox_helpRequested() { QgsContextHelp::run( metaObject()->className() ); }
       private slots:
         //! on change state projection enable
         void changeStateProjectionEnable();
       private:

         /**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 changeStateProjectionEnable();
       private slots:
         void changeState();
     };
     #endif // QGSDISPLAYANGLE_H

     QgsDisplayAngle::QgsDisplayAngle( QWidget * parent, Qt::WindowFlags f ): QDialog( parent, f )
+    {
       setupUi( this );
       QSettings settings;
       int s = settings.value( "/qgis/measure/projection_enable", "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( changeStateProjectionEnable() ) );
+    }
     QgsDisplayAngle::~QgsDisplayAngle()
-...
+    }
     bool QgsDisplayAngle::projectionEnabled()
+    {
       return mcbProjectionEnabled->isChecked();
+    }
     void QgsDisplayAngle::setValueInRadians( double value )
+    {
       QSettings settings;
-...
+      }
+    }
     void QgsDisplayAngle::changeState()
+    {
       QSettings settings;
       if ( mcbProjectionEnabled->isChecked() )
         settings.setValue( "/qgis/measure/projection_enable", 2);
       else
         settings.setValue( "/qgis/measure/projection_enable", 0);
+    }

       //mTable->setHeaderLabels(QStringList() << tr("Segments (in meters)") << tr("Total") << tr("Azimuth") );
       QSettings settings;
       int s = settings.value( "/qgis/measure/projection_enable", "2" ).toInt();
       if ( s == 2 )
         mcbProjectionEnabled->setCheckState( Qt::Checked );
       else
         mcbProjectionEnabled->setCheckState( Qt::Unchecked );
       connect( mcbProjectionEnabled, SIGNAL( stateChanged(int) ),
           this, SLOT( changeStateProjectionEnable() ));
       updateUi();
+    }
-...
       QSettings settings;
       int decimalPlaces = settings.value( "/qgis/measure/decimalplaces", "3" ).toInt();
       // Create QgsDistance Area for customization ProjectionEnabled setting
       QgsDistanceArea myDa;
       myDa.setSourceCrs( mTool->canvas()->mapRenderer()->destinationSrs().srsid() );
       myDa.setEllipsoid( mTool->canvas()->mapRenderer()->distanceArea()->ellipsoid() );
       myDa.setProjectionsEnabled( mcbProjectionEnabled->isChecked() );
       // show current distance/area while moving the point
       // by creating a temporary copy of point array
       // and adding moving point at the end
       // and adding moving point at the end
       if ( mMeasureArea && mTool->points().size() > 1 )
+      {
         QList<QgsPoint> tmpPoints = mTool->points();
         tmpPoints.append( point );
         double area = mTool->canvas()->mapRenderer()->distanceArea()->measurePolygon( tmpPoints );
         double area = myDa.measurePolygon( tmpPoints );
         editTotal->setText( formatArea( area, decimalPlaces ) );
+      }
       else if ( !mMeasureArea && mTool->points().size() > 0 )
+      {
         QgsPoint p1( mTool->points().last() ), p2( point );
         double d = mTool->canvas()->mapRenderer()->distanceArea()->measureLine( p1, p2 );
         double d = myDa.measureLine( p1, p2 );
         editTotal->setText( formatDistance( mTotal + d, decimalPlaces ) );
         QGis::UnitType myDisplayUnits;
         // Ignore units
-...
       QSettings settings;
       int decimalPlaces = settings.value( "/qgis/measure/decimalplaces", "3" ).toInt();
       // Create QgsDistance Area for customization ProjectionEnabled setting
       QgsDistanceArea myDa;
       myDa.setSourceCrs( mTool->canvas()->mapRenderer()->destinationSrs().srsid() );
       myDa.setEllipsoid( mTool->canvas()->mapRenderer()->distanceArea()->ellipsoid() );
       myDa.setProjectionsEnabled( mcbProjectionEnabled->isChecked() );
       int numPoints = mTool->points().size();
       if ( mMeasureArea && numPoints > 2 )
+      {
         double area = mTool->canvas()->mapRenderer()->distanceArea()->measurePolygon( mTool->points() );
         double area = myDa.measurePolygon( mTool->points() );
         editTotal->setText( formatArea( area, decimalPlaces ) );
+      }
       else if ( !mMeasureArea && numPoints > 1 )
-...
         QgsPoint p1 = mTool->points()[last], p2 = mTool->points()[last+1];
         double d = mTool->canvas()->mapRenderer()->distanceArea()->measureLine( p1, p2 );
         double d = myDa.measureLine( p1, p2 );
         mTotal += d;
         editTotal->setText( formatDistance( mTotal, decimalPlaces ) );
-...
       QGis::UnitType myUnits = mTool->canvas()->mapUnits();
       if (( myUnits == QGis::Degrees || myUnits == QGis::Feet ) &&
           mTool->canvas()->mapRenderer()->distanceArea()->ellipsoid() != "NONE" &&
           mTool->canvas()->mapRenderer()->distanceArea()->hasCrsTransformEnabled() )
           mcbProjectionEnabled->isChecked() )
+      {
         // Measuring on an ellipsoid returns meters, and so does using projections???
         myUnits = QGis::Meters;
         QgsDebugMsg( "We're measuring on an ellipsoid or using projections, the system is returning meters" );
+      }
       // Get the units for display
       QSettings settings;
       QString myDisplayUnitsTxt = settings.value( "/qgis/measure/displayunits", "meters" ).toString();
       // Only convert between meters and feet
       if ( myUnits == QGis::Meters && myDisplayUnitsTxt == "feet" )
+      {
-...
       u = myUnits;
+    }
     void QgsMeasureDialog::changeStateProjectionEnable()
+    {
       // store value
       QSettings settings;
       if ( mcbProjectionEnabled->isChecked() )
         settings.setValue( "/qgis/measure/projection_enable", 2);
       else
         settings.setValue( "/qgis/measure/projection_enable", 0);
       // clear interface
       mTable->clear();
       QTreeWidgetItem* item = new QTreeWidgetItem( QStringList( QString::number( 0, 'f', 1 ) ) );
       item->setTextAlignment( 0, Qt::AlignRight );
       mTable->addTopLevelItem( item );
       mTotal = 0;
       updateUi();
       int decimalPlaces = settings.value( "/qgis/measure/decimalplaces", "3" ).toInt();
       // create DistanceArea
       QgsDistanceArea myDa;
       myDa.setSourceCrs( mTool->canvas()->mapRenderer()->destinationSrs().srsid() );
       myDa.setEllipsoid( mTool->canvas()->mapRenderer()->distanceArea()->ellipsoid() );
       myDa.setProjectionsEnabled( mcbProjectionEnabled->isChecked() );
       if ( mMeasureArea )
+      {
         double area = 0.0;
         if ( mTool->points().size() > 1 )
+        {
           area = myDa.measurePolygon( mTool->points() );
+        }
         editTotal->setText( formatArea( area, decimalPlaces ) );
       }else
+      {
         QList<QgsPoint>::const_iterator it;
         bool b = true; // first point
         QgsPoint p1,p2;
         for (it=mTool->points().constBegin(); it != mTool->points().constEnd(); ++it)
+        {
           p2 = *it;
           if ( !b )
+          {
             double d  = myDa.measureLine( p1, p2 );
             mTotal += d;
             editTotal->setText( formatDistance( mTotal, decimalPlaces ) );
             QGis::UnitType myDisplayUnits;
             convertMeasurement( d, myDisplayUnits, false );
             QTreeWidgetItem *item = mTable->topLevelItem( mTable->topLevelItemCount() - 1 );
             item->setText( 0, QLocale::system().toString( d, 'f', decimalPlaces ) );
             item = new QTreeWidgetItem( QStringList( QLocale::system().toString( 0.0, 'f', decimalPlaces ) ) );
             item->setTextAlignment( 0, Qt::AlignRight );
             mTable->addTopLevelItem( item );
             mTable->scrollToItem( item );
+          }
           p1 = p2;
           b = false;
+        }
+      }
+    }

         /**Deletes the rubber band and the dialog*/
         void stopMeasuring();
         /** recalculate angle if projection state changed*/
         void changeStateProjectionEnable();
     };
     #endif // QGSMAPTOOLMEASUREANGLE_H

         QgsDistanceArea* distArea = mCanvas->mapRenderer()->distanceArea();
         if ( distArea )
+        {
           double azimutOne = distArea->bearing( mAnglePoints.at( 1 ), mAnglePoints.at( 0 ) );
           double azimutTwo = distArea->bearing( mAnglePoints.at( 1 ), point );
           //show angle in dialog
           if ( !mResultDisplay )
+          {
             mResultDisplay = new QgsDisplayAngle( mCanvas->topLevelWidget() );
             QObject::connect( mResultDisplay, SIGNAL( rejected() ), this, SLOT( stopMeasuring() ) );
             QObject::connect( mResultDisplay, SIGNAL( changeStateProjectionEnable() ),
                 this, SLOT( changeStateProjectionEnable() ) );
             mResultDisplay->move( e->pos() - QPoint( 100, 100 ) );
+          }
           mResultDisplay->show();
           QgsDistanceArea myDa;
           myDa.setSourceCrs( mCanvas->mapRenderer()->destinationSrs().srsid() );
           myDa.setEllipsoid( distArea->ellipsoid() );
           myDa.setProjectionsEnabled( mResultDisplay->projectionEnabled() );
           //angle calculation
           double azimutOne = myDa.bearing( mAnglePoints.at( 1 ), mAnglePoints.at( 0 ) );
           double azimutTwo = myDa.bearing( mAnglePoints.at( 1 ), point );
           double resultAngle = azimutTwo - azimutOne;
           QgsDebugMsg( QString::number( qAbs( resultAngle ) ) );
           QgsDebugMsg( QString::number( M_PI ) );
-...
+            }
+          }
           //show angle in dialog
           if ( !mResultDisplay )
+          {
             mResultDisplay = new QgsDisplayAngle( mCanvas->topLevelWidget() );
             QObject::connect( mResultDisplay, SIGNAL( rejected() ), this, SLOT( stopMeasuring() ) );
             mResultDisplay->move( e->pos() - QPoint( 100, 100 ) );
+          }
           mResultDisplay->show();
           mResultDisplay->setValueInRadians( resultAngle );
+        }
+      }
-...
+      }
+    }
     void QgsMapToolMeasureAngle::changeStateProjectionEnable()
+    {
       if ( mAnglePoints.size() != 3 )
         return;
       if ( !mResultDisplay )
         return;
       QgsDistanceArea myDa;
       myDa.setSourceCrs( mCanvas->mapRenderer()->destinationSrs().srsid() );
       myDa.setEllipsoid( mCanvas->mapRenderer()->distanceArea()->ellipsoid() );
       myDa.setProjectionsEnabled( mResultDisplay->projectionEnabled() );
       //angle calculation
       double azimutOne = myDa.bearing( mAnglePoints.at( 1 ), mAnglePoints.at( 0 ) );
       double azimutTwo = myDa.bearing( mAnglePoints.at( 1 ), mAnglePoints.at( 2 ) );
       double resultAngle = azimutTwo - azimutOne;
       QgsDebugMsg( QString::number( fabs( resultAngle ) ) );
       QgsDebugMsg( QString::number( M_PI ) );
       if ( fabs( resultAngle ) > M_PI )
+      {
         if ( resultAngle < 0 )
+        {
           resultAngle = M_PI + ( resultAngle + M_PI );
+        }
         else
+        {
           resultAngle = -M_PI + ( resultAngle - M_PI );
+        }
+      }
       mResultDisplay->setValueInRadians( resultAngle );
+    }

        <property name="spacing">
         <number>6</number>
        </property>
        <item row="1" column="2">
        <item row="2" column="2">
         <widget class="QLineEdit" name="editTotal">
          <property name="font">
           <font>
-...
          </property>
         </widget>
        </item>
        <item row="1" column="1">
        <item row="2" column="1">
         <spacer>
          <property name="orientation">
           <enum>Qt::Horizontal</enum>
-...
          </property>
         </spacer>
        </item>
        <item row="1" column="0">
        <item row="2" column="0">
         <widget class="QLabel" name="textLabel2">
          <property name="text">
           <string>Total</string>
-...
          </property>
         </widget>
        </item>
        <item row="0" column="0" colspan="3">
        <item row="1" column="0" colspan="3">
         <widget class="QTreeWidget" name="mTable">
          <property name="editTriggers">
           <set>QAbstractItemView::NoEditTriggers</set>
-...
          </column>
         </widget>
        </item>
        <item row="2" column="2">
        <item row="3" column="2">
         <widget class="QDialogButtonBox" name="buttonBox">
          <property name="standardButtons">
           <set>QDialogButtonBox::Close|QDialogButtonBox::Help</set>
          </property>
         </widget>
        </item>
        <item row="0" column="0" colspan="3">
         <widget class="QCheckBox" name="mcbProjectionEnabled">
          <property name="text">
           <string>Ellipsoidal (WGS84)</string>
          </property>
         </widget>
        </item>
       </layout>
      </widget>
      <layoutdefault spacing="6" margin="11"/>

        <rect>
         <x>0</x>
         <y>0</y>
         <width>276</width>
         <height>78</height>
         <width>293</width>
         <height>105</height>
        </rect>
       </property>
       <property name="windowTitle">
        <string>Angle</string>
       </property>
       <layout class="QGridLayout" name="gridLayout">
        <item row="0" column="0" colspan="2">
        <item row="1" column="0" colspan="2">
         <widget class="QLineEdit" name="mAngleLineEdit">
          <property name="readOnly">
           <bool>true</bool>
          </property>
         </widget>
        </item>
        <item row="1" column="0">
        <item row="2" column="0">
         <spacer name="horizontalSpacer">
          <property name="orientation">
           <enum>Qt::Horizontal</enum>
-...
          </property>
         </spacer>
        </item>
        <item row="1" column="1">
        <item row="2" column="1">
         <widget class="QDialogButtonBox" name="buttonBox">
          <property name="orientation">
           <enum>Qt::Horizontal</enum>
-...
          </property>
         </widget>
        </item>
        <item row="0" column="0">
         <widget class="QCheckBox" name="mcbProjectionEnabled">
          <property name="text">
           <string>Ellipsoidal (WGS84)</string>
          </property>
         </widget>
        </item>
       </layout>
      </widget>
      <resources/>

QGIS » QGIS Application