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

Move MatterSlice style slicing to EngineMappingMatterSlice

Browse source 
- Convert EngineMappingMatterSlice to IObjectSlicer with classic slicing
- Update IObjectSlicer to support tasks, cancellation, progress
- Remove Printer couplings
- Remove printer reference from SliceProgressReporter
This commit is contained in:
John Lewin 2019-06-27 09:27:16 -07:00 • committed by jlewin
parent a7821d2e26
commit 9523ae320f
6 changed files with 427 additions and 436 deletions
Download patch file Download diff file Expand all files Collapse all files

10
MatterControlLib/PartPreviewWindow/View3D/SliceProgressReporter.cs
View file

@ -36,12 +36,10 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
public class SliceProgressReporter : IProgress<ProgressStatus>
{
private IProgress<ProgressStatus> reporter;
private PrinterConfig printer;
public SliceProgressReporter(IProgress<ProgressStatus> reporter, PrinterConfig printer)
public SliceProgressReporter(IProgress<ProgressStatus> reporter)
{
this.reporter = reporter;
this.printer = printer;
}
public void Report(ProgressStatus progressStatus)
@ -50,7 +48,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
double destValue = 10;
string statusText = progressStatus.Status = progressStatus.Status.Trim().TrimEnd('.');
if (GCodeFile.GetFirstNumberAfter("", statusText, ref currentValue)
&& GCodeFile.GetFirstNumberAfter("/", statusText, ref destValue))
{
@ -60,10 +58,12 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
}
progressStatus.Progress0To1 = currentValue / destValue;
progressStatus.Target = null;
}
else
{
printer.Connection.TerminalLog.WriteLine(statusText);
progressStatus.Status = statusText;
progressStatus.Target = "terminal";
}
reporter.Report(progressStatus);