Changeset 15381 for stable

Timestamp:

09/26/17 14:57:33 (7 years ago)

Author:

mkommend

Message:

#2837: Merged r15370 into stable.

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.DataPreprocessing.Views (modified) (1 prop)
• HeuristicLab.DataPreprocessing.Views/3.4/DataPreprocessingView.cs (modified) (1 diff)

stable/HeuristicLab.DataPreprocessing.Views/3.4/DataPreprocessingView.cs

@@ -150 +150 @@
       importProblemDataTypeContextMenuStrip.Show(Cursor.Position);
     }
-    private void importRegressionToolStripMenuItem_Click(object sender, EventArgs e) {
-      Import(new RegressionCSVInstanceProvider(), new RegressionImportDialog(),
-        (dialog => ((RegressionImportDialog)dialog).ImportType));
-    }
-    private void importClassificationToolStripMenuItem_Click(object sender, EventArgs e) {
-      Import(new ClassificationCSVInstanceProvider(), new ClassificationImportDialog(),
-        (dialog => ((ClassificationImportDialog)dialog).ImportType));
-    }
-    private void importTimeSeriesToolStripMenuItem_Click(object sender, EventArgs e) {
-      Import(new TimeSeriesPrognosisCSVInstanceProvider(), new TimeSeriesPrognosisImportDialog(),
-        (dialog => ((TimeSeriesPrognosisImportDialog)dialog).ImportType));
-    }
-    private void Import<TProblemData, TImportType>(DataAnalysisInstanceProvider<TProblemData, TImportType> instanceProvider, DataAnalysisImportDialog importDialog,
+    private async void importRegressionToolStripMenuItem_Click(object sender, EventArgs e) {
+      await ImportAsync(new RegressionCSVInstanceProvider(), new RegressionImportDialog(),
+        dialog => ((RegressionImportDialog)dialog).ImportType);
+    }
+    private async void importClassificationToolStripMenuItem_Click(object sender, EventArgs e) {
+      await ImportAsync(new ClassificationCSVInstanceProvider(), new ClassificationImportDialog(),
+        dialog => ((ClassificationImportDialog)dialog).ImportType);
+    }
+    private async void importTimeSeriesToolStripMenuItem_Click(object sender, EventArgs e) {
+      await ImportAsync(new TimeSeriesPrognosisCSVInstanceProvider(), new TimeSeriesPrognosisImportDialog(),
+        dialog => ((TimeSeriesPrognosisImportDialog)dialog).ImportType);
+    }
+    private async Task ImportAsync<TProblemData, TImportType>(DataAnalysisInstanceProvider<TProblemData, TImportType> instanceProvider, DataAnalysisImportDialog importDialog,
       Func<DataAnalysisImportDialog, TImportType> getImportType)
       where TProblemData : class, IDataAnalysisProblemData
       where TImportType : DataAnalysisImportType {
       if (importDialog.ShowDialog() == DialogResult.OK) {
-        Task.Run(() => {
+        await Task.Run(() => {
           TProblemData instance;
           var mainForm = (MainForm.WindowsForms.MainForm)MainFormManager.MainForm;