Merge pull request #2275 from mhugent/rubberband_fixes

Fix rubberband issues
qgis · Aug 31, 2015 · 19a98b2 · 19a98b2
2 parents a60c8fc + 8b82584
commit 19a98b2
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 8 deletions.
diff --git a/src/core/geometry/qgscircularstringv2.cpp b/src/core/geometry/qgscircularstringv2.cpp
@@ -701,6 +701,7 @@ bool QgsCircularStringV2::insertVertex( const QgsVertexId& position, const QgsPo
   {
     insertVertexBetween( position.vertex, position.vertex + 1, position.vertex - 1 );
   }
+  mBoundingBox = QgsRectangle(); //set bounding box invalid
   return true;
 }
 
@@ -749,6 +750,7 @@ bool QgsCircularStringV2::deleteVertex( const QgsVertexId& position )
     deleteVertex( position.vertex - 1 );
   }
 
+  mBoundingBox = QgsRectangle(); //set bounding box invalid
   return true;
 }
 

diff --git a/src/core/geometry/qgscompoundcurvev2.cpp b/src/core/geometry/qgscompoundcurvev2.cpp
@@ -467,7 +467,13 @@ bool QgsCompoundCurveV2::insertVertex( const QgsVertexId& position, const QgsPoi
   {
     return false;
   }
-  return mCurves[curveId]->insertVertex( curveIds.at( 0 ).second, vertex );
+
+  bool success = mCurves[curveId]->insertVertex( curveIds.at( 0 ).second, vertex );
+  if ( success )
+  {
+    mBoundingBox = QgsRectangle(); //bbox changed
+  }
+  return success;
 }
 
 bool QgsCompoundCurveV2::moveVertex( const QgsVertexId& position, const QgsPointV2& newPos )
@@ -478,8 +484,13 @@ bool QgsCompoundCurveV2::moveVertex( const QgsVertexId& position, const QgsPoint
   {
     mCurves[idIt->first]->moveVertex( idIt->second, newPos );
   }
-  mBoundingBox = QgsRectangle(); //bbox changed
-  return curveIds.size() > 0;
+
+  bool success = curveIds.size() > 0;
+  if ( success )
+  {
+    mBoundingBox = QgsRectangle(); //bbox changed
+  }
+  return success;
 }
 
 bool QgsCompoundCurveV2::deleteVertex( const QgsVertexId& position )
@@ -490,7 +501,13 @@ bool QgsCompoundCurveV2::deleteVertex( const QgsVertexId& position )
   {
     mCurves[idIt->first]->deleteVertex( idIt->second );
   }
-  return curveIds.size() > 0;
+
+  bool success = curveIds.size() > 0;
+  if ( success )
+  {
+    mBoundingBox = QgsRectangle(); //bbox changed
+  }
+  return success;
 }
 
 QList< QPair<int, QgsVertexId> > QgsCompoundCurveV2::curveVertexId( const QgsVertexId& id ) const

diff --git a/src/core/geometry/qgscurvepolygonv2.cpp b/src/core/geometry/qgscurvepolygonv2.cpp
@@ -580,13 +580,19 @@ bool QgsCurvePolygonV2::insertVertex( const QgsVertexId& vId, const QgsPointV2&
   QgsCurveV2* ring = vId.ring == 0 ? mExteriorRing : mInteriorRings[vId.ring - 1];
   int n = ring->numPoints();
   bool success = ring->insertVertex( QgsVertexId( 0, 0, vId.vertex ), vertex );
+  if ( !success )
+  {
+    return false;
+  }
+
   // If first or last vertex is inserted, re-sync the last/first vertex
   if ( vId.vertex == 0 )
     ring->moveVertex( QgsVertexId( 0, 0, n ), vertex );
   else if ( vId.vertex == n )
     ring->moveVertex( QgsVertexId( 0, 0, 0 ), vertex );
 
-  return success;
+  mBoundingBox = QgsRectangle();
+  return true;
 }
 
 bool QgsCurvePolygonV2::moveVertex( const QgsVertexId& vId, const QgsPointV2& newPos )

diff --git a/src/core/geometry/qgsgeometrycollectionv2.cpp b/src/core/geometry/qgsgeometrycollectionv2.cpp
@@ -367,7 +367,12 @@ bool QgsGeometryCollectionV2::insertVertex( const QgsVertexId& position, const Q
     return false;
   }
 
-  return mGeometries[position.part]->insertVertex( position, vertex );
+  bool success = mGeometries[position.part]->insertVertex( position, vertex );
+  if ( success )
+  {
+    mBoundingBox = QgsRectangle(); //set bounding box invalid
+  }
+  return success;
 }
 
 bool QgsGeometryCollectionV2::moveVertex( const QgsVertexId& position, const QgsPointV2& newPos )
@@ -377,7 +382,12 @@ bool QgsGeometryCollectionV2::moveVertex( const QgsVertexId& position, const Qgs
     return false;
   }
 
-  return mGeometries[position.part]->moveVertex( position, newPos );
+  bool success = mGeometries[position.part]->moveVertex( position, newPos );
+  if ( success )
+  {
+    mBoundingBox = QgsRectangle(); //set bounding box invalid
+  }
+  return success;
 }
 
 bool QgsGeometryCollectionV2::deleteVertex( const QgsVertexId& position )
@@ -401,6 +411,10 @@ bool QgsGeometryCollectionV2::deleteVertex( const QgsVertexId& position )
     removeGeometry( position.part );
   }
 
+  if ( success )
+  {
+    mBoundingBox = QgsRectangle(); //set bounding box invalid
+  }
   return success;
 }
 

diff --git a/src/core/geometry/qgslinestringv2.cpp b/src/core/geometry/qgslinestringv2.cpp
@@ -358,6 +358,7 @@ bool QgsLineStringV2::insertVertex( const QgsVertexId& position, const QgsPointV
   {
     mM.insert( position.vertex, vertex.m() );
   }
+  mBoundingBox = QgsRectangle(); //set bounding box invalid
   return true;
 }
 
@@ -397,6 +398,7 @@ bool QgsLineStringV2::deleteVertex( const QgsVertexId& position )
   {
     mM.remove( position.vertex );
   }
+  mBoundingBox = QgsRectangle(); //set bounding box invalid
   return true;
 }
 
@@ -416,6 +418,7 @@ void QgsLineStringV2::addVertex( const QgsPointV2& pt )
   {
     mM.append( pt.m() );
   }
+  mBoundingBox = QgsRectangle(); //set bounding box invalid
 }
 
 double QgsLineStringV2::closestSegment( const QgsPointV2& pt, QgsPointV2& segmentPt,  QgsVertexId& vertexAfter, bool* leftOf, double epsilon ) const

diff --git a/src/gui/qgsgeometryrubberband.cpp b/src/gui/qgsgeometryrubberband.cpp
@@ -22,7 +22,7 @@
 #include <QPainter>
 
 QgsGeometryRubberBand::QgsGeometryRubberBand( QgsMapCanvas* mapCanvas, QGis::GeometryType geomType ): QgsMapCanvasItem( mapCanvas ),
-    mGeometry( 0 ), mIconSize( 5 ), mIconType( ICON_CIRCLE ), mGeometryType( geomType )
+    mGeometry( 0 ), mIconSize( 5 ), mIconType( ICON_BOX ), mGeometryType( geomType )
 {
   mPen = QPen( QColor( 255, 0, 0 ) );
   mBrush = QBrush( QColor( 255, 0, 0 ) );