@@ -313,7 +313,7 @@ int FeaturePart::createCandidatesAtOrderedPositionsOverPoint( double x, double y
313
313
double labelWidth = getLabelWidth ();
314
314
double labelHeight = getLabelHeight ();
315
315
double distanceToLabel = getLabelDistance ();
316
- const QgsLabelFeature::VisualMargin & visualMargin = mLF ->visualMargin ();
316
+ const QgsMargins & visualMargin = mLF ->visualMargin ();
317
317
318
318
double symbolWidthOffset = ( mLF ->offsetType () == QgsPalLayerSettings::FromSymbolBounds ? mLF ->symbolSize ().width () / 2.0 : 0.0 );
319
319
double symbolHeightOffset = ( mLF ->offsetType () == QgsPalLayerSettings::FromSymbolBounds ? mLF ->symbolSize ().height () / 2.0 : 0.0 );
@@ -331,85 +331,85 @@ int FeaturePart::createCandidatesAtOrderedPositionsOverPoint( double x, double y
331
331
case QgsPalLayerSettings::TopLeft:
332
332
quadrant = LabelPosition::QuadrantAboveLeft;
333
333
alpha = 3 * M_PI_4;
334
- deltaX = -labelWidth + visualMargin.right - symbolWidthOffset;
335
- deltaY = -visualMargin.bottom + symbolHeightOffset;
334
+ deltaX = -labelWidth + visualMargin.right () - symbolWidthOffset;
335
+ deltaY = -visualMargin.bottom () + symbolHeightOffset;
336
336
break ;
337
337
338
338
case QgsPalLayerSettings::TopSlightlyLeft:
339
339
quadrant = LabelPosition::QuadrantAboveRight; // right quadrant, so labels are left-aligned
340
340
alpha = M_PI_2;
341
- deltaX = -labelWidth / 4.0 - visualMargin.left ;
342
- deltaY = -visualMargin.bottom + symbolHeightOffset;
341
+ deltaX = -labelWidth / 4.0 - visualMargin.left () ;
342
+ deltaY = -visualMargin.bottom () + symbolHeightOffset;
343
343
break ;
344
344
345
345
case QgsPalLayerSettings::TopMiddle:
346
346
quadrant = LabelPosition::QuadrantAbove;
347
347
alpha = M_PI_2;
348
348
deltaX = -labelWidth / 2.0 ;
349
- deltaY = -visualMargin.bottom + symbolHeightOffset;
349
+ deltaY = -visualMargin.bottom () + symbolHeightOffset;
350
350
break ;
351
351
352
352
case QgsPalLayerSettings::TopSlightlyRight:
353
353
quadrant = LabelPosition::QuadrantAboveLeft; // left quadrant, so labels are right-aligned
354
354
alpha = M_PI_2;
355
- deltaX = -labelWidth * 3.0 / 4.0 + visualMargin.right ;
356
- deltaY = -visualMargin.bottom + symbolHeightOffset;
355
+ deltaX = -labelWidth * 3.0 / 4.0 + visualMargin.right () ;
356
+ deltaY = -visualMargin.bottom () + symbolHeightOffset;
357
357
break ;
358
358
359
359
case QgsPalLayerSettings::TopRight:
360
360
quadrant = LabelPosition::QuadrantAboveRight;
361
361
alpha = M_PI_4;
362
- deltaX = - visualMargin.left + symbolWidthOffset;
363
- deltaY = -visualMargin.bottom + symbolHeightOffset;
362
+ deltaX = - visualMargin.left () + symbolWidthOffset;
363
+ deltaY = -visualMargin.bottom () + symbolHeightOffset;
364
364
break ;
365
365
366
366
case QgsPalLayerSettings::MiddleLeft:
367
367
quadrant = LabelPosition::QuadrantLeft;
368
368
alpha = M_PI;
369
- deltaX = -labelWidth + visualMargin.right - symbolWidthOffset;
369
+ deltaX = -labelWidth + visualMargin.right () - symbolWidthOffset;
370
370
deltaY = -labelHeight / 2.0 ;// TODO - should this be adjusted by visual margin??
371
371
break ;
372
372
373
373
case QgsPalLayerSettings::MiddleRight:
374
374
quadrant = LabelPosition::QuadrantRight;
375
375
alpha = 0.0 ;
376
- deltaX = -visualMargin.left + symbolWidthOffset;
376
+ deltaX = -visualMargin.left () + symbolWidthOffset;
377
377
deltaY = -labelHeight / 2.0 ;// TODO - should this be adjusted by visual margin??
378
378
break ;
379
379
380
380
case QgsPalLayerSettings::BottomLeft:
381
381
quadrant = LabelPosition::QuadrantBelowLeft;
382
382
alpha = 5 * M_PI_4;
383
- deltaX = -labelWidth + visualMargin.right - symbolWidthOffset;
384
- deltaY = -labelHeight + visualMargin.top - symbolHeightOffset;
383
+ deltaX = -labelWidth + visualMargin.right () - symbolWidthOffset;
384
+ deltaY = -labelHeight + visualMargin.top () - symbolHeightOffset;
385
385
break ;
386
386
387
387
case QgsPalLayerSettings::BottomSlightlyLeft:
388
388
quadrant = LabelPosition::QuadrantBelowRight; // right quadrant, so labels are left-aligned
389
389
alpha = 3 * M_PI_2;
390
- deltaX = -labelWidth / 4.0 - visualMargin.left ;
391
- deltaY = -labelHeight + visualMargin.top - symbolHeightOffset;
390
+ deltaX = -labelWidth / 4.0 - visualMargin.left () ;
391
+ deltaY = -labelHeight + visualMargin.top () - symbolHeightOffset;
392
392
break ;
393
393
394
394
case QgsPalLayerSettings::BottomMiddle:
395
395
quadrant = LabelPosition::QuadrantBelow;
396
396
alpha = 3 * M_PI_2;
397
397
deltaX = -labelWidth / 2.0 ;
398
- deltaY = -labelHeight + visualMargin.top - symbolHeightOffset;
398
+ deltaY = -labelHeight + visualMargin.top () - symbolHeightOffset;
399
399
break ;
400
400
401
401
case QgsPalLayerSettings::BottomSlightlyRight:
402
402
quadrant = LabelPosition::QuadrantBelowLeft; // left quadrant, so labels are right-aligned
403
403
alpha = 3 * M_PI_2;
404
- deltaX = -labelWidth * 3.0 / 4.0 + visualMargin.right ;
405
- deltaY = -labelHeight + visualMargin.top - symbolHeightOffset;
404
+ deltaX = -labelWidth * 3.0 / 4.0 + visualMargin.right () ;
405
+ deltaY = -labelHeight + visualMargin.top () - symbolHeightOffset;
406
406
break ;
407
407
408
408
case QgsPalLayerSettings::BottomRight:
409
409
quadrant = LabelPosition::QuadrantBelowRight;
410
410
alpha = 7 * M_PI_4;
411
- deltaX = -visualMargin.left + symbolWidthOffset;
412
- deltaY = -labelHeight + visualMargin.top - symbolHeightOffset;
411
+ deltaX = -visualMargin.left () + symbolWidthOffset;
412
+ deltaY = -labelHeight + visualMargin.top () - symbolHeightOffset;
413
413
break ;
414
414
}
415
415
0 commit comments