299 Commits

Author SHA1 Message Date
Nyall Dawson
7fcc7ab195 Add specific test for QgsMultiBandColorRenderer
The raster blend mode test, which uses QgsMultiBandColorRenderer
fails occasionally for no obvious reason. This additional test
is an attempt to narrow down whether the issue lies in
rendering multi band images or elsewhere.
2016-01-25 19:05:13 +11:00
Nyall Dawson
39e1f68ccc Fix filtering legend content by map when renderer contains
duplicate symbols (fix #14131)

Now, we don't test for map content using the symbols but instead
use the legend key during the hit test
2016-01-25 14:43:54 +11:00
Nyall Dawson
88a9f99a5d Add mask for adjacent line fill test image 2016-01-24 08:16:55 +11:00
Nyall Dawson
41f320f771 Remove rubbish file 2016-01-22 18:53:21 +11:00
Matthias Kuhn
8d72f13a57 [25d] Improve convertability to other layers
* Move height and angle expressions for 2.5D renderer to layer
 * Apply color based on main symbol color

This makes the transition to other renderers easy.

Fixes #14132
2016-01-21 22:37:51 +01:00
Nyall Dawson
c38ee41f5b Fix rendering of CurvePolygons without curved segments (fix #14028) 2016-01-21 21:44:40 +11:00
Nyall Dawson
1a7dede155 Add TestQgsSymbolV2 with tests for rendering different geometry types 2016-01-21 21:44:34 +11:00
Nyall Dawson
03df709eb9 Enable and cleanup adjacent tiles test 2016-01-21 17:57:24 +11:00
mhugent
f4bdaad59f Merge pull request #2666 from mhugent/symbology_brush_transform
Symbology brush transform
2016-01-19 16:19:09 +01:00
Nyall Dawson
ed5284f1df Update test mask 2016-01-17 08:52:50 +11:00
Nyall Dawson
c452c3d85f Fix some warnings and test failures on nightlies 2016-01-15 08:32:56 +11:00
Marco Hugentobler
a91b685685 Yet another slightly different control image... 2016-01-14 18:11:47 +01:00
Marco Hugentobler
d416b14cf7 Generate test images on newer system and use tolerance of 100 pixels 2016-01-14 16:58:33 +01:00
Marco Hugentobler
561690c9ee Use render job in unit test instead of vector renderer 2016-01-14 13:26:47 +01:00
Matthias Kuhn
4e9afcec4c Expression variable for the currently rendered part
During rendering, two new variables will be available:

  * `geometry_part_count`
  * `geometry_part_num` (1-based index)

Useful to apply different styles to different parts of multipart
features
2016-01-13 08:17:49 +01:00
Nyall Dawson
f0d8efbdd4 Update test mask 2016-01-13 16:16:39 +11:00
Nyall Dawson
e26ef82890 Update test mask image 2016-01-12 20:07:58 +11:00
Nyall Dawson
8779091225 Fix failing tests 2016-01-12 08:24:56 +11:00
Nyall Dawson
8b28c040d1 [FEATURE] Add mode to apply label distance from symbol bounds
(only works with Cartographic point label placement). When this
setting is active, the label distance applies from the bounds
of the rendered symbol for a point, instead of the point itself.
It's especially useful when the symbol size isn't fixed, eg if
it's set by a data defined size or when using different symbols
in a categorised renderer.

Sponsored by Andreas Neumann
2016-01-12 08:24:39 +11:00
Nyall Dawson
6499439cc5 Fix failing tests, add tests for ordered placement
Sponsored by Andreas Neumann
2016-01-12 08:24:38 +11:00
Nyall Dawson
19a47fec29 Test mask update 2016-01-10 18:48:37 +11:00
Nyall Dawson
3496f08a8d Update test mask image 2016-01-10 07:37:23 +11:00
Marco Hugentobler
886fd725a3 Add test for rendering of adjacent tile images 2016-01-07 13:27:43 +01:00
Nyall Dawson
bd9d41c6ee Update test masks 2016-01-07 10:17:18 +11:00
Nyall Dawson
d9bb22a370 Update test mask images 2016-01-06 16:12:18 +11:00
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
Martin Dobias
7b2298e574 Fix failing labeling test on my ubuntu 14.04 box (12 mismatched pixels) 2016-01-04 23:13:18 +01:00
Matthias Kuhn
e00815db33 Add test for rendering order 2015-12-22 09:12:32 +01:00
Matthias Kuhn
c9fa33410d Fix rendering geometry generators for line layers
And add more tests
2015-12-11 11:41:41 +01:00
Matthias Kuhn
aa4f28882d Add geometry generator tests 2015-12-10 12:33:43 +01:00
Nyall Dawson
4624fb88ae Update test mask images 2015-11-26 12:53:52 +11:00
Nyall Dawson
e03f5549ca Update test mask images 2015-11-25 07:48:47 +11:00
Nyall Dawson
675da0ce40 Fix PyQgsServerAccessControl on Ubuntu
Add size tolerance to legend images, add masks for legend images
2015-11-24 07:54:29 +11:00
Nyall Dawson
f1458434fb Followup 7d600bd, proper fix for failing labeling engine test
When labelFeatures is called outside of the renderering loop,
we need to make sure the renderer is prepared by calling
startRender.
2015-11-24 07:26:37 +11:00
Nyall Dawson
169989a02f Update test mask images 2015-11-23 21:03:04 +11:00
Nyall Dawson
73ac9f9acd Update test mask images 2015-11-23 06:03:44 +11:00
Nyall Dawson
7d600bdaed [FEATURE] Use rendered symbol size as obstacle for point feature labels
Previously, only the point feature itself was treated as an obstacle
for label candidates. If a large or offset symbol was used for the
point, then labels were allowed to overlap this symbol without
incurring the obstacle cost.

Sponsored by City of Uster
2015-11-22 21:30:42 +11:00
Nyall Dawson
2e0019df39 Test mask updates 2015-11-22 18:08:34 +11:00
Nyall Dawson
9cc10e2a21 [labeling] Allow different obstacle geometry to feature geometry
This change makes it possible to have a different geometry used
for labeling obstacle detection to the geometry used for generating
label position candidates.

Also fixes parts of multipolygon features were not treated as
obstacles when "label only largest part" of polygon was checked.
Some inefficiencies in pal were also fixed (eg avoiding adding
features/obstacles to pal rtree indexes when they will never
be used).

Sponsored by City of Uster
2015-11-21 22:23:16 +11:00
Nyall Dawson
47e6d3031b Update test masks 2015-11-21 22:03:19 +11:00
Nyall Dawson
03f9e1b351 [pal] Never treat features as obstacles for their own labels
Fixes issues like rule based labelling registering two labels for
a single feature which was resulting in each label colliding
with the feature's geometry registered by the other label. This
resulted in poor placement for these labels.

Sponsored by City of Uster
2015-11-21 20:49:28 +11:00
Nyall Dawson
86ad564ef5 Add (disabled) test for labels around large symbols 2015-11-21 20:02:21 +11:00
Nyall Dawson
b81858f3fc Rename marker line symbol test folder to match other symbol tests 2015-11-21 19:05:48 +11:00
Nyall Dawson
711c38dfaf Make symbol line fill tests more robust 2015-11-21 19:01:28 +11:00
Nyall Dawson
11c82045b7 More test mask updates 2015-11-21 18:39:36 +11:00
Juergen E. Fischer
ff3a622e53 4 more pixels... (followup ca3da4c) 2015-11-21 00:52:33 +01:00
Juergen E. Fischer
ca3da4ceee adapt render tests to c6460a3 2015-11-20 23:23:50 +01:00
Nyall Dawson
4203a7c1f4 Add method to determine approximate rendered symbol bounds for markers
Sponsored by City of Uster
2015-11-20 19:55:02 +11:00
Nyall Dawson
4d02e48f16 Update test mask images for windows 2015-11-20 11:29:09 +11:00
Stéphane Brunner
c9f0d83aaf The plugin define the following methods:
* layerFilterExpression
  Return an additional filter, used in
  WMS/GetMap, WMS/GetFeatureInfo, WFS/GetFeature to filter the features
* layerFilterSubsetString
  Return an additional the subset string (typically SQL) filter.
  Faster than the layerFilterExpression but not supported on all the
  type of layer
* layerPermissions
  Change the rights on the layer per user (known by the plugin)
  Concern rights: publish, insert, update, delete.
  Mostly used in WFS/Transaction, and the publish in all requests.
* authorizedLayerAttributes
  Be able to show some attributes only for a subset of user
  Used in: WMS/GetFeatureInfo, WFS/GetFeature
* allowToEdit
  Be able to don't allow to edit a particular feature, in our case base
  on the Geometry
  Used in: WFS/Transaction
* cacheKey
  Cache key to used to create the capabilities cache, "" for no cache,
  shouldn't contains any "-", default to ""
2015-11-18 14:49:43 +01:00