diff --git a/OpenNest/Controls/CutDirectionArrows.cs b/OpenNest/Controls/CutDirectionArrows.cs index e3aa87d..5cc74f1 100644 --- a/OpenNest/Controls/CutDirectionArrows.cs +++ b/OpenNest/Controls/CutDirectionArrows.cs @@ -1,7 +1,6 @@ using OpenNest.CNC; using OpenNest.Geometry; using OpenNest.Math; -using System; using System.Drawing; namespace OpenNest.Controls @@ -128,19 +127,18 @@ namespace OpenNest.Controls private static void DrawArrowHead(Graphics g, Pen pen, PointF tip, double angle, float size) { - var sin = (float)System.Math.Sin(angle); - var cos = (float)System.Math.Cos(angle); + var leftAngle = angle + System.Math.PI + 0.5; + var rightAngle = angle + System.Math.PI - 0.5; - var backX = -size * cos; - var backY = -size * sin; - var wingX = size * 0.5f * sin; - var wingY = -size * 0.5f * cos; + var left = new PointF( + tip.X + size * (float)System.Math.Cos(leftAngle), + tip.Y + size * (float)System.Math.Sin(leftAngle)); + var right = new PointF( + tip.X + size * (float)System.Math.Cos(rightAngle), + tip.Y + size * (float)System.Math.Sin(rightAngle)); - var wing1 = new PointF(tip.X + backX + wingX, tip.Y + backY + wingY); - var wing2 = new PointF(tip.X + backX - wingX, tip.Y + backY - wingY); - - g.DrawLine(pen, wing1, tip); - g.DrawLine(pen, wing2, tip); + g.DrawLine(pen, left, tip); + g.DrawLine(pen, right, tip); } } } diff --git a/OpenNest/Controls/PlateRenderer.cs b/OpenNest/Controls/PlateRenderer.cs index 9baf863..74ea7c6 100644 --- a/OpenNest/Controls/PlateRenderer.cs +++ b/OpenNest/Controls/PlateRenderer.cs @@ -515,7 +515,7 @@ namespace OpenNest.Controls private void DrawAllCutDirectionArrows(Graphics g) { - using var pen = new Pen(Color.FromArgb(220, Color.Black), 1.5f); + using var pen = new Pen(Color.FromArgb(60, 60, 60), 1.5f); var arrowSpacingWorld = view.LengthGuiToWorld(60f); var arrowSize = 6f; diff --git a/OpenNest/Controls/ProgramEditorControl.cs b/OpenNest/Controls/ProgramEditorControl.cs index d185806..a802904 100644 --- a/OpenNest/Controls/ProgramEditorControl.cs +++ b/OpenNest/Controls/ProgramEditorControl.cs @@ -273,7 +273,7 @@ namespace OpenNest.Controls var pgm = ConvertGeometry.ToProgram(contour.Shape); if (pgm == null) continue; - using var pen = new Pen(Color.FromArgb(220, Color.Black), 1.5f); + using var pen = new Pen(Color.FromArgb(60, 60, 60), 1.5f); var pos = new Vector(); CutDirectionArrows.DrawProgram(e.Graphics, preview, pgm, ref pos, pen, spacing, arrowSize); }