Fix #11143 take 3 (cannot remove visibility groups)

wonder-sk · wonder-sk · commit 95f4a30e7bbe · 2014-09-10T12:05:35.000+07:00
Now we also handle rules that are not valid anymore
diff --git a/src/app/qgsvisibilitygroups.cpp b/src/app/qgsvisibilitygroups.cpp
@@ -256,6 +256,30 @@ void QgsVisibilityGroups::applyState( const QString& groupName )
     return;
 
   applyStateToLayerTreeGroup( QgsProject::instance()->layerTreeRoot(), mGroups[groupName] );
+
+  // also make sure that the group is up-to-date (not containing any non-existant legend items)
+  if ( mGroups[groupName] == currentState() )
+    return; // no need for update
+
+  GroupRecord& rec = mGroups[groupName];
+  foreach ( QString layerID, rec.mPerLayerCheckedLegendSymbols.keys() )
+  {
+    QgsVectorLayer* vl = qobject_cast<QgsVectorLayer*>( QgsMapLayerRegistry::instance()->mapLayer( layerID ) );
+    if ( !vl || !vl->rendererV2() )
+      continue;
+
+    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 );
+  }
 }
 
 
diff --git a/src/app/qgsvisibilitygroups.h b/src/app/qgsvisibilitygroups.h
@@ -84,6 +84,10 @@ class QgsVisibilityGroups : public QObject
       {
         return mVisibleLayerIDs == other.mVisibleLayerIDs && mPerLayerCheckedLegendSymbols == other.mPerLayerCheckedLegendSymbols;
       }
+      bool operator!=( const GroupRecord& other ) const
+      {
+        return !( *this == other );
+      }
 
       //! List of layers that are visible
       QSet<QString> mVisibleLayerIDs;

Original file line number	Diff line number	Diff line change
`@@ -84,6 +84,10 @@ class QgsVisibilityGroups : public QObject`
`84`	`84`	`{`
`85`	`85`	`return mVisibleLayerIDs == other.mVisibleLayerIDs && mPerLayerCheckedLegendSymbols == other.mPerLayerCheckedLegendSymbols;`
`86`	`86`	`}`
	`87`	`+ bool operator!=( const GroupRecord& other ) const`
	`88`	`+ {`
	`89`	`+ return !( *this == other );`
	`90`	`+ }`
`87`	`91`
`88`	`92`	`//! List of layers that are visible`
`89`	`93`	`QSet<QString> mVisibleLayerIDs;`