Changeset 9363 for branches/OaaS/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Symbols

Timestamp:

04/16/13 13:13:41 (12 years ago)

Author:

spimming

Message:

#1888:

• Merged revisions from trunk

Location:

branches/OaaS

Files:

• . (modified) (2 props)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4 (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Symbols/VariableConditionView.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Symbols/VariableView.cs (modified) (3 diffs)

branches/OaaS

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll
 packages

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll
 packages

branches/OaaS/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4

@@ +1 @@
+*.user
+Plugin.cs
 bin
 obj
-*.user
-HeuristicLabProblemsDataAnalysisSymbolicViewsPlugin.cs
-*.vs10x
-Plugin.cs

@@ +1 @@
+*.user
+Plugin.cs
 bin
 obj
-*.user
-HeuristicLabProblemsDataAnalysisSymbolicViewsPlugin.cs
-*.vs10x
-Plugin.cs

branches/OaaS/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Symbols/VariableConditionView.cs

@@ -124 +124 @@
         RegisterVariableNamesViewContentEvents();
       } else {
-        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.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);
+        variableNamesView.Content.Clear();
+        foreach (var variableName in Content.AllVariableNames) {
+          variableNamesView.Content.Add(new StringValue(variableName), Content.VariableNames.Contains(variableName));
+        }
         RegisterVariableNamesViewContentEvents();
 

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

@@ -92 +92 @@
     protected override void SetEnabledStateOfControls() {
       base.SetEnabledStateOfControls();
+      enabledCheckBox.Enabled = Content != null && Content.VariableNames.Any() && !Locked && !ReadOnly;
       weightInitializationMuTextBox.Enabled = Content != null;
       weightInitializationMuTextBox.ReadOnly = ReadOnly;
@@ -123 +124 @@
     private void UpdateContent() {
       if (Content != null) {
+        Content.Fixed = true;
         DeregisterContentEvents();
         Content.VariableNames = variableNamesView.Content.CheckedItems.Select(x => x.Value).ToList();
@@ -180 +182 @@
         RegisterVariableNamesViewContentEvents();
       } else {
-        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.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);
+        variableNamesView.Content.Clear();
+        foreach (var variableName in Content.AllVariableNames) {
+          variableNamesView.Content.Add(new StringValue(variableName), Content.VariableNames.Contains(variableName));
+        }
         RegisterVariableNamesViewContentEvents();
 

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll
 packages

@@ +1 @@
+*.user
+Plugin.cs
 bin
 obj
-*.user
-HeuristicLabProblemsDataAnalysisSymbolicViewsPlugin.cs
-*.vs10x
-Plugin.cs