Skip to content

Commit de80f44

Browse files
lbartolettilbartoletti
committedOct 3, 2017
Concat successive if
·
ltr-3_40final-3_0_0
1 parent 30d9ad8 commit de80f44

11 files changed

+38
-66
lines changed
 

‎src/app/qgsmaptoolcircle2points.cpp

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,10 @@ void QgsMapToolCircle2Points::cadCanvasReleaseEvent( QgsMapMouseEvent *e )
3535
{
3636
mPoints.append( mapPoint );
3737

38-
if ( !mPoints.isEmpty() )
38+
if ( !mPoints.isEmpty() && !mTempRubberBand )
3939
{
40-
if ( !mTempRubberBand )
41-
{
42-
mTempRubberBand = createGeometryRubberBand( ( mode() == CapturePolygon ) ? QgsWkbTypes::PolygonGeometry : QgsWkbTypes::LineGeometry, true );
43-
mTempRubberBand->show();
44-
}
40+
mTempRubberBand = createGeometryRubberBand( ( mode() == CapturePolygon ) ? QgsWkbTypes::PolygonGeometry : QgsWkbTypes::LineGeometry, true );
41+
mTempRubberBand->show();
4542
}
4643
}
4744
else if ( e->button() == Qt::RightButton )

‎src/app/qgsmaptoolcircle3points.cpp

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,10 @@ void QgsMapToolCircle3Points::cadCanvasReleaseEvent( QgsMapMouseEvent *e )
3636
if ( mPoints.size() < 2 )
3737
mPoints.append( mapPoint );
3838

39-
if ( !mPoints.isEmpty() )
39+
if ( !mPoints.isEmpty() && !mTempRubberBand )
4040
{
41-
if ( !mTempRubberBand )
42-
{
43-
mTempRubberBand = createGeometryRubberBand( ( mode() == CapturePolygon ) ? QgsWkbTypes::PolygonGeometry : QgsWkbTypes::LineGeometry, true );
44-
mTempRubberBand->show();
45-
}
41+
mTempRubberBand = createGeometryRubberBand( ( mode() == CapturePolygon ) ? QgsWkbTypes::PolygonGeometry : QgsWkbTypes::LineGeometry, true );
42+
mTempRubberBand->show();
4643
}
4744
}
4845
else if ( e->button() == Qt::RightButton )

‎src/app/qgsmaptoolcirclecenterpoint.cpp

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,12 @@ void QgsMapToolCircleCenterPoint::cadCanvasReleaseEvent( QgsMapMouseEvent *e )
3535
{
3636
mPoints.append( mapPoint );
3737

38-
if ( !mPoints.isEmpty() )
38+
if ( !mPoints.isEmpty() && !mTempRubberBand )
3939
{
40-
if ( !mTempRubberBand )
41-
{
42-
mTempRubberBand = createGeometryRubberBand( ( mode() == CapturePolygon ) ? QgsWkbTypes::PolygonGeometry : QgsWkbTypes::LineGeometry, true );
43-
mTempRubberBand->show();
44-
}
40+
mTempRubberBand = createGeometryRubberBand( ( mode() == CapturePolygon ) ? QgsWkbTypes::PolygonGeometry : QgsWkbTypes::LineGeometry, true );
41+
mTempRubberBand->show();
4542
}
43+
4644
}
4745
else if ( e->button() == Qt::RightButton )
4846
{

‎src/app/qgsmaptoolellipsecenter2points.cpp

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,10 @@ void QgsMapToolEllipseCenter2Points::cadCanvasReleaseEvent( QgsMapMouseEvent *e
3838
if ( mPoints.size() < 2 )
3939
mPoints.append( mapPoint );
4040

41-
if ( !mPoints.isEmpty() )
41+
if ( !mPoints.isEmpty() && !mTempRubberBand )
4242
{
43-
if ( !mTempRubberBand )
44-
{
45-
mTempRubberBand = createGeometryRubberBand( ( mode() == CapturePolygon ) ? QgsWkbTypes::PolygonGeometry : QgsWkbTypes::LineGeometry, true );
46-
mTempRubberBand->show();
47-
}
43+
mTempRubberBand = createGeometryRubberBand( ( mode() == CapturePolygon ) ? QgsWkbTypes::PolygonGeometry : QgsWkbTypes::LineGeometry, true );
44+
mTempRubberBand->show();
4845
}
4946
}
5047
else if ( e->button() == Qt::RightButton )

‎src/app/qgsmaptoolellipsecenterpoint.cpp

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,10 @@ void QgsMapToolEllipseCenterPoint::cadCanvasReleaseEvent( QgsMapMouseEvent *e )
3535
{
3636
mPoints.append( mapPoint );
3737

38-
if ( !mPoints.isEmpty() )
38+
if ( !mPoints.isEmpty() && !mTempRubberBand )
3939
{
40-
if ( !mTempRubberBand )
41-
{
42-
mTempRubberBand = createGeometryRubberBand( ( mode() == CapturePolygon ) ? QgsWkbTypes::PolygonGeometry : QgsWkbTypes::LineGeometry, true );
43-
mTempRubberBand->show();
44-
}
40+
mTempRubberBand = createGeometryRubberBand( ( mode() == CapturePolygon ) ? QgsWkbTypes::PolygonGeometry : QgsWkbTypes::LineGeometry, true );
41+
mTempRubberBand->show();
4542
}
4643
}
4744
else if ( e->button() == Qt::RightButton )

‎src/app/qgsmaptoolellipseextent.cpp

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,10 @@ void QgsMapToolEllipseExtent::cadCanvasReleaseEvent( QgsMapMouseEvent *e )
3535
{
3636
mPoints.append( mapPoint );
3737

38-
if ( !mPoints.isEmpty() )
38+
if ( !mPoints.isEmpty() && !mTempRubberBand )
3939
{
40-
if ( !mTempRubberBand )
41-
{
42-
mTempRubberBand = createGeometryRubberBand( ( mode() == CapturePolygon ) ? QgsWkbTypes::PolygonGeometry : QgsWkbTypes::LineGeometry, true );
43-
mTempRubberBand->show();
44-
}
40+
mTempRubberBand = createGeometryRubberBand( ( mode() == CapturePolygon ) ? QgsWkbTypes::PolygonGeometry : QgsWkbTypes::LineGeometry, true );
41+
mTempRubberBand->show();
4542
}
4643
}
4744
else if ( e->button() == Qt::RightButton )

‎src/app/qgsmaptoolellipsefoci.cpp

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,10 @@ void QgsMapToolEllipseFoci::cadCanvasReleaseEvent( QgsMapMouseEvent *e )
3636
{
3737
mPoints.append( mapPoint );
3838

39-
if ( !mPoints.isEmpty() )
39+
if ( !mPoints.isEmpty() && !mTempRubberBand )
4040
{
41-
if ( !mTempRubberBand )
42-
{
43-
mTempRubberBand = createGeometryRubberBand( ( mode() == CapturePolygon ) ? QgsWkbTypes::PolygonGeometry : QgsWkbTypes::LineGeometry, true );
44-
mTempRubberBand->show();
45-
}
41+
mTempRubberBand = createGeometryRubberBand( ( mode() == CapturePolygon ) ? QgsWkbTypes::PolygonGeometry : QgsWkbTypes::LineGeometry, true );
42+
mTempRubberBand->show();
4643
}
4744
}
4845
else if ( e->button() == Qt::RightButton )

‎src/app/qgsmaptoolrectangle3points.cpp

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,12 @@ void QgsMapToolRectangle3Points::cadCanvasReleaseEvent( QgsMapMouseEvent *e )
3838
if ( mPoints.size() < 2 )
3939
mPoints.append( mapPoint );
4040

41-
if ( !mPoints.isEmpty() )
41+
if ( !mPoints.isEmpty() && !mTempRubberBand )
4242
{
43-
if ( !mTempRubberBand )
44-
{
45-
mTempRubberBand = createGeometryRubberBand( ( mode() == CapturePolygon ) ? QgsWkbTypes::PolygonGeometry : QgsWkbTypes::LineGeometry, true );
46-
mTempRubberBand->show();
47-
}
43+
mTempRubberBand = createGeometryRubberBand( ( mode() == CapturePolygon ) ? QgsWkbTypes::PolygonGeometry : QgsWkbTypes::LineGeometry, true );
44+
mTempRubberBand->show();
4845
}
46+
4947
}
5048
else if ( e->button() == Qt::RightButton )
5149
{

‎src/app/qgsmaptoolrectanglecenter.cpp

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,12 @@ void QgsMapToolRectangleCenter::cadCanvasReleaseEvent( QgsMapMouseEvent *e )
3737
{
3838
mPoints.append( mapPoint );
3939

40-
if ( !mPoints.isEmpty() )
40+
if ( !mPoints.isEmpty() && !mTempRubberBand )
4141
{
42-
if ( !mTempRubberBand )
43-
{
44-
mTempRubberBand = createGeometryRubberBand( ( mode() == CapturePolygon ) ? QgsWkbTypes::PolygonGeometry : QgsWkbTypes::LineGeometry, true );
45-
mTempRubberBand->show();
46-
}
42+
mTempRubberBand = createGeometryRubberBand( ( mode() == CapturePolygon ) ? QgsWkbTypes::PolygonGeometry : QgsWkbTypes::LineGeometry, true );
43+
mTempRubberBand->show();
4744
}
45+
4846
}
4947
else if ( e->button() == Qt::RightButton )
5048
{

‎src/app/qgsmaptoolrectangleextent.cpp

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,12 @@ void QgsMapToolRectangleExtent::cadCanvasReleaseEvent( QgsMapMouseEvent *e )
3636
{
3737
mPoints.append( mapPoint );
3838

39-
if ( !mPoints.isEmpty() )
39+
if ( !mPoints.isEmpty() && !mTempRubberBand )
4040
{
41-
if ( !mTempRubberBand )
42-
{
43-
mTempRubberBand = createGeometryRubberBand( ( mode() == CapturePolygon ) ? QgsWkbTypes::PolygonGeometry : QgsWkbTypes::LineGeometry, true );
44-
mTempRubberBand->show();
45-
}
41+
mTempRubberBand = createGeometryRubberBand( ( mode() == CapturePolygon ) ? QgsWkbTypes::PolygonGeometry : QgsWkbTypes::LineGeometry, true );
42+
mTempRubberBand->show();
4643
}
44+
4745
}
4846
else if ( e->button() == Qt::RightButton )
4947
{

‎src/app/qgsmaptoolsquarecenter.cpp

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,12 @@ void QgsMapToolSquareCenter::cadCanvasReleaseEvent( QgsMapMouseEvent *e )
4141
{
4242
mPoints.append( mapPoint );
4343

44-
if ( !mPoints.isEmpty() )
44+
if ( !mPoints.isEmpty() && !mTempRubberBand )
4545
{
46-
if ( !mTempRubberBand )
47-
{
48-
mTempRubberBand = createGeometryRubberBand( ( mode() == CapturePolygon ) ? QgsWkbTypes::PolygonGeometry : QgsWkbTypes::LineGeometry, true );
49-
mTempRubberBand->show();
50-
}
46+
mTempRubberBand = createGeometryRubberBand( ( mode() == CapturePolygon ) ? QgsWkbTypes::PolygonGeometry : QgsWkbTypes::LineGeometry, true );
47+
mTempRubberBand->show();
5148
}
49+
5250
}
5351
else if ( e->button() == Qt::RightButton )
5452
{

0 commit comments

Comments
 (0)
Please sign in to comment.