Refactored capturetool to capturemode and fixed some compile errors

timlinux · timlinux · commit b18b097c38ad · 2010-01-07T19:03:14.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@12697 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/qgsmaptooladdfeature.cpp b/src/app/qgsmaptooladdfeature.cpp
@@ -31,7 +31,7 @@
 #include <QMouseEvent>
 #include <QSettings>
 
-QgsMapToolAddFeature::QgsMapToolAddFeature( QgsMapCanvas* canvas, CaptureTool tool ): QgsMapToolCapture( canvas, tool )
+QgsMapToolAddFeature::QgsMapToolAddFeature( QgsMapCanvas* canvas, CaptureMode tool ): QgsMapToolCapture( canvas, tool )
 {
 
 }
@@ -85,7 +85,7 @@ void QgsMapToolAddFeature::canvasReleaseEvent( QMouseEvent * e )
   }
 
   // POINT CAPTURING
-  if ( mTool == CapturePoint )
+  if ( mCaptureMode == CapturePoint )
   {
     //check we only use this tool for point/multipoint layers
     if ( vlayer->geometryType() != QGis::Point )
@@ -209,18 +209,18 @@ void QgsMapToolAddFeature::canvasReleaseEvent( QMouseEvent * e )
     }
 
   }
-  else if ( mTool == CaptureLine || mTool == CapturePolygon )
+  else if ( mCaptureMode == CaptureLine || mCaptureMode == CapturePolygon )
   {
     //check we only use the line tool for line/multiline layers
-    if ( mTool == CaptureLine && vlayer->geometryType() != QGis::Line )
+    if ( mCaptureMode == CaptureLine && vlayer->geometryType() != QGis::Line )
     {
       QMessageBox::information( 0, tr( "Wrong editing tool" ),
                                 tr( "Cannot apply the 'capture line' tool on this vector layer" ) );
       return;
     }
 
     //check we only use the polygon tool for polygon/multipolygon layers
-    if ( mTool == CapturePolygon && vlayer->geometryType() != QGis::Polygon )
+    if ( mCaptureMode == CapturePolygon && vlayer->geometryType() != QGis::Polygon )
     {
       QMessageBox::information( 0, tr( "Wrong editing tool" ),
                                 tr( "Cannot apply the 'capture polygon' tool on this vector layer" ) );
@@ -253,7 +253,7 @@ void QgsMapToolAddFeature::canvasReleaseEvent( QMouseEvent * e )
       mCapturing = FALSE;
 
       //lines: bail out if there are not at least two vertices
-      if ( mTool == CaptureLine && mCaptureList.size() < 2 )
+      if ( mCaptureMode == CaptureLine && mCaptureList.size() < 2 )
       {
         delete mRubberBand;
         mRubberBand = NULL;
@@ -262,7 +262,7 @@ void QgsMapToolAddFeature::canvasReleaseEvent( QMouseEvent * e )
       }
 
       //polygons: bail out if there are not at least two vertices
-      if ( mTool == CapturePolygon && mCaptureList.size() < 3 )
+      if ( mCaptureMode == CapturePolygon && mCaptureList.size() < 3 )
       {
         delete mRubberBand;
         mRubberBand = NULL;
@@ -276,7 +276,7 @@ void QgsMapToolAddFeature::canvasReleaseEvent( QMouseEvent * e )
       int size;
       char end = QgsApplication::endian();
 
-      if ( mTool == CaptureLine )
+      if ( mCaptureMode == CaptureLine )
       {
         if ( layerWKBType == QGis::WKBLineString )
         {
diff --git a/src/app/qgsmaptoolcapture.cpp b/src/app/qgsmaptoolcapture.cpp
@@ -36,8 +36,8 @@
 #include <QMouseEvent>
 
 
-QgsMapToolCapture::QgsMapToolCapture( QgsMapCanvas* canvas, enum CaptureTool tool )
-    : QgsMapToolEdit( canvas ), mTool( tool ), mRubberBand( 0 )
+QgsMapToolCapture::QgsMapToolCapture( QgsMapCanvas* canvas, enum CaptureMode tool )
+    : QgsMapToolEdit( canvas ), mCaptureMode( tool ), mRubberBand( 0 )
 {
   mCapturing = FALSE;
 
@@ -98,7 +98,7 @@ int QgsMapToolCapture::addVertex( const QPoint& p )
 
   if ( !mRubberBand )
   {
-    mRubberBand = createRubberBand( mTool == CapturePolygon );
+    mRubberBand = createRubberBand( mCaptureMode == CapturePolygon );
   }
 
   QgsPoint digitisedPoint;
diff --git a/src/app/qgsmaptoolcapture.h b/src/app/qgsmaptoolcapture.h
@@ -31,15 +31,15 @@ class QgsMapToolCapture : public QgsMapToolEdit
 {
   public:
 
-    enum CaptureTool
+    enum CaptureMode
     {
       CapturePoint,
       CaptureLine,
       CapturePolygon
     };
 
     //! constructor
-    QgsMapToolCapture( QgsMapCanvas* canvas, CaptureTool tool );
+    QgsMapToolCapture( QgsMapCanvas* canvas, CaptureMode tool );
 
     //! destructor
     virtual ~QgsMapToolCapture();
@@ -71,7 +71,7 @@ class QgsMapToolCapture : public QgsMapToolEdit
   protected:
 
     /** which capturing tool is being used */
-    enum CaptureTool mTool;
+    enum CaptureMode mCaptureMode;
 
     /** Flag to indicate a map canvas capture operation is taking place */
     bool mCapturing;

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@`
`31`	`31`	`#include <QMouseEvent>`
`32`	`32`	`#include <QSettings>`
`33`	`33`
`34`		`-QgsMapToolAddFeature::QgsMapToolAddFeature( QgsMapCanvas* canvas, CaptureTool tool ): QgsMapToolCapture( canvas, tool )`
	`34`	`+QgsMapToolAddFeature::QgsMapToolAddFeature( QgsMapCanvas* canvas, CaptureMode tool ): QgsMapToolCapture( canvas, tool )`
`35`	`35`	`{`
`36`	`36`
`37`	`37`	`}`
`@@ -85,7 +85,7 @@ void QgsMapToolAddFeature::canvasReleaseEvent( QMouseEvent * e )`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`// POINT CAPTURING`
`88`		`- if ( mTool == CapturePoint )`
	`88`	`+ if ( mCaptureMode == CapturePoint )`
`89`	`89`	`{`
`90`	`90`	`//check we only use this tool for point/multipoint layers`
`91`	`91`	`if ( vlayer->geometryType() != QGis::Point )`
`@@ -209,18 +209,18 @@ void QgsMapToolAddFeature::canvasReleaseEvent( QMouseEvent * e )`
`209`	`209`	`}`
`210`	`210`
`211`	`211`	`}`
`212`		`- else if ( mTool == CaptureLine \|\| mTool == CapturePolygon )`
	`212`	`+ else if ( mCaptureMode == CaptureLine \|\| mCaptureMode == CapturePolygon )`
`213`	`213`	`{`
`214`	`214`	`//check we only use the line tool for line/multiline layers`
`215`		`- if ( mTool == CaptureLine && vlayer->geometryType() != QGis::Line )`
	`215`	`+ if ( mCaptureMode == CaptureLine && vlayer->geometryType() != QGis::Line )`
`216`	`216`	`{`
`217`	`217`	`QMessageBox::information( 0, tr( "Wrong editing tool" ),`
`218`	`218`	`tr( "Cannot apply the 'capture line' tool on this vector layer" ) );`
`219`	`219`	`return;`
`220`	`220`	`}`
`221`	`221`
`222`	`222`	`//check we only use the polygon tool for polygon/multipolygon layers`
`223`		`- if ( mTool == CapturePolygon && vlayer->geometryType() != QGis::Polygon )`
	`223`	`+ if ( mCaptureMode == CapturePolygon && vlayer->geometryType() != QGis::Polygon )`
`224`	`224`	`{`
`225`	`225`	`QMessageBox::information( 0, tr( "Wrong editing tool" ),`
`226`	`226`	`tr( "Cannot apply the 'capture polygon' tool on this vector layer" ) );`
`@@ -253,7 +253,7 @@ void QgsMapToolAddFeature::canvasReleaseEvent( QMouseEvent * e )`
`253`	`253`	`mCapturing = FALSE;`
`254`	`254`
`255`	`255`	`//lines: bail out if there are not at least two vertices`
`256`		`- if ( mTool == CaptureLine && mCaptureList.size() < 2 )`
	`256`	`+ if ( mCaptureMode == CaptureLine && mCaptureList.size() < 2 )`
`257`	`257`	`{`
`258`	`258`	`delete mRubberBand;`
`259`	`259`	`mRubberBand = NULL;`
`@@ -262,7 +262,7 @@ void QgsMapToolAddFeature::canvasReleaseEvent( QMouseEvent * e )`
`262`	`262`	`}`
`263`	`263`
`264`	`264`	`//polygons: bail out if there are not at least two vertices`
`265`		`- if ( mTool == CapturePolygon && mCaptureList.size() < 3 )`
	`265`	`+ if ( mCaptureMode == CapturePolygon && mCaptureList.size() < 3 )`
`266`	`266`	`{`
`267`	`267`	`delete mRubberBand;`
`268`	`268`	`mRubberBand = NULL;`
`@@ -276,7 +276,7 @@ void QgsMapToolAddFeature::canvasReleaseEvent( QMouseEvent * e )`
`276`	`276`	`int size;`
`277`	`277`	`char end = QgsApplication::endian();`
`278`	`278`
`279`		`- if ( mTool == CaptureLine )`
	`279`	`+ if ( mCaptureMode == CaptureLine )`
`280`	`280`	`{`
`281`	`281`	`if ( layerWKBType == QGis::WKBLineString )`
`282`	`282`	`{`
Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,8 @@`
`36`	`36`	`#include <QMouseEvent>`
`37`	`37`
`38`	`38`
`39`		`-QgsMapToolCapture::QgsMapToolCapture( QgsMapCanvas* canvas, enum CaptureTool tool )`
`40`		`- : QgsMapToolEdit( canvas ), mTool( tool ), mRubberBand( 0 )`
	`39`	`+QgsMapToolCapture::QgsMapToolCapture( QgsMapCanvas* canvas, enum CaptureMode tool )`
	`40`	`+ : QgsMapToolEdit( canvas ), mCaptureMode( tool ), mRubberBand( 0 )`
`41`	`41`	`{`
`42`	`42`	`mCapturing = FALSE;`
`43`	`43`
`@@ -98,7 +98,7 @@ int QgsMapToolCapture::addVertex( const QPoint& p )`
`98`	`98`
`99`	`99`	`if ( !mRubberBand )`
`100`	`100`	`{`
`101`		`- mRubberBand = createRubberBand( mTool == CapturePolygon );`
	`101`	`+ mRubberBand = createRubberBand( mCaptureMode == CapturePolygon );`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`QgsPoint digitisedPoint;`