@@ -94,12 +94,12 @@ void QgsMapToolAnnotation::canvasPressEvent( QgsMapMouseEvent *e )
94
94
return ;
95
95
}
96
96
97
- mLastMousePosition = e->posF ();
97
+ mLastMousePosition = e->pos ();
98
98
99
99
QgsMapCanvasAnnotationItem *item = selectedItem ();
100
100
if ( item )
101
101
{
102
- mCurrentMoveAction = item->moveActionForPosition ( e->posF () );
102
+ mCurrentMoveAction = item->moveActionForPosition ( e->pos () );
103
103
if ( mCurrentMoveAction != QgsMapCanvasAnnotationItem::NoAction )
104
104
{
105
105
return ;
@@ -110,7 +110,7 @@ void QgsMapToolAnnotation::canvasPressEvent( QgsMapMouseEvent *e )
110
110
{
111
111
// select a new item if there is one at this position
112
112
mCanvas ->scene ()->clearSelection ();
113
- QgsMapCanvasAnnotationItem *existingItem = itemAtPos ( e->posF () );
113
+ QgsMapCanvasAnnotationItem *existingItem = itemAtPos ( e->pos () );
114
114
if ( existingItem )
115
115
{
116
116
existingItem->setSelected ( true );
@@ -124,8 +124,8 @@ void QgsMapToolAnnotation::canvasPressEvent( QgsMapMouseEvent *e )
124
124
QgsPointXY mapPos = transformCanvasToAnnotation ( toMapCoordinates ( e->pos () ), annotation );
125
125
annotation->setMapPosition ( mapPos );
126
126
annotation->setMapPositionCrs ( mCanvas ->mapSettings ().destinationCrs () );
127
- annotation->setRelativePosition ( QPointF ( e->posF ().x () / mCanvas ->width (),
128
- e->posF ().y () / mCanvas ->height () ) );
127
+ annotation->setRelativePosition ( QPointF ( e->pos ().x () / mCanvas ->width (),
128
+ e->pos ().y () / mCanvas ->height () ) );
129
129
annotation->setFrameSize ( QSizeF ( 200 , 100 ) );
130
130
131
131
QgsProject::instance ()->annotationManager ()->addAnnotation ( annotation );
@@ -184,17 +184,17 @@ void QgsMapToolAnnotation::canvasMoveEvent( QgsMapMouseEvent *e )
184
184
{
185
185
QgsPointXY mapPos = transformCanvasToAnnotation ( e->snapPoint (), annotation );
186
186
annotation->setMapPosition ( mapPos );
187
- annotation->setRelativePosition ( QPointF ( e->posF ().x () / mCanvas ->width (),
188
- e->posF ().y () / mCanvas ->height () ) );
187
+ annotation->setRelativePosition ( QPointF ( e->pos ().x () / mCanvas ->width (),
188
+ e->pos ().y () / mCanvas ->height () ) );
189
189
item->update ();
190
190
QgsProject::instance ()->setDirty ( true );
191
191
}
192
192
else if ( mCurrentMoveAction == QgsMapCanvasAnnotationItem::MoveFramePosition )
193
193
{
194
- QPointF newCanvasPos = item->pos () + ( e->posF () - mLastMousePosition );
194
+ QPointF newCanvasPos = item->pos () + ( e->pos () - mLastMousePosition );
195
195
if ( annotation->hasFixedMapPosition () )
196
196
{
197
- annotation->setFrameOffsetFromReferencePoint ( annotation->frameOffsetFromReferencePoint () + ( e->posF () - mLastMousePosition ) );
197
+ annotation->setFrameOffsetFromReferencePoint ( annotation->frameOffsetFromReferencePoint () + ( e->pos () - mLastMousePosition ) );
198
198
annotation->setRelativePosition ( QPointF ( newCanvasPos.x () / mCanvas ->width (),
199
199
newCanvasPos.y () / mCanvas ->height () ) );
200
200
}
@@ -223,27 +223,27 @@ void QgsMapToolAnnotation::canvasMoveEvent( QgsMapMouseEvent *e )
223
223
mCurrentMoveAction == QgsMapCanvasAnnotationItem::ResizeFrameRightDown ||
224
224
mCurrentMoveAction == QgsMapCanvasAnnotationItem::ResizeFrameRightUp )
225
225
{
226
- xmax += e->posF ().x () - mLastMousePosition .x ();
226
+ xmax += e->pos ().x () - mLastMousePosition .x ();
227
227
}
228
228
if ( mCurrentMoveAction == QgsMapCanvasAnnotationItem::ResizeFrameLeft ||
229
229
mCurrentMoveAction == QgsMapCanvasAnnotationItem::ResizeFrameLeftDown ||
230
230
mCurrentMoveAction == QgsMapCanvasAnnotationItem::ResizeFrameLeftUp )
231
231
{
232
- xmin += e->posF ().x () - mLastMousePosition .x ();
233
- relPosX = ( relPosX * mCanvas ->width () + e->posF ().x () - mLastMousePosition .x () ) / ( double )mCanvas ->width ();
232
+ xmin += e->pos ().x () - mLastMousePosition .x ();
233
+ relPosX = ( relPosX * mCanvas ->width () + e->pos ().x () - mLastMousePosition .x () ) / ( double )mCanvas ->width ();
234
234
}
235
235
if ( mCurrentMoveAction == QgsMapCanvasAnnotationItem::ResizeFrameUp ||
236
236
mCurrentMoveAction == QgsMapCanvasAnnotationItem::ResizeFrameLeftUp ||
237
237
mCurrentMoveAction == QgsMapCanvasAnnotationItem::ResizeFrameRightUp )
238
238
{
239
- ymin += e->posF ().y () - mLastMousePosition .y ();
240
- relPosY = ( relPosY * mCanvas ->height () + e->posF ().y () - mLastMousePosition .y () ) / ( double )mCanvas ->height ();
239
+ ymin += e->pos ().y () - mLastMousePosition .y ();
240
+ relPosY = ( relPosY * mCanvas ->height () + e->pos ().y () - mLastMousePosition .y () ) / ( double )mCanvas ->height ();
241
241
}
242
242
if ( mCurrentMoveAction == QgsMapCanvasAnnotationItem::ResizeFrameDown ||
243
243
mCurrentMoveAction == QgsMapCanvasAnnotationItem::ResizeFrameLeftDown ||
244
244
mCurrentMoveAction == QgsMapCanvasAnnotationItem::ResizeFrameRightDown )
245
245
{
246
- ymax += e->posF ().y () - mLastMousePosition .y ();
246
+ ymax += e->pos ().y () - mLastMousePosition .y ();
247
247
}
248
248
249
249
// switch min / max if necessary
@@ -270,18 +270,18 @@ void QgsMapToolAnnotation::canvasMoveEvent( QgsMapMouseEvent *e )
270
270
}
271
271
else if ( item )
272
272
{
273
- QgsMapCanvasAnnotationItem::MouseMoveAction moveAction = item->moveActionForPosition ( e->posF () );
273
+ QgsMapCanvasAnnotationItem::MouseMoveAction moveAction = item->moveActionForPosition ( e->pos () );
274
274
if ( mCanvas )
275
275
{
276
276
mCanvas ->setCursor ( QCursor ( item->cursorShapeForAction ( moveAction ) ) );
277
277
}
278
278
}
279
- mLastMousePosition = e->posF ();
279
+ mLastMousePosition = e->pos ();
280
280
}
281
281
282
282
void QgsMapToolAnnotation::canvasDoubleClickEvent ( QgsMapMouseEvent *e )
283
283
{
284
- QgsMapCanvasAnnotationItem *item = itemAtPos ( e->posF () );
284
+ QgsMapCanvasAnnotationItem *item = itemAtPos ( e->pos () );
285
285
if ( !item )
286
286
{
287
287
return ;
0 commit comments