Visual indent part 2

lbartoletti · lbartoletti · commit dec09cf5bdbb · 2017-10-03T21:39:59.000+02:00
diff --git a/src/app/qgsmaptoolcircle2points.cpp b/src/app/qgsmaptoolcircle2points.cpp
@@ -24,7 +24,6 @@ QgsMapToolCircle2Points::QgsMapToolCircle2Points( QgsMapToolCapture *parentTool,
     QgsMapCanvas *canvas, CaptureMode mode )
   : QgsMapToolAddCircle( parentTool, canvas, mode )
 {
-
 }
 
 void QgsMapToolCircle2Points::cadCanvasReleaseEvent( QgsMapMouseEvent *e )
diff --git a/src/app/qgsmaptoolcircle2tangentspoint.cpp b/src/app/qgsmaptoolcircle2tangentspoint.cpp
@@ -70,10 +70,9 @@ void QgsMapToolCircle2TangentsPoint::cadCanvasReleaseEvent( QgsMapMouseEvent *e
             QgsMessageBar::CRITICAL, QgisApp::instance()->messageTimeout() );
         deactivate();
       }
-      createRadiusSpinBox();
 
+      createRadiusSpinBox();
     }
-
   }
   else if ( e->button() == Qt::RightButton )
   {
@@ -222,8 +221,6 @@ void QgsMapToolCircle2TangentsPoint::getPossibleCenter( )
     mCenters.append( p4 );
 
   }
-
-
 }
 
 void QgsMapToolCircle2TangentsPoint::createRadiusSpinBox()
@@ -270,6 +267,5 @@ void QgsMapToolCircle2TangentsPoint::radiusSpinBoxChanged( int radius )
       tempRB->show();
       mRubberBands.append( tempRB.release() );
     }
-
   }
 }
diff --git a/src/app/qgsmaptoolcircle2tangentspoint.h b/src/app/qgsmaptoolcircle2tangentspoint.h
@@ -36,6 +36,7 @@ class QgsMapToolCircle2TangentsPoint: public QgsMapToolAddCircle
 
   public slots:
     void radiusSpinBoxChanged( int radius );
+
   private:
     //! Return the point where segments are intersected. Method from QgsGeometryUtils doesn't work for special cases used by this tool.
     QgsPointXY intersect( QgsPointXY seg1_pt1, QgsPointXY seg1_pt2, QgsPointXY seg2_pt1, QgsPointXY seg2_pt2 );
@@ -50,7 +51,6 @@ class QgsMapToolCircle2TangentsPoint: public QgsMapToolAddCircle
 
     QSpinBox *mRadiusSpinBox = nullptr;
 
-
     int mRadius = 0;
     QVector<QgsPointXY> mCenters;
     QVector<QgsGeometryRubberBand *> mRubberBands;
diff --git a/src/app/qgsmaptoolcircle3points.cpp b/src/app/qgsmaptoolcircle3points.cpp
@@ -35,7 +35,6 @@ void QgsMapToolCircle3Points::cadCanvasReleaseEvent( QgsMapMouseEvent *e )
   {
     if ( mPoints.size() < 2 )
       mPoints.append( mapPoint );
-
     if ( !mPoints.isEmpty() && !mTempRubberBand )
     {
       mTempRubberBand = createGeometryRubberBand( ( mode() == CapturePolygon ) ? QgsWkbTypes::PolygonGeometry : QgsWkbTypes::LineGeometry, true );
diff --git a/src/app/qgsmaptoolcircle3tangents.cpp b/src/app/qgsmaptoolcircle3tangents.cpp
@@ -32,7 +32,6 @@ QgsMapToolCircle3Tangents::QgsMapToolCircle3Tangents( QgsMapToolCapture *parentT
 
 void QgsMapToolCircle3Tangents::cadCanvasReleaseEvent( QgsMapMouseEvent *e )
 {
-
   QgsPoint mapPoint( e->mapPoint() );
   EdgesOnlyFilter filter;
   QgsPointLocator::Match match = mCanvas->snappingUtils()->snapToMap( mapPoint, &filter );
@@ -66,7 +65,6 @@ void QgsMapToolCircle3Tangents::cadCanvasReleaseEvent( QgsMapMouseEvent *e )
   {
     if ( match.isValid() && ( mPoints.size() == 4 ) )
     {
-
       match.edgePoints( p1, p2 );
       mPoints.append( QgsPoint( p1 ) );
       mPoints.append( QgsPoint( p2 ) );
diff --git a/src/app/qgsmaptoolcircle3tangents.h b/src/app/qgsmaptoolcircle3tangents.h
@@ -28,7 +28,6 @@ class QgsMapToolCircle3Tangents: public QgsMapToolAddCircle
     QgsMapToolCircle3Tangents( QgsMapToolCapture *parentTool, QgsMapCanvas *canvas, CaptureMode mode = CaptureLine );
 
     void cadCanvasReleaseEvent( QgsMapMouseEvent *e ) override;
-
 };
 
 #endif // QGSMAPTOOLCIRCLE3TANGENTS_H

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,6 @@ QgsMapToolCircle2Points::QgsMapToolCircle2Points( QgsMapToolCapture *parentTool,`
`24`	`24`	`QgsMapCanvas *canvas, CaptureMode mode )`
`25`	`25`	`: QgsMapToolAddCircle( parentTool, canvas, mode )`
`26`	`26`	`{`
`27`		`-`
`28`	`27`	`}`
`29`	`28`
`30`	`29`	`void QgsMapToolCircle2Points::cadCanvasReleaseEvent( QgsMapMouseEvent *e )`
Original file line number	Diff line number	Diff line change
`@@ -70,10 +70,9 @@ void QgsMapToolCircle2TangentsPoint::cadCanvasReleaseEvent( QgsMapMouseEvent *e`
`70`	`70`	`QgsMessageBar::CRITICAL, QgisApp::instance()->messageTimeout() );`
`71`	`71`	`deactivate();`
`72`	`72`	`}`
`73`		`- createRadiusSpinBox();`
`74`	`73`
	`74`	`+ createRadiusSpinBox();`
`75`	`75`	`}`
`76`		`-`
`77`	`76`	`}`
`78`	`77`	`else if ( e->button() == Qt::RightButton )`
`79`	`78`	`{`
`@@ -222,8 +221,6 @@ void QgsMapToolCircle2TangentsPoint::getPossibleCenter( )`
`222`	`221`	`mCenters.append( p4 );`
`223`	`222`
`224`	`223`	`}`
`225`		`-`
`226`		`-`
`227`	`224`	`}`
`228`	`225`
`229`	`226`	`void QgsMapToolCircle2TangentsPoint::createRadiusSpinBox()`
`@@ -270,6 +267,5 @@ void QgsMapToolCircle2TangentsPoint::radiusSpinBoxChanged( int radius )`
`270`	`267`	`tempRB->show();`
`271`	`268`	`mRubberBands.append( tempRB.release() );`
`272`	`269`	`}`
`273`		`-`
`274`	`270`	`}`
`275`	`271`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,6 @@ void QgsMapToolCircle3Points::cadCanvasReleaseEvent( QgsMapMouseEvent *e )`
`35`	`35`	`{`
`36`	`36`	`if ( mPoints.size() < 2 )`
`37`	`37`	`mPoints.append( mapPoint );`
`38`		`-`
`39`	`38`	`if ( !mPoints.isEmpty() && !mTempRubberBand )`
`40`	`39`	`{`
`41`	`40`	`mTempRubberBand = createGeometryRubberBand( ( mode() == CapturePolygon ) ? QgsWkbTypes::PolygonGeometry : QgsWkbTypes::LineGeometry, true );`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,6 @@ QgsMapToolCircle3Tangents::QgsMapToolCircle3Tangents( QgsMapToolCapture *parentT`
`32`	`32`
`33`	`33`	`void QgsMapToolCircle3Tangents::cadCanvasReleaseEvent( QgsMapMouseEvent *e )`
`34`	`34`	`{`
`35`		`-`
`36`	`35`	`QgsPoint mapPoint( e->mapPoint() );`
`37`	`36`	`EdgesOnlyFilter filter;`
`38`	`37`	`QgsPointLocator::Match match = mCanvas->snappingUtils()->snapToMap( mapPoint, &filter );`
`@@ -66,7 +65,6 @@ void QgsMapToolCircle3Tangents::cadCanvasReleaseEvent( QgsMapMouseEvent *e )`
`66`	`65`	`{`
`67`	`66`	`if ( match.isValid() && ( mPoints.size() == 4 ) )`
`68`	`67`	`{`
`69`		`-`
`70`	`68`	`match.edgePoints( p1, p2 );`
`71`	`69`	`mPoints.append( QgsPoint( p1 ) );`
`72`	`70`	`mPoints.append( QgsPoint( p2 ) );`