Merge pull request #811 from 3nids/fixrubber

NathanW2 · NathanW2 · commit 25e79f9f3bb0 · 2013-08-14T22:42:17.000-07:00
fix appearance of point rubber bands at small scales
diff --git a/src/gui/qgsrubberband.cpp b/src/gui/qgsrubberband.cpp
@@ -190,9 +190,9 @@ void QgsRubberBand::removePoint( int index, bool doUpdate/* = true*/, int geomet
   }
 }
 
-void QgsRubberBand::removeLastPoint( int geometryIndex )
+void QgsRubberBand::removeLastPoint( int geometryIndex, bool doUpdate/* = true*/ )
 {
-  removePoint( -1, true, geometryIndex );
+  removePoint( -1, doUpdate, geometryIndex );
 }
 
 /*!
@@ -272,6 +272,7 @@ void QgsRubberBand::addGeometry( QgsGeometry* geom, QgsVectorLayer* layer )
         pt = geom->asPoint();
       }
       addPoint( pt, false, idx );
+      removeLastPoint( idx , false );
     }
     break;
 
@@ -285,10 +286,12 @@ void QgsRubberBand::addGeometry( QgsGeometry* geom, QgsVectorLayer* layer )
         if ( layer )
         {
           addPoint( mr->layerToMapCoordinates( layer, pt ), false, idx );
+          removeLastPoint( idx , false );
         }
         else
         {
           addPoint( pt, false, idx );
+          removeLastPoint( idx , false );
         }
       }
     }
@@ -499,8 +502,10 @@ void QgsRubberBand::updateRect()
     {
       return;
     }
-    qreal s = ( mIconSize - 1 ) / 2;
-    qreal p = mPen.width();
+
+    qreal scale = mMapCanvas->mapUnitsPerPixel();
+    qreal s = ( mIconSize - 1 ) / 2 * scale;
+    qreal p = mPen.width() * scale;
 
     QgsRectangle r( it->x() + mTranslationOffsetX - s - p, it->y() + mTranslationOffsetY - s - p,
                     it->x() + mTranslationOffsetX + s + p, it->y() + mTranslationOffsetY + s + p );
diff --git a/src/gui/qgsrubberband.h b/src/gui/qgsrubberband.h
@@ -149,7 +149,7 @@ class GUI_EXPORT QgsRubberBand: public QgsMapCanvasItem
     /**
      * Removes the last point. Most useful in connection with undo operations
      */
-    void removeLastPoint( int geometryIndex = 0 );
+    void removeLastPoint( int geometryIndex = 0 , bool doUpdate = true );
 
     /**
      * Moves the rubber band point specified by index. Note that if the rubber band is

Original file line number	Diff line number	Diff line change
`@@ -190,9 +190,9 @@ void QgsRubberBand::removePoint( int index, bool doUpdate/* = true*/, int geomet`
`190`	`190`	`}`
`191`	`191`	`}`
`192`	`192`
`193`		`-void QgsRubberBand::removeLastPoint( int geometryIndex )`
	`193`	`+void QgsRubberBand::removeLastPoint( int geometryIndex, bool doUpdate/* = true*/ )`
`194`	`194`	`{`
`195`		`- removePoint( -1, true, geometryIndex );`
	`195`	`+ removePoint( -1, doUpdate, geometryIndex );`
`196`	`196`	`}`
`197`	`197`
`198`	`198`	`/*!`
`@@ -272,6 +272,7 @@ void QgsRubberBand::addGeometry( QgsGeometry* geom, QgsVectorLayer* layer )`
`272`	`272`	`pt = geom->asPoint();`
`273`	`273`	`}`
`274`	`274`	`addPoint( pt, false, idx );`
	`275`	`+ removeLastPoint( idx , false );`
`275`	`276`	`}`
`276`	`277`	`break;`
`277`	`278`
`@@ -285,10 +286,12 @@ void QgsRubberBand::addGeometry( QgsGeometry* geom, QgsVectorLayer* layer )`
`285`	`286`	`if ( layer )`
`286`	`287`	`{`
`287`	`288`	`addPoint( mr->layerToMapCoordinates( layer, pt ), false, idx );`
	`289`	`+ removeLastPoint( idx , false );`
`288`	`290`	`}`
`289`	`291`	`else`
`290`	`292`	`{`
`291`	`293`	`addPoint( pt, false, idx );`
	`294`	`+ removeLastPoint( idx , false );`
`292`	`295`	`}`
`293`	`296`	`}`
`294`	`297`	`}`
`@@ -499,8 +502,10 @@ void QgsRubberBand::updateRect()`
`499`	`502`	`{`
`500`	`503`	`return;`
`501`	`504`	`}`
`502`		`- qreal s = ( mIconSize - 1 ) / 2;`
`503`		`- qreal p = mPen.width();`
	`505`	`+`
	`506`	`+ qreal scale = mMapCanvas->mapUnitsPerPixel();`
	`507`	`+ qreal s = ( mIconSize - 1 ) / 2 * scale;`
	`508`	`+ qreal p = mPen.width() * scale;`
`504`	`509`
`505`	`510`	`QgsRectangle r( it->x() + mTranslationOffsetX - s - p, it->y() + mTranslationOffsetY - s - p,`
`506`	`511`	`it->x() + mTranslationOffsetX + s + p, it->y() + mTranslationOffsetY + s + p );`