Changeset 6235 for trunk/sources

Timestamp:

05/19/11 15:46:40 (14 years ago)

Author:

mkommend

Message:

#1531: Corrected display of variable names in VariableNamesView.

File:

• trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Symbols/VariableView.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Symbols/VariableView.cs

@@ -33 +33 @@
 
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Views {
-
   [View("Variable View")]
   [Content(typeof(Variable), true)]
@@ -138 +137 @@
       }
     }
-
     private void multiplicativeWeightChangeSigmaTextBox_TextChanged(object sender, EventArgs e) {
       double sigma;
@@ -162 +160 @@
         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();