[labeling] allows data defined to align multiline when wordwrap function is used as expression (fix #11805) #1724
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -3548,7 +3548,7 @@ void QgsPalLabeling::dataDefinedTextFormatting( QgsPalLayerSettings& tmpLyr, | |||
| tmpLyr.wrapChar = ddValues.value( QgsPalLayerSettings::MultiLineWrapChar ).toString(); | |||
| } | |||
|
|
|||
| if ( !tmpLyr.wrapChar.isEmpty() ) | |||
| if ( !tmpLyr.wrapChar.isEmpty() || tmpLyr.getLabelExpression()->expression().indexOf("wordwrap", 0) != -1 ) | |||
There was a problem hiding this comment.
Could probably just be:
if ( !tmpLyr.wrapChar.isEmpty() || tmpLyr.getLabelExpression()->expression().contains( "wordwrap" ) )It is easier to read and is the same function underneath.
Note: please run scripts/prepare-commit.sh before submitting C++ code. It would have fixed up some of the spacing in your code. I recommend staging your changes before running the script, then you will see any diffs in your working tree (though there is also a diff saved by the script if anything is changed).
|
Once you have cleaned up the code, and it passes CI, feel free to push the change yourself. |
…ion is used as expression (fix qgis#11805)
|
Thanks @dakcarto for reviewing. |
slarosa
added a commit
that referenced
this pull request
Dec 15, 2014
[labeling] allows data defined to align multiline when wordwrap function is used as expression (fix #11805)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Currently it is not possible to use data defined to align multiline text if wordwrap function is used for the label expression. This change allows to do it working. See: http://hub.qgis.org/issues/11805