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

Timestamp:

04/12/11 13:43:05 (13 years ago)

Author:

cneumuel

Message:

#1233

• changed relationship between Job and HiveExperiment. There is no more HiveExperiment.RootJobId, instead there is Job.HiveExperimentId.
• One HiveExperiment can now have multiple Experiments.
• TreeView supports multiple root nodes
• HiveEngine creates a HiveExperiment for each set of jobs, so jobs cannot be without an parent experiment anymore (no more loose jobs)
• updated ExperimentManager binaries

Location:

branches/HeuristicLab.Hive-3.4/sources

Files:

• . (modified) (1 prop)
• HeuristicLab.Clients.Hive.Views/3.4/ExperimentManager/ItemTreeView.cs (modified) (19 diffs)

branches/HeuristicLab.Hive-3.4/sources

@@ -4 +4 @@
 PrecompiledWeb
 CreateEventLogSources
+WindowsFormsTestProject

@@ -4 +4 @@
 PrecompiledWeb
 CreateEventLogSources
+WindowsFormsTestProject

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

@@ -24 +24 @@
 using HeuristicLab.Collections;
 using HeuristicLab.Common;
+using HeuristicLab.Core;
 using HeuristicLab.Core.Views;
 using HeuristicLab.MainForm;
@@ -30 +31 @@
 namespace HeuristicLab.Clients.Hive.Views {
   [View("ItemTree View")]
-  [Content(typeof(IItemTree), IsDefaultView = false)]
-  public sealed partial class ItemTreeView : ItemView {
-    public new IItemTree Content {
-      get { return (IItemTree)base.Content; }
+  [Content(typeof(ItemCollection<>), IsDefaultView = false)]
+  [Content(typeof(ItemCollection<IItemTree>), IsDefaultView = true)]
+  public sealed partial class ItemTreeView<T> : ItemView where T : class, IItemTree {
+    public new ItemCollection<T> Content {
+      get { return (ItemCollection<T>)base.Content; }
       set { base.Content = value; }
+    }
+
+    public T SelectedItem {
+      get {
+        if (treeView.SelectedNode != null)
+          return (T)treeView.SelectedNode.Tag;
+        return null;
+      }
     }
 
@@ -42 +52 @@
 
     protected override void DeregisterContentEvents() {
+      Content.ItemsAdded -= new CollectionItemsChangedEventHandler<T>(Content_ItemsAdded);
+      Content.ItemsRemoved -= new CollectionItemsChangedEventHandler<T>(Content_ItemsRemoved);
+      Content.CollectionReset -= new CollectionItemsChangedEventHandler<T>(Content_CollectionReset);
       foreach (TreeNode node in treeView.Nodes) {
-        DeregisterContentEvents((IItemTree)node.Tag, node);
+        DeregisterContentEvents((T)node.Tag, node);
       }
       base.DeregisterContentEvents();
     }
 
-    private void DeregisterContentEvents(IItemTree item, TreeNode node) {
+    private void DeregisterContentEvents(T item, TreeNode node) {
       item.ItemsAdded -= new CollectionItemsChangedEventHandler<IItemTree>(item_ItemsAdded);
       item.ItemsRemoved -= new CollectionItemsChangedEventHandler<IItemTree>(item_ItemsRemoved);
@@ -55 +68 @@
       item.ItemImageChanged -= new EventHandler(item_ItemImageChanged);
       foreach (TreeNode childNode in node.Nodes) {
-        DeregisterContentEvents((IItemTree)childNode.Tag, childNode);
+        DeregisterContentEvents((T)childNode.Tag, childNode);
       }
     }
@@ -61 +74 @@
     protected override void RegisterContentEvents() {
       base.RegisterContentEvents();
+      Content.ItemsAdded += new CollectionItemsChangedEventHandler<T>(Content_ItemsAdded);
+      Content.ItemsRemoved += new CollectionItemsChangedEventHandler<T>(Content_ItemsRemoved);
+      Content.CollectionReset += new CollectionItemsChangedEventHandler<T>(Content_CollectionReset);
       foreach (TreeNode node in treeView.Nodes) {
-        RegisterContentEvents((IItemTree)node.Tag, node);
-      }
-    }
-
-    private void RegisterContentEvents(IItemTree item, TreeNode node) {
+        RegisterContentEvents((T)node.Tag, node);
+      }
+    }
+
+    private void RegisterContentEvents(T item, TreeNode node) {
       item.ItemsAdded += new CollectionItemsChangedEventHandler<IItemTree>(item_ItemsAdded);
       item.ItemsRemoved += new CollectionItemsChangedEventHandler<IItemTree>(item_ItemsRemoved);
@@ -73 +89 @@
       item.ItemImageChanged += new EventHandler(item_ItemImageChanged);
       foreach (TreeNode childNode in node.Nodes) {
-        RegisterContentEvents((IItemTree)childNode.Tag, childNode);
+        RegisterContentEvents((T)childNode.Tag, childNode);
       }
     }
 
     #region Event Handlers (Content)
+    private void Content_ItemsAdded(object sender, CollectionItemsChangedEventArgs<T> e) {
+      if (InvokeRequired) {
+        Invoke(new CollectionItemsChangedEventHandler<T>(Content_ItemsAdded), sender, e);
+      } else {
+        foreach (T item in e.Items) {
+          var node = AddChildNodes(item, treeView.Nodes, true);
+          UpdateNodeItemImage(node);
+        }
+      }
+    }
+    private void Content_ItemsRemoved(object sender, CollectionItemsChangedEventArgs<T> e) {
+      if (InvokeRequired) {
+        Invoke(new CollectionItemsChangedEventHandler<T>(Content_ItemsRemoved), sender, e);
+      } else {
+        foreach (T item in e.Items) {
+          RemoveChildNodes(item, treeView.Nodes);
+        }
+        RebuildImageList();
+      }
+    }
+    private void Content_CollectionReset(object sender, CollectionItemsChangedEventArgs<T> e) {
+      if (InvokeRequired) {
+        Invoke(new CollectionItemsChangedEventHandler<T>(Content_CollectionReset), sender, e);
+      } else {
+        foreach (T item in e.OldItems) {
+          RemoveChildNodes(item, treeView.Nodes);
+        }
+        RebuildImageList();
+        foreach (T item in e.Items) {
+          AddChildNodes(item, treeView.Nodes, true);
+        }
+      }
+    }
+
     private void item_ItemsAdded(object sender, CollectionItemsChangedEventArgs<IItemTree> e) {
       if (InvokeRequired) {
         Invoke(new CollectionItemsChangedEventHandler<IItemTree>(item_ItemsAdded), sender, e);
       } else {
-        TreeNode node = GetNodeByItem(sender as IItemTree);
+        TreeNode node = GetNodeByItem(sender as T);
         if (node != null) {
-          foreach (IItemTree item in e.Items) {
+          foreach (T item in e.Items) {
             AddChildNodes(item, node.Nodes, true);
             node.ExpandAll();
@@ -97 +147 @@
         Invoke(new CollectionItemsChangedEventHandler<IItemTree>(item_ItemsRemoved), sender, e);
       } else {
-        TreeNode node = GetNodeByItem(sender as IItemTree);
+        TreeNode node = GetNodeByItem(sender as T);
         if (node != null) {
-          foreach (IItemTree item in e.Items) {
+          foreach (T item in e.Items) {
             RemoveChildNodes(item, node.Nodes);
           }
@@ -111 +161 @@
         Invoke(new CollectionItemsChangedEventHandler<IItemTree>(item_CollectionReset), sender, e);
       } else {
-        TreeNode node = GetNodeByItem(sender as IItemTree);
+        TreeNode node = GetNodeByItem(sender as T);
         if (node != null) {
-          foreach (IItemTree item in e.OldItems) {
+          foreach (T item in e.OldItems) {
             RemoveChildNodes(item, node.Nodes);
           }
           RebuildImageList();
-          foreach (IItemTree item in e.Items) {
+          foreach (T item in e.Items) {
             AddChildNodes(item, node.Nodes, true);
           }
@@ -128 +178 @@
         Invoke(new EventHandler(item_ToStringChanged), sender, e);
       } else {
-        var item = sender as IItemTree;
+        var item = sender as T;
         TreeNode node = GetNodeByItem(item);
         if(node != null)
@@ -139 +189 @@
         Invoke(new EventHandler(item_ItemImageChanged), sender, e);
       } else {
-        var item = sender as IItemTree;
+        var item = sender as T;
         TreeNode node = GetNodeByItem(item);
         if(node != null)
@@ -151 +201 @@
       } else {
         if (treeView.SelectedNode != null) {
-          var item = treeView.SelectedNode.Tag as IItemTree;
+          var item = treeView.SelectedNode.Tag as T;
           if (item != null) {
             IContentView view = MainFormManager.MainForm.ShowContent(item);
@@ -167 +217 @@
       base.OnContentChanged();
       if (Content == null) {
-        // Add code when content has been changed and is null
         ClearNodes();
         detailsViewHost.Content = null;
       } else {
-        // Add code when content has been changed and is not null
         ClearNodes();
-        AddChildNodes(Content, treeView.Nodes, false);
+        foreach (T itemTree in Content) {
+          AddChildNodes(itemTree, treeView.Nodes, false);
+        }
         foreach (TreeNode node in treeView.Nodes) {
           UpdateNodeItemImage(node);
         }
+        detailsViewHost.Content = null;
       }
     }
@@ -184 +235 @@
     }
 
-    private void AddChildNodes(IItemTree item, TreeNodeCollection nodes, bool registerEvents) {
+    private TreeNode AddChildNodes(T item, TreeNodeCollection nodes, bool registerEvents) {
       TreeNode node = CreateTreeViewNode(item);
       nodes.Add(node);
@@ -190 +241 @@
       RegisterContentEvents(item, node); 
       var childItems = item.GetChildItems();
-      foreach (var childItem in childItems) {
+      foreach (T childItem in childItems) {
         AddChildNodes(childItem, node.Nodes, registerEvents);
       }
       node.ExpandAll();
-    }
-
-    private void RemoveChildNodes(IItemTree item, TreeNodeCollection treeNodeCollection) {
+      return node;
+    }
+
+    private void RemoveChildNodes(T item, TreeNodeCollection treeNodeCollection) {
       int idx = -1;
       for (int i = 0; i < treeNodeCollection.Count; i++) {
@@ -207 +259 @@
     }
     
-    private TreeNode GetNodeByItem(IItemTree item) {
+    private TreeNode GetNodeByItem(T item) {
       TreeNode found = null;
       foreach (TreeNode node in treeView.Nodes) {
@@ -217 +269 @@
     }
 
-    private TreeNode GetNodeByItem(TreeNode node, IItemTree item) {
+    private TreeNode GetNodeByItem(TreeNode node, T item) {
       if (node.Tag == item)
         return node;
@@ -229 +281 @@
     }
 
-    private TreeNode CreateTreeViewNode(IItemTree item) {
+    private TreeNode CreateTreeViewNode(T item) {
       var node = new TreeNode(item.ToString());
       node.Tag = item;
@@ -237 +289 @@
     private void UpdateNodeItemImage(TreeNode node) {
       if (node == null) throw new ArgumentNullException();
-      var item = node.Tag as IItemTree;
+      var item = node.Tag as T;
       int i = node.ImageIndex;
       this.imageList.Images[i] = item == null ? HeuristicLab.Common.Resources.VSImageLibrary.Nothing : item.ItemImage;
@@ -268 +320 @@
 
     private void RebuildImageList(TreeNode node) {
-      var item = node.Tag as IItemTree;
+      var item = node.Tag as T;
       treeView.ImageList.Images.Add(item == null ? HeuristicLab.Common.Resources.VSImageLibrary.Nothing : item.ItemImage);
       node.ImageIndex = treeView.ImageList.Images.Count - 1;

@@ -4 +4 @@
 PrecompiledWeb
 CreateEventLogSources
+WindowsFormsTestProject