372 Commits

Author SHA1 Message Date
Nyall Dawson
ce2891b10e Fix missing map settings expression variables in composer maps
Missing map extent related variables were causing stacking order
issues with the 25d renderer (fix #14604)
2016-04-12 09:14:03 +10:00
Nyall Dawson
0c5fa81126 Fix huge legend item size when symbol uses map unit sizes (fix #13979)
Add unit test
2016-04-11 15:34:49 +10:00
Nyall Dawson
d464f86290 [FEATURE] Null ("No symbol") renderer
Using this renderer no symbol will be drawn for features, but labeling,
diagrams and other non-symbol parts will still be shown.

Selections can still be made on the layer in the canvas and selected
features will be rendered with a default symbol. Features being edited
will also be shown.

This is intended as a handy shortcut for layers which you only want
to show labels or diagrams for, and avoids the need to render
symbols with totally transparent fill/border to achieve this.

(fix #12131)
2016-04-06 20:55:26 +10:00
Nyall Dawson
86ec27e08e Use real values when interpolating color components in gradients 2016-04-06 20:55:26 +10:00
Patrick Valsecchi
f696b0a34d Allow relative links in composer labels
Now labels and HTML boxes can contain relative URLs. If we don't have
a base URL, the project file will be used as a base URL (closes #7236).

Remove the exception for the labels where the images where not
loaded (unless in in PDF or image mode). It was because of a crash. Qt didn't
like having the HTML loading to be done synchronously during painting.

Fix a leak when rendering labels.
2016-04-04 11:05:30 +02:00
Mathieu Pellerin
541463718d [FEATURE] add outline join style to ellipse markers 2016-04-04 14:38:52 +10:00
nirvn
3a2a099c59 add simple marker join style tests 2016-04-03 11:56:47 +07:00
Blottiere Paul
7a8a5411e0 [FEATURE][composer] Add tools for drawing polygon and polylines 2016-04-01 11:05:03 +11:00
Nyall Dawson
befa962b30 Update legend test mask images for Windows build 2016-03-31 16:46:30 +11:00
Nyall Dawson
9dd791da01 Fix composer_label tests under Windows 2016-03-31 16:44:43 +11:00
Nyall Dawson
9104704f59 [composer] Set base stylesheet of composer labels to match the
label font and margins when rendering as HTML.

This allows interactive choice of font, margins and colors and
avoids the need to manually set these with CSS within the
label HTML code.
2016-03-30 19:35:34 +11:00
Nyall Dawson
68f0e832ec Add qt5 test masks for compositions tests 2016-03-18 16:32:44 +11:00
Nyall Dawson
6b4f60970d Add masks for qt5 and enable atlas test 2016-03-18 16:32:44 +11:00
Hugo Mercier
f9c736c9f8 Only filter legend nodes that are checked.
Keep unchecked legend items when filtered by expression
2016-03-14 14:17:43 +01:00
Nyall Dawson
ed3cb12008 [FEATURE] Parameterized svg support for composer svg images
This makes it possible to change SVG fill/outline color and outline
width when using parameterised SVG files such as those included
with QGIS (fix #10542)
2016-03-08 08:15:04 +11:00
Nyall Dawson
a89b51076c Merge indidividual regression1141.cpp and regression1141.cpp checks
into testqgsrasterlayer and testqgsvectorfilewriter

(slightly speeds up compiling and running tests)
2016-03-07 09:39:48 +11:00
Juergen E. Fischer
d1743a99f9 update qgis_labelingenginev2 test mask for ubuntu xenial 2016-03-06 22:18:47 +01:00
Nyall Dawson
dc2f1523cd Update test mask images 2016-03-03 15:32:44 +11:00
Nyall Dawson
87145f753c Test mask update 2016-02-27 09:43:08 +11:00
Nyall Dawson
b8c620a317 update test mask 2016-02-26 22:48:08 +11:00
Nyall Dawson
58c85bb8c0 Tweak vertical position of labels under points in "cartographic"
label placement mode

Previously labels were being drawn too low
2016-02-26 19:36:20 +11:00
Martin Dobias
b34105d812 Fix test mask for labelingenginev2 tests so they do not fail on my laptop 2016-02-23 13:07:47 +08:00
Nyall Dawson
ba7dc0d7e7 Add unit tests for #13919 2016-02-22 10:20:22 +11:00
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