sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-12-15 00:07:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

QgsMapLayer::setDataSource don't require layer name, provider

Browse Source 
Make them optional, and default to current layer name/provider
when not specified
This commit is contained in:
Nyall Dawson 2024-10-03 13:58:50 +10:00
parent ebe818745a
commit 94ec0d9139
4 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
python/PyQt6/core/auto_generated/qgsmaplayer.sip.in
View File

@ -1327,7 +1327,7 @@ Write just the symbology information for the layer into the document
%End
void setDataSource( const QString &dataSource, const QString &baseName, const QString &provider, bool loadDefaultStyleFlag = false );
void setDataSource( const QString &dataSource, const QString &baseName = QString(), const QString &provider = QString(), bool loadDefaultStyleFlag = false );
%Docstring
Updates the data source of the layer.
@ -1335,11 +1335,12 @@ The ``dataSource`` argument must specify the new data source string for the laye
the specified data ``provider`` in use. See :py:class:`QgsDataSourceUri` and the documentation for the various :py:class:`QgsMapLayer`
subclasses for further details on data source strings.
The ``baseName`` argument specifies the user-visible name to use for the layer. (See :py:func:`~QgsMapLayer.name` or :py:func:`~QgsMapLayer.setName`).
The ``baseName`` argument specifies the user-visible name to use for the layer. (See :py:func:`~QgsMapLayer.name` or :py:func:`~QgsMapLayer.setName`). If not
specified, then the current name will be left unchanged (since QGIS 3.40).
The ``provider`` argument is used to specify the unique key of the data provider to use for
the layer. This must match one of the values returned by :py:func:`QgsProviderRegistry.instance()`->:py:func:`~QgsMapLayer.providerList`.
(See :py:func:`~QgsMapLayer.providerType`).
(See :py:func:`~QgsMapLayer.providerType`). If not specified, then the current data provider will be used (since QGIS 3.40).
If ``loadDefaultStyleFlag`` is set to ``True`` then the layer's existing style will be reset to the default
for the data source.

7
python/core/auto_generated/qgsmaplayer.sip.in
View File

@ -1327,7 +1327,7 @@ Write just the symbology information for the layer into the document
%End
void setDataSource( const QString &dataSource, const QString &baseName, const QString &provider, bool loadDefaultStyleFlag = false );
void setDataSource( const QString &dataSource, const QString &baseName = QString(), const QString &provider = QString(), bool loadDefaultStyleFlag = false );
%Docstring
Updates the data source of the layer.
@ -1335,11 +1335,12 @@ The ``dataSource`` argument must specify the new data source string for the laye
the specified data ``provider`` in use. See :py:class:`QgsDataSourceUri` and the documentation for the various :py:class:`QgsMapLayer`
subclasses for further details on data source strings.
The ``baseName`` argument specifies the user-visible name to use for the layer. (See :py:func:`~QgsMapLayer.name` or :py:func:`~QgsMapLayer.setName`).
The ``baseName`` argument specifies the user-visible name to use for the layer. (See :py:func:`~QgsMapLayer.name` or :py:func:`~QgsMapLayer.setName`). If not
specified, then the current name will be left unchanged (since QGIS 3.40).
The ``provider`` argument is used to specify the unique key of the data provider to use for
the layer. This must match one of the values returned by :py:func:`QgsProviderRegistry.instance()`->:py:func:`~QgsMapLayer.providerList`.
(See :py:func:`~QgsMapLayer.providerType`).
(See :py:func:`~QgsMapLayer.providerType`). If not specified, then the current data provider will be used (since QGIS 3.40).
If ``loadDefaultStyleFlag`` is set to ``True`` then the layer's existing style will be reset to the default
for the data source.

5
src/core/qgsmaplayer.cpp
View File

@ -2444,7 +2444,10 @@ void QgsMapLayer::setDataSource( const QString &dataSource, const QString &baseN
{
flags |= Qgis::DataProviderReadFlag::TrustDataSource;
}
setDataSource( dataSource, baseName, provider, options, flags );
setDataSource( dataSource,
baseName.isEmpty() ? mLayerName : baseName,
provider.isEmpty() ? mProviderKey : provider,
options, flags );
}
void QgsMapLayer::setDataSource( const QString &dataSource, const QString &baseName, const QString &provider,

7
src/core/qgsmaplayer.h
View File

@ -1399,11 +1399,12 @@ class CORE_EXPORT QgsMapLayer : public QObject
* the specified data \a provider in use. See QgsDataSourceUri and the documentation for the various QgsMapLayer
* subclasses for further details on data source strings.
*
* The \a baseName argument specifies the user-visible name to use for the layer. (See name() or setName()).
* The \a baseName argument specifies the user-visible name to use for the layer. (See name() or setName()). If not
* specified, then the current name will be left unchanged (since QGIS 3.40).
*
* The \a provider argument is used to specify the unique key of the data provider to use for
* the layer. This must match one of the values returned by QgsProviderRegistry::instance()->providerList().
* (See providerType()).
* (See providerType()). If not specified, then the current data provider will be used (since QGIS 3.40).
*
* If \a loadDefaultStyleFlag is set to TRUE then the layer's existing style will be reset to the default
* for the data source.
@ -1421,7 +1422,7 @@ class CORE_EXPORT QgsMapLayer : public QObject
* \see dataSourceChanged()
* \since QGIS 3.20
*/
void setDataSource( const QString &dataSource, const QString &baseName, const QString &provider, bool loadDefaultStyleFlag = false );
void setDataSource( const QString &dataSource, const QString &baseName = QString(), const QString &provider = QString(), bool loadDefaultStyleFlag = false );
/**
* Updates the data source of the layer.