Replace stored property setters (BestPartCount, BestDensity, NestedWidth, NestedLength, NestedArea) with computed properties that derive values from BestParts, with a lazy cache invalidated on setter. Add internal ProgressReport struct to replace the 7-parameter ReportProgress signature. Update all 13 callsites and AccumulatingProgress. Delete FormatPhaseName in favor of NestPhase.ShortName() extension. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
35 lines
1.1 KiB
C#
35 lines
1.1 KiB
C#
using System;
|
|
using System.Collections.Generic;
|
|
|
|
namespace OpenNest.Engine.Fill
|
|
{
|
|
/// <summary>
|
|
/// Wraps an IProgress to prepend previously placed parts to each report,
|
|
/// so the UI shows the full picture during incremental fills.
|
|
/// </summary>
|
|
internal class AccumulatingProgress : IProgress<NestProgress>
|
|
{
|
|
private readonly IProgress<NestProgress> inner;
|
|
private readonly List<Part> previousParts;
|
|
|
|
public AccumulatingProgress(IProgress<NestProgress> inner, List<Part> previousParts)
|
|
{
|
|
this.inner = inner;
|
|
this.previousParts = previousParts;
|
|
}
|
|
|
|
public void Report(NestProgress value)
|
|
{
|
|
if (value.BestParts != null && previousParts.Count > 0)
|
|
{
|
|
var combined = new List<Part>(previousParts.Count + value.BestParts.Count);
|
|
combined.AddRange(previousParts);
|
|
combined.AddRange(value.BestParts);
|
|
value.BestParts = combined;
|
|
}
|
|
|
|
inner.Report(value);
|
|
}
|
|
}
|
|
}
|