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

Revise ReportProgressRatio implementation

Browse source
This commit is contained in:
John Lewin 2017-07-14 13:55:02 -07:00
parent 990539d979
commit 4eb8ebe254
21 changed files with 95 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

5
MatterControl.Printing/GCode/GCodeFile.cs
View file

@ -33,6 +33,7 @@ using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Threading.Tasks;
using System.Threading;
namespace MatterHackers.GCodeVisualizer
{
@ -175,7 +176,7 @@ namespace MatterHackers.GCodeVisualizer
return false;
}
public static GCodeFile Load(string fileName)
public static GCodeFile Load(string fileName, CancellationToken cancellationToken)
{
if (FileTooBigToLoad(fileName))
{
@ -183,7 +184,7 @@ namespace MatterHackers.GCodeVisualizer
}
else
{
return new GCodeMemoryFile(fileName);
return new GCodeMemoryFile(fileName, cancellationToken);
}
}