Changeset 4753

Timestamp:

11/09/10 11:09:37 (13 years ago)

Author:

epitzer

Message:

Show expected parameter values and include type information in tool tip (#47)

Location:

branches/HeuristicLab.DebugEngine

Files:

• DebugEngine.cs (modified) (5 diffs)
• DebugEngineView.Designer.cs (modified) (2 diffs)
• DebugEngineView.cs (modified) (6 diffs)
• DebugEngineView.resx (modified) (2 diffs)

branches/HeuristicLab.DebugEngine/DebugEngine.cs

@@ -62 +62 @@
       OperationCollection coll = next as OperationCollection;
       while (coll != null) {
+        Log.LogMessage("Expanding OperationCollection");
         for (int i = coll.Count - 1; i >= 0; i--) {
           ExecutionStack.Push(coll[i]);
@@ -70 +71 @@
       IAtomicOperation operation = next as IAtomicOperation;
       if (operation != null) {
+        Log.LogMessage("Preparing IAtomicOperation");
         try {
           currentOperator = operation.Operator;
@@ -77 +79 @@
             Pause();
           }
+          Log.LogMessage("Executing IAtomicOperation");
           ExecutionStack.Push(operation.Operator.Execute((IExecutionContext)operation));
         } catch (Exception ex) {
@@ -83 +86 @@
         }
       } else {
+        Log.LogMessage("Nothing to do");
         CurrentOperation = null;
       }
@@ -99 +103 @@
       OnStarted();
       var lastUpdateTime = DateTime.Now;
-      if (ExecutionStack.Count > 0)
+      if (ExecutionStack.Count > 0) {
+        while (ExecutionStack.Count > 0 && ExecutionStack.Peek() == null)
+          ExecutionStack.Pop();
         ProcessNextOperation();
+      }
       ExecutionTime += DateTime.Now - lastUpdateTime;
       OnPaused();

branches/HeuristicLab.DebugEngine/DebugEngineView.Designer.cs

@@ -141 +141 @@
       this.executionStackTreeView.Location = new System.Drawing.Point(3, 16);
       this.executionStackTreeView.Name = "executionStackTreeView";
+      this.executionStackTreeView.ShowNodeToolTips = true;
       this.executionStackTreeView.Size = new System.Drawing.Size(252, 143);
       this.executionStackTreeView.TabIndex = 2;
@@ -170 +171 @@
       this.scopeTreeView.Location = new System.Drawing.Point(3, 16);
       this.scopeTreeView.Name = "scopeTreeView";
+      this.scopeTreeView.ShowNodeToolTips = true;
       this.scopeTreeView.Size = new System.Drawing.Size(247, 143);
       this.scopeTreeView.TabIndex = 0;

branches/HeuristicLab.DebugEngine/DebugEngineView.cs

@@ -27 +27 @@
 using HeuristicLab.Core.Views;
 using HeuristicLab.MainForm;
+using HeuristicLab.Persistence.Auxiliary;
 namespace HeuristicLab.DebugEngine {
   /// <summary>
@@ -116 +117 @@
         Invoke(new Action(UpdateView));
       } else {
+        executionStackTreeView.BeginUpdate();
         executionStackTreeView.Nodes.Clear();
         AddOperations(executionStackTreeView.Nodes, Content.ExecutionStack.ToArray());
         executionStackTreeView.ExpandAll();
-
+        if (executionStackTreeView.Nodes.Count > 0)
+          executionStackTreeView.TopNode = executionStackTreeView.Nodes[0];
+        executionStackTreeView.EndUpdate();
+
+
+        scopeTreeView.BeginUpdate();
         scopeTreeView.Nodes.Clear();
         if (Content.CurrentOperation != null) {
@@ -125 +132 @@
         }
         scopeTreeView.ExpandAll();
-      }
+        if (scopeTreeView.Nodes.Count > 0)
+          scopeTreeView.TopNode = scopeTreeView.Nodes[0];
+        scopeTreeView.EndUpdate();
+      }
+    }
+
+    private string TypeName(object obj) {
+      if (obj == null)
+        return "null";
+      return TypeNameParser.Parse(obj.GetType().ToString()).GetTypeNameInCode(true);
     }
 
@@ -134 +150 @@
           TreeNode node = nodes.Add(atom.Operator.Name);
           node.Tag = atom;
+          node.ToolTipText = TypeName(atom);
           if (atom.Operator.Breakpoint)
             node.ForeColor = Color.Red;
           foreach (var param in atom.Operator.Parameters) {
-            IItem value = null;
-            try {
-              value = param.ActualValue;
-            } catch (Exception) { }
-            TreeNode paramNode = node.Nodes.Add(string.Format("Param {0}={1}", param.Name, value));
+            string typeName = "null";
+            TreeNode paramNode = node.Nodes.Add(string.Format("Param {0} = {1}", param.Name, GetApproximateValue(param, ref typeName)));
             paramNode.Tag = param;
+            paramNode.ToolTipText = string.Format("{0} = {1}", TypeName(param), typeName);
           }
         } else if (op is OperationCollection) {
@@ -148 +163 @@
           TreeNode node = executionStackTreeView.Nodes.Add(string.Format("{0} Operations", ops.Count));
           node.Tag = op;
+          node.ToolTipText = TypeName(ops);
           AddOperations(node.Nodes, ops);
         }
       }
+    }
+
+    private string GetApproximateValue(IParameter param, ref string typeName) {
+      string value = "<none>";
+      try {
+        IExecutionContext context = Content.CurrentOperation as IExecutionContext;
+        IExecutionContext oldContext = param.ExecutionContext;
+        if (context != null) {
+          param.ExecutionContext = context;
+        }
+        value = param.ActualValue.ToString();
+        typeName = TypeName(param.ActualValue);
+        if (context != oldContext) {
+          param.ExecutionContext = oldContext;
+          value = string.Format("~ {0}", value);
+        }
+      } catch (Exception) { }
+      return value;
     }
 
@@ -158 +192 @@
         TreeNode varNode = node.Nodes.Add(string.Format("{0}={1}", var.Name, var.Value.ToString()));
         varNode.Tag = var.Value;
+        varNode.ToolTipText = TypeName(var.Value);
       }
       foreach (var subScope in scope.SubScopes) {

branches/HeuristicLab.DebugEngine/DebugEngineView.resx

@@ -122 +122 @@
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALDAAA
-        CwwBP0AiyAAAAXxJREFUOE9j+P//PwM6Tuh5woZNHJsYhmaQIqABpkDMQowhWA0onPX8f/zkt/bohoDE
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALCwAA
+        CwsBbQSEtwAAAXxJREFUOE9j+P//PwM6Tuh5woZNHJsYhmaQIqABpkDMQowhWA0onPX8f/zkt/bohoDE
         G+Y9/xXb8fANzHCsBuTOfPY/ofve/7gJr72QvQMSX3Xk/f/w9gdA/RCvYzUgY8rT//P2//4f1HDzL9CA
         bJghIPGF+z78D264ht8AoIb/s/f9+t+59e9/t9LL/4H8PJAhIPFpW97/96++gN+AyK5H/6ds+/W/ZOnf
@@ -135 +135 @@
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALDwAA
-        Cw8BkvkDpQAAAkNJREFUOE+d0l1IU2EYB/AZXSR0GV10bRclXWRdRB8kk5TIMV3iFgWC1FhgZbNlBNY2
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALDgAA
+        Cw4BQL7hQQAAAkNJREFUOE+d0l1IU2EYB/AZXSR0GV10bRclXWRdRB8kk5TIMV3iFgWC1FhgZbNlBNY2
         KqEwzbkMwpVzKyoWeswuXNOWy8yZ8zPXyMlcbbbvj+NZ24x/74JC7BjSgQfOxfv+zv95zpMFgKN60LW+
         KH9X0ez8At/1xb8tGqc3B4KRjRuysz/lbM1rquBtpzirPRmg941Nrm6nxrpMQwmj9SOMU07cowZwsUkP