nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change more background workers to async

Browse source 
Put in a cast (Action) so we don't have to do () => func();
This commit is contained in:
Lars Brubaker 2015-07-21 11:10:01 -07:00
parent 4dbc03edb8
commit c70d56c3be
7 changed files with 13 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

20
CustomWidgets/ExportPrintItemWindow.cs
View file

@ -15,6 +15,7 @@ using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
using System.Diagnostics; using System.Diagnostics;
using System.IO; using System.IO;
using System.Threading.Tasks;
namespace MatterHackers.MatterControl 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(); await Task.Run(() => SaveAmf(saveParams));
saveWorker.DoWork += amfSaveWorker_DoWork;
saveWorker.RunWorkerAsync(saveParams);
} }
private void amfSaveWorker_DoWork(object sender, DoWorkEventArgs e) private void SaveAmf(SaveFileDialogParams saveParams)
{ {
SaveFileDialogParams saveParams = e.Argument as SaveFileDialogParams;
if (saveParams.FileName != null) if (saveParams.FileName != null)
{ {
string filePathToSave = saveParams.FileName; 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(); await Task.Run(() => SaveStl(saveParams));
saveWorker.DoWork += stlSaveWorker_DoWork;
saveWorker.RunWorkerAsync(saveParams);
} }
private void stlSaveWorker_DoWork(object sender, DoWorkEventArgs e) private void SaveStl(SaveFileDialogParams saveParams)
{ {
SaveFileDialogParams saveParams = e.Argument as SaveFileDialogParams;
if (saveParams.FileName != null) if (saveParams.FileName != null)
{ {
string filePathToSave = saveParams.FileName; string filePathToSave = saveParams.FileName;

2
PartPreviewWindow/View3D/View3DAlign.cs
View file

@ -135,7 +135,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
LockEditControls(); LockEditControls();
viewIsInEditModePreLock = true; viewIsInEditModePreLock = true;
await Task.Run(() => AlignSelected()); await Task.Run((System.Action)AlignSelected);
if (WidgetHasBeenClosed) if (WidgetHasBeenClosed)
{ {

2
PartPreviewWindow/View3D/View3DAutoArange.cs
View file

@ -142,7 +142,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
processingProgressControl.PercentComplete = 0; processingProgressControl.PercentComplete = 0;
LockEditControls(); LockEditControls();
await Task.Run(() => ArrangeMeshGroups()); await Task.Run((System.Action)ArrangeMeshGroups);
if (WidgetHasBeenClosed) if (WidgetHasBeenClosed)
{ {

2
PartPreviewWindow/View3D/View3DCopyGroup.cs
View file

@ -75,7 +75,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
processingProgressControl.PercentComplete = 0; processingProgressControl.PercentComplete = 0;
LockEditControls(); LockEditControls();
await Task.Run(() => CopyGroup()); await Task.Run((System.Action)CopyGroup);
if (WidgetHasBeenClosed) if (WidgetHasBeenClosed)
{ {

2
PartPreviewWindow/View3D/View3DCreateSelecitonData.cs
View file

@ -86,7 +86,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
LockEditControls(); LockEditControls();
viewIsInEditModePreLock = true; viewIsInEditModePreLock = true;
await Task.Run(() => CreateSelectionData()); await Task.Run((System.Action)CreateSelectionData);
if (WidgetHasBeenClosed) if (WidgetHasBeenClosed)
{ {

2
PartPreviewWindow/View3D/View3DGroup.cs
View file

@ -112,7 +112,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
LockEditControls(); LockEditControls();
viewIsInEditModePreLock = true; viewIsInEditModePreLock = true;
await Task.Run(() => GroupSelected()); await Task.Run((System.Action)GroupSelected);
if (WidgetHasBeenClosed) if (WidgetHasBeenClosed)
{ {

2
PartPreviewWindow/View3D/View3DUngroup.cs
View file

@ -110,7 +110,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
LockEditControls(); LockEditControls();
viewIsInEditModePreLock = true; viewIsInEditModePreLock = true;
await Task.Run(() => UngroupSelected()); await Task.Run((System.Action)UngroupSelected);
if (WidgetHasBeenClosed) if (WidgetHasBeenClosed)
{ {