diff --git a/PamhagenSysCtrl/Helpers/Pipeline/FlowArrow.cs b/PamhagenSysCtrl/Helpers/Pipeline/FlowArrows.cs similarity index 94% rename from PamhagenSysCtrl/Helpers/Pipeline/FlowArrow.cs rename to PamhagenSysCtrl/Helpers/Pipeline/FlowArrows.cs index f271262..fe15225 100644 --- a/PamhagenSysCtrl/Helpers/Pipeline/FlowArrow.cs +++ b/PamhagenSysCtrl/Helpers/Pipeline/FlowArrows.cs @@ -5,7 +5,7 @@ using System.Windows.Media; using System.Windows.Shapes; namespace PamhagenSysCtrl.Helpers.Pipeline { - internal sealed class FlowArrow { + internal sealed class FlowArrows { public const double SPEED = 20; public const double SPACING = 15; @@ -23,7 +23,7 @@ namespace PamhagenSysCtrl.Helpers.Pipeline { public double Length => GetLength(_path[0], _path[1]) + GetLength(_path[1], _path[2]); - private FlowArrow(Canvas canvas, Point[] path) { + private FlowArrows(Canvas canvas, Point[] path) { _path = path; _layer = new Canvas() { IsHitTestVisible = false, @@ -33,16 +33,16 @@ namespace PamhagenSysCtrl.Helpers.Pipeline { canvas.Children.Add(_layer); } - public static FlowArrow Create(Canvas canvas, Line first, Line second) { - return new FlowArrow(canvas, [ + public static FlowArrows Create(Canvas canvas, Line first, Line second) { + return new FlowArrows(canvas, [ new Point(first.X1, first.Y1), new Point(first.X2, first.Y2), new Point(second.X2, second.Y2), ]); } - public static FlowArrow Create(Canvas canvas, Polyline path) { - return new FlowArrow(canvas, [.. path.Points]); + public static FlowArrows Create(Canvas canvas, Polyline path) { + return new FlowArrows(canvas, [.. path.Points]); } public void Update((bool TowardEnd, double PathOffset)? flow) { diff --git a/PamhagenSysCtrl/Helpers/Pipeline/Inlet.cs b/PamhagenSysCtrl/Helpers/Pipeline/Inlet.cs index 031d489..51dead1 100644 --- a/PamhagenSysCtrl/Helpers/Pipeline/Inlet.cs +++ b/PamhagenSysCtrl/Helpers/Pipeline/Inlet.cs @@ -12,13 +12,13 @@ namespace PamhagenSysCtrl.Helpers.Pipeline { public bool Orientation { get; set; } public Brush? Highlight { get; set; } public (bool TowardEnd, double PathOffset)? Flow { get; set; } - public double FlowLength => _flowArrow?.Length ?? 0; + public double FlowLength => _flowArrows?.Length ?? 0; private Line? _outer1; private Line? _outer2; private Line? _inner1; private Line? _inner2; - private FlowArrow? _flowArrow; + private FlowArrows? _flowArrows; public Inlet(INode start, ISink end, bool orientation = false) { Start = start; @@ -77,13 +77,13 @@ namespace PamhagenSysCtrl.Helpers.Pipeline { canvas.Children.Add(_outer2); canvas.Children.Add(_inner1); canvas.Children.Add(_inner2); - _flowArrow = FlowArrow.Create(canvas, _inner1!, _inner2!); + _flowArrows = FlowArrows.Create(canvas, _inner1!, _inner2!); } public void Update() { _inner1?.Stroke = Highlight ?? Brushes.DarkGray; _inner2?.Stroke = Highlight ?? Brushes.DarkGray; - _flowArrow?.Update(Flow); + _flowArrows?.Update(Flow); } } } diff --git a/PamhagenSysCtrl/Helpers/Pipeline/Outlet.cs b/PamhagenSysCtrl/Helpers/Pipeline/Outlet.cs index 0aaa13b..323f221 100644 --- a/PamhagenSysCtrl/Helpers/Pipeline/Outlet.cs +++ b/PamhagenSysCtrl/Helpers/Pipeline/Outlet.cs @@ -14,10 +14,10 @@ namespace PamhagenSysCtrl.Helpers.Pipeline { public bool Orientation { get; set; } public Brush? Highlight { get; set; } public (bool TowardEnd, double PathOffset)? Flow { get; set; } - public double FlowLength => _flowArrow?.Length ?? 0; + public double FlowLength => _flowArrows?.Length ?? 0; private Polygon? _hopper; - private FlowArrow? _flowArrow; + private FlowArrows? _flowArrows; private Line? _outer1; private Line? _outer2; private Line? _inner1; @@ -87,14 +87,14 @@ namespace PamhagenSysCtrl.Helpers.Pipeline { canvas.Children.Add(_hopper); canvas.Children.Add(_inner1); canvas.Children.Add(_inner2); - _flowArrow = FlowArrow.Create(canvas, _inner1!, _inner2!); + _flowArrows = FlowArrows.Create(canvas, _inner1!, _inner2!); } public void Update() { _inner1?.Stroke = Highlight ?? Brushes.DarkGray; _inner2?.Stroke = Highlight ?? Brushes.DarkGray; _hopper?.Fill = Highlight ?? Brushes.DarkGray; - _flowArrow?.Update(Flow); + _flowArrows?.Update(Flow); } } } diff --git a/PamhagenSysCtrl/Helpers/Pipeline/Pipe.cs b/PamhagenSysCtrl/Helpers/Pipeline/Pipe.cs index 318f230..7076901 100644 --- a/PamhagenSysCtrl/Helpers/Pipeline/Pipe.cs +++ b/PamhagenSysCtrl/Helpers/Pipeline/Pipe.cs @@ -11,11 +11,11 @@ namespace PamhagenSysCtrl.Helpers.Pipeline { public bool Orientation { get; set; } public Brush? Highlight { get; set; } public (bool TowardEnd, double PathOffset)? Flow { get; set; } - public double FlowLength => _flowArrow?.Length ?? 0; + public double FlowLength => _flowArrows?.Length ?? 0; private Polyline? _outer; private Polyline? _inner; - private FlowArrow? _flowArrow; + private FlowArrows? _flowArrows; public Pipe(INode start, INode end, bool orientation = false, bool twoWay = false) { Start = start; @@ -49,12 +49,12 @@ namespace PamhagenSysCtrl.Helpers.Pipeline { }; canvas.Children.Add(_outer); canvas.Children.Add(_inner); - _flowArrow = FlowArrow.Create(canvas, _inner); + _flowArrows = FlowArrows.Create(canvas, _inner); } public void Update() { _inner?.Stroke = Highlight ?? Brushes.DarkGray; - _flowArrow?.Update(Flow); + _flowArrows?.Update(Flow); } } }