8 Commits

Author SHA1 Message Date
Nyall Dawson
5e4c14cd40 [FEATURE] Control over label rendering order
A new control for setting a label's "z-index" has been added to
the labeling properties dialog. This control (which also accepts
data-defined overrides for individual features) determines the order
in which label are rendered. Label layers with a higher z-index
are rendered on top of labels from a layer with lower z-index.

Additionally, the logic has been tweaks so that if 2 labels have
matching z-indexes, then:
- if they are from the same layer, a smaller label will be drawn
above a larger label
- if they are from different layers, the labels will be drawn in
the same order as the layers themselves (ie respecting the order
set in the legend)

Diagrams can also have their z-index set (but not data defined)
so that the order of labels and diagrams can be controlled.

Note that this does *NOT* allow labels to be drawn below the
features from other layers, it just controls the order in which
labels are drawn on top of all the layer's features.

Fix #13888, #13559
2016-01-05 22:27:22 +11:00
Nyall Dawson
4eb53d366a Update test mask images 2015-10-10 21:21:21 +11:00
Nyall Dawson
e108febb5e Clean up diagram tests
- Consolidate tests to single file
- Don't use composition for testing
2015-06-18 21:03:42 +10:00
Nyall Dawson
31c32505bb Switch to RGB32 images for composition checker 2014-11-14 18:30:29 +01:00
Nyall Dawson
2cfcca10d2 Use a non-transparent background for composition checker
Fix composerhtml tests on precise
2014-11-14 18:30:28 +01:00
Nyall Dawson
3af68f4888 Rebuild composer test images at 96 dpi to speed up unit tests 2014-09-21 19:47:39 +10:00
Nyall Dawson
7cb2315e29 Fix some failing tests (diagrams control images needed rebuilding following MTR composer changes, added tolerance to renderers test) 2014-06-18 21:48:20 +10:00
Stéphane Brunner
a0911d6b55 [diagram] Add expression for diagram attributes and size 2014-01-10 16:43:23 +01:00