Changeset 5146

Timestamp:

12/21/10 12:04:19 (14 years ago)

Author:

epitzer

Message:

(#47)

• Show a different icon for breakpoints
• Show an icon for the active operation

Location:

trunk/sources/HeuristicLab.DebugEngine/3.3

Files:

• ExecutionStackView.cs (modified) (2 diffs)
• OperationContent.cs (modified) (3 diffs)
• OperationContentView.Designer.cs (modified) (6 diffs)
• OperationContentView.cs (modified) (1 diff)
• OperatorTraceView.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.DebugEngine/3.3/ExecutionStackView.cs

@@ -81 +81 @@
         treeView.ImageList.Images.Add(VS2008ImageLibrary.Method);
         treeView.ImageList.Images.Add(VS2008ImageLibrary.Module);
+        treeView.ImageList.Images.Add(VS2008ImageLibrary.BreakpointActive);
         int totalNodes = AddStackOperations(treeView.Nodes, ((IEnumerable<IOperation>)Content).Reverse());
         if (treeView.Nodes.Count > 0)
@@ -111 +112 @@
             Utils.TypeName(atom.Operator), Environment.NewLine,
             Utils.Wrap(atom.Operator.Description ?? atom.Operator.ItemDescription, 60));
-          node.ImageIndex = 0;
-          node.SelectedImageIndex = 0;
-          if (atom.Operator.Breakpoint)
+          if (atom.Operator.Breakpoint) {
             node.ForeColor = Color.Red;
+            node.ImageIndex = 2;
+            node.SelectedImageIndex = 2;
+          } else {
+            node.ImageIndex = 0;
+            node.SelectedImageIndex = 0;
+          }
           count++;
         } else if (op is OperationCollection) {

trunk/sources/HeuristicLab.DebugEngine/3.3/OperationContent.cs

@@ -20 +20 @@
 #endregion
 
+using System.Drawing;
 using HeuristicLab.Common;
+using HeuristicLab.Common.Resources;
 using HeuristicLab.Core;
 
@@ -31 +33 @@
     public ExecutionContext ExecutionContext { get; private set; }
     public string Name { get; private set; }
+    public Image Icon { get; private set; }
 
     public OperationContent(IOperation operation) {
@@ -39 +42 @@
       if (AtomicOperation != null) {
         Name = Utils.Name(AtomicOperation);
+        if (AtomicOperation.Operator != null && AtomicOperation.Operator.Breakpoint) {
+          Icon = VS2008ImageLibrary.BreakpointActive;
+        } else {
+          Icon = VS2008ImageLibrary.Method;
+        }
       } else if (Collection != null) {
         Name = string.Format("{0} Operations", Collection.Count);
+        Icon = VS2008ImageLibrary.Module;
       } else {
         Name = "";
+        Icon = VS2008ImageLibrary.Nothing;
       }
     }

trunk/sources/HeuristicLab.DebugEngine/3.3/OperationContentView.Designer.cs

@@ -58 +58 @@
       this.nameTextBox = new System.Windows.Forms.TextBox();
       this.parametersImageList = new System.Windows.Forms.ImageList(this.components);
+      this.iconBox = new System.Windows.Forms.PictureBox();
       this.groupBox.SuspendLayout();
       this.splitContainer1.Panel1.SuspendLayout();
@@ -65 +66 @@
       this.executionContextConextMenu.SuspendLayout();
       this.scopeGroupBox.SuspendLayout();
+      ((System.ComponentModel.ISupportInitialize)(this.iconBox)).BeginInit();
       this.SuspendLayout();
       // 
       // groupBox
       // 
+      this.groupBox.Controls.Add(this.iconBox);
       this.groupBox.Controls.Add(this.splitContainer1);
       this.groupBox.Controls.Add(this.nameTextBox);
@@ -187 +190 @@
             | System.Windows.Forms.AnchorStyles.Right)));
       this.nameTextBox.Cursor = System.Windows.Forms.Cursors.Default;
-      this.nameTextBox.Location = new System.Drawing.Point(6, 19);
+      this.nameTextBox.Location = new System.Drawing.Point(32, 19);
       this.nameTextBox.Name = "nameTextBox";
       this.nameTextBox.ReadOnly = true;
-      this.nameTextBox.Size = new System.Drawing.Size(551, 20);
+      this.nameTextBox.Size = new System.Drawing.Size(525, 20);
       this.nameTextBox.TabIndex = 3;
       this.nameTextBox.DoubleClick += new System.EventHandler(this.nameTextBox_DoubleClick);
@@ -199 +202 @@
       this.parametersImageList.ImageSize = new System.Drawing.Size(16, 16);
       this.parametersImageList.TransparentColor = System.Drawing.Color.Transparent;
+      // 
+      // iconBox
+      // 
+      this.iconBox.Location = new System.Drawing.Point(6, 19);
+      this.iconBox.Name = "iconBox";
+      this.iconBox.Size = new System.Drawing.Size(20, 20);
+      this.iconBox.TabIndex = 5;
+      this.iconBox.TabStop = false;
       // 
       // OperationContentView
@@ -215 +226 @@
       this.executionContextConextMenu.ResumeLayout(false);
       this.scopeGroupBox.ResumeLayout(false);
+      ((System.ComponentModel.ISupportInitialize)(this.iconBox)).EndInit();
       this.ResumeLayout(false);
 
@@ -233 +245 @@
     private System.Windows.Forms.ContextMenuStrip executionContextConextMenu;
     private System.Windows.Forms.ToolStripMenuItem showValueToolStripMenuItem;
+    private System.Windows.Forms.PictureBox iconBox;
   }
 }

trunk/sources/HeuristicLab.DebugEngine/3.3/OperationContentView.cs

@@ -50 +50 @@
         scopeTreeView.Nodes.Clear();
         executionContextTreeView.Nodes.Clear();
+        iconBox.Image = null;
       } else {
         nameTextBox.Text = Content.Name;
         UpdateScopeTree();
         UpdateExecutionContext();
+        iconBox.Image = Content.Icon;
       }
     }

trunk/sources/HeuristicLab.DebugEngine/3.3/OperatorTraceView.cs

@@ -21 +21 @@
 
 using System;
+using System.Drawing;
 using System.Windows.Forms;
 using HeuristicLab.Collections;
@@ -77 +78 @@
       listView.SmallImageList.Images.Add(VS2008ImageLibrary.Method);
       listView.SmallImageList.Images.Add(VS2008ImageLibrary.Module);
+      listView.SmallImageList.Images.Add(VS2008ImageLibrary.BreakpointActive);
       foreach (var item in Content) {
         var viewItem = listView.Items.Add(item.Name ?? item.ItemName);
@@ -83 +85 @@
           Utils.Wrap(item.Description, 60));
         viewItem.Tag = item;
-        viewItem.ImageIndex = item is CombinedOperator ? 1 : 0;
+        if (item.Breakpoint) {
+          viewItem.ForeColor = Color.Red;
+          viewItem.ImageIndex = 2;
+        } else {
+          viewItem.ImageIndex = item is CombinedOperator ? 1 : 0;
+        }
       }
       if (listView.Items.Count > 0) {