32114 Commits

Author SHA1 Message Date
Nyall Dawson
0c5fa81126 Fix huge legend item size when symbol uses map unit sizes (fix #13979)
Add unit test
2016-04-11 15:34:49 +10:00
Nyall Dawson
e21de0394d Add methods for retrieving and setting size units for QgsMarkerSymbolV2 2016-04-11 15:34:43 +10:00
Nyall Dawson
25ad0af86c [symbology] Add explanatory text for 0 line widths (fix #9937) 2016-04-11 08:42:54 +10:00
Alexander Bruy
8eb79dbb91 [processing] fix missed quotes in OTB provider (fix #14557) 2016-04-10 11:39:29 +03:00
Alexander Bruy
badea8ceb2 [processing] fix GRASS icon 2016-04-10 11:32:16 +03:00
Alexander Bruy
525194dc0b [processing] don't ask for MSYS folder for GRASS7 (fix #14431) 2016-04-10 11:31:46 +03:00
Alexander Bruy
391e14ac96 Merge pull request #2988 from nyalldawson/dissolve
[processing] Use unary union in dissolve
2016-04-10 09:23:08 +03:00
Nyall Dawson
ae59b733c3 [processing] Use unary union in dissolve (much faster for many
complex geometry inputs)
2016-04-10 12:58:01 +10:00
Jürgen Fischer
7d235d2b0c Merge pull request #2987 from rouault/wfs_uppercase_attribute
[WFS] Fix support of attribute names in upper-case
2016-04-10 01:14:21 +02:00
Nyall Dawson
f90f999eb4 Fix typo 2016-04-10 08:49:30 +10:00
Even Rouault
a72fcb8fe1 [WFS] Fix support of attribute names in upper-case
Bugfix of issue introduced in commit 9040ec1baf33e55a9ba5abcc4fa2ee18d54a4212

When doing the spatialite cache initialization with OGR, the attribute
names get 'laundered' in lower case, which makes their matching afterwards
fail. Fix this. And also handle the situation where an attribute would
be named 'geometry'
2016-04-10 00:30:35 +02:00
Juergen E. Fischer
fa3aba348c fix 1050174 2016-04-09 23:21:23 +02:00
Juergen E. Fischer
1050174532 spatialite provider: prefer rowid as primary key where available (and some cleanups)
fixes #14575, fixes #14626
2016-04-09 22:32:17 +02:00
Matthias Kuhn
289776417d [travis] No need to wait for slow jobs to finish on failure 2016-04-09 15:32:29 +02:00
Matthias Kuhn
e7c7f85b30 [travis] Clang 3.8 for Qt5 buildss 2016-04-09 15:14:56 +02:00
Matthias Kuhn
79e3e0e9f1 [travis] Clang 3.8 for Qt4 builds 2016-04-09 15:14:04 +02:00
Nyall Dawson
156721b380 Use average mode for align raster downsample tests
GDAL 2.0 changed (fixed) the bilinear downsampling algorithm, so
switch to the average algorithm so that test results are the same
for GDAL versions >= 2.0 and < 2.0.
2016-04-09 09:48:47 +02:00
Matthias Kuhn
2ee6200eb0 @cond 2016-04-09 09:48:47 +02:00
QGEP
6ea74d6234 Workaround a instable system call 2016-04-09 09:48:46 +02:00
Matthias Kuhn
fa90a7bb7c ogrinfo reports null geometry features differently 2016-04-09 09:48:46 +02:00
Matthias Kuhn
f88cf7de8a Drop processing algorithm comparison precision 2016-04-09 09:48:46 +02:00
Matthias Kuhn
c825f46534 Writing shapefiles with Z dimensions is gdal version dependent 2016-04-09 09:48:46 +02:00
Matthias Kuhn
21702baeab Container based Qt4 builds 2016-04-09 09:48:46 +02:00
Nyall Dawson
965cef2b2e Indentation fix 2016-04-09 10:55:27 +10:00
Nyall Dawson
1b4bd47076 [composer] New QSortFilterProxyModel for filtering items by type
and new widget QgsComposerItemComboBox for showing matching composer
items.

Swap existing comboboxes to use the new widget, which removes a lot
of fragile code designed to allow selection of items. Additionally
the combobox now show the correct item id rather than always showing
"Map 0/1/..."
2016-04-09 09:38:09 +10:00
Nyall Dawson
4764b53518 [composer] Fix world file map is not restored from project 2016-04-09 09:38:09 +10:00
Nyall Dawson
8722acea57 [browser] Set focus to filter edit when filter activated
Also clean up some code
2016-04-09 09:38:09 +10:00
Nyall Dawson
edee876874 Merge pull request #2985 from manisandro/geom_checker_fixes
Geom checker fixes
2016-04-09 09:14:15 +10:00
Juergen E. Fischer
d07bc18353 oracle provider: handle empty geometries (fixes #14631) 2016-04-08 21:46:19 +02:00
Juergen E. Fischer
96148e36ff fix python future installation (followup 5895780) 2016-04-08 21:02:29 +02:00
Jürgen Fischer
644eec66a5 Merge pull request #2984 from rouault/fix_thread_unsafe_init_of_QgsExpression_functions
Fix thread-unsafe initialization of QgsExpression::Functions()
2016-04-08 19:47:46 +02:00
Matthias Kuhn
9b9377fa87 Fixup b6aee93 2016-04-08 19:23:57 +02:00
Even Rouault
d30836ea1a Fix thread-unsafe initialization of QgsExpression::Functions()
The method initializes the gmFunctions static member, without any mutex protection.
This turned out to cause random crashes in the tests of the WFS provider since the downloader
thread may evaluate an expression, in parallel of the main thread, which does the same.
This was mainly seen on Mac Travis (2 crashes + 1 failures, over 50 iterations), when
parallelizing tests so as to get particular scheduling :
https://travis-ci.org/rouault/Quantum-GIS/builds/121720556.
But I could finally reproduce it systematically on my Linux box when inserting the following sleep.

diff --git a/src/providers/wfs/qgswfsshareddata.cpp b/src/providers/wfs/qgswfsshareddata.cpp
index adc7042..e9e4577 100644
--- a/src/providers/wfs/qgswfsshareddata.cpp
+++ b/src/providers/wfs/qgswfsshareddata.cpp
@@ -426,6 +426,7 @@ int QgsWFSSharedData::registerToCache( QgsWFSFeatureIterator* iterator, QgsRecta
     connect( mDownloader, SIGNAL( ready() ), &loop, SLOT( quit() ) );
     mDownloader->start();
     loop.exec( QEventLoop::ExcludeUserInputEvents );
+    usleep( 100 * 1000 );
   }
   if ( mDownloadFinished )
     return -1;

After applying this commit, the Mac builder is fine:
https://travis-ci.org/rouault/Quantum-GIS/builds/121756158
2016-04-08 19:19:49 +02:00
Matthias Kuhn
b6aee93563 Align raster code improvements
* Fix x/y mismatch
 * Improve strings for translation
 * Remove unrequired cast
2016-04-08 18:48:59 +02:00
rldhont
a6aa855631 [BUGFIX] QGIS Server segfault when features does not have the same fields as the layer.
In some WFS GetFeature request, with Filter or FeatureId, all the fields are not well loaded in the feature.

To fix it, we just verifying that the attribute index is lesser than the feature fields count.

Fixes #14619
2016-04-08 15:26:59 +02:00
Matthias Kuhn
e3bfec0d57 Merge pull request #2954 from tomchadwin/master
New custom CSS for https://qgis.org/api/
2016-04-08 14:12:29 +02:00
Denis Rouzaud
c397ae652e allow sorting relations in project properties 2016-04-08 08:22:19 +02:00
Denis Rouzaud
31e6d2853a be sure that layer exists 2016-04-08 07:03:18 +02:00
Denis Rouzaud
54cc56ff41 rename protected variable (starts with m), remove old comment 2016-04-08 07:00:13 +02:00
Denis Rouzaud
3c53817988 regroup duplicated code 2016-04-08 06:57:47 +02:00
Nyall Dawson
85d472e680 Merge pull request #2981 from nirvn/symbol_label_diagram_sync
[ui] add missing icons for no labels and no diagram
2016-04-08 14:13:46 +10:00
nirvn
f0a2d60c81 [ui] make symbol/label/diagram title case consistent 2016-04-08 09:48:11 +07:00
nirvn
7c3ec07aca [ui] add missing icons for no labels and no diagram 2016-04-08 09:48:11 +07:00
Matthias Kuhn
a6a77ee46b Remove remainders of buggy pg test 2016-04-07 22:51:43 +02:00
Matthias Kuhn
5cd2319c3f Also retrieve generated values for pktInt 2016-04-07 21:26:43 +02:00
Matthias Kuhn
eecd77a324 Fix postgres unit test 2016-04-07 21:24:01 +02:00
Matthias Kuhn
e98e16f1b2 Unit test for 4ec97c33 2016-04-07 15:59:22 +02:00
Matthias Kuhn
4ec97c3362 [postgres] Update primary key on insert with pktFidMap
Helps to retrieve generated keys with views
2016-04-07 15:03:41 +02:00
Denis Rouzaud
40f214b415 Revert "add todo QGIS 3: add /In,Out/ to QgsVectorLayer.addFeature (python)"
this works already, features are updated.

This reverts commit bf3f8b5920bc43cf528c9569a3d6b1000f0eef9f.
2016-04-07 14:25:42 +02:00
Matthias Kuhn
5376cbf35e Followup 297f466 pep8 2016-04-07 14:11:03 +02:00