Changeset 6526 for trunk/sources

Timestamp:

07/07/11 01:15:31 (13 years ago)

Author:

mkommend

Message:

#1555: Enabled editing of node labels and optimized drag over method.

Location:

trunk/sources/HeuristicLab.Optimization.Views/3.3

Files:

• ExperimentTreeView.Designer.cs (modified) (6 diffs)
• ExperimentTreeView.cs (modified) (5 diffs)

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

@@ -49 +49 @@
       this.ExpandToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
       this.CollapseToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+      this.EditNodeLabelToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
       this.toolTip = new System.Windows.Forms.ToolTip(this.components);
       this.optimizersGroupBox.SuspendLayout();
@@ -162 +163 @@
       this.treeView.ImageIndex = 0;
       this.treeView.ImageList = this.imageList;
+      this.treeView.LabelEdit = true;
       this.treeView.Location = new System.Drawing.Point(4, 34);
       this.treeView.Name = "optimizerTreeView";
@@ -167 +169 @@
       this.treeView.Size = new System.Drawing.Size(191, 402);
       this.treeView.TabIndex = 10;
+      this.treeView.AfterLabelEdit += new System.Windows.Forms.NodeLabelEditEventHandler(treeView_AfterLabelEdit);
+      this.treeView.BeforeLabelEdit += new System.Windows.Forms.NodeLabelEditEventHandler(treeView_BeforeLabelEdit);
       this.treeView.ItemDrag += new System.Windows.Forms.ItemDragEventHandler(this.optimizerTreeView_ItemDrag);
       this.treeView.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.optimizerTreeview_NodeMouseClick);
@@ -215 +219 @@
       // 
       this.contextMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.EditNodeLabelToolStripMenuItem,
             this.ExpandToolStripMenuItem,
             this.CollapseToolStripMenuItem});
@@ -233 +238 @@
       this.CollapseToolStripMenuItem.Text = "Collapse";
       this.CollapseToolStripMenuItem.Click += new System.EventHandler(this.CollapseToolStripMenuItem_Click);
+      //
+      // EditNodeLabelToolStripMenuItem
+      //
+      this.EditNodeLabelToolStripMenuItem.Name = "EditNodeLabelToolStripMenuItem";
+      this.EditNodeLabelToolStripMenuItem.Size = new System.Drawing.Size(119, 22);
+      this.EditNodeLabelToolStripMenuItem.Text = "Edit Name";
+      this.EditNodeLabelToolStripMenuItem.Click += new System.EventHandler(this.EditNodeLabelToolStripMenuItem_Click);
+
       // 
       // ExperimentTreeView
@@ -268 +281 @@
     private System.Windows.Forms.ToolStripMenuItem ExpandToolStripMenuItem;
     private System.Windows.Forms.ToolStripMenuItem CollapseToolStripMenuItem;
+    private System.Windows.Forms.ToolStripMenuItem EditNodeLabelToolStripMenuItem;
 
   }

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

@@ -454 +454 @@
             else throw new NotSupportedException("Handling for specific type not implemented" + parentOptimizer.GetType());
           }
-          SetEnabledStateOfControls();
-          UpdateDetailsViewHost();
-          RebuildImageList();
         }
       }
@@ -493 +490 @@
           if (optimizer == null) return;
           if (batchRun.Optimizer != null) return;
-          if (optimizer.GetObjectGraphObjects().OfType<IOptimizer>().Contains(batchRun)) return;
+          if (optimizer.NestedOptimizers.Contains(batchRun)) return;
         }
 
@@ -503 +500 @@
           if (enumerable != null) optimizers = enumerable.Cast<IOptimizer>();
 
-          if (optimizer != null && optimizer.GetObjectGraphObjects().OfType<IOptimizer>().Contains(experiment)) return;
-          if (optimizers != null && optimizers.GetObjectGraphObjects().OfType<IOptimizer>().Contains(experiment)) return;
+          if (optimizer != null && optimizer.NestedOptimizers.Contains(experiment)) return;
+          if (optimizers != null && optimizers.Any(x => x.NestedOptimizers.Contains(experiment))) return;
         }
 
@@ -611 +608 @@
         CollapseToolStripMenuItem.Enabled = toolStripMenuNode.IsExpanded;
         CollapseToolStripMenuItem.Visible = toolStripMenuNode.IsExpanded;
+        EditNodeLabelToolStripMenuItem.Enabled = toolStripMenuNode.Tag != null && toolStripMenuNode.Tag is INamedItem;
+        EditNodeLabelToolStripMenuItem.Visible = toolStripMenuNode.Tag != null && toolStripMenuNode.Tag is INamedItem;
         if (contextMenuStrip.Items.Cast<ToolStripMenuItem>().Any(item => item.Enabled))
           contextMenuStrip.Show(Cursor.Position);
@@ -621 +620 @@
     private void CollapseToolStripMenuItem_Click(object sender, EventArgs e) {
       if (toolStripMenuNode != null) toolStripMenuNode.Collapse();
+    }
+    private void EditNodeLabelToolStripMenuItem_Click(object sender, EventArgs e) {
+      if (toolStripMenuNode != null) {
+        if (!toolStripMenuNode.IsEditing) toolStripMenuNode.BeginEdit();
+      }
+    }
+
+
+    private void treeView_BeforeLabelEdit(object sender, NodeLabelEditEventArgs e) {
+      if (e.Node.Tag == null || !(e.Node.Tag is INamedItem)) {
+        e.CancelEdit = true;
+        return;
+      }
+    }
+    private void treeView_AfterLabelEdit(object sender, NodeLabelEditEventArgs e) {
+      if (e.Label == null) return;
+
+      e.Node.EndEdit(false);
+      var namedItem = (INamedItem)e.Node.Tag;
+      namedItem.Name = e.Label;
     }