Skip to content

Commit 871fdb2

Browse files
committed
Slightly increase default maximum angles for curved labels
The recent improvements to curve label rendering make this possible (cherry-picked from 1b1db22)
1 parent 27a4168 commit 871fdb2

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/core/qgspallabeling.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -205,8 +205,8 @@ QgsPalLayerSettings::QgsPalLayerSettings()
205205
offsetType = FromPoint;
206206
angleOffset = 0;
207207
preserveRotation = true;
208-
maxCurvedCharAngleIn = 20.0;
209-
maxCurvedCharAngleOut = -20.0;
208+
maxCurvedCharAngleIn = 25.0;
209+
maxCurvedCharAngleOut = -25.0;
210210
priority = 5;
211211
repeatDistance = 0;
212212
repeatDistanceUnit = MM;
@@ -1044,8 +1044,8 @@ void QgsPalLayerSettings::readFromLayer( QgsVectorLayer* layer )
10441044
}
10451045
angleOffset = layer->customProperty( "labeling/angleOffset", QVariant( 0.0 ) ).toDouble();
10461046
preserveRotation = layer->customProperty( "labeling/preserveRotation", QVariant( true ) ).toBool();
1047-
maxCurvedCharAngleIn = layer->customProperty( "labeling/maxCurvedCharAngleIn", QVariant( 20.0 ) ).toDouble();
1048-
maxCurvedCharAngleOut = layer->customProperty( "labeling/maxCurvedCharAngleOut", QVariant( -20.0 ) ).toDouble();
1047+
maxCurvedCharAngleIn = layer->customProperty( "labeling/maxCurvedCharAngleIn", QVariant( 25.0 ) ).toDouble();
1048+
maxCurvedCharAngleOut = layer->customProperty( "labeling/maxCurvedCharAngleOut", QVariant( -25.0 ) ).toDouble();
10491049
priority = layer->customProperty( "labeling/priority" ).toInt();
10501050
repeatDistance = layer->customProperty( "labeling/repeatDistance", 0.0 ).toDouble();
10511051
repeatDistanceUnit = static_cast< SizeUnit >( layer->customProperty( "labeling/repeatDistanceUnit", QVariant( MM ) ).toUInt() );
@@ -1500,8 +1500,8 @@ void QgsPalLayerSettings::readXml( QDomElement& elem )
15001500
}
15011501
angleOffset = placementElem.attribute( "angleOffset", "0" ).toDouble();
15021502
preserveRotation = placementElem.attribute( "preserveRotation", "1" ).toInt();
1503-
maxCurvedCharAngleIn = placementElem.attribute( "maxCurvedCharAngleIn", "20" ).toDouble();
1504-
maxCurvedCharAngleOut = placementElem.attribute( "maxCurvedCharAngleOut", "-20" ).toDouble();
1503+
maxCurvedCharAngleIn = placementElem.attribute( "maxCurvedCharAngleIn", "25" ).toDouble();
1504+
maxCurvedCharAngleOut = placementElem.attribute( "maxCurvedCharAngleOut", "-25" ).toDouble();
15051505
priority = placementElem.attribute( "priority" ).toInt();
15061506
repeatDistance = placementElem.attribute( "repeatDistance", "0" ).toDouble();
15071507
repeatDistanceUnit = static_cast< SizeUnit >( placementElem.attribute( "repeatDistanceUnit", QString::number( MM ) ).toUInt() );

0 commit comments

Comments
 (0)