[labeling] Curved labels are now angled per character

...instead of shifted along base line (fix #15210)
qgis · Jul 20, 2016 · f6d07a3 · f6d07a3
1 parent 48f090c
commit f6d07a3
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 3 deletions.
diff --git a/src/core/pal/feature.cpp b/src/core/pal/feature.cpp
@@ -879,6 +879,13 @@ LabelPosition* FeaturePart::curvedPlacementAtOffset( PointSet* path_positions, d
       delete slp;
       return nullptr;
     }
+    // Shift the character downwards since the draw position is specified at the baseline
+    // and we're calculating the mean line here
+    double dist = 0.9 * li->label_height / 2;
+    if ( orientation < 0 )
+      dist = -dist;
+    start_x += dist * cos( angle + M_PI_2 );
+    start_y -= dist * sin( angle + M_PI_2 );
 
     double render_angle = angle;
 
@@ -1042,11 +1049,11 @@ int FeaturePart::createCurvedCandidatesAlongLine( QList< LabelPosition* >& lPos,
       double angle_avg = atan2( sin_avg / li->char_num, cos_avg / li->char_num );
       // displacement
       if (( !reversed && ( flags & FLAG_ABOVE_LINE ) ) || ( reversed && ( flags & FLAG_BELOW_LINE ) ) )
-        positions.append( _createCurvedCandidate( slp, angle_avg, mLF->distLabel() ) );
+        positions.append( _createCurvedCandidate( slp, angle_avg, mLF->distLabel() + li->label_height / 2 ) );
       if ( flags & FLAG_ON_LINE )
-        positions.append( _createCurvedCandidate( slp, angle_avg, -li->label_height / 2 ) );
+        positions.append( _createCurvedCandidate( slp, angle_avg, 0 ) );
       if (( !reversed && ( flags & FLAG_BELOW_LINE ) ) || ( reversed && ( flags & FLAG_ABOVE_LINE ) ) )
-        positions.append( _createCurvedCandidate( slp, angle_avg, -li->label_height - mLF->distLabel() ) );
+        positions.append( _createCurvedCandidate( slp, angle_avg, -li->label_height / 2 - mLF->distLabel() ) );
 
       // delete original candidate
       delete slp;

diff --git a/...images/labelingenginev2/expected_label_order_size/expected_label_order_size.png b/...images/labelingenginev2/expected_label_order_size/expected_label_order_size.png
diff --git a/...s/labelingenginev2/expected_label_order_size/expected_label_order_size_mask.png b/...s/labelingenginev2/expected_label_order_size/expected_label_order_size_mask.png
diff --git a/...rol_images/labelingenginev2/expected_labeling_basic/expected_labeling_basic.png b/...rol_images/labelingenginev2/expected_labeling_basic/expected_labeling_basic.png
diff --git a/...mages/labelingenginev2/expected_labeling_basic/expected_labeling_basic_mask.png b/...mages/labelingenginev2/expected_labeling_basic/expected_labeling_basic_mask.png
diff --git a/...es/labelingenginev2/expected_labeling_rulebased/expected_labeling_rulebased.png b/...es/labelingenginev2/expected_labeling_rulebased/expected_labeling_rulebased.png
diff --git a/...belingenginev2/expected_labeling_rulebased/expected_labeling_rulebased_mask.png b/...belingenginev2/expected_labeling_rulebased/expected_labeling_rulebased_mask.png