Merge branch 'master' into regularShape_gui

qgis · Sep 6, 2017 · e57c3b3 · e57c3b3
2 parents 37b6052 + a0e6b7f
commit e57c3b3
Show file tree

Hide file tree

Showing 1,186 changed files with 21,375 additions and 12,474 deletions.
diff --git a/.ci/travis/linux/script.sh b/.ci/travis/linux/script.sh
@@ -13,6 +13,8 @@
 #                                                                         #
 ###########################################################################
 
+set -e
+
 export PYTHONPATH=${HOME}/osgeo4travis/lib/python3.3/site-packages/
 export PATH=${HOME}/osgeo4travis/bin:${HOME}/osgeo4travis/sbin:${HOME}/OTB-5.6.0-Linux64/bin:${PATH}
 export LD_LIBRARY_PATH=${HOME}/osgeo4travis/lib
@@ -27,18 +29,17 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 export OTB_APPLICATION_PATH=${HOME}/OTB-5.6.0-Linux64/lib/otb/applications
 export LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so
 
-export CTEST_BUILD_COMMAND="/usr/bin/make -j3 -i -k"
+export CTEST_BUILD_COMMAND="/usr/bin/make -j3 -i"
 
-# This works around an issue where travis would timeout on master because
+# This works around an issue where travis would timeout because
 # when make is run inside ctest no output is generated. At the current time
-# nobody know why, but at least this workaround gets travis results for master
+# nobody know why, but at least this workaround gets travis results
 # back. Better approaches VERY welcome.
-if [[ ${TRAVIS_PULL_REQUEST} == "false" ]];
-then
-    pushd build
-    $CTEST_BUILD_COMMAND
-    popd
-fi
+pushd build
+echo "travis_fold:start:qgis_build"
+$CTEST_BUILD_COMMAND
+echo "travis_fold:end:qgis_build"
+popd
 
 python ${TRAVIS_BUILD_DIR}/.ci/travis/scripts/ctest2travis.py \
   xvfb-run ctest -V -E "$(cat ${DIR}/blacklist.txt | sed -r '/^(#.*?)?$/d' | paste -sd '|' -)" -S ${DIR}/../travis.ctest --output-on-failure
diff --git a/.gitignore b/.gitignore
@@ -61,6 +61,7 @@ tests/testdata/grass/wgs84/test/.gislock
 tests/testdata/grass/wgs84/test6/.gislock
 tests/testdata/grass/wgs84/test7/.gislock
 tests/testdata/*.aux.xml
+tests/testdata/landsat-int16-b1.tif.aux.xml
 tests/testdata/raster/*.aux.xml
 tests/testdata/raster/band1_byte_noct_epsg4326.tif.aux.xml
 tests/testdata/raster/band1_float32_noct_epsg4326.tif.aux.xml

diff --git a/.travis.yml b/.travis.yml
@@ -66,18 +66,18 @@ matrix:
             - coreutils
             - libyaml-tiny-perl
     # OSX based build with QT4 and Python 2
-    - os: osx
-      osx_image: xcode8.3 # MacOS 10.12: Sierra
-      cache:
-        pip: true
-        directories:
-          - $HOME/.ccache
-      env:
-        - TRAVIS_CONFIG=macos
-        - IGNORE_BUILD_FAILURES=YES
-
-  allow_failures:
-    - os: osx
+#    - os: osx
+#      osx_image: xcode8.3 # MacOS 10.12: Sierra
+#      cache:
+#        pip: true
+#        directories:
+#          - $HOME/.ccache
+#      env:
+#        - TRAVIS_CONFIG=macos
+#        - IGNORE_BUILD_FAILURES=YES
+#
+#  allow_failures:
+#    - os: osx
 
 git:
   depth: 30

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -581,7 +581,6 @@ IF (WITH_CORE)
   #hoops to escape compiler directives then
   IF(COMMAND cmake_policy)
     cmake_policy(SET CMP0003 NEW)
-    cmake_policy(SET CMP0005 OLD)
     IF(NOT "${CMAKE_VERSION}" VERSION_LESS "3.3")
       cmake_policy(SET CMP0063 NEW)
     ENDIF(NOT "${CMAKE_VERSION}" VERSION_LESS "3.3")

diff --git a/Dockerfile b/Dockerfile
@@ -17,6 +17,8 @@ WORKDIR /usr/src/QGIS/build
 
 RUN cmake \
  -GNinja \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DBINDINGS_GLOBAL_INSTALL=ON \
  -DWITH_STAGED_PLUGINS=ON \
  -DWITH_GRASS=ON \
  -DSUPPRESS_QT_WARNINGS=ON \
@@ -30,4 +32,6 @@ RUN cmake \
  -DDISABLE_DEPRECATED=ON \
  .. \
  && ninja install \
- && rm -rf /usr/src/QGIS/build/*
+ && rm -rf /usr/src/QGIS
+
+WORKDIR /
diff --git a/INSTALL b/INSTALL
@@ -102,7 +102,7 @@ Required build dependencies:
 - Sqlite3 >= 3.0.0
 - SpatiaLite
 - libspatialindex
-- GDAL/OGR >= 2.0
+- GDAL/OGR >= 2.1
 - Qwt >= 5.0 & (< 6.1 with internal QwtPolar)
 - expat >= 1.95
 - QScintilla2

diff --git a/README.md b/README.md
@@ -27,7 +27,7 @@ modified.
 
 ## Supported raster formats include:
 
- * Grass
+ * GRASS
  * USGS DEM
  * ArcInfo binary grid
  * ArcInfo ASCII grid

diff --git a/cmake/FindGDAL.cmake b/cmake/FindGDAL.cmake
@@ -62,8 +62,11 @@ ELSE(WIN32)
           STRING(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\1" GDAL_VERSION_MAJOR "${GDAL_VERSION}")
           STRING(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\2" GDAL_VERSION_MINOR "${GDAL_VERSION}")
           IF (GDAL_VERSION_MAJOR LESS 2)
-            MESSAGE (FATAL_ERROR "GDAL version is too old (${GDAL_VERSION}). Use 2.0 or higher.")
+            MESSAGE (FATAL_ERROR "GDAL version is too old (${GDAL_VERSION}). Use 2.1 or higher.")
           ENDIF (GDAL_VERSION_MAJOR LESS 2)
+          IF ( (GDAL_VERSION_MAJOR EQUAL 2) AND (GDAL_VERSION_MINOR LESS 1) )
+            MESSAGE (FATAL_ERROR "GDAL version is too old (${GDAL_VERSION}). Use 2.1 or higher.")
+          ENDIF( (GDAL_VERSION_MAJOR EQUAL 2) AND (GDAL_VERSION_MINOR LESS 1) )
 
         ENDIF (GDAL_LIBRARY)
         SET (CMAKE_FIND_FRAMEWORK ${CMAKE_FIND_FRAMEWORK_save} CACHE STRING "" FORCE)
@@ -101,10 +104,13 @@ ELSE(WIN32)
 
         # check for gdal version
         # version 1.2.5 is known NOT to be supported (missing CPL_STDCALL macro)
-        # According to INSTALL, 2.0+ is required
+        # According to INSTALL, 2.1+ is required
         IF (GDAL_VERSION_MAJOR LESS 2)
-          MESSAGE (FATAL_ERROR "GDAL version is too old (${GDAL_VERSION}). Use 2.0 or higher.")
+          MESSAGE (FATAL_ERROR "GDAL version is too old (${GDAL_VERSION}). Use 2.1 or higher.")
         ENDIF (GDAL_VERSION_MAJOR LESS 2)
+        IF ( (GDAL_VERSION_MAJOR EQUAL 2) AND (GDAL_VERSION_MINOR LESS 1) )
+          MESSAGE (FATAL_ERROR "GDAL version is too old (${GDAL_VERSION}). Use 2.1 or higher.")
+        ENDIF( (GDAL_VERSION_MAJOR EQUAL 2) AND (GDAL_VERSION_MINOR LESS 1) )
 
         # set INCLUDE_DIR to prefix+include
         EXEC_PROGRAM(${GDAL_CONFIG}

diff --git a/cmake/FindGSL.cmake b/cmake/FindGSL.cmake
@@ -107,7 +107,7 @@ ELSE(WIN32)
         #      MESSAGE("DBG  GSL_LINK_DIRECTORIES=${GSL_LINK_DIRECTORIES}")
         #      MESSAGE("DBG  GSL_EXE_LINKER_FLAGS=${GSL_EXE_LINKER_FLAGS}")
 
-        #      ADD_DEFINITIONS("-DHAVE_GSL")
+        #      ADD_DEFINITIONS(-DHAVE_GSL)
         #      SET(GSL_DEFINITIONS "-DHAVE_GSL")
         MARK_AS_ADVANCED(
             GSL_CXX_FLAGS

diff --git a/cmake/FindOSGEARTH.cmake b/cmake/FindOSGEARTH.cmake
@@ -48,11 +48,11 @@ FIND_OSGEARTH_INCLUDE( OSGEARTH_ELEVATION_QUERY   osgEarth/ElevationQuery )
 
 ###### libraries ######
 
-MACRO( FIND_OSGEARTH_LIBRARY MYLIBRARY MYLIBRARYNAME )
+MACRO( FIND_OSGEARTH_LIBRARY MYLIBRARY )
 
 FIND_LIBRARY(${MYLIBRARY}
     NAMES
-        ${MYLIBRARYNAME}
+        ${ARGN}
     PATHS
         ${OSGEARTH_DIR}
         $ENV{OSGEARTH_BUILD_DIR}
@@ -93,8 +93,8 @@ FIND_OSGEARTH_LIBRARY( OSGEARTHFEATURES_LIBRARY_DEBUG osgEarthFeaturesd )
 FIND_OSGEARTH_LIBRARY( OSGEARTHSYMBOLOGY_LIBRARY osgEarthSymbology )
 FIND_OSGEARTH_LIBRARY( OSGEARTHSYMBOLOGY_LIBRARY_DEBUG osgEarthSymbologyd )
 
-FIND_OSGEARTH_LIBRARY( OSGEARTHQT_LIBRARY osgEarthQt )
-FIND_OSGEARTH_LIBRARY( OSGEARTHQT_LIBRARY_DEBUG osgEarthQtd )
+FIND_OSGEARTH_LIBRARY( OSGEARTHQT_LIBRARY osgEarthQt5 osgEarthQt)
+FIND_OSGEARTH_LIBRARY( OSGEARTHQT_LIBRARY_DEBUG osgEarthQtd osgEarthQt5d)
 
 FIND_OSGEARTH_LIBRARY( OSGEARTHANNOTATION_LIBRARY osgEarthAnnotation )
 FIND_OSGEARTH_LIBRARY( OSGEARTHANNOTATION_LIBRARY_DEBUG osgEarthAnnotationd )

diff --git a/doc/api_break.dox b/doc/api_break.dox
@@ -249,6 +249,8 @@ Removed Classes        {#qgis_api_break_3_0_removed_classes}
 - QgsAnnotationItem was removed. This was replaced by QgsAnnotation and QgsMapCanvasAnnotationItem.
 - QgsAttributeAction was removed, and replaced by QgsActionManager.
 - QgsAttributeEditor was removed. Use QgsEditorWidgetRegistry::create() instead.
+- Bezier3D.
+- CloughTocherInterpolator.
 - QgsColorbutton was removed. QgsColorButtonV2 has now been renamed to QgsColorButton. Hence, QgsColorButtonV2 does not exist anymore.
 - QgsColorDialog was removed, and QgsColorDialogV2 was renamed to QgsColorDialog. Hence, QgsColorButtonV2 does not exist anymore.
 All the functionality from the old QgsColorDialog has been moved to the new class.
@@ -266,10 +268,12 @@ should now call QgsCoordinateReferenceSystem::invalidateCache() and QgsCoordinat
 - QgsDataDefinedButton was removed. Use QgsPropertyOverrideButton instead.
 - QgsDataDefinedSymbolDialog was removed. Code using this dialog should be reworked to use QgsPropertyOverrideButton
 - QgsDefaultPluginLayerLegend was removed. Use QgsMapLayer::setLegend() to provide legend nodes for plugin layers.
+- DualEdgeTriangulation
 - QgsFileNameWidgetWrapper was removed. Use QgsExternalResourceWidgetWrapper instead.
 - QgsFileDropEdit was removed. Use QgsFileWidget instead.
 - QgsFormAnnotationItem. Use QgsFormAnnotation instead.
 - QgsGeometryAnalyzer. Use the equivalent Processing algorithms instead.
+- HalfEdge.
 - QgsHtmlAnnotationItem. Use QgsHtmlAnnotation instead.
 - QgsHttpTransaction. This class was outdated and code should be ported to native Qt or Python implementations.
 - QgsGenericProjectionSelector. Use QgsProjectionSelectionTreeWidget instead.
@@ -282,11 +286,16 @@ should now call QgsCoordinateReferenceSystem::invalidateCache() and QgsCoordinat
   - addLegendLayerActionForLayer() moved to QgisInterface::addCustomActionForLayer()
   - removeLegendLayerAction() moved to QgisInterface::removeCustomActionForLayerType()
 - QgsLegendModel was removed.
+- Line3D.
+- LinTriangleInterpolator.
 - QgsMapCanvasLayer. Map canvas and overview canvas are updated separately with their own setLayers() calls.
 - QgsMapCanvasMap. It is an internal class used by map canvas.
 - QgsMapLayerRegistry. Its functionality has been moved to QgsProject.
 - QgsMapRenderer. It has been replaced by QgsMapRendererJob with subclasses and QgsMapSettings.
 - QgsMapToolTouch. The touch navigation functionality is now built into the standard QgsMapToolPan tool.
+- Node.
+- NormVecDecorator.
+- ParametericLine.
 - QgsPhotoWidgetWrapper was removed. Use QgsExternalResourceWidgetWrapper instead.
 - QgsPointSample. Use the Processing "Random Points in Polygon" algorithm instead.
 - QgsPseudoColorShader. This shader has been broken for some time and was replaced by QgsSingleBandPseudoColorRenderer.
@@ -302,10 +311,14 @@ should now call QgsCoordinateReferenceSystem::invalidateCache() and QgsCoordinat
 - QgsSvgAnnotationItem. Use QgsSvgAnnotation instead.
 - QgsSymbologyV2Conversion was removed. Reading of renderers from pre-1.0 versions is not supported anymore.
 - QgsTextAnnotationItem. Use QgsTextAnnotation instead.
+- QgsTransectSample. This class was unused and unmaintained.
+- TriangleInterpolator.
+- Triangulation.
+- TriDecorator.
 - QgsSnapper. Use QgsSnappingUtils instead.
 - QgsSnappingResult. Use QgsSnappingUtils instead.
 - QgsMapCanvasSnapper. Use QgsMapCanvas::snappingUtils() instead.
-
+- Vector3D
 
 General changes        {#qgis_api_break_3_0_global}
 ---------------
@@ -1348,6 +1361,13 @@ QgsGraduatedRenderer        {#qgis_api_break_3_0_QgsGraduatedRenderer}
 - setInvertedColorRamp() and invertedColorRamp() functions are gone, QgsColorRamp now responsible for invert
 - createRenderer() and updateColorRamp()'s inverted parameter is gone
 
+
+QgsGridFileWriter       {#qgis_api_break_3_0_QgsGridFileWriter}
+-----------------
+
+- writeFile() now takes an optional QgsFeedback argument instead of using a QProgressDialog
+
+
 QgsGroupWMSDataDialog        {#qgis_api_break_3_0_QgsGroupWMSDataDialog}
 ---------------------
 
@@ -1889,7 +1909,8 @@ QgsRasterCalculator     {#qgis_api_break_3_0_QgsRasterCalculator}
 -------------------
 
 - Cancelled (Result enum value) has been renamed to Canceled  <!--#spellok-->
-
+- processCalculation() now uses an optional QgsFeedback instead of QProgressDialog
+for progress reports and cancelation.
 
 QgsRasterDataProvider        {#qgis_api_break_3_0_QgsRasterDataProvider}
 ---------------------
@@ -1973,6 +1994,11 @@ QgsRelation        {#qgis_api_break_3_0_QgsRelation}
 - `setRelationName()` has been renamed to `QgsRelation::setName()`
 - `setRelationId()` has been renamed to `QgsRelation::setId()`
 
+QgsRelief        {#qgis_api_break_3_0_QgsRelief}
+---------
+
+- processRaster() now uses a QgsFeedback object instead of a QProgressDialog
+
 
 QgsRenderChecker        {#qgis_api_break_3_0_QgsRenderChecker}
 ----------------
@@ -2309,6 +2335,12 @@ QgsSymbolsListWidget        {#qgis_api_break_3_0_QgsSymbolsListWidget}
 - expressionContext(), setExpressionContext(), setMapCanvas() and mapCanvas() have been removed in favor of setContext()/context()
 
 
+QgsTINInterpolator        {#qgis_api_break_3_0_QgsTINInterpolator}
+------------------
+
+- The constructor takes a QgsFeedback argument instead of using a QProgressDialog.
+- setExportTriangulationToFile() and setTriangulationFilePath() were removed. Use setTriangulationSink() instead.
+
 QgsTolerance        {#qgis_api_break_3_0_QgsTolerance}
 ------------
 

diff --git a/images/images.qrc b/images/images.qrc
@@ -342,6 +342,9 @@
         <file>themes/default/mIconDelete.png</file>
         <file>themes/default/mIconDeselected.svg</file>
         <file>themes/default/mIconDropDownMenu.svg</file>
+        <file>themes/default/mIconJoinNotEditable.svg</file>
+        <file>themes/default/mIconJoinedLayerNotEditable.svg</file>
+        <file>themes/default/mIconJoinHasNotUpsertOnEdit.svg</file>
         <file>themes/default/mIconEditableEdits.svg</file>
         <file>themes/default/mIconExpand.svg</file>
         <file>themes/default/mIconExpandSmall.svg</file>

diff --git a/images/splash/splash.png b/images/splash/splash.png