Changeset 4759

Timestamp:

11/09/10 15:58:12 (13 years ago)

Author:

epitzer

Message:

navigate execution contexts show active scopes (#47)

Location:

branches/HeuristicLab.DebugEngine

Files:

• DebugEngineView.Designer.cs (modified) (11 diffs)
• DebugEngineView.cs (modified) (8 diffs)
• DebugEngineView.resx (added)
• HeuristicLab.DebugEngine.csproj (modified) (1 diff)

branches/HeuristicLab.DebugEngine/DebugEngineView.Designer.cs

@@ -45 +45 @@
     /// </summary>
     private void InitializeComponent() {
+      this.components = new System.ComponentModel.Container();
       System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DebugEngineView));
       this.label1 = new System.Windows.Forms.Label();
@@ -50 +51 @@
       this.logView = new HeuristicLab.Core.Views.LogView();
       this.splitContainer1 = new System.Windows.Forms.SplitContainer();
-      this.splitContainer2 = new System.Windows.Forms.SplitContainer();
       this.executionStackTreeView = new System.Windows.Forms.TreeView();
       this.label2 = new System.Windows.Forms.Label();
+      this.splitContainer2 = new System.Windows.Forms.SplitContainer();
       this.label3 = new System.Windows.Forms.Label();
       this.scopeTreeView = new System.Windows.Forms.TreeView();
       this.stepButton = new System.Windows.Forms.Button();
       this.updateButton = new System.Windows.Forms.Button();
+      this.toolTip = new System.Windows.Forms.ToolTip(this.components);
+      this.parentButton = new System.Windows.Forms.Button();
+      this.operationTextBox = new System.Windows.Forms.TextBox();
+      this.label4 = new System.Windows.Forms.Label();
       this.splitContainer1.Panel1.SuspendLayout();
       this.splitContainer1.Panel2.SuspendLayout();
@@ -81 +86 @@
       this.executionTimeTextBox.Name = "executionTimeTextBox";
       this.executionTimeTextBox.ReadOnly = true;
-      this.executionTimeTextBox.Size = new System.Drawing.Size(366, 20);
+      this.executionTimeTextBox.Size = new System.Drawing.Size(496, 20);
       this.executionTimeTextBox.TabIndex = 1;
       // 
@@ -92 +97 @@
       this.logView.Name = "logView";
       this.logView.ReadOnly = false;
-      this.logView.Size = new System.Drawing.Size(515, 175);
+      this.logView.Size = new System.Drawing.Size(339, 255);
       this.logView.TabIndex = 2;
       // 
       // splitContainer1
       // 
-      this.splitContainer1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-                  | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
-      this.splitContainer1.Location = new System.Drawing.Point(3, 32);
+      this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.splitContainer1.Location = new System.Drawing.Point(0, 0);
       this.splitContainer1.Name = "splitContainer1";
       this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal;
@@ -106 +109 @@
       // splitContainer1.Panel1
       // 
-      this.splitContainer1.Panel1.Controls.Add(this.splitContainer2);
+      this.splitContainer1.Panel1.Controls.Add(this.executionStackTreeView);
+      this.splitContainer1.Panel1.Controls.Add(this.label2);
       // 
       // splitContainer1.Panel2
       // 
       this.splitContainer1.Panel2.Controls.Add(this.logView);
-      this.splitContainer1.Size = new System.Drawing.Size(515, 341);
-      this.splitContainer1.SplitterDistance = 162;
+      this.splitContainer1.Size = new System.Drawing.Size(339, 492);
+      this.splitContainer1.SplitterDistance = 233;
       this.splitContainer1.TabIndex = 3;
-      // 
-      // splitContainer2
-      // 
-      this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.splitContainer2.Location = new System.Drawing.Point(0, 0);
-      this.splitContainer2.Name = "splitContainer2";
-      // 
-      // splitContainer2.Panel1
-      // 
-      this.splitContainer2.Panel1.Controls.Add(this.executionStackTreeView);
-      this.splitContainer2.Panel1.Controls.Add(this.label2);
-      // 
-      // splitContainer2.Panel2
-      // 
-      this.splitContainer2.Panel2.Controls.Add(this.label3);
-      this.splitContainer2.Panel2.Controls.Add(this.scopeTreeView);
-      this.splitContainer2.Size = new System.Drawing.Size(515, 162);
-      this.splitContainer2.SplitterDistance = 258;
-      this.splitContainer2.TabIndex = 0;
       // 
       // executionStackTreeView
@@ -142 +127 @@
       this.executionStackTreeView.Name = "executionStackTreeView";
       this.executionStackTreeView.ShowNodeToolTips = true;
-      this.executionStackTreeView.Size = new System.Drawing.Size(252, 143);
+      this.executionStackTreeView.Size = new System.Drawing.Size(333, 214);
       this.executionStackTreeView.TabIndex = 2;
       this.executionStackTreeView.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.executionStackTreeView_NodeMouseDoubleClick);
@@ -155 +140 @@
       this.label2.Text = "Execution Stack";
       // 
+      // splitContainer2
+      // 
+      this.splitContainer2.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+                  | System.Windows.Forms.AnchorStyles.Left)
+                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.splitContainer2.Location = new System.Drawing.Point(3, 32);
+      this.splitContainer2.Name = "splitContainer2";
+      // 
+      // splitContainer2.Panel1
+      // 
+      this.splitContainer2.Panel1.Controls.Add(this.splitContainer1);
+      // 
+      // splitContainer2.Panel2
+      // 
+      this.splitContainer2.Panel2.Controls.Add(this.label4);
+      this.splitContainer2.Panel2.Controls.Add(this.operationTextBox);
+      this.splitContainer2.Panel2.Controls.Add(this.label3);
+      this.splitContainer2.Panel2.Controls.Add(this.scopeTreeView);
+      this.splitContainer2.Size = new System.Drawing.Size(678, 492);
+      this.splitContainer2.SplitterDistance = 339;
+      this.splitContainer2.TabIndex = 0;
+      // 
       // label3
       // 
       this.label3.AutoSize = true;
-      this.label3.Location = new System.Drawing.Point(3, 0);
+      this.label3.Location = new System.Drawing.Point(3, 26);
       this.label3.Name = "label3";
       this.label3.Size = new System.Drawing.Size(63, 13);
@@ -169 +176 @@
                   | System.Windows.Forms.AnchorStyles.Left)
                   | System.Windows.Forms.AnchorStyles.Right)));
-      this.scopeTreeView.Location = new System.Drawing.Point(3, 16);
+      this.scopeTreeView.Location = new System.Drawing.Point(3, 42);
       this.scopeTreeView.Name = "scopeTreeView";
       this.scopeTreeView.ShowNodeToolTips = true;
-      this.scopeTreeView.Size = new System.Drawing.Size(247, 143);
+      this.scopeTreeView.Size = new System.Drawing.Size(329, 447);
       this.scopeTreeView.TabIndex = 0;
       this.scopeTreeView.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.scopeTreeView_NodeMouseDoubleClick);
@@ -180 +187 @@
       this.stepButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
       this.stepButton.Image = ((System.Drawing.Image)(resources.GetObject("stepButton.Image")));
-      this.stepButton.Location = new System.Drawing.Point(494, 3);
+      this.stepButton.Location = new System.Drawing.Point(624, 3);
       this.stepButton.Name = "stepButton";
       this.stepButton.Size = new System.Drawing.Size(24, 24);
       this.stepButton.TabIndex = 4;
+      this.toolTip.SetToolTip(this.stepButton, "Step");
       this.stepButton.UseVisualStyleBackColor = true;
       this.stepButton.Click += new System.EventHandler(this.stepButton_Click);
@@ -191 +199 @@
       this.updateButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
       this.updateButton.Image = ((System.Drawing.Image)(resources.GetObject("updateButton.Image")));
-      this.updateButton.Location = new System.Drawing.Point(464, 3);
+      this.updateButton.Location = new System.Drawing.Point(654, 3);
       this.updateButton.Name = "updateButton";
       this.updateButton.Size = new System.Drawing.Size(24, 24);
       this.updateButton.TabIndex = 5;
+      this.toolTip.SetToolTip(this.updateButton, "Refresh/Reset View");
       this.updateButton.UseVisualStyleBackColor = true;
       this.updateButton.Click += new System.EventHandler(this.updateButton_Click);
       // 
+      // parentButton
+      // 
+      this.parentButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+      this.parentButton.Image = ((System.Drawing.Image)(resources.GetObject("parentButton.Image")));
+      this.parentButton.Location = new System.Drawing.Point(594, 3);
+      this.parentButton.Name = "parentButton";
+      this.parentButton.Size = new System.Drawing.Size(24, 24);
+      this.parentButton.TabIndex = 6;
+      this.toolTip.SetToolTip(this.parentButton, "Go to parent ExecutionContext");
+      this.parentButton.UseVisualStyleBackColor = true;
+      this.parentButton.Click += new System.EventHandler(this.parentButton_Click);
+      // 
+      // operationTextBox
+      // 
+      this.operationTextBox.Location = new System.Drawing.Point(65, 3);
+      this.operationTextBox.Name = "operationTextBox";
+      this.operationTextBox.ReadOnly = true;
+      this.operationTextBox.Size = new System.Drawing.Size(267, 20);
+      this.operationTextBox.TabIndex = 2;
+      // 
+      // label4
+      // 
+      this.label4.AutoSize = true;
+      this.label4.Location = new System.Drawing.Point(3, 6);
+      this.label4.Name = "label4";
+      this.label4.Size = new System.Drawing.Size(56, 13);
+      this.label4.TabIndex = 3;
+      this.label4.Text = "Operation:";
+      // 
       // DebugEngineView
       // 
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+      this.Controls.Add(this.parentButton);
+      this.Controls.Add(this.splitContainer2);
       this.Controls.Add(this.updateButton);
       this.Controls.Add(this.stepButton);
-      this.Controls.Add(this.splitContainer1);
       this.Controls.Add(this.executionTimeTextBox);
       this.Controls.Add(this.label1);
       this.Name = "DebugEngineView";
-      this.Size = new System.Drawing.Size(521, 376);
+      this.Size = new System.Drawing.Size(684, 527);
       this.splitContainer1.Panel1.ResumeLayout(false);
+      this.splitContainer1.Panel1.PerformLayout();
       this.splitContainer1.Panel2.ResumeLayout(false);
       this.splitContainer1.ResumeLayout(false);
       this.splitContainer2.Panel1.ResumeLayout(false);
-      this.splitContainer2.Panel1.PerformLayout();
       this.splitContainer2.Panel2.ResumeLayout(false);
       this.splitContainer2.Panel2.PerformLayout();
@@ -234 +273 @@
     private System.Windows.Forms.Button stepButton;
     private System.Windows.Forms.Button updateButton;
+    private System.Windows.Forms.ToolTip toolTip;
+    private System.Windows.Forms.Button parentButton;
+    private System.Windows.Forms.Label label4;
+    private System.Windows.Forms.TextBox operationTextBox;
 
   }

branches/HeuristicLab.DebugEngine/DebugEngineView.cs

@@ -24 +24 @@
 using System.Drawing;
 using System.Windows.Forms;
+using HeuristicLab.Common.Resources;
 using HeuristicLab.Core;
 using HeuristicLab.Core.Views;
@@ -49 +50 @@
     public DebugEngineView() {
       InitializeComponent();
+      updateButton.Image = VS2008ImageLibrary.Refresh;
+      stepButton.Image = VS2008ImageLibrary.MoveNext;
+      parentButton.Image = VS2008ImageLibrary.ArrowUp;
     }
 
@@ -117 +121 @@
         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) {
-          AddScope(scopeTreeView.Nodes, Content.CurrentOperation.Scope);
-        }
-        scopeTreeView.ExpandAll();
-        if (scopeTreeView.Nodes.Count > 0)
-          scopeTreeView.TopNode = scopeTreeView.Nodes[0];
-        scopeTreeView.EndUpdate();
-      }
+        UpdateExecutionStack();
+        SetOperation(Content.CurrentOperation);
+      }
+    }
+
+    private void SetOperation(IOperation operation) {
+      IAtomicOperation atomicOperation = operation as IAtomicOperation;
+      operationTextBox.Text = "<none>";
+      toolTip.SetToolTip(operationTextBox, null);
+      if (atomicOperation != null && atomicOperation.Operator != null) {
+        operationTextBox.Text = string.Format("Atomic {0}", atomicOperation.Operator.Name);
+        toolTip.SetToolTip(operationTextBox, TypeName(atomicOperation.Operator));
+      }
+      OperationCollection operationCollection = operation as OperationCollection;
+      if (operationCollection != null)
+        operationTextBox.Text = string.Format("Collection {0}", operationCollection.Count);
+      IExecutionContext context = operation as IExecutionContext;
+      IScope scope = null;
+      if (context != null) {
+        scope = context.Scope;
+        while (scope != null && scope.Parent != null)
+          scope = scope.Parent;
+      }
+      UpdateScope(scope);
+      if (context != null)
+        parentButton.Enabled = context.Parent != null;
+      scopeTreeView.Tag = context;
+    }
+
+    private void UpdateExecutionStack() {
+      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();
+    }
+
+    private void UpdateScope(IScope scope) {
+      scopeTreeView.BeginUpdate();
+      scopeTreeView.Nodes.Clear();
+      if (scope != null) {
+        AddScope(scopeTreeView.Nodes, scope);
+      }
+      scopeTreeView.ExpandAll();
+      if (scopeTreeView.Nodes.Count > 0)
+        scopeTreeView.TopNode = scopeTreeView.Nodes[0];
+      scopeTreeView.EndUpdate();
     }
 
@@ -151 +185 @@
           node.Tag = atom;
           node.ToolTipText = TypeName(atom);
+          node.ImageKey = "AtomicOperation";
           if (atom.Operator.Breakpoint)
             node.ForeColor = Color.Red;
@@ -158 +193 @@
             paramNode.Tag = param;
             paramNode.ToolTipText = string.Format("{0} = {1}", TypeName(param), typeName);
+            paramNode.ImageKey = "Parameter";
           }
         } else if (op is OperationCollection) {
@@ -164 +200 @@
           node.Tag = op;
           node.ToolTipText = TypeName(ops);
+          node.ImageKey = "OperationCollection";
           AddOperations(node.Nodes, ops);
         }
@@ -170 +207 @@
 
     private string GetApproximateValue(IParameter param, ref string typeName) {
-      string value = "<none>";
+      string valueString = "<none>";
+      IExecutionContext context = Content.CurrentOperation as IExecutionContext;
+      IExecutionContext originalContext = param.ExecutionContext;
+      object value = null;
       try {
-        IExecutionContext context = Content.CurrentOperation as IExecutionContext;
-        IExecutionContext oldContext = param.ExecutionContext;
-        if (context != null) {
+        try {
           param.ExecutionContext = context;
-        }
-        value = param.ActualValue.ToString();
-        typeName = TypeName(param.ActualValue);
-        if (context != oldContext) {
-          param.ExecutionContext = oldContext;
-          value = string.Format("~ {0}", value);
+          value = param.ActualValue;
+        } finally {
+          param.ExecutionContext = originalContext;
         }
       } catch (Exception) { }
-      return value;
+      if (value != null) {
+        valueString = value.ToString();
+        if (context != originalContext)
+          valueString = " ~ " + valueString;
+        typeName = TypeName(value);
+      }
+      return valueString;
     }
 
     private void AddScope(TreeNodeCollection nodes, IScope scope) {
       TreeNode node = nodes.Add(scope.Name);
+      if (Content.CurrentOperation != null && Content.CurrentOperation.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.ToString()));
@@ -230 +275 @@
         MainFormManager.MainForm.ShowContent((IItem)e.Node.Tag);
     }
+
+    private void parentButton_Click(object sender, EventArgs e) {
+      IExecutionContext context = scopeTreeView.Tag as IExecutionContext;
+      if (context != null) {
+        SetOperation(context.Parent as IOperation);
+      }
+    }
   }
 }

branches/HeuristicLab.DebugEngine/HeuristicLab.DebugEngine.csproj

@@ -114 +114 @@
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />