Changeset 12381

Timestamp:

05/05/15 10:44:35 (9 years ago)

Author:

pfleck

Message:

#2379 Added tree view component in RecursiveDataItemView. Removed RecursiveDataItemListView view because tree view is moved to RecursiveDataItemView.

Location:

branches/BubbleChart/HeuristicLab.Optimization.BubbleChart/3.3

Files:

• HeuristicLab.Optimization.BubbleChart-3.3.csproj (modified) (1 diff)
• RecursiveDataItemListView.Designer.cs (deleted)
• RecursiveDataItemListView.cs (deleted)
• RecursiveDataItemView.Designer.cs (modified) (5 diffs)
• RecursiveDataItemView.cs (modified) (5 diffs)

branches/BubbleChart/HeuristicLab.Optimization.BubbleChart/3.3/HeuristicLab.Optimization.BubbleChart-3.3.csproj

@@ -84 +84 @@
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="RecursiveDataItemListView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="RecursiveDataItemListView.Designer.cs">
-      <DependentUpon>RecursiveDataItemListView.cs</DependentUpon>
-    </Compile>
     <Compile Include="RecursiveDataItemView.cs">
       <SubType>UserControl</SubType>

branches/BubbleChart/HeuristicLab.Optimization.BubbleChart/3.3/RecursiveDataItemView.Designer.cs

@@ -48 +48 @@
       this.listView = new System.Windows.Forms.ListView();
       this.viewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
+      this.nameColumnHeader = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+      this.valueColumnHeader = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+      this.dataGroupBox = new System.Windows.Forms.GroupBox();
+      this.detailsGroupBox = new System.Windows.Forms.GroupBox();
+      this.dataChildrenSplitContainer = new System.Windows.Forms.SplitContainer();
+      this.treeView = new System.Windows.Forms.TreeView();
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
       ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit();
@@ -53 +59 @@
       this.splitContainer.Panel2.SuspendLayout();
       this.splitContainer.SuspendLayout();
+      this.dataGroupBox.SuspendLayout();
+      this.detailsGroupBox.SuspendLayout();
+      ((System.ComponentModel.ISupportInitialize)(this.dataChildrenSplitContainer)).BeginInit();
+      this.dataChildrenSplitContainer.Panel1.SuspendLayout();
+      this.dataChildrenSplitContainer.Panel2.SuspendLayout();
+      this.dataChildrenSplitContainer.SuspendLayout();
       this.SuspendLayout();
       // 
@@ -59 +71 @@
       this.errorProvider.SetIconAlignment(this.nameTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
       this.errorProvider.SetIconPadding(this.nameTextBox, 2);
+      this.nameTextBox.Size = new System.Drawing.Size(459, 20);
+      // 
+      // infoLabel
+      // 
+      this.infoLabel.Location = new System.Drawing.Point(523, 3);
       // 
       // splitContainer
       // 
-      this.splitContainer.Location = new System.Drawing.Point(3, 26);
+      this.splitContainer.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.splitContainer.Location = new System.Drawing.Point(3, 16);
       this.splitContainer.Name = "splitContainer";
       // 
       // splitContainer.Panel1
       // 
-      this.splitContainer.Panel1.Controls.Add(this.listView);
+      this.splitContainer.Panel1.Controls.Add(this.dataChildrenSplitContainer);
       // 
       // splitContainer.Panel2
       // 
-      this.splitContainer.Panel2.Controls.Add(this.viewHost);
-      this.splitContainer.Size = new System.Drawing.Size(345, 261);
-      this.splitContainer.SplitterDistance = 115;
+      this.splitContainer.Panel2.Controls.Add(this.detailsGroupBox);
+      this.splitContainer.Size = new System.Drawing.Size(527, 297);
+      this.splitContainer.SplitterDistance = 170;
       this.splitContainer.TabIndex = 3;
       // 
       // listView
       // 
-      this.listView.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.listView.Location = new System.Drawing.Point(0, 0);
+      this.listView.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.listView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
+            this.nameColumnHeader,
+            this.valueColumnHeader});
+      this.listView.FullRowSelect = true;
+      this.listView.HideSelection = false;
+      this.listView.Location = new System.Drawing.Point(3, 3);
       this.listView.MultiSelect = false;
       this.listView.Name = "listView";
-      this.listView.Size = new System.Drawing.Size(115, 261);
+      this.listView.Size = new System.Drawing.Size(160, 185);
+      this.listView.Sorting = System.Windows.Forms.SortOrder.Ascending;
       this.listView.TabIndex = 0;
       this.listView.UseCompatibleStateImageBehavior = false;
+      this.listView.View = System.Windows.Forms.View.Details;
       this.listView.SelectedIndexChanged += new System.EventHandler(this.listView_SelectedIndexChanged);
       // 
       // viewHost
       // 
+      this.viewHost.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.viewHost.Caption = "View";
       this.viewHost.Content = null;
-      this.viewHost.Dock = System.Windows.Forms.DockStyle.Fill;
       this.viewHost.Enabled = false;
-      this.viewHost.Location = new System.Drawing.Point(0, 0);
+      this.viewHost.Location = new System.Drawing.Point(6, 19);
       this.viewHost.Name = "viewHost";
       this.viewHost.ReadOnly = false;
-      this.viewHost.Size = new System.Drawing.Size(226, 261);
+      this.viewHost.Size = new System.Drawing.Size(334, 265);
       this.viewHost.TabIndex = 0;
       this.viewHost.ViewsLabelVisible = true;
       this.viewHost.ViewType = null;
       // 
+      // nameColumnHeader
+      // 
+      this.nameColumnHeader.Text = "Name";
+      // 
+      // valueColumnHeader
+      // 
+      this.valueColumnHeader.Text = "Value";
+      // 
+      // dataGroupBox
+      // 
+      this.dataGroupBox.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.dataGroupBox.Controls.Add(this.splitContainer);
+      this.dataGroupBox.Location = new System.Drawing.Point(6, 26);
+      this.dataGroupBox.Name = "dataGroupBox";
+      this.dataGroupBox.Size = new System.Drawing.Size(533, 316);
+      this.dataGroupBox.TabIndex = 4;
+      this.dataGroupBox.TabStop = false;
+      this.dataGroupBox.Text = "Data && Children";
+      // 
+      // detailsGroupBox
+      // 
+      this.detailsGroupBox.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.detailsGroupBox.Controls.Add(this.viewHost);
+      this.detailsGroupBox.Location = new System.Drawing.Point(4, 4);
+      this.detailsGroupBox.Name = "detailsGroupBox";
+      this.detailsGroupBox.Size = new System.Drawing.Size(346, 290);
+      this.detailsGroupBox.TabIndex = 1;
+      this.detailsGroupBox.TabStop = false;
+      this.detailsGroupBox.Text = "Details";
+      // 
+      // dataChildrenSplitContainer
+      // 
+      this.dataChildrenSplitContainer.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.dataChildrenSplitContainer.Location = new System.Drawing.Point(4, 4);
+      this.dataChildrenSplitContainer.Name = "dataChildrenSplitContainer";
+      this.dataChildrenSplitContainer.Orientation = System.Windows.Forms.Orientation.Horizontal;
+      // 
+      // dataChildrenSplitContainer.Panel1
+      // 
+      this.dataChildrenSplitContainer.Panel1.Controls.Add(this.listView);
+      // 
+      // dataChildrenSplitContainer.Panel2
+      // 
+      this.dataChildrenSplitContainer.Panel2.Controls.Add(this.treeView);
+      this.dataChildrenSplitContainer.Size = new System.Drawing.Size(168, 290);
+      this.dataChildrenSplitContainer.SplitterDistance = 191;
+      this.dataChildrenSplitContainer.TabIndex = 1;
+      // 
+      // treeView
+      // 
+      this.treeView.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.treeView.Location = new System.Drawing.Point(3, 3);
+      this.treeView.Name = "treeView";
+      this.treeView.Size = new System.Drawing.Size(160, 89);
+      this.treeView.TabIndex = 0;
+      this.treeView.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeView_AfterSelect);
+      // 
       // RecursiveDataItemView
       // 
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-      this.Controls.Add(this.splitContainer);
+      this.Controls.Add(this.dataGroupBox);
       this.Name = "RecursiveDataItemView";
-      this.Size = new System.Drawing.Size(351, 290);
+      this.Size = new System.Drawing.Size(542, 345);
       this.Controls.SetChildIndex(this.nameLabel, 0);
       this.Controls.SetChildIndex(this.nameTextBox, 0);
       this.Controls.SetChildIndex(this.infoLabel, 0);
-      this.Controls.SetChildIndex(this.splitContainer, 0);
+      this.Controls.SetChildIndex(this.dataGroupBox, 0);
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
       this.splitContainer.Panel1.ResumeLayout(false);
@@ -117 +211 @@
       ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).EndInit();
       this.splitContainer.ResumeLayout(false);
+      this.dataGroupBox.ResumeLayout(false);
+      this.detailsGroupBox.ResumeLayout(false);
+      this.dataChildrenSplitContainer.Panel1.ResumeLayout(false);
+      this.dataChildrenSplitContainer.Panel2.ResumeLayout(false);
+      ((System.ComponentModel.ISupportInitialize)(this.dataChildrenSplitContainer)).EndInit();
+      this.dataChildrenSplitContainer.ResumeLayout(false);
       this.ResumeLayout(false);
       this.PerformLayout();
@@ -127 +227 @@
     private System.Windows.Forms.ListView listView;
     private HeuristicLab.MainForm.WindowsForms.ViewHost viewHost;
+    private System.Windows.Forms.ColumnHeader nameColumnHeader;
+    private System.Windows.Forms.ColumnHeader valueColumnHeader;
+    private System.Windows.Forms.GroupBox detailsGroupBox;
+    private System.Windows.Forms.GroupBox dataGroupBox;
+    private System.Windows.Forms.SplitContainer dataChildrenSplitContainer;
+    private System.Windows.Forms.TreeView treeView;
   }
 }

branches/BubbleChart/HeuristicLab.Optimization.BubbleChart/3.3/RecursiveDataItemView.cs

@@ -28 +28 @@
 namespace HeuristicLab.Optimization.BubbleChart {
   [View("RecursiveDataItem View")]
-  [Content(typeof(RecursiveDataItem))]
+  [Content(typeof(RecursiveDataItem), true)]
   public partial class RecursiveDataItemView : NamedItemView {
 
@@ -41 +41 @@
 
     protected override void OnContentChanged() {
-      listView.Clear();
+      base.OnContentChanged();
+
+      listView.Items.Clear();
+      treeView.Nodes.Clear();
       viewHost.Content = null;
 
@@ -47 +50 @@
         foreach (var data in Content.Data) {
           listView.Items.Add(CreateListViewItem(data));
+        }
+        for (int i = 0; i < listView.Columns.Count; i++)
+          listView.Columns[i].AutoResize(ColumnHeaderAutoResizeStyle.ColumnContent);
+        foreach (var dataItem in Content.Children) {
+          treeView.Nodes.Add(CreateTreeNode(dataItem));
         }
       }
@@ -56 +64 @@
 
     private ListViewItem CreateListViewItem(KeyValuePair<string, IItem> data) {
-      return new ListViewItem(data.Key) {
+      return new ListViewItem(new[] { data.Key, data.Value != null ? data.Value.ToString() : "-" }) {
         Tag = data.Value
       };
+    }
+    private TreeNode CreateTreeNode(RecursiveDataItem dataItem) {
+      var node = new TreeNode(dataItem.Name) {
+        Tag = dataItem
+      };
+      foreach (var child in dataItem.Children) {
+        node.Nodes.Add(CreateTreeNode(child));
+      }
+      return node;
     }
 
@@ -69 +86 @@
       }
     }
+    private void treeView_AfterSelect(object sender, TreeViewEventArgs e) {
+      var dataItem = (RecursiveDataItem)e.Node.Tag;
+      viewHost.Content = dataItem;
+    }
   }
 }