measure.diff
| src/app/qgsmeasuredialog.cpp (working copy) | ||
|---|---|---|
| 97 | 97 |
{
|
| 98 | 98 |
QSettings settings; |
| 99 | 99 |
int decimalPlaces = settings.value( "/qgis/measure/decimalplaces", "3" ).toInt(); |
| 100 |
QString ellipsoidId = settings.value( "/qgis/measure/ellipsoid", "WGS84").toString(); |
|
| 100 | 101 | |
| 101 | 102 |
// Create QgsDistance Area for customization ProjectionEnabled setting |
| 102 | 103 |
QgsDistanceArea myDa; |
| 103 | 104 |
myDa.setSourceCrs( mTool->canvas()->mapRenderer()->destinationSrs().srsid() ); |
| 104 |
myDa.setEllipsoid( mTool->canvas()->mapRenderer()->distanceArea()->ellipsoid() );
|
|
| 105 |
myDa.setEllipsoid( ellipsoidId );
|
|
| 105 | 106 |
myDa.setProjectionsEnabled( mcbProjectionEnabled->isChecked() ); |
| 106 | 107 | |
| 107 | 108 |
// show current distance/area while moving the point |
| ... | ... | |
| 132 | 133 |
{
|
| 133 | 134 |
QSettings settings; |
| 134 | 135 |
int decimalPlaces = settings.value( "/qgis/measure/decimalplaces", "3" ).toInt(); |
| 136 |
QString ellipsoidId = settings.value( "/qgis/measure/ellipsoid", "WGS84").toString(); |
|
| 135 | 137 | |
| 136 | 138 |
// Create QgsDistance Area for customization ProjectionEnabled setting |
| 137 | 139 |
QgsDistanceArea myDa; |
| 138 | 140 |
myDa.setSourceCrs( mTool->canvas()->mapRenderer()->destinationSrs().srsid() ); |
| 139 |
myDa.setEllipsoid( mTool->canvas()->mapRenderer()->distanceArea()->ellipsoid() ); |
|
| 141 |
myDa.setEllipsoid( ellipsoidId ); |
|
| 142 |
|
|
| 140 | 143 |
myDa.setProjectionsEnabled( mcbProjectionEnabled->isChecked() ); |
| 141 | 144 | |
| 142 | 145 |
int numPoints = mTool->points().size(); |
| src/app/qgsmaptoolmeasureangle.cpp (working copy) | ||
|---|---|---|
| 59 | 59 |
mResultDisplay->move( e->pos() - QPoint( 100, 100 ) ); |
| 60 | 60 |
} |
| 61 | 61 |
mResultDisplay->show(); |
| 62 | ||
| 63 |
QSettings settings; |
|
| 64 |
QString ellipsoidId = settings.value( "/qgis/measure/ellipsoid", "WGS84").toString(); |
|
| 62 | 65 |
|
| 63 | 66 |
QgsDistanceArea myDa; |
| 64 | 67 |
myDa.setSourceCrs( mCanvas->mapRenderer()->destinationSrs().srsid() ); |
| 65 |
myDa.setEllipsoid( distArea->ellipsoid() );
|
|
| 68 |
myDa.setEllipsoid( ellipsoidId );
|
|
| 66 | 69 |
myDa.setProjectionsEnabled( mResultDisplay->projectionEnabled() ); |
| 67 | 70 | |
| 68 | 71 |
//angle calculation |
| ... | ... | |
| 161 | 164 |
if ( !mResultDisplay ) |
| 162 | 165 |
return; |
| 163 | 166 |
|
| 167 |
QSettings settings; |
|
| 168 |
QString ellipsoidId = settings.value( "/qgis/measure/ellipsoid", "WGS84").toString(); |
|
| 169 | ||
| 164 | 170 |
QgsDistanceArea myDa; |
| 165 | 171 |
myDa.setSourceCrs( mCanvas->mapRenderer()->destinationSrs().srsid() ); |
| 166 |
myDa.setEllipsoid( mCanvas->mapRenderer()->distanceArea()->ellipsoid() );
|
|
| 172 |
myDa.setEllipsoid( ellipsoidId );
|
|
| 167 | 173 |
myDa.setProjectionsEnabled( mResultDisplay->projectionEnabled() ); |
| 168 | 174 | |
| 169 | 175 |
//angle calculation |
| src/ui/qgsmeasurebase.ui (working copy) | ||
|---|---|---|
| 101 | 101 |
<item row="0" column="0" colspan="3"> |
| 102 | 102 |
<widget class="QCheckBox" name="mcbProjectionEnabled"> |
| 103 | 103 |
<property name="text"> |
| 104 |
<string>Ellipsoidal (WGS84)</string>
|
|
| 104 |
<string>Ellipsoidal</string> |
|
| 105 | 105 |
</property> |
| 106 | 106 |
</widget> |
| 107 | 107 |
</item> |
| src/ui/qgsdisplayanglebase.ui (working copy) | ||
|---|---|---|
| 47 | 47 |
<item row="0" column="0"> |
| 48 | 48 |
<widget class="QCheckBox" name="mcbProjectionEnabled"> |
| 49 | 49 |
<property name="text"> |
| 50 |
<string>Ellipsoidal (WGS84)</string>
|
|
| 50 |
<string>Ellipsoidal</string> |
|
| 51 | 51 |
</property> |
| 52 | 52 |
</widget> |
| 53 | 53 |
</item> |