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

Changed ReportPregress delegate to have touple and use CancellationTokenSource

Browse source
This commit is contained in:
Lars Brubaker 2017-06-30 16:09:31 -07:00
parent f7b5ea9386
commit 1a9ebebaed
30 changed files with 104 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

10
PartPreviewWindow/ViewGcodeBasic.cs
View file

@ -30,6 +30,7 @@ either expressed or implied, of the FreeBSD Project.
using System;
using System.IO;
using System.Linq;
using System.Threading;
using MatterHackers.Agg;
using MatterHackers.Agg.UI;
using MatterHackers.GCodeVisualizer;
@ -594,10 +595,13 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
SetSyncToPrintVisibility();
}
private void LoadProgress_Changed(double progress0To1, string processingState, out bool continueProcessing)
private void LoadProgress_Changed((double progress0To1, string processingState) progress, CancellationTokenSource continueProcessing)
{
SetProcessingMessage(string.Format("{0} {1:0}%...", gcodeLoading, progress0To1 * 100));
continueProcessing = !this.HasBeenClosed;
SetProcessingMessage(string.Format("{0} {1:0}%...", gcodeLoading, progress.progress0To1 * 100));
if(this.HasBeenClosed)
{
continueProcessing.Cancel();
}
}
private GuiWidget CreateGCodeViewWidget(string pathAndFileName)