feat(ui): support Accept button in nesting callers
This commit is contained in:
@@ -930,7 +930,7 @@ namespace OpenNest.Controls
|
|||||||
var parts = await Task.Run(() =>
|
var parts = await Task.Run(() =>
|
||||||
engine.Fill(groupParts, workArea, progress, cts.Token));
|
engine.Fill(groupParts, workArea, progress, cts.Token));
|
||||||
|
|
||||||
if (parts.Count > 0 && !cts.IsCancellationRequested)
|
if (parts.Count > 0 && (!cts.IsCancellationRequested || progressForm.Accepted))
|
||||||
{
|
{
|
||||||
AcceptTemporaryParts();
|
AcceptTemporaryParts();
|
||||||
sw.Stop();
|
sw.Stop();
|
||||||
|
|||||||
@@ -865,7 +865,7 @@ namespace OpenNest.Forms
|
|||||||
|
|
||||||
activeForm.PlateView.ClearTemporaryParts();
|
activeForm.PlateView.ClearTemporaryParts();
|
||||||
|
|
||||||
if (nestParts.Count > 0 && !token.IsCancellationRequested)
|
if (nestParts.Count > 0 && (!token.IsCancellationRequested || progressForm.Accepted))
|
||||||
{
|
{
|
||||||
plate.Parts.AddRange(nestParts);
|
plate.Parts.AddRange(nestParts);
|
||||||
activeForm.PlateView.Invalidate();
|
activeForm.PlateView.Invalidate();
|
||||||
|
|||||||
Reference in New Issue
Block a user