Merge branch 'master' into geomCheckerCodingConventions

qgis · Aug 21, 2018 · 50acde0 · 50acde0
2 parents 37d0b7b + c0032f1
commit 50acde0
Show file tree

Hide file tree

Showing 109 changed files with 1,984 additions and 409 deletions.
diff --git a/ms-windows/osgeo4w/package.cmd b/ms-windows/osgeo4w/package.cmd
@@ -150,7 +150,10 @@ cmake -G "%CMAKEGEN%" ^
 	-D WITH_GLOBE=FALSE ^
 	-D WITH_ORACLE=TRUE ^
 	-D WITH_CUSTOM_WIDGETS=TRUE ^
-	-D CMAKE_CXX_FLAGS_RELEASE="/MD /MP /O2 /Ob2 /D NDEBUG" ^
+	-D CMAKE_CXX_FLAGS_RELEASE="/MD /Zi /MP /O2 /Ob2 /D NDEBUG" ^
+	-D CMAKE_SHARED_LINKER_FLAGS_RELEASE="/INCREMENTAL:NO /DEBUG /OPT:REF /OPT:ICF" ^
+	-D CMAKE_MODULE_LINKER_FLAGS_RELEASE="/INCREMENTAL:NO /DEBUG /OPT:REF /OPT:ICF" ^
+	-D CMAKE_PDB_OUTPUT_DIRECTORY_RELEASE=%BUILDDIR%\apps\%PACKAGENAME%\pdb ^
 	-D CMAKE_BUILD_TYPE=%BUILDCONF% ^
 	-D CMAKE_CONFIGURATION_TYPES=%BUILDCONF% ^
 	-D GEOS_LIBRARY=%O4W_ROOT%/lib/geos_c.lib ^
@@ -407,6 +410,11 @@ if not exist %ARCH%\release\qgis\%PACKAGENAME% mkdir %ARCH%\release\qgis\%PACKAG
 	"etc/preremove/%PACKAGENAME%.bat"
 if errorlevel 1 (echo tar desktop failed & goto error)
 
+if not exist %ARCH%\release\qgis\%PACKAGENAME%-pdb mkdir %ARCH%\release\qgis\%PACKAGENAME%-pdb
+%TAR% -C %BUILDDIR% -cjf %ARCH%/release/qgis/%PACKAGENAME%-pdb/%PACKAGENAME%-pdb-%VERSION%-%PACKAGE%.tar.bz2 ^
+	apps/%PACKAGENAME%/pdb
+if errorlevel 1 (echo tar failed & goto error)
+
 %TAR% -C %OSGEO4W_ROOT% -cjf %ARCH%/release/qgis/%PACKAGENAME%-grass-plugin-common/%PACKAGENAME%-grass-plugin-common-%VERSION%-%PACKAGE%.tar.bz2 ^
 	--exclude-from exclude ^
 	--exclude "*.pyc" ^

diff --git a/ms-windows/osgeo4w/qgis.reg.tmpl b/ms-windows/osgeo4w/qgis.reg.tmpl
@@ -20,15 +20,6 @@ Windows Registry Editor Version 5.00
 [HKEY_CLASSES_ROOT\.qgz]
 @="QGIS Project"
 
-[HKEY_CLASSES_ROOT\QGIS Layer Definition]
-@="QGIS Layer Definition"
-
-[HKEY_CLASSES_ROOT\QGIS Layer Definition\DefaultIcon]
-@="@osgeo4w@\\apps\\@package@\\icons\\qgis-qml.ico"
-
-[HKEY_CLASSES_ROOT\.qml]
-@="QGIS Layer Definition"
-
 [HKEY_CLASSES_ROOT\QGIS Composer Template]
 @="QGIS Composer Template"
 

diff --git a/python/console/console_output.py b/python/console/console_output.py
@@ -169,8 +169,9 @@ def __init__(self, parent=None):
 
     def insertInitText(self):
         txtInit = QCoreApplication.translate("PythonConsole",
-                                             "Python Console \n"
-                                             "Use iface to access QGIS API interface or Type help(iface) for more info")
+                                             "Python Console\n"
+                                             "Use iface to access QGIS API interface or Type help(iface) for more info\n"
+                                             "Security warning: typing commands from an untrusted source can lead to data loss and/or leak")
 
         # some translation string for the console header ends without '\n'
         # and the first command in console will be appended at the header text.

diff --git a/python/core/auto_generated/layout/qgslayoutitemregistry.sip.in b/python/core/auto_generated/layout/qgslayoutitemregistry.sip.in
@@ -178,6 +178,8 @@ of layout items.
       LayoutAttributeTable,
       LayoutTextTable,
 
+      Layout3DMap,
+
       // item
       PluginItem,
     };

diff --git a/python/core/auto_generated/mesh/qgsmeshdataprovider.sip.in b/python/core/auto_generated/mesh/qgsmeshdataprovider.sip.in
@@ -359,6 +359,18 @@ Returns dataset metadata
 Returns vector/scalar value associated with the index from the dataset
 
 See QgsMeshDatasetMetadata.isVector() to check if the returned value is vector or scalar
+%End
+
+    virtual bool isFaceActive( QgsMeshDatasetIndex index, int faceIndex ) const = 0;
+%Docstring
+Returns whether the face is active for particular dataset
+
+For example to represent the situation when F1 and F3 are flooded, but F2 is dry,
+some solvers store water depth on vertices V1-V8 (all non-zero values) and
+set active flag for F2 to false.
+V1 ---- V2 ---- V5-----V7
+|   F1  |   F2   | F3  |
+V3 ---- V4 ---- V6-----V8
 %End
 };
 

diff --git a/python/core/auto_generated/mesh/qgsmeshrenderersettings.sip.in b/python/core/auto_generated/mesh/qgsmeshrenderersettings.sip.in
@@ -90,6 +90,19 @@ Returns color ramp shader function
     void setColorRampShader( const QgsColorRampShader &shader );
 %Docstring
 Sets color ramp shader function
+%End
+
+    double classificationMinimum() const;
+%Docstring
+Returns min value used for creation of the color ramp shader
+%End
+    double classificationMaximum() const;
+%Docstring
+Returns max value used for creation of the color ramp shader
+%End
+    void setClassificationMinimumMaximum( double minimum, double maximum );
+%Docstring
+Sets min/max values used for creation of the color ramp shader
 %End
 
     QDomElement writeXml( QDomDocument &doc ) const;

diff --git a/python/core/auto_generated/qgsfeaturerequest.sip.in b/python/core/auto_generated/qgsfeaturerequest.sip.in
@@ -635,7 +635,7 @@ Check if a feature is accepted by this requests filter
 .. versionadded:: 2.1
 %End
 
-    int connectionTimeout() const;
+ int connectionTimeout() const /Deprecated/;
 %Docstring
 Returns the timeout (in milliseconds) for how long we should wait for a connection if none is available from the pool
 at this moment. A negative value (which is set by default) will wait forever.
@@ -644,10 +644,12 @@ at this moment. A negative value (which is set by default) will wait forever.
 
    Only works if the provider supports this option.
 
+.. deprecated:: Use timeout() instead.
+
 .. versionadded:: 3.0
 %End
 
-    QgsFeatureRequest &setConnectionTimeout( int connectionTimeout );
+ QgsFeatureRequest &setConnectionTimeout( int connectionTimeout ) /Deprecated/;
 %Docstring
 Sets the timeout (in milliseconds) for how long we should wait for a connection if none is available from the pool
 at this moment. A negative value (which is set by default) will wait forever.
@@ -656,7 +658,33 @@ at this moment. A negative value (which is set by default) will wait forever.
 
    Only works if the provider supports this option.
 
+.. deprecated:: Use setTimeout() instead.
+
 .. versionadded:: 3.0
+%End
+
+    int timeout() const;
+%Docstring
+Returns the timeout (in milliseconds) for the maximum time we should wait during feature requests before a
+feature is returned. A negative value (which is set by default) will wait forever.
+
+.. note::
+
+   Only works if the provider supports this option.
+
+.. versionadded:: 3.4
+%End
+
+    QgsFeatureRequest &setTimeout( int timeout );
+%Docstring
+Sets the ``timeout`` (in milliseconds) for the maximum time we should wait during feature requests before a
+feature is returned. A negative value (which is set by default) will wait forever.
+
+.. note::
+
+   Only works if the provider supports this option.
+
+.. versionadded:: 3.4
 %End
 
     bool requestMayBeNested() const;

diff --git a/python/core/auto_generated/qgsproxyprogresstask.sip.in b/python/core/auto_generated/qgsproxyprogresstask.sip.in
@@ -52,6 +52,36 @@ This method is safe to call from the main thread.
 
 };
 
+class QgsScopedProxyProgressTask
+{
+%Docstring
+
+Scoped :py:class:`QgsScopedProxyProgressTask`, which automatically adds the proxy task
+to the application task manager on construction and finalizes the task
+when it goes out of scope.
+
+.. versionadded:: 3.4
+%End
+
+%TypeHeaderCode
+#include "qgsproxyprogresstask.h"
+%End
+  public:
+
+    QgsScopedProxyProgressTask( const QString &description );
+%Docstring
+Constructor for QgsScopedProxyProgressTask, with the specified ``description``.
+%End
+
+    ~QgsScopedProxyProgressTask();
+
+    void setProgress( double progress );
+%Docstring
+Sets the ``progress`` (from 0 to 100) for the proxied operation.
+%End
+
+};
+
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *

diff --git a/python/gui/auto_generated/qgsabstractdatasourcewidget.sip.in b/python/gui/auto_generated/qgsabstractdatasourcewidget.sip.in
@@ -102,10 +102,11 @@ Emitted when a layer needs to be replaced
 :param provider: key
 %End
 
-
-    void progress( int, int );
+ void progress( int, int ) /Deprecated/;
 %Docstring
-Emitted when a progress dialog is shown by the provider dialog
+Emitted when a progress dialog is shown by the provider dialog.
+
+.. deprecated:: Since QGIS 3.4 this signal is no longer used. Use QgsProxyProgressTask instead to show progress reports.
 %End
 
     void progressMessage( QString message );

diff --git a/python/plugins/processing/algs/gdal/OgrToPostGis.py b/python/plugins/processing/algs/gdal/OgrToPostGis.py
@@ -163,7 +163,15 @@ def name(self):
         return 'importvectorintopostgisdatabasenewconnection'
 
     def displayName(self):
-        return self.tr('Import vector into PostGIS database (new connection)')
+        return self.tr('Export to PostgreSQL (new connection)')
+
+    def shortDescription(self):
+        return self.tr('Exports a vector layer to a new PostgreSQL database connection')
+
+    def tags(self):
+        t = self.tr('import,into,postgis,database,vector').split(',')
+        t.extend(super().tags())
+        return t
 
     def group(self):
         return self.tr('Vector miscellaneous')

diff --git a/python/plugins/processing/algs/gdal/ogr2ogrtopostgislist.py b/python/plugins/processing/algs/gdal/ogr2ogrtopostgislist.py
@@ -171,7 +171,15 @@ def name(self):
         return 'importvectorintopostgisdatabaseavailableconnections'
 
     def displayName(self):
-        return self.tr('Import vector into PostGIS database (available connections)')
+        return self.tr('Export to PostgreSQL (available connections)')
+
+    def shortDescription(self):
+        return self.tr('Exports a vector layer to an existing PostgreSQL database connection')
+
+    def tags(self):
+        t = self.tr('import,into,postgis,database,vector').split(',')
+        t.extend(super().tags())
+        return t
 
     def group(self):
         return self.tr('Vector miscellaneous')

diff --git a/python/plugins/processing/algs/gdal/ogrinfo.py b/python/plugins/processing/algs/gdal/ogrinfo.py
@@ -74,7 +74,7 @@ def commandName(self):
         return 'ogrinfo'
 
     def getConsoleCommands(self, parameters, context, feedback, executing=True):
-        arguments = [self.commandName(), '-al']
+        arguments = ['-al']
 
         if self.parameterAsBool(parameters, self.SUMMARY_ONLY, context):
             arguments.append('-so')
@@ -87,7 +87,7 @@ def getConsoleCommands(self, parameters, context, feedback, executing=True):
 
         connectionString = GdalUtils.ogrConnectionString(inLayer.source(), context)
         arguments.append(connectionString)
-        return arguments
+        return [self.commandName(), GdalUtils.escapeAndJoin(arguments)]
 
     def processAlgorithm(self, parameters, context, feedback):
         GdalUtils.runGdal(self.getConsoleCommands(parameters, context, feedback), feedback)

diff --git a/python/plugins/processing/algs/qgis/ImportIntoPostGIS.py b/python/plugins/processing/algs/qgis/ImportIntoPostGIS.py
@@ -115,7 +115,13 @@ def name(self):
         return 'importintopostgis'
 
     def displayName(self):
-        return self.tr('Import into PostGIS')
+        return self.tr('Export to PostgreSQL')
+
+    def shortDescription(self):
+        return self.tr('Exports a vector layer to a PostgreSQL database')
+
+    def tags(self):
+        return self.tr('import,postgis,table,layer,into,copy').split(',')
 
     def processAlgorithm(self, parameters, context, feedback):
         connection = self.parameterAsString(parameters, self.DATABASE, context)

diff --git a/python/plugins/processing/algs/qgis/ImportIntoSpatialite.py b/python/plugins/processing/algs/qgis/ImportIntoSpatialite.py
@@ -84,7 +84,13 @@ def name(self):
         return 'importintospatialite'
 
     def displayName(self):
-        return self.tr('Import into Spatialite')
+        return self.tr('Export to SpatiaLite')
+
+    def shortDescription(self):
+        return self.tr('Exports a vector layer to a SpatiaLite database')
+
+    def tags(self):
+        return self.tr('import,table,layer,into,copy').split(',')
 
     def processAlgorithm(self, parameters, context, feedback):
         database = self.parameterAsVectorLayer(parameters, self.DATABASE, context)

diff --git a/python/plugins/processing/algs/qgis/PostGISExecuteAndLoadSQL.py b/python/plugins/processing/algs/qgis/PostGISExecuteAndLoadSQL.py
@@ -89,7 +89,13 @@ def name(self):
         return 'postgisexecuteandloadsql'
 
     def displayName(self):
-        return self.tr('PostGIS execute and load SQL')
+        return self.tr('PostgreSQL execute and load SQL')
+
+    def shortDescription(self):
+        return self.tr('Executes a SQL command on a PostgreSQL database and loads the result as a table')
+
+    def tags(self):
+        return self.tr('postgis,table,database').split(',')
 
     def processAlgorithm(self, parameters, context, feedback):
         connection = self.parameterAsString(parameters, self.DATABASE, context)

diff --git a/python/plugins/processing/algs/qgis/PostGISExecuteSQL.py b/python/plugins/processing/algs/qgis/PostGISExecuteSQL.py
@@ -58,7 +58,13 @@ def name(self):
         return 'postgisexecutesql'
 
     def displayName(self):
-        return self.tr('PostGIS execute SQL')
+        return self.tr('PostgreSQL execute SQL')
+
+    def shortDescription(self):
+        return self.tr('Executes a SQL command on a PostgreSQL database')
+
+    def tags(self):
+        return self.tr('postgis,database').split(',')
 
     def processAlgorithm(self, parameters, context, feedback):
         connection = self.parameterAsString(parameters, self.DATABASE, context)