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

allow printer connection to take a stream to print

Browse source
This commit is contained in:
LarsBrubaker 2019-03-23 18:37:53 -07:00
parent 50fbc8be69
commit 2cb8d521af
7 changed files with 98 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -111,14 +111,12 @@ namespace MatterControl.Printing
|| lineString.StartsWith("; layer ");
}
public static bool FileTooBigToLoad(string fileName)
public static bool FileTooBigToLoad(Stream fileStream)
{
if (File.Exists(fileName)
&& Is32Bit)
if (Is32Bit)
{
FileInfo info = new FileInfo(fileName);
// Let's make sure we can load a file this big
if (info.Length > Max32BitFileSize)
if (fileStream.Length > Max32BitFileSize)
{
// It is too big to load
return true;
@ -172,20 +170,20 @@ namespace MatterControl.Printing
return false;
}
public static GCodeFile Load(string fileName,
public static GCodeFile Load(Stream fileStream,
Vector4 maxAccelerationMmPerS2,
Vector4 maxVelocityMmPerS,
Vector4 velocitySameAsStopMmPerS,
Vector4 speedMultiplier,
CancellationToken cancellationToken)
{
if (FileTooBigToLoad(fileName))
if (FileTooBigToLoad(fileStream))
{
return new GCodeFileStreamed(fileName);
return new GCodeFileStreamed(fileStream);
}
else
{
return GCodeMemoryFile.Load(fileName,
return GCodeMemoryFile.Load(fileStream,
maxAccelerationMmPerS2,
maxVelocityMmPerS,
velocitySameAsStopMmPerS,