Changeset 3528

Timestamp:

04/26/10 04:14:27 (14 years ago)

Author:

swagner

Message:

Implemented reviewers' comments (#893)

Location:

trunk/sources

Files:

• HeuristicLab.Core.Views/3.3/ScopeView.Designer.cs (modified) (3 diffs)
• HeuristicLab.Core.Views/3.3/ScopeView.cs (modified) (18 diffs)
• HeuristicLab.Core.Views/3.3/TypeSelector.cs (modified) (2 diffs)
• HeuristicLab.Core/3.3/Scope.cs (modified) (2 diffs)
• HeuristicLab.Optimization/3.3/UserDefinedAlgorithm.cs (modified) (1 diff)
• HeuristicLab.Problems.ArtificialAnt/3.3/ArtificialAntProblem.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic/SymbolicRegressionProblem.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis/3.3/DataAnalysisProblem.cs (modified) (1 diff)
• HeuristicLab.Problems.Knapsack/3.3/KnapsackProblem.cs (modified) (1 diff)
• HeuristicLab.Problems.OneMax/3.3/OnemaxProblem.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Core.Views/3.3/ScopeView.Designer.cs

@@ -34 +34 @@
       if (disposing) {
         if (scopesTreeView.Nodes.Count > 0) {
-          RemoveTreeNode(scopesTreeView.Nodes[0]);
+          ClearTreeNode(scopesTreeView.Nodes[0]);
         }
         if (components != null) components.Dispose();
@@ -71 +71 @@
       this.scopesTreeView.AfterCollapse += new System.Windows.Forms.TreeViewEventHandler(this.scopesTreeView_AfterCollapse);
       this.scopesTreeView.BeforeExpand += new System.Windows.Forms.TreeViewCancelEventHandler(this.scopesTreeView_BeforeExpand);
+      this.scopesTreeView.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.scopesTreeView_AfterSelect);
       this.scopesTreeView.MouseDown += new System.Windows.Forms.MouseEventHandler(this.scopesTreeView_MouseDown);
       this.scopesTreeView.ItemDrag += new System.Windows.Forms.ItemDragEventHandler(this.scopesTreeView_ItemDrag);
@@ -111 +112 @@
                   | System.Windows.Forms.AnchorStyles.Right)));
       this.variableCollectionView.Caption = "VariableCollection";
+      this.variableCollectionView.Content = null;
       this.variableCollectionView.Location = new System.Drawing.Point(3, 3);
       this.variableCollectionView.Name = "variableCollectionView";
+      this.variableCollectionView.ReadOnly = false;
       this.variableCollectionView.Size = new System.Drawing.Size(394, 190);
       this.variableCollectionView.TabIndex = 0;

trunk/sources/HeuristicLab.Core.Views/3.3/ScopeView.cs

@@ -74 +74 @@
     protected override void OnContentChanged() {
       base.OnContentChanged();
-      if (scopesTreeView.Nodes.Count > 0) {
-        RemoveTreeNode(scopesTreeView.Nodes[0]);
-        scopesTreeView.Nodes.Clear();
-      }
+      if (scopesTreeView.Nodes.Count > 0)
+        ClearTreeNode(scopesTreeView.Nodes[0]);
+      scopesTreeView.Nodes.Clear();
       variableCollectionView.Content = null;
       Caption = "Scope";
       if (Content != null) {
-        Caption = Content.Name + " (" + Content.GetType().Name + ")";
+        Caption = Content.Name + " (" + Content.ItemName + ")";
         scopesTreeView.Nodes.Add(CreateTreeNode(Content));
       }
@@ -97 +96 @@
     }
 
+    #region TreeNode Management
     private TreeNode CreateTreeNode(IScope scope) {
       TreeNode node = new TreeNode();
@@ -104 +104 @@
       scopeNodeTable.Add(scope, node);
       scope.NameChanged += new EventHandler(Scope_NameChanged);
+      subScopesScopeTable.Add(scope.SubScopes, scope);
       scope.SubScopes.ItemsAdded += new CollectionItemsChangedEventHandler<IndexedItem<IScope>>(SubScopes_ItemsAdded);
       scope.SubScopes.ItemsRemoved += new CollectionItemsChangedEventHandler<IndexedItem<IScope>>(SubScopes_ItemsRemoved);
@@ -109 +110 @@
       scope.SubScopes.ItemsMoved += new CollectionItemsChangedEventHandler<IndexedItem<IScope>>(SubScopes_ItemsMoved);
       scope.SubScopes.CollectionReset += new CollectionItemsChangedEventHandler<IndexedItem<IScope>>(SubScopes_CollectionReset);
-      subScopesScopeTable.Add(scope.SubScopes, scope);
       if (scope.SubScopes.Count > 0)
         node.Nodes.Add(new TreeNode());
@@ -115 +115 @@
     }
 
-    private void RemoveTreeNode(TreeNode node) {
+    private void ClearTreeNode(TreeNode node) {
+      if (scopesTreeView.SelectedNode == node) {
+        scopesTreeView.SelectedNode = null;
+        UpdateVariables();
+      }
+
       foreach (TreeNode child in node.Nodes)
-        RemoveTreeNode(child);
+        ClearTreeNode(child);
 
       IScope scope = node.Tag as IScope;
       if (scope != null) {
+        scope.NameChanged -= new EventHandler(Scope_NameChanged);
         scopeNodeTable.Remove(scope);
-        scope.NameChanged -= new EventHandler(Scope_NameChanged);
         scope.SubScopes.ItemsAdded -= new CollectionItemsChangedEventHandler<IndexedItem<IScope>>(SubScopes_ItemsAdded);
         scope.SubScopes.ItemsRemoved -= new CollectionItemsChangedEventHandler<IndexedItem<IScope>>(SubScopes_ItemsRemoved);
@@ -131 +136 @@
       }
     }
+    #endregion
 
     #region TreeView Events
+    private void scopesTreeView_AfterSelect(object sender, TreeViewEventArgs e) {
+      UpdateVariables();
+    }
     private void scopesTreeView_MouseDown(object sender, MouseEventArgs e) {
       TreeNode node = scopesTreeView.GetNodeAt(e.X, e.Y);
-      if ((node != null) && (node.Tag is IScope)) {
-        variableCollectionView.Content = ((IScope)node.Tag).Variables;
-        variableCollectionView.Enabled = true;
-      } else {
-        variableCollectionView.Content = null;
-        variableCollectionView.Enabled = false;
-        if (node == null) scopesTreeView.SelectedNode = null;
-      }
+      scopesTreeView.SelectedNode = node;
+      UpdateVariables();
     }
     private void scopesTreeView_BeforeExpand(object sender, TreeViewCancelEventArgs e) {
@@ -158 +161 @@
       if (node.Nodes.Count > 0) {
         for (int i = 0; i < node.Nodes.Count; i++)
-          RemoveTreeNode(node.Nodes[i]);
+          ClearTreeNode(node.Nodes[i]);
         node.Nodes.Clear();
         node.Nodes.Add(new TreeNode());
@@ -177 +180 @@
     #endregion
 
-    #region Scope Events
+    #region Content Events
     private void Scope_NameChanged(object sender, EventArgs e) {
       if (InvokeRequired)
@@ -186 +189 @@
       }
     }
-    #endregion
-
-    #region SubScopes Events
     private void SubScopes_ItemsAdded(object sender, CollectionItemsChangedEventArgs<IndexedItem<IScope>> e) {
       if (InvokeRequired)
@@ -195 +195 @@
         IScope parentScope = subScopesScopeTable[(ScopeList)sender];
         TreeNode parentNode = scopeNodeTable[parentScope];
+        scopesTreeView.BeginUpdate();
         if (parentNode.IsExpanded) {
           foreach (IndexedItem<IScope> item in e.Items) {
@@ -203 +204 @@
           parentNode.Nodes.Add(new TreeNode());
         }
+        scopesTreeView.EndUpdate();
       }
     }
@@ -211 +213 @@
         IScope parentScope = subScopesScopeTable[(ScopeList)sender];
         TreeNode parentNode = scopeNodeTable[parentScope];
+        scopesTreeView.BeginUpdate();
         if (parentNode.IsExpanded) {
           foreach (IndexedItem<IScope> item in e.Items) {
             TreeNode node = scopeNodeTable[item.Value];
-            RemoveTreeNode(node);
+            ClearTreeNode(node);
             node.Remove();
           }
@@ -220 +223 @@
           parentNode.Nodes.Clear();
         }
+        scopesTreeView.EndUpdate();
       }
     }
@@ -228 +232 @@
         IScope parentScope = subScopesScopeTable[(ScopeList)sender];
         TreeNode parentNode = scopeNodeTable[parentScope];
+        scopesTreeView.BeginUpdate();
         if (parentNode.IsExpanded) {
           foreach (IndexedItem<IScope> item in e.Items) {
             TreeNode node = parentNode.Nodes[item.Index];
-            RemoveTreeNode(node);
+            ClearTreeNode(node);
             node.Remove();
             node = CreateTreeNode(item.Value);
             parentNode.Nodes.Insert(item.Index, node);
           }
+          scopesTreeView.EndUpdate();
         }
       }
@@ -245 +251 @@
         IScope parentScope = subScopesScopeTable[(ScopeList)sender];
         TreeNode parentNode = scopeNodeTable[parentScope];
+        scopesTreeView.BeginUpdate();
         if (parentNode.IsExpanded) {
           parentNode.Nodes.Clear();
@@ -250 +257 @@
             parentNode.Nodes.Insert(item.Index, scopeNodeTable[item.Value]);
         }
+        scopesTreeView.EndUpdate();
       }
     }
@@ -258 +266 @@
         IScope parentScope = subScopesScopeTable[(ScopeList)sender];
         TreeNode parentNode = scopeNodeTable[parentScope];
+        scopesTreeView.BeginUpdate();
         if (parentNode.IsExpanded) {
           foreach (TreeNode node in parentNode.Nodes)
-            RemoveTreeNode(node);
+            ClearTreeNode(node);
           parentNode.Nodes.Clear();
           foreach (IndexedItem<IScope> item in e.Items) {
@@ -271 +280 @@
             parentNode.Nodes.Add(new TreeNode());
         }
+        scopesTreeView.EndUpdate();
+      }
+    }
+    #endregion
+
+    #region Helpers
+    private void UpdateVariables() {
+      if (scopesTreeView.SelectedNode == null) {
+        variableCollectionView.Content = null;
+        variableCollectionView.Enabled = false;
+      } else {
+        variableCollectionView.Enabled = true;
+        variableCollectionView.Content = ((IScope)scopesTreeView.SelectedNode.Tag).Variables;
       }
     }

trunk/sources/HeuristicLab.Core.Views/3.3/TypeSelector.cs

@@ -91 +91 @@
         imageList.Images.Add(HeuristicLab.Common.Resources.VS2008ImageLibrary.Namespace);  // plugins
         imageList.Images.Add(HeuristicLab.Common.Resources.VS2008ImageLibrary.Interface);  // interfaces
-        imageList.Images.Add(HeuristicLab.Common.Resources.VS2008ImageLibrary.OrgChart);   // abstract types
         imageList.Images.Add(HeuristicLab.Common.Resources.VS2008ImageLibrary.Template);   // generic types
 
@@ -119 +118 @@
               typeNode.ImageIndex = 0;
               if (type.IsInterface) typeNode.ImageIndex = 2;
-              else if (type.IsAbstract) typeNode.ImageIndex = 3;
-              else if (type.ContainsGenericParameters) typeNode.ImageIndex = 4;
+              else if (type.ContainsGenericParameters) typeNode.ImageIndex = 3;
               else if (imageList.Images.ContainsKey(type.FullName)) typeNode.ImageIndex = imageList.Images.IndexOfKey(type.FullName);
               else if (typeof(IItem).IsAssignableFrom(type)) {

trunk/sources/HeuristicLab.Core/3.3/Scope.cs

@@ -20 +20 @@
 #endregion
 
+using System.Drawing;
 using HeuristicLab.Collections;
 using HeuristicLab.Common;
@@ -31 +32 @@
   [StorableClass]
   public sealed class Scope : NamedItem, IScope {
+    public override Image ItemImage {
+      get { return HeuristicLab.Common.Resources.VS2008ImageLibrary.OrgChart; }
+    }
+
     [Storable]
     private IScope parent;

trunk/sources/HeuristicLab.Optimization/3.3/UserDefinedAlgorithm.cs

@@ -30 +30 @@
   /// An algorithm which can be defined by the user.
   /// </summary>
-  [Item("UserDefinedAlgorithm", "An algorithm which can be defined by the user.")]
+  [Item("User-Defined Algorithm", "An algorithm which can be defined by the user.")]
   [Creatable("Algorithms")]
   [StorableClass]

trunk/sources/HeuristicLab.Problems.ArtificialAnt/3.3/ArtificialAntProblem.cs

@@ -38 +38 @@
 
 namespace HeuristicLab.Problems.ArtificialAnt {
-  [Item("ArtificialAntProblem", "Represents the Artificial Ant problem.")]
+  [Item("Artificial Ant Problem", "Represents the Artificial Ant problem.")]
   [Creatable("Problems")]
   [StorableClass]

trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic/SymbolicRegressionProblem.cs

@@ -40 +40 @@
 
 namespace HeuristicLab.Problems.DataAnalysis.Regression.Symbolic {
-  [Item("SymbolicRegressionProblem", "Represents a symbolic regression problem.")]
+  [Item("Symbolic Regression Problem", "Represents a symbolic regression problem.")]
   [Creatable("Problems")]
   [StorableClass]

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/DataAnalysisProblem.cs

@@ -33 +33 @@
 
 namespace HeuristicLab.Problems.DataAnalysis {
-  [Item("DataAnalysisProblem", "Represents a data analysis problem.")]
+  [Item("Data Analysis Problem", "Represents a data analysis problem.")]
   [Creatable("Problems")]
   [StorableClass]

trunk/sources/HeuristicLab.Problems.Knapsack/3.3/KnapsackProblem.cs

@@ -35 +35 @@
 
 namespace HeuristicLab.Problems.Knapsack {
-  [Item("KnapsackProblem", "Represents a Knapsack Problem.")]
+  [Item("Knapsack Problem", "Represents a Knapsack Problem.")]
   [Creatable("Problems")]
   [StorableClass]

trunk/sources/HeuristicLab.Problems.OneMax/3.3/OnemaxProblem.cs

@@ -34 +34 @@
 
 namespace HeuristicLab.Problems.OneMax {
-  [Item("OneMaxProblem", "Represents a OneMax Problem.")]
+  [Item("OneMax Problem", "Represents a OneMax Problem.")]
   [Creatable("Problems")]
   [StorableClass]