Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Slightly increase default maximum angles for curved labels
The recent improvements to curve label rendering make this possible
  • Loading branch information
nyalldawson committed Aug 9, 2016
1 parent dc9ed2b commit 1b1db22
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions src/core/qgspallabeling.cpp
Expand Up @@ -204,8 +204,8 @@ QgsPalLayerSettings::QgsPalLayerSettings()
offsetType = FromPoint;
angleOffset = 0;
preserveRotation = true;
maxCurvedCharAngleIn = 20.0;
maxCurvedCharAngleOut = -20.0;
maxCurvedCharAngleIn = 25.0;
maxCurvedCharAngleOut = -25.0;
priority = 5;
repeatDistance = 0;
repeatDistanceUnit = MM;
Expand Down Expand Up @@ -1040,8 +1040,8 @@ void QgsPalLayerSettings::readFromLayer( QgsVectorLayer* layer )
}
angleOffset = layer->customProperty( "labeling/angleOffset", QVariant( 0.0 ) ).toDouble();
preserveRotation = layer->customProperty( "labeling/preserveRotation", QVariant( true ) ).toBool();
maxCurvedCharAngleIn = layer->customProperty( "labeling/maxCurvedCharAngleIn", QVariant( 20.0 ) ).toDouble();
maxCurvedCharAngleOut = layer->customProperty( "labeling/maxCurvedCharAngleOut", QVariant( -20.0 ) ).toDouble();
maxCurvedCharAngleIn = layer->customProperty( "labeling/maxCurvedCharAngleIn", QVariant( 25.0 ) ).toDouble();
maxCurvedCharAngleOut = layer->customProperty( "labeling/maxCurvedCharAngleOut", QVariant( -25.0 ) ).toDouble();
priority = layer->customProperty( "labeling/priority" ).toInt();
repeatDistance = layer->customProperty( "labeling/repeatDistance", 0.0 ).toDouble();
repeatDistanceUnit = static_cast< SizeUnit >( layer->customProperty( "labeling/repeatDistanceUnit", QVariant( MM ) ).toUInt() );
Expand Down Expand Up @@ -1496,8 +1496,8 @@ void QgsPalLayerSettings::readXml( QDomElement& elem )
}
angleOffset = placementElem.attribute( "angleOffset", "0" ).toDouble();
preserveRotation = placementElem.attribute( "preserveRotation", "1" ).toInt();
maxCurvedCharAngleIn = placementElem.attribute( "maxCurvedCharAngleIn", "20" ).toDouble();
maxCurvedCharAngleOut = placementElem.attribute( "maxCurvedCharAngleOut", "-20" ).toDouble();
maxCurvedCharAngleIn = placementElem.attribute( "maxCurvedCharAngleIn", "25" ).toDouble();
maxCurvedCharAngleOut = placementElem.attribute( "maxCurvedCharAngleOut", "-25" ).toDouble();
priority = placementElem.attribute( "priority" ).toInt();
repeatDistance = placementElem.attribute( "repeatDistance", "0" ).toDouble();
repeatDistanceUnit = static_cast< SizeUnit >( placementElem.attribute( "repeatDistanceUnit", QString::number( MM ) ).toUInt() );
Expand Down

0 comments on commit 1b1db22

Please sign in to comment.