Changeset 14337 for branches/ItemTreeViews

Timestamp:

10/17/16 12:43:30 (8 years ago)

Author:

bwerth

Message:

#2684 changed recursions to queue structures

Location:

branches/ItemTreeViews/3.3

Files:

• .vs/HeuristicLab.ItemTreeViews.Views-3.3/v14/.suo (modified) (previous)
• Plugin.cs (modified) (1 diff)
• Plugin.cs.frame (added)
• Properties/AssemblyInfo.cs (modified) (3 diffs)
• Properties/AssemblyInfo.cs.frame (added)
• Views/ItemCollectionTreeView.cs (modified) (28 diffs)

branches/ItemTreeViews/3.3/Plugin.cs

@@ -23 +23 @@
 
 namespace HeuristicLab.ItemTreeViews.Views {
-  [Plugin("HeuristicLab.ItemTreeViews.Views", "3.3.14.14195")]
+  [Plugin("HeuristicLab.ItemTreeViews.Views", "3.3.14.14335")]
   [PluginFile("HeuristicLab.ItemTreeViews.Views-3.3.dll", PluginFileType.Assembly)]
-  [PluginDependency("HeuristicLab.Collections", "3.3")]
+  [PluginDependency("HeuristicLab.Collections", "3.3")] 
   [PluginDependency("HeuristicLab.Common", "3.3")]
   [PluginDependency("HeuristicLab.Common.Resources", "3.3")]
-  [PluginDependency("HeuristicLab.Core", "3.3")]
+  [PluginDependency("HeuristicLab.Core", "3.3")] 
   [PluginDependency("HeuristicLab.Core.Views", "3.3")]
-  [PluginDependency("HeuristicLab.MainForm", "3.3")]
-  [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")]
+  [PluginDependency("HeuristicLab.MainForm", "3.3")] 
+  [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")]     
   public class Plugin : PluginBase {
   }

branches/ItemTreeViews/3.3/Properties/AssemblyInfo.cs

@@ -21 +21 @@
 
 using System.Reflection;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
@@ -26 +27 @@
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("HeuristicLab.ItemTreeViews.Views")]
+[assembly: AssemblyTitle("HeuristicLab.Problems.TestFunctions.MultiObjective")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
@@ -54 +55 @@
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("3.3.0.0")]
-[assembly: AssemblyFileVersion("3.3.14.14195")]
+[assembly: AssemblyFileVersion("3.3.14.14335")]

branches/ItemTreeViews/3.3/Views/ItemCollectionTreeView.cs

@@ -62 +62 @@
       set { showDetailsCheckBox.Checked = value; }
     }
-
     public TreeView ItemsTreeView { get { return itemsTreeView; } }
-
     #endregion
 
@@ -72 +70 @@
       treeViewChildrenMapping = new Dictionary<T, T>();
     }
-
     protected override void Dispose(bool disposing) {
       if (disposing) {
@@ -82 +79 @@
 
     #region eventregistration
-
     protected override void DeregisterContentEvents() {
       Content.ItemsAdded -= Content_ItemsAdded;
@@ -89 +85 @@
       base.DeregisterContentEvents();
     }
-
     protected override void RegisterContentEvents() {
       DeregisterContentEvents(); //prevent multiattaching
@@ -102 +97 @@
       item.ToStringChanged -= Item_ToStringChanged;
     }
-
     protected virtual void RegisterItemEvents(T item) {
       DeregisterItemEvents(item); //prevent multiattaching
@@ -114 +108 @@
       ItemsTreeView.KeyDown -= itemsTreeView_KeyDown;
     }
-
     protected virtual void RegisterViewEvents() {
       DeregisterViewEvents(); //prevent multiattaching
@@ -132 +125 @@
       RegisterViewEvents();
       Caption += " (" + Content.GetType().Name + ")";
-
       foreach (T item in Content)
         AddTreeNodeRecursive(item, null);
@@ -138 +130 @@
       ItemsTreeView.EndUpdate();
     }
-
     #endregion
 
@@ -159 +150 @@
       }
     }
-
     protected virtual T CreateItem() {
       if (typeSelectorDialog == null) {
@@ -177 +167 @@
       return null;
     }
-
     protected virtual TreeNode CreateTreeViewNode(T item) {
       var treeViewNode = new TreeNode("noName");
@@ -197 +186 @@
     }
 
-    #region recursive adding
-
+    #region adding
     protected virtual void AddTreeNode(T item) {
-      if (item != null && !itemTreeViewItemMapping.ContainsKey(item) && treeViewChildrenMapping.ContainsKey(item)) { //create TreeNode if not exists
-        RegisterItemEvents(item);
-        var node = CreateTreeViewNode(item);
-        itemTreeViewItemMapping[item] = node;
-        var p = GetParent(item);
-        (p == null ? ItemsTreeView.Nodes : itemTreeViewItemMapping[p].Nodes).Add(node);
-      }
+      if (item == null || itemTreeViewItemMapping.ContainsKey(item) || !treeViewChildrenMapping.ContainsKey(item))
+        return;
+      RegisterItemEvents(item);
+      var node = CreateTreeViewNode(item);
+      itemTreeViewItemMapping[item] = node;
+      var p = GetParent(item);
+      (p == null ? ItemsTreeView.Nodes : itemTreeViewItemMapping[p].Nodes).Add(node);
+
 
     }
@@ -214 +203 @@
       queue.Enqueue(item);
       if (!treeViewChildrenMapping.ContainsKey(item))
-        treeViewChildrenMapping.Add(item, parent != null ? parent.Tag as T : null); //Set explicitly to null in some cases. who cares??
+        treeViewChildrenMapping.Add(item, parent != null ? parent.Tag as T : null); //Set explicitly to null in some cases
       while (queue.Count > 0 && (item = queue.Dequeue()) != null) {
         AddTreeNode(item);
         foreach (var child in ExpandTreeViewItem(item)) { //Expand queue
-          if (!treeViewChildrenMapping.ContainsKey(child)) {
+          if (!treeViewChildrenMapping.ContainsKey(child))
             treeViewChildrenMapping.Add(child, item);
-          }
           queue.Enqueue(child);
         }
       }
     }
-
-
     protected void UpdateTreeNodeRecursive(T item, TreeNode parent) {
       if (item == null) return;
       Queue<T> queue = new Queue<T>();
       queue.Enqueue(item);
-      //parent relation has to exist by now
-      //if (!treeViewChildrenMapping.ContainsKey(item))
-      //treeViewChildrenMapping.Add(item, parent != null ? parent.Tag as T : null); //Set explicitly to null in some cases. who cares??
       while (queue.Count > 0 && (item = queue.Dequeue()) != null) {
         AddTreeNode(item);
@@ -244 +227 @@
 
         foreach (var child in newChildren) { //Expand queue
-          if (!treeViewChildrenMapping.ContainsKey(child)) {
+          if (!treeViewChildrenMapping.ContainsKey(child))
             treeViewChildrenMapping.Add(child, item);
-          }
           queue.Enqueue(child);
         }
@@ -255 +237 @@
       }
     }
-
-
 
     /// <summary>
@@ -277 +257 @@
     #endregion
 
-    #region recursive removal 
-    protected virtual void RemoveTreeViewItem(TreeNode treeViewItem) {
+    #region removal 
+    private void RemoveTreeViewItem2(TreeNode treeViewItem) {
       if (treeViewItem == null) return;
       T item = treeViewItem.Tag as T;
@@ -291 +271 @@
           RemoveTreeViewItem(itemTreeViewItemMapping[node]);
       treeViewItem.Remove();
-
-    }
+    }
+
+    protected void RemoveTreeViewItem(TreeNode treeViewNode) {
+      var queue = new Queue<TreeNode>(new[] { treeViewNode });
+      treeViewNode.Remove();
+      while (queue.Count > 0) {
+        treeViewNode = queue.Dequeue();
+        T item = treeViewNode.Tag as T;
+        if (item != null) {
+          treeViewChildrenMapping.Remove(item);
+          itemTreeViewItemMapping.Remove(item);
+          DeregisterItemEvents(item);
+        }
+        var children = GetChildren(item);
+        foreach (var node in children)
+          if (node != null && itemTreeViewItemMapping.ContainsKey(node)) queue.Enqueue(itemTreeViewItemMapping[node]);
+      }
+    }
+    #endregion
+
     protected virtual void UpdateTreeViewItemImage(TreeNode treeViewNode) {
       if (treeViewNode == null) throw new ArgumentNullException();
@@ -298 +296 @@
       var i = treeViewNode.ImageIndex;
       ItemsTreeView.ImageList.Images[i] = item == null ? Common.Resources.VSImageLibrary.Nothing : item.ItemImage;
-      treeViewNode.ImageIndex = -1;
+      treeViewNode.ImageIndex = i;
       treeViewNode.SelectedImageIndex = treeViewNode.ImageIndex;
-      treeViewNode.ImageIndex = i;
     }
     protected virtual void UpdateTreeViewItemText(TreeNode treeViewNode) {
       if (treeViewNode == null) throw new ArgumentNullException();
-      T item = treeViewNode.Tag as T;
+      var item = treeViewNode.Tag as T;
       treeViewNode.Text = item == null ? "null" : item.ToString();
       treeViewNode.ToolTipText = item == null ? string.Empty : item.ItemName + ": " + item.ItemDescription;
@@ -314 +311 @@
       itemTreeViewItemMapping.TryGetValue(item, out viewItem);
       return viewItem;
-
-    }
-    #endregion
+    }
 
     #region View Events
     protected virtual void itemsTreeView_SelectedIndexChanged(object sender, EventArgs e) {
       removeButton.Enabled = (Content != null) && !Content.IsReadOnly && !ReadOnly && ItemsTreeView.SelectedNode != null;
-      if (showDetailsCheckBox.Checked) {
-        var item = ItemsTreeView.SelectedNode != null ? ItemsTreeView.SelectedNode.Tag as T : null;
-        detailsGroupBox.Enabled = true;
-        viewHost.Content = item;
-      }
+      if (!showDetailsCheckBox.Checked) return;
+      var item = ItemsTreeView.SelectedNode != null ? ItemsTreeView.SelectedNode.Tag as T : null;
+      detailsGroupBox.Enabled = true;
+      viewHost.Content = item;
     }
     protected virtual void itemsTreeView_KeyDown(object sender, KeyEventArgs e) {
       if (e.KeyCode == Keys.Delete) {
         if ((ItemsTreeView.SelectedNode != null) && !Content.IsReadOnly && !ReadOnly) {
-          //no multiselction but recursive deletion
           var selected = GetAllNodes(ItemsTreeView.SelectedNode);
           if (ItemCollection != null) ItemCollection.RemoveRange(selected.Select(i => (T)i.Tag));
           else {
             ItemsTreeView.BeginUpdate();
-            foreach (TreeNode item in selected) { Content.Remove((T)item.Tag); }
+            foreach (var item in selected) Content.Remove((T)item.Tag);
             ItemsTreeView.EndUpdate();
           }
@@ -354 +347 @@
     protected virtual void addButton_Click(object sender, EventArgs e) {
       T item = CreateItem();
-      if (item != null)
-        Content.Add(item);
+      if (item != null) Content.Add(item);
     }
     protected virtual void sortAscendingButton_Click(object sender, EventArgs e) {
       SortItemsTreeView();
     }
-    protected virtual void sortDescendingButton_Click(object sender, EventArgs e) {
-      //DO nothing for Treeview (no custom sort order)
+    protected virtual void sortDescendingButton_Click(object sender, EventArgs e) { //DO nothing for Treeview (no custom sort order possible) 
     }
     protected virtual void removeButton_Click(object sender, EventArgs e) {
@@ -395 +386 @@
       else {
         ItemsTreeView.BeginUpdate();
-        foreach (T item in e.Items) {
-          AddTreeNodeRecursive(item, null);
-        }
+        foreach (T item in e.Items) AddTreeNodeRecursive(item, null);
         RebuildTreeImageList();
         ItemsTreeView.EndUpdate();
@@ -409 +398 @@
         ItemsTreeView.BeginUpdate();
         foreach (T item in e.Items) {
-          //remove only the first matching ViewItem, because the IItem could be contained multiple times in the ItemCollection
           var treeNode = GetTreeNodeForItem(item);
           if (treeNode != null) RemoveTreeViewItem(treeNode);
-
         }
         RebuildTreeImageList();
@@ -424 +411 @@
         ItemsTreeView.BeginUpdate();
         foreach (T item in e.OldItems) {
-          //remove only the first matching ViewItem, because the IItem could be contained multiple times in the ItemCollection
           var treeNode = GetTreeNodeForItem(item);
           if (treeNode != null) RemoveTreeViewItem(treeNode);
@@ -441 +427 @@
         Invoke(new EventHandler(Item_ItemImageChanged), sender, e);
       else {
-        var item = sender as T;
-        var node = GetTreeNodeForItem(item);
-        if (node != null) { UpdateTreeViewItemImage(node); }
-
+        var node = GetTreeNodeForItem(sender as T);
+        if (node != null) UpdateTreeViewItemImage(node);
       }
     }
@@ -455 +439 @@
         if (itemNode == null) return; //nothing to remove
         var parent = itemNode.Parent;
-        //update Node
         ItemsTreeView.BeginUpdate();
-        //        if (itemNode.Nodes.Count > 0)
-        //          RemoveTreeViewItem(itemNode);
-        //        AddTreeNodeRecursive(item, parent);
         UpdateTreeNodeRecursive(item, parent);
         UpdateTreeViewItemText(itemNode);
@@ -468 +448 @@
 
     #region Helpers
-    // no sortOrder in TreeView
     protected virtual void SortItemsTreeView() {
       ItemsTreeView.Sort();
       ItemsTreeView.Sorted = true;
     }
-    // recursive image list rebuilding
     protected virtual void RebuildTreeImageList() {
       if (ItemsTreeView.ImageList == null) ItemsTreeView.ImageList = new ImageList();
@@ -502 +480 @@
     }
     private static void AddAllNodes(List<TreeNode> list, TreeNode node) {
-      if (list.Contains(node)) return;
-      list.Add(node);
-      foreach (TreeNode n in node.Nodes) {
-        AddAllNodes(list, n);
-      }
-    }
-
+      var queue = new Queue<TreeNode>(new[] { node });
+      while (queue.Count > 0) {
+        node = queue.Dequeue();
+        if (!list.Contains(node)) list.Add(node);
+        foreach (TreeNode n in node.Nodes)
+          queue.Enqueue(n);
+      }
+    }
     protected T GetParent(T child) {
       return treeViewChildrenMapping.ContainsKey(child) ? treeViewChildrenMapping[child] : null;
-    }
-    protected TreeNode GetParent(TreeNode child) {
-      return child.Parent;
     }
     private static IItem GetValue(object parent) {
@@ -522 +498 @@
             try { return prop.GetValue(parent) as IItem; }
             catch (TargetInvocationException) { }  //if getting the value is not an option (LookUpParameters,...) try other properties
-
           }
         }
@@ -528 +503 @@
       return null;
     }
-
     protected List<T> GetChildren(T parent) {
       return treeViewChildrenMapping.Where(x => x.Value == parent).Select(x => x.Key).ToList();
     }
-    private int CountAllNodes(TreeNode n) {
-      var nodes = n != null ? n.Nodes : null ?? ItemsTreeView.Nodes;
-      var res = 1;
-      foreach (var node in nodes.Cast<TreeNode>()) {
-        res += CountAllNodes(node);
-      }
-      return res;
-    }
     #endregion
   }