Merge branch 'master' into processing_sampling

qgis · Jul 16, 2018 · 14c74d8 · 14c74d8
2 parents 1a0d0db + 7933c85
commit 14c74d8
Show file tree

Hide file tree

Showing 208 changed files with 9,235 additions and 1,627 deletions.
diff --git a/.ci/travis/code_layout/install.sh b/.ci/travis/code_layout/install.sh
@@ -19,6 +19,6 @@ export CORES=2
 mkdir build
 pushd build || exit
 
-cmake -DUSE_CCACHE=OFF -DWITH_CORE=OFF -DWITH_APIDOC=ON -DWITH_ASTYLE=ON -DENABLE_TESTS=ON ..
+cmake -DWITH_SERVER=ON -DUSE_CCACHE=OFF -DWITH_CORE=OFF -DWITH_APIDOC=ON -DWITH_ASTYLE=ON -DENABLE_TESTS=ON ..
 
 popd || exit
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
@@ -104,23 +104,16 @@ IF(WITH_APIDOC)
       ${CMAKE_SOURCE_DIR}/src/quickgui/plugin
     )
 
-    IF(WITH_SERVER_PLUGINS)
+    IF(WITH_SERVER)
       SET(DOXYGEN_INPUT
         ${DOXYGEN_INPUT}
-        ${CMAKE_SOURCE_DIR}/src/server/qgsserver.h
-        ${CMAKE_SOURCE_DIR}/src/server/qgscapabilitiescache.h
-        ${CMAKE_SOURCE_DIR}/src/server/qgsserverexception.h
-        ${CMAKE_SOURCE_DIR}/src/server/qgsrequesthandler.h
-        ${CMAKE_SOURCE_DIR}/src/server/qgsserverfilter.h
-        ${CMAKE_SOURCE_DIR}/src/server/qgsaccesscontrolfilter.h
-        ${CMAKE_SOURCE_DIR}/src/server/qgsserverinterface.h
-        ${CMAKE_SOURCE_DIR}/src/server/qgsserverrequest.h
-        ${CMAKE_SOURCE_DIR}/src/server/qgsserverresponse.h
-        ${CMAKE_SOURCE_DIR}/src/server/qgsserverrequest.h
-        ${CMAKE_SOURCE_DIR}/src/server/qgsservice.h
-        ${CMAKE_SOURCE_DIR}/src/server/qgsserviceregistry.h
+        ${CMAKE_SOURCE_DIR}/src/server/
+        ${CMAKE_SOURCE_DIR}/src/server/services/
+        ${CMAKE_SOURCE_DIR}/src/server/services/wms
+        ${CMAKE_SOURCE_DIR}/src/server/services/wfs
+        ${CMAKE_SOURCE_DIR}/src/server/services/wcs
       )
-    ENDIF(WITH_SERVER_PLUGINS)
+    ENDIF(WITH_SERVER)
 
     SET(DOXYGEN_FILE_PATTERNS *.h *.cpp *.dox)
 

diff --git a/doc/qgsquick.dox b/doc/qgsquick.dox
@@ -13,6 +13,9 @@ QGIS Quick consists of a Qt plugin that provides the QML components and of a sha
 
 \subsection qgsquick_overview_widgets QML Classes
 \subsubsection qgsquick_overview_widgets_mapcanvas MapCanvas
+\subsubsection qgsquick_overview_widgets_featureform FeatureForm
+A form listing attributes of a given feature. It supports basic edit field widgets for types such as edit text, map value,
+checkbox,  date/time picker or external resource (photo capture).
 \subsubsection qgsquick_overview_widgets_positionmarker PositionMarker
 The element refers to current position according gps location device connected to it. It holds information about longitude, latitude, altitude,
 direction of the movement and accuracy of the signal. See also QgsQuickPositionKit.

diff --git a/images/images.qrc b/images/images.qrc
@@ -170,6 +170,7 @@
         <file>themes/default/mActionDistributeTop.svg</file>
         <file>themes/default/mActionDistributeVCenter.svg</file>
         <file>themes/default/mActionAddLayer.svg</file>
+        <file>themes/default/mActionAddMeshLayer.svg</file>
         <file>themes/default/mActionAddAllToOverview.svg</file>
         <file>themes/default/mActionAddArrow.svg</file>
         <file>themes/default/mActionAddBasicShape.svg</file>
@@ -694,6 +695,7 @@
         <file>themes/default/mActionIdentifyByRadius.svg</file>
         <file>themes/default/mActionIdentifyByRectangle.svg</file>
         <file>themes/default/mIndicatorEmbedded.svg</file>
+        <file>themes/default/mIconHistory.svg</file>
     </qresource>
     <qresource prefix="/images/tips">
         <file alias="symbol_levels.png">qgis_tips/symbol_levels.png</file>

diff --git a/images/themes/default/mActionAddMeshLayer.svg b/images/themes/default/mActionAddMeshLayer.svg
diff --git a/python/plugins/processing/images/history.svg → images/themes/default/mIconHistory.svg b/python/plugins/processing/images/history.svg → images/themes/default/mIconHistory.svg
diff --git a/images/themes/default/providerQgis.svg b/images/themes/default/providerQgis.svg
diff --git a/python/core/auto_generated/qgsofflineediting.sip.in b/python/core/auto_generated/qgsofflineediting.sip.in
@@ -28,16 +28,23 @@ class QgsOfflineEditing : QObject
       UpdateGeometries
     };
 
+    enum ContainerType
+    {
+      SpatiaLite,
+      GPKG
+    };
+
     QgsOfflineEditing();
 
-    bool convertToOfflineProject( const QString &offlineDataPath, const QString &offlineDbFile, const QStringList &layerIds, bool onlySelected = false );
+    bool convertToOfflineProject( const QString &offlineDataPath, const QString &offlineDbFile, const QStringList &layerIds, bool onlySelected = false, ContainerType containerType = SpatiaLite );
 %Docstring
 Convert current project for offline editing
 
 :param offlineDataPath: Path to offline db file
 :param offlineDbFile: Offline db file name
 :param layerIds: List of layer names to convert
 :param onlySelected: Only copy selected features from layers where a selection is present
+:param containerType: defines the SQLite file container type like SpatiaLite or GPKG
 %End
 
     bool isOfflineProject() const;

diff --git a/python/core/auto_generated/raster/qgscolorrampshader.sip.in b/python/core/auto_generated/raster/qgscolorrampshader.sip.in
@@ -143,7 +143,7 @@ Classify color ramp shader
 :param input: raster input used in classification (quantile mode only)
 %End
 
-    virtual bool shade( double value, int *returnRedValue /Out/, int *returnGreenValue /Out/, int *returnBlueValue /Out/, int *returnAlphaValue /Out/ );
+    virtual bool shade( double value, int *returnRedValue /Out/, int *returnGreenValue /Out/, int *returnBlueValue /Out/, int *returnAlphaValue /Out/ ) const;
 
 %Docstring
 Generates and new RGB value based on one input value
@@ -152,7 +152,7 @@ Generates and new RGB value based on one input value
      virtual bool shade( double redValue, double greenValue,
                 double blueValue, double alphaValue,
                 int *returnRedValue /Out/, int *returnGreenValue /Out/,
-                int *returnBlueValue /Out/, int *returnAlphaValue /Out/ );
+                int *returnBlueValue /Out/, int *returnAlphaValue /Out/ ) const;
 %Docstring
 Generates and new RGB value based on original RGB value
 %End

diff --git a/python/core/auto_generated/raster/qgsrastershaderfunction.sip.in b/python/core/auto_generated/raster/qgsrastershaderfunction.sip.in
@@ -54,7 +54,7 @@ Sets the minimum ``value`` for the raster shader.
                         int *returnRedValue /Out/,
                         int *returnGreenValue /Out/,
                         int *returnBlueValue /Out/,
-                        int *returnAlpha /Out/ );
+                        int *returnAlpha /Out/ ) const;
 %Docstring
 Generates an new RGBA value based on one input ``value``.
 
@@ -74,7 +74,7 @@ Generates an new RGBA value based on one input ``value``.
                         int *returnRedValue /Out/,
                         int *returnGreenValue /Out/,
                         int *returnBlueValue /Out/,
-                        int *returnAlpha /Out/ );
+                        int *returnAlpha /Out/ ) const;
 %Docstring
 Generates an new RGBA value based on an original RGBA value.
 

diff --git a/python/gui/auto_additions/qgsprocessingtoolboxmodel.py b/python/gui/auto_additions/qgsprocessingtoolboxmodel.py
@@ -0,0 +1,3 @@
+# The following has been generated automatically from src/gui/processing/qgsprocessingtoolboxmodel.h
+QgsProcessingToolboxProxyModel.Filters.baseClass = QgsProcessingToolboxProxyModel
+Filters = QgsProcessingToolboxProxyModel  # dirty hack since SIP seems to introduce the flags in module