29904 Commits

Author SHA1 Message Date
Matthias Kuhn
8653bb4812 Merge pull request #2493 from SebDieBln/AttrTableHideSortIndicator
Hide the sort indicator in the attribute table until first sort (fixes #6705)
2015-11-22 15:35:15 +01:00
Sebastian Dietrich
caab4c12f5 hide the sort indicator in the attribute table until first sort 2015-11-22 13:23:24 +01: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
6b0e7de9e2 Allow registering feature to label/diagram provider with obstacle geom
Sponsored by City of Uster
2015-11-22 20:21:38 +11:00
Nyall Dawson
2e0019df39 Test mask updates 2015-11-22 18:08:34 +11:00
Matthias Kuhn
504c252c05 Merge pull request #2327 from DelazJ/ConsistentTerms2
Add consistency to attribute's dialogs
2015-11-21 14:41:59 +01:00
Nyall Dawson
531fec039c Fix copy constructor for pal::FeaturePart 2015-11-21 23:02:44 +11:00
Nyall Dawson
55ead85382 Allow setting label obstacle geom in QgsPalLabeling::registerFeature
Sponsored by City of Uster
2015-11-21 22:52:22 +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
0a2773ff4b Followup c6460a3, avoid rendering issues 2015-11-21 21:00:10 +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
Juergen E. Fischer
22f0f25364 fix builds with older compilers 2015-11-20 23:12:53 +01:00
Juergen E. Fischer
90053c52d6 also update strpos function help (followup 2a557db) 2015-11-20 19:53:30 +01:00
Matthias Kuhn
fbb3dc5050 Merge pull request #2487 from SebDieBln/CopyPasteScaleBasedVisibility
Make copy/paste style aware of scale based visibility (fixes #13746)
2015-11-20 18:37:33 +01:00
Matthias Kuhn
d795e508cc Merge pull request #469 from olivierdalang/SanitizeEntryNames
Warning about invalid entry names
2015-11-20 18:03:44 +01:00
Juergen E. Fischer
c6460a3d7d render polylines with drawPath too (followup 08185c9; fixes #13343) 2015-11-20 17:08:58 +01:00
Nic
6bb94e0664 Update ClipData.py 2015-11-20 17:04:37 +01:00
Nic
fb568c3238 Update ClipData.py 2015-11-20 17:03:26 +01:00
Juergen E. Fischer
79640ef805 restore QgsVectorLayer::setReadOnly (followup 4cd1e38) 2015-11-20 15:45:02 +01:00
Matthias Kuhn
bbbf8a5a27 [sip] fix editor widget bindings 2015-11-20 15:31:58 +01:00
Matthias Kuhn
182dd8a369 Constification 2015-11-20 15:31:57 +01:00
Alessandro Pasotti
4180c1e275 Merge pull request #2489 from elpaso/qgseditorwidgetwrapper-config-added
Added config() to QgsEditorWidgetWrapper SIP wrapper
2015-11-20 13:23:56 +01:00
elpaso
8c24e1e2d4 Added const to config() method 2015-11-20 12:45:23 +01:00
Nyall Dawson
ecfdde5797 Fix copy constructor for pal::PointSet 2015-11-20 22:44:58 +11:00
rldhont
05ebeee3dc Clean [BUGFIX] Multipoint asJSON 2015-11-20 11:17:54 +01:00
Matthias Kuhn
c780184565 Merge pull request #2488 from nyalldawson/clang
[travis] Use newer clang 3.7 for linux builds
2015-11-20 11:13:21 +01:00
rldhont
00ea968347 [BUGFIX] Multipoint asJSON
Fixes #13855
Multipoint asJSON made MultiPoint as Multilinestring with only 1 point by linestring.

This bugfix adds tests.
2015-11-20 11:01:27 +01:00
elpaso
7cc0a21bf8 Added config() to QgsEditorWidgetWrapper SIP wrapper 2015-11-20 10:47:57 +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
54cf64bcdc [travis] Use newer clang 3.7 for linux builds 2015-11-20 12:59:18 +11:00
Nyall Dawson
4d02e48f16 Update test mask images for windows 2015-11-20 11:29:09 +11:00
Nyall Dawson
323f265c94 Misc cleanups following c9f0d83 2015-11-20 10:38:34 +11:00
Sebastian Dietrich
a5b2a06981 made copy/paste style aware of scale based visibility (fixes #13746) 2015-11-19 22:50:52 +01:00
Juergen E. Fischer
e3489e0bec install qgsfeaturefilterprovider.h (followup c9f0d83) 2015-11-19 20:40:11 +01:00
olivierdalang
0132a3e173 Merge pull request #1 from SebDieBln/SanitizeEntryNames
add a test for makeKeyTokens_()
2015-11-19 16:21:00 +00:00
Juergen E. Fischer
84e4539b9e fix c40a764 2015-11-19 16:07:23 +01:00
Matthias Kuhn
5b5960970e Some sip changes and doxymentation 2015-11-19 15:32:28 +01:00
Matthias Kuhn
d2ac91b3b4 fixup doxygen 2015-11-19 15:32:28 +01:00
Matthias Kuhn
4cd1e38631 fieldEditable -> readOnly 2015-11-19 15:32:28 +01:00
Matthias Kuhn
d70a47e7cf Document function name changes 2015-11-19 15:32:28 +01:00
Matthias Kuhn
a50f2d051f Refactor edit form configuration out of QgsVectorLayer 2015-11-19 15:32:28 +01:00
Alessandro Pasotti
d315a12362 Fix segfault when editor widget is invalid on form init
"editor" can be null in that case
2015-11-19 15:29:19 +01:00
Sebastian Dietrich
174fbb97ce added a test for makeKeyTokens_() 2015-11-19 14:01:39 +01:00