34301 Commits

Author SHA1 Message Date
Nyall Dawson
014409d025 Merge pull request #3419 from nirvn/aggregate_collect_geom
[expression] support collection of geometry in the aggregate() function
2016-08-24 12:30:14 +10:00
nirvn
2a326ef8ad [FEATURE] support aggregation of geometry
This feature adds a 'collect' aggregation method resulting in a
single multipart geometry from a list of geometries. This is exposed
in the expression engine via the existing aggregate() function,
as well as a new collect() function.
2016-08-24 08:39:05 +07:00
Nyall Dawson
5d38dcbaff Merge pull request #3427 from nyalldawson/inline_map_unit
[FEATURE] Make map unit scaling dialog show inline in style dock
2016-08-24 09:37:00 +10:00
Nyall Dawson
005147b284 Fix oracle provider build
[ci skip]
2016-08-24 08:10:48 +10:00
Nyall Dawson
dfff9dd3ca Merge pull request #3404 from DelazJ/patch-13
Keep base units as default behavior (fix #15434)
2016-08-24 07:53:38 +10:00
Nyall Dawson
5735be131f [FEATURE] Make map unit scaling dialog show inline in style dock 2016-08-24 07:51:03 +10:00
Alexander Bruy
6475fd2129 fix typo 2016-08-24 00:03:07 +03:00
Nyall Dawson
e0229ad8c7 Merge pull request #3423 from nyalldawson/remove_deprecated
Remove unused QgsProvider(Count|ExtentCalc)Event classes
2016-08-24 06:59:41 +10:00
Juergen E. Fischer
f156b1f64d fix switching of projects within unicode folders
(cherry picked from commit 3951f15b6481a85b551e2f33f26c2aeb6687a24a)
2016-08-23 20:46:39 +02:00
Denis Rouzaud
50099ae7d4 followup 579ec8b18e3dc8b6365bb8668fbd90a2d281935a 2016-08-23 16:09:50 +02:00
Denis Rouzaud
579ec8b18e remove bitmap cursors
use window system cursors instead
followup 3624d7b4d818628b7d7d446ff642f5be1cc16773
2016-08-23 15:42:53 +02:00
Denis Rouzaud
f5aa28bb32 rename QgsFieldProxyModel::Filter All to AllTypes 2016-08-23 15:42:37 +02:00
Denis Rouzaud
bd887bac7b sort api_break document 2016-08-23 15:31:33 +02:00
Denis Rouzaud
7fdade1a3a remove some deprecated methods, rename QgsAnnotation::mapPositionFixed() to hasFixedMapPosition() 2016-08-23 15:00:56 +02:00
Alexander Bruy
eb308a604d fix open() call 2016-08-23 15:49:03 +03:00
volaya
008d3cd79a [processing] fixed extent selection from batch processing interface
fixes #15408
2016-08-23 14:41:20 +02:00
Denis Rouzaud
da599495aa add missing inclue of qgslogger 2016-08-23 14:34:46 +02:00
Alexander Bruy
3711a17066 add missed codecs import 2016-08-23 15:18:28 +03:00
Alexander Bruy
d7634bafff remove unused imports 2016-08-23 15:01:39 +03:00
Matthias Kuhn
5edf6f61cc Merge pull request #3414 from aaime/uom_rescale
Emit valid SLD when mm are used as symbol unit
2016-08-23 13:54:21 +02:00
Nyall Dawson
a10b8fc3e5 Make QgsVectorDataProvider defaults methods more efficient 2016-08-23 20:35:52 +10:00
Nyall Dawson
5ac34ce86b Restore cancel button in color dialog when used from layer properties 2016-08-23 20:35:52 +10:00
Alexander Bruy
993aa842fb forgot to remove import 2016-08-23 13:34:51 +03:00
Alexander Bruy
6a7fa7dd5a [processing] add missed error() method 2016-08-23 11:25:14 +03:00
Alexander Bruy
640f93e758 [processing] update TauDEM tools to latest TauDEM version 2016-08-23 11:18:50 +03:00
Alexander Bruy
19a6a5fb90 [processing] fix CMakeLists.txt 2016-08-23 11:18:50 +03:00
Alexander Bruy
7866bdadf1 [processing] remove obsolete TauDEM multifile stuff 2016-08-23 11:18:49 +03:00
Harrissou Sant-anna
2040cdf29f Keep base units as default behavior (fix #15434) 2016-08-23 09:52:41 +02:00
Alexander Bruy
3bfd99864e Merge branch 'otb_apps_export_improvment' 2016-08-23 10:17:49 +03:00
Alexander Bruy
df248dbe93 fix indentation 2016-08-23 10:17:03 +03:00
Alexander Bruy
10f72cd762 Merge branch 'otb_apps_export_improvment' of https://github.com/grizonnetm/QGIS into otb_apps_export_improvment 2016-08-23 10:16:24 +03:00
Andrea Aime
a0adcc22e7 Emit valid SLD when on screen mm are used
SLD does not have a notion of on screen mm, rescale them to pixels to get an equivalent, more valid and more widely usable, output
2016-08-23 08:14:21 +02:00
Nyall Dawson
cb313761ca Remove unused QgsProvider(Count|ExtentCalc)Event classes 2016-08-23 10:03:52 +10:00
Manuel Grizonnet
ce0a2ae062 forget to commit xml descriptors for otb 5.6 2016-08-22 15:56:30 +02:00
Manuel Grizonnet
d772a68472 Update otb processing maintenance files to version 5.6.0 2016-08-22 15:39:41 +02:00
Denis Rouzaud
3251eced69 run astyle 2016-08-22 10:15:47 +02:00
Tim Sutton
c47b4ca995 Spatialise error message fix (#3416)
* Fixed issue where opening an invalid spatialite db fails and gives and poor warning message

* Fix formatting
2016-08-22 08:34:07 +02:00
Nyall Dawson
5a41748b86 [browser] Correctly refresh postgres schemas when dropping tables 2016-08-22 14:39:28 +10:00
Martin Dobias
26dd13063e [FEATURE] Drag'n'drop layers from layer tree view to browser dock
Makes it easy to e.g. store your temporary layers in PostGIS
2016-08-22 10:38:10 +08:00
Nyall Dawson
b101510c84 Merge pull request #3417 from nyalldawson/expression_line_edit
Expression line edit widget
2016-08-22 09:42:30 +10:00
Nyall Dawson
c468a0471c Use QgsExpressionLineEdit for geometry generator expression
The full expression builder widget is too large to fit
comfortable in the geometry generator setting widget,
especially when used in layer styling dock mode.
2016-08-22 08:39:33 +10:00
Nyall Dawson
ae3d6e7697 Remove minimum size from QgsCodeEditor (seems unnecessary) 2016-08-22 08:39:33 +10:00
Nyall Dawson
8f4ca47b70 New QgsExpressionLineEdit widget
Consists of a filter line edit + button to open expression builder

This widget is a bit like the existing QgsFieldExpressionWidget,
but for cases where a combo box does not make sense. Eg, when
no fields are available for the expression to use.

It also has an optional multiline mode, which allows it to be
used in place of the full-blown QgsExpressionBuilderWidget when
space is a problem.
2016-08-22 08:39:33 +10:00
Nyall Dawson
86feb6d376 Indentation 2016-08-22 07:42:27 +10:00
Nyall Dawson
77750ada98 Merge pull request #3413 from nyalldawson/line_locate_point
Linear referencing functions
2016-08-22 06:25:44 +10:00
Manuel Grizonnet
bf7db728f3 ENH: update log info when parsing otb apps 2016-08-21 20:55:29 +02:00
Manuel Grizonnet
82f2726d7f ENH: remove useless QApplication and prefer to use QGIS_PREFIX_PATH 2016-08-21 20:34:08 +02:00
Matthias Kuhn
f64adb9675 Merge pull request #3412 from medspx/PyQtQFileDialogFix
[PyQt] Add a lib2to3 custom fix to handle QFileDialog methods in PyQt5
2016-08-21 13:42:26 +02:00
Nyall Dawson
e110ba7d54 [FEATURE] Add linear referencing functions to expression engine
Adds new functions
- line_interpolate_point: interpolates a point by a given distance
along a linestring geometry
- line_locate_point: returns the distance along a linestring to
the closest position on the linestring to a given point
2016-08-21 20:59:57 +10:00
Nyall Dawson
409dfdf539 [FEATURE] Expose GEOS linear referencing function to QgsGeometry
Adds a new QgsGeometry::lineLocatePoint() function for
retrieving the distance along a linestring to the nearest
position on the linestring to a given point.
2016-08-21 20:48:54 +10:00