Changeset 10000 for trunk/sources/HeuristicLab.Problems.Instances.VehicleRouting.Views/3.4

Timestamp:

09/24/13 11:49:28 (11 years ago)

Author:

jkarder

Message:

#2110: refactored ProblemInstanceProviderViews

Location:

trunk/sources/HeuristicLab.Problems.Instances.VehicleRouting.Views/3.4

Files:

• HeuristicLab.Problems.Instances.VehicleRouting.Views-3.4.csproj (modified) (3 diffs)
• VRPInstanceProviderView.cs (moved) (moved from trunk/sources/HeuristicLab.Problems.Instances.VehicleRouting.Views/3.4/VRPInstanceConsumerView.cs) (4 diffs)
• VRPInstanceProviderView.designer.cs (moved) (moved from trunk/sources/HeuristicLab.Problems.Instances.VehicleRouting.Views/3.4/VRPInstanceConsumerView.designer.cs)

trunk/sources/HeuristicLab.Problems.Instances.VehicleRouting.Views/3.4/HeuristicLab.Problems.Instances.VehicleRouting.Views-3.4.csproj

@@ -115 +115 @@
     <Compile Include="Plugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="VRPInstanceConsumerView.cs">
+    <Compile Include="VRPInstanceProviderView.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="VRPInstanceConsumerView.designer.cs">
-      <DependentUpon>VRPInstanceConsumerView.cs</DependentUpon>
+    <Compile Include="VRPInstanceProviderView.designer.cs">
+      <DependentUpon>VRPInstanceProviderView.cs</DependentUpon>
     </Compile>
     <Compile Include="VRPImportDialog.cs">
@@ -182 +182 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-   <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
 set ProjectDir=$(ProjectDir)
 set SolutionDir=$(SolutionDir)
@@ -188 +188 @@
 
 call PreBuildEvent.cmd</PreBuildEvent>
-<PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
 export ProjectDir=$(ProjectDir)
 export SolutionDir=$(SolutionDir)

trunk/sources/HeuristicLab.Problems.Instances.VehicleRouting.Views/3.4/VRPInstanceProviderView.cs

@@ -24 +24 @@
 using System.Windows.Forms;
 using HeuristicLab.MainForm;
-using HeuristicLab.MainForm.WindowsForms;
 using HeuristicLab.PluginInfrastructure;
 using HeuristicLab.Problems.Instances.Views;
@@ -30 +29 @@
 namespace HeuristicLab.Problems.Instances.VehicleRouting.Views {
   [View("VRP InstanceProvider View")]
-  [Content(typeof(IProblemInstanceConsumer<IVRPData>), IsDefaultView = true)]
-  public partial class VRPInstanceProviderView<T> : ProblemInstanceConsumerViewGeneric<T> where T : class, IVRPData {
-
-    public new IProblemInstanceConsumer<T> Content {
-      get { return (IProblemInstanceConsumer<T>)base.Content; }
-      set { base.Content = value; }
-    }
+  [Content(typeof(IProblemInstanceProvider<IVRPData>), IsDefaultView = true)]
+  public partial class VRPInstanceProviderView<T> : ProblemInstanceProviderViewGeneric<T> where T : class, IVRPData {
 
     public VRPInstanceProviderView() {
@@ -42 +36 @@
     }
 
-    protected override void SetEnabledStateOfControls() {
-      problemInstanceProviderComboBox.Enabled = !ReadOnly && !Locked && Content != null && problemInstanceProviderComboBox.Items.Count > 0;
-      libraryInfoButton.Enabled = SelectedProvider != null && SelectedProvider.WebLink != null;
-      IVRPInstanceProvider provider = SelectedProvider as IVRPInstanceProvider;
-      importButton.Enabled = !ReadOnly && !Locked && Content != null && Consumer != null &&
-                             provider != null && provider.CanImportData;
-      ProviderImportSplitContainer.Panel2Collapsed = !importButton.Enabled;
-      exportButton.Enabled = !ReadOnly && !Locked && Content != null && Exporter != null &&
-                             provider != null && provider.CanExportData;
-      ProviderExportSplitContainer.Panel2Collapsed = !exportButton.Enabled;
-    }
-
     protected override void importButton_Click(object sender, EventArgs e) {
-      IVRPInstanceProvider provider = SelectedProvider as IVRPInstanceProvider;
+      var provider = Content as IVRPInstanceProvider;
       if (provider != null) {
-        using (var dialog = new VRPImportDialog(SelectedProvider.Name)) {
+        using (var dialog = new VRPImportDialog(Content.Name)) {
           if (dialog.ShowDialog() == DialogResult.OK) {
             var instance = provider.Import(dialog.VRPFileName, dialog.TourFileName);
             try {
               GenericConsumer.Load(instance as T);
-            }
-            catch (Exception ex) {
+              instancesComboBox.SelectedIndex = -1;
+            } catch (Exception ex) {
               MessageBox.Show(String.Format("This problem does not support loading the instance {0}: {1}", Path.GetFileName(openFileDialog.FileName), Environment.NewLine + ex.Message), "Cannot load instance");
             }
@@ -72 +54 @@
 
     protected override void exportButton_Click(object sender, EventArgs e) {
-      IVRPInstanceProvider provider = SelectedProvider as IVRPInstanceProvider;
+      var provider = Content as IVRPInstanceProvider;
       if (provider != null) {
         if (saveFileDialog.ShowDialog(this) == DialogResult.OK) {
           try {
             provider.Export(GenericExporter.Export(), saveFileDialog.FileName);
-          }
-          catch (Exception ex) {
+          } catch (Exception ex) {
             ErrorHandling.ShowErrorDialog(this, ex);
           }