31853 Commits

Author SHA1 Message Date
Juergen E. Fischer
fbf4d675ca de-plenk more 2016-03-25 23:08:32 +01:00
Juergen E. Fischer
962726cf66 de-plenk exclamation marks 2016-03-25 22:50:50 +01:00
Juergen E. Fischer
e1d3dd5ff6 geometry checker: refine dialog (implement #14572) 2016-03-25 22:34:06 +01:00
Juergen E. Fischer
b1a4ef27da prepare-commit.sh: show progress 2016-03-25 20:29:18 +01:00
Alexander Bruy
428ec00e5b fix typo 2016-03-25 16:21:06 +02:00
Alexander Bruy
619356ea1c [processing] add OPTIMIZE_SIZE option to gdalwarp (fix #5651) 2016-03-25 15:37:20 +02:00
Alexander Bruy
660bb27388 [processing] replace some raster icons with SVG to improve HiDPI support (refs #14474) 2016-03-25 15:19:52 +02:00
Alexander Bruy
6f7961044f [processing] refactor Virtual vector layer algorithm
Add support for unioned layers (fix #12991)
2016-03-25 15:19:52 +02:00
elpaso
2d3b813d22 Fixes an error when unloading plugins
Custom utils._import was never called, because
builtins was correctly imported (even if it missed __import__)
and  _import was then monkey patched to builtins instead of __builtin__

Tested on python 2
2016-03-25 12:17:58 +01:00
Juergen E. Fischer
8af5edce12 pyqtwrapper: update some remaining scripts 2016-03-25 10:42:17 +01:00
Juergen E. Fischer
f129540991 don't include future for python3 (followup 2b55d89) 2016-03-25 10:41:37 +01:00
Juergen E. Fischer
2b55d89d2a give qgis future (followup 15b3600) 2016-03-25 01:00:45 +01:00
Jürgen Fischer
0d21e640a9 Merge pull request #2944 from rouault/fix_crash_on_invalid_spatialite_iterator
[Spatialite] Fix crash on iterator closing if connection failed.
2016-03-24 20:21:11 +01:00
Juergen E. Fischer
ea4a0e27d9 testqgswcspublicservers: also update network timeout (followup 3894159) 2016-03-24 18:39:00 +01:00
Even Rouault
2b15eaa14d [Spatialite] Fix crash on iterator closing if connection failed.
If an iterator fails to open the spatialite database (mHandle == nullptr
in QgsSpatiaLiteFeatureIterator::QgsSpatiaLiteFeatureIterator() ),
a crash will occur at the destruction of the QgsSpatiaLiteFeatureSource,
due to the iterator not being removed from the list of active iterators.

Currently QgsSpatiaLiteFeatureIterator::close() does not call
iteratorClosed() if mHandle is invalid, which later causes
QgsAbstractFeatureSource::~QgsAbstractFeatureSource() to try calling
the close() method of a now defunct iterator.

If not applying the patch, the added test case crashes with:

177: src/providers/spatialite/qgsspatialiteconnection.cpp: 736: (openDb) [1ms] New sqlite connection for /tmp/test.sqlite.corrupt
177: src/providers/spatialite/qgsspatialiteconnection.cpp: 750: (openDb) [1ms] Failure while connecting to: /tmp/test.sqlite.corrupt
177:
177: invalid metadata tables
177: src/core/qgsfeaturerequest.cpp: 259: (~QgsAbstractFeatureSource) [0ms] closing active iterator
177: CMake Error at PyQgsSpatialiteProvider.cmake:22 (MESSAGE):
177:   Test failed: Segmentation fault
2016-03-24 18:37:17 +01:00
Juergen E. Fischer
90e624d8f2 don't strip utf8 in log 2016-03-24 18:28:43 +01:00
Jürgen Fischer
38941596c4 Merge pull request #2943 from rouault/fix_networkTimeout
Use consistant default value of 60000ms for /qgis/networkAndProxy/networkTimeout
2016-03-24 18:27:39 +01:00
Even Rouault
f3872914ce Use consistant default value of 60000ms for /qgis/networkAndProxy/networkTimeout
Currently there's an inconsistancy between the Options dialog that displays a
default value of 60000ms for network request timeouts, whereas places in the
code use 20000ms. I propose to align on 60000s, since there are occurrences
of network requests, for example big WFS GetFeature requests, that can take
more than 20s to start.
2016-03-24 17:11:14 +01:00
Hugo Mercier
140b51728a Merge pull request #2915 from mhugo/fix_vlayers
Various fixes for virtual layers
2016-03-24 15:48:51 +01:00
Juergen E. Fischer
15b36005ad debian packaging: limit python-future to stretch, sid, wily and xenial
TODO add internal python-future for others
2016-03-24 09:53:39 +01:00
Matthias Kuhn
f669af06fa Fix indentation 2016-03-24 06:48:23 +01:00
Matthias Kuhn
a46efeea69 Some style improvements for test 2016-03-23 23:33:03 +01:00
Jürgen Fischer
b24d5eaeb3 Merge pull request #2923 from nyalldawson/fix_14407
Don't force use of SQL dialect when running ogr queries (fix #14407)
2016-03-23 22:14:35 +01:00
Juergen E. Fischer
40611d7885 Reenable fcgi and server on osx (followup 53d40e8) 2016-03-23 21:36:41 +01:00
Jürgen Fischer
9767bd054a Merge pull request #2940 from rouault/spatialite_bind_blob_fix
[Spatialite] Use correct free function for sqlite3_bind_blob of geome…
2016-03-23 21:14:01 +01:00
Even Rouault
2e04162e37 [Spatialite] Use correct free function for sqlite3_bind_blob of geometries
Currently sqlite3_bind_blob() uses free() as the free function of WKB
blobs returned by convertFromGeosWKB(). But those are allocated with
new[] and should consequently be freed with delete[].

Spotted by Valgrind:
==4014== Mismatched free() / delete / delete []
==4014==    at 0x4C287BE: free (vg_replace_malloc.c:446)
==4014==    by 0xE42E481: sqlite3VdbeMemReleaseExternal (sqlite3.c:57237)
==4014==    by 0xE42E4E3: sqlite3VdbeMemRelease (sqlite3.c:57252)
==4014==    by 0xE42EC3E: releaseMemArray (sqlite3.c:59208)
==4014==    by 0xE42ED1E: sqlite3VdbeDeleteObject (sqlite3.c:60561)
==4014==    by 0xE46A6DB: sqlite3VdbeFinalize (sqlite3.c:60528)
==4014==    by 0xE46A916: sqlite3_finalize (sqlite3.c:61431)
==4014==    by 0x7FB23958: QgsSpatiaLiteProvider::addFeatures(QList<QgsFeature>&) (qgsspatialiteprovider.cpp:3752)
==4014==  Address 0x8e2a8b30 is 0 bytes inside a block of size 94 alloc'd
==4014==    at 0x4C29520: operator new[](unsigned long) (vg_replace_malloc.c:363)
==4014==    by 0x7FB1B964: QgsSpatiaLiteProvider::convertFromGeosWKB(unsigned char const*, int, unsigned char**, int*, int) (qgsspatialiteprovider.cpp:1341)
==4014==    by 0x7FB234B5: QgsSpatiaLiteProvider::addFeatures(QList<QgsFeature>&) (qgsspatialiteprovider.cpp:3676)
2016-03-23 19:07:41 +01:00
Hugo Mercier
7dbc0bf819 [db manager] Fix virtual layers plugin (fixes #14404) 2016-03-23 17:39:41 +01:00
Hugo Mercier
3d1601046c Fix virtual layer UI tooltips 2016-03-23 17:07:19 +01:00
Hugo Mercier
f14bc8c4d9 Virtual layer: Be case insensitive when looking for a layer name 2016-03-23 17:07:19 +01:00
Hugo Mercier
d87c3813e2 Add a right click action to edit virtual layer settings 2016-03-23 17:07:19 +01:00
Hugo Mercier
ee81c6b0c3 Fix the virtual layer icon text 2016-03-23 17:07:19 +01:00
Alexander Bruy
70e2696be5 Merge pull request #2936 from sept-en/master
[processing] fix filter in Processing settings dialog. Add ability to specify mininal required number of items for MultipleInput parameter (fix #11469, fix #12580)
2016-03-23 17:23:08 +02:00
Matthias Kuhn
4b5796497a Merge pull request #2939 from rouault/missing_sqlite3_include_pyspatialite
Add missing SQLITE3_INCLUDE_DIR in pyspatialite CMakeLists.txt
2016-03-23 16:16:55 +01:00
Even Rouault
d830d91764 Add missing SQLITE3_INCLUDE_DIR in pyspatialite CMakeLists.txt 2016-03-23 16:03:58 +01:00
Juergen E. Fischer
8fdf48507b oracle provider: refactor uri handling in oracle provider (followup d161612) 2016-03-23 15:49:35 +01:00
Stéphane Brunner
cf22cab3e9 Fix the master (merge without tests pass :-( )
Related to #2893
2016-03-23 13:53:04 +01:00
Septen
f0be0457d5 Typo fixes. 2016-03-23 15:25:15 +03:00
volaya
d808ef9ab6 Merge pull request #2893 from NaturalGIS/processing_gdalwarp_extent
processing: add extent parameter to gdal_warp
2016-03-23 10:55:13 +01:00
volaya
48104d5737 Merge pull request #2891 from csandor/patch-1
Table names in postgresql can be max 63 characters long
2016-03-23 10:41:40 +01:00
volaya
2e6fcf57d6 Merge pull request #2865 from medspx/processing_raster_bunch
[Processing] Add the last GRASS7 r.* algorithms
2016-03-23 10:39:58 +01:00
Matthias Kuhn
bec849c4f5 Merge pull request #2935 from matakuka/dissolve
changed check for validity from isGeosValid() to validateGeometry()
2016-03-23 09:48:27 +01:00
Matthias Kuhn
e6c5301cf8 Don't run qt5 tests in parallel 2016-03-23 09:43:32 +01:00
Juergen E. Fischer
ded1e045c9 indentation fix 2016-03-23 08:06:22 +01:00
Septen
736be486e7 Typo fixes. Stylystic fixes. 2016-03-23 05:43:59 +03:00
Juergen E. Fischer
45c9ea2355 2to3:
* drop libpasteurize.fixes.fix_division
* replace lib2to3.fixes.fix_import with libfuturize.fixes.fix_absolute_import (with PyQt exclude plus AlgorithmsTestBase)
* drop lib2to3.fixes.fix_print (replaced with libfuturize.fixes.fix_print_with_import)
2016-03-23 01:14:33 +01:00
Septen
4b75f4e0e3 ParameterMultipleInput: added tests. 2016-03-23 01:23:05 +03:00
Septen
d5acc211c8 ParameterMultipleInput minor fixes. 2016-03-23 01:22:44 +03:00
Septen
8c9eddcdc6 Some PEP8 fixes. 2016-03-23 00:55:36 +03:00
Maximilian Krambach
097b18190c identation errors and wrong file paths 2016-03-22 22:01:21 +01:00
Septen
4a046b7db1 Merge branch 'master' of git://github.com/qgis/QGIS 2016-03-22 23:51:59 +03:00