Changeset 5675 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.4

Timestamp:

03/14/11 16:45:46 (14 years ago)

Author:

cneumuel

Message:

#1233

• improved treeview for hive jobs

Location:

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.4/ExperimentManager

Files:

• HiveExperimentView.Designer.cs (modified) (7 diffs)
• HiveExperimentView.cs (modified) (2 diffs)
• ItemTreeView.cs (modified) (5 diffs)
• ItemTreeView.designer.cs (modified) (7 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.4/ExperimentManager/HiveExperimentView.Designer.cs

@@ -52 +52 @@
       this.experimentNamedItemView = new HeuristicLab.Core.Views.NamedItemView();
       this.viewExperimentButton = new System.Windows.Forms.Button();
-      this.jobsTabPage = new System.Windows.Forms.TabPage();
       this.logTabPage = new System.Windows.Forms.TabPage();
       this.logView = new HeuristicLab.Core.Views.LogView();
@@ -68 +67 @@
       this.downloadExperimentPanel = new System.Windows.Forms.Panel();
       this.useLocalPluginsCheckBox = new System.Windows.Forms.CheckBox();
-      this.jobViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
+      this.jobsTabPage = new System.Windows.Forms.TabPage();
+      this.jobsTreeView = new HeuristicLab.Clients.Hive.Views.ItemTreeView();
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
       this.tabControl.SuspendLayout();
       this.experimentTabPage.SuspendLayout();
-      this.jobsTabPage.SuspendLayout();
       this.logTabPage.SuspendLayout();
       this.downloadExperimentPanel.SuspendLayout();
+      this.jobsTabPage.SuspendLayout();
       this.SuspendLayout();
       // 
@@ -161 +161 @@
       this.viewExperimentButton.Click += new System.EventHandler(this.showExperimentButton_Click);
       // 
-      // jobsTabPage
-      // 
-      this.jobsTabPage.Controls.Add(this.jobViewHost);
-      this.jobsTabPage.Location = new System.Drawing.Point(4, 22);
-      this.jobsTabPage.Name = "jobsTabPage";
-      this.jobsTabPage.Size = new System.Drawing.Size(791, 494);
-      this.jobsTabPage.TabIndex = 5;
-      this.jobsTabPage.Text = "Jobs";
-      this.jobsTabPage.UseVisualStyleBackColor = true;
-      // 
       // logTabPage
       // 
@@ -183 +173 @@
       // logView
       // 
-      this.logView.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.logView.Caption = "Log View";
       this.logView.Content = null;
-      this.logView.Location = new System.Drawing.Point(3, 4);
+      this.logView.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.logView.Location = new System.Drawing.Point(0, 0);
       this.logView.Name = "logView";
       this.logView.ReadOnly = false;
-      this.logView.Size = new System.Drawing.Size(721, 362);
+      this.logView.Size = new System.Drawing.Size(791, 494);
       this.logView.TabIndex = 0;
       // 
@@ -343 +331 @@
       this.useLocalPluginsCheckBox.CheckedChanged += new System.EventHandler(this.useLocalPluginsCheckBox_CheckedChanged);
       // 
-      // jobViewHost
-      // 
-      this.jobViewHost.Caption = "View";
-      this.jobViewHost.Content = null;
-      this.jobViewHost.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.jobViewHost.Enabled = false;
-      this.jobViewHost.Location = new System.Drawing.Point(0, 0);
-      this.jobViewHost.Name = "jobViewHost";
-      this.jobViewHost.ReadOnly = false;
-      this.jobViewHost.Size = new System.Drawing.Size(791, 494);
-      this.jobViewHost.TabIndex = 0;
-      this.jobViewHost.ViewsLabelVisible = true;
-      this.jobViewHost.ViewType = null;
+      // jobsTabPage
+      // 
+      this.jobsTabPage.Controls.Add(this.jobsTreeView);
+      this.jobsTabPage.Location = new System.Drawing.Point(4, 22);
+      this.jobsTabPage.Name = "jobsTabPage";
+      this.jobsTabPage.Size = new System.Drawing.Size(791, 494);
+      this.jobsTabPage.TabIndex = 5;
+      this.jobsTabPage.Text = "Jobs";
+      this.jobsTabPage.UseVisualStyleBackColor = true;
+      // 
+      // jobsTreeView
+      // 
+      this.jobsTreeView.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.jobsTreeView.Caption = "ItemTree View";
+      this.jobsTreeView.Content = null;
+      this.jobsTreeView.Location = new System.Drawing.Point(2, 3);
+      this.jobsTreeView.Name = "jobsTreeView";
+      this.jobsTreeView.ReadOnly = false;
+      this.jobsTreeView.Size = new System.Drawing.Size(786, 488);
+      this.jobsTreeView.TabIndex = 0;
       // 
       // HiveExperimentView
@@ -396 +393 @@
       this.tabControl.ResumeLayout(false);
       this.experimentTabPage.ResumeLayout(false);
-      this.jobsTabPage.ResumeLayout(false);
       this.logTabPage.ResumeLayout(false);
       this.downloadExperimentPanel.ResumeLayout(false);
+      this.jobsTabPage.ResumeLayout(false);
       this.ResumeLayout(false);
       this.PerformLayout();
@@ -423 +420 @@
     private System.Windows.Forms.Button openExperimentButton;
     private System.Windows.Forms.Button newExperimentButton;
-    private System.Windows.Forms.TabPage jobsTabPage;
     private System.Windows.Forms.Button downloadExperimentButton;
     private System.Windows.Forms.Panel downloadExperimentPanel;
     private System.Windows.Forms.CheckBox useLocalPluginsCheckBox;
-    private MainForm.WindowsForms.ViewHost jobViewHost;
+    private System.Windows.Forms.TabPage jobsTabPage;
+    private ItemTreeView jobsTreeView;
 
   }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.4/ExperimentManager/HiveExperimentView.cs

@@ -105 +105 @@
         this.descriptionTextBox.ReadOnly = Content.ExecutionState != ExecutionState.Prepared;
         this.resourceNamesTextBox.ReadOnly = Content.ExecutionState != ExecutionState.Prepared;
-        this.jobViewHost.ReadOnly = Content.ExecutionState != ExecutionState.Prepared;
+        this.jobsTreeView.ReadOnly = Content.ExecutionState != ExecutionState.Prepared;
         this.useLocalPluginsCheckBox.Enabled = Content.ExecutionState == ExecutionState.Prepared;
 
@@ -189 +189 @@
       else {
         if (Content != null) {
-          jobViewHost.Content = Content.HiveJob;
+          jobsTreeView.Content = Content.HiveJob;
           experimentNamedItemView.Content = Content.GetExperiment();
         } else {
-          jobViewHost.Content = null;
+          jobsTreeView.Content = null;
           experimentNamedItemView.Content = null;
         }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.4/ExperimentManager/ItemTreeView.cs

@@ -20 +20 @@
 #endregion
 
+using System;
 using System.Windows.Forms;
+using HeuristicLab.Collections;
 using HeuristicLab.Common;
 using HeuristicLab.Core.Views;
@@ -40 +42 @@
 
     protected override void DeregisterContentEvents() {
-      // Deregister your event handlers here
+      foreach (TreeNode node in treeView.Nodes) {
+        DeregisterContentEvents((IItemTree)node.Tag, node);
+      }
       base.DeregisterContentEvents();
+    }
+
+    private void DeregisterContentEvents(IItemTree item, TreeNode node) {
+      item.ItemsAdded -= new CollectionItemsChangedEventHandler<IItemTree>(item_ItemsAdded);
+      item.ItemsRemoved -= new CollectionItemsChangedEventHandler<IItemTree>(item_ItemsRemoved);
+      item.CollectionReset -= new CollectionItemsChangedEventHandler<IItemTree>(item_CollectionReset);
+      item.ToStringChanged -= new System.EventHandler(item_ToStringChanged);
+      item.ItemImageChanged -= new EventHandler(item_ItemImageChanged);
+      foreach (TreeNode childNode in node.Nodes) {
+        DeregisterContentEvents((IItemTree)childNode.Tag, childNode);
+      }
     }
 
     protected override void RegisterContentEvents() {
       base.RegisterContentEvents();
-      // Register your event handlers here
+      foreach (TreeNode node in treeView.Nodes) {
+        RegisterContentEvents((IItemTree)node.Tag, node);
+      }
+    }
+
+    private void RegisterContentEvents(IItemTree item, TreeNode node) {
+      item.ItemsAdded += new CollectionItemsChangedEventHandler<IItemTree>(item_ItemsAdded);
+      item.ItemsRemoved += new CollectionItemsChangedEventHandler<IItemTree>(item_ItemsRemoved);
+      item.CollectionReset += new CollectionItemsChangedEventHandler<IItemTree>(item_CollectionReset);
+      item.ToStringChanged += new System.EventHandler(item_ToStringChanged);
+      item.ItemImageChanged += new EventHandler(item_ItemImageChanged);
+      foreach (TreeNode childNode in node.Nodes) {
+        RegisterContentEvents((IItemTree)childNode.Tag, childNode);
+      }
     }
 
@@ -57 +85 @@
       if (Content == null) {
         // Add code when content has been changed and is null
-        treeView.Nodes.Clear();
+        ClearNodes();
       } else {
         // Add code when content has been changed and is not null
-        treeView.Nodes.Clear();
-        AddChildNodes(Content, treeView.Nodes);
-      }
-    }
-
-    private void AddChildNodes(IItemTree item, TreeNodeCollection nodes) {
-      var node = CreateTreeViewNode(item);
+        ClearNodes();
+        AddChildNodes(Content, treeView.Nodes, false);
+        foreach (TreeNode node in treeView.Nodes) {
+          UpdateNodeItemImage(node);
+        }
+      }
+    }
+
+    private void ClearNodes() {
+      treeView.Nodes.Clear();
+    }
+
+    private void AddChildNodes(IItemTree item, TreeNodeCollection nodes, bool registerEvents) {
+      TreeNode node = CreateTreeViewNode(item);
       nodes.Add(node);
-      var childItems = item.GetChildNodes();
-      foreach (var childItem in childItems) {        
-        AddChildNodes(childItem, node.Nodes);
-      }
+      RebuildImageList(node);
+      RegisterContentEvents(item, node); 
+      var childItems = item.GetChildItems();
+      foreach (var childItem in childItems) {
+        AddChildNodes(childItem, node.Nodes, registerEvents);
+      }
+      node.ExpandAll();
+    }
+
+    private void RemoveChildNodes(IItemTree item, TreeNodeCollection treeNodeCollection) {
+      int idx = -1;
+      for (int i = 0; i < treeNodeCollection.Count; i++) {
+        if (treeNodeCollection[i].Tag == item) {
+          idx = i; break;
+        }
+      }
+      DeregisterContentEvents(item, treeNodeCollection[idx]);
+      treeNodeCollection.RemoveAt(idx);
+    }
+
+    private void item_ItemsAdded(object sender, CollectionItemsChangedEventArgs<IItemTree> e) {
+      TreeNode node = GetNodeByItem(sender as IItemTree);
+      foreach (IItemTree item in e.Items) {
+        AddChildNodes(item, node.Nodes, true);
+        node.ExpandAll();
+        UpdateNodeItemImage(node);
+      }
+    }
+
+    private void item_ItemsRemoved(object sender, CollectionItemsChangedEventArgs<IItemTree> e) {
+      TreeNode node = GetNodeByItem(sender as IItemTree);
+      foreach (IItemTree item in e.Items) {
+        RemoveChildNodes(item, node.Nodes);
+      }
+      RebuildImageList();
+    }
+
+    private void item_CollectionReset(object sender, CollectionItemsChangedEventArgs<IItemTree> e) {
+      TreeNode node = GetNodeByItem(sender as IItemTree);
+      foreach (IItemTree item in e.OldItems) {
+        RemoveChildNodes(item, node.Nodes);
+      }
+      RebuildImageList();
+      foreach (IItemTree item in e.Items) {
+        AddChildNodes(item, node.Nodes, true);
+      }
+    }
+
+    private void item_ToStringChanged(object sender, EventArgs e) {
+      var item = sender as IItemTree;
+      TreeNode node = GetNodeByItem(item);
+      node.Text = item.ToString();
+    }
+
+    private void item_ItemImageChanged(object sender, EventArgs e) {
+      var item = sender as IItemTree;
+      TreeNode node = GetNodeByItem(item);
+      UpdateNodeItemImage(node);
+    }
+
+    private TreeNode GetNodeByItem(IItemTree item) {
+      TreeNode found = null;
+      foreach (TreeNode node in treeView.Nodes) {
+        found = GetNodeByItem(node, item);
+        if (found != null)
+          return found;
+      }
+      return null;
+    }
+
+    private TreeNode GetNodeByItem(TreeNode node, IItemTree item) {
+      if (node.Tag == item)
+        return node;
+      TreeNode found = null;
+      foreach (TreeNode childNode in node.Nodes) {
+        found = GetNodeByItem(childNode, item);
+        if (found != null)
+          return found;
+      }
+      return null;
     }
 
@@ -77 +188 @@
       var node = new TreeNode(item.ToString());
       node.Tag = item;
-      if (!treeView.ImageList.Images.ContainsKey(item.ItemImage.GetHashCode().ToString())) {
-        treeView.ImageList.Images.Add(item.ItemImage.GetHashCode().ToString(), item.ItemImage);
-      }
-      node.ImageKey = item.ItemImage.GetHashCode().ToString();
       return node;
+    }
+
+    private void UpdateNodeItemImage(TreeNode node) {
+      if (node == null) throw new ArgumentNullException();
+      var item = node.Tag as IItemTree;
+      int i = node.ImageIndex;
+      this.imageList.Images[i] = item == null ? HeuristicLab.Common.Resources.VSImageLibrary.Nothing : item.ItemImage;
+      node.ImageIndex = -1;
+      node.ImageIndex = i;
+      node.SelectedImageIndex = node.ImageIndex;
+      foreach (TreeNode childNode in node.Nodes) {
+        UpdateNodeItemImage(childNode);
+      }
     }
 
@@ -96 +216 @@
     #endregion
 
-
+    private void RebuildImageList() {
+      treeView.ImageList.Images.Clear();
+      foreach (TreeNode node in treeView.Nodes) {
+        RebuildImageList(node);
+      }
+    }
+
+    private void RebuildImageList(TreeNode node) {
+      var item = node.Tag as IItemTree;
+      treeView.ImageList.Images.Add(item == null ? HeuristicLab.Common.Resources.VSImageLibrary.Nothing : item.ItemImage);
+      node.ImageIndex = treeView.ImageList.Images.Count - 1;
+      node.SelectedImageIndex = node.ImageIndex;
+      foreach (TreeNode childNode in node.Nodes) {
+        RebuildImageList(childNode);
+      }
+    }
   }
 }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.4/ExperimentManager/ItemTreeView.designer.cs

@@ -27 +27 @@
       this.splitContainer = new System.Windows.Forms.SplitContainer();
       this.treeView = new System.Windows.Forms.TreeView();
+      this.imageList = new System.Windows.Forms.ImageList(this.components);
+      this.detailsGroupBox = new System.Windows.Forms.GroupBox();
       this.viewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
-      this.imageList = new System.Windows.Forms.ImageList(this.components);
       ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit();
       this.splitContainer.Panel1.SuspendLayout();
       this.splitContainer.Panel2.SuspendLayout();
       this.splitContainer.SuspendLayout();
+      this.detailsGroupBox.SuspendLayout();
       this.SuspendLayout();
       // 
@@ -38 +40 @@
       // 
       this.splitContainer.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.splitContainer.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
       this.splitContainer.Location = new System.Drawing.Point(0, 0);
       this.splitContainer.Name = "splitContainer";
@@ -47 +50 @@
       // splitContainer.Panel2
       // 
-      this.splitContainer.Panel2.Controls.Add(this.viewHost);
-      this.splitContainer.Size = new System.Drawing.Size(551, 463);
-      this.splitContainer.SplitterDistance = 183;
+      this.splitContainer.Panel2.Controls.Add(this.detailsGroupBox);
+      this.splitContainer.Size = new System.Drawing.Size(624, 463);
+      this.splitContainer.SplitterDistance = 200;
       this.splitContainer.TabIndex = 0;
       // 
@@ -60 +63 @@
       this.treeView.Name = "treeView";
       this.treeView.SelectedImageIndex = 0;
-      this.treeView.Size = new System.Drawing.Size(183, 463);
+      this.treeView.Size = new System.Drawing.Size(200, 463);
       this.treeView.TabIndex = 0;
       this.treeView.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeView_AfterSelect);
+      // 
+      // imageList
+      // 
+      this.imageList.ColorDepth = System.Windows.Forms.ColorDepth.Depth8Bit;
+      this.imageList.ImageSize = new System.Drawing.Size(16, 16);
+      this.imageList.TransparentColor = System.Drawing.Color.Transparent;
+      // 
+      // detailsGroupBox
+      // 
+      this.detailsGroupBox.Controls.Add(this.viewHost);
+      this.detailsGroupBox.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.detailsGroupBox.Location = new System.Drawing.Point(0, 0);
+      this.detailsGroupBox.Name = "detailsGroupBox";
+      this.detailsGroupBox.Size = new System.Drawing.Size(420, 463);
+      this.detailsGroupBox.TabIndex = 1;
+      this.detailsGroupBox.TabStop = false;
+      this.detailsGroupBox.Text = "Details";
       // 
       // viewHost
@@ -70 +90 @@
       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(3, 16);
       this.viewHost.Name = "viewHost";
       this.viewHost.ReadOnly = false;
-      this.viewHost.Size = new System.Drawing.Size(364, 463);
+      this.viewHost.Size = new System.Drawing.Size(414, 444);
       this.viewHost.TabIndex = 0;
       this.viewHost.ViewsLabelVisible = true;
       this.viewHost.ViewType = null;
-      // 
-      // imageList
-      // 
-      this.imageList.ColorDepth = System.Windows.Forms.ColorDepth.Depth8Bit;
-      this.imageList.ImageSize = new System.Drawing.Size(16, 16);
-      this.imageList.TransparentColor = System.Drawing.Color.Transparent;
       // 
       // ItemTreeView
@@ -89 +103 @@
       this.Controls.Add(this.splitContainer);
       this.Name = "ItemTreeView";
-      this.Size = new System.Drawing.Size(551, 463);
+      this.Size = new System.Drawing.Size(624, 463);
       this.splitContainer.Panel1.ResumeLayout(false);
       this.splitContainer.Panel2.ResumeLayout(false);
       ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).EndInit();
       this.splitContainer.ResumeLayout(false);
+      this.detailsGroupBox.ResumeLayout(false);
       this.ResumeLayout(false);
 
@@ -104 +119 @@
     private MainForm.WindowsForms.ViewHost viewHost;
     private System.Windows.Forms.ImageList imageList;
+    private System.Windows.Forms.GroupBox detailsGroupBox;
   }
 }