sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-17 00:04:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Auxiliary storage can be used on non spatial layer

Browse Source
This commit is contained in:
Blottiere Paul 2017-09-05 09:19:18 +01:00
parent 94fde118a5
commit b6752df628
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/qgsvectorlayerproperties.cpp
View File

@ -1545,8 +1545,6 @@ void QgsVectorLayerProperties::updateAuxiliaryStoragePage( bool reset )
mAuxiliaryLayerActionClear->setEnabled( false );
mAuxiliaryLayerActionDelete->setEnabled( false );
mAuxiliaryLayerActionExport->setEnabled( false );
if ( mLayer->isSpatial() )
mAuxiliaryLayerActionNew->setEnabled( true );
mAuxiliaryStorageFieldsTree->clear();
@ -1565,7 +1563,7 @@ void QgsVectorLayerProperties::onAuxiliaryLayerNew()
{
QgsAuxiliaryLayer *alayer = mLayer->auxiliaryLayer();
if ( alayer || !mLayer->isSpatial() )
if ( alayer )
return;
QgsNewAuxiliaryLayerDialog dlg( mLayer, this );

2
src/core/qgsauxiliarystorage.cpp
View File

@ -480,7 +480,7 @@ QgsAuxiliaryLayer *QgsAuxiliaryStorage::createAuxiliaryLayer( const QgsField &fi
{
QgsAuxiliaryLayer *alayer = nullptr;
if ( mValid && layer && layer->isSpatial() )
if ( mValid && layer )
{
const QString table( layer->id() );
sqlite3 *handler = openDB( currentFileName() );

2
src/core/qgsproject.cpp
View File

@ -2252,7 +2252,7 @@ QList<QgsMapLayer *> QgsProject::addMapLayers(
continue;
QgsVectorLayer *vl = qobject_cast<QgsVectorLayer *>( mlayer );
if ( vl && vl->isSpatial() )
if ( vl )
{
vl->loadAuxiliaryLayer( *mAuxiliaryStorage.get() );
}

2
src/core/qgsvectorlayer.cpp
View File

@ -4273,7 +4273,7 @@ bool QgsVectorLayer::loadAuxiliaryLayer( const QgsAuxiliaryStorage &storage )
{
bool rc = false;
if ( isSpatial() && storage.isValid() && !mAuxiliaryLayerKey.isEmpty() )
if ( storage.isValid() && !mAuxiliaryLayerKey.isEmpty() )
{
QgsAuxiliaryLayer *alayer = nullptr;