sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-17 00:09:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Default to follow placement alignment for labels

Browse Source
This commit is contained in:
Nyall Dawson 2016-08-08 13:23:56 +10:00
parent 66d4af3922
commit dc9ed2b4b5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/qgspallabeling.cpp
View File

@ -132,7 +132,7 @@ QgsPalLayerSettings::QgsPalLayerSettings()
// text formatting // text formatting
wrapChar = ""; wrapChar = "";
multilineHeight = 1.0; multilineHeight = 1.0;
multilineAlign = MultiLeft; multilineAlign = MultiFollowPlacement;
addDirectionSymbol = false; addDirectionSymbol = false;
leftDirectionSymbol = QString( "<" ); leftDirectionSymbol = QString( "<" );
rightDirectionSymbol = QString( ">" ); rightDirectionSymbol = QString( ">" );
@ -852,7 +852,7 @@ void QgsPalLayerSettings::readFromLayer( QgsVectorLayer* layer )
// text formatting // text formatting
wrapChar = layer->customProperty( "labeling/wrapChar" ).toString(); wrapChar = layer->customProperty( "labeling/wrapChar" ).toString();
multilineHeight = layer->customProperty( "labeling/multilineHeight", QVariant( 1.0 ) ).toDouble(); multilineHeight = layer->customProperty( "labeling/multilineHeight", QVariant( 1.0 ) ).toDouble();
multilineAlign = static_cast< MultiLineAlign >( layer->customProperty( "labeling/multilineAlign", QVariant( MultiLeft ) ).toUInt() ); multilineAlign = static_cast< MultiLineAlign >( layer->customProperty( "labeling/multilineAlign", QVariant( MultiFollowPlacement ) ).toUInt() );
addDirectionSymbol = layer->customProperty( "labeling/addDirectionSymbol" ).toBool(); addDirectionSymbol = layer->customProperty( "labeling/addDirectionSymbol" ).toBool();
leftDirectionSymbol = layer->customProperty( "labeling/leftDirectionSymbol", QVariant( "<" ) ).toString(); leftDirectionSymbol = layer->customProperty( "labeling/leftDirectionSymbol", QVariant( "<" ) ).toString();
rightDirectionSymbol = layer->customProperty( "labeling/rightDirectionSymbol", QVariant( ">" ) ).toString(); rightDirectionSymbol = layer->customProperty( "labeling/rightDirectionSymbol", QVariant( ">" ) ).toString();
@ -1304,7 +1304,7 @@ void QgsPalLayerSettings::readXml( QDomElement& elem )
QDomElement textFormatElem = elem.firstChildElement( "text-format" ); QDomElement textFormatElem = elem.firstChildElement( "text-format" );
wrapChar = textFormatElem.attribute( "wrapChar" ); wrapChar = textFormatElem.attribute( "wrapChar" );
multilineHeight = textFormatElem.attribute( "multilineHeight", "1" ).toDouble(); multilineHeight = textFormatElem.attribute( "multilineHeight", "1" ).toDouble();
multilineAlign = static_cast< MultiLineAlign >( textFormatElem.attribute( "multilineAlign", QString::number( MultiLeft ) ).toUInt() ); multilineAlign = static_cast< MultiLineAlign >( textFormatElem.attribute( "multilineAlign", QString::number( MultiFollowPlacement ) ).toUInt() );
addDirectionSymbol = textFormatElem.attribute( "addDirectionSymbol" ).toInt(); addDirectionSymbol = textFormatElem.attribute( "addDirectionSymbol" ).toInt();
leftDirectionSymbol = textFormatElem.attribute( "leftDirectionSymbol", "<" ); leftDirectionSymbol = textFormatElem.attribute( "leftDirectionSymbol", "<" );
rightDirectionSymbol = textFormatElem.attribute( "rightDirectionSymbol", ">" ); rightDirectionSymbol = textFormatElem.attribute( "rightDirectionSymbol", ">" );