28462 Commits

Author SHA1 Message Date
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
Nyall Dawson
8f6669fcb5 Fix missing QgsExpressionContext::isReadOnly definition 2015-08-22 19:01:43 +10:00
Nyall Dawson
d7b74748c8 Fix filtering of highlighted variables 2015-08-22 19:01:43 +10:00
Nyall Dawson
4bf8b131e3 Port conditional styles to expression contexts 2015-08-22 19:01:43 +10:00
Nyall Dawson
440926bbc4 Sort functions and variables in expression builder 2015-08-22 19:01:42 +10:00
Nyall Dawson
85bda6c05f Add method for highlighting variables in the expression builder 2015-08-22 19:01:42 +10:00
Nyall Dawson
334ea504db Add help for project_color function 2015-08-22 19:01:42 +10:00
Nyall Dawson
f74db81b9a Hide contextual functions from builder unless provided by context 2015-08-22 19:01:42 +10:00
Nyall Dawson
2a951ec945 Add some missing expression group help 2015-08-22 19:01:42 +10:00
Nyall Dawson
6487f1716c Add help text for variables 2015-08-22 19:01:42 +10:00
Nyall Dawson
00892ce068 Tweak context for composer items
- Attribute tables have access to layer context when applicable
- Frames have access to parent multiframe's context
2015-08-22 19:01:42 +10:00
Nyall Dawson
be26c61bc4 Ensure expression context is available to expression builders
called from field expression widgets
2015-08-22 19:01:42 +10:00
Nyall Dawson
1c1e574d64 More contexts for expression builder dialogs 2015-08-22 19:01:42 +10:00
Nyall Dawson
a7d8519c7f Ensure context is available to builders from data defined buttons 2015-08-22 19:01:42 +10:00
Nyall Dawson
bfc8f56ad4 Display variables and functions from contexts in expression builder 2015-08-22 19:01:42 +10:00
Nyall Dawson
c9c12bc7f9 Fix warnings 2015-08-22 19:01:41 +10:00
Nyall Dawson
2edc85c086 Final porting to expression contexts 2015-08-22 19:01:41 +10:00
Nyall Dawson
54f1b9bdd4 Port expression selection dialog to contexts 2015-08-22 19:01:41 +10:00
Nyall Dawson
0ed1644c50 Fix handling of expression contexts with feature requests 2015-08-22 19:01:41 +10:00
Nyall Dawson
cc6feae835 More misc porting to expression contexts 2015-08-22 19:01:41 +10:00
Nyall Dawson
000a62f33c More gui expression porting 2015-08-22 19:01:41 +10:00
Nyall Dawson
786de4b820 Port server to expression contexts 2015-08-22 19:01:41 +10:00
Nyall Dawson
a1e21f3994 Port providers to expression contexts 2015-08-22 19:01:41 +10:00
Nyall Dawson
f108dcd7c0 Follow up diagram porting 2015-08-22 19:01:41 +10:00
Nyall Dawson
430303dfc9 Port diagrams to expression contexts 2015-08-22 19:01:40 +10:00
Nyall Dawson
f82c641a3d Port attribute actions to expression contexts 2015-08-22 19:01:40 +10:00
Nyall Dawson
3b6f5915e7 Port iterators to expression contexts 2015-08-22 19:01:40 +10:00