@@ -595,6 +595,8 @@ class QgisApp : public QMainWindow
595
595
void measure ();
596
596
// ! Measure area
597
597
void measureArea ();
598
+ // ! Measure angle
599
+ void measureAngle ();
598
600
599
601
// ! show the attribute table for the currently selected layer
600
602
void attributeTable ();
@@ -712,8 +714,8 @@ class QgisApp : public QMainWindow
712
714
// ! check to see if file is dirty and if so, prompt the user th save it
713
715
bool saveDirty ();
714
716
/* * 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 );
717
719
718
720
/* *Deletes all the composer objects and clears mPrintComposers*/
719
721
void deletePrintComposers ();
@@ -802,6 +804,7 @@ class QgisApp : public QMainWindow
802
804
QAction *mActionDeselectAll ;
803
805
QAction *mActionIdentify ;
804
806
QAction *mActionMeasure ;
807
+ QAction *mActionMeasureAngle ;
805
808
QAction *mActionMeasureArea ;
806
809
QAction *mActionViewSeparator1 ;
807
810
QAction *mActionZoomFullExtent ;
@@ -906,6 +909,7 @@ class QgisApp : public QMainWindow
906
909
QgsMapTool* mIdentify ;
907
910
QgsMapTool* mMeasureDist ;
908
911
QgsMapTool* mMeasureArea ;
912
+ QgsMapTool* mMeasureAngle ;
909
913
QgsMapTool* mCapturePoint ;
910
914
QgsMapTool* mCaptureLine ;
911
915
QgsMapTool* mCapturePolygon ;
0 commit comments