aj/OpenNest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

refactor: extract CutDirectionArrows and reuse in program editor preview

Browse Source
This commit is contained in:
AJ Isaacs
2026-03-31 22:22:57 -04:00
parent 35dc954017
commit bb70ae26d3
3 changed files with 160 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files
OpenNest/Controls/ProgramEditorControl.cs
+13 -105
View File
@@ -26,6 +26,7 @@ namespace OpenNest.Controls
reverseButton.Click += OnReverseClicked;
menuReverse.Click += OnReverseClicked;
applyButton.Click += OnApplyClicked;
preview.Paint += OnPreviewPaint;
}
public Program Program { get; private set; }
@@ -157,7 +158,6 @@ namespace OpenNest.Controls
var selColor = GetContourColor(contour.Type, true);
foreach (var entity in contour.Shape.Entities)
entity.Color = selColor;
AddDirectionArrows(contour.Shape, selColor);
}
preview.Entities.AddRange(contour.Shape.Entities);
@@ -258,119 +258,27 @@ namespace OpenNest.Controls
ProgramChanged?.Invoke(this, EventArgs.Empty);
}
private void AddDirectionArrows(Shape shape, Color color)
private void OnPreviewPaint(object sender, PaintEventArgs e)
{
var entities = shape.Entities;
if (entities.Count == 0) return;
if (contours.Count == 0) return;
var totalLength = shape.Length;
if (totalLength < 0.001) return;
var spacing = preview.LengthGuiToWorld(60f);
var arrowSize = 5f;
var arrowSize = totalLength * 0.02;
if (arrowSize < 0.5) arrowSize = 0.5;
if (arrowSize > 5) arrowSize = 5;
foreach (var fraction in new[] { 0.25, 0.75 })
for (var i = 0; i < contours.Count; i++)
{
var targetDist = totalLength * fraction;
var accumulated = 0.0;
var found = false;
if (!contourList.SelectedIndices.Contains(i)) continue;
foreach (var entity in entities)
{
var entityLen = entity.Length;
if (accumulated + entityLen >= targetDist)
{
var localFraction = (targetDist - accumulated) / entityLen;
var (point, angle) = GetPointAndAngle(entity, localFraction);
AddArrowHead(point, angle, arrowSize, color);
found = true;
break;
}
accumulated += entityLen;
}
var contour = contours[i];
var pgm = ConvertGeometry.ToProgram(contour.Shape);
if (pgm == null) continue;
if (!found && entities.Count > 0)
{
var last = entities[^1];
var (point, angle) = GetPointAndAngle(last, 0.5);
AddArrowHead(point, angle, arrowSize, color);
}
using var pen = new Pen(Color.FromArgb(220, Color.Black), 1.5f);
var pos = new Vector();
CutDirectionArrows.DrawProgram(e.Graphics, preview, pgm, ref pos, pen, spacing, arrowSize);
}
}
private static (Vector point, double angle) GetPointAndAngle(Entity entity, double fraction)
{
switch (entity)
{
case Line line:
{
var dx = line.EndPoint.X - line.StartPoint.X;
var dy = line.EndPoint.Y - line.StartPoint.Y;
var pt = new Vector(
line.StartPoint.X + dx * fraction,
line.StartPoint.Y + dy * fraction);
var angle = System.Math.Atan2(dy, dx);
return (pt, angle);
}
case Arc arc:
{
var startAngle = arc.StartAngle;
var endAngle = arc.EndAngle;
if (arc.IsReversed)
{
var span = startAngle - endAngle;
if (span < 0) span += 2 * System.Math.PI;
var a = startAngle - span * fraction;
var pt = new Vector(
arc.Center.X + arc.Radius * System.Math.Cos(a),
arc.Center.Y + arc.Radius * System.Math.Sin(a));
var tangent = a - System.Math.PI / 2;
return (pt, tangent);
}
else
{
var span = endAngle - startAngle;
if (span < 0) span += 2 * System.Math.PI;
var a = startAngle + span * fraction;
var pt = new Vector(
arc.Center.X + arc.Radius * System.Math.Cos(a),
arc.Center.Y + arc.Radius * System.Math.Sin(a));
var tangent = a + System.Math.PI / 2;
return (pt, tangent);
}
}
case Circle circle:
{
var a = 2 * System.Math.PI * fraction;
var pt = new Vector(
circle.Center.X + circle.Radius * System.Math.Cos(a),
circle.Center.Y + circle.Radius * System.Math.Sin(a));
var tangent = a + System.Math.PI / 2;
return (pt, tangent);
}
default:
return (new Vector(), 0);
}
}
private void AddArrowHead(Vector tip, double angle, double size, Color color)
{
var leftAngle = angle + System.Math.PI + 0.4;
var rightAngle = angle + System.Math.PI - 0.4;
var left = new Vector(
tip.X + size * System.Math.Cos(leftAngle),
tip.Y + size * System.Math.Sin(leftAngle));
var right = new Vector(
tip.X + size * System.Math.Cos(rightAngle),
tip.Y + size * System.Math.Sin(rightAngle));
var arrowColor = Color.FromArgb(255, 140, 50);
preview.Entities.Add(new Line(left, tip) { Color = arrowColor });
preview.Entities.Add(new Line(right, tip) { Color = arrowColor });
}
private void OnApplyClicked(object sender, EventArgs e)
{
var text = gcodeEditor.Text;