mirror of
https://github.com/ajisaacs/OpenNest.git
synced 2026-10-15 09:01:54 -04:00
Slice 3b task 3 (D9 + display). OpenNest.Core: TimingInfo gains ClampRemovalMinutes (included in +, -, * so every aggregation stays consistent); Timing.GetTimingInfo(Plate) adds plate.ClampRemovalMinutes once per physical sheet, before the quantity multiply so it scales with everything else cut on that sheet; CalculateTime adds it to the estimate as a flat number of minutes regardless of the cut parameters' unit. A plate with nothing removed is unaffected (zero). OpenNest.Data: ClampSettings and ClampRailEditor carry RemovalMinutes through the same three boundaries as clamp size - the rail/constructor, the settings file (missing key falls back to ClampRail.DefaultRemovalMinutes; present but negative/non-numeric/null is ignored and reported Partial, same as width/depth), and ToMachineDefaults - except it is a time, not a length, so ConvertedTo never scales it between inches and millimeters. Desktop: ClampsForm gets a 'Minutes to remove and replace one clamp' field wired to the editor; PlateRenderer.DrawRemovedClamps draws each clamp Plate.RemovedClamps lists (resolved from the full rail, since a removed clamp is absent from Plate.ClampZones) as a dashed grey outline with a small 'remove' marker, distinct from an active clamp's solid hatch and still display-only - no hit test, selection or sequencing; PlateView calls it right after the active-zone pass. MainForm's Auto Nest completion flow lists every committed sheet with a removal as 'Sheet N: remove clamp-X (+5 min)', using Plate.RemovedClamps/ClampRemovalMinutes from Slice 3b tasks 1-2. Tests: 10 new Data (ClampSettingsTests, ClampRailEditorTests) covering round-trip/default/invalid-value handling and the never-scaled-by-units rule; 4 new Core (TimingTests) covering the per-sheet add, the quantity scaling, CalculateTime, and nest-level aggregation across plates. Desktop changes (dialog field, renderer, Auto Nest summary) are compile-verified only (-p:EnableWindowsTargeting=true), matching the project's existing WinForms testing bar - no automated UI test exists for the sibling DrawClampZones either. Gates: Release OpenNest.Tests 3898 passed/31 skipped, OpenNest.IO.Tests 105 passed, OpenNest.Engine.Tests 878 passed/2 skipped; desktop and OpenNest.WinForms.Tests cross-builds clean; scoped dotnet format --verify-no-changes clean. This completes Slice 3b (D8/D9) on top of Slice 3's rail-following plates. Not published; master and other feature/clamp-zones-* branches untouched. Windows runtime/visual acceptance not claimed - the plan's click-through checklist (after slices 3-5) still applies.
133 lines
4.9 KiB
C#
133 lines
4.9 KiB
C#
namespace OpenNest.Data;
|
|
|
|
/// <summary>
|
|
/// Decision logic behind the desktop Clamps dialog: edits one nest's clamp rail in that
|
|
/// nest's units. Three explicit boundaries: <see cref="LoadMachineDefaults"/> only fills
|
|
/// the editor, <see cref="ApplyTo"/> changes the nest (the dialog's OK), and
|
|
/// <see cref="ToMachineDefaults"/> is what "Save as Machine Defaults" writes immediately.
|
|
/// </summary>
|
|
public sealed class ClampRailEditor
|
|
{
|
|
private readonly List<double> _centers = new();
|
|
|
|
/// <summary>Starts from the nest's rail, or the default clamp size with no clamps.</summary>
|
|
public ClampRailEditor(ClampRail? rail, Units units, bool applyToNewNests)
|
|
{
|
|
Units = units;
|
|
ApplyToNewNests = applyToNewNests;
|
|
var initial = ClampSettings.FromRail(rail, units, applyToNewNests);
|
|
Width = initial.Width;
|
|
Depth = initial.Depth;
|
|
RemovalMinutes = initial.RemovalMinutes;
|
|
_centers.AddRange(initial.Centers);
|
|
}
|
|
|
|
/// <summary>The nest's units; every value is in these units.</summary>
|
|
public Units Units { get; }
|
|
|
|
/// <summary>Clamp extent along the edge (X).</summary>
|
|
public double Width { get; set; }
|
|
|
|
/// <summary>Clamp intrusion into the sheet (Y).</summary>
|
|
public double Depth { get; set; }
|
|
|
|
/// <summary>Minutes to remove one clamp and put it back after cutting (D9); not a
|
|
/// length, so it is never converted between units.</summary>
|
|
public double RemovalMinutes { get; set; }
|
|
|
|
/// <summary>Whether saved machine defaults give new nests these clamps.</summary>
|
|
public bool ApplyToNewNests { get; set; }
|
|
|
|
/// <summary>Clamp centers along X from the plate origin, ascending and distinct.</summary>
|
|
public IReadOnlyList<double> Centers => _centers;
|
|
|
|
/// <summary>
|
|
/// Adds a clamp center, keeping the list sorted. Refuses (with an operator-facing
|
|
/// reason) values that are not finite, negative, or already listed.
|
|
/// </summary>
|
|
public bool TryAddCenter(double center, out string? error)
|
|
{
|
|
if (!double.IsFinite(center) || center < 0)
|
|
{
|
|
error = "Enter a clamp center measured from the plate origin (zero or more).";
|
|
return false;
|
|
}
|
|
|
|
var index = _centers.BinarySearch(center);
|
|
if (index >= 0)
|
|
{
|
|
error = $"A clamp is already centered at {center:0.####}.";
|
|
return false;
|
|
}
|
|
|
|
_centers.Insert(~index, center);
|
|
error = null;
|
|
return true;
|
|
}
|
|
|
|
public void RemoveCenterAt(int index)
|
|
{
|
|
if (index >= 0 && index < _centers.Count)
|
|
_centers.RemoveAt(index);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Replaces the editor's values with the machine defaults converted to this nest's
|
|
/// units. Nothing is applied or saved.
|
|
/// </summary>
|
|
public void LoadMachineDefaults(ClampSettings settings)
|
|
{
|
|
ArgumentNullException.ThrowIfNull(settings);
|
|
var converted = settings.ConvertedTo(Units);
|
|
Width = converted.Width;
|
|
Depth = converted.Depth;
|
|
RemovalMinutes = converted.RemovalMinutes;
|
|
ApplyToNewNests = settings.Enabled;
|
|
_centers.Clear();
|
|
_centers.AddRange(converted.Centers.Distinct().OrderBy(c => c));
|
|
}
|
|
|
|
/// <summary>
|
|
/// The edited rail, or null when no clamp is listed. Throws
|
|
/// <see cref="ArgumentOutOfRangeException"/> for a non-positive width or depth, or a
|
|
/// negative/non-finite removal time.
|
|
/// </summary>
|
|
public ClampRail? BuildRail() =>
|
|
_centers.Count == 0 ? null : new ClampRail(Width, Depth, _centers, RemovalMinutes);
|
|
|
|
/// <summary>The dialog's OK: makes the edited rail the nest's, re-resolving every plate.</summary>
|
|
public void ApplyTo(Nest nest)
|
|
{
|
|
ArgumentNullException.ThrowIfNull(nest);
|
|
nest.SetClampRail(BuildRail());
|
|
}
|
|
|
|
/// <summary>
|
|
/// The machine settings "Save as Machine Defaults" writes: these values in this nest's
|
|
/// units, enabled for new nests only when requested and at least one clamp is listed.
|
|
/// </summary>
|
|
public ClampSettings ToMachineDefaults()
|
|
{
|
|
// Validate before anything is persisted.
|
|
if (!double.IsFinite(Width) || Width <= 0 || !double.IsFinite(Depth) || Depth <= 0)
|
|
throw new ArgumentOutOfRangeException(
|
|
nameof(Width),
|
|
"Clamp width and depth must be positive."
|
|
);
|
|
if (!double.IsFinite(RemovalMinutes) || RemovalMinutes < 0)
|
|
throw new ArgumentOutOfRangeException(
|
|
nameof(RemovalMinutes),
|
|
"Clamp removal time must be finite and zero or more."
|
|
);
|
|
return new ClampSettings
|
|
{
|
|
Enabled = ApplyToNewNests && _centers.Count > 0,
|
|
Units = Units,
|
|
Width = Width,
|
|
Depth = Depth,
|
|
RemovalMinutes = RemovalMinutes,
|
|
Centers = _centers.ToArray(),
|
|
};
|
|
}
|
|
}
|