Changeset 6493 for branches/GP.Grammar.Editor/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding

Timestamp:

06/28/11 15:16:25 (13 years ago)

Author:

mkommend

Message:

#1479: added functional improvements to SymbolicExpressionGrammar editor.

Location:

branches/GP.Grammar.Editor/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4

Files:

• SymbolicExpressionGrammarBase.cs (modified) (3 diffs)
• Symbols/GroupSymbol.cs (modified) (1 diff)

branches/GP.Grammar.Editor/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionGrammarBase.cs

@@ -426 +426 @@
       symbol.NameChanging += new EventHandler<CancelEventArgs<string>>(Symbol_NameChanging);
       symbol.NameChanged += new EventHandler(Symbol_NameChanged);
-      symbol.Changed += new EventHandler(Symbol_Changed);
+
       var groupSymbol = symbol as GroupSymbol;
       if (groupSymbol != null) RegisterGroupSymbolEvents(groupSymbol);
+      else symbol.Changed += new EventHandler(Symbol_Changed);
     }
     private void DeregisterSymbolEvents(ISymbol symbol) {
       symbol.NameChanging -= new EventHandler<CancelEventArgs<string>>(Symbol_NameChanging);
       symbol.NameChanged -= new EventHandler(Symbol_NameChanged);
-      symbol.Changed -= new EventHandler(Symbol_Changed);
+
       var groupSymbol = symbol as GroupSymbol;
       if (groupSymbol != null) DeregisterGroupSymbolEvents(groupSymbol);
+      else symbol.Changed -= new EventHandler(Symbol_Changed);
     }
 
     private void RegisterGroupSymbolEvents(GroupSymbol groupSymbol) {
+      groupSymbol.Changed += new EventHandler(GroupSymbol_Changed);
       groupSymbol.SymbolsCollection.ItemsAdded += new Collections.CollectionItemsChangedEventHandler<ISymbol>(GroupSymbol_ItemsAdded);
       groupSymbol.SymbolsCollection.ItemsRemoved += new Collections.CollectionItemsChangedEventHandler<ISymbol>(GroupSymbol_ItemsRemoved);
@@ -444 +447 @@
     }
     private void DeregisterGroupSymbolEvents(GroupSymbol groupSymbol) {
+      groupSymbol.Changed -= new EventHandler(GroupSymbol_Changed);
       groupSymbol.SymbolsCollection.ItemsAdded -= new Collections.CollectionItemsChangedEventHandler<ISymbol>(GroupSymbol_ItemsAdded);
       groupSymbol.SymbolsCollection.ItemsRemoved -= new Collections.CollectionItemsChangedEventHandler<ISymbol>(GroupSymbol_ItemsRemoved);
@@ -492 +496 @@
     }
 
-    private void Symbol_Changed(object sende, EventArgs e) {
+    private void Symbol_Changed(object sender, EventArgs e) {
+      if (suppressEvents) return;
+      ClearCaches();
+      OnChanged();
+    }
+
+    private void GroupSymbol_Changed(object sender, EventArgs e) {
+      if (suppressEvents) return;
+      suppressEvents = true;
+      GroupSymbol groupSymbol = (GroupSymbol)sender;
+      foreach (ISymbol symbol in groupSymbol.Flatten())
+        symbol.Enabled = groupSymbol.Enabled;
+      suppressEvents = false;
       ClearCaches();
       OnChanged();

branches/GP.Grammar.Editor/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Symbols/GroupSymbol.cs

@@ -51 +51 @@
     public override bool Enabled {
       get { return base.Enabled; }
-      set {
-        if (value != Enabled) {
-          base.Enabled = value;
-          foreach (ISymbol symbol in symbols)
-            symbol.Enabled = value;
-        }
-      }
+      set { base.Enabled = value; }
     }