16
16
17
17
#include " qgshighlight.h"
18
18
#include " qgsgeometry.h"
19
- #include " qgslogger.h"
20
19
#include " qgsmapcanvas.h"
21
20
#include " qgsmaprenderer.h"
22
21
#include " qgsvectorlayer.h"
@@ -31,7 +30,6 @@ QgsHighlight::QgsHighlight( QgsMapCanvas* mapCanvas, QgsGeometry *geom, QgsVecto
31
30
: QgsMapCanvasItem( mapCanvas )
32
31
, mLayer( layer )
33
32
{
34
- QgsDebugMsg ( geom ? " geometry!" : " no geometry" );
35
33
mGeometry = geom ? new QgsGeometry ( *geom ) : 0 ;
36
34
updateRect ();
37
35
update ();
@@ -66,13 +64,12 @@ void QgsHighlight::paintPoint( QPainter *p, QgsPoint point )
66
64
{
67
65
QPolygonF r ( 5 );
68
66
69
- double d = mMapCanvas ->extent ().width () * 0.005 ;
70
-
71
67
if ( mLayer )
72
68
{
73
69
point = mMapCanvas ->mapRenderer ()->layerToMapCoordinates ( mLayer , point );
74
70
}
75
71
72
+ double d = mMapCanvas ->extent ().width () * 0.005 ;
76
73
r[0 ] = toCanvasCoordinates ( point + QgsVector ( -d, -d ) ) - pos ();
77
74
r[1 ] = toCanvasCoordinates ( point + QgsVector ( d, -d ) ) - pos ();
78
75
r[2 ] = toCanvasCoordinates ( point + QgsVector ( d, d ) ) - pos ();
@@ -129,7 +126,6 @@ void QgsHighlight::paintPolygon( QPainter *p, QgsPolygon polygon )
129
126
poly = ring;
130
127
else
131
128
poly = poly.subtracted ( ring );
132
-
133
129
}
134
130
135
131
// just fill, no outline
@@ -143,11 +139,8 @@ void QgsHighlight::paintPolygon( QPainter *p, QgsPolygon polygon )
143
139
*/
144
140
void QgsHighlight::paint ( QPainter* p )
145
141
{
146
- QgsDebugMsg ( " entered." );
147
-
148
142
if ( !mGeometry )
149
143
{
150
- QgsDebugMsg ( " no geometry." );
151
144
return ;
152
145
}
153
146
@@ -229,7 +222,7 @@ void QgsHighlight::updateRect()
229
222
r.setXMinimum ( r.xMinimum () - d );
230
223
r.setYMinimum ( r.yMinimum () - d );
231
224
r.setXMaximum ( r.xMaximum () + d );
232
- r.setXMaximum ( r.yMaximum () + d );
225
+ r.setYMaximum ( r.yMaximum () + d );
233
226
}
234
227
235
228
setRect ( r );
@@ -239,6 +232,4 @@ void QgsHighlight::updateRect()
239
232
{
240
233
setRect ( QgsRectangle () );
241
234
}
242
-
243
235
}
244
-
0 commit comments