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

Fix #12197 - cannot delete old visibility preset

Browse Source 
When a preset gets applied, we try to fix it by removing irelevant stuff
(e.g. legend items that do not exist anymore, styles that do not exist).
This is however slightly complicated and leaves room for problems.

Let's simply fix the presets by assigning them the current state after
being applied - and get rid of all the patching...
This commit is contained in:
Martin Dobias 2015-02-20 13:49:38 +07:00
parent c9682e550b
commit 5eba57558d
1 changed files with 1 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/app/qgsvisibilitypresets.cpp
View File

@ -339,52 +339,7 @@ void QgsVisibilityPresets::applyState( const QString& presetName )
applyStateToLayerTreeGroup( QgsProject::instance()->layerTreeRoot(), mPresets[presetName] );
// also make sure that the preset is up-to-date (not containing any non-existent legend items)
if ( mPresets[presetName] == currentState() )
return; // no need for update
PresetRecord& rec = mPresets[presetName];
foreach ( QString layerID, rec.mPerLayerCheckedLegendSymbols.keys() )
{
QgsVectorLayer* vl = qobject_cast<QgsVectorLayer*>( QgsMapLayerRegistry::instance()->mapLayer( layerID ) );
if ( !vl || !vl->rendererV2() )
continue;
// first verify if the layer still has checkable legend items
// if not, remove the entry for the layer
if ( !vl->rendererV2()->legendSymbolItemsCheckable() )
{
rec.mPerLayerCheckedLegendSymbols.remove( layerID );
continue;
}
// now verify that all recorded legend items still exist
// if not, remove them from the layer's entry
QSet<QString> validRuleKeys;
foreach ( const QgsLegendSymbolItemV2& item, vl->rendererV2()->legendSymbolItemsV2() )
validRuleKeys << item.ruleKey();
QSet<QString> invalidRuleKeys;
foreach ( QString ruleKey, rec.mPerLayerCheckedLegendSymbols[layerID] )
if ( !validRuleKeys.contains( ruleKey ) )
invalidRuleKeys << ruleKey;
foreach ( QString invalidRuleKey, invalidRuleKeys )
rec.mPerLayerCheckedLegendSymbols[layerID].remove( invalidRuleKey );
}
// fix non-existent layer styles
foreach ( QString layerID, rec.mPerLayerCurrentStyle.keys() )
{
QgsMapLayer* ml = QgsMapLayerRegistry::instance()->mapLayer( layerID );
if ( !ml )
continue;
QString name = rec.mPerLayerCurrentStyle[layerID];
if ( !ml->styleManager()->styles().contains( name ) )
rec.mPerLayerCurrentStyle[layerID] = ml->styleManager()->currentStyle();
}
mPresets[presetName] = currentState();
}
void QgsVisibilityPresets::reconnectToLayersStyleManager()