27084 Commits

Author SHA1 Message Date
mhugent
6d61025796 Merge pull request #2054 from arnaud-morvan/join_memory_cache
Write to project join memory cache property value instead of not cache is empty
2015-05-22 16:43:49 +02:00
Nyall Dawson
9031e9849f [FEATURE] Add options under categorised renderer advanced menu to
set categories to symbols with a matching name from the style
library or an XML style file.

Thanks Lene for the great hackfest!
2015-05-23 00:42:24 +10:00
pcav
2004f22ac5 Uniform and informative output names for Processing (QGIS, final) 2015-05-22 16:39:20 +02:00
pcav
4c871bb952 Merge branch 'master' of https://github.com/qgis/QGIS 2015-05-22 16:10:01 +02:00
pcav
00f64971f7 Uniform and informative output names for Processing (QGIS, Take #2) 2015-05-22 16:09:55 +02:00
rldhont
7ab336f206 [BUGFIX] Remove extra line after header 2015-05-22 16:03:57 +02:00
pcav
efeae6f44f Merge branch 'master' of https://github.com/qgis/QGIS 2015-05-22 15:57:14 +02:00
pcav
7dacddc08a Uniform and informative output names for Processing (QGIS, Take #1) 2015-05-22 15:56:45 +02:00
Pirmin Kalberer
06ae01e009 Revert "Add connection pool for OGR provider"
This reverts commit a64ffc495e4099759dcfce292154b15f51814ba9.
2015-05-22 15:30:10 +02:00
Nyall Dawson
e5fcbc39d3 Small optimisation to data defined symbology 2015-05-22 21:39:36 +10:00
Nyall Dawson
b14896884e Merge pull request #2062 from vmora/add_tooltip
add tooltip to graduated method (color or size)
2015-05-22 13:37:53 +02:00
Jürgen Fischer
ce7b1d31ac Merge pull request #2060 from manisandro/ogrpool
Add connection pool for OGR provider (followup 0b9d1dc)
2015-05-22 13:34:56 +02:00
Nyall Dawson
f337d4137a Merge pull request #2061 from vmora/convert_old_size_scale
remove SizeScale and Rotation from Advanced Menu
2015-05-22 13:01:39 +02:00
Nyall Dawson
f81d808ca7 Correctly restore font and character for font marker widget 2015-05-22 20:59:34 +10:00
vmora
e0098a5d62 use proper type in convert functions interface 2015-05-22 12:31:03 +02:00
vmora
c49884f4ef remove unused variables 2015-05-22 12:26:51 +02:00
Nyall Dawson
ef0d413819 Data defined font marker character 2015-05-22 20:00:19 +10:00
Matthias Kuhn
97de55d117 Add new postgres provider test 2015-05-22 11:57:16 +02:00
Matthias Kuhn
8571ae7eab Convert tests/README to markdown and add more information 2015-05-22 11:57:16 +02:00
Matthias Kuhn
ec9e1464c1 Provider test 2015-05-22 11:57:16 +02:00
Matthias Kuhn
a2ae8b4e38 Add unit tests for postgres provider
basically to get a framework to test the expression compiler
2015-05-22 11:57:16 +02:00
Matthias Kuhn
babfae994b Make expression compiler configurable 2015-05-22 11:57:16 +02:00
Matthias Kuhn
a99deb8b88 [FEATURE] Send filter expressions to postgres provider
This commit allows to filter features already on server side. Only supported
expressions will be sent to the database. Expressions using unsupported
operators or functions will gracefully fallback to local evaluation.

To make use of this feature

 * Enable it in options: data sources
 * QgsFeatureRequest().setFilterExpression( expression )
 * or QgsVectorLayer::getFeatures( expression )
2015-05-22 11:57:16 +02:00
Matthias Kuhn
9b6e23d3af Add convenience method QgsVectorLayer::getFeatures( expression ) 2015-05-22 11:57:16 +02:00
Matthias Kuhn
6952a389ea Fix compiling without QtWebKit
This makes it possible to compile QGIS master for Android.
Hooray!
2015-05-22 11:48:02 +02:00
vmora
278141f331 add tooltip to graduated method (color or size) 2015-05-22 11:41:47 +02:00
vmora
9589a18930 avoid duplication of function 2015-05-22 11:08:47 +02:00
Sandro Mani
a64ffc495e Add connection pool for OGR provider 2015-05-22 10:41:35 +02:00
vmora
0bab3ca641 remove SizeScale and Rotation from Advanced Menu
The expressions used in old project are converted to symbol level
DadaDefined size and angle

Note that sice the aspect of a composite marker is fixed for symbol size
and angle, the aspect of the scaled symbol will change for symbols with
offsets and composite markers.
2015-05-22 10:33:04 +02:00
Matthias Kuhn
6075442439 Doxymentation 2015-05-22 10:27:14 +02:00
Juergen E. Fischer
5910adf55e fix windows build 2015-05-22 08:39:07 +02:00
Juergen E. Fischer
f2d4d3083b debian packaging update 2015-05-22 08:39:07 +02:00
volaya
5c3a7af532 Merge pull request #2058 from arnaud-morvan/processing-model-help
Fix processing model help saving
2015-05-22 08:37:53 +02:00
Matthias Kuhn
f5054ce702 Allow compiling QGIS without QtWebkit
This allows to compile QGIS without webkit.

1. Webkit is soon-to-be deprecated
2. Webkit is not supported on Android
3. Who needs it anyway
4. The developer map on the about page is gone with webkit disabled
5. So is the information about plugins
2015-05-21 18:11:17 +02:00
Radim Blazek
8abe726c74 [GRASS] raster import: create link by r.external if crs are the same; link icon 2015-05-21 18:04:32 +02:00
Radim Blazek
bb7943f38b new mIconRasterLink.svg 2015-05-21 18:04:32 +02:00
Radim Blazek
c0361ba3f7 fixed browser symlink icons 2015-05-21 18:04:32 +02:00
rldhont
e3a832c29e [FEATURE][SERVER] GetFeature without geometry
You can add an extra parameter GeometryName with the value to NONE or None or
 none in GetFeature WFS Request to only have fields.
2015-05-21 18:02:03 +02:00
arnaud.morvan@camptocamp.com
c19a4a70bd Fix processing model help saving and make script help content saving consistent with models behavior 2015-05-21 17:29:02 +02:00
Nyall Dawson
1e3b820da4 [FEATURE] Data defined properties for font marker 2015-05-22 01:04:02 +10:00
volaya
87f2370da3 [processing] implement alternative display names for algorithms 2015-05-21 16:53:46 +02:00
volaya
7a35d62b09 [processing] add help links for gdal/ogr alga 2015-05-21 15:44:00 +02:00
volaya
f1dc58ce01 [processing] fixed saga help links 2015-05-21 15:44:00 +02:00
volaya
c9841fb645 [processing] cosmetic improvements to gdal/ogr algs 2015-05-21 15:44:00 +02:00
Nyall Dawson
a32ac3d43a Fix broken area scaling for simple marker symbols 2015-05-21 23:38:53 +10:00
Nyall Dawson
d62794de5d [symbology] Fix potential crash in data defined symbol rotation 2015-05-21 23:38:53 +10:00
Hugo Mercier
d9f54c42fc Merge pull request #1970 from mhugo/fix_spatialite
[spatialite] Allows to use a query as a table without primary key. It will auto increments an internal counter as feature id in this case.
2015-05-21 15:19:10 +02:00
Radim Blazek
a6f1ece73b [GRASS] browser import cancel action 2015-05-21 14:23:59 +02:00
rldhont
263d89c334 [BUGFIX] GetFeatureInfo STYLES and FILTER used together
In GetFeatureInfo WMS Request, if STYLES and FILTER are used together, it's
 like FILTER is not applied.

To fix it, we check in the QgsMapLayerRegistry if the layers associated to
 QUERY_LAYERS has already created.
2015-05-21 13:56:42 +02:00
Martin Dobias
19c1dc69e9 Fix #12406 (measured area is wrong when computed on ellipsoid)
Introduced in e568493
2015-05-21 13:48:00 +02:00