28538 Commits

Author SHA1 Message Date
Nathan Woodrow
b5362b0fdb Fix broken conditional styles tests 2015-08-25 23:10:06 +10:00
Nathan Woodrow
704ce9630f Add missing doc strings 2015-08-25 22:50:57 +10:00
Nathan Woodrow
9094575b80 Merge branch 'master' of https://github.com/qgis/QGIS
Conflicts:
	src/gui/attributetable/qgsfieldconditionalformatwidget.cpp
2015-08-25 22:45:05 +10:00
Nyall Dawson
385a608a0b Fix a bunch of leaks in unit tests 2015-08-25 21:40:41 +10:00
Nyall Dawson
24b8405d58 Ensure standard expressions functions are deleted on exit
(Avoids a lot of LeakSanitiser noise)
2015-08-25 21:40:32 +10:00
Nyall Dawson
8ca4b6751c Fix leaks in QgsInvertedPolygonRenderer 2015-08-25 21:40:24 +10:00
Nyall Dawson
cbd20586f5 Fix memory leak in composer objects 2015-08-25 21:40:17 +10:00
Nyall Dawson
374d78963d Ensure that all QObjects which have been marked deleteLater
will get deleted in QgsApplication::exitQgis()

It's not strictly necessary, but helps remove a lot of noise
when tracking leaks using LeakSanitiser
2015-08-25 21:40:11 +10:00
Nyall Dawson
572a3f4e3f Fix leak in diagram renderer 2015-08-25 21:40:03 +10:00
Nathan Woodrow
01d635a9ae Merge remote-tracking branch 'origin' 2015-08-25 21:39:52 +10:00
Nyall Dawson
74234e1bb6 Fix leak in QgsFieldConditionalFormatWidget 2015-08-25 21:39:33 +10:00
Nyall Dawson
7901ce2681 Fix leak in QgsLegendSymbolItemV2 2015-08-25 21:39:33 +10:00
Nyall Dawson
3621beec24 Fix leaks in QgsExpression 2015-08-25 21:39:33 +10:00
Nyall Dawson
b20b4d8a99 Fix leak in QgsDistanceArea 2015-08-25 21:39:33 +10:00
Nyall Dawson
a954c3f2bb Fix some memory leaks 2015-08-25 21:39:33 +10:00
Nathan Woodrow
2f60a5f85c [Conditional Styles] Better defaults
Add QgsConditionalLayerStyles to hold row and field styles
2015-08-25 21:08:55 +10:00
Radim Blazek
039b4fbcf9 [GRASS] fixed setMapset 2015-08-25 12:03:55 +02:00
Denis Rouzaud
2ecb55f254 remove duplicated line 2015-08-25 10:18:14 +02:00
Juergen E. Fischer
94eb41eda2 'fix' windows build 2015-08-25 09:14:15 +02:00
Marco Hugentobler
d5c9457b0a Enable / disable circular string edit tools 2015-08-25 09:10:38 +02:00
Giuseppe Sucameli
762d28b8d4 Postgres/SQLite/MSSQL provider: fix addAttributes() fail (wrong syntax/empty statement) when argument is an empty list 2015-08-25 03:00:07 +02:00
Giuseppe Sucameli
fdb0d20677 [DBManager] get default pk, geom and srid values from input layer to set default options in import vector dialog 2015-08-25 02:39:19 +02:00
Giuseppe Sucameli
a2ce73aec0 [DBManager] retrieve and store columns not null value when editing table (fix #13089) 2015-08-25 00:46:28 +02:00
Nyall Dawson
9aecf9f236 Test mask update 2015-08-25 08:42:25 +10:00
Juergen E. Fischer
3efa50c9c2 debian packaging update 2015-08-25 00:15:01 +02:00
Radim Blazek
d909597c5f [GRASS] add auto relation between column and layer option (disabled) 2015-08-24 20:27:08 +02:00
mhugent
5807875797 Merge pull request #2268 from mhugent/curve_capture_tool
Curve capture tool
2015-08-24 18:18:40 +02:00
Marco Hugentobler
ed69f1c026 Fix warnings 2015-08-24 16:49:21 +02:00
Juergen E. Fischer
2c4f02ad06 osgeo4w: include python wrapper 2015-08-24 16:39:04 +02:00
Juergen E. Fischer
aa36491347 more unicoding (followup 697d2af) 2015-08-24 16:39:02 +02:00
Denis Rouzaud
ab7c0bff87 Fix #13224 add joins crashes if no other vector layer exists 2015-08-24 15:22:10 +02:00
Radim Blazek
42953e618a [GRASS] fixed saving mapset to project 2015-08-24 15:13:24 +02:00
Nyall Dawson
3c0fe13207 Fix crash in geometry serialisation when no geometry set 2015-08-24 22:14:12 +10:00
Radim Blazek
2acff9b6c9 Merge pull request #2264 from NINAnor/grass7_pluginupdate
Grass7 pluginupdate - File management
2015-08-24 14:07:28 +02:00
Radim Blazek
d594a56f37 [GRASS] catch fatal error when opening db 2015-08-24 13:41:17 +02:00
Radim Blazek
c078ce5506 [GRASS] fixed path to modules used in browser 2015-08-24 13:15:04 +02:00
Denis Rouzaud
f82b8c6e02 [identify menu] display feature title next to layer title when single feature is identified 2015-08-24 11:51:50 +02:00
Marco Hugentobler
f5e763a002 Fix build 2015-08-24 09:10:32 +02:00
Nyall Dawson
46114659a8 More robust maprotation label test
Previous test was too reliant on platform-specific font rendering
2015-08-24 12:49:50 +10:00
Nyall Dawson
4d4de5d1b0 Remove item_height, etc variables
Before people become reliant on these variables we need a method
for evaluating data defined item rects which use them which
doesn't result in infinite recursion...
2015-08-24 12:10:06 +10:00
Nyall Dawson
7871d6c5fc Remove a bunch of layer variables, replace with new layer_property
function

layer_property takes a layer name/id and a property (eg 'crs')
and returns the matching value. This approach is more flexible than
having all these values as variables, since it allows retrieval
of properties of a layer from contexts which aren't layer-aware
(eg a composer label showing the metadata of a layer).
2015-08-24 12:00:11 +10:00
Juergen E. Fischer
9f3e229e18 fix typo 2015-08-23 18:19:04 +02:00
Nathan Woodrow
83115cd16a Merge row style support for attribute table
Conflicts:
	python/core/qgsconditionalstyle.sip
	python/core/qgsfielduiproperties.sip
	src/core/qgsfielduiproperties.cpp
	src/core/qgsfielduiproperties.h
	src/gui/attributetable/qgsattributetablemodel.cpp
	src/ui/qgsfieldconditionalformatwidget.ui
	tests/src/python/test_qgsconditionalstyle.py
2015-08-23 12:35:29 +10:00
Nathan Woodrow
b87073e146 Refresh attribute table for row styles. Tests 2015-08-23 10:53:03 +10:00
Nathan Woodrow
d75362687f Use combo box for preset 2015-08-22 23:40:55 +10:00
Juergen E. Fischer
b39055b39c indentation update (now including autopep8) 2015-08-22 14:29:41 +02:00
Juergen E. Fischer
93d45a0452 fix translation string 2015-08-22 14:12:29 +02:00
Juergen E. Fischer
97c8e1ab57 scripts: run python scripts through autopep8 2015-08-22 13:30:57 +02:00
Nyall Dawson
81d7ce7e5d Show message in dd menu if no variables set 2015-08-22 19:01:43 +10:00
Nyall Dawson
4dea16ad0b Show user-set variables in data defined buttons 2015-08-22 19:01:43 +10:00