Fix callout rendering to rotated labels

Fixes #36681
qgis · Jun 11, 2020 · 2bb4aad · 2bb4aad
1 parent ef19911
commit 2bb4aad
Show file tree

Hide file tree

Showing 11 changed files with 178 additions and 12 deletions.
diff --git a/src/core/callouts/qgscallout.cpp b/src/core/callouts/qgscallout.cpp
@@ -254,32 +254,53 @@ QgsCallout::LabelAnchorPoint QgsCallout::decodeLabelAnchorPoint( const QString &
   return LabelPointOnExterior;
 }
 
-QgsGeometry QgsCallout::labelAnchorGeometry( QRectF rect, const double, LabelAnchorPoint anchor ) const
+QgsGeometry QgsCallout::labelAnchorGeometry( QRectF rect, const double angle, LabelAnchorPoint anchor ) const
 {
-  QgsGeometry label( QgsGeometry::fromRect( rect ) );
+  QgsGeometry label;
   switch ( anchor )
   {
     case LabelPointOnExterior:
-      return label;
+      label = QgsGeometry::fromRect( rect );
+      break;
+
     case LabelCentroid:
-      return label.centroid();
+      label = QgsGeometry::fromRect( rect ).centroid();
+      break;
+
     case LabelTopLeft:
-      return QgsGeometry::fromPointXY( QgsPointXY( rect.bottomLeft() ) );
+      label = QgsGeometry::fromPointXY( QgsPointXY( rect.bottomLeft() ) );
+      break;
+
     case LabelTopMiddle:
-      return QgsGeometry::fromPointXY( QgsPointXY( ( rect.left() + rect.right() ) / 2.0, rect.bottom() ) );
+      label = QgsGeometry::fromPointXY( QgsPointXY( ( rect.left() + rect.right() ) / 2.0, rect.bottom() ) );
+      break;
+
     case LabelTopRight:
-      return QgsGeometry::fromPointXY( QgsPointXY( rect.bottomRight() ) );
+      label = QgsGeometry::fromPointXY( QgsPointXY( rect.bottomRight() ) );
+      break;
+
     case LabelMiddleLeft:
-      return QgsGeometry::fromPointXY( QgsPointXY( rect.left(), ( rect.top() + rect.bottom() ) / 2.0 ) );
+      label = QgsGeometry::fromPointXY( QgsPointXY( rect.left(), ( rect.top() + rect.bottom() ) / 2.0 ) );
+      break;
+
     case LabelMiddleRight:
-      return QgsGeometry::fromPointXY( QgsPointXY( rect.right(), ( rect.top() + rect.bottom() ) / 2.0 ) );
+      label = QgsGeometry::fromPointXY( QgsPointXY( rect.right(), ( rect.top() + rect.bottom() ) / 2.0 ) );
+      break;
+
     case LabelBottomLeft:
-      return QgsGeometry::fromPointXY( QgsPointXY( rect.topLeft() ) );
+      label = QgsGeometry::fromPointXY( QgsPointXY( rect.topLeft() ) );
+      break;
+
     case LabelBottomMiddle:
-      return QgsGeometry::fromPointXY( QgsPointXY( ( rect.left() + rect.right() ) / 2.0, rect.top() ) );
+      label = QgsGeometry::fromPointXY( QgsPointXY( ( rect.left() + rect.right() ) / 2.0, rect.top() ) );
+      break;
+
     case LabelBottomRight:
-      return QgsGeometry::fromPointXY( QgsPointXY( rect.topRight() ) );
+      label = QgsGeometry::fromPointXY( QgsPointXY( rect.topRight() ) );
+      break;
   }
+
+  label.rotate( angle, rect.topLeft() );
   return label;
 }
 

diff --git a/tests/src/core/testqgscallout.cpp b/tests/src/core/testqgscallout.cpp
@@ -999,6 +999,23 @@ void TestQgsCallout::calloutLabelAnchorTopRight()
   p.end();
 
   QVERIFY( imageCheck( "callout_label_anchor_top_right", img, 20 ) );
+
+  img = job.renderedImage();
+  p.begin( &img );
+  settings.placement = QgsPalLayerSettings::OverPoint;
+  settings.xOffset = 6;
+  settings.yOffset = -6;
+  settings.dataDefinedProperties().setProperty( QgsPalLayerSettings::LabelRotation, QgsProperty::fromValue( 15 ) );
+  vl->setLabeling( new QgsVectorLayerSimpleLabeling( settings ) );  // TODO: this should not be necessary!
+
+  QgsDefaultLabelingEngine engine2;
+  engine2.setMapSettings( mapSettings );
+  engine2.addProvider( new QgsVectorLayerLabelProvider( vl, QString(), true, &settings ) );
+  //engine.setFlags( QgsLabelingEngine::RenderOutlineLabels | QgsLabelingEngine::DrawLabelRectOnly );
+  engine2.run( context );
+  p.end();
+  QVERIFY( imageCheck( "callout_label_anchor_top_right_rotated", img, 20 ) );
+
 }
 
 void TestQgsCallout::calloutLabelAnchorTopLeft()
@@ -1051,6 +1068,22 @@ void TestQgsCallout::calloutLabelAnchorTopLeft()
   p.end();
 
   QVERIFY( imageCheck( "callout_label_anchor_top_left", img, 20 ) );
+
+  img = job.renderedImage();
+  p.begin( &img );
+  settings.placement = QgsPalLayerSettings::OverPoint;
+  settings.xOffset = 6;
+  settings.yOffset = -6;
+  settings.dataDefinedProperties().setProperty( QgsPalLayerSettings::LabelRotation, QgsProperty::fromValue( 15 ) );
+  vl->setLabeling( new QgsVectorLayerSimpleLabeling( settings ) );  // TODO: this should not be necessary!
+
+  QgsDefaultLabelingEngine engine2;
+  engine2.setMapSettings( mapSettings );
+  engine2.addProvider( new QgsVectorLayerLabelProvider( vl, QString(), true, &settings ) );
+  //engine.setFlags( QgsLabelingEngine::RenderOutlineLabels | QgsLabelingEngine::DrawLabelRectOnly );
+  engine2.run( context );
+  p.end();
+  QVERIFY( imageCheck( "callout_label_anchor_top_left_rotated", img, 20 ) );
 }
 
 void TestQgsCallout::calloutLabelAnchorTop()
@@ -1103,6 +1136,22 @@ void TestQgsCallout::calloutLabelAnchorTop()
   p.end();
 
   QVERIFY( imageCheck( "callout_label_anchor_top_middle", img, 20 ) );
+
+  img = job.renderedImage();
+  p.begin( &img );
+  settings.placement = QgsPalLayerSettings::OverPoint;
+  settings.xOffset = 6;
+  settings.yOffset = -6;
+  settings.dataDefinedProperties().setProperty( QgsPalLayerSettings::LabelRotation, QgsProperty::fromValue( 15 ) );
+  vl->setLabeling( new QgsVectorLayerSimpleLabeling( settings ) );  // TODO: this should not be necessary!
+
+  QgsDefaultLabelingEngine engine2;
+  engine2.setMapSettings( mapSettings );
+  engine2.addProvider( new QgsVectorLayerLabelProvider( vl, QString(), true, &settings ) );
+  //engine.setFlags( QgsLabelingEngine::RenderOutlineLabels | QgsLabelingEngine::DrawLabelRectOnly );
+  engine2.run( context );
+  p.end();
+  QVERIFY( imageCheck( "callout_label_anchor_top_middle_rotated", img, 20 ) );
 }
 
 void TestQgsCallout::calloutLabelAnchorBottomLeft()
@@ -1155,6 +1204,22 @@ void TestQgsCallout::calloutLabelAnchorBottomLeft()
   p.end();
 
   QVERIFY( imageCheck( "callout_label_anchor_bottom_left", img, 20 ) );
+
+  img = job.renderedImage();
+  p.begin( &img );
+  settings.placement = QgsPalLayerSettings::OverPoint;
+  settings.xOffset = 6;
+  settings.yOffset = -6;
+  settings.dataDefinedProperties().setProperty( QgsPalLayerSettings::LabelRotation, QgsProperty::fromValue( 15 ) );
+  vl->setLabeling( new QgsVectorLayerSimpleLabeling( settings ) );  // TODO: this should not be necessary!
+
+  QgsDefaultLabelingEngine engine2;
+  engine2.setMapSettings( mapSettings );
+  engine2.addProvider( new QgsVectorLayerLabelProvider( vl, QString(), true, &settings ) );
+  //engine.setFlags( QgsLabelingEngine::RenderOutlineLabels | QgsLabelingEngine::DrawLabelRectOnly );
+  engine2.run( context );
+  p.end();
+  QVERIFY( imageCheck( "callout_label_anchor_bottom_left_rotated", img, 20 ) );
 }
 
 void TestQgsCallout::calloutLabelAnchorBottom()
@@ -1207,6 +1272,22 @@ void TestQgsCallout::calloutLabelAnchorBottom()
   p.end();
 
   QVERIFY( imageCheck( "callout_label_anchor_bottom_middle", img, 20 ) );
+
+  img = job.renderedImage();
+  p.begin( &img );
+  settings.placement = QgsPalLayerSettings::OverPoint;
+  settings.xOffset = 6;
+  settings.yOffset = -6;
+  settings.dataDefinedProperties().setProperty( QgsPalLayerSettings::LabelRotation, QgsProperty::fromValue( 15 ) );
+  vl->setLabeling( new QgsVectorLayerSimpleLabeling( settings ) );  // TODO: this should not be necessary!
+
+  QgsDefaultLabelingEngine engine2;
+  engine2.setMapSettings( mapSettings );
+  engine2.addProvider( new QgsVectorLayerLabelProvider( vl, QString(), true, &settings ) );
+  //engine.setFlags( QgsLabelingEngine::RenderOutlineLabels | QgsLabelingEngine::DrawLabelRectOnly );
+  engine2.run( context );
+  p.end();
+  QVERIFY( imageCheck( "callout_label_anchor_bottom_middle_rotated", img, 20 ) );
 }
 
 void TestQgsCallout::calloutLabelAnchorBottomRight()
@@ -1259,6 +1340,22 @@ void TestQgsCallout::calloutLabelAnchorBottomRight()
   p.end();
 
   QVERIFY( imageCheck( "callout_label_anchor_bottom_right", img, 20 ) );
+
+  img = job.renderedImage();
+  p.begin( &img );
+  settings.placement = QgsPalLayerSettings::OverPoint;
+  settings.xOffset = 6;
+  settings.yOffset = -6;
+  settings.dataDefinedProperties().setProperty( QgsPalLayerSettings::LabelRotation, QgsProperty::fromValue( 15 ) );
+  vl->setLabeling( new QgsVectorLayerSimpleLabeling( settings ) );  // TODO: this should not be necessary!
+
+  QgsDefaultLabelingEngine engine2;
+  engine2.setMapSettings( mapSettings );
+  engine2.addProvider( new QgsVectorLayerLabelProvider( vl, QString(), true, &settings ) );
+  //engine.setFlags( QgsLabelingEngine::RenderOutlineLabels | QgsLabelingEngine::DrawLabelRectOnly );
+  engine2.run( context );
+  p.end();
+  QVERIFY( imageCheck( "callout_label_anchor_bottom_right_rotated", img, 20 ) );
 }
 
 void TestQgsCallout::calloutLabelAnchorLeft()
@@ -1311,6 +1408,22 @@ void TestQgsCallout::calloutLabelAnchorLeft()
   p.end();
 
   QVERIFY( imageCheck( "callout_label_anchor_left", img, 20 ) );
+
+  img = job.renderedImage();
+  p.begin( &img );
+  settings.placement = QgsPalLayerSettings::OverPoint;
+  settings.xOffset = 6;
+  settings.yOffset = -6;
+  settings.dataDefinedProperties().setProperty( QgsPalLayerSettings::LabelRotation, QgsProperty::fromValue( 15 ) );
+  vl->setLabeling( new QgsVectorLayerSimpleLabeling( settings ) );  // TODO: this should not be necessary!
+
+  QgsDefaultLabelingEngine engine2;
+  engine2.setMapSettings( mapSettings );
+  engine2.addProvider( new QgsVectorLayerLabelProvider( vl, QString(), true, &settings ) );
+  //engine.setFlags( QgsLabelingEngine::RenderOutlineLabels | QgsLabelingEngine::DrawLabelRectOnly );
+  engine2.run( context );
+  p.end();
+  QVERIFY( imageCheck( "callout_label_anchor_left_rotated", img, 20 ) );
 }
 
 void TestQgsCallout::calloutLabelAnchorRight()
@@ -1363,6 +1476,22 @@ void TestQgsCallout::calloutLabelAnchorRight()
   p.end();
 
   QVERIFY( imageCheck( "callout_label_anchor_right", img, 20 ) );
+
+  img = job.renderedImage();
+  p.begin( &img );
+  settings.placement = QgsPalLayerSettings::OverPoint;
+  settings.xOffset = 6;
+  settings.yOffset = -6;
+  settings.dataDefinedProperties().setProperty( QgsPalLayerSettings::LabelRotation, QgsProperty::fromValue( 15 ) );
+  vl->setLabeling( new QgsVectorLayerSimpleLabeling( settings ) );  // TODO: this should not be necessary!
+
+  QgsDefaultLabelingEngine engine2;
+  engine2.setMapSettings( mapSettings );
+  engine2.addProvider( new QgsVectorLayerLabelProvider( vl, QString(), true, &settings ) );
+  //engine.setFlags( QgsLabelingEngine::RenderOutlineLabels | QgsLabelingEngine::DrawLabelRectOnly );
+  engine2.run( context );
+  p.end();
+  QVERIFY( imageCheck( "callout_label_anchor_right_rotated", img, 20 ) );
 }
 
 void TestQgsCallout::calloutLabelAnchorCentroid()
@@ -1415,6 +1544,22 @@ void TestQgsCallout::calloutLabelAnchorCentroid()
   p.end();
 
   QVERIFY( imageCheck( "callout_label_anchor_centroid", img, 20 ) );
+
+  img = job.renderedImage();
+  p.begin( &img );
+  settings.placement = QgsPalLayerSettings::OverPoint;
+  settings.xOffset = 6;
+  settings.yOffset = -6;
+  settings.dataDefinedProperties().setProperty( QgsPalLayerSettings::LabelRotation, QgsProperty::fromValue( 15 ) );
+  vl->setLabeling( new QgsVectorLayerSimpleLabeling( settings ) );  // TODO: this should not be necessary!
+
+  QgsDefaultLabelingEngine engine2;
+  engine2.setMapSettings( mapSettings );
+  engine2.addProvider( new QgsVectorLayerLabelProvider( vl, QString(), true, &settings ) );
+  //engine.setFlags( QgsLabelingEngine::RenderOutlineLabels | QgsLabelingEngine::DrawLabelRectOnly );
+  engine2.run( context );
+  p.end();
+  QVERIFY( imageCheck( "callout_label_anchor_centroid_rotated", img, 20 ) );
 }
 
 void TestQgsCallout::calloutLabelDataDefinedAnchor()

diff --git a/...nchor_bottom_left_rotated/expected_callout_label_anchor_bottom_left_rotated.png b/...nchor_bottom_left_rotated/expected_callout_label_anchor_bottom_left_rotated.png
diff --git a/...r_bottom_middle_rotated/expected_callout_label_anchor_bottom_middle_rotated.png b/...r_bottom_middle_rotated/expected_callout_label_anchor_bottom_middle_rotated.png
diff --git a/...hor_bottom_right_rotated/expected_callout_label_anchor_bottom_right_rotated.png b/...hor_bottom_right_rotated/expected_callout_label_anchor_bottom_right_rotated.png
diff --git a/...abel_anchor_centroid_rotated/expected_callout_label_anchor_centroid_rotated.png b/...abel_anchor_centroid_rotated/expected_callout_label_anchor_centroid_rotated.png
diff --git a/...allout_label_anchor_left_rotated/expected_callout_label_anchor_left_rotated.png b/...allout_label_anchor_left_rotated/expected_callout_label_anchor_left_rotated.png
diff --git a/...lout_label_anchor_right_rotated/expected_callout_label_anchor_right_rotated.png b/...lout_label_anchor_right_rotated/expected_callout_label_anchor_right_rotated.png
diff --git a/...abel_anchor_top_left_rotated/expected_callout_label_anchor_top_left_rotated.png b/...abel_anchor_top_left_rotated/expected_callout_label_anchor_top_left_rotated.png
diff --git a/..._anchor_top_middle_rotated/expected_callout_label_anchor_top_middle_rotated.png b/..._anchor_top_middle_rotated/expected_callout_label_anchor_top_middle_rotated.png
diff --git a/...el_anchor_top_right_rotated/expected_callout_label_anchor_top_right_rotated.png b/...el_anchor_top_right_rotated/expected_callout_label_anchor_top_right_rotated.png