Changeset 6760 for branches/PersistenceSpeedUp/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Symbols

Timestamp:

09/14/11 13:59:25 (13 years ago)

Author:

epitzer

Message:

#1530 integrate changes from trunk

Location:

branches/PersistenceSpeedUp

Files:

• . (modified) (2 props)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Symbols/VariableView.cs (modified) (7 diffs)

branches/PersistenceSpeedUp

@@ -12 +12 @@
 *.psess
 *.vsp
+*.docstates

@@ -12 +12 @@
 *.psess
 *.vsp
+*.docstates

branches/PersistenceSpeedUp/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Symbols/VariableView.cs

@@ -23 +23 @@
 using System.Linq;
 using System.Windows.Forms;
+using HeuristicLab.Collections;
+using HeuristicLab.Core;
+using HeuristicLab.Core.Views;
+using HeuristicLab.Data;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views;
 using HeuristicLab.MainForm;
 using HeuristicLab.MainForm.WindowsForms;
-using HeuristicLab.Core;
-using HeuristicLab.Data;
-using HeuristicLab.Core.Views;
-using HeuristicLab.Collections;
 
 
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Views {
-
   [View("Variable View")]
   [Content(typeof(Variable), true)]
@@ -59 +58 @@
       variableNamesView.Content.CheckedItemsChanged += new CollectionItemsChangedEventHandler<StringValue>(variableNames_Changed);
       variableNamesView.Content.CollectionReset += new CollectionItemsChangedEventHandler<StringValue>(variableNames_Changed);
-    }
+      foreach (var variable in variableNamesView.Content) {
+        variable.ValueChanged += new EventHandler(variable_ValueChanged);
+      }
+    }
+
 
     private void DeregisterVariableNamesViewContentEvents() {
@@ -66 +69 @@
       variableNamesView.Content.CheckedItemsChanged -= new CollectionItemsChangedEventHandler<StringValue>(variableNames_Changed);
       variableNamesView.Content.CollectionReset -= new CollectionItemsChangedEventHandler<StringValue>(variableNames_Changed);
+      foreach (var variable in variableNamesView.Content) {
+        variable.ValueChanged -= new EventHandler(variable_ValueChanged);
+      }
     }
 
@@ -81 +87 @@
     protected override void OnContentChanged() {
       base.OnContentChanged();
+      variableNamesView.Content.Clear();
       UpdateControl();
     }
@@ -104 +111 @@
     #region control event handlers
     private void variableNames_Changed(object sender, CollectionItemsChangedEventArgs<StringValue> args) {
+      if (args.Items != null)
+        foreach (var newVar in args.Items)
+          newVar.ValueChanged += new EventHandler(variable_ValueChanged);
+      if (args.OldItems != null)
+        foreach (var oldVar in args.OldItems)
+          oldVar.ValueChanged -= new EventHandler(variable_ValueChanged);
+      UpdateContent();
+    }
+
+    private void variable_ValueChanged(object sender, EventArgs e) {
+      UpdateContent();
+    }
+
+    private void UpdateContent() {
       if (Content != null) {
+        Content.Changed -= new EventHandler(Content_Changed);
         Content.VariableNames = variableNamesView.Content.CheckedItems.Select(x => x.Value).ToList();
-      }
-    }
+        Content.Changed += new EventHandler(Content_Changed);
+      }
+    }
+
 
     private void weightMuTextBox_TextChanged(object sender, EventArgs e) {
@@ -137 +161 @@
       }
     }
-
     private void multiplicativeWeightChangeSigmaTextBox_TextChanged(object sender, EventArgs e) {
       double sigma;
@@ -161 +184 @@
         RegisterVariableNamesViewContentEvents();
       } else {
-        var existingEntries = variableNamesView.Content.Select(x => x.Value);
-        
+        var existingEntries = variableNamesView.Content.ToList();
+
         // temporarily deregister to prevent circular calling of events
         DeregisterVariableNamesViewContentEvents();
         // add additional entries
-        foreach (var variableName in Content.VariableNames.Except(existingEntries)) {
+        foreach (var variableName in Content.VariableNames.Except(existingEntries.Select(x => x.Value)))
           variableNamesView.Content.Add(new StringValue(variableName), true);
-        }
+        foreach (var oldEntry in existingEntries.Where(x => !Content.VariableNames.Contains(x.Value)))
+          variableNamesView.Content.Remove(oldEntry);
         RegisterVariableNamesViewContentEvents();
 

@@ -12 +12 @@
 *.psess
 *.vsp
+*.docstates