Changeset 3135 for trunk/sources

Timestamp:

03/20/10 02:35:09 (14 years ago)

Author:

swagner

Message:

Fixed resetting of node appearance when the value of an operator parameter is set to null (#927).

File:

• trunk/sources/HeuristicLab.Core.Views/3.3/OperatorTreeView.cs (modified) (3 diffs)

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

@@ -70 +70 @@
       parametersOperatorTable = new Dictionary<IObservableKeyedCollection<string, IParameter>, IOperator>();
       Caption = "Operator";
-      imageList.Images.Add("Default", HeuristicLab.Common.Resources.VS2008ImageLibrary.Method);
     }
     /// <summary>
@@ -120 +119 @@
       opParamNodeTable[opParam].Add(node);
 
-      IOperator op = opParam.Value;
-      if (op == null)
+      FillTreeNode(node, opParam.Value);
+      return node;
+    }
+    private void FillTreeNode(TreeNode node, IOperator op) {
+      if (op == null) {
+        if (!graphTreeView.ImageList.Images.ContainsKey("Default"))
+          graphTreeView.ImageList.Images.Add("Default", HeuristicLab.Common.Resources.VS2008ImageLibrary.Method);
+
         node.Text += "-";
-      else
-        FillTreeNode(node, op);
-
-      return node;
-    }
-    private void FillTreeNode(TreeNode node, IOperator op) {
-      if (!graphTreeView.ImageList.Images.ContainsKey(op.GetType().FullName))
-        graphTreeView.ImageList.Images.Add(op.GetType().FullName, op.ItemImage);
-
-      node.Text += op.Name;
-      node.ToolTipText = op.ItemName + ": " + op.ItemDescription;
-      node.ImageIndex = graphTreeView.ImageList.Images.IndexOfKey(op.GetType().FullName);
-      node.SelectedImageIndex = node.ImageIndex;
-      SetOperatorTag(node, op);
-
-      if (!operatorNodeTable.ContainsKey(op)) {
-        operatorNodeTable.Add(op, new List<TreeNode>());
-        op.NameChanged += new EventHandler(op_NameChanged);
-        op.BreakpointChanged += new EventHandler(op_BreakpointChanged);
-        parametersOperatorTable.Add(op.Parameters, op);
-        op.Parameters.ItemsAdded += new CollectionItemsChangedEventHandler<IParameter>(Parameters_ItemsAdded);
-        op.Parameters.ItemsRemoved += new CollectionItemsChangedEventHandler<IParameter>(Parameters_ItemsRemoved);
-        op.Parameters.ItemsReplaced += new CollectionItemsChangedEventHandler<IParameter>(Parameters_ItemsReplaced);
-        op.Parameters.CollectionReset += new CollectionItemsChangedEventHandler<IParameter>(Parameters_CollectionReset);
-      }
-      operatorNodeTable[op].Add(node);
-
-      if (op.Breakpoint)
-        node.ForeColor = Color.Red;
-
-      foreach (IParameter param in op.Parameters) {
-        if (param is IValueParameter<IOperator>)
-          node.Nodes.Add(new TreeNode());
-      }
-      node.Collapse();
+        node.ToolTipText = "";
+        node.ImageIndex = graphTreeView.ImageList.Images.IndexOfKey("Default"); ;
+        node.SelectedImageIndex = node.ImageIndex;
+        node.ForeColor = graphTreeView.ForeColor;
+      } else {
+        if (!graphTreeView.ImageList.Images.ContainsKey(op.GetType().FullName))
+          graphTreeView.ImageList.Images.Add(op.GetType().FullName, op.ItemImage);
+
+        node.Text += op.Name;
+        node.ToolTipText = op.ItemName + ": " + op.ItemDescription;
+        node.ImageIndex = graphTreeView.ImageList.Images.IndexOfKey(op.GetType().FullName);
+        node.SelectedImageIndex = node.ImageIndex;
+        SetOperatorTag(node, op);
+
+        if (!operatorNodeTable.ContainsKey(op)) {
+          operatorNodeTable.Add(op, new List<TreeNode>());
+          op.NameChanged += new EventHandler(op_NameChanged);
+          op.BreakpointChanged += new EventHandler(op_BreakpointChanged);
+          parametersOperatorTable.Add(op.Parameters, op);
+          op.Parameters.ItemsAdded += new CollectionItemsChangedEventHandler<IParameter>(Parameters_ItemsAdded);
+          op.Parameters.ItemsRemoved += new CollectionItemsChangedEventHandler<IParameter>(Parameters_ItemsRemoved);
+          op.Parameters.ItemsReplaced += new CollectionItemsChangedEventHandler<IParameter>(Parameters_ItemsReplaced);
+          op.Parameters.CollectionReset += new CollectionItemsChangedEventHandler<IParameter>(Parameters_CollectionReset);
+        }
+        operatorNodeTable[op].Add(node);
+
+        if (op.Breakpoint) node.ForeColor = Color.Red;
+        else node.ForeColor = graphTreeView.ForeColor;
+
+        foreach (IParameter param in op.Parameters) {
+          if (param is IValueParameter<IOperator>)
+            node.Nodes.Add(new TreeNode());
+        }
+        node.Collapse();
+      }
     }
     private void ClearTreeNode(TreeNode node) {
@@ -223 +228 @@
         foreach (TreeNode node in opParamNodeTable[opParam]) {
           node.Text = opParam.Name + ": ";
-          if (opParam.Value == null)
-            node.Text += "-";
-          else
-            FillTreeNode(node, opParam.Value);
+          FillTreeNode(node, opParam.Value);
         }
       }