5047 Commits

Author SHA1 Message Date
Nyall Dawson
87022a4efd Add mode for drawing just label rects for debugging
Sponsored by City of Uster
2015-08-28 11:01:46 +10:00
Nyall Dawson
e04f4018d1 Fix warnings 2015-08-26 06:52:02 +10:00
Juergen E. Fischer
05b8a985a5 indentation update 2015-08-25 20:04:50 +02: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
24b8405d58 Ensure standard expressions functions are deleted on exit
(Avoids a lot of LeakSanitiser noise)
2015-08-25 21:40:32 +10:00
Nathan Woodrow
01d635a9ae Merge remote-tracking branch 'origin' 2015-08-25 21:39:52 +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
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
mhugent
5807875797 Merge pull request #2268 from mhugent/curve_capture_tool
Curve capture tool
2015-08-24 18:18:40 +02:00
Juergen E. Fischer
aa36491347 more unicoding (followup 697d2af) 2015-08-24 16:39:02 +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
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
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
f74db81b9a Hide contextual functions from builder unless provided by context 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
be26c61bc4 Ensure expression context is available to expression builders
called from field expression widgets
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
54f1b9bdd4 Port expression selection dialog to contexts 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
3b6f5915e7 Port iterators to expression contexts 2015-08-22 19:01:40 +10:00
Nyall Dawson
43bcc0c2a5 Finish porting composer to expression contexts 2015-08-22 19:01:40 +10:00
Nyall Dawson
d6d6827b6e Port symbols to expression contexts 2015-08-22 19:01:40 +10:00
Nyall Dawson
1a7acb0d98 Port labelling to expression contexts 2015-08-22 19:01:40 +10:00
Nyall Dawson
5e03016b3a Update QgsDataDefined for expression contexts 2015-08-22 19:01:40 +10:00
Nyall Dawson
2bb1c8a31b Start on implementing contexts for render operations 2015-08-22 19:01:39 +10:00
Nyall Dawson
a0e35a3893 Switch some composer expressions to contexts 2015-08-22 19:01:39 +10:00
Nyall Dawson
c1adf623af Port field calculator to contexts 2015-08-22 19:01:39 +10:00
Nyall Dawson
d6542276e7 Add a bunch of layer related variables, including things like
metadata, extent, crs, feature count, geometry types, etc...
2015-08-22 19:01:39 +10:00
Nyall Dawson
1c7a5b2dba Add editor widget for editing QgsExpressionContextScope variables 2015-08-22 19:01:39 +10:00
Nyall Dawson
f6e0ce788e New framework for context based expressions
This commit adds the ability for expressions to be evaluated against
specific contexts. It replaces the previous behaviour where
expressions were evaluated against a specific feature and could
utilise fragile global "special columns".

Now, expressions are instead evaluated using a context designed for
each individual expression. This is done via QgsExpressionContext
and QgsExpressionContextScope objects.

A QgsExpressionContextScope encapsulates the variables and functions
relating to a specific context. For instance, scopes can be created
for "global" variables (such as QGIS version, platform, and user-set
variables specified within the QGIS options dialog. Think things
like user name, work department, etc), or for "project" variables
(eg project path, title, filename, and user-set variables set
through the project properties dialog. Project version, reference
number, that kind of thing). Many more scopes are planned, including
map layer scopes (variables for layer name, id, user-set variables
through the layer properties dialog), composer scopes, etc...

QgsExpressionContextScopes are 'stacked' into a QgsExpressionContext
object. Scopes added later to a QgsExpressionContext will override
any variables or functions provided by earlier scopes, so for
instance a user could override their global 'author' variable set
within QGIS options with a different 'author' set via the project
properties dialog.

The intended use is that a QgsExpressionContext is created before
a batch set of QgsExpression evaluations. Scopes are then added to
the context based on what makes sense for that particular
expression. Eg, almost all contexts will consist of the global
scope and project scope, and then additional scopes as required.
So a composer label would be evaluated against a context
consisting of the global scope, project scope, composition scope
and finally composer item scope. The batch set of expression
evaluations would then be performed using this context, after which
the context is discarded. In other words, a context is designed
for use for one specific set of expression evaluations only.
2015-08-22 19:01:39 +10:00
Nyall Dawson
f5de32779f Add missing sip changes 2015-08-22 19:01:39 +10:00
Nyall Dawson
57669e71c0 Make QgsRenderContext available to more renderer methods 2015-08-22 19:01:38 +10:00
Giuseppe Sucameli
4dc7eba107 DBManager: fix minor issues due to Query dialogs repleaced with Query tabs (ref commit 5fb52fa1edc)
In detail:
* hide close button from Info, Table and Preview tabs (it should work on Mac as well),
* always display dbtype icon into query tab
* show database name in tab text (otherwise we dunno which db the query is executed against)
* restore original tab text when query name becomes empty
2015-08-22 02:34:53 +02:00
Tom Kralidis
a8bd9995e1 update MetaSearch plugin metadata 2015-08-21 09:11:40 -04:00
Nyall Dawson
9d984b163e Immediately apply conditional formatting changes to table 2015-08-21 10:04:22 +10:00
Nyall Dawson
6a3357fab8 Fix warnings, add missing sip bindings 2015-08-21 05:45:49 +10:00
Nathan Woodrow
faa32f36cf [FEATURE] Conditional formatting for attribute table cells 2015-08-20 23:06:31 +10:00
volaya
3ff3b02ad7 Merge pull request #2247 from spencerrecneps/master
[Processing] Fixed bad variable references
2015-08-20 14:42:31 +02:00
Markus Neteler
424d3d337e Update Grass7Utils.py
In batchjob, use GRASS_MESSAGE_FORMAT=plain
2015-08-20 10:36:22 +02:00
Nyall Dawson
ca04bb6409 Allow more customisation of QgsNewNameDialog 2015-08-20 16:09:52 +10:00
Juergen E. Fischer
d2282a77c7 processing: when using batch jobs remove GISBASE from environment when calling GRASS (fixes #13072) 2015-08-20 01:10:43 +02:00
Bernhard Ströbl
1f81109b4a [PROCESSING] Fix Progress bar in Dissolve 2015-08-19 16:02:10 +02:00