refactor: extract PreviewManager from PlateView
Moves preview part lifecycle (stationaryParts, activeParts) into a dedicated PreviewManager class. PlateView retains forwarding properties and methods for backward compatibility. Adds Previews property for direct access. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -32,9 +32,8 @@ namespace OpenNest.Controls
|
|||||||
private CutOffSettings cutOffSettings = new CutOffSettings();
|
private CutOffSettings cutOffSettings = new CutOffSettings();
|
||||||
private SelectionManager selection;
|
private SelectionManager selection;
|
||||||
private CutOffHandler cutOffHandler;
|
private CutOffHandler cutOffHandler;
|
||||||
|
private PreviewManager previewManager;
|
||||||
protected List<LayoutPart> parts;
|
protected List<LayoutPart> parts;
|
||||||
private List<LayoutPart> stationaryParts = new List<LayoutPart>();
|
|
||||||
private List<LayoutPart> activeParts = new List<LayoutPart>();
|
|
||||||
private Point middleMouseDownPoint;
|
private Point middleMouseDownPoint;
|
||||||
private Box activeWorkArea;
|
private Box activeWorkArea;
|
||||||
private List<Box> debugRemnants;
|
private List<Box> debugRemnants;
|
||||||
@@ -70,6 +69,7 @@ namespace OpenNest.Controls
|
|||||||
internal SelectionManager Selection => selection;
|
internal SelectionManager Selection => selection;
|
||||||
internal CutOffHandler CutOffs => cutOffHandler;
|
internal CutOffHandler CutOffs => cutOffHandler;
|
||||||
internal ActionManager Actions => actionManager;
|
internal ActionManager Actions => actionManager;
|
||||||
|
internal PreviewManager Previews => previewManager;
|
||||||
|
|
||||||
public event EventHandler<ItemAddedEventArgs<Part>> PartAdded;
|
public event EventHandler<ItemAddedEventArgs<Part>> PartAdded;
|
||||||
public event EventHandler<ItemRemovedEventArgs<Part>> PartRemoved;
|
public event EventHandler<ItemRemovedEventArgs<Part>> PartRemoved;
|
||||||
@@ -94,6 +94,7 @@ namespace OpenNest.Controls
|
|||||||
parts = new List<LayoutPart>();
|
parts = new List<LayoutPart>();
|
||||||
selection = new SelectionManager(this);
|
selection = new SelectionManager(this);
|
||||||
cutOffHandler = new CutOffHandler(this);
|
cutOffHandler = new CutOffHandler(this);
|
||||||
|
previewManager = new PreviewManager(this);
|
||||||
|
|
||||||
redrawTimer = new Timer()
|
redrawTimer = new Timer()
|
||||||
{
|
{
|
||||||
@@ -158,14 +159,9 @@ namespace OpenNest.Controls
|
|||||||
|
|
||||||
internal List<LayoutPart> LayoutParts => parts;
|
internal List<LayoutPart> LayoutParts => parts;
|
||||||
|
|
||||||
internal IReadOnlyList<LayoutPart> PreviewParts =>
|
internal IReadOnlyList<LayoutPart> PreviewParts => previewManager.PreviewParts;
|
||||||
activeParts.Count > 0 ? activeParts : stationaryParts;
|
internal Brush PreviewBrush => previewManager.PreviewBrush;
|
||||||
|
internal Pen PreviewPen => previewManager.PreviewPen;
|
||||||
internal Brush PreviewBrush =>
|
|
||||||
activeParts.Count > 0 ? ColorScheme.ActivePreviewPartBrush : ColorScheme.PreviewPartBrush;
|
|
||||||
|
|
||||||
internal Pen PreviewPen =>
|
|
||||||
activeParts.Count > 0 ? ColorScheme.ActivePreviewPartPen : ColorScheme.PreviewPartPen;
|
|
||||||
|
|
||||||
internal RectangleF GetViewBounds() =>
|
internal RectangleF GetViewBounds() =>
|
||||||
new RectangleF(-origin.X, -origin.Y, Width, Height);
|
new RectangleF(-origin.X, -origin.Y, Width, Height);
|
||||||
@@ -213,8 +209,7 @@ namespace OpenNest.Controls
|
|||||||
plate.PartAdded -= plate_PartAdded;
|
plate.PartAdded -= plate_PartAdded;
|
||||||
plate.PartRemoved -= plate_PartRemoved;
|
plate.PartRemoved -= plate_PartRemoved;
|
||||||
parts.Clear();
|
parts.Clear();
|
||||||
stationaryParts.Clear();
|
previewManager.Clear();
|
||||||
activeParts.Clear();
|
|
||||||
selection.Clear();
|
selection.Clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -537,8 +532,7 @@ namespace OpenNest.Controls
|
|||||||
public override void Refresh()
|
public override void Refresh()
|
||||||
{
|
{
|
||||||
parts.ForEach(p => p.Update(this));
|
parts.ForEach(p => p.Update(this));
|
||||||
stationaryParts.ForEach(p => p.Update(this));
|
previewManager.Update();
|
||||||
activeParts.ForEach(p => p.Update(this));
|
|
||||||
Invalidate();
|
Invalidate();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -566,51 +560,10 @@ namespace OpenNest.Controls
|
|||||||
Plate.Parts.Add(part);
|
Plate.Parts.Add(part);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void SetStationaryParts(List<Part> parts)
|
public void SetStationaryParts(List<Part> parts) => previewManager.SetStationaryParts(parts);
|
||||||
{
|
public void SetActiveParts(List<Part> parts) => previewManager.SetActiveParts(parts);
|
||||||
stationaryParts.Clear();
|
public void ClearPreviewParts() => previewManager.ClearPreviewParts();
|
||||||
activeParts.Clear();
|
public void AcceptPreviewParts(List<Part> parts) => previewManager.AcceptPreviewParts(parts);
|
||||||
|
|
||||||
if (parts != null)
|
|
||||||
{
|
|
||||||
foreach (var part in parts)
|
|
||||||
stationaryParts.Add(LayoutPart.Create(part, this));
|
|
||||||
}
|
|
||||||
|
|
||||||
Invalidate();
|
|
||||||
}
|
|
||||||
|
|
||||||
public void SetActiveParts(List<Part> parts)
|
|
||||||
{
|
|
||||||
activeParts.Clear();
|
|
||||||
|
|
||||||
if (parts != null)
|
|
||||||
{
|
|
||||||
foreach (var part in parts)
|
|
||||||
activeParts.Add(LayoutPart.Create(part, this));
|
|
||||||
}
|
|
||||||
|
|
||||||
Invalidate();
|
|
||||||
}
|
|
||||||
|
|
||||||
public void ClearPreviewParts()
|
|
||||||
{
|
|
||||||
stationaryParts.Clear();
|
|
||||||
activeParts.Clear();
|
|
||||||
Invalidate();
|
|
||||||
}
|
|
||||||
|
|
||||||
public void AcceptPreviewParts(List<Part> parts)
|
|
||||||
{
|
|
||||||
if (parts != null)
|
|
||||||
{
|
|
||||||
foreach (var part in parts)
|
|
||||||
Plate.Parts.Add(part);
|
|
||||||
}
|
|
||||||
|
|
||||||
stationaryParts.Clear();
|
|
||||||
activeParts.Clear();
|
|
||||||
}
|
|
||||||
|
|
||||||
public async void FillWithProgress(List<Part> groupParts, Box workArea)
|
public async void FillWithProgress(List<Part> groupParts, Box workArea)
|
||||||
{
|
{
|
||||||
@@ -751,8 +704,7 @@ namespace OpenNest.Controls
|
|||||||
{
|
{
|
||||||
base.UpdateMatrix();
|
base.UpdateMatrix();
|
||||||
parts.ForEach(p => p.Update(this));
|
parts.ForEach(p => p.Update(this));
|
||||||
stationaryParts.ForEach(p => p.Update(this));
|
previewManager.Update();
|
||||||
activeParts.ForEach(p => p.Update(this));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,84 @@
|
|||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Drawing;
|
||||||
|
|
||||||
|
namespace OpenNest.Controls
|
||||||
|
{
|
||||||
|
internal class PreviewManager
|
||||||
|
{
|
||||||
|
private readonly PlateView view;
|
||||||
|
private readonly List<LayoutPart> stationaryParts = new List<LayoutPart>();
|
||||||
|
private readonly List<LayoutPart> activeParts = new List<LayoutPart>();
|
||||||
|
|
||||||
|
public PreviewManager(PlateView view)
|
||||||
|
{
|
||||||
|
this.view = view;
|
||||||
|
}
|
||||||
|
|
||||||
|
public IReadOnlyList<LayoutPart> PreviewParts =>
|
||||||
|
activeParts.Count > 0 ? activeParts : stationaryParts;
|
||||||
|
|
||||||
|
public Brush PreviewBrush =>
|
||||||
|
activeParts.Count > 0 ? view.ColorScheme.ActivePreviewPartBrush : view.ColorScheme.PreviewPartBrush;
|
||||||
|
|
||||||
|
public Pen PreviewPen =>
|
||||||
|
activeParts.Count > 0 ? view.ColorScheme.ActivePreviewPartPen : view.ColorScheme.PreviewPartPen;
|
||||||
|
|
||||||
|
public void SetStationaryParts(List<Part> parts)
|
||||||
|
{
|
||||||
|
stationaryParts.Clear();
|
||||||
|
activeParts.Clear();
|
||||||
|
|
||||||
|
if (parts != null)
|
||||||
|
{
|
||||||
|
foreach (var part in parts)
|
||||||
|
stationaryParts.Add(LayoutPart.Create(part, view));
|
||||||
|
}
|
||||||
|
|
||||||
|
view.Invalidate();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void SetActiveParts(List<Part> parts)
|
||||||
|
{
|
||||||
|
activeParts.Clear();
|
||||||
|
|
||||||
|
if (parts != null)
|
||||||
|
{
|
||||||
|
foreach (var part in parts)
|
||||||
|
activeParts.Add(LayoutPart.Create(part, view));
|
||||||
|
}
|
||||||
|
|
||||||
|
view.Invalidate();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void ClearPreviewParts()
|
||||||
|
{
|
||||||
|
stationaryParts.Clear();
|
||||||
|
activeParts.Clear();
|
||||||
|
view.Invalidate();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void AcceptPreviewParts(List<Part> parts)
|
||||||
|
{
|
||||||
|
if (parts != null)
|
||||||
|
{
|
||||||
|
foreach (var part in parts)
|
||||||
|
view.Plate.Parts.Add(part);
|
||||||
|
}
|
||||||
|
|
||||||
|
stationaryParts.Clear();
|
||||||
|
activeParts.Clear();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Update()
|
||||||
|
{
|
||||||
|
stationaryParts.ForEach(p => p.Update(view));
|
||||||
|
activeParts.ForEach(p => p.Update(view));
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Clear()
|
||||||
|
{
|
||||||
|
stationaryParts.Clear();
|
||||||
|
activeParts.Clear();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user