sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-28 00:17:30 -05:00
Code Issues Packages Projects Releases Wiki Activity
30,419 Commits 81 Branches 277 Tags
Commit Graph

30419 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastian Dietrich
8203fa1b93 [StyleManager] fix minor memory leaks leaving orphaned QMenus and QActions 
Build menus once within the ctor rather than on every event within the slot.
 2016-01-06 02:56:31 +01:00
Sebastian Dietrich
0243201a1d [StyleManager] fix labels 2016-01-06 02:56:30 +01:00
Sebastian Dietrich
95e571c3f8 added functions to QgsStyleV2 for getting groups by id 2016-01-06 02:56:30 +01:00
Nyall Dawson
6051d3a401 Merge pull request #2622 from duncan-r/feature4273_and_3756 
Feature #4273 and #3756
 2016-01-06 09:47:22 +11:00
Juergen E. Fischer
e961a52c6a revive python tests on windows (followup afcf567) 2016-01-05 23:34:02 +01:00
Roel Huybrechts
97b8a72b82 Interpret 'decimal' fields as double in WFS provider. 
Fixes #11864.
 2016-01-05 14:13:30 +01:00
Nyall Dawson
17ed9d15fa Remove unused help button from style manager (fix #14055) 2016-01-05 22:38:12 +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
Duncan Runnacles
47d93078ba Added placement margin to decoration items and updated dialogs. 
- North arrow, scalebar, and copyright label updated to include a
  margin option on placement.
- All qgsdecorationitem type dialogs amended so that all widgets sit
  within a checkable group box for activating/deactivating the item.
 2016-01-05 10:40:12 +00:00
Nyall Dawson
1340afdc01 Fix more clang warnings 2016-01-05 20:13:58 +11:00
Matthias Kuhn
614c84f2c6 Merge pull request #2636 from nirvn/orderby_fix 
[rendering order] fix order setting not saved in rule-based symb. (fixes #14043)
 2016-01-05 09:17:35 +01:00
nirvn
16aeb3f1eb fix orderby not saved in several symbologies (fixes #14043) 2016-01-05 11:23:49 +07:00
Nyall Dawson
c55cfc0560 Merge pull request #2615 from nirvn/natural_break_max_increase 
[symbology] increase maximum size of natural break classification
 2016-01-05 14:09:55 +11:00
Nyall Dawson
115cc483dd Merge pull request #2627 from SebDieBln/FixNewStyleGroup 
Initialize a style group upon creation instead of upon renaming (fixes #14050)
 2016-01-05 13:31:21 +11:00
Nyall Dawson
90eaba9f4f Merge pull request #2629 from SebDieBln/FixStyleManagerGroupingMode 
[StyleManager] Keep group actions enabled while in grouping mode (fixes #14049)
 2016-01-05 13:26:08 +11:00
Nyall Dawson
adf83850d0 Fix failing test 2016-01-05 12:57:38 +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
2341c2b1e2 Update indentation 2016-01-05 01:10:53 +01:00
Martin Dobias
5ac617037b Move QgsLabelFeature and QgsTextLabelFeature class to separate files 
No actual code changes

This code has been funded by Tuscany Region (Italy) - SITA (CIG: 63526840AE) and commissioned to Gis3W s.a.s.
 2016-01-05 00:03:39 +01: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
Juergen E. Fischer
fdebde5080 debian packaging update: update liblwgeom dependency of python-qgis to 2.2-2 2016-01-04 20:19:02 +01:00
Juergen E. Fischer
712925ea62 fix windows build 2016-01-04 18:29:28 +01:00
Marco Hugentobler
de0a88682d Open sqlite db for datum transform info in readonly mode. Fixes slow opening on windows 2016-01-04 17:34:10 +01:00
rldhont
94da2ab212 [QGIS Server] Add place holder and tooltip to OWS inputs 2016-01-04 15:05:34 +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
Médéric RIBREUX
006a1614cf [Processing]Add gdal_retile.py and gdal2tiles.py algorithms 
This should fix Redmine #3331
 2016-01-04 13:19:46 +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
375ae60c49 Intendation 2016-01-04 11:31:09 +01:00
Marco Hugentobler
7f978d96e3 Update test_qgsgeometry 2016-01-04 11:23:04 +01:00
Matthias Kuhn
73945c0c56 Merge pull request #2631 from spatialthoughts/patch-1 
Change comparison back to NULL
 2016-01-04 09:51:29 +01:00
Matthias Kuhn
49eaf16f52 Merge pull request #2623 from cjmayo/no-pyqtconfig 
[pyqgis-console] Don't import pyqtconfig
 2016-01-04 09:50:42 +01:00
mhugent
1c464d69fc Merge pull request #2611 from mhugent/shapefile_sbn_remove 
Cleanup sbn file if gdal did not already remove it. Fixes bug #13319
 2016-01-04 09:08:29 +01:00
Ujaval Gandhi
899c57a91f Change comparison back to NULL 
filter_null method previously filtered the NULL values using NULL type in qgis.core which is a QPyNullVariant. 
f9e0093ce7

This was subsequently changed to 'is not None' comparison which is incorrect. The current version fails to filter out the null values.
 2016-01-04 11:01:06 +05:30
Nyall Dawson
aacb37d258 Fix failing SIP coverage test 2016-01-04 16:23:00 +11:00
Nyall Dawson
8c38bc9883 More nullptr conversions 2016-01-04 16:22:53 +11:00
Nyall Dawson
8df09a6f47 Pal cleanups: 
- remove use of namespace blocks (avoids unnecessary indentation)
- cleanup includes
- remove old std::cout debugging blocks
- move some documentation from cpp to headers
 2016-01-04 08:58:07 +11:00
Nyall Dawson
4cc590c929 Cleanup labeling, avoid some duplicate enums, add docs 2016-01-04 07:23:58 +11:00
Sebastian Dietrich
a943d9510d keep group actions enabled while in grouping mode (fixes #14049) 
Group actions must be enabled to have the option of leaving grouping mode again.
 2016-01-03 21:13:05 +01:00
Nyall Dawson
fe9a098954 Minor Coverity fixups, clang warnings, 0->nullptr conversions 2016-01-03 20:56:40 +11:00
Nyall Dawson
2eb95f081f Fix more warnings when building under clang with -wEverything 2016-01-02 11:08:03 +11:00
Sebastian Dietrich
62cc59c380 initialize a style group upon creation instead of upon renaming 
(fixes #14050)
 2016-01-02 01:07:27 +01:00
Nyall Dawson
144ca8da2e Fix test for QWT_POLAR 2016-01-02 09:40:54 +11:00
Nyall Dawson
0df4cbe3c4 Merge pull request #2625 from SebDieBln/FixAppendingNotSupported 
Fix accumulating "Not supported" hints
 2016-01-02 09:21:40 +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
b2b44ccca9 split generating XML and saving to QLR-file into separate functions 
This increases flexibility and is consistent with the loading of a QLR-file.
 2016-01-01 21:34:22 +01:00
Sebastian Dietrich
ff3200fd6c make vector joins work within layer-definition-files 2016-01-01 21:12:41 +01:00
Nyall Dawson
5a42728f3e Merge pull request #2624 from SebDieBln/SaveMemoryLayerFields 
Read source from provider before saving memory layer (fixes #8997)
 2016-01-02 06:27:41 +11:00
Sebastian Dietrich
836ea81b77 added a test for memory layer fields being saved to XML 2016-01-01 15:28:58 +01:00