2047 Commits

Author SHA1 Message Date
Matthias Kuhn
04919963f7 Merge pull request #2616 from SebDieBln/FixLayerCountAttribute
Remove the 'layercount' attribute in a project file
2016-01-12 10:46:17 +01: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
7479bf385b Allow setting data defined placement order in GUI
Sponsored by Andreas Neumann
2016-01-12 08:24:38 +11:00
Nyall Dawson
b589856735 [FEATURE] "Cartographic" placement mode for point labels
In this placement mode, point label candidates are generated
following ideal cartographic placement rules, eg labels
placements are priortised in the order:
- top right
- top left
- bottom right
- bottom left
- middle right
- middle left
- top, slightly right
- bottom, slightly left
(respecting the guidelines from Krygier and Wood (2011) and other
cartographic textbooks)

Placement priority can also be set for an individual feature using
a data defined list of prioritised positions. This also allows for
only certain placements to be used, so eg for coastal features you
could prevent labels being placed over the land.

TODO:
- while the ordering can be customised by editing a project file,
there's no GUI to customise this ordering if you want to deviate
from this standard priority (and it's out of scope for this
current work)
- tests

Sponsored by Andreas Neumann
2016-01-12 08:24:38 +11:00
rldhont
e276f170c7 [Feature][QGIS Server] Add WMS INSPIRE Capabilities
In the project properties the user can:
* activate INSPIRE capabilities
* select language of the service, 24 EU official languages + 5 regionals
* choose the scenario for service metadata and specify them

The WMS 1.3.0 capabilities reflects the INSPIRE configuration.
2016-01-11 21:12:09 +01:00
Martin Dobias
33ea60d741 [tracer] Fix reprojection, limit tracing graph to visible extent 2016-01-11 15:55:56 +01:00
Hugo Mercier
61173c2077 Allow to call qgis expression functions in virtual layers 2016-01-11 14:11:08 +01:00
Juergen E. Fischer
312de68331 spelling fixes 2016-01-10 17:30:17 +01:00
Nyall Dawson
19a47fec29 Test mask update 2016-01-10 18:48:37 +11:00
Nyall Dawson
651ca519b1 Fix constructor test for Sip binding coverage 2016-01-10 07:58:05 +11:00
Nyall Dawson
3496f08a8d Update test mask image 2016-01-10 07:37:23 +11:00
Nyall Dawson
a54c8b162e Merge pull request #2653 from SebDieBln/MemoryLayerNoGeometry
[FEATURE] allow geometryless memory layers
2016-01-09 11:33:47 +11:00
Sebastian Dietrich
6ef2f5ddb8 extended the test for memory layers
The test now includes all geometry types including NoGeometry.
2016-01-08 23:47:18 +01:00
Juergen E. Fischer
4e1cf3c081 add missing copyright headers 2016-01-08 21:32:11 +01:00
Juergen E. Fischer
bd6169e1ce spelling fixes 2016-01-08 20:38:43 +01:00
Martin Dobias
0cd9b68abf [tracer] update tracer when any of the input layers is changed 2016-01-08 18:38:26 +01:00
Martin Dobias
12705b708a [tracer] Added reprojection of layers 2016-01-08 17:31:26 +01:00
Martin Dobias
9a6ffc4b2e Added QgsTracer to support tracing in map tools
The tracer builds a graph from input layers and uses Dijkstra's
algorithm for the shortest path in the graph.

There is already QgsGraph class and friends in QGIS code including
Dijkstra's algorithm, however that implementation does not fit our
needs well for a number of reasons (some of them would be easy
to fix, but others would require a significant rewrite):
- limited to single input layer
- no monitoring of changes in the input layers
- no support for polygons
- not in core library
- shortest path alg does only stops when all distances are calculated
- every point of input layer represented as a vertex in graph
  (resulting graph is much denser than necessary and path finding slower)
- edges have always one direction, requiring two edges between each
  pair of vertices (resulting graph has twice as many edges)
- graph is always built with start/finish points
  (does not allow temporary addition of start/finish points and their
   removal without complete rebuild of the graph)
2016-01-08 17:00:02 +01:00
Sebastian Dietrich
d26bd46d99 remove 'layercount' attribute from project file
The 'layercount' attribute was not used anyway and the calculated number could already be outdated when loading the project file again due to changes to embedded projects.
2016-01-08 16:10:58 +01:00
Nyall Dawson
24ce02692d Add a bit of tolerance to labelingenginev2 tests 2016-01-08 16:54:23 +11:00
Nyall Dawson
87c58f4541 Mark more includes as system includes 2016-01-08 16:43:27 +11:00
Hugo Mercier
1a1af3788c Rework layer dependencies to work also with layer definition files 2016-01-07 14:03:15 +01:00
Marco Hugentobler
886fd725a3 Add test for rendering of adjacent tile images 2016-01-07 13:27:43 +01:00
Hugo Mercier
ba2e9dfc89 Add layer dependencies for virtual layers 2016-01-07 12:04:20 +01:00
Juergen E. Fischer
f8f056e0b2 fix server access control tests on windows 2016-01-07 10:50:34 +01:00
Nyall Dawson
2ceeb94831 Fix crash on close of access control test 2016-01-07 16:26:15 +11:00
Nyall Dawson
497f270408 Partially fix access control test for Win 2016-01-07 16:23:30 +11:00
Juergen E. Fischer
f6ed4535f8 fix projectPath in server access control test 2016-01-07 02:39:48 +01:00
Nyall Dawson
bd9d41c6ee Update test masks 2016-01-07 10:17:18 +11:00
Nyall Dawson
0afcb0f364 Make test render checker work correctly in non-Firefox browsers 2016-01-07 10:17:05 +11:00
Juergen E. Fischer
f5b615acdd fix virtuallayer tests on windows 2016-01-06 23:52:28 +01:00
Nyall Dawson
f76bbeba76 More debugging for server access control tests 2016-01-07 07:20:11 +11:00
Hugo Mercier
62cdb27160 Fix virtual layer definition parsing 2016-01-06 16:05:54 +01:00
Hugo Mercier
b46a593e32 Merge pull request #2617 from SebDieBln/FixLayerDefVectorJoins
Make vector joins work within layer-definition-files
2016-01-06 09:50:38 +01: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
Nyall Dawson
d10680c5fc Followup 881074 2016-01-05 12:18:02 +11:00
Nyall Dawson
881074b194 Boost coverage of SIP bindings
Now all classes and members are either exposed to bindings or marked
as "not available in Python bindings" in the docs.

Drop test thresholds to 0. Now it should be much easier to determine
what missing members have been added which are causing test
failures.
2016-01-05 11:16:15 +11:00
Martin Dobias
215ba22597 Fix failing composer scale bar test on less common locales 2016-01-04 23:46:08 +01: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
mhugent
cbd29e5fd5 Merge pull request #2632 from mhugent/nodetool_remove_lines
Remove all vertices if removing second to last line point / fourth to last ring point
2016-01-04 13:42:00 +01:00
mhugent
164739f205 Merge pull request #2606 from nyalldawson/close_rings
Ensure that rings are closed when adding to polygons
2016-01-04 11:43:45 +01:00
Marco Hugentobler
7f978d96e3 Update test_qgsgeometry 2016-01-04 11:23:04 +01:00
Nyall Dawson
2eb95f081f Fix more warnings when building under clang with -wEverything 2016-01-02 11:08:03 +11:00
Sebastian Dietrich
c136f9f550 added a test for vector joins in layer definition files 2016-01-01 23:06:06 +01:00
Sebastian Dietrich
836ea81b77 added a test for memory layer fields being saved to XML 2016-01-01 15:28:58 +01:00
Nyall Dawson
766bfa1a7f Fix some more old style cast and float comparison warnings 2015-12-31 07:27:58 +11:00