Changeset 3505

Timestamp:

04/23/10 02:22:48 (14 years ago)

Author:

swagner

Message:

Implemented reviewers' comments (#893)

Location:

trunk/sources

Files:

• HeuristicLab.Optimization.Views/3.3/AlgorithmView.Designer.cs (modified) (3 diffs)
• HeuristicLab.Optimization.Views/3.3/EngineAlgorithmView.Designer.cs (modified) (6 diffs)
• HeuristicLab.Optimization.Views/3.3/RunCollectionView.cs (modified) (1 diff)
• HeuristicLab.Optimization.Views/3.3/UserDefinedAlgorithmView.Designer.cs (modified) (4 diffs)
• HeuristicLab.Problems.TravelingSalesman.Views/3.3/TravelingSalesmanProblemView.Designer.cs (modified) (4 diffs)

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

@@ -89 +89 @@
                   | System.Windows.Forms.AnchorStyles.Left)
                   | System.Windows.Forms.AnchorStyles.Right)));
+      this.tabControl.Controls.Add(this.problemTabPage);
       this.tabControl.Controls.Add(this.parametersTabPage);
-      this.tabControl.Controls.Add(this.problemTabPage);
       this.tabControl.Controls.Add(this.resultsTabPage);
       this.tabControl.Controls.Add(this.runsTabPage);
@@ -106 +106 @@
       this.parametersTabPage.Padding = new System.Windows.Forms.Padding(3);
       this.parametersTabPage.Size = new System.Drawing.Size(671, 374);
-      this.parametersTabPage.TabIndex = 0;
+      this.parametersTabPage.TabIndex = 1;
       this.parametersTabPage.Text = "Parameters";
       this.parametersTabPage.UseVisualStyleBackColor = true;
@@ -131 +131 @@
       this.problemTabPage.Padding = new System.Windows.Forms.Padding(3);
       this.problemTabPage.Size = new System.Drawing.Size(671, 374);
-      this.problemTabPage.TabIndex = 1;
+      this.problemTabPage.TabIndex = 0;
       this.problemTabPage.Text = "Problem";
       this.problemTabPage.UseVisualStyleBackColor = true;

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

@@ -45 +45 @@
     /// </summary>
     private void InitializeComponent() {
-      System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(EngineAlgorithmView));
       this.engineLabel = new System.Windows.Forms.Label();
       this.createUserDefinedAlgorithmButton = new System.Windows.Forms.Button();
@@ -75 +74 @@
       this.tabControl.Controls.SetChildIndex(this.runsTabPage, 0);
       this.tabControl.Controls.SetChildIndex(this.resultsTabPage, 0);
+      this.tabControl.Controls.SetChildIndex(this.parametersTabPage, 0);
       this.tabControl.Controls.SetChildIndex(this.problemTabPage, 0);
-      this.tabControl.Controls.SetChildIndex(this.parametersTabPage, 0);
       // 
       // parametersTabPage
@@ -191 +190 @@
       this.engineComboBox.Location = new System.Drawing.Point(55, 6);
       this.engineComboBox.Name = "engineComboBox";
-      this.engineComboBox.Size = new System.Drawing.Size(610, 21);
+      this.engineComboBox.Size = new System.Drawing.Size(644, 21);
       this.engineComboBox.TabIndex = 1;
       this.engineComboBox.SelectedIndexChanged += new System.EventHandler(this.engineComboBox_SelectedIndexChanged);
@@ -204 +203 @@
       this.engineTabPage.Padding = new System.Windows.Forms.Padding(3);
       this.engineTabPage.Size = new System.Drawing.Size(705, 441);
-      this.engineTabPage.TabIndex = 3;
+      this.engineTabPage.TabIndex = 5;
       this.engineTabPage.Text = "Engine";
       this.engineTabPage.UseVisualStyleBackColor = true;
@@ -213 +212 @@
                   | System.Windows.Forms.AnchorStyles.Left)
                   | System.Windows.Forms.AnchorStyles.Right)));
+      this.engineViewHost.Caption = null;
       this.engineViewHost.Content = null;
       this.engineViewHost.Location = new System.Drawing.Point(6, 33);
       this.engineViewHost.Name = "engineViewHost";
       this.engineViewHost.ReadOnly = false;
-      this.engineViewHost.Size = new System.Drawing.Size(659, 335);
+      this.engineViewHost.Size = new System.Drawing.Size(693, 402);
       this.engineViewHost.TabIndex = 2;
       this.engineViewHost.ViewType = null;
@@ -260 +260 @@
                   | System.Windows.Forms.AnchorStyles.Left)
                   | System.Windows.Forms.AnchorStyles.Right)));
+      this.operatorGraphViewHost.Caption = null;
       this.operatorGraphViewHost.Content = null;
       this.operatorGraphViewHost.Location = new System.Drawing.Point(3, 33);
       this.operatorGraphViewHost.Name = "operatorGraphViewHost";
       this.operatorGraphViewHost.ReadOnly = true;
-      this.operatorGraphViewHost.Size = new System.Drawing.Size(699, 405);
+      this.operatorGraphViewHost.Size = new System.Drawing.Size(665, 338);
       this.operatorGraphViewHost.TabIndex = 0;
       this.operatorGraphViewHost.ViewType = null;

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

@@ -47 +47 @@
       InitializeComponent();
       Caption = "Run Collection";
+      itemsGroupBox.Text = "Runs";
     }
 

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

@@ -48 +48 @@
       this.globalScopeView = new HeuristicLab.Core.Views.ScopeView();
       this.engineTabPage.SuspendLayout();
+      this.operatorGraphTabPage.SuspendLayout();
       this.tabControl.SuspendLayout();
       this.parametersTabPage.SuspendLayout();
@@ -64 +65 @@
       this.createUserDefinedAlgorithmButton.Visible = false;
       // 
+      // engineComboBox
+      // 
+      this.engineComboBox.Size = new System.Drawing.Size(644, 21);
+      // 
+      // engineViewHost
+      // 
+      this.engineViewHost.Size = new System.Drawing.Size(693, 402);
+      // 
+      // openOperatorGraphButton
+      // 
+      this.toolTip.SetToolTip(this.openOperatorGraphButton, "Open Operator Graph");
+      // 
+      // newOperatorGraphButton
+      // 
+      this.toolTip.SetToolTip(this.newOperatorGraphButton, "New Operator Graph");
+      // 
       // tabControl
       // 
       this.tabControl.Controls.Add(this.globalScopeTabPage);
+      this.tabControl.Controls.SetChildIndex(this.engineTabPage, 0);
       this.tabControl.Controls.SetChildIndex(this.globalScopeTabPage, 0);
       this.tabControl.Controls.SetChildIndex(this.operatorGraphTabPage, 0);
       this.tabControl.Controls.SetChildIndex(this.runsTabPage, 0);
       this.tabControl.Controls.SetChildIndex(this.resultsTabPage, 0);
-      this.tabControl.Controls.SetChildIndex(this.engineTabPage, 0);
+      this.tabControl.Controls.SetChildIndex(this.parametersTabPage, 0);
       this.tabControl.Controls.SetChildIndex(this.problemTabPage, 0);
-      this.tabControl.Controls.SetChildIndex(this.parametersTabPage, 0);
       // 
       // newProblemButton
@@ -110 +127 @@
       this.globalScopeTabPage.Name = "globalScopeTabPage";
       this.globalScopeTabPage.Size = new System.Drawing.Size(705, 441);
-      this.globalScopeTabPage.TabIndex = 3;
+      this.globalScopeTabPage.TabIndex = 6;
       this.globalScopeTabPage.Text = "Global Scope";
       this.globalScopeTabPage.UseVisualStyleBackColor = true;
@@ -134 +151 @@
       this.engineTabPage.ResumeLayout(false);
       this.engineTabPage.PerformLayout();
+      this.operatorGraphTabPage.ResumeLayout(false);
       this.tabControl.ResumeLayout(false);
       this.parametersTabPage.ResumeLayout(false);

trunk/sources/HeuristicLab.Problems.TravelingSalesman.Views/3.3/TravelingSalesmanProblemView.Designer.cs

@@ -70 +70 @@
       // importButton
       // 
-      this.importButton.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
+      this.importButton.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
                   | System.Windows.Forms.AnchorStyles.Right)));
-      this.importButton.Location = new System.Drawing.Point(0, 399);
+      this.importButton.Location = new System.Drawing.Point(0, 52);
       this.importButton.Name = "importButton";
       this.importButton.Size = new System.Drawing.Size(529, 23);
-      this.importButton.TabIndex = 5;
+      this.importButton.TabIndex = 4;
       this.importButton.Text = "&Import from TSPLIB";
       this.importButton.UseVisualStyleBackColor = true;
@@ -87 +87 @@
       this.tabControl.Controls.Add(this.parametersTabPage);
       this.tabControl.Controls.Add(this.visualizationTabPage);
-      this.tabControl.Location = new System.Drawing.Point(0, 52);
+      this.tabControl.Location = new System.Drawing.Point(0, 81);
       this.tabControl.Name = "tabControl";
       this.tabControl.SelectedIndex = 0;
       this.tabControl.Size = new System.Drawing.Size(529, 341);
-      this.tabControl.TabIndex = 4;
+      this.tabControl.TabIndex = 5;
       // 
       // parametersTabPage
@@ -113 +113 @@
       this.parameterCollectionView.Location = new System.Drawing.Point(6, 6);
       this.parameterCollectionView.Name = "parameterCollectionView";
+      this.parameterCollectionView.ReadOnly = false;
       this.parameterCollectionView.Size = new System.Drawing.Size(509, 303);
       this.parameterCollectionView.TabIndex = 0;
@@ -136 +137 @@
       this.pathTSPTourView.Location = new System.Drawing.Point(6, 6);
       this.pathTSPTourView.Name = "pathTSPTourView";
+      this.pathTSPTourView.ReadOnly = false;
       this.pathTSPTourView.Size = new System.Drawing.Size(509, 303);
       this.pathTSPTourView.TabIndex = 0;