Changeset 3300 for trunk

Timestamp:

04/11/10 04:30:31 (14 years ago)

Author:

swagner

Message:

Continued work on algorithm batch processing (#947).

Location:

trunk/sources

Files:

• HeuristicLab.Optimization.Views/3.3/RunView.Designer.cs (modified) (10 diffs)
• HeuristicLab.Optimization.Views/3.3/RunView.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Run.cs (modified) (1 diff)

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

@@ -53 +53 @@
       this.nameColumnHeader = new System.Windows.Forms.ColumnHeader();
       this.valueColumnHeader = new System.Windows.Forms.ColumnHeader();
+      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);
+      this.showAlgorithmButton = new System.Windows.Forms.Button();
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
       this.parametersResultsGroupBox.SuspendLayout();
@@ -82 +83 @@
       this.parametersResultsGroupBox.Location = new System.Drawing.Point(0, 52);
       this.parametersResultsGroupBox.Name = "parametersResultsGroupBox";
-      this.parametersResultsGroupBox.Size = new System.Drawing.Size(495, 299);
+      this.parametersResultsGroupBox.Size = new System.Drawing.Size(495, 272);
       this.parametersResultsGroupBox.TabIndex = 4;
       this.parametersResultsGroupBox.TabStop = false;
@@ -100 +101 @@
       // 
       this.splitContainer.Panel2.Controls.Add(this.detailsGroupBox);
-      this.splitContainer.Size = new System.Drawing.Size(489, 280);
+      this.splitContainer.Size = new System.Drawing.Size(489, 253);
       this.splitContainer.SplitterDistance = 177;
       this.splitContainer.TabIndex = 0;
@@ -125 +126 @@
       this.listView.Name = "listView";
       this.listView.ShowItemToolTips = true;
-      this.listView.Size = new System.Drawing.Size(171, 274);
+      this.listView.Size = new System.Drawing.Size(171, 247);
       this.listView.SmallImageList = this.imageList;
       this.listView.Sorting = System.Windows.Forms.SortOrder.Ascending;
@@ -132 +133 @@
       this.listView.View = System.Windows.Forms.View.Details;
       this.listView.SelectedIndexChanged += new System.EventHandler(this.listView_SelectedIndexChanged);
+      this.listView.DoubleClick += new System.EventHandler(this.listView_DoubleClick);
+      this.listView.ItemDrag += new System.Windows.Forms.ItemDragEventHandler(this.listView_ItemDrag);
       // 
       // nameColumnHeader
@@ -140 +143 @@
       // 
       this.valueColumnHeader.Text = "Value";
+      // 
+      // 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
@@ -149 +158 @@
       this.detailsGroupBox.Location = new System.Drawing.Point(3, 3);
       this.detailsGroupBox.Name = "detailsGroupBox";
-      this.detailsGroupBox.Size = new System.Drawing.Size(302, 274);
+      this.detailsGroupBox.Size = new System.Drawing.Size(302, 247);
       this.detailsGroupBox.TabIndex = 0;
       this.detailsGroupBox.TabStop = false;
@@ -162 +171 @@
       this.viewHost.Location = new System.Drawing.Point(6, 19);
       this.viewHost.Name = "viewHost";
-      this.viewHost.Size = new System.Drawing.Size(290, 249);
+      this.viewHost.Size = new System.Drawing.Size(290, 222);
       this.viewHost.TabIndex = 0;
       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;
+      // showAlgorithmButton
+      // 
+      this.showAlgorithmButton.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
+                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.showAlgorithmButton.Location = new System.Drawing.Point(0, 330);
+      this.showAlgorithmButton.Name = "showAlgorithmButton";
+      this.showAlgorithmButton.Size = new System.Drawing.Size(495, 23);
+      this.showAlgorithmButton.TabIndex = 5;
+      this.showAlgorithmButton.Text = "&Show Algorithm";
+      this.toolTip.SetToolTip(this.showAlgorithmButton, "Show the algorithm which produced these results");
+      this.showAlgorithmButton.UseVisualStyleBackColor = true;
+      this.showAlgorithmButton.Click += new System.EventHandler(this.showAlgorithmButton_Click);
       // 
       // RunView
@@ -177 +193 @@
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
       this.Controls.Add(this.parametersResultsGroupBox);
+      this.Controls.Add(this.showAlgorithmButton);
       this.Name = "RunView";
-      this.Size = new System.Drawing.Size(495, 351);
+      this.Size = new System.Drawing.Size(495, 353);
+      this.Controls.SetChildIndex(this.showAlgorithmButton, 0);
       this.Controls.SetChildIndex(this.parametersResultsGroupBox, 0);
       this.Controls.SetChildIndex(this.descriptionLabel, 0);
@@ -205 +223 @@
     private HeuristicLab.MainForm.WindowsForms.ViewHost viewHost;
     private System.Windows.Forms.ImageList imageList;
+    private System.Windows.Forms.Button showAlgorithmButton;
 
   }

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

@@ -117 +117 @@
       }
     }
+    private void listView_DoubleClick(object sender, EventArgs e) {
+      if (listView.SelectedItems.Count == 1) {
+        IItem item = (IItem)listView.SelectedItems[0].Tag;
+        IView view = MainFormManager.CreateDefaultView(item);
+        if (view != null) view.Show();
+      }
+    }
+    private void listView_ItemDrag(object sender, ItemDragEventArgs e) {
+      ListViewItem listViewItem = (ListViewItem)e.Item;
+      IItem item = (IItem)listViewItem.Tag;
+      DataObject data = new DataObject();
+      data.SetData("Type", item.GetType());
+      data.SetData("Value", item);
+      DragDropEffects result = DoDragDrop(data, DragDropEffects.Copy | DragDropEffects.Link);
+    }
+    private void showAlgorithmButton_Click(object sender, EventArgs e) {
+      MainFormManager.CreateDefaultView(Content.Algorithm).Show();
+    }
   }
 }

trunk/sources/HeuristicLab.Optimization/3.3/Run.cs

@@ -77 +77 @@
     private void Initialize(IAlgorithm algorithm) {
       this.algorithm = algorithm;
+      this.algorithm.Runs.Clear();
       parameters = new Dictionary<string, IItem>();
       results = new Dictionary<string, IItem>();