Skip to content

Commit f0d8aa5

Browse files
author
jef
committed
more fixes
git-svn-id: http://svn.osgeo.org/qgis/trunk@12696 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 3a028cf commit f0d8aa5

File tree

7 files changed

+22
-18
lines changed

7 files changed

+22
-18
lines changed

src/app/qgisapp.h

+6-2
Original file line numberDiff line numberDiff line change
@@ -595,6 +595,8 @@ class QgisApp : public QMainWindow
595595
void measure();
596596
//! Measure area
597597
void measureArea();
598+
//! Measure angle
599+
void measureAngle();
598600

599601
//! show the attribute table for the currently selected layer
600602
void attributeTable();
@@ -712,8 +714,8 @@ class QgisApp : public QMainWindow
712714
//! check to see if file is dirty and if so, prompt the user th save it
713715
bool saveDirty();
714716
/** Helper function to union several geometries together (used in function mergeSelectedFeatures)
715-
@return 0 in case of error*/
716-
QgsGeometry* unionGeometries( const QgsVectorLayer* vl, QgsFeatureList& featureList );
717+
@return 0 in case of error or if canceled */
718+
QgsGeometry* unionGeometries( const QgsVectorLayer* vl, QgsFeatureList& featureList, bool &canceled );
717719

718720
/**Deletes all the composer objects and clears mPrintComposers*/
719721
void deletePrintComposers();
@@ -802,6 +804,7 @@ class QgisApp : public QMainWindow
802804
QAction *mActionDeselectAll;
803805
QAction *mActionIdentify;
804806
QAction *mActionMeasure;
807+
QAction *mActionMeasureAngle;
805808
QAction *mActionMeasureArea;
806809
QAction *mActionViewSeparator1;
807810
QAction *mActionZoomFullExtent;
@@ -906,6 +909,7 @@ class QgisApp : public QMainWindow
906909
QgsMapTool* mIdentify;
907910
QgsMapTool* mMeasureDist;
908911
QgsMapTool* mMeasureArea;
912+
QgsMapTool* mMeasureAngle;
909913
QgsMapTool* mCapturePoint;
910914
QgsMapTool* mCaptureLine;
911915
QgsMapTool* mCapturePolygon;

src/app/qgsmaptooladdfeature.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#include <QMouseEvent>
3232
#include <QSettings>
3333

34-
QgsMapToolAddFeature::QgsMapToolAddFeature( QgsMapCanvas* canvas, enum CaptureTool tool ): QgsMapToolCapture( canvas, tool )
34+
QgsMapToolAddFeature::QgsMapToolAddFeature( QgsMapCanvas* canvas, CaptureTool tool ): QgsMapToolCapture( canvas, tool )
3535
{
3636

3737
}

src/app/qgsmaptoolcapture.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class QgsMapToolCapture : public QgsMapToolEdit
3939
};
4040

4141
//! constructor
42-
QgsMapToolCapture( QgsMapCanvas* canvas, enum CaptureTool tool );
42+
QgsMapToolCapture( QgsMapCanvas* canvas, CaptureTool tool );
4343

4444
//! destructor
4545
virtual ~QgsMapToolCapture();

src/core/qgscoordinatetransform.cpp

+8-8
Original file line numberDiff line numberDiff line change
@@ -193,13 +193,13 @@ void QgsCoordinateTransform::initialise()
193193
// If the source and destination projection are the same, set the short
194194
// circuit flag (no transform takes place)
195195
mShortCircuit = true;
196-
QgsDebugMsg( "Source/Dest CRS equal, shortcircuit is set." );
196+
QgsDebugMsgLevel( "Source/Dest CRS equal, shortcircuit is set.", 3 );
197197
}
198198
else
199199
{
200200
// Transform must take place
201201
mShortCircuit = false;
202-
QgsDebugMsg( "Source/Dest CRS UNequal, shortcircuit is NOt set." );
202+
QgsDebugMsgLevel( "Source/Dest CRS UNequal, shortcircuit is NOt set.", 3 );
203203
}
204204

205205
}
@@ -472,18 +472,18 @@ void QgsCoordinateTransform::transformCoords( const int& numPoints, double *x, d
472472
{
473473
if ( direction == ForwardTransform )
474474
{
475-
points += QString("(%1, %2)\n").arg( x[i] ).arg( y[i] );
475+
points += QString( "(%1, %2)\n" ).arg( x[i] ).arg( y[i] );
476476
}
477477
else
478478
{
479-
points += QString("(%1, %2)\n").arg( x[i]*RAD_TO_DEG ).arg( y[i]*RAD_TO_DEG );
479+
points += QString( "(%1, %2)\n" ).arg( x[i] * RAD_TO_DEG ).arg( y[i] * RAD_TO_DEG );
480480
}
481481
}
482482

483-
QString msg = tr("%1 of\n%2\nfailed with error: %3\n")
484-
.arg( dir )
485-
.arg( points )
486-
.arg( QString::fromUtf8( pj_strerrno( projResult ) ) );
483+
QString msg = tr( "%1 of\n%2\nfailed with error: %3\n" )
484+
.arg( dir )
485+
.arg( points )
486+
.arg( QString::fromUtf8( pj_strerrno( projResult ) ) );
487487

488488
QgsDebugMsg( "Projection failed emitting invalid transform signal: " + msg );
489489

src/plugins/grass/qgsgrassmodule.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -294,8 +294,8 @@ QgsGrassModuleStandardOptions::QgsGrassModuleStandardOptions(
294294
QgisInterface *iface,
295295
QString xname, QDomElement qDocElem,
296296
QWidget * parent, Qt::WFlags f )
297-
: QgsGrassModuleOptions( tools, module, iface ),
298-
QWidget( parent, f )
297+
: QWidget( parent, f ),
298+
QgsGrassModuleOptions( tools, module, iface )
299299
{
300300
QgsDebugMsg( "called." );
301301
QgsDebugMsg( QString( "PATH = %1" ).arg( getenv( "PATH" ) ) );

src/plugins/scale_bar/pluginguibase.ui

+3-3
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@
123123
</sizepolicy>
124124
</property>
125125
<property name="text">
126-
<string>Colour of bar</string>
126+
<string>Color of bar</string>
127127
</property>
128128
<property name="buddy">
129129
<cstring>pbnChangeColor</cstring>
@@ -139,10 +139,10 @@
139139
</sizepolicy>
140140
</property>
141141
<property name="toolTip">
142-
<string>Click to select the colour</string>
142+
<string>Click to select the color</string>
143143
</property>
144144
<property name="whatsThis">
145-
<string>Click to select the colour</string>
145+
<string>Click to select the color</string>
146146
</property>
147147
<property name="text">
148148
<string/>

src/ui/qgsoptionsbase.ui

+1-1
Original file line numberDiff line numberDiff line change
@@ -699,7 +699,7 @@
699699
<item row="1" column="0">
700700
<widget class="QLabel" name="mLineColorTextLabel">
701701
<property name="text">
702-
<string>Line colour</string>
702+
<string>Line color</string>
703703
</property>
704704
</widget>
705705
</item>

0 commit comments

Comments
 (0)