winzer/pamhagen-sysctrl
2
0
Fork 0
Code Issues Pull Requests Actions Releases Activity

Add remaining tanks

Browse Source
This commit is contained in:
Lorenz Stechauner
2026-07-13 17:11:21 +02:00
parent 011f90233c
commit 74ec9527da
13 changed files with 378 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files
PamhagenSysCtrl/Helpers/Pipeline/Graph.cs
+25 -3
View File
@@ -22,6 +22,18 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
return p; return p;
} }
public Pipe CreateTwoWayPipe(INode n1, INode n2, bool verticalFirst = false) {
Nodes.Add(n1);
Nodes.Add(n2);
var p = new Pipe(n1, n2, verticalFirst, twoWay: true);
n1.Inputs.Add(p);
n1.Outputs.Add(p);
n2.Inputs.Add(p);
n2.Outputs.Add(p);
Edges.Add(p);
return p;
}
public Inlet CreateInlet(INode start, ISink end) { public Inlet CreateInlet(INode start, ISink end) {
Nodes.Add(start); Nodes.Add(start);
Nodes.Add(end); Nodes.Add(end);
@@ -32,16 +44,26 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
return p; return p;
} }
public Outlet CreateOutlet(ISource start, INode end) {
Nodes.Add(start);
Nodes.Add(end);
var p = new Outlet(start, end);
start.Outputs.Add(p);
end.Inputs.Add(p);
Edges.Add(p);
return p;
}
public Path? GetPath(INode start, INode end, Func<INode, bool>? valid = null) { public Path? GetPath(INode start, INode end, Func<INode, bool>? valid = null) {
if (!Nodes.Contains(start) || !Nodes.Contains(end)) throw new ArgumentException("Start/end node not contained in graph"); if (!Nodes.Contains(start) || !Nodes.Contains(end)) throw new ArgumentException("Start/end node not contained in graph");
valid ??= a => true; valid ??= a => true;
List<(IEdge, INode)> hops = []; List<(IEdge, INode)> hops = [];
Path? path = null; Path? path = null;
foreach (var o in start.Outputs) { foreach (var o in start.Outputs) {
if (!valid(o.End)) { if (o.End == end) {
continue;
} else if (o.End == end) {
return new(start, [(o, o.End)]); return new(start, [(o, o.End)]);
} else if (!valid(o.End)) {
continue;
} }
var p = GetPath(o.End, end, valid); var p = GetPath(o.End, end, valid);
PamhagenSysCtrl/Helpers/Pipeline/IEdge.cs
+3 -1
View File
@@ -1,12 +1,14 @@
using System.Windows.Controls; using System.Windows.Controls;
using System.Windows.Media;
namespace PamhagenSysCtrl.Helpers.Pipeline { namespace PamhagenSysCtrl.Helpers.Pipeline {
public interface IEdge { public interface IEdge {
public INode Start { get; } public INode Start { get; }
public INode End { get; } public INode End { get; }
public bool IsTwoWay { get; }
public bool Orientation { get; } public bool Orientation { get; }
public bool Highlight { get; set; } public Brush? Highlight { get; set; }
public void Draw(Canvas canvas); public void Draw(Canvas canvas);
public bool Update(double x, double y); public bool Update(double x, double y);
PamhagenSysCtrl/Helpers/Pipeline/ISource.cs
+1
View File
@@ -1,5 +1,6 @@
namespace PamhagenSysCtrl.Helpers.Pipeline { namespace PamhagenSysCtrl.Helpers.Pipeline {
public interface ISource : INode { public interface ISource : INode {
public double BottomY { get; }
public bool IsFilled { get; } public bool IsFilled { get; }
} }
} }
PamhagenSysCtrl/Helpers/Pipeline/Inlet.cs
+6 -5
View File
@@ -8,8 +8,9 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
public INode Start { get; set; } public INode Start { get; set; }
public INode End => Sink; public INode End => Sink;
public ISink Sink { get; set; } public ISink Sink { get; set; }
public bool IsTwoWay => false;
public bool Orientation { get; set; } public bool Orientation { get; set; }
public bool Highlight { get; set; } public Brush? Highlight { get; set; }
private Line? _outer1; private Line? _outer1;
private Line? _outer2; private Line? _outer2;
@@ -36,7 +37,7 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
Y2 = y2, Y2 = y2,
StrokeThickness = 10, StrokeThickness = 10,
Stroke = Brushes.Black, Stroke = Brushes.Black,
StrokeStartLineCap = PenLineCap.Square, StrokeStartLineCap = PenLineCap.Round,
StrokeEndLineCap = PenLineCap.Round, StrokeEndLineCap = PenLineCap.Round,
}; };
_inner1 = new Line() { _inner1 = new Line() {
@@ -46,7 +47,7 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
Y2 = y2, Y2 = y2,
StrokeThickness = 6, StrokeThickness = 6,
Stroke = Brushes.DarkGray, Stroke = Brushes.DarkGray,
StrokeStartLineCap = PenLineCap.Square, StrokeStartLineCap = PenLineCap.Round,
StrokeEndLineCap = PenLineCap.Round, StrokeEndLineCap = PenLineCap.Round,
}; };
_outer2 = new Line() { _outer2 = new Line() {
@@ -76,8 +77,8 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
} }
public bool Update(double x, double y) { public bool Update(double x, double y) {
_inner1?.Stroke = Highlight ? Brushes.Green : Brushes.DarkGray; _inner1?.Stroke = Highlight ?? Brushes.DarkGray;
_inner2?.Stroke = Highlight ? Brushes.Green : Brushes.DarkGray; _inner2?.Stroke = Highlight ?? Brushes.DarkGray;
return false; return false;
} }
} }
PamhagenSysCtrl/Helpers/Pipeline/Outlet.cs
+96
View File
@@ -0,0 +1,96 @@
using System.Windows.Controls;
using System.Windows.Media;
using System.Windows.Shapes;
namespace PamhagenSysCtrl.Helpers.Pipeline {
public class Outlet : IEdge {
public const double POINT = 16;
public INode Start => Source;
public INode End { get; set; }
public ISource Source { get; set; }
public bool IsTwoWay => false;
public bool Orientation { get; set; }
public Brush? Highlight { get; set; }
private Polygon? _hopper;
private Line? _outer1;
private Line? _outer2;
private Line? _inner1;
private Line? _inner2;
public Outlet(ISource start, INode end) {
Source = start;
End = end;
Orientation = true;
}
public void Draw(Canvas canvas) {
var x1 = Start.CenterX ;
var y1 = Source.BottomY;
var x2 = Orientation ? Start.CenterX : End.CenterX;
var y2 = Orientation ? End.CenterY : Start.CenterY;
var x3 = End.CenterX;
var y3 = End.CenterY;
_hopper = new Polygon() {
Points = [new(x1 - POINT, y1 - 2), new(x1 + POINT, y1 - 2), new(x1, y1 + POINT)],
Fill = Brushes.DarkGray,
Stroke = Brushes.Black,
StrokeThickness = 2,
};
_outer1 = new Line() {
X1 = x1,
Y1 = y1,
X2 = x2,
Y2 = y2,
StrokeThickness = 10,
Stroke = Brushes.Black,
StrokeStartLineCap = PenLineCap.Round,
StrokeEndLineCap = PenLineCap.Round,
};
_inner1 = new Line() {
X1 = x1,
Y1 = y1,
X2 = x2,
Y2 = y2,
StrokeThickness = 6,
Stroke = Brushes.DarkGray,
StrokeStartLineCap = PenLineCap.Round,
StrokeEndLineCap = PenLineCap.Round,
};
_outer2 = new Line() {
X1 = x2,
Y1 = y2,
X2 = x3,
Y2 = y3,
StrokeThickness = 10,
Stroke = Brushes.Black,
StrokeStartLineCap = PenLineCap.Round,
StrokeEndLineCap = PenLineCap.Round,
};
_inner2 = new Line() {
X1 = x2,
Y1 = y2,
X2 = x3,
Y2 = y3,
StrokeThickness = 6,
Stroke = Brushes.DarkGray,
StrokeStartLineCap = PenLineCap.Square,
StrokeEndLineCap = PenLineCap.Square,
};
canvas.Children.Add(_outer1);
canvas.Children.Add(_outer2);
canvas.Children.Add(_hopper);
canvas.Children.Add(_inner1);
canvas.Children.Add(_inner2);
}
public bool Update(double x, double y) {
_inner1?.Stroke = Highlight ?? Brushes.DarkGray;
_inner2?.Stroke = Highlight ?? Brushes.DarkGray;
_hopper?.Fill = Highlight ?? Brushes.DarkGray;
return false;
}
}
}
PamhagenSysCtrl/Helpers/Pipeline/Pipe.cs
+14 -12
View File
@@ -8,18 +8,20 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
public INode Start { get; set; } public INode Start { get; set; }
public INode End { get; set; } public INode End { get; set; }
public bool IsTwoWay { get; set; }
public bool Orientation { get; set; } public bool Orientation { get; set; }
public bool Highlight { get; set; } public Brush? Highlight { get; set; }
private Line? _outer1; private Line? _outer1;
private Line? _outer2; private Line? _outer2;
private Line? _inner1; private Line? _inner1;
private Line? _inner2; private Line? _inner2;
public Pipe(INode start, INode end, bool orientation = false) { public Pipe(INode start, INode end, bool orientation = false, bool twoWay = false) {
Start = start; Start = start;
End = end; End = end;
Orientation = orientation; Orientation = orientation;
IsTwoWay = twoWay;
} }
public void Draw(Canvas canvas) { public void Draw(Canvas canvas) {
@@ -33,29 +35,29 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
X1 = x1, Y1 = y1, X2 = x2, Y2 = y2, X1 = x1, Y1 = y1, X2 = x2, Y2 = y2,
StrokeThickness = 10, StrokeThickness = 10,
Stroke = Brushes.Black, Stroke = Brushes.Black,
StrokeStartLineCap = PenLineCap.Square, StrokeStartLineCap = PenLineCap.Round,
StrokeEndLineCap = PenLineCap.Square, StrokeEndLineCap = PenLineCap.Round,
}; };
_inner1 = new Line() { _inner1 = new Line() {
X1 = x1, Y1 = y1, X2 = x2, Y2 = y2, X1 = x1, Y1 = y1, X2 = x2, Y2 = y2,
StrokeThickness = 6, StrokeThickness = 6,
Stroke = Brushes.DarkGray, Stroke = Brushes.DarkGray,
StrokeStartLineCap = PenLineCap.Square, StrokeStartLineCap = PenLineCap.Round,
StrokeEndLineCap = PenLineCap.Square, StrokeEndLineCap = PenLineCap.Round,
}; };
_outer2 = new Line() { _outer2 = new Line() {
X1 = x2, Y1 = y2, X2 = x3, Y2 = y3, X1 = x2, Y1 = y2, X2 = x3, Y2 = y3,
StrokeThickness = 10, StrokeThickness = 10,
Stroke = Brushes.Black, Stroke = Brushes.Black,
StrokeStartLineCap = PenLineCap.Square, StrokeStartLineCap = PenLineCap.Round,
StrokeEndLineCap = PenLineCap.Square, StrokeEndLineCap = PenLineCap.Round,
}; };
_inner2 = new Line() { _inner2 = new Line() {
X1 = x2, Y1 = y2, X2 = x3, Y2 = y3, X1 = x2, Y1 = y2, X2 = x3, Y2 = y3,
StrokeThickness = 6, StrokeThickness = 6,
Stroke = Brushes.DarkGray, Stroke = Brushes.DarkGray,
StrokeStartLineCap = PenLineCap.Square, StrokeStartLineCap = PenLineCap.Round,
StrokeEndLineCap = PenLineCap.Square, StrokeEndLineCap = PenLineCap.Round,
}; };
canvas.Children.Add(_outer1); canvas.Children.Add(_outer1);
canvas.Children.Add(_outer2); canvas.Children.Add(_outer2);
@@ -64,8 +66,8 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
} }
public bool Update(double x, double y) { public bool Update(double x, double y) {
_inner1?.Stroke = Highlight ? Brushes.Green: Brushes.DarkGray; _inner1?.Stroke = Highlight ?? Brushes.DarkGray;
_inner2?.Stroke = Highlight ? Brushes.Green : Brushes.DarkGray; _inner2?.Stroke = Highlight ?? Brushes.DarkGray;
return false; return false;
} }
} }
PamhagenSysCtrl/Helpers/Pipeline/PipeJoin.cs
+25 -13
View File
@@ -16,7 +16,7 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
public ISet<IEdge> Inputs { get; init; } public ISet<IEdge> Inputs { get; init; }
public ISet<IEdge> Outputs { get; init; } public ISet<IEdge> Outputs { get; init; }
private Polygon? _rect; private Shape? _rect;
public PipeJoin(double x, double y) { public PipeJoin(double x, double y) {
CenterX = x; CenterX = x;
@@ -26,35 +26,47 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
} }
public void Draw(Canvas canvas) { public void Draw(Canvas canvas) {
bool? top = Inputs.Any(e => e.Start.CenterY < CenterY && (!e.Orientation || e.Start.CenterX == CenterX)) ? false : Outputs.Any(e => e.End.CenterY < CenterY && (e.Orientation || e.Start.CenterX == CenterX)) ? true : null; var it = Inputs.Any(e => (e.Start.CenterY < CenterY && (!e.Orientation || e.Start.CenterX == CenterX)) || (e.IsTwoWay && e.End.CenterY < CenterY && (!e.Orientation || e.End.CenterX == CenterX)));
bool? right = Inputs.Any(e => e.Start.CenterX > CenterX && (e.Orientation || e.Start.CenterY == CenterY)) ? false : Outputs.Any(e => e.End.CenterX > CenterX && (!e.Orientation || e.Start.CenterY == CenterY)) ? true : null; var ot = Outputs.Any(e => (e.End.CenterY < CenterY && ( e.Orientation || e.End.CenterX == CenterX)) || (e.IsTwoWay && e.Start.CenterY < CenterY && ( e.Orientation || e.Start.CenterX == CenterX)));
bool? bottom = Inputs.Any(e => e.Start.CenterY > CenterY && (!e.Orientation || e.Start.CenterX == CenterX)) ? false : Outputs.Any(e => e.End.CenterY > CenterY && (e.Orientation || e.Start.CenterX == CenterX)) ? true : null; var ir = Inputs.Any(e => (e.Start.CenterX > CenterX && ( e.Orientation || e.Start.CenterY == CenterY)) || (e.IsTwoWay && e.End.CenterX > CenterX && ( e.Orientation || e.End.CenterY == CenterY)));
bool? left = Inputs.Any(e => e.Start.CenterX < CenterX && (e.Orientation || e.Start.CenterY == CenterY)) ? false : Outputs.Any(e => e.End.CenterX < CenterX && (!e.Orientation || e.Start.CenterY == CenterY)) ? true : null; var or = Outputs.Any(e => (e.End.CenterX > CenterX && (!e.Orientation || e.End.CenterY == CenterY)) || (e.IsTwoWay && e.Start.CenterX > CenterX && (!e.Orientation || e.Start.CenterY == CenterY)));
var ib = Inputs.Any(e => (e.Start.CenterY > CenterY && (!e.Orientation || e.Start.CenterX == CenterX)) || (e.IsTwoWay && e.End.CenterY > CenterY && (!e.Orientation || e.End.CenterX == CenterX)));
var ob = Outputs.Any(e => (e.End.CenterY > CenterY && ( e.Orientation || e.End.CenterX == CenterX)) || (e.IsTwoWay && e.Start.CenterY > CenterY && ( e.Orientation || e.Start.CenterX == CenterX)));
var il = Inputs.Any(e => (e.Start.CenterX < CenterX && ( e.Orientation || e.Start.CenterY == CenterY)) || (e.IsTwoWay && e.End.CenterX < CenterX && ( e.Orientation || e.End.CenterY == CenterY)));
var ol = Outputs.Any(e => (e.End.CenterX < CenterX && (!e.Orientation || e.End.CenterY == CenterY)) || (e.IsTwoWay && e.Start.CenterX < CenterX && (!e.Orientation || e.Start.CenterY == CenterY)));
var points = new List<Point> { var points = new List<Point> {
new(0, 0) new(0, 0)
}; };
if (top == true) { if (ot && it) {
points.AddRange([new(SIZE / 2 - POINT, 0), new(SIZE / 2, -POINT / 2), new(SIZE / 2, POINT / 2), new(SIZE / 2 + POINT, 0)]);
} else if (ot) {
points.AddRange([new(SIZE / 2 - POINT, 0), new(SIZE / 2, -POINT), new(SIZE / 2 + POINT, 0)]); points.AddRange([new(SIZE / 2 - POINT, 0), new(SIZE / 2, -POINT), new(SIZE / 2 + POINT, 0)]);
} else if (top == false) { } else if (it) {
points.AddRange([new(SIZE / 2 - POINT, 0), new(SIZE / 2, POINT), new(SIZE / 2 + POINT, 0)]); points.AddRange([new(SIZE / 2 - POINT, 0), new(SIZE / 2, POINT), new(SIZE / 2 + POINT, 0)]);
} }
points.Add(new(SIZE, 0)); points.Add(new(SIZE, 0));
if (right == true) { if (or && ir) {
points.AddRange([new(SIZE, SIZE / 2 - POINT), new(SIZE + POINT / 2, SIZE / 2), new(SIZE - POINT / 2, SIZE / 2), new(SIZE, SIZE / 2 + POINT)]);
} else if (or) {
points.AddRange([new(SIZE, SIZE / 2 - POINT), new(SIZE + POINT, SIZE / 2), new(SIZE, SIZE / 2 + POINT)]); points.AddRange([new(SIZE, SIZE / 2 - POINT), new(SIZE + POINT, SIZE / 2), new(SIZE, SIZE / 2 + POINT)]);
} else if (right == false) { } else if (ir) {
points.AddRange([new(SIZE, SIZE / 2 - POINT), new(SIZE - POINT, SIZE / 2), new(SIZE, SIZE / 2 + POINT)]); points.AddRange([new(SIZE, SIZE / 2 - POINT), new(SIZE - POINT, SIZE / 2), new(SIZE, SIZE / 2 + POINT)]);
} }
points.Add(new(SIZE, SIZE)); points.Add(new(SIZE, SIZE));
if (bottom == true) { if (ob && ib) {
points.AddRange([new(SIZE / 2 + POINT, SIZE), new(SIZE / 2, SIZE + POINT / 2), new(SIZE / 2, SIZE - POINT / 2), new(SIZE / 2 - POINT, SIZE)]);
} else if (ob) {
points.AddRange([new(SIZE / 2 + POINT, SIZE), new(SIZE / 2, SIZE + POINT), new(SIZE / 2 - POINT, SIZE)]); points.AddRange([new(SIZE / 2 + POINT, SIZE), new(SIZE / 2, SIZE + POINT), new(SIZE / 2 - POINT, SIZE)]);
} else if (bottom == false) { } else if (ib) {
points.AddRange([new(SIZE / 2 + POINT, SIZE), new(SIZE / 2, SIZE - POINT), new(SIZE / 2 - POINT, SIZE)]); points.AddRange([new(SIZE / 2 + POINT, SIZE), new(SIZE / 2, SIZE - POINT), new(SIZE / 2 - POINT, SIZE)]);
} }
points.Add(new(0, SIZE)); points.Add(new(0, SIZE));
if (left == true) { if (ol && il) {
points.AddRange([new(0, SIZE / 2 + POINT), new(-POINT / 2, SIZE / 2), new(POINT / 2, SIZE / 2), new(0, SIZE / 2 - POINT)]);
} else if (ol) {
points.AddRange([new(0, SIZE / 2 + POINT), new(-POINT, SIZE / 2), new(0, SIZE / 2 - POINT)]); points.AddRange([new(0, SIZE / 2 + POINT), new(-POINT, SIZE / 2), new(0, SIZE / 2 - POINT)]);
} else if (left == false) { } else if (il) {
points.AddRange([new(0, SIZE / 2 + POINT), new(POINT, SIZE / 2), new(0, SIZE / 2 - POINT)]); points.AddRange([new(0, SIZE / 2 + POINT), new(POINT, SIZE / 2), new(0, SIZE / 2 - POINT)]);
} }
PamhagenSysCtrl/Helpers/Pipeline/Pump.cs
+2 -2
View File
@@ -14,7 +14,7 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
public ISet<IEdge> Inputs { get; init; } public ISet<IEdge> Inputs { get; init; }
public ISet<IEdge> Outputs { get; init; } public ISet<IEdge> Outputs { get; init; }
private Ellipse? _circle; private Shape? _circle;
private TextBlock? _text; private TextBlock? _text;
public Pump(string label, double x, double y) { public Pump(string label, double x, double y) {
@@ -26,7 +26,7 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
} }
public void Draw(Canvas canvas) { public void Draw(Canvas canvas) {
_circle = new() { _circle = new Ellipse() {
Height = RADIUS, Height = RADIUS,
Width = RADIUS, Width = RADIUS,
Fill = Brushes.WhiteSmoke, Fill = Brushes.WhiteSmoke,
PamhagenSysCtrl/Helpers/Pipeline/Tank.cs
+22 -6
View File
@@ -1,4 +1,5 @@
using System.Windows.Controls; using System.Windows;
using System.Windows.Controls;
using System.Windows.Media; using System.Windows.Media;
using System.Windows.Shapes; using System.Windows.Shapes;
@@ -11,6 +12,7 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
public double CenterX { get; set; } public double CenterX { get; set; }
public double CenterY { get; set; } public double CenterY { get; set; }
public double TopY => CenterY - HEIGHT / 2; public double TopY => CenterY - HEIGHT / 2;
public double BottomY => CenterY + HEIGHT / 2;
public string Label { get; set; } public string Label { get; set; }
public bool IsFull => CallbackIsFull(); public bool IsFull => CallbackIsFull();
public bool IsFilled => CallbackIsFilled(); public bool IsFilled => CallbackIsFilled();
@@ -21,6 +23,9 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
protected Func<bool> CallbackIsFilled; protected Func<bool> CallbackIsFilled;
protected Func<bool> CallbackIsFull; protected Func<bool> CallbackIsFull;
private Shape? _rect;
private TextBlock? _text;
public Tank(string label, double x, double y, Func<bool> cbFilled, Func<bool> cbFull) { public Tank(string label, double x, double y, Func<bool> cbFilled, Func<bool> cbFull) {
CenterX = x; CenterX = x;
CenterY = y; CenterY = y;
@@ -32,20 +37,31 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
} }
public void Draw(Canvas canvas) { public void Draw(Canvas canvas) {
var rect = new Rectangle() { _rect = new Rectangle() {
Width = WIDTH, Width = WIDTH,
Height = HEIGHT, Height = HEIGHT,
Stroke = Brushes.Black, Stroke = Brushes.Black,
StrokeThickness = 2, StrokeThickness = 2,
Fill = Brushes.White, Fill = Brushes.WhiteSmoke,
}; };
rect.SetValue(Canvas.LeftProperty, CenterX - WIDTH / 2); _text = new() {
rect.SetValue(Canvas.TopProperty, CenterY - HEIGHT / 2); Text = Label,
canvas.Children.Add(rect); FontSize = 12,
Width = WIDTH,
TextAlignment = TextAlignment.Center,
VerticalAlignment = VerticalAlignment.Center,
};
_rect.SetValue(Canvas.LeftProperty, CenterX - WIDTH / 2);
_rect.SetValue(Canvas.TopProperty, CenterY - HEIGHT / 2);
_text.SetValue(Canvas.LeftProperty, CenterX - WIDTH / 2);
_text.SetValue(Canvas.TopProperty, CenterY - 8);
canvas.Children.Add(_rect);
canvas.Children.Add(_text);
} }
public bool Update(double x, double y) { public bool Update(double x, double y) {
var hover = Math.Abs(x - CenterX) <= WIDTH / 2 && Math.Abs(y - CenterY) <= HEIGHT / 2; var hover = Math.Abs(x - CenterX) <= WIDTH / 2 && Math.Abs(y - CenterY) <= HEIGHT / 2;
_rect?.Fill = hover ? Brushes.LightGray : Brushes.WhiteSmoke;
return hover; return hover;
} }
} }
PamhagenSysCtrl/Helpers/Pipeline/Trough.cs
+1
View File
@@ -5,6 +5,7 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
public double CenterX { get; set; } public double CenterX { get; set; }
public double CenterY { get; set; } public double CenterY { get; set; }
public double BottomY => CenterY;
public string Label { get; set; } public string Label { get; set; }
public bool IsFilled => CallbackIsFilled(); public bool IsFilled => CallbackIsFilled();
public ISet<IEdge> Inputs { get; init; } public ISet<IEdge> Inputs { get; init; }
PamhagenSysCtrl/Helpers/Pipeline/Valve.cs
+2 -2
View File
@@ -20,7 +20,7 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
protected Func<bool> CallbackIsOpen; protected Func<bool> CallbackIsOpen;
protected Func<bool> CallbackWantOpen; protected Func<bool> CallbackWantOpen;
private Ellipse? _circle; private Shape? _circle;
private TextBlock? _text; private TextBlock? _text;
public Valve(string label, double x, double y, Func<bool> cbOpen, Func<bool> cbWant) { public Valve(string label, double x, double y, Func<bool> cbOpen, Func<bool> cbWant) {
@@ -34,7 +34,7 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
} }
public void Draw(Canvas canvas) { public void Draw(Canvas canvas) {
_circle = new() { _circle = new Ellipse() {
Height = RADIUS, Height = RADIUS,
Width = RADIUS, Width = RADIUS,
Fill = Brushes.DarkGray, Fill = Brushes.DarkGray,
PamhagenSysCtrl/Windows/PlantSchemeWindow.xaml
+1 -1
View File
@@ -4,7 +4,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:PamhagenSysCtrl.Windows" xmlns:local="clr-namespace:PamhagenSysCtrl.Windows"
Title="Schema - Anlagensteuerung Pamhagen" Height="450" Width="800"> Title="Schema - Anlagensteuerung Pamhagen" Height="600" Width="1600">
<Grid MouseMove="SchemeCanvas_MouseMove"> <Grid MouseMove="SchemeCanvas_MouseMove">
<Canvas x:Name="SchemeCanvas"> <Canvas x:Name="SchemeCanvas">
</Canvas> </Canvas>
PamhagenSysCtrl/Windows/PlantSchemeWindow.xaml.cs
+180 -65
View File
@@ -2,6 +2,7 @@
using PamhagenSysCtrl.Helpers.Pipeline; using PamhagenSysCtrl.Helpers.Pipeline;
using System.Windows; using System.Windows;
using System.Windows.Input; using System.Windows.Input;
using System.Windows.Media;
namespace PamhagenSysCtrl.Windows { namespace PamhagenSysCtrl.Windows {
public partial class PlantSchemeWindow : Window { public partial class PlantSchemeWindow : Window {
@@ -16,6 +17,24 @@ namespace PamhagenSysCtrl.Windows {
Graph = new Graph(); Graph = new Graph();
double ltg1Y = 410;
double ltg2Y = ltg1Y + 30;
double ltg1X = 600;
double ltg2X = ltg1X + 30;
double ltg6Y = 60;
double ltg7Y = ltg6Y - 30;
double tanksY = 180;
double tValveY = ((tanksY - 50) + ltg6Y) / 2 + 5;
double t1X = 735;
double t2X = t1X + 80;
double t3X = t2X + 80;
double t4X = t3X + 80 + 30;
double t5X = t4X + 80;
double t6X = t5X + 80 + 30;
double t7X = t6X + 80;
double t8X = t7X + 80;
double t9X = t8X + 80;
MW1 = new Trough("MW1", 200, 50, () => App.Plant?.FillLevelA1 != FillState.Empty); MW1 = new Trough("MW1", 200, 50, () => App.Plant?.FillLevelA1 != FillState.Empty);
MW2 = new Trough("MW2", 50, 50, () => App.Plant?.FillLevelA1 != FillState.Empty); MW2 = new Trough("MW2", 50, 50, () => App.Plant?.FillLevelA1 != FillState.Empty);
var mp1 = new Pump("MP1", 200, 80); var mp1 = new Pump("MP1", 200, 80);
@@ -39,9 +58,9 @@ namespace PamhagenSysCtrl.Windows {
Graph.CreatePipe(x2, v3); Graph.CreatePipe(x2, v3);
var x3 = new PipeJoin(200, 180); var x3 = new PipeJoin(200, 180);
var x4 = new PipeJoin(200, 210); var x4 = new PipeJoin(200, ltg1Y);
var x5 = new PipeJoin(50, 210); var x5 = new PipeJoin(50, 210);
var x6 = new PipeJoin(50, 240); var x6 = new PipeJoin(50, ltg2Y);
Graph.CreatePipe(v1, x3, true); Graph.CreatePipe(v1, x3, true);
Graph.CreatePipe(v3, x3, true); Graph.CreatePipe(v3, x3, true);
@@ -50,11 +69,11 @@ namespace PamhagenSysCtrl.Windows {
Graph.CreatePipe(v4, x5, true); Graph.CreatePipe(v4, x5, true);
Graph.CreatePipe(x5, x6, true); Graph.CreatePipe(x5, x6, true);
var v5 = CreateValve(5, 250, 210); var v5 = CreateValve(5, 250, ltg1Y);
var v6 = CreateValve(6, 200, 280); var v6 = CreateValve(6, 200, ltg2Y + 40);
var v7 = CreateValve(7, 125, 240); var v7 = CreateValve(7, 125, ltg2Y);
var v8 = CreateValve(8, 50, 280); var v8 = CreateValve(8, 50, ltg2Y + 40);
var v9 = CreateValve(9, 280, 240); var v9 = CreateValve(9, ltg2X, 400);
Graph.CreatePipe(x4, v5); Graph.CreatePipe(x4, v5);
Graph.CreatePipe(x4, v6); Graph.CreatePipe(x4, v6);
@@ -62,21 +81,21 @@ namespace PamhagenSysCtrl.Windows {
Graph.CreatePipe(x6, v8); Graph.CreatePipe(x6, v8);
Graph.CreatePipe(v7, v9); Graph.CreatePipe(v7, v9);
var xv15 = new PipeJoin(390, 210); var xv15 = new PipeJoin(ltg1X, 300);
var xv11 = new PipeJoin(360, 240); var xv11 = new PipeJoin(ltg2X, 330);
var x7 = new PipeJoin(320, 240); var x7 = new PipeJoin(ltg2X, 360);
Graph.CreatePipe(v5, xv15); Graph.CreatePipe(v5, xv15);
Graph.CreatePipe(v9, x7); Graph.CreatePipe(v9, x7);
Graph.CreatePipe(x7, xv11); Graph.CreatePipe(x7, xv11);
var v10 = CreateValve(10, 320, 280); var v10 = CreateValve(10, ltg2X + 40, 360);
var v11 = CreateValve(11, 360, 180); var v11 = CreateValve(11, ltg1X - 40, 330);
var v12 = CreateValve(12, 440, 210); var v12 = CreateValve(12, ltg1X, 260);
var v13 = CreateValve(13, 440, 240); var v13 = CreateValve(13, ltg2X, 260);
var v14 = CreateValve(14, 490, 180); var v14 = CreateValve(14, ltg1X - 40, 220);
var v15 = CreateValve(15, 390, 180); var v15 = CreateValve(15, ltg1X - 40, 300);
var v16 = CreateValve(16, 520, 180); var v16 = CreateValve(16, ltg1X - 40, 190);
Graph.CreatePipe(v10, x7); Graph.CreatePipe(v10, x7);
Graph.CreatePipe(xv11, v11); Graph.CreatePipe(xv11, v11);
@@ -84,52 +103,52 @@ namespace PamhagenSysCtrl.Windows {
Graph.CreatePipe(xv15, v12); Graph.CreatePipe(xv15, v12);
Graph.CreatePipe(xv11, v13); Graph.CreatePipe(xv11, v13);
var xv16 = new PipeJoin(520, 210); var xv16 = new PipeJoin(ltg1X, 190);
var xv14 = new PipeJoin(490, 240); var xv14 = new PipeJoin(ltg2X, 220);
Graph.CreatePipe(v12, xv16); Graph.CreatePipe(v12, xv16);
Graph.CreatePipe(v13, xv14); Graph.CreatePipe(v13, xv14);
Graph.CreatePipe(v16, xv16); Graph.CreatePipe(v16, xv16);
Graph.CreatePipe(v14, xv14); Graph.CreatePipe(v14, xv14);
var v20 = CreateValve(20, 650, 180); var v20 = CreateValve(20, ltg1X - 40, 60);
var v21 = CreateValve(21, 620, 180); var v21 = CreateValve(21, ltg1X - 40, 90);
var xv20 = new PipeJoin(650, 210); var xv20 = new PipeJoin(ltg1X, 60);
var xv21 = new PipeJoin(620, 240); var xv21 = new PipeJoin(ltg2X, 90);
Graph.CreatePipe(xv16, xv20); Graph.CreatePipe(xv16, xv20);
Graph.CreatePipe(xv14, xv21); Graph.CreatePipe(xv14, xv21);
Graph.CreatePipe(v20, xv20); Graph.CreatePipe(v20, xv20);
Graph.CreatePipe(v21, xv21); Graph.CreatePipe(v21, xv21);
var x8 = new PipeJoin(390, 140); var x8 = new PipeJoin(ltg1X - 80, 300);
var x9 = new PipeJoin(490, 140); var x9 = new PipeJoin(ltg1X - 80, 220);
var x10 = new PipeJoin(620, 140); var x10 = new PipeJoin(ltg1X - 80, 90);
Graph.CreatePipe(v11, x8, true); Graph.CreatePipe(v11, x8);
Graph.CreatePipe(v15, x8, true); Graph.CreatePipe(v15, x8);
Graph.CreatePipe(x9, v14); Graph.CreatePipe(x9, v14, true);
Graph.CreatePipe(x9, v16); Graph.CreatePipe(x9, v16, true);
Graph.CreatePipe(x10, v20); Graph.CreatePipe(x10, v20, true);
Graph.CreatePipe(x10, v21); Graph.CreatePipe(x10, v21, true);
var xv22 = new PipeJoin(720, 210); var xv22 = new PipeJoin(t1X - 15, ltg7Y);
var xv23 = new PipeJoin(750, 240); var xv23 = new PipeJoin(t1X + 15, ltg6Y);
var v22 = CreateValve(22, 720, 280); var v22 = CreateValve(22, t1X - 15, tValveY);
var v23 = CreateValve(23, 750, 280); var v23 = CreateValve(23, t1X + 15, tValveY);
var t1 = CreateTank(1, 735, 360); var t1 = CreateTank(1, t1X, tanksY);
Graph.CreatePipe(xv20, xv22); Graph.CreatePipe(xv20, xv22, true);
Graph.CreatePipe(xv21, xv23); Graph.CreatePipe(xv21, xv23, true);
Graph.CreatePipe(xv22, v22); Graph.CreatePipe(xv22, v22);
Graph.CreatePipe(xv23, v23); Graph.CreatePipe(xv23, v23);
Graph.CreateInlet(v22, t1); Graph.CreateInlet(v22, t1);
Graph.CreateInlet(v23, t1); Graph.CreateInlet(v23, t1);
var xv24 = new PipeJoin(800, 210); var xv24 = new PipeJoin(t2X - 15, ltg7Y);
var xv25 = new PipeJoin(830, 240); var xv25 = new PipeJoin(t2X + 15, ltg6Y);
var v24 = CreateValve(24, 800, 280); var v24 = CreateValve(24, t2X - 15, tValveY);
var v25 = CreateValve(25, 830, 280); var v25 = CreateValve(25, t2X + 15, tValveY);
var t2 = CreateTank(2, 815, 360); var t2 = CreateTank(2, t2X, tanksY);
Graph.CreatePipe(xv22, xv24); Graph.CreatePipe(xv22, xv24);
Graph.CreatePipe(xv23, xv25); Graph.CreatePipe(xv23, xv25);
Graph.CreatePipe(xv24, v24); Graph.CreatePipe(xv24, v24);
@@ -137,11 +156,11 @@ namespace PamhagenSysCtrl.Windows {
Graph.CreateInlet(v24, t2); Graph.CreateInlet(v24, t2);
Graph.CreateInlet(v25, t2); Graph.CreateInlet(v25, t2);
var xv26 = new PipeJoin(880, 210); var xv26 = new PipeJoin(t3X - 15, ltg7Y);
var xv27 = new PipeJoin(910, 240); var xv27 = new PipeJoin(t3X + 15, ltg6Y);
var v26 = CreateValve(26, 880, 280); var v26 = CreateValve(26, t3X - 15, tValveY);
var v27 = CreateValve(27, 910, 280); var v27 = CreateValve(27, t3X + 15, tValveY);
var t3 = CreateTank(3, 895, 360); var t3 = CreateTank(3, t3X, tanksY);
Graph.CreatePipe(xv24, xv26); Graph.CreatePipe(xv24, xv26);
Graph.CreatePipe(xv25, xv27); Graph.CreatePipe(xv25, xv27);
Graph.CreatePipe(xv26, v26); Graph.CreatePipe(xv26, v26);
@@ -149,16 +168,16 @@ namespace PamhagenSysCtrl.Windows {
Graph.CreateInlet(v26, t3); Graph.CreateInlet(v26, t3);
Graph.CreateInlet(v27, t3); Graph.CreateInlet(v27, t3);
var v28 = CreateValve(28, 950, 210); var v28 = CreateValve(28, (t3X + t4X) / 2, ltg7Y);
var v29 = CreateValve(29, 950, 240); var v29 = CreateValve(29, (t3X + t4X) / 2, ltg6Y);
Graph.CreatePipe(xv26, v28); Graph.CreatePipe(xv26, v28);
Graph.CreatePipe(xv27, v29); Graph.CreatePipe(xv27, v29);
var xv30 = new PipeJoin(990, 210); var xv30 = new PipeJoin(t4X - 15, ltg7Y);
var xv31 = new PipeJoin(1020, 240); var xv31 = new PipeJoin(t4X + 15, ltg6Y);
var v30 = CreateValve(30, 990, 280); var v30 = CreateValve(30, t4X - 15, tValveY);
var v31 = CreateValve(31, 1020, 280); var v31 = CreateValve(31, t4X + 15, tValveY);
var t4 = CreateTank(4, 1005, 360); var t4 = CreateTank(4, t4X, tanksY);
Graph.CreatePipe(v28, xv30); Graph.CreatePipe(v28, xv30);
Graph.CreatePipe(v29, xv31); Graph.CreatePipe(v29, xv31);
Graph.CreatePipe(xv30, v30); Graph.CreatePipe(xv30, v30);
@@ -166,11 +185,11 @@ namespace PamhagenSysCtrl.Windows {
Graph.CreateInlet(v30, t4); Graph.CreateInlet(v30, t4);
Graph.CreateInlet(v31, t4); Graph.CreateInlet(v31, t4);
var xv32 = new PipeJoin(1070, 210); var xv32 = new PipeJoin(t5X - 15, ltg7Y);
var xv33 = new PipeJoin(1100, 240); var xv33 = new PipeJoin(t5X + 15, ltg6Y);
var v32 = CreateValve(32, 1070, 280); var v32 = CreateValve(32, t5X - 15, tValveY);
var v33 = CreateValve(33, 1100, 280); var v33 = CreateValve(33, t5X + 15, tValveY);
var t5 = CreateTank(5, 1085, 360); var t5 = CreateTank(5, t5X, tanksY);
Graph.CreatePipe(xv30, xv32); Graph.CreatePipe(xv30, xv32);
Graph.CreatePipe(xv31, xv33); Graph.CreatePipe(xv31, xv33);
Graph.CreatePipe(xv32, v32); Graph.CreatePipe(xv32, v32);
@@ -178,6 +197,102 @@ namespace PamhagenSysCtrl.Windows {
Graph.CreateInlet(v32, t5); Graph.CreateInlet(v32, t5);
Graph.CreateInlet(v33, t5); Graph.CreateInlet(v33, t5);
var v34 = CreateValve(34, (t5X + t6X) / 2, ltg7Y);
var v35 = CreateValve(35, (t5X + t6X) / 2, ltg6Y);
Graph.CreatePipe(xv32, v34);
Graph.CreatePipe(xv33, v35);
var xv36 = new PipeJoin(t6X + 15, ltg6Y);
var xv37 = new PipeJoin(t6X - 15, ltg7Y);
var v36 = CreateValve(36, t6X + 15, tValveY);
var v37 = CreateValve(37, t6X - 15, tValveY);
var t6 = CreateTank(6, t6X, tanksY);
Graph.CreatePipe(v34, xv37);
Graph.CreatePipe(v35, xv36);
Graph.CreatePipe(xv37, v37);
Graph.CreatePipe(xv36, v36);
Graph.CreateInlet(v36, t6);
Graph.CreateInlet(v37, t6);
var xv38 = new PipeJoin(t7X + 15, ltg6Y);
var xv39 = new PipeJoin(t7X - 15, ltg7Y);
var v38 = CreateValve(38, t7X + 15, tValveY);
var v39 = CreateValve(39, t7X - 15, tValveY);
var t7 = CreateTank(7, t7X, tanksY);
Graph.CreatePipe(xv37, xv39);
Graph.CreatePipe(xv36, xv38);
Graph.CreatePipe(xv38, v38);
Graph.CreatePipe(xv39, v39);
Graph.CreateInlet(v38, t7);
Graph.CreateInlet(v39, t7);
var xv40 = new PipeJoin(t8X + 15, ltg6Y);
var xv41 = new PipeJoin(t8X - 15, ltg7Y);
var v40 = CreateValve(40, t8X + 15, tValveY);
var v41 = CreateValve(41, t8X - 15, tValveY);
var t8 = CreateTank(8, t8X, tanksY);
Graph.CreatePipe(xv38, xv40);
Graph.CreatePipe(xv39, xv41);
Graph.CreatePipe(xv40, v40);
Graph.CreatePipe(xv41, v41);
Graph.CreateInlet(v40, t8);
Graph.CreateInlet(v41, t8);
var v42 = CreateValve(42, t9X + 15, tValveY);
var v43 = CreateValve(43, t9X - 15, tValveY);
var t9 = CreateTank(9, t9X, tanksY);
Graph.CreatePipe(xv40, v42);
Graph.CreatePipe(xv41, v43);
Graph.CreateInlet(v42, t9);
Graph.CreateInlet(v43, t9);
var xp12 = new PipeJoin((t1X + t2X) / 2, tanksY + 80);
var p12 = new Pump("P1/2", (t1X + t2X) / 2, tanksY + 110);
Graph.CreateOutlet(t1, xp12);
Graph.CreateOutlet(t2, xp12);
Graph.CreatePipe(xp12, p12);
var p3 = new Pump("P3", t3X, tanksY + 110);
var p4 = new Pump("P4", t4X, tanksY + 110);
var p5 = new Pump("P5", t5X, tanksY + 110);
Graph.CreateOutlet(t3, p3);
Graph.CreateOutlet(t4, p4);
Graph.CreateOutlet(t5, p5);
var v44 = CreateValve(44, (t1X + t2X) / 2, tanksY + 150);
var v45 = CreateValve(45, t3X, tanksY + 150);
var v46 = CreateValve(46, (t3X + t4X) / 2, tanksY + 180);
var v47 = CreateValve(47, t4X, tanksY + 150);
var v48 = CreateValve(48, t5X, tanksY + 150);
var xv44 = new PipeJoin((t1X + t2X) / 2, tanksY + 180);
var xv45 = new PipeJoin(t3X, tanksY + 180);
var xv47 = new PipeJoin(t4X, tanksY + 180);
Graph.CreatePipe(p12, v44);
Graph.CreatePipe(p3, v45);
Graph.CreatePipe(p4, v47);
Graph.CreatePipe(p5, v48);
Graph.CreatePipe(v44, xv44);
Graph.CreatePipe(v45, xv45);
Graph.CreatePipe(v47, xv47);
Graph.CreatePipe(xv44, v10);
Graph.CreatePipe(v48, xv47, true);
Graph.CreateTwoWayPipe(xv47, v46);
Graph.CreateTwoWayPipe(v46, xv45);
Graph.CreateTwoWayPipe(xv45, xv44);
var xt6 = new PipeJoin(t6X, tanksY + 80);
var xt7 = new PipeJoin(t7X, tanksY + 80);
var xt8 = new PipeJoin(t8X, tanksY + 80);
var p6 = new Pump("P6", t6X, tanksY + 110);
Graph.CreateOutlet(t6, xt6);
Graph.CreateOutlet(t7, xt7);
Graph.CreateOutlet(t8, xt8);
Graph.CreateOutlet(t9, xt8);
Graph.CreatePipe(xt8, xt7);
Graph.CreatePipe(xt7, xt6);
Graph.CreatePipe(xt6, p6);
Graph.Draw(SchemeCanvas); Graph.Draw(SchemeCanvas);
} }
@@ -186,20 +301,20 @@ namespace PamhagenSysCtrl.Windows {
} }
private static Tank CreateTank(int n, double x, double y) { private static Tank CreateTank(int n, double x, double y) {
return new($"T{n}", x, y, () => App.Plant?.TankFillLevels[n - 1] != FillState.Empty, () => App.Plant?.TankFillLevels[n - 1] != FillState.Full); return new($"Tank {n}", x, y, () => App.Plant?.TankFillLevels[n - 1] != FillState.Empty, () => App.Plant?.TankFillLevels[n - 1] != FillState.Full);
} }
private void SchemeCanvas_MouseMove(object sender, MouseEventArgs evt) { private void SchemeCanvas_MouseMove(object sender, MouseEventArgs evt) {
var p = evt.GetPosition(SchemeCanvas); var p = evt.GetPosition(SchemeCanvas);
foreach (var e in Graph.Edges) { foreach (var e in Graph.Edges) {
e.Highlight = false; e.Highlight = null;
} }
var hover = Graph.Update(p.X, p.Y); var hover = Graph.Update(p.X, p.Y);
if (hover.Count > 0) { if (hover.Count > 0) {
var path = Graph.GetPath(MW1, hover.First()); var path = Graph.GetPath(MW1, hover.First(), (n) => n is not ISink);
if (path != null) { if (path != null) {
foreach (var (edge, node) in path.Value.Hops) { foreach (var (edge, node) in path.Value.Hops) {
edge.Highlight = true; edge.Highlight = Brushes.Green;
} }
} }
Graph.Update(p.X, p.Y); Graph.Update(p.X, p.Y);