Merge branch 'master' of github.com:qgis/QGIS into plugman

qgis · Oct 16, 2017 · 9159325 · 9159325
2 parents 11ec24f + 83212e7
commit 9159325
Show file tree

Hide file tree

Showing 120 changed files with 15,370 additions and 4,618 deletions.
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
@@ -89,6 +89,7 @@ IF(WITH_APIDOC)
       ${CMAKE_SOURCE_DIR}/src/analysis
       ${CMAKE_SOURCE_DIR}/src/analysis/interpolation
       ${CMAKE_SOURCE_DIR}/src/analysis/network
+      ${CMAKE_SOURCE_DIR}/src/analysis/processing
       ${CMAKE_SOURCE_DIR}/src/analysis/raster
       ${CMAKE_SOURCE_DIR}/src/analysis/vector
       ${CMAKE_SOURCE_DIR}/src/3d

diff --git a/doc/CONTRIBUTORS b/doc/CONTRIBUTORS
@@ -44,6 +44,7 @@ Ismail Sunni
 Ivan Lucena
 Ivan Mincik
 Jaka Kranjc (lynxlynxlynx)
+James Shaeffer
 Jean-Denis Giguere
 Jeremy Palmer
 Jerrit Collord

diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
@@ -224,11 +224,13 @@ ENDIF (WITH_SERVER AND WITH_SERVER_PLUGINS)
 
 # additional analysis includes
 INCLUDE_DIRECTORIES(BEFORE
+  ../src/analysis/processing
   ../src/analysis/vector
   ../src/analysis/raster
   ../src/analysis/network
   ../src/analysis/interpolation
   ../src/analysis/openstreetmap
+  ${CMAKE_BINARY_DIR}/src/analysis/processing
   ${CMAKE_BINARY_DIR}/src/analysis/vector
   ${CMAKE_BINARY_DIR}/src/analysis/raster
   ${CMAKE_BINARY_DIR}/src/analysis/network

diff --git a/python/analysis/analysis_auto.sip b/python/analysis/analysis_auto.sip
@@ -26,4 +26,5 @@
 %Include network/qgsnetworkdistancestrategy.sip
 %Include network/qgsgraphanalyzer.sip
 %Include network/qgsvectorlayerdirector.sip
+%Include processing/qgsnativealgorithms.sip
 %Include network/qgsgraphdirector.sip
diff --git a/python/analysis/processing/qgsnativealgorithms.sip b/python/analysis/processing/qgsnativealgorithms.sip
@@ -0,0 +1,55 @@
+/************************************************************************
+ * This file has been generated automatically from                      *
+ *                                                                      *
+ * src/analysis/processing/qgsnativealgorithms.h                        *
+ *                                                                      *
+ * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
+ ************************************************************************/
+
+
+
+
+class QgsNativeAlgorithms: QgsProcessingProvider
+{
+%Docstring
+.. versionadded:: 3.0
+ Native c++ processing algorithm provider.
+%End
+
+%TypeHeaderCode
+#include "qgsnativealgorithms.h"
+%End
+  public:
+
+    QgsNativeAlgorithms( QObject *parent = 0 );
+%Docstring
+ Constructor for QgsNativeAlgorithms.
+%End
+
+    virtual QIcon icon() const;
+
+    virtual QString svgIconPath() const;
+
+    virtual QString id() const;
+
+    virtual QString name() const;
+
+    virtual bool supportsNonFileBasedOutput() const;
+
+
+  protected:
+
+    virtual void loadAlgorithms();
+
+
+};
+
+
+
+/************************************************************************
+ * This file has been generated automatically from                      *
+ *                                                                      *
+ * src/analysis/processing/qgsnativealgorithms.h                        *
+ *                                                                      *
+ * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
+ ************************************************************************/
diff --git a/python/core/qgscoordinatereferencesystem.sip b/python/core/qgscoordinatereferencesystem.sip
@@ -601,6 +601,17 @@ Returns whether this CRS is correctly initialized and usable
  :rtype: QgsUnitTypes.DistanceUnit
 %End
 
+    QgsRectangle bounds() const;
+%Docstring
+ Returns the approximate bounds for the region the CRS is usable within.
+
+ The returned bounds represent the latitude and longitude extent for the
+ projection in the WGS 84 CRS.
+
+.. versionadded:: 3.0
+ :rtype: QgsRectangle
+%End
+
 
     void setValidationHint( const QString &html );
 %Docstring

diff --git a/python/gui/qgsprojectionselectiontreewidget.sip b/python/gui/qgsprojectionselectiontreewidget.sip
@@ -11,6 +11,7 @@
 
 
 
+
 class QgsProjectionSelectionTreeWidget : QWidget
 {
 %Docstring
@@ -51,6 +52,13 @@ class QgsProjectionSelectionTreeWidget : QWidget
  option is selected, calling crs() will return an invalid QgsCoordinateReferenceSystem.
 .. seealso:: showNoProjection()
 .. versionadded:: 3.0
+%End
+
+    void setShowBoundsMap( bool show );
+%Docstring
+ Sets whether to show the bounnds preview map.
+.. seealso:: showBoundsMap()
+.. versionadded:: 3.0
 %End
 
     bool showNoProjection() const;
@@ -62,6 +70,14 @@ class QgsProjectionSelectionTreeWidget : QWidget
  :rtype: bool
 %End
 
+    bool showBoundsMap() const;
+%Docstring
+ Returns whether the bounds preview map is shown.
+.. versionadded:: 3.0
+.. seealso:: setShowBoundsMap()
+ :rtype: bool
+%End
+
     bool hasValidSelection() const;
 %Docstring
  Returns true if the current selection in the widget is a valid choice. Valid
@@ -80,6 +96,21 @@ class QgsProjectionSelectionTreeWidget : QWidget
 .. seealso:: crs()
 %End
 
+    void setPreviewRect( const QgsRectangle &rect );
+%Docstring
+ Sets the initial "preview" rectangle for the bounds overview map.
+.. versionadded:: 3.0
+.. seealso:: previewRect()
+%End
+
+    QgsRectangle previewRect() const;
+%Docstring
+ The initial "preview" rectangle for the bounds overview map.
+.. versionadded:: 3.0
+.. seealso:: previewRect()
+ :rtype: QgsRectangle
+%End
+
     void setOgcWmsCrsFilter( const QSet<QString> &crsFilter );
 %Docstring
  filters this widget by the given CRSs

diff --git a/python/plugins/processing/tests/GuiTest.py b/python/plugins/processing/tests/GuiTest.py
@@ -27,13 +27,15 @@
 
 from qgis.testing import start_app, unittest
 from qgis.core import QgsApplication
+from qgis.analysis import QgsNativeAlgorithms
 
 from processing.gui.AlgorithmDialog import AlgorithmDialog
 from processing.gui.BatchAlgorithmDialog import BatchAlgorithmDialog
 from processing.modeler.ModelerParametersDialog import ModelerParametersDialog
 from processing.gui.wrappers import *
 
 start_app()
+QgsApplication.processingRegistry().addProvider(QgsNativeAlgorithms())
 
 
 class AlgorithmDialogTest(unittest.TestCase):

diff --git a/python/plugins/processing/tests/QgisAlgorithmsTest.py b/python/plugins/processing/tests/QgisAlgorithmsTest.py
@@ -30,9 +30,11 @@
 import nose2
 import shutil
 
-from qgis.core import (QgsProcessingAlgorithm,
+from qgis.core import (QgsApplication,
+                       QgsProcessingAlgorithm,
                        QgsProcessingFeedback,
                        QgsProcessingException)
+from qgis.analysis import (QgsNativeAlgorithms)
 from qgis.testing import start_app, unittest
 from processing.tools.dataobjects import createContext
 
@@ -64,6 +66,7 @@ class TestQgisAlgorithms(unittest.TestCase, AlgorithmsTestBase.AlgorithmsTest):
     @classmethod
     def setUpClass(cls):
         start_app()
+        QgsApplication.processingRegistry().addProvider(QgsNativeAlgorithms())
         from processing.core.Processing import Processing
         Processing.initialize()
         cls.cleanup_paths = []

diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt
@@ -4,6 +4,7 @@ INSTALL(FILES qgis_global_settings.ini
         DESTINATION ${QGIS_DATA_DIR})
 INSTALL(DIRECTORY cpt-city-qgis-min DESTINATION ${QGIS_DATA_DIR}/resources)
 INSTALL(DIRECTORY themes DESTINATION ${QGIS_DATA_DIR}/resources)
+INSTALL(DIRECTORY data DESTINATION ${QGIS_DATA_DIR}/resources)
 
 IF (WITH_SERVER)
         INSTALL(DIRECTORY server DESTINATION ${QGIS_DATA_DIR}/resources)

diff --git a/resources/data/world_map.dbf b/resources/data/world_map.dbf
diff --git a/resources/data/world_map.prj b/resources/data/world_map.prj
@@ -0,0 +1 @@
+GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137.0,298.257223563]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]]
diff --git a/resources/data/world_map.qix b/resources/data/world_map.qix