[processing] Fix and improve eliminate

CMakeLists.txt

@@ -105,6 +105,7 @@ IF (WITH_BINDINGS)
   SET (WITH_QSCIAPI TRUE CACHE BOOL "Whether to generate PyQGIS QScintilla2 API file. (For devs) run 'make qsci-pap-src' in between QGIS build and install to regenerate .pap file in source tree for console auto-completion.")
   # keep casual users from updating their source tree via WITH_QSCIAPI
   MARK_AS_ADVANCED (WITH_QSCIAPI)
+  ADD_DEFINITIONS(-DWITH_BINDINGS)
 ENDIF (WITH_BINDINGS)
 
 #BUILD WITH QtMobility by default on android only. Other platform can force it
@@ -268,23 +269,6 @@ IF (WITH_QTMOBILITY)
     FIND_PACKAGE(QtMobility 1.1.0)
 ENDIF (WITH_QTMOBILITY)
 
-IF (ANDROID)
-  SET (DEFAULT_WITH_TOUCH TRUE)
-ELSE (ANDROID)
-  SET (DEFAULT_WITH_TOUCH FALSE)
-ENDIF (ANDROID)
-
-#Add a touch mode if Qt has Qt Gestures
-SET (WITH_TOUCH ${DEFAULT_WITH_TOUCH} CACHE BOOL "Determines if touch interface related code should be build")
-
-IF (WITH_TOUCH)
-  # following variable is used in qgsconfig.h
-  SET (HAVE_TOUCH TRUE)
-  MESSAGE (STATUS "Touch support enabled")
-ELSE (WITH_TOUCH)
-  MESSAGE (STATUS "Touch support disabled")
-ENDIF (WITH_TOUCH)
-
 # search for QScintilla2 (C++ lib)
 FIND_PACKAGE(QScintilla REQUIRED)
 
@@ -569,15 +553,16 @@ IF(COMMAND cmake_policy)
   IF(NOT "${CMAKE_VERSION}" VERSION_LESS "3.3")
     cmake_policy(SET CMP0063 NEW)
   ENDIF(NOT "${CMAKE_VERSION}" VERSION_LESS "3.3")
+  IF(MSVC)
+    cmake_policy(SET CMP0020 NEW)
+  ENDIF(MSVC)
 ENDIF(COMMAND cmake_policy)
 
-IF (WIN32)
-  IF(PEDANTIC AND NOT APPLE)
-    SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined")
-    SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined")
-    SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--no-undefined")
-  ENDIF(PEDANTIC AND NOT APPLE)
-ENDIF(WIN32)
+IF (PEDANTIC AND NOT WIN32 AND NOT APPLE)
+  SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined")
+  SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined")
+  SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--no-undefined")
+ENDIF(PEDANTIC AND NOT WIN32 AND NOT APPLE)
 
 SET(CMAKE_CXX_VISIBILITY_PRESET hidden)
 INCLUDE(GenerateExportHeader)

CONTRIBUTE.md

@@ -13,7 +13,7 @@ by running the prepare commit script **before** issuing `git commit`.
 
 This can be automated by setting up the pre-commit hook properly.
 
-    ln -s scripts/prepare-commit.sh .git/hooks/pre-commit
+    ln -s ../../scripts/prepare-commit.sh .git/hooks/pre-commit
 
 Getting your pull request merged
 --------------------------------

INSTALL

@@ -1,26 +1,24 @@
 QGIS
 Building QGIS from source - step by step
-Monday January 09, 2017
+Wednesday January 25, 2017
 
 
-Last Updated: Monday January 09, 2017
-Last Change : Monday January 09, 2017
+Last Updated: Wednesday January 25, 2017
+Last Change : Friday January 20, 2017
 
 
   1. Introduction
   2. Overview
   3. Building on GNU/Linux
-    3.1. Building QGIS with Qt 4.x
+    3.1. Building QGIS with Qt 5.x
     3.2. Prepare apt
     3.3. Install build dependencies
     3.4. Setup ccache (Optional)
     3.5. Prepare your development environment
     3.6. Check out the QGIS Source Code
     3.7. Starting the compile
     3.8. Building Debian packages
-    3.9. Building QGIS with Qt 5.x
-    3.10. On Debian Linux
-    3.11. On Fedora Linux
+    3.9. On Fedora Linux
   4. Building on Windows
     4.1. Building with Microsoft Visual Studio
     4.2. Building using MinGW
@@ -139,13 +137,13 @@ those formats in GDAL.
   ========================
 
 
-  3.1. Building QGIS with Qt 4.x
+  3.1. Building QGIS with Qt 5.x
   ==============================
 
 Requires: Ubuntu / Debian derived distro
 
 /!\ Note: Refer to the section Building Debian packages for building
-debian packages.  Unless you plan to develop on QGIS, that is probably the
+debian packages. Unless you plan to develop on QGIS, that is probably the
 easiest option to compile and install QGIS.
 
 These notes are for Ubuntu - other versions and Debian derived distros may
@@ -263,6 +261,11 @@ be pressed several times before the 'g' option becomes available.
 After the 'g' generation is complete, press 'q' to exit the ccmake
 interactive dialog.
 
+/!\ Warning: Make sure that your build directory is completely empty when you 
+enter the command. Do never try to "re-use" an existing Qt4 build directory.
+If you want to use `ccmake` or other interactive tools, run the command in
+the empty build directory once before starting to use the interactive tools.
+
 Now on with the build:
 
   make -jX
@@ -349,56 +352,15 @@ Install them using dpkg.  E.g.:
   sudo debi
 
 
-  3.9. Building QGIS with Qt 5.x
-  ==============================
-
-/!\ Warning: Qt 5 is not officially supported. Building against Qt 5
-libraries seems to work quite well already but be prepared that you are one
-of very few with this setup. We strongly recommend using QGIS with Qt 4 for
-production work.
-
-Python bindings in particular are not expected to be compatible. When Qt 5
-is enabled, the build system automatically activates Python 3 and PyQt5 as well.
-There are no plugins and not even the python code shipped along the QGIS source
-code is compatible with PyQt5.
-
-You have been warned.
-
-
-  3.10. On Debian Linux
-  =====================
-
-We assume that you have the source code of QGIS ready and created a new
-subdirectory called `build` or `build-qt5` in it.
-
-
-    3.10.1. Install build dependencies
-    ==================================
-
-  apt-get install git build-essential cmake flex bison pyqt5-dev qttools5-dev qtpositioning5-dev libqt5svg5-dev libqt5webkit5-dev  libqt5gui5 libqt5scripttools5 qtscript5-dev libqca-qt5-2-dev grass-dev libgeos-dev libgdal-dev libqt5xmlpatterns5-dev libqt5scintilla2-dev pyqt5.qsci-dev python3-pyqt5.qsci libgsl-dev txt2tags libproj-dev libqwt-qt5-dev libspatialindex-dev pyqt5-dev-tools qttools5-dev-tools qt5-default python3-future python3-pyqt5.qtsql python3-psycopg2 python3-sip-dev
-
-Make sure that your build directory is completely empty when you enter the
-following command. Do never try to "re-use" an existing Qt4 build directory.
-If you want to use `ccmake` or other interactive tools, run the following
-command in the empty build directory once before starting to use the
-interactive tools.
-
-  cmake
-
-If everything went ok you can finally start to compile. (As usual append a -jX where X is the number of available cores option to make to speed up your build process)
-
-  make
-
-
-  3.11. On Fedora Linux
-  =====================
+  3.9. On Fedora Linux
+  ====================
 
 We assume that you have the source code of QGIS ready and created a
 new subdirectory called `build` or `build-qt5` in it.
 
 
-    3.11.1. Install build dependencies
-    ==================================
+    3.9.1. Install build dependencies
+    =================================
 
   dnf install qt5-qtwebkit-devel qt5-qtlocation-devel qt5-qttools-static
   qt5-qtscript-devel qca-qt5-devel python3-qt5-devel python3-qscintilla-qt5-devel 

NEWS

@@ -74,9 +74,9 @@ This release has following new features:
 - Rendering: New options for on the fly simplification
 - Rendering: Quantile based classification for raster layers
 - Rendering: Live hillshade renderer
-- Digitising: "Repeating" locking mode for constraints
-- Digitising: Extend linestring geometries with reshape tool
-- Digitising: Segmentation tolerance
+- Digitizing: "Repeating" locking mode for constraints
+- Digitizing: Extend linestring geometries with reshape tool
+- Digitizing: Segmentation tolerance
 - Data management: New configuration options for attribute table
 - Data management: Multiple columns in attribute forms
 - Data management: Control over attributes to export when saving a vector layer
@@ -163,9 +163,9 @@ This release has following new features:
 - Data management : Vector joins are now saved within QLR layer-definition-files
 - Data management : N:M relation editing
 - Data management : External Resource widget
-- Digitising : Configurable rubber band color
-- Digitising : Autotrace
-- Digitising : Trace digitising tool
+- Digitizing : Configurable rubber band color
+- Digitizing : Autotrace
+- Digitizing : Trace digitizing tool
 - General : Changed behavior of strpos function
 - General : Field calculator can be used to update feature's geometry
 - General : Virtual layers
@@ -230,7 +230,7 @@ This release has following new features:
 - Data management : DBManager Improvements
 - Data management : Conditional formatting for attribute table cells
 - Data management : Support for relative paths in widgets
-- Digitising : Digitising improvements
+- Digitizing : Digitizing improvements
 - General : New welcome screen
 - General : Ongoing improvements to code quality
 - General : Advanced settings editor
@@ -427,7 +427,7 @@ This is the minor release sports a number of great new features:
 - When pasting a selection, it is now possible to create a new layer on the fly
   from the pasted features.
 - WMS Legend is now available via a getLegendGraphic request.
-- It is now possible to digitise a new feature as an interior ring of an
+- It is now possible to digitize a new feature as an interior ring of an
   existing feature.
 - Recent expressions are saved in the expression builder for quick re-use.
 - You can now set the color for the zebra map border style in composer.
@@ -571,7 +571,7 @@ key new features.
 - Heatmap tool - a new core plugin has been added for generating raster heatmaps from point data. You may need to activate this plugin using the plugin manager.
 - GPS Tracking - The GPS live tracking user interface was overhauled and many fixes and improvements were added to it.
 - Menu Re-organisation - The menus were re-organised a little - we now have separate menus for Vector and Raster and many plugins were updated to place their menus in the new Vector and Raster top level menus.
-- Offset Curves - a new digitising tool for creating offset curves was added.
+- Offset Curves - a new digitizing tool for creating offset curves was added.
 - Terrain Analysis Plugin - a new core plugin was added for doing terrain analysis - and it can make really good looking colored relief maps.
 - Ellipse renderer - symbollayer to render ellipse shapes (and also rectangles, triangles, crosses by specifying width and height). Moreover, the symbol layer allows setting all parameters (width, height, colors, rotation, outline with) from data fields, in mm or map units
 - New scale selector with predefined scales
@@ -1376,7 +1376,7 @@ This release includes over 120 bug fixes and enhancements
 over the QGIS 0.9.1 release. In addition we have added 
 the following new features:
 
-- Improvements to digitising capabilities.
+- Improvements to digitizing capabilities.
 - Supporting default and defined styles (.qml) files for file based 
 vector layers. With styles you can save the symbolisation 
 and other settings associated with a vector layer and they 
@@ -1396,7 +1396,7 @@ improvements 'under the hood'.
 - This release candidate includes over 40 bug fixes and enhancements 
 over the QGIS 0.9.1 release. In addition we have added 
 the following new features:
-- Imrovements to digitising capabilities.
+- Improvements to digitizing capabilities.
 - Supporting default and defined styles (.qml) files for file based 
 vector layers. With styles you can save the symbolisation 
 and other settings associated with a vector layer and they 
@@ -2012,7 +2012,7 @@ Implemented a new map cursor type : Capture Point (little pencil icon on your to
    are placed into the system clipboard. 
 
   In release 0.5 this will be extended to provide simple point vector file data capture / 
-  digitising facility. This will be implemented by means of a plugin which will utilise the 
+  digitizing facility. This will be implemented by means of a plugin which will utilise the 
   aforementioned xyClickCoordinate(QgsPoint) signal.
 
 2004-06-12 [gsherman] 0.3.0devel30
@@ -2724,7 +2724,7 @@ July 20, 2002
 
 July 18, 2002
   Point, line and polygon PostGis layers can be drawn. Still issues with
-  map exent and positioning of layers on the canvas. Drawing is manual and
+  map extent and positioning of layers on the canvas. Drawing is manual and
   not tied to the paint event. No zooming or panning yet.
 
 July 10, 2002

ci/travis/check_spelling.sh

@@ -6,10 +6,15 @@ export PATH=${HOME}/osgeo4travis/bin:${PATH}
 
 echo "Spell check"
 
-if [[ !  -z  $TRAVIS_PULL_REQUEST_BRANCH  ]]; then
+if [[ ! -z  $TRAVIS_PULL_REQUEST_BRANCH  ]]; then
   # if on a PR, just analyse the changed files
   echo "TRAVIS PR BRANCH: $TRAVIS_PULL_REQUEST_BRANCH"
   FILES=$(git diff --diff-filter=AM --name-only $(git merge-base HEAD master) | tr '\n' ' ' )
+else
+  echo "TRAVIS COMMIT RANGE: $TRAVIS_COMMIT_RANGE"
+  FILES=$(git diff --diff-filter=AM --name-only ${TRAVIS_COMMIT_RANGE/.../..} | tr '\n' ' ' )
 fi
 
-./scripts/spell_check/check_spelling.sh -r $FILES
+if [[ ! -z $FILES ]]; then
+  ./scripts/spell_check/check_spelling.sh -r $FILES
+fi

ci/travis/linux/before_install.sh

@@ -32,4 +32,4 @@ wget https://www.orfeo-toolbox.org/packages/archives/OTB/OTB-5.6.0-Linux64.run -
 
 popd
 
-pip install psycopg2 numpy nose2 pyyaml mock future termcolor
+pip install psycopg2 numpy nose2 pyyaml mock future termcolor autopep8

ci/travis/linux/install.sh

@@ -65,12 +65,14 @@ if [ "$CACHE_WARMING" = true ] ; then
     ${CMAKE_FLAGS}
     -DWITH_DESKTOP=OFF
     -DWITH_SERVER=OFF
+    -DWITH_CUSTOM_WIDGETS=OFF
   "
 else
   CMAKE_FLAGS="
     ${CMAKE_FLAGS}
     -DWITH_DESKTOP=ON
     -DWITH_SERVER=ON
+    -DWITH_CUSTOM_WIDGETS=ON
   "
 fi
 

cmake/FindProj.cmake

@@ -41,7 +41,7 @@ FIND_PATH(PROJ_INCLUDE_DIR proj_api.h
   "$ENV{LIB_DIR}/include"
   )
 
-FIND_LIBRARY(PROJ_LIBRARY NAMES proj proj_i PATHS
+FIND_LIBRARY(PROJ_LIBRARY NAMES proj_i proj PATHS
   "$ENV{LIB}"
   "$ENV{LIB_DIR}/lib"
   )

cmake/FindQwt.cmake

@@ -34,7 +34,7 @@ FIND_PATH(QWT_INCLUDE_DIR NAMES qwt.h PATHS
   /usr/local/include
   "$ENV{LIB_DIR}/include"
   "$ENV{INCLUDE}"
-  PATH_SUFFIXES qwt-qt4 qwt qwt5 qwt6
+  PATH_SUFFIXES qwt-qt5 qwt qwt5 qwt6
 )
 
 IF (QWT_INCLUDE_DIR AND QWT_LIBRARY)

cmake/MacBundleMacros.cmake

@@ -107,7 +107,7 @@ ENDFUNCTION (COPY_FRAMEWORK)
 
 FUNCTION (UPDATEQGISPATHS LIBFROM LIBTO)
     IF (LIBFROM)
-        STRING (REGEX MATCH "\\.dylib$" ISLIB "${LIBTO}")
+        STRING (REGEX MATCH "\\.(dylib|so)$" ISLIB "${LIBTO}")
         IF (ISLIB)
             SET (LIBPOST "${LIBTO}")
             SET (LIBMID "${QGIS_LIB_SUBDIR}")
@@ -228,7 +228,7 @@ FILE (GLOB QGFWLIST RELATIVE "${QFWDIR}" "${QFWDIR}/qgis*.framework")
 STRING(REPLACE ".framework" ";" QGFWLIST ${QGFWLIST})
 # don't collect any library symlinks, limit to versioned libs
 SET (Q_LIBVER ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR})
-FILE (GLOB QGLIBLIST  RELATIVE "${QLIBDIR}" "${QLIBDIR}/libqgis*.dylib")
+FILE (GLOB QGLIBLIST  RELATIVE "${QLIBDIR}" "${QLIBDIR}/libqgis*.dylib" "${QLIBDIR}/qgis/server/lib*.so")
 FILE (GLOB QGPLUGLIST "${QPLUGDIR}/*.so")
 FILE (GLOB QGPYLIST "${QGISPYDIR}/qgis/*.so")
 FILE (GLOB QGAPPLIST RELATIVE "${QBINDIR}" "${QBINDIR}/q*.app")

cmake/PyQtMacros.cmake

@@ -55,7 +55,7 @@ ENDMACRO(PYQT_WRAP_UI)
 IF(NOT PYRCC_PROGRAM)
   IF (MSVC)
     FIND_PROGRAM(PYRCC_PROGRAM
-      NAMES ${PYRCC_PROG_NAME}.exe
+      NAMES ${PYRCC_PROG_NAME}.bat
       PATHS $ENV{LIB_DIR}/bin
     )
   ELSE(MSVC)

cmake/SIPMacros.cmake

@@ -97,12 +97,6 @@ MACRO(GENERATE_SIP_PYTHON_MODULE_CODE MODULE_NAME MODULE_SIP CPP_FILES)
   ENDIF(MSVC)
 
   SET(SIPCMD ${SIP_BINARY_PATH} ${_sip_tags} -w -e ${_sip_x} ${SIP_EXTRA_OPTIONS} -j ${SIP_CONCAT_PARTS} -c ${CMAKE_CURRENT_BINARY_DIR}/${_module_path} ${_sip_includes} ${_abs_module_sip})
-  SET(SUPPRESS_SIP_WARNINGS FALSE CACHE BOOL "Hide SIP warnings")
-  MARK_AS_ADVANCED(SUPPRESS_SIP_WARNINGS)
-  IF(SUPPRESS_SIP_WARNINGS)
-    SET(SIPCMD ${SIPCMD} 2> /dev/null || true)
-  ENDIF(SUPPRESS_SIP_WARNINGS)
-
   ADD_CUSTOM_COMMAND(
     OUTPUT ${_sip_output_files}
     COMMAND ${CMAKE_COMMAND} -E echo ${message}