Changeset 6485

Timestamp:

06/27/11 16:28:33 (14 years ago)

Author:

mkommend

Message:

#1555: Added remove by keystroke functionality and refactored the code.

Location:

trunk/sources/HeuristicLab.Optimization.Views/3.3

Files:

• ExperimentTreeView.Designer.cs (modified) (2 diffs)
• ExperimentTreeView.cs (modified) (11 diffs)

trunk/sources/HeuristicLab.Optimization.Views/3.3/ExperimentTreeView.Designer.cs

@@ -34 +34 @@
     private void InitializeComponent() {
       this.components = new System.ComponentModel.Container();
-      System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ExperimentTreeView));
       this.optimizersGroupBox = new System.Windows.Forms.GroupBox();
       this.splitContainer = new System.Windows.Forms.SplitContainer();
@@ -167 +166 @@
       this.optimizerTreeView.DragEnter += new System.Windows.Forms.DragEventHandler(this.optimizerTreeView_DragEnter);
       this.optimizerTreeView.DragOver += new System.Windows.Forms.DragEventHandler(this.optimizerTreeView_DragOver);
+      this.optimizerTreeView.KeyDown += new System.Windows.Forms.KeyEventHandler(this.optimizerTreeView_KeyDown);
       this.optimizerTreeView.MouseClick += new System.Windows.Forms.MouseEventHandler(this.optimizerTreeview_MouseClick);
       this.optimizerTreeView.MouseDown += new System.Windows.Forms.MouseEventHandler(this.optimizerTreeView_MouseDown);

trunk/sources/HeuristicLab.Optimization.Views/3.3/ExperimentTreeView.cs

@@ -162 +162 @@
       }
       RebuildImageList();
+      UpdateDetailsViewHost();
     }
 
@@ -219 +220 @@
       }
       RebuildImageList();
+      UpdateDetailsViewHost();
     }
     private void Optimizers_ItemsRemoved(object sender, CollectionItemsChangedEventArgs<IndexedItem<IOptimizer>> e) {
@@ -242 +244 @@
       }
       RebuildImageList();
+      UpdateDetailsViewHost();
     }
     private void Optimizers_ItemsReplaced(object sender, CollectionItemsChangedEventArgs<IndexedItem<IOptimizer>> e) {
@@ -270 +273 @@
       }
       RebuildImageList();
+      UpdateDetailsViewHost();
     }
     private void Optimizers_CollectionReset(object sender, CollectionItemsChangedEventArgs<IndexedItem<IOptimizer>> e) {
@@ -298 +302 @@
       }
       RebuildImageList();
+      UpdateDetailsViewHost();
     }
 
@@ -382 +387 @@
             else throw new NotSupportedException("Handling for specific type not implemented" + parentOptimizer.GetType());
           }
-          if (optimizerTreeView.SelectedNode != null)
-            detailsViewHost.Content = (IOptimizer)optimizerTreeView.SelectedNode.Tag;
           SetEnabledStateOfControls();
+          UpdateDetailsViewHost();
           RebuildImageList();
         }
@@ -494 +498 @@
     }
 
+    private void optimizerTreeView_KeyDown(object sender, KeyEventArgs e) {
+      if (ReadOnly) return;
+      if (optimizerTreeView.SelectedNode == null) return;
+      if (e.KeyCode != Keys.Delete) return;
+
+      var treeNode = optimizerTreeView.SelectedNode;
+      var optimizer = (IOptimizer)treeNode.Tag;
+
+      if (treeNode.Parent == null)
+        Content.Optimizers.Remove(optimizer);
+      else {
+        var batchRun = treeNode.Parent.Tag as BatchRun;
+        var experiment = treeNode.Parent.Tag as Experiment;
+        if (batchRun != null) batchRun.Optimizer = null;
+        else if (experiment != null) experiment.Optimizers.Remove(optimizer);
+        else throw new NotSupportedException("Handling for specific type not implemented" + optimizerTreeView.SelectedNode.Tag.GetType());
+      }
+      SetEnabledStateOfControls();
+      UpdateDetailsViewHost();
+      RebuildImageList();
+    }
+
     private void addButton_Click(object sender, System.EventArgs e) {
       if (typeSelectorDialog == null) {
@@ -526 +552 @@
       else experiment = (Experiment)optimizerTreeView.SelectedNode.Parent.Tag;
 
-      detailsViewHost.SuspendRepaint();
       int index = optimizerTreeView.SelectedNode.Index;
       experiment.Optimizers.Reverse(index - 1, 2);
       optimizerTreeView.SelectedNode = optimizerTreeViewMapping[optimizer].First();
-      detailsViewHost.Content = (IOptimizer)optimizerTreeView.SelectedNode.Tag;
       SetEnabledStateOfControls();
-      detailsViewHost.ResumeRepaint(true);
+      UpdateDetailsViewHost();
+      RebuildImageList();
     }
     private void moveDownButton_Click(object sender, EventArgs e) {
@@ -543 +568 @@
       experiment.Optimizers.Reverse(index, 2);
       optimizerTreeView.SelectedNode = optimizerTreeViewMapping[optimizer].First();
-      detailsViewHost.Content = (IOptimizer)optimizerTreeView.SelectedNode.Tag;
       SetEnabledStateOfControls();
-    }
-
-    private void removeButton_Click(object sender, System.EventArgs e) {
+      UpdateDetailsViewHost();
+      RebuildImageList();
+    }
+
+    private void removeButton_Click(object sender, EventArgs e) {
       var treeNode = optimizerTreeView.SelectedNode;
       var optimizer = (IOptimizer)treeNode.Tag;
@@ -561 +587 @@
       }
       SetEnabledStateOfControls();
-      detailsViewHost.Content = (IOptimizer)optimizerTreeView.SelectedNode.Tag;
+      UpdateDetailsViewHost();
+      RebuildImageList();
     }
 
@@ -577 +604 @@
 
     #region helpers
+    private void UpdateDetailsViewHost() {
+      if (optimizerTreeView.SelectedNode != null)
+        detailsViewHost.Content = (IOptimizer)optimizerTreeView.SelectedNode.Tag;
+      else
+        detailsViewHost.Content = null;
+    }
+
     private TreeNode CreateTreeNode(IOptimizer optimizer) {
       TreeNode node = new TreeNode(optimizer.ToString());