Skip to content
Permalink
Browse files

Merge pull request #42154 from nyalldawson/provider_file_based

Fix broken bad layer handler dialog
  • Loading branch information
nyalldawson committed Mar 10, 2021
2 parents e0489b3 + fd1c9f3 commit 03edd718a1934976a488dc23c7a50f877c60e8da
Showing with 533 additions and 190 deletions.
  1. +0 −1 python/3d/auto_generated/qgsrulebased3drenderer.sip.in
  2. +54 −0 python/core/auto_generated/qgsmaplayerfactory.sip.in
  3. +14 −0 python/core/auto_generated/qgsprovidermetadata.sip.in
  4. +1 −0 python/core/core_auto.sip
  5. +143 −146 src/app/qgshandlebadlayers.cpp
  6. +11 −6 src/app/qgshandlebadlayers.h
  7. +2 −0 src/core/CMakeLists.txt
  8. +2 −1 src/core/annotations/qgsannotationlayer.cpp
  9. +2 −1 src/core/mesh/qgsmeshlayer.cpp
  10. +2 −1 src/core/pointcloud/qgspointcloudlayer.cpp
  11. +50 −31 src/core/project/qgsproject.cpp
  12. +5 −0 src/core/providers/ept/qgseptprovider.cpp
  13. +1 −0 src/core/providers/ept/qgseptprovider.h
  14. +5 −0 src/core/providers/gdal/qgsgdalprovider.cpp
  15. +1 −0 src/core/providers/gdal/qgsgdalprovider.h
  16. +5 −0 src/core/providers/ogr/qgsogrprovider.cpp
  17. +1 −0 src/core/providers/ogr/qgsogrprovider.h
  18. +62 −0 src/core/qgsmaplayerfactory.cpp
  19. +57 −0 src/core/qgsmaplayerfactory.h
  20. +5 −0 src/core/qgsprovidermetadata.cpp
  21. +18 −0 src/core/qgsprovidermetadata.h
  22. +2 −1 src/core/raster/qgsrasterlayer.cpp
  23. +2 −1 src/core/vector/qgsvectorlayer.cpp
  24. +2 −1 src/core/vectortile/qgsvectortilelayer.cpp
  25. +5 −0 src/providers/delimitedtext/qgsdelimitedtextprovider.cpp
  26. +1 −0 src/providers/delimitedtext/qgsdelimitedtextprovider.h
  27. +5 −0 src/providers/mdal/qgsmdalprovider.cpp
  28. +1 −0 src/providers/mdal/qgsmdalprovider.h
  29. +5 −0 src/providers/pdal/qgspdalprovider.cpp
  30. +1 −0 src/providers/pdal/qgspdalprovider.h
  31. +1 −0 tests/src/python/CMakeLists.txt
  32. +67 −0 tests/src/python/test_qgsmaplayerfactory.py
@@ -11,7 +11,6 @@




class QgsRuleBased3DRendererMetadata : Qgs3DRendererAbstractMetadata
{
%Docstring
@@ -0,0 +1,54 @@
/************************************************************************
* This file has been generated automatically from *
* *
* src/core/qgsmaplayerfactory.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/





class QgsMapLayerFactory
{
%Docstring
Contains utility functions for creating map layers.

.. versionadded:: 3.18.1
%End

%TypeHeaderCode
#include "qgsmaplayerfactory.h"
%End
public:

static QgsMapLayerType typeFromString( const QString &string, bool &ok /Out/ );
%Docstring
Returns the map layer type corresponding a ``string`` value.

:param string: string to convert to map layer type

:return: - converted map layer type
- ok: will be set to ``True`` if ``string`` was successfully converted to a map layer type


.. seealso:: :py:func:`typeToString`
%End

static QString typeToString( QgsMapLayerType type );
%Docstring
Converts a map layer ``type`` to a string value.

.. seealso:: :py:func:`typeFromString`
%End

};

/************************************************************************
* This file has been generated automatically from *
* *
* src/core/qgsmaplayerfactory.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
@@ -115,6 +115,13 @@ library object.
typedef QFlags<QgsProviderMetadata::ProviderMetadataCapability> ProviderMetadataCapabilities;


enum ProviderCapability
{
FileBasedUris,
};
typedef QFlags<QgsProviderMetadata::ProviderCapability> ProviderCapabilities;



QgsProviderMetadata( const QString &key, const QString &description, const QString &library = QString() );
%Docstring
@@ -147,6 +154,13 @@ This is used to provide a descriptive list of available data providers.
Returns the provider metadata capabilities.

.. versionadded:: 3.18
%End

virtual QgsProviderMetadata::ProviderCapabilities providerCapabilities() const;
%Docstring
Returns the provider's capabilities.

.. versionadded:: 3.18.1
%End

QString library() const /Deprecated/;
@@ -106,6 +106,7 @@
%Include auto_generated/qgsmaphittest.sip
%Include auto_generated/qgsmaplayer.sip
%Include auto_generated/qgsmaplayerdependency.sip
%Include auto_generated/qgsmaplayerfactory.sip
%Include auto_generated/qgsmaplayerlegend.sip
%Include auto_generated/qgsmaplayermodel.sip
%Include auto_generated/qgsmaplayerproxymodel.sip

0 comments on commit 03edd71

Please sign in to comment.