fix mixing pixels and map units in calculation of update rectangle

3nids · 3nids · commit 93a5879f860d · 2013-08-15T07:38:06.000+02:00
diff --git a/src/gui/qgsrubberband.cpp b/src/gui/qgsrubberband.cpp
@@ -502,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 );

Original file line number	Diff line number	Diff line change
`@@ -502,8 +502,10 @@ void QgsRubberBand::updateRect()`
`502`	`502`	`{`
`503`	`503`	`return;`
`504`	`504`	`}`
`505`		`- qreal s = ( mIconSize - 1 ) / 2;`
`506`		`- qreal p = mPen.width();`
	`505`	`+`
	`506`	`+ qreal scale = mMapCanvas->mapUnitsPerPixel();`
	`507`	`+ qreal s = ( mIconSize - 1 ) / 2 * scale;`
	`508`	`+ qreal p = mPen.width() * scale;`
`507`	`509`
`508`	`510`	`QgsRectangle r( it->x() + mTranslationOffsetX - s - p, it->y() + mTranslationOffsetY - s - p,`
`509`	`511`	`it->x() + mTranslationOffsetX + s + p, it->y() + mTranslationOffsetY + s + p );`