Changeset 5116 for trunk/sources/HeuristicLab.DebugEngine/3.3/OperationContentView.cs

Timestamp:

12/16/10 12:19:54 (13 years ago)

Author:

epitzer

Message:

• fixed truncation of bold text in TreeView
• changed "show actual value" initial caps
• select node on right click
• fixed margins
• include actual name for parameters
• remove unnecessary labels

(#47)

File:

• trunk/sources/HeuristicLab.DebugEngine/3.3/OperationContentView.cs (modified) (7 diffs)

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

@@ -48 +48 @@
       if (Content == null) {
         nameTextBox.Text = "";
-        contextLabel.ForeColor = SystemColors.ControlDark;
-        atomicLabel.ForeColor = SystemColors.ControlDark;
-        collectionLabel.ForeColor = SystemColors.ControlDark;
         scopeTreeView.Nodes.Clear();
         executionContextTreeView.Nodes.Clear();
       } else {
-        contextLabel.ForeColor = Content.IsContext ? Color.Black : SystemColors.ControlDark;
-        atomicLabel.ForeColor = Content.IsAtomic ? Color.Black : SystemColors.ControlDark;
-        collectionLabel.ForeColor = Content.IsCollection ? Color.Black : SystemColors.ControlDark;
         nameTextBox.Text = Content.Name;
         UpdateScopeTree();
@@ -63 +57 @@
     }
 
-    private object GetParameterValue(IParameter param, IExecutionContext context) {
+    private object GetParameterValue(IParameter param, IExecutionContext context, out string actualName) {
       param = (IParameter)param.Clone();
       param.ExecutionContext = context;
@@ -72 +66 @@
         value = x.Message;
       }
+      ILookupParameter lookupParam = param as ILookupParameter;
+      if (lookupParam != null)
+        actualName = lookupParam.ActualName;
+      else
+        actualName = null;
       return value;
     }
@@ -146 +145 @@
       node.SelectedImageIndex = 0;
       foreach (var param in executionContext.Parameters) {
-        TreeNode paramNode = node.Nodes.Add(string.Format("{0}={1}",
-          param.Name, GetParameterValue(param, executionContext)));
+        string actualName = null;
+        object value = GetParameterValue(param, executionContext, out actualName);
+        string label = actualName != null && actualName != param.Name ?
+          string.Format("{0}({1})={2}", param.Name, actualName, value) :
+          string.Format("{0}={1}", param.Name, value);
+        TreeNode paramNode = node.Nodes.Add(label);
         paramNode.Tag = param;
         executionContextTreeView.ImageList.Images.Add(param.ItemImage ?? VS2008ImageLibrary.Nothing);
@@ -180 +183 @@
     private TreeNode selectedScopeNode = null;
     private void executionContextTreeView_NodeMouseClick(object sender, TreeNodeMouseClickEventArgs e) {
+      scopeTreeView.BeginUpdate();
       if (selectedScopeNode != null) {
         if (Content.IsAtomic && Content.AtomicOperation.Scope == selectedScopeNode.Tag) {
@@ -210 +214 @@
         }
       }
+      scopeTreeView.EndUpdate();
     }
 
@@ -234 +239 @@
         return;
       IParameter param = executionContextTreeView.SelectedNode.Tag as IParameter;
+      string actualName = null;
       if (param != null)
-        MainFormManager.MainForm.ShowContent(GetParameterValue(param, Content.ExecutionContext) as IContent);
-    }
-
-    #endregion
+        MainFormManager.MainForm.ShowContent(GetParameterValue(param, Content.ExecutionContext, out actualName) as IContent);
+    }
 
     private void executionContextConextMenu_Opening(object sender, System.ComponentModel.CancelEventArgs e) {
       IParameter param = executionContextTreeView.SelectedNode.Tag as IParameter;
+      string actualName = null;
       if (param != null)
-        showValueToolStripMenuItem.Enabled = GetParameterValue(param, Content.ExecutionContext) is IContent;
+        showValueToolStripMenuItem.Enabled = GetParameterValue(param, Content.ExecutionContext, out actualName) is IContent;
       else
         e.Cancel = true;
     }
 
+    private void executionContextTreeView_MouseDown(object sender, MouseEventArgs e) {
+      if (e.Button == System.Windows.Forms.MouseButtons.Right)
+        executionContextTreeView.SelectedNode = executionContextTreeView.GetNodeAt(e.Location);
+    }
+
+    #endregion