Changeset 6607 for branches/VRP/HeuristicLab.Problems.VehicleRouting.Views

Timestamp:

07/28/11 14:16:21 (13 years ago)

Author:

svonolfe

Message:

Merged changes from trunk (#1561) into branch (#1177)

Location:

branches/VRP/HeuristicLab.Problems.VehicleRouting.Views/3.4

Files:

• HeuristicLab.Problems.VehicleRouting.Views-3.4.csproj (modified) (1 diff)
• VRPSolutionView.Designer.cs (modified) (5 diffs)
• VRPSolutionView.cs (modified) (2 diffs)

branches/VRP/HeuristicLab.Problems.VehicleRouting.Views/3.4/HeuristicLab.Problems.VehicleRouting.Views-3.4.csproj

@@ -197 +197 @@
       <Name>HeuristicLab.MainForm-3.3</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
+      <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
+      <Name>HeuristicLab.Operators-3.3</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Optimization.Views\3.3\HeuristicLab.Optimization.Views-3.3.csproj">
       <Project>{662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}</Project>

branches/VRP/HeuristicLab.Problems.VehicleRouting.Views/3.4/VRPSolutionView.Designer.cs

@@ -29 +29 @@
       this.tabPage2 = new System.Windows.Forms.TabPage();
       this.tourGroupBox = new System.Windows.Forms.GroupBox();
-      this.tourGridView = new System.Windows.Forms.DataGridView();
+      this.valueTextBox = new System.Windows.Forms.TextBox();
       this.tabControl1.SuspendLayout();
       this.tabPage1.SuspendLayout();
       this.tabPage2.SuspendLayout();
       this.tourGroupBox.SuspendLayout();
-      ((System.ComponentModel.ISupportInitialize)(this.tourGridView)).BeginInit();
       this.SuspendLayout();
       // 
@@ -84 +83 @@
       // tourGroupBox
       // 
-      this.tourGroupBox.Controls.Add(this.tourGridView);
+      this.tourGroupBox.Controls.Add(this.valueTextBox);
       this.tourGroupBox.Dock = System.Windows.Forms.DockStyle.Fill;
       this.tourGroupBox.Location = new System.Drawing.Point(3, 3);
@@ -93 +92 @@
       this.tourGroupBox.Text = "Tour";
       // 
-      // tourGridView
+      // valueTextBox
       // 
-      this.tourGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-      this.tourGridView.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.tourGridView.Location = new System.Drawing.Point(3, 16);
-      this.tourGridView.Name = "tourGridView";
-      this.tourGridView.Size = new System.Drawing.Size(448, 364);
-      this.tourGridView.TabIndex = 0;
+      this.valueTextBox.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.valueTextBox.Location = new System.Drawing.Point(3, 16);
+      this.valueTextBox.Multiline = true;
+      this.valueTextBox.Name = "valueTextBox";
+      this.valueTextBox.Size = new System.Drawing.Size(403, 507);
+      this.valueTextBox.TabIndex = 0;
       // 
       // VRPSolutionView
@@ -112 +111 @@
       this.tabPage2.ResumeLayout(false);
       this.tourGroupBox.ResumeLayout(false);
-      ((System.ComponentModel.ISupportInitialize)(this.tourGridView)).EndInit();
       this.ResumeLayout(false);
 
@@ -124 +122 @@
     private System.Windows.Forms.TabPage tabPage2;
     private System.Windows.Forms.GroupBox tourGroupBox;
-    private System.Windows.Forms.DataGridView tourGridView;
+    private System.Windows.Forms.TextBox valueTextBox;
   }
 }

branches/VRP/HeuristicLab.Problems.VehicleRouting.Views/3.4/VRPSolutionView.cs

@@ -32 +32 @@
 namespace HeuristicLab.Problems.VehicleRouting.Views {
   [View("VRPSolution View")]
-  [Content(typeof(VRPSolution), true)]
-  public partial class VRPSolutionView : HeuristicLab.Core.Views.ItemView {
+  [Content(typeof(VRPSolution), true)] 
+  public partial class VRPSolutionView: HeuristicLab.Core.Views.ItemView {
     public new VRPSolution Content {
       get { return (VRPSolution)base.Content; }
       set { base.Content = value; }
-    }
+    } 
     
     public VRPSolutionView() {
@@ -91 +91 @@
 
     private void UpdateTourView() {
-      tourGridView.Rows.Clear();
-      tourGridView.ColumnCount = Content.ProblemInstance.Coordinates.Rows - 1;
+      StringBuilder sb = new StringBuilder();
 
       if (Content != null && Content.Solution != null) {
         foreach (Tour tour in Content.Solution.GetTours()) {
-          int row = tourGridView.Rows.Add();
-          int cell = 0;
           foreach (int city in tour.Stops) {
-            tourGridView.Rows[row].Cells[cell].Value = city;
-            cell++;
+            sb.Append(city);
+            sb.Append(" ");
           }
+          sb.AppendLine();
         }
       }
+
+      valueTextBox.Text = sb.ToString();
     }
   }