sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-01 00:46:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

offline editing: add layer to map layer registry before

Browse Source 
copying the symbology - otherwise edit widget settings
won't be copied (fixes #11827)
This commit is contained in:
Juergen E. Fischer 2015-02-10 18:40:31 +01:00
parent 2073c03931
commit 4938fe79e8
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/core/qgsofflineediting.cpp
View File

@ -233,13 +233,13 @@ void QgsOfflineEditing::synchronize()
QgsVectorLayer* offlineLayer = qobject_cast<QgsVectorLayer*>( layer ); QgsVectorLayer* offlineLayer = qobject_cast<QgsVectorLayer*>( layer );
// copy style
copySymbology( offlineLayer, remoteLayer );
// register this layer with the central layers registry // register this layer with the central layers registry
QgsMapLayerRegistry::instance()->addMapLayers( QgsMapLayerRegistry::instance()->addMapLayers(
QList<QgsMapLayer *>() << remoteLayer, true ); QList<QgsMapLayer *>() << remoteLayer, true );
// copy style
copySymbology( offlineLayer, remoteLayer );
// apply layer edit log // apply layer edit log
QString qgisLayerId = layer->id(); QString qgisLayerId = layer->id();
QString sql = QString( "SELECT \"id\" FROM 'log_layer_ids' WHERE \"qgis_id\" = '%1'" ).arg( qgisLayerId ); QString sql = QString( "SELECT \"id\" FROM 'log_layer_ids' WHERE \"qgis_id\" = '%1'" ).arg( qgisLayerId );
@ -557,6 +557,10 @@ QgsVectorLayer* QgsOfflineEditing::copyVectorLayer( QgsVectorLayer* layer, sqlit
newLayer->setCustomProperty( CUSTOM_PROPERTY_REMOTE_SOURCE, layer->source() ); newLayer->setCustomProperty( CUSTOM_PROPERTY_REMOTE_SOURCE, layer->source() );
newLayer->setCustomProperty( CUSTOM_PROPERTY_REMOTE_PROVIDER, layer->providerType() ); newLayer->setCustomProperty( CUSTOM_PROPERTY_REMOTE_PROVIDER, layer->providerType() );
// register this layer with the central layers registry
QgsMapLayerRegistry::instance()->addMapLayers(
QList<QgsMapLayer *>() << newLayer );
// copy style // copy style
bool hasLabels = layer->hasLabelsEnabled(); bool hasLabels = layer->hasLabelsEnabled();
if ( !hasLabels ) if ( !hasLabels )
@ -565,10 +569,6 @@ QgsVectorLayer* QgsOfflineEditing::copyVectorLayer( QgsVectorLayer* layer, sqlit
copySymbology( layer, newLayer ); copySymbology( layer, newLayer );
} }
// register this layer with the central layers registry
QgsMapLayerRegistry::instance()->addMapLayers(
QList<QgsMapLayer *>() << newLayer );
QgsLayerTreeGroup* layerTreeRoot = QgsProject::instance()->layerTreeRoot(); QgsLayerTreeGroup* layerTreeRoot = QgsProject::instance()->layerTreeRoot();
// Find the parent group of the original layer // Find the parent group of the original layer
QgsLayerTreeLayer* layerTreeLayer = layerTreeRoot->findLayer( layer->id() ); QgsLayerTreeLayer* layerTreeLayer = layerTreeRoot->findLayer( layer->id() );