@@ -298,27 +298,31 @@ void QgsLabelingGui::init()
298
298
// populate placement options
299
299
mCentroidRadioWhole ->setChecked ( lyr.centroidWhole );
300
300
mCentroidInsideCheckBox ->setChecked ( lyr.centroidInside );
301
+ mLineDistanceSpnBx ->setValue ( lyr.dist );
302
+ mLineDistanceUnitWidget ->setUnit ( lyr.distInMapUnits ? QgsSymbolV2::MapUnit : QgsSymbolV2::MM );
303
+ mLineDistanceUnitWidget ->setMapUnitScale ( lyr.distMapUnitScale );
304
+ mQuadrantBtnGrp ->button (( int )lyr.quadOffset )->setChecked ( true );
305
+ mPointOffsetXSpinBox ->setValue ( lyr.xOffset );
306
+ mPointOffsetYSpinBox ->setValue ( lyr.yOffset );
307
+ mPointOffsetUnitWidget ->setUnit ( lyr.labelOffsetInMapUnits ? QgsSymbolV2::MapUnit : QgsSymbolV2::MM );
308
+ mPointOffsetUnitWidget ->setMapUnitScale ( lyr.labelOffsetMapUnitScale );
309
+ mPointAngleSpinBox ->setValue ( lyr.angleOffset );
310
+ chkLineAbove->setChecked ( lyr.placementFlags & QgsPalLayerSettings::AboveLine );
311
+ chkLineBelow->setChecked ( lyr.placementFlags & QgsPalLayerSettings::BelowLine );
312
+ chkLineOn->setChecked ( lyr.placementFlags & QgsPalLayerSettings::OnLine );
313
+ if ( !( lyr.placementFlags & QgsPalLayerSettings::MapOrientation ) )
314
+ chkLineOrientationDependent->setChecked ( true );
315
+
301
316
switch ( lyr.placement )
302
317
{
303
318
case QgsPalLayerSettings::AroundPoint:
304
319
radAroundPoint->setChecked ( true );
305
320
radAroundCentroid->setChecked ( true );
306
-
307
- mLineDistanceSpnBx ->setValue ( lyr.dist );
308
- mLineDistanceUnitWidget ->setUnit ( lyr.distInMapUnits ? QgsSymbolV2::MapUnit : QgsSymbolV2::MM );
309
- mLineDistanceUnitWidget ->setMapUnitScale ( lyr.distMapUnitScale );
310
321
// spinAngle->setValue( lyr.angle ); // TODO: uncomment when supported
311
322
break ;
312
323
case QgsPalLayerSettings::OverPoint:
313
324
radOverPoint->setChecked ( true );
314
325
radOverCentroid->setChecked ( true );
315
-
316
- mQuadrantBtnGrp ->button (( int )lyr.quadOffset )->setChecked ( true );
317
- mPointOffsetXSpinBox ->setValue ( lyr.xOffset );
318
- mPointOffsetYSpinBox ->setValue ( lyr.yOffset );
319
- mPointOffsetUnitWidget ->setUnit ( lyr.labelOffsetInMapUnits ? QgsSymbolV2::MapUnit : QgsSymbolV2::MM );
320
- mPointOffsetUnitWidget ->setMapUnitScale ( lyr.labelOffsetMapUnitScale );
321
- mPointAngleSpinBox ->setValue ( lyr.angleOffset );
322
326
break ;
323
327
case QgsPalLayerSettings::Line:
324
328
radLineParallel->setChecked ( true );
@@ -336,18 +340,6 @@ void QgsLabelingGui::init()
336
340
break ;
337
341
}
338
342
339
- if ( lyr.placement == QgsPalLayerSettings::Line || lyr.placement == QgsPalLayerSettings::Curved )
340
- {
341
- mLineDistanceSpnBx ->setValue ( lyr.dist );
342
- mLineDistanceUnitWidget ->setUnit ( lyr.distInMapUnits ? QgsSymbolV2::MapUnit : QgsSymbolV2::MM );
343
- mLineDistanceUnitWidget ->setMapUnitScale ( lyr.distMapUnitScale );
344
- chkLineAbove->setChecked ( lyr.placementFlags & QgsPalLayerSettings::AboveLine );
345
- chkLineBelow->setChecked ( lyr.placementFlags & QgsPalLayerSettings::BelowLine );
346
- chkLineOn->setChecked ( lyr.placementFlags & QgsPalLayerSettings::OnLine );
347
- if ( !( lyr.placementFlags & QgsPalLayerSettings::MapOrientation ) )
348
- chkLineOrientationDependent->setChecked ( true );
349
- }
350
-
351
343
// Label repeat distance
352
344
mRepeatDistanceSpinBox ->setValue ( lyr.repeatDistance );
353
345
mRepeatDistanceUnitWidget ->setUnit ( lyr.repeatDistanceUnit == QgsPalLayerSettings::MapUnits ? QgsSymbolV2::MapUnit : QgsSymbolV2::MM );
@@ -586,43 +578,39 @@ QgsPalLayerSettings QgsLabelingGui::layerSettings()
586
578
QWidget* curPlacementWdgt = stackedPlacement->currentWidget ();
587
579
lyr.centroidWhole = mCentroidRadioWhole ->isChecked ();
588
580
lyr.centroidInside = mCentroidInsideCheckBox ->isChecked ();
581
+ lyr.dist = mLineDistanceSpnBx ->value ();
582
+ lyr.distInMapUnits = ( mLineDistanceUnitWidget ->unit () == QgsSymbolV2::MapUnit );
583
+ lyr.distMapUnitScale = mLineDistanceUnitWidget ->getMapUnitScale ();
584
+ lyr.quadOffset = ( QgsPalLayerSettings::QuadrantPosition )mQuadrantBtnGrp ->checkedId ();
585
+ lyr.xOffset = mPointOffsetXSpinBox ->value ();
586
+ lyr.yOffset = mPointOffsetYSpinBox ->value ();
587
+ lyr.labelOffsetInMapUnits = ( mPointOffsetUnitWidget ->unit () == QgsSymbolV2::MapUnit );
588
+ lyr.labelOffsetMapUnitScale = mPointOffsetUnitWidget ->getMapUnitScale ();
589
+ lyr.angleOffset = mPointAngleSpinBox ->value ();
590
+ if ( chkLineAbove->isChecked () )
591
+ lyr.placementFlags |= QgsPalLayerSettings::AboveLine;
592
+ if ( chkLineBelow->isChecked () )
593
+ lyr.placementFlags |= QgsPalLayerSettings::BelowLine;
594
+ if ( chkLineOn->isChecked () )
595
+ lyr.placementFlags |= QgsPalLayerSettings::OnLine;
596
+ if ( ! chkLineOrientationDependent->isChecked () )
597
+ lyr.placementFlags |= QgsPalLayerSettings::MapOrientation;
589
598
if (( curPlacementWdgt == pagePoint && radAroundPoint->isChecked () )
590
599
|| ( curPlacementWdgt == pagePolygon && radAroundCentroid->isChecked () ) )
591
600
{
592
601
lyr.placement = QgsPalLayerSettings::AroundPoint;
593
- lyr.dist = mLineDistanceSpnBx ->value ();
594
- lyr.distInMapUnits = ( mLineDistanceUnitWidget ->unit () == QgsSymbolV2::MapUnit );
595
- lyr.distMapUnitScale = mLineDistanceUnitWidget ->getMapUnitScale ();
596
602
}
597
603
else if (( curPlacementWdgt == pagePoint && radOverPoint->isChecked () )
598
604
|| ( curPlacementWdgt == pagePolygon && radOverCentroid->isChecked () ) )
599
605
{
600
606
lyr.placement = QgsPalLayerSettings::OverPoint;
601
- lyr.quadOffset = ( QgsPalLayerSettings::QuadrantPosition )mQuadrantBtnGrp ->checkedId ();
602
- lyr.xOffset = mPointOffsetXSpinBox ->value ();
603
- lyr.yOffset = mPointOffsetYSpinBox ->value ();
604
- lyr.labelOffsetInMapUnits = ( mPointOffsetUnitWidget ->unit () == QgsSymbolV2::MapUnit );
605
- lyr.labelOffsetMapUnitScale = mPointOffsetUnitWidget ->getMapUnitScale ();
606
- lyr.angleOffset = mPointAngleSpinBox ->value ();
607
607
}
608
608
else if (( curPlacementWdgt == pageLine && radLineParallel->isChecked () )
609
609
|| ( curPlacementWdgt == pagePolygon && radPolygonPerimeter->isChecked () )
610
610
|| ( curPlacementWdgt == pageLine && radLineCurved->isChecked () ) )
611
611
{
612
612
bool curved = ( curPlacementWdgt == pageLine && radLineCurved->isChecked () );
613
613
lyr.placement = ( curved ? QgsPalLayerSettings::Curved : QgsPalLayerSettings::Line );
614
- lyr.dist = mLineDistanceSpnBx ->value ();
615
- lyr.distInMapUnits = ( mLineDistanceUnitWidget ->unit () == QgsSymbolV2::MapUnit );
616
- lyr.distMapUnitScale = mLineDistanceUnitWidget ->getMapUnitScale ();
617
- if ( chkLineAbove->isChecked () )
618
- lyr.placementFlags |= QgsPalLayerSettings::AboveLine;
619
- if ( chkLineBelow->isChecked () )
620
- lyr.placementFlags |= QgsPalLayerSettings::BelowLine;
621
- if ( chkLineOn->isChecked () )
622
- lyr.placementFlags |= QgsPalLayerSettings::OnLine;
623
-
624
- if ( ! chkLineOrientationDependent->isChecked () )
625
- lyr.placementFlags |= QgsPalLayerSettings::MapOrientation;
626
614
}
627
615
else if (( curPlacementWdgt == pageLine && radLineHorizontal->isChecked () )
628
616
|| ( curPlacementWdgt == pagePolygon && radPolygonHorizontal->isChecked () ) )
0 commit comments