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

Timestamp:

11/19/10 15:43:21 (14 years ago)

Author:

svonolfe

Message:

Merged changes from trunk into branch (#1177)

Location:

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

Files:

• HeuristicLab.Problems.VehicleRouting.Views-3.4.csproj (modified) (1 diff)
• VRPImportDialog.Designer.cs (added)
• VRPImportDialog.cs (added)
• VehicleRoutingProblemView.Designer.cs (modified) (4 diffs)
• VehicleRoutingProblemView.cs (modified) (3 diffs)

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

@@ -125 +125 @@
       <DependentUpon>SingleDepotVRPView.cs</DependentUpon>
     </Compile>
+    <Compile Include="VRPImportDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="VRPImportDialog.Designer.cs">
+      <DependentUpon>VRPImportDialog.cs</DependentUpon>
+    </Compile>
     <Compile Include="VRPProblemInstanceView.cs">
       <SubType>UserControl</SubType>

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

@@ -25 +25 @@
     private void InitializeComponent() {
       this.importButton = new System.Windows.Forms.Button();
-      this.importButton2 = new System.Windows.Forms.Button();
-      this.importButton3 = new System.Windows.Forms.Button();
       this.parameterCollectionView = new HeuristicLab.Core.Views.ParameterCollectionView();
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
@@ -38 +36 @@
       // importButton
       // 
+      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, 55);
       this.importButton.Name = "importButton";
-      this.importButton.Size = new System.Drawing.Size(139, 23);
+      this.importButton.Size = new System.Drawing.Size(490, 23);
       this.importButton.TabIndex = 5;
-      this.importButton.Text = "Import from Solomon";
+      this.importButton.Text = "Import";
       this.importButton.UseVisualStyleBackColor = true;
       this.importButton.Click += new System.EventHandler(this.importButton_Click);
-      // 
-      // importButton2
-      // 
-      this.importButton2.Location = new System.Drawing.Point(145, 55);
-      this.importButton2.Name = "importButton2";
-      this.importButton2.Size = new System.Drawing.Size(126, 23);
-      this.importButton2.TabIndex = 7;
-      this.importButton2.Text = "Import from TSPLib";
-      this.importButton2.UseVisualStyleBackColor = true;
-      this.importButton2.Click += new System.EventHandler(this.importButton2_Click);
-      // 
-      // importButton3
-      // 
-      this.importButton3.Location = new System.Drawing.Point(277, 55);
-      this.importButton3.Name = "importButton3";
-      this.importButton3.Size = new System.Drawing.Size(131, 23);
-      this.importButton3.TabIndex = 8;
-      this.importButton3.Text = "Import from ORLib";
-      this.importButton3.UseVisualStyleBackColor = true;
-      this.importButton3.Click += new System.EventHandler(this.importButton3_Click);
       // 
       // parameterCollectionView
@@ -83 +63 @@
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.Controls.Add(this.parameterCollectionView);
-      this.Controls.Add(this.importButton3);
-      this.Controls.Add(this.importButton2);
       this.Controls.Add(this.importButton);
       this.Name = "VehicleRoutingProblemView";
       this.Size = new System.Drawing.Size(490, 352);
       this.Controls.SetChildIndex(this.importButton, 0);
-      this.Controls.SetChildIndex(this.importButton2, 0);
-      this.Controls.SetChildIndex(this.importButton3, 0);
+      this.Controls.SetChildIndex(this.parameterCollectionView, 0);
       this.Controls.SetChildIndex(this.nameTextBox, 0);
       this.Controls.SetChildIndex(this.nameLabel, 0);
       this.Controls.SetChildIndex(this.descriptionLabel, 0);
       this.Controls.SetChildIndex(this.descriptionTextBox, 0);
-      this.Controls.SetChildIndex(this.parameterCollectionView, 0);
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
       this.ResumeLayout(false);
@@ -105 +81 @@
 
     private System.Windows.Forms.Button importButton;
-    private System.Windows.Forms.Button importButton2;
-    private System.Windows.Forms.Button importButton3;
     private Core.Views.ParameterCollectionView parameterCollectionView;
   }

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

@@ -26 +26 @@
 using HeuristicLab.Core.Views;
 using HeuristicLab.Core;
+using HeuristicLab.PluginInfrastructure;
 
 namespace HeuristicLab.Problems.VehicleRouting.Views {
@@ -31 +32 @@
   [Content(typeof(VehicleRoutingProblem), true)]
   public partial class VehicleRoutingProblemView : NamedItemView {
+    private VRPImportDialog vrpImportDialog; 
+
     public new VehicleRoutingProblem Content {
       get { return (VehicleRoutingProblem)base.Content; }
@@ -59 +62 @@
       base.SetEnabledStateOfControls();
       parameterCollectionView.Enabled = Content != null;
-      importButton.Enabled = importButton2.Enabled = importButton3.Enabled = Content != null && !ReadOnly;
+      importButton.Enabled = Content != null && !ReadOnly;
     }
 
     private void importButton_Click(object sender, EventArgs e) {
-      OpenFileDialog dialog = new OpenFileDialog();
-      dialog.Filter = "Solomon files (*.txt)|*.txt";
+      if (vrpImportDialog == null) vrpImportDialog = new VRPImportDialog();
 
-      if (dialog.ShowDialog() == DialogResult.OK) {
-        Content.ImportFromSolomon(dialog.FileName);
+      if (vrpImportDialog.ShowDialog(this) == DialogResult.OK) {
+        try {
+          switch (vrpImportDialog.Format) {
+            case VRPFormat.TSPLib:
+              Content.ImportFromTSPLib(vrpImportDialog.VRPFileName);
+              break;
+
+            case VRPFormat.Solomon:
+              Content.ImportFromSolomon(vrpImportDialog.VRPFileName);
+              break;
+
+            case VRPFormat.ORLib:
+              Content.ImportFromORLib(vrpImportDialog.VRPFileName);
+              break;
+          }
+
+          if (!string.IsNullOrEmpty(vrpImportDialog.TourFileName))
+            Content.ImportSolution(vrpImportDialog.TourFileName); 
+        }
+        catch (Exception ex) {
+          ErrorHandling.ShowErrorDialog(this, ex);
+        }
       }
-    }
-
-    private void importButton2_Click(object sender, EventArgs e) {
-      OpenFileDialog dialog = new OpenFileDialog();
-      dialog.Filter = "TSPLib files (*.vrp)|*.vrp";
-
-      if (dialog.ShowDialog() == DialogResult.OK) {
-        Content.ImportFromTSPLib(dialog.FileName);
-      }
-    }
-
-    private void importButton3_Click(object sender, EventArgs e) {
-      OpenFileDialog dialog = new OpenFileDialog();
-      dialog.Filter = "ORLib files (*.txt)|*.txt";
-
-      if (dialog.ShowDialog() == DialogResult.OK) {
-        Content.ImportFromORLib(dialog.FileName);
-      }
-    }    
+    }  
   }
 }