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

integrating offline changes

Browse source
This commit is contained in:
Lars Brubaker 2023-03-10 17:15:55 -08:00
parent 121623bad3
commit 3f8eeda65b
125 changed files with 5442 additions and 5434 deletions
Download patch file Download diff file Expand all files Collapse all files

13
MatterControlLib/DesignTools/Operations/Image/ImageToPathObject3D_2.cs
View file

@ -357,7 +357,7 @@ namespace MatterHackers.MatterControl.DesignTools
{
await Rebuild();
}
else if (SheetObject3D.NeedsRebuild(this, invalidateArgs))
else if (Expressions.NeedRebuild(this, invalidateArgs))
{
CopyNewImageData();
await Rebuild();
@ -391,16 +391,13 @@ namespace MatterHackers.MatterControl.DesignTools
null,
(reporter, cancellationToken) =>
{
var progressStatus = new ProgressStatus();
switch (AnalysisType)
{
case AnalysisTypes.Transparency:
this.GenerateMarchingSquaresAndLines(
(progress0to1, status) =>
{
progressStatus.Progress0To1 = progress0to1;
progressStatus.Status = status;
reporter.Report(progressStatus);
reporter?.Invoke(progress0to1, status);
},
SourceImage,
new AlphaFunction());
@ -411,10 +408,8 @@ namespace MatterHackers.MatterControl.DesignTools
this.GenerateMarchingSquaresAndLines(
(progress0to1, status) =>
{
progressStatus.Progress0To1 = progress0to1;
progressStatus.Status = status;
reporter.Report(progressStatus);
},
reporter?.Invoke(progress0to1, status);
},
alphaImage,
new AlphaFunction());
break;