Changeset 8693 for trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis.Views/3.3/DataAnalysisInstanceConsumerView.cs

Timestamp:

09/25/12 10:57:42 (12 years ago)

Author:

sforsten

Message:

#1942:

• fixed type "Shuffel"
• removed icon and control box

File:

• trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis.Views/3.3/DataAnalysisInstanceConsumerView.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis.Views/3.3/DataAnalysisInstanceConsumerView.cs

@@ -47 +47 @@
       var provider = SelectedProvider as DataAnalysisInstanceProvider<T>;
       if (provider != null) {
-        openFileDialog.FileName = GetProblemType() + " instance";
-        if (openFileDialog.ShowDialog() == DialogResult.OK) {
+        DataAnalysisImportTypeDialog importTypeDialog = new DataAnalysisImportTypeDialog();
+        if (importTypeDialog.ShowDialog() == DialogResult.OK) {
           T instance = default(T);
           try {
-            DataAnalysisImportTypeDialog importTypeDialog = new DataAnalysisImportTypeDialog();
-            if (importTypeDialog.ShowDialog() == DialogResult.OK) {
-              instance = provider.ImportData(openFileDialog.FileName, importTypeDialog.ImportType);
-            } else {
-              return;
-            }
+            instance = provider.ImportData(importTypeDialog.Path, importTypeDialog.ImportType);
+
           }
           catch (Exception ex) {
@@ -66 +62 @@
           }
           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");
+            MessageBox.Show(String.Format("This problem does not support loading the instance {0}: {1}", Path.GetFileName(importTypeDialog.Path), Environment.NewLine + ex.Message), "Cannot load instance");
           }
+        } else {
+          return;
         }
       } else {