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

Removed active printer static

Browse source 
issue: MatterHackers/MCCentral#4562
GCodeStream
This commit is contained in:
Lars Brubaker 2018-11-12 15:02:47 -08:00
parent 0e3225e529
commit 844f97a060
24 changed files with 4119 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

7
MatterControlLib/Library/Export/GCodeExport.cs
View file

@ -129,7 +129,7 @@ namespace MatterHackers.MatterControl.Library.Export
using (var gcodeStream = await assetStream.GetStream(progress: null))
{
this.ApplyStreamPipelineAndExport(
new GCodeFileStream(new GCodeFileStreamed(gcodeStream.Stream)),
new GCodeFileStream(new GCodeFileStreamed(gcodeStream.Stream), printer),
outputPath);
return true;
@ -236,7 +236,7 @@ namespace MatterHackers.MatterControl.Library.Export
{
try
{
var queueStream = new QueuedCommandsStream(gCodeFileStream);
var queueStream = new QueuedCommandsStream(printer, gCodeFileStream);
// this is added to ensure we are rewriting the G0 G1 commands as needed
GCodeStream finalStream = new ProcessWriteRegexStream(printer, queueStream, queueStream);
@ -287,7 +287,8 @@ namespace MatterHackers.MatterControl.Library.Export
new Vector4(),
new Vector4(),
Vector4.One,
CancellationToken.None)),
CancellationToken.None)
, printer),
outputPath);
}
catch (Exception e)