33451 Commits

Author SHA1 Message Date
Juergen E. Fischer
2c112f96ca gdal tools: use native file dialogs (fixes #5500) 2016-06-21 00:16:47 +02:00
Even Rouault
ab98858b98 Fix build failure due to dabc3b16d72184da2867e0b3ae37b1d45928cddd 2016-06-20 22:03:11 +02:00
Matteo
f3bbf897d2 Small fix in write.csv option (#3225) 2016-06-20 21:23:05 +02:00
Even Rouault
6ea03ea4e2 [Geometry] Fix various issues related to Wkb/Wkt import
- Make QgsCurvePolygonV2::fromWkb() accept CompoundCurveM sub-geometries
- Make QgsGeometryCollectionV2::fromWkb() validate the sub-geometry type,
  so that QgsGeometryCollectionV2 subclasses do not import incompatible
  sub-geometries
- Make QgsGeometryCollectionV2::fromWkt() accept curve sub-geometries
- Make QgsMultiPolygonV2::addGeometry() accept only Polygon and not
  CurvePolygon
- Add tests
2016-06-20 21:08:51 +02:00
Even Rouault
dabc3b16d7 [Geometry] Fix deleteVertex() for CircularString, CompoundCurve and CurvePolygon
In some situations, deleteVertex() could generate an invalid geometry, causing
later crashes due to unexpected structure.

Fix #15087
2016-06-20 17:05:16 +02:00
Nathan Woodrow
b015fb4cea [styledock] Hide/Show back button correctly 2016-06-20 20:56:34 +10:00
Nathan Woodrow
0914b7440f Rename Map Styling Dock to Layer Styling Dock 2016-06-20 20:56:34 +10:00
Even Rouault
1cd78083f8 QgsAttributeTableFilterModel::headerData(): fix crash on layer with no field
Fix crash on qgis_attributetabletest and when displaying the attribute
table of a layer without any attribute field.

Was likely introduced in 4a3a814d087c82f869b42a4d1375ee0f92d045fc, so master
only
2016-06-20 12:55:17 +02:00
Even Rouault
4c56fa6e8e [OGR provider] Make changeGeometryValues() accept null geometry
Fixes #15081
2016-06-20 12:20:41 +02:00
Nyall Dawson
0ba128694a Tighten margins and spacing on various docks
Fixes a rendering artefact on OSX toolbars and leaves more
space for content.

Let me know if this looks bad on Windows and I'll ifdef it out
2016-06-20 20:09:52 +10:00
Even Rouault
85128c5419 QgsCoordinateReferenceSystem::setProj4String(): harden validation
OSRImportFromProj4() may accept strings that are not valid proj.4 strings,
e.g if they lack a +ellps parameter, it will automatically add +ellps=WGS84, but as
we use the original mProj4 with QgsCoordinateTransform, it will fail to initialize
so better detect it now.

Fixes #14844
2016-06-20 11:30:29 +02:00
Nyall Dawson
878394104a Merge pull request #3221 from nirvn/bookmark_ui_imp
[bookmarks] improve zoom to bookmark icon and UI
2016-06-20 18:28:00 +10:00
nirvn
43bdcdb7ca [bookmarks] improve zoom to bookmark icon and UI 2016-06-20 14:22:40 +07:00
Mathieu Pellerin
63cbf8778e [styledock] open via double click action legend setting (#3220) 2016-06-20 17:09:48 +10:00
Nyall Dawson
3672ab9e50 Merge pull request #3219 from nirvn/composer_icons
[gui/hidpi] vectorize composer toolbar & attribute table toolbar icons
2016-06-20 15:07:09 +10:00
nirvn
aae8fefd91 [gui/hidpi] vectorize attribute table toolbar icons 2016-06-20 11:49:06 +07:00
nirvn
ace324b636 [gui/hidpi] vectorize composer toolbar icons 2016-06-20 11:17:15 +07:00
Nyall Dawson
1053c5e126 Better reflect layer capabilities in attribute dialog toolbar 2016-06-20 14:07:14 +10:00
Nyall Dawson
1156c8dee0 Properly set multiedit button state 2016-06-20 14:07:14 +10:00
Nyall Dawson
8261275a9a Respect icon size in attribute table, use svg icons 2016-06-20 14:07:14 +10:00
Nyall Dawson
33d64dc479 Use a real toolbar for attribute table dialog
- Fixes style issues on various platforms (esp. OSX)
- Allows resizing the window smaller and actions get moved
to overflow menu
2016-06-20 14:07:14 +10:00
Mathieu Pellerin
fcbaf7fa2f [styledock] create a style preset icon (#3210) 2016-06-20 13:35:48 +10:00
Nathan Woodrow
03ea9fb9ca Remove unused variable 2016-06-20 11:16:13 +10:00
Nathan Woodrow
7a572c4ff8 [style dock] Refactor API. Move back button outside scrollarea.
Clean up API. Remove QgsPanelWidgetPage - no longer needed
QgsPanelWidgetStack widget manages back button and breadcrumb.
QgsPanelWidget manages state of active widget.
2016-06-20 10:48:53 +10:00
Mathieu Pellerin
29df8a9f08 [gui/hidpi] vectorize advanced digitizing toolbar icons (#3216)
* [gui/hidpi] vectorize advanced digitizing toolbar icons

* [gui/hidpi] vectorize label toolbar icons
2016-06-19 17:37:37 +10:00
Even Rouault
8f62a57301 [DXF export] Replace newline character in layer name by underscore
Fixes #15067
2016-06-18 21:04:16 +02:00
Even Rouault
6bc0313a1e [OGR provider] Make ogrWkbGeometryTypeName() correctly display M/ZM geometry names, as potentially returned by GDAL 2.1 2016-06-18 19:30:43 +02:00
Even Rouault
22dfd764eb [OGR provider] Avoid considering mix of Polygon and CurvePolygon as 2 sublayers
Fixes #15066
2016-06-18 19:21:10 +02:00
Even Rouault
3b65568c73 [OGR provider] Improve detection of layer geometry type
When a OGR layer is of geometry type "unknown", we use the
geometry of the first feature to guess the geometry type. But
if this feature has no geometry, then we assume that we have no
geometry for the whole layer. This is a bit extreme. Let us
allow to probe a few features before giving up.

Fixes #15065
2016-06-18 18:36:47 +02:00
Even Rouault
7b7c3773d8 [OGR provider] Do not return wkbUnknown25D, wkbUnknownM/Z/ZM layer geometry types
Those are illegal QgsWKBTypes::Type / QGis::WkbType values, and can cause
undefined behaviour outside of the provider.

Fixes #15064
2016-06-18 18:22:30 +02:00
Even Rouault
aceef9ed47 QgsRendererV2PropertiesDialog::syncToLayer(): make it robust to NULL renderer
Fixes #15064

Probably just a band-aid, proper fix to follow in OGR provider itself.
2016-06-18 18:21:20 +02:00
Even Rouault
f3549981a6 [WFS provider] Add heuristics to detect MapServer WFS 1.1 behaviour (sometimes)
Fix #15061

MapServer honours EPSG axis order in WFS 1.1, but returns srsName in GetFeature
response with EPSG:XXXX syntax instead of urn EPSG srs. This confuses the GML
parser that thinks that no axis inversion should then happen.

The heuristics here consist in checking the envelope of the response with the
capabilities extent.

This should be safe and should work for layers with non global extent, but will
not detect all issues.

Proper fix is either to force WFS 1.0, or upgrade to MapServer 7.0 with WFS 2.0
2016-06-18 15:10:44 +02:00
Nyall Dawson
eee599e0be Merge pull request #3215 from nirvn/raster_icons
[gui/hidpi] vectorize raster toolbar icons
2016-06-18 14:40:55 +10:00
nirvn
2a82caf173 [gui/hidpi] vectorize raster toolbar icons 2016-06-18 10:31:50 +07:00
Sandro Santilli
a211c982cf Allow to undo/redo composer grouping/ungrouping
Fixes #11371 (crash on ungrouping after moving the group) and more
undo/redo related issues.

Enable pending test for the crash (now passing) and add many more
undo/redo related ones (including signals testing).

Includes a new QgsGroupUngroupItemsCommand class
and its SIP bindings.
2016-06-17 13:41:56 +02:00
Nyall Dawson
efdbb87406 Fix Coverity null pointer dereference warning 2016-06-17 20:43:50 +10:00
Nyall Dawson
1ff187583b Fix uninitialized member 2016-06-17 20:42:27 +10:00
Nyall Dawson
ee23bc22a5 Fix uninitialized member 2016-06-17 20:39:22 +10:00
Matthias Kuhn
15e9e0a903 [UX] Show feature id in attribute table tooltip 2016-06-17 10:13:27 +02:00
Nyall Dawson
44112675fb [roadgraph] Allow use of virtual and joined fields (fix #15041)
Also modernise some code
2016-06-17 12:23:51 +10:00
Nyall Dawson
5d54b5b4a5 Some roadgraph plugin ux improvements 2016-06-17 11:50:26 +10:00
Nyall Dawson
9abb6c43f2 Revert "[FEATURE][expressions] implicit feature->geom conversion"
This reverts commit 7cab60bc4328e6cb4c57f8320c2d85d9383a2424.

The conversion was unreliable, as it was not correctly determining
that the feature's geometry was required and consequently not
fetching it from the provider. This isn't trivial to fix, so
I'm reverting this feature before release.
2016-06-17 11:16:08 +10:00
Harrissou Sant-anna
6035f19394 few typo fix (#3207) 2016-06-16 20:40:13 +02:00
Sandro Santilli
57ff59aa2d Ignore files generated during "make check" 2016-06-16 18:38:36 +02:00
Sandro Santilli
e241ab9b01 Remove generated test files from repository
Fixes #14976
2016-06-16 18:27:33 +02:00
Matthias Kuhn
3ea35fc033 Relation Reference Widget: Only enable form button when a feature is set 2016-06-16 17:58:23 +02:00
Nyall Dawson
8868303dbd Fix displacement renderer when using map unit sizes for symbols 2016-06-16 23:03:31 +10:00
Nyall Dawson
a6f96ba51b Fix displacement symbols with data defined properties (fix #9601)
Previously only the attributes of the first feature were being
used to render the points inside a group
2016-06-16 23:03:31 +10:00
Nathan Woodrow
5458d6445f Revert "Don't resize canvas size on widget change"
Revert this change for now as it has larger impacts
then I thought it would. Will improve and bring back
next release.

This reverts commit ef51b702b89ce7c90b3fa9ee8a9d9fab8bc9e528.
2016-06-16 20:51:09 +10:00
Nyall Dawson
f9ff5e25d3 [composer] Instant feedback for legend when linked map changes 2016-06-16 18:30:22 +10:00