Changeset 4011 for trunk/sources/HeuristicLab.Optimization.Views/3.3

Timestamp:

07/07/10 14:36:22 (14 years ago)

Author:

mkommend

Message:

• refactored ViewHost and various views to use fewer nested controls
• added UnitTests for ContentViews to ensure proper using of the ContentAttribute
• fixed some views which could not handle null as Content

(ticket #972)

Location:

trunk/sources/HeuristicLab.Optimization.Views/3.3

Files:

• AlgorithmView.Designer.cs (modified) (6 diffs)
• AlgorithmView.cs (modified) (2 diffs)
• BatchRunView.Designer.cs (modified) (6 diffs)
• BatchRunView.cs (modified) (3 diffs)
• EngineAlgorithmView.Designer.cs (modified) (3 diffs)
• RunView.cs (modified) (2 diffs)
• UserDefinedAlgorithmView.Designer.cs (modified) (2 diffs)

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

@@ -50 +50 @@
       this.parameterCollectionView = new HeuristicLab.Core.Views.ParameterCollectionView();
       this.problemTabPage = new System.Windows.Forms.TabPage();
-      this.problemPanel = new System.Windows.Forms.Panel();
       this.problemViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
       this.openProblemButton = new System.Windows.Forms.Button();
@@ -69 +68 @@
       this.parametersTabPage.SuspendLayout();
       this.problemTabPage.SuspendLayout();
-      this.problemPanel.SuspendLayout();
       this.resultsTabPage.SuspendLayout();
       this.runsTabPage.SuspendLayout();
@@ -123 +121 @@
       // problemTabPage
       // 
-      this.problemTabPage.Controls.Add(this.problemPanel);
+      this.problemTabPage.Controls.Add(this.problemViewHost);
       this.problemTabPage.Controls.Add(this.openProblemButton);
       this.problemTabPage.Controls.Add(this.newProblemButton);
@@ -134 +132 @@
       this.problemTabPage.UseVisualStyleBackColor = true;
       // 
-      // problemPanel
-      // 
-      this.problemPanel.AllowDrop = true;
-      this.problemPanel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-                  | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
-      this.problemPanel.Controls.Add(this.problemViewHost);
-      this.problemPanel.Location = new System.Drawing.Point(6, 36);
-      this.problemPanel.Name = "problemPanel";
-      this.problemPanel.Size = new System.Drawing.Size(659, 332);
-      this.problemPanel.TabIndex = 3;
-      this.problemPanel.DragOver += new System.Windows.Forms.DragEventHandler(this.problemPanel_DragEnterOver);
-      this.problemPanel.DragDrop += new System.Windows.Forms.DragEventHandler(this.problemPanel_DragDrop);
-      this.problemPanel.DragEnter += new System.Windows.Forms.DragEventHandler(this.problemPanel_DragEnterOver);
-      // 
       // problemViewHost
       // 
+      this.problemViewHost.AllowDrop = true;
       this.problemViewHost.Content = null;
-      this.problemViewHost.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.problemViewHost.Location = new System.Drawing.Point(0, 0);
+      this.problemViewHost.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+                  | System.Windows.Forms.AnchorStyles.Left)
+                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.problemViewHost.Location = new System.Drawing.Point(6, 36);
       this.problemViewHost.Name = "problemViewHost";
       this.problemViewHost.Size = new System.Drawing.Size(659, 332);
-      this.problemViewHost.TabIndex = 0;
+      this.problemViewHost.TabIndex = 3;
       this.problemViewHost.ViewType = null;
+      this.problemViewHost.DragOver += new System.Windows.Forms.DragEventHandler(this.problemViewHost_DragEnterOver);
+      this.problemViewHost.DragDrop += new System.Windows.Forms.DragEventHandler(this.problemViewHost_DragDrop);
+      this.problemViewHost.DragEnter += new System.Windows.Forms.DragEventHandler(this.problemViewHost_DragEnterOver);
       // 
       // openProblemButton
@@ -327 +316 @@
       this.parametersTabPage.ResumeLayout(false);
       this.problemTabPage.ResumeLayout(false);
-      this.problemPanel.ResumeLayout(false);
       this.resultsTabPage.ResumeLayout(false);
       this.runsTabPage.ResumeLayout(false);
@@ -355 +343 @@
     protected System.Windows.Forms.TabPage runsTabPage;
     protected RunCollectionView runsView;
-    protected System.Windows.Forms.Panel problemPanel;
-
   }
 }

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

@@ -216 +216 @@
       Content.Prepare(false);
     }
-    protected virtual void problemPanel_DragEnterOver(object sender, DragEventArgs e) {
+    protected virtual void problemViewHost_DragEnterOver(object sender, DragEventArgs e) {
       e.Effect = DragDropEffects.None;
       Type type = e.Data.GetData("Type") as Type;
@@ -227 +227 @@
       }
     }
-    protected virtual void problemPanel_DragDrop(object sender, DragEventArgs e) {
+    protected virtual void problemViewHost_DragDrop(object sender, DragEventArgs e) {
       if (e.Effect != DragDropEffects.None) {
         IProblem problem = e.Data.GetData("Value") as IProblem;

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

@@ -48 +48 @@
       this.tabControl = new System.Windows.Forms.TabControl();
       this.algorithmTabPage = new System.Windows.Forms.TabPage();
-      this.algorithmPanel = new System.Windows.Forms.Panel();
       this.algorithmViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
       this.openAlgorithmButton = new System.Windows.Forms.Button();
@@ -66 +65 @@
       this.tabControl.SuspendLayout();
       this.algorithmTabPage.SuspendLayout();
-      this.algorithmPanel.SuspendLayout();
       this.runsTabPage.SuspendLayout();
       ((System.ComponentModel.ISupportInitialize)(this.repetitionsNumericUpDown)).BeginInit();
@@ -96 +94 @@
       // algorithmTabPage
       // 
-      this.algorithmTabPage.Controls.Add(this.algorithmPanel);
+      this.algorithmTabPage.Controls.Add(this.algorithmViewHost);
       this.algorithmTabPage.Controls.Add(this.openAlgorithmButton);
       this.algorithmTabPage.Controls.Add(this.newAlgorithmButton);
@@ -107 +105 @@
       this.algorithmTabPage.UseVisualStyleBackColor = true;
       // 
-      // algorithmPanel
-      // 
-      this.algorithmPanel.AllowDrop = true;
-      this.algorithmPanel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+      // algorithmViewHost
+      // 
+      this.algorithmViewHost.Content = null;
+      this.algorithmViewHost.AllowDrop = true;
+      this.algorithmViewHost.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
                   | System.Windows.Forms.AnchorStyles.Left)
                   | System.Windows.Forms.AnchorStyles.Right)));
-      this.algorithmPanel.Controls.Add(this.algorithmViewHost);
-      this.algorithmPanel.Location = new System.Drawing.Point(6, 36);
-      this.algorithmPanel.Name = "algorithmPanel";
-      this.algorithmPanel.Size = new System.Drawing.Size(659, 306);
-      this.algorithmPanel.TabIndex = 3;
-      this.algorithmPanel.DragOver += new System.Windows.Forms.DragEventHandler(this.algorithmPanel_DragEnterOver);
-      this.algorithmPanel.DragDrop += new System.Windows.Forms.DragEventHandler(this.algorithmPanel_DragDrop);
-      this.algorithmPanel.DragEnter += new System.Windows.Forms.DragEventHandler(this.algorithmPanel_DragEnterOver);
-      // 
-      // algorithmViewHost
-      // 
-      this.algorithmViewHost.Content = null;
-      this.algorithmViewHost.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.algorithmViewHost.Location = new System.Drawing.Point(0, 0);
+      this.algorithmViewHost.Location = new System.Drawing.Point(6, 36);
       this.algorithmViewHost.Name = "algorithmViewHost";
       this.algorithmViewHost.Size = new System.Drawing.Size(659, 306);
-      this.algorithmViewHost.TabIndex = 0;
+      this.algorithmViewHost.TabIndex = 3;
       this.algorithmViewHost.ViewType = null;
+      this.algorithmViewHost.DragOver += new System.Windows.Forms.DragEventHandler(this.algorithmViewHost_DragEnterOver);
+      this.algorithmViewHost.DragDrop += new System.Windows.Forms.DragEventHandler(this.algorithmViewHost_DragDrop);
+      this.algorithmViewHost.DragEnter += new System.Windows.Forms.DragEventHandler(this.algorithmViewHost_DragEnterOver);
       // 
       // openAlgorithmButton
@@ -317 +306 @@
       this.tabControl.ResumeLayout(false);
       this.algorithmTabPage.ResumeLayout(false);
-      this.algorithmPanel.ResumeLayout(false);
       this.runsTabPage.ResumeLayout(false);
       ((System.ComponentModel.ISupportInitialize)(this.repetitionsNumericUpDown)).EndInit();
@@ -342 +330 @@
     private RunCollectionView runsView;
     private System.Windows.Forms.Button pauseButton;
-    private System.Windows.Forms.Panel algorithmPanel;
-
   }
 }

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

@@ -140 +140 @@
     }
     private void repetitionsNumericUpDown_ValueChanged(object sender, EventArgs e) {
-      Content.Repetitions = (int)repetitionsNumericUpDown.Value;
+      if (Content != null)
+        Content.Repetitions = (int)repetitionsNumericUpDown.Value;
     }
     private void newAlgorithmButton_Click(object sender, EventArgs e) {
@@ -197 +198 @@
       Content.Prepare(false);
     }
-    private void algorithmPanel_DragEnterOver(object sender, DragEventArgs e) {
+    private void algorithmViewHost_DragEnterOver(object sender, DragEventArgs e) {
       e.Effect = DragDropEffects.None;
       if (ReadOnly)
@@ -210 +211 @@
       }
     }
-    private void algorithmPanel_DragDrop(object sender, DragEventArgs e) {
+    private void algorithmViewHost_DragDrop(object sender, DragEventArgs e) {
       if (e.Effect != DragDropEffects.None) {
         IAlgorithm algorithm = e.Data.GetData("Value") as IAlgorithm;

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

@@ -58 +58 @@
       this.resultsTabPage.SuspendLayout();
       this.runsTabPage.SuspendLayout();
-      this.problemPanel.SuspendLayout();
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
       this.engineTabPage.SuspendLayout();
@@ -148 +147 @@
       // problemPanel
       // 
-      this.problemPanel.Size = new System.Drawing.Size(693, 399);
+      this.problemViewHost.Size = new System.Drawing.Size(693, 399);
       // 
       // nameTextBox
@@ -276 +275 @@
       this.resultsTabPage.ResumeLayout(false);
       this.runsTabPage.ResumeLayout(false);
-      this.problemPanel.ResumeLayout(false);
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
       this.engineTabPage.ResumeLayout(false);

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

@@ -103 +103 @@
     }
 
+    private string selectedName;
     private void FillListView() {
-      string selectedName = null;
       if (listView.SelectedItems.Count == 1) selectedName = listView.SelectedItems[0].SubItems[0].Text;
 
@@ -117 +117 @@
           for (int i = 0; i < listView.Columns.Count; i++)
             listView.Columns[i].AutoResize(ColumnHeaderAutoResizeStyle.ColumnContent);
+          selectedName = null;
         }
       }

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

@@ -54 +54 @@
       this.resultsTabPage.SuspendLayout();
       this.runsTabPage.SuspendLayout();
-      this.problemPanel.SuspendLayout();
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
       this.globalScopeTabPage.SuspendLayout();
@@ -152 +151 @@
       this.resultsTabPage.ResumeLayout(false);
       this.runsTabPage.ResumeLayout(false);
-      this.problemPanel.ResumeLayout(false);
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
       this.globalScopeTabPage.ResumeLayout(false);