Changeset 4930

Timestamp:

11/25/10 10:38:08 (14 years ago)

Author:

epitzer

Message:

Better display and highlighting of scopes (#47)

File:

• branches/HeuristicLab.DebugEngine/OperationContentView.cs (modified) (7 diffs)

branches/HeuristicLab.DebugEngine/OperationContentView.cs

@@ -90 +90 @@
         while (scope != null && scope.Parent != null)
           scope = scope.Parent;
-        if (scope != null)
+        if (scope != null) {
           AddScope(scopeTreeView.Nodes, scope);
-        if (scopeTreeView.Nodes.Count > 0)
-          scopeTreeView.TopNode = scopeTreeView.Nodes[0];
-      }
-      scopeTreeView.ExpandAll();
-      if (scopeTreeView.Nodes.Count > 0)
-        scopeTreeView.TopNode = scopeTreeView.Nodes[0];
+
+        }
+      }
       scopeTreeView.EndUpdate();
     }
@@ -107 +104 @@
       node.ImageIndex = 0;
       node.SelectedImageIndex = 0;
-      if (Content.IsAtomic && Content.AtomicOperation.Scope == scope) {
-        node.ForeColor = Color.Red;
-        node.BackColor = Color.LightGray;
-      }
       foreach (var var in scope.Variables) {
         TreeNode varNode = node.Nodes.Add(string.Format("{0}={1}", var.Name, var.Value));
@@ -120 +113 @@
         varNode.SelectedImageIndex = 1;
       }
-      foreach (var subScope in scope.SubScopes) {
+      foreach (var subScope in scope.SubScopes)
         AddScope(node.Nodes, subScope);
-      }
-    }
+      if (Content.IsAtomic && Content.AtomicOperation.Scope == scope) {
+        node.NodeFont = new Font(DefaultFont, FontStyle.Bold);
+        node.ForeColor = Color.White;
+        node.BackColor = Color.Crimson;
+        node.Expand();
+        scopeTreeView.TopNode = node;
+      }
+    }
+
 
     private void UpdateExecutionContext() {
@@ -202 +202 @@
               timer_Tick(this, EventArgs.Empty);
             }
-            timer.Tag = new KeyValuePair<TreeNode, Color>(scopeNode, scopeNode.BackColor);
+            timer.Tag = new KeyValuePair<TreeNode, TreeNode>(scopeNode, new TreeNode() {
+              BackColor = scopeNode.BackColor,
+              ForeColor = scopeNode.ForeColor,
+              NodeFont = scopeNode.NodeFont,
+            });
             scopeNode.BackColor = Color.Blue;
+            scopeNode.ForeColor = Color.White;
+            scopeNode.NodeFont = new Font(DefaultFont, FontStyle.Bold); 
             scopeTreeView.TopNode = scopeNode;
             timer.Start();
@@ -211 +217 @@
     }
 
-    private void ResetNode(TreeNode node, Color color) {
+    private void ResetNode(TreeNode node, TreeNode template) {
       if (InvokeRequired)
-        Invoke(new Action<TreeNode, Color>(ResetNode), node, color);
-      else
-        node.BackColor = color;
+        Invoke(new Action<TreeNode, TreeNode>(ResetNode), node, template);
+      else {
+        node.ForeColor = template.ForeColor;
+        node.BackColor = template.BackColor;
+        node.NodeFont = template.NodeFont;
+      }
     }
 
@@ -232 +241 @@
 
     private void timer_Tick(object sender, EventArgs e) {
-      KeyValuePair<TreeNode, Color> kvp = (KeyValuePair<TreeNode, Color>)timer.Tag;
+      KeyValuePair<TreeNode, TreeNode> kvp = (KeyValuePair<TreeNode, TreeNode>)timer.Tag;
       ResetNode(kvp.Key, kvp.Value);
       timer.Stop();
@@ -243 +252 @@
 
     #endregion
-
-
-
   }
 }