From c70d56c3be673cd2a57be439fa0a5c3ba832d64e Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Tue, 21 Jul 2015 11:10:01 -0700 Subject: [PATCH] Change more background workers to async Put in a cast (Action) so we don't have to do () => func(); --- CustomWidgets/ExportPrintItemWindow.cs | 20 +++++++------------ PartPreviewWindow/View3D/View3DAlign.cs | 2 +- PartPreviewWindow/View3D/View3DAutoArange.cs | 2 +- PartPreviewWindow/View3D/View3DCopyGroup.cs | 2 +- .../View3D/View3DCreateSelecitonData.cs | 2 +- PartPreviewWindow/View3D/View3DGroup.cs | 2 +- PartPreviewWindow/View3D/View3DUngroup.cs | 2 +- 7 files changed, 13 insertions(+), 19 deletions(-) diff --git a/CustomWidgets/ExportPrintItemWindow.cs b/CustomWidgets/ExportPrintItemWindow.cs index 37083ef16..b680e0308 100644 --- a/CustomWidgets/ExportPrintItemWindow.cs +++ b/CustomWidgets/ExportPrintItemWindow.cs @@ -15,6 +15,7 @@ using System.Collections.Generic; using System.ComponentModel; using System.Diagnostics; using System.IO; +using System.Threading.Tasks; namespace MatterHackers.MatterControl { @@ -381,17 +382,13 @@ namespace MatterHackers.MatterControl }); } - private void onExportAmfFileSelected(SaveFileDialogParams saveParams) + private async void onExportAmfFileSelected(SaveFileDialogParams saveParams) { - BackgroundWorker saveWorker = new BackgroundWorker(); - saveWorker.DoWork += amfSaveWorker_DoWork; - saveWorker.RunWorkerAsync(saveParams); + await Task.Run(() => SaveAmf(saveParams)); } - private void amfSaveWorker_DoWork(object sender, DoWorkEventArgs e) + private void SaveAmf(SaveFileDialogParams saveParams) { - SaveFileDialogParams saveParams = e.Argument as SaveFileDialogParams; - if (saveParams.FileName != null) { string filePathToSave = saveParams.FileName; @@ -431,16 +428,13 @@ namespace MatterHackers.MatterControl }); } - private void onExportStlFileSelected(SaveFileDialogParams saveParams) + private async void onExportStlFileSelected(SaveFileDialogParams saveParams) { - BackgroundWorker saveWorker = new BackgroundWorker(); - saveWorker.DoWork += stlSaveWorker_DoWork; - saveWorker.RunWorkerAsync(saveParams); + await Task.Run(() => SaveStl(saveParams)); } - private void stlSaveWorker_DoWork(object sender, DoWorkEventArgs e) + private void SaveStl(SaveFileDialogParams saveParams) { - SaveFileDialogParams saveParams = e.Argument as SaveFileDialogParams; if (saveParams.FileName != null) { string filePathToSave = saveParams.FileName; diff --git a/PartPreviewWindow/View3D/View3DAlign.cs b/PartPreviewWindow/View3D/View3DAlign.cs index e636a976e..2408530e9 100644 --- a/PartPreviewWindow/View3D/View3DAlign.cs +++ b/PartPreviewWindow/View3D/View3DAlign.cs @@ -135,7 +135,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow LockEditControls(); viewIsInEditModePreLock = true; - await Task.Run(() => AlignSelected()); + await Task.Run((System.Action)AlignSelected); if (WidgetHasBeenClosed) { diff --git a/PartPreviewWindow/View3D/View3DAutoArange.cs b/PartPreviewWindow/View3D/View3DAutoArange.cs index db6231b6a..23f572123 100644 --- a/PartPreviewWindow/View3D/View3DAutoArange.cs +++ b/PartPreviewWindow/View3D/View3DAutoArange.cs @@ -142,7 +142,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow processingProgressControl.PercentComplete = 0; LockEditControls(); - await Task.Run(() => ArrangeMeshGroups()); + await Task.Run((System.Action)ArrangeMeshGroups); if (WidgetHasBeenClosed) { diff --git a/PartPreviewWindow/View3D/View3DCopyGroup.cs b/PartPreviewWindow/View3D/View3DCopyGroup.cs index 67ecab778..dd9282747 100644 --- a/PartPreviewWindow/View3D/View3DCopyGroup.cs +++ b/PartPreviewWindow/View3D/View3DCopyGroup.cs @@ -75,7 +75,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow processingProgressControl.PercentComplete = 0; LockEditControls(); - await Task.Run(() => CopyGroup()); + await Task.Run((System.Action)CopyGroup); if (WidgetHasBeenClosed) { diff --git a/PartPreviewWindow/View3D/View3DCreateSelecitonData.cs b/PartPreviewWindow/View3D/View3DCreateSelecitonData.cs index d92eb8097..ae8e11790 100644 --- a/PartPreviewWindow/View3D/View3DCreateSelecitonData.cs +++ b/PartPreviewWindow/View3D/View3DCreateSelecitonData.cs @@ -86,7 +86,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow LockEditControls(); viewIsInEditModePreLock = true; - await Task.Run(() => CreateSelectionData()); + await Task.Run((System.Action)CreateSelectionData); if (WidgetHasBeenClosed) { diff --git a/PartPreviewWindow/View3D/View3DGroup.cs b/PartPreviewWindow/View3D/View3DGroup.cs index e0011ea6a..61c24d024 100644 --- a/PartPreviewWindow/View3D/View3DGroup.cs +++ b/PartPreviewWindow/View3D/View3DGroup.cs @@ -112,7 +112,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow LockEditControls(); viewIsInEditModePreLock = true; - await Task.Run(() => GroupSelected()); + await Task.Run((System.Action)GroupSelected); if (WidgetHasBeenClosed) { diff --git a/PartPreviewWindow/View3D/View3DUngroup.cs b/PartPreviewWindow/View3D/View3DUngroup.cs index e14c65faf..299200996 100644 --- a/PartPreviewWindow/View3D/View3DUngroup.cs +++ b/PartPreviewWindow/View3D/View3DUngroup.cs @@ -110,7 +110,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow LockEditControls(); viewIsInEditModePreLock = true; - await Task.Run(() => UngroupSelected()); + await Task.Run((System.Action)UngroupSelected); if (WidgetHasBeenClosed) {