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

Add press 1 and 2

Browse Source
This commit is contained in:
Lorenz Stechauner
2026-07-13 23:43:05 +02:00
parent 74ec9527da
commit 0967249a22
9 changed files with 200 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
PamhagenSysCtrl/Helpers/Pipeline/ISink.cs
+1
View File
@@ -2,5 +2,6 @@
public interface ISink : INode { public interface ISink : INode {
public double TopY { get; } public double TopY { get; }
public bool IsFull { get; } public bool IsFull { get; }
public int? CapacityLiters { get; }
} }
} }
PamhagenSysCtrl/Helpers/Pipeline/Inlet.cs
+2 -2
View File
@@ -28,8 +28,8 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
var y1 = Start.CenterY; var y1 = Start.CenterY;
var x2 = Start.CenterX; var x2 = Start.CenterX;
var y2 = Sink.TopY - 10; var y2 = Sink.TopY - 10;
var x3 = Start.CenterX + (Orientation ? -10 : 10); var x3 = Start.CenterX + (Orientation ? -20 : 20);
var y3 = Sink.TopY + 10; var y3 = Sink.TopY + 20;
_outer1 = new Line() { _outer1 = new Line() {
X1 = x1, X1 = x1,
Y1 = y1, Y1 = y1,
PamhagenSysCtrl/Helpers/Pipeline/Outlet.cs
+2 -2
View File
@@ -46,7 +46,7 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
Y2 = y2, Y2 = y2,
StrokeThickness = 10, StrokeThickness = 10,
Stroke = Brushes.Black, Stroke = Brushes.Black,
StrokeStartLineCap = PenLineCap.Round, StrokeStartLineCap = PenLineCap.Flat,
StrokeEndLineCap = PenLineCap.Round, StrokeEndLineCap = PenLineCap.Round,
}; };
_inner1 = new Line() { _inner1 = new Line() {
@@ -56,7 +56,7 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
Y2 = y2, Y2 = y2,
StrokeThickness = 6, StrokeThickness = 6,
Stroke = Brushes.DarkGray, Stroke = Brushes.DarkGray,
StrokeStartLineCap = PenLineCap.Round, StrokeStartLineCap = PenLineCap.Flat,
StrokeEndLineCap = PenLineCap.Round, StrokeEndLineCap = PenLineCap.Round,
}; };
_outer2 = new Line() { _outer2 = new Line() {
PamhagenSysCtrl/Helpers/Pipeline/Press.cs
+68
View File
@@ -0,0 +1,68 @@
using System.Windows;
using System.Windows.Controls;
using System.Windows.Media;
using System.Windows.Shapes;
namespace PamhagenSysCtrl.Helpers.Pipeline {
public class Press : INode, ISink {
public const double DIAMETER = 120;
public double CenterX { get; set; }
public double CenterY { get; set; }
public string Label { get; set; }
public ISet<IEdge> Inputs { get; set; }
public ISet<IEdge> Outputs { get; set; }
protected Func<bool> CallbackIsFull;
public double TopY => CenterY - DIAMETER / 2;
public bool IsFull => CallbackIsFull();
public int? CapacityLiters { get; set; }
private Shape? _circle;
private TextBlock? _text;
public Press(string label, double x, double y, int capacityLiters, Func<bool> cbFull) {
CenterX = x;
CenterY = y;
Label = label;
CapacityLiters = capacityLiters;
CallbackIsFull = cbFull;
Inputs = new HashSet<IEdge>();
Outputs = new HashSet<IEdge>();
}
public void Draw(Canvas canvas) {
_circle = new Ellipse() {
Width = DIAMETER,
Height = DIAMETER,
Stroke = Brushes.Black,
StrokeThickness = 2,
Fill = Brushes.WhiteSmoke,
};
_text = new() {
Text = CapacityLiters.HasValue ? $"{Label}\n{CapacityLiters:N0}" : Label,
FontSize = 14,
Width = DIAMETER,
TextAlignment = TextAlignment.Center,
VerticalAlignment = VerticalAlignment.Center,
};
_circle.SetValue(Canvas.LeftProperty, CenterX - DIAMETER / 2);
_circle.SetValue(Canvas.TopProperty, CenterY - DIAMETER / 2);
_text.SetValue(Canvas.LeftProperty, CenterX - DIAMETER / 2);
_text.SetValue(Canvas.TopProperty, CenterY - (CapacityLiters.HasValue ? 20 : 10));
canvas.Children.Add(_circle);
canvas.Children.Add(_text);
}
public bool Update(double x, double y) {
var hover = Math.Sqrt(Math.Pow(CenterX - x, 2) + Math.Pow(CenterY - y, 2)) <= DIAMETER / 2;
_circle?.Fill = hover ? Brushes.LightGray : Brushes.WhiteSmoke;
return hover;
}
}
}
PamhagenSysCtrl/Helpers/Pipeline/Pump.cs
+29 -7
View File
@@ -1,11 +1,12 @@
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;
namespace PamhagenSysCtrl.Helpers.Pipeline { namespace PamhagenSysCtrl.Helpers.Pipeline {
public class Pump : INode { public class Pump : INode {
public const double RADIUS = 24; public const double DIAMETER = 24;
public double CenterX { get; set; } public double CenterX { get; set; }
public double CenterY { get; set; } public double CenterY { get; set; }
@@ -15,6 +16,7 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
public ISet<IEdge> Outputs { get; init; } public ISet<IEdge> Outputs { get; init; }
private Shape? _circle; private Shape? _circle;
private Shape? _triangle;
private TextBlock? _text; private TextBlock? _text;
public Pump(string label, double x, double y) { public Pump(string label, double x, double y) {
@@ -27,19 +29,39 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
public void Draw(Canvas canvas) { public void Draw(Canvas canvas) {
_circle = new Ellipse() { _circle = new Ellipse() {
Height = RADIUS, Height = DIAMETER,
Width = RADIUS, Width = DIAMETER,
Fill = Brushes.WhiteSmoke, Fill = Brushes.WhiteSmoke,
Stroke = Brushes.Black, Stroke = Brushes.Black,
StrokeThickness = 2, StrokeThickness = 2,
}; };
_circle.SetValue(Canvas.LeftProperty, CenterX - RADIUS / 2); var dx = Math.Cos(Math.PI / 6) * (DIAMETER / 2 - 2);
_circle.SetValue(Canvas.TopProperty, CenterY - RADIUS / 2); var dy = Math.Sin(Math.PI / 6) * (DIAMETER / 2 - 2);
_triangle = new Polygon() {
Points = [new(CenterX - dx, CenterY - dy), new(CenterX + dx, CenterY - dy), new(CenterX, CenterY + DIAMETER / 2 - 2)],
Fill = Brushes.Transparent,
Stroke = Brushes.Black,
StrokeThickness = 2,
};
_text = new() {
Text = Label,
FontSize = 14,
TextAlignment = TextAlignment.Left,
VerticalAlignment = VerticalAlignment.Center,
};
_circle.SetValue(Canvas.LeftProperty, CenterX - DIAMETER / 2);
_circle.SetValue(Canvas.TopProperty, CenterY - DIAMETER / 2);
_text.SetValue(Canvas.LeftProperty, CenterX + DIAMETER / 2 + 2);
_text.SetValue(Canvas.TopProperty, CenterY - 10);
canvas.Children.Add(_circle); canvas.Children.Add(_circle);
canvas.Children.Add(_triangle);
canvas.Children.Add(_text);
} }
public bool Update(double x, double y) { public bool Update(double x, double y) {
return false; var hover = Math.Sqrt(Math.Pow(CenterX - x, 2) + Math.Pow(CenterY - y, 2)) <= DIAMETER / 2;
_circle?.Fill = hover ? Brushes.LightGray : Brushes.WhiteSmoke;
return hover;
} }
} }
} }
PamhagenSysCtrl/Helpers/Pipeline/Tank.cs
+6 -3
View File
@@ -20,16 +20,19 @@ 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; }
public int? CapacityLiters { get; set; }
protected Func<bool> CallbackIsFilled; protected Func<bool> CallbackIsFilled;
protected Func<bool> CallbackIsFull; protected Func<bool> CallbackIsFull;
private Shape? _rect; private Shape? _rect;
private TextBlock? _text; 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, int capacityLiters, Func<bool> cbFilled, Func<bool> cbFull) {
CenterX = x; CenterX = x;
CenterY = y; CenterY = y;
Label = label; Label = label;
CapacityLiters = capacityLiters;
CallbackIsFilled = cbFilled; CallbackIsFilled = cbFilled;
CallbackIsFull = cbFull; CallbackIsFull = cbFull;
Inputs = new HashSet<IEdge>(); Inputs = new HashSet<IEdge>();
@@ -45,7 +48,7 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
Fill = Brushes.WhiteSmoke, Fill = Brushes.WhiteSmoke,
}; };
_text = new() { _text = new() {
Text = Label, Text = CapacityLiters.HasValue ? $"{Label}\n{CapacityLiters:N0}" : Label,
FontSize = 12, FontSize = 12,
Width = WIDTH, Width = WIDTH,
TextAlignment = TextAlignment.Center, TextAlignment = TextAlignment.Center,
@@ -54,7 +57,7 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
_rect.SetValue(Canvas.LeftProperty, CenterX - WIDTH / 2); _rect.SetValue(Canvas.LeftProperty, CenterX - WIDTH / 2);
_rect.SetValue(Canvas.TopProperty, CenterY - HEIGHT / 2); _rect.SetValue(Canvas.TopProperty, CenterY - HEIGHT / 2);
_text.SetValue(Canvas.LeftProperty, CenterX - WIDTH / 2); _text.SetValue(Canvas.LeftProperty, CenterX - WIDTH / 2);
_text.SetValue(Canvas.TopProperty, CenterY - 8); _text.SetValue(Canvas.TopProperty, CenterY - (CapacityLiters.HasValue ? 16 : 8));
canvas.Children.Add(_rect); canvas.Children.Add(_rect);
canvas.Children.Add(_text); canvas.Children.Add(_text);
} }
PamhagenSysCtrl/Helpers/Pipeline/Valve.cs
+10 -10
View File
@@ -6,7 +6,7 @@ using System.Windows.Shapes;
namespace PamhagenSysCtrl.Helpers.Pipeline { namespace PamhagenSysCtrl.Helpers.Pipeline {
public class Valve : INode { public class Valve : INode {
public const double RADIUS = 24; public const double DIAMETER = 24;
public double CenterX { get; set; } public double CenterX { get; set; }
public double CenterY { get; set; } public double CenterY { get; set; }
@@ -35,30 +35,30 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
public void Draw(Canvas canvas) { public void Draw(Canvas canvas) {
_circle = new Ellipse() { _circle = new Ellipse() {
Height = RADIUS, Height = DIAMETER,
Width = RADIUS, Width = DIAMETER,
Fill = Brushes.DarkGray, Fill = Brushes.DarkGray,
Stroke = Brushes.Black, Stroke = Brushes.Black,
StrokeThickness = 2, StrokeThickness = 2,
}; };
_circle.SetValue(Canvas.LeftProperty, CenterX - RADIUS / 2); _circle.SetValue(Canvas.LeftProperty, CenterX - DIAMETER / 2);
_circle.SetValue(Canvas.TopProperty, CenterY - RADIUS / 2); _circle.SetValue(Canvas.TopProperty, CenterY - DIAMETER / 2);
_text = new() { _text = new() {
Text = Label, Text = Label,
FontSize = 10, FontSize = 10,
Width = RADIUS, Width = DIAMETER,
Height = RADIUS, Height = DIAMETER,
TextAlignment = TextAlignment.Center, TextAlignment = TextAlignment.Center,
VerticalAlignment = VerticalAlignment.Center, VerticalAlignment = VerticalAlignment.Center,
}; };
_text.SetValue(Canvas.LeftProperty, CenterX - RADIUS / 2); _text.SetValue(Canvas.LeftProperty, CenterX - DIAMETER / 2);
_text.SetValue(Canvas.TopProperty, CenterY - RADIUS / 2 + 5); _text.SetValue(Canvas.TopProperty, CenterY - DIAMETER / 2 + 5);
canvas.Children.Add(_circle); canvas.Children.Add(_circle);
canvas.Children.Add(_text); canvas.Children.Add(_text);
} }
public bool Update(double x, double y) { public bool Update(double x, double y) {
var hover = Math.Sqrt(Math.Pow(CenterX - x, 2) + Math.Pow(CenterY - y, 2)) <= RADIUS / 2; var hover = Math.Sqrt(Math.Pow(CenterX - x, 2) + Math.Pow(CenterY - y, 2)) <= DIAMETER / 2;
_circle?.Fill = hover ? Brushes.LightGray : Brushes.DarkGray; _circle?.Fill = hover ? Brushes.LightGray : Brushes.DarkGray;
return hover; return hover;
} }
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="600" Width="1600"> Title="Schema - Anlagensteuerung Pamhagen" Height="800" 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
+81 -35
View File
@@ -17,6 +17,9 @@ namespace PamhagenSysCtrl.Windows {
Graph = new Graph(); Graph = new Graph();
double mw2X = 100;
double mw1X = 250;
double mpY = 280;
double ltg1Y = 410; double ltg1Y = 410;
double ltg2Y = ltg1Y + 30; double ltg2Y = ltg1Y + 30;
double ltg1X = 600; double ltg1X = 600;
@@ -35,32 +38,32 @@ namespace PamhagenSysCtrl.Windows {
double t8X = t7X + 80; double t8X = t7X + 80;
double t9X = t8X + 80; double t9X = t8X + 80;
MW1 = new Trough("MW1", 200, 50, () => App.Plant?.FillLevelA1 != FillState.Empty); MW1 = new Trough("MW1", mw1X, mpY - 40, () => App.Plant?.FillLevelA1 != FillState.Empty);
MW2 = new Trough("MW2", 50, 50, () => App.Plant?.FillLevelA1 != FillState.Empty); MW2 = new Trough("MW2", mw2X, mpY - 40, () => App.Plant?.FillLevelA1 != FillState.Empty);
var mp1 = new Pump("MP1", 200, 80); var mp1 = new Pump("MP1", mw1X, mpY);
var mp2 = new Pump("MP2", 50, 80); var mp2 = new Pump("MP2", mw2X, mpY);
var x1 = new PipeJoin(200, 120); var x1 = new PipeJoin(mw1X, mpY + 40);
var x2 = new PipeJoin(50, 120); var x2 = new PipeJoin(mw2X, mpY + 40);
Graph.CreatePipe(MW1, mp1); Graph.CreateOutlet(MW1, mp1);
Graph.CreatePipe(MW2, mp2); Graph.CreateOutlet(MW2, mp2);
Graph.CreatePipe(mp1, x1); Graph.CreatePipe(mp1, x1);
Graph.CreatePipe(mp2, x2); Graph.CreatePipe(mp2, x2);
var v1 = CreateValve(1, 200, 150); var v1 = CreateValve(1, mw1X, mpY + 70);
var v2 = CreateValve(2, 50, 150); var v2 = CreateValve(2, mw2X, mpY + 70);
var v3 = CreateValve(3, 80, 150); var v3 = CreateValve(3, mw2X + 30, mpY + 70);
var v4 = CreateValve(4, 170, 150); var v4 = CreateValve(4, mw1X - 30, mpY + 70);
Graph.CreatePipe(x1, v1); Graph.CreatePipe(x1, v1);
Graph.CreatePipe(x1, v4); Graph.CreatePipe(x1, v4);
Graph.CreatePipe(x2, v2); Graph.CreatePipe(x2, v2);
Graph.CreatePipe(x2, v3); Graph.CreatePipe(x2, v3);
var x3 = new PipeJoin(200, 180); var x3 = new PipeJoin(mw1X, mpY + 100);
var x4 = new PipeJoin(200, ltg1Y); var x4 = new PipeJoin(mw1X, ltg1Y);
var x5 = new PipeJoin(50, 210); var x5 = new PipeJoin(mw2X, mpY + 130);
var x6 = new PipeJoin(50, ltg2Y); var x6 = new PipeJoin(mw2X, ltg2Y);
Graph.CreatePipe(v1, x3, true); Graph.CreatePipe(v1, x3, true);
Graph.CreatePipe(v3, x3, true); Graph.CreatePipe(v3, x3, true);
@@ -69,10 +72,10 @@ 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, ltg1Y); var v5 = CreateValve(5, mw1X + 50, ltg1Y);
var v6 = CreateValve(6, 200, ltg2Y + 40); var v6 = CreateValve(6, mw1X, ltg2Y + 40);
var v7 = CreateValve(7, 125, ltg2Y); var v7 = CreateValve(7, (mw2X + mw1X) / 2, ltg2Y);
var v8 = CreateValve(8, 50, ltg2Y + 40); var v8 = CreateValve(8, mw2X, ltg2Y + 40);
var v9 = CreateValve(9, ltg2X, 400); var v9 = CreateValve(9, ltg2X, 400);
Graph.CreatePipe(x4, v5); Graph.CreatePipe(x4, v5);
@@ -136,7 +139,7 @@ namespace PamhagenSysCtrl.Windows {
var xv23 = new PipeJoin(t1X + 15, ltg6Y); var xv23 = new PipeJoin(t1X + 15, ltg6Y);
var v22 = CreateValve(22, t1X - 15, tValveY); var v22 = CreateValve(22, t1X - 15, tValveY);
var v23 = CreateValve(23, t1X + 15, tValveY); var v23 = CreateValve(23, t1X + 15, tValveY);
var t1 = CreateTank(1, t1X, tanksY); var t1 = CreateTank(1, t1X, tanksY, 100000);
Graph.CreatePipe(xv20, xv22, true); Graph.CreatePipe(xv20, xv22, true);
Graph.CreatePipe(xv21, xv23, true); Graph.CreatePipe(xv21, xv23, true);
Graph.CreatePipe(xv22, v22); Graph.CreatePipe(xv22, v22);
@@ -148,7 +151,7 @@ namespace PamhagenSysCtrl.Windows {
var xv25 = new PipeJoin(t2X + 15, ltg6Y); var xv25 = new PipeJoin(t2X + 15, ltg6Y);
var v24 = CreateValve(24, t2X - 15, tValveY); var v24 = CreateValve(24, t2X - 15, tValveY);
var v25 = CreateValve(25, t2X + 15, tValveY); var v25 = CreateValve(25, t2X + 15, tValveY);
var t2 = CreateTank(2, t2X, tanksY); var t2 = CreateTank(2, t2X, tanksY, 100000);
Graph.CreatePipe(xv22, xv24); Graph.CreatePipe(xv22, xv24);
Graph.CreatePipe(xv23, xv25); Graph.CreatePipe(xv23, xv25);
Graph.CreatePipe(xv24, v24); Graph.CreatePipe(xv24, v24);
@@ -160,7 +163,7 @@ namespace PamhagenSysCtrl.Windows {
var xv27 = new PipeJoin(t3X + 15, ltg6Y); var xv27 = new PipeJoin(t3X + 15, ltg6Y);
var v26 = CreateValve(26, t3X - 15, tValveY); var v26 = CreateValve(26, t3X - 15, tValveY);
var v27 = CreateValve(27, t3X + 15, tValveY); var v27 = CreateValve(27, t3X + 15, tValveY);
var t3 = CreateTank(3, t3X, tanksY); var t3 = CreateTank(3, t3X, tanksY, 100000);
Graph.CreatePipe(xv24, xv26); Graph.CreatePipe(xv24, xv26);
Graph.CreatePipe(xv25, xv27); Graph.CreatePipe(xv25, xv27);
Graph.CreatePipe(xv26, v26); Graph.CreatePipe(xv26, v26);
@@ -177,7 +180,7 @@ namespace PamhagenSysCtrl.Windows {
var xv31 = new PipeJoin(t4X + 15, ltg6Y); var xv31 = new PipeJoin(t4X + 15, ltg6Y);
var v30 = CreateValve(30, t4X - 15, tValveY); var v30 = CreateValve(30, t4X - 15, tValveY);
var v31 = CreateValve(31, t4X + 15, tValveY); var v31 = CreateValve(31, t4X + 15, tValveY);
var t4 = CreateTank(4, t4X, tanksY); var t4 = CreateTank(4, t4X, tanksY, 100000);
Graph.CreatePipe(v28, xv30); Graph.CreatePipe(v28, xv30);
Graph.CreatePipe(v29, xv31); Graph.CreatePipe(v29, xv31);
Graph.CreatePipe(xv30, v30); Graph.CreatePipe(xv30, v30);
@@ -189,7 +192,7 @@ namespace PamhagenSysCtrl.Windows {
var xv33 = new PipeJoin(t5X + 15, ltg6Y); var xv33 = new PipeJoin(t5X + 15, ltg6Y);
var v32 = CreateValve(32, t5X - 15, tValveY); var v32 = CreateValve(32, t5X - 15, tValveY);
var v33 = CreateValve(33, t5X + 15, tValveY); var v33 = CreateValve(33, t5X + 15, tValveY);
var t5 = CreateTank(5, t5X, tanksY); var t5 = CreateTank(5, t5X, tanksY, 100000);
Graph.CreatePipe(xv30, xv32); Graph.CreatePipe(xv30, xv32);
Graph.CreatePipe(xv31, xv33); Graph.CreatePipe(xv31, xv33);
Graph.CreatePipe(xv32, v32); Graph.CreatePipe(xv32, v32);
@@ -206,7 +209,7 @@ namespace PamhagenSysCtrl.Windows {
var xv37 = new PipeJoin(t6X - 15, ltg7Y); var xv37 = new PipeJoin(t6X - 15, ltg7Y);
var v36 = CreateValve(36, t6X + 15, tValveY); var v36 = CreateValve(36, t6X + 15, tValveY);
var v37 = CreateValve(37, t6X - 15, tValveY); var v37 = CreateValve(37, t6X - 15, tValveY);
var t6 = CreateTank(6, t6X, tanksY); var t6 = CreateTank(6, t6X, tanksY, 100000);
Graph.CreatePipe(v34, xv37); Graph.CreatePipe(v34, xv37);
Graph.CreatePipe(v35, xv36); Graph.CreatePipe(v35, xv36);
Graph.CreatePipe(xv37, v37); Graph.CreatePipe(xv37, v37);
@@ -218,7 +221,7 @@ namespace PamhagenSysCtrl.Windows {
var xv39 = new PipeJoin(t7X - 15, ltg7Y); var xv39 = new PipeJoin(t7X - 15, ltg7Y);
var v38 = CreateValve(38, t7X + 15, tValveY); var v38 = CreateValve(38, t7X + 15, tValveY);
var v39 = CreateValve(39, t7X - 15, tValveY); var v39 = CreateValve(39, t7X - 15, tValveY);
var t7 = CreateTank(7, t7X, tanksY); var t7 = CreateTank(7, t7X, tanksY, 100000);
Graph.CreatePipe(xv37, xv39); Graph.CreatePipe(xv37, xv39);
Graph.CreatePipe(xv36, xv38); Graph.CreatePipe(xv36, xv38);
Graph.CreatePipe(xv38, v38); Graph.CreatePipe(xv38, v38);
@@ -230,7 +233,7 @@ namespace PamhagenSysCtrl.Windows {
var xv41 = new PipeJoin(t8X - 15, ltg7Y); var xv41 = new PipeJoin(t8X - 15, ltg7Y);
var v40 = CreateValve(40, t8X + 15, tValveY); var v40 = CreateValve(40, t8X + 15, tValveY);
var v41 = CreateValve(41, t8X - 15, tValveY); var v41 = CreateValve(41, t8X - 15, tValveY);
var t8 = CreateTank(8, t8X, tanksY); var t8 = CreateTank(8, t8X, tanksY, 100000);
Graph.CreatePipe(xv38, xv40); Graph.CreatePipe(xv38, xv40);
Graph.CreatePipe(xv39, xv41); Graph.CreatePipe(xv39, xv41);
Graph.CreatePipe(xv40, v40); Graph.CreatePipe(xv40, v40);
@@ -240,7 +243,7 @@ namespace PamhagenSysCtrl.Windows {
var v42 = CreateValve(42, t9X + 15, tValveY); var v42 = CreateValve(42, t9X + 15, tValveY);
var v43 = CreateValve(43, t9X - 15, tValveY); var v43 = CreateValve(43, t9X - 15, tValveY);
var t9 = CreateTank(9, t9X, tanksY); var t9 = CreateTank(9, t9X, tanksY, 100000);
Graph.CreatePipe(xv40, v42); Graph.CreatePipe(xv40, v42);
Graph.CreatePipe(xv41, v43); Graph.CreatePipe(xv41, v43);
Graph.CreateInlet(v42, t9); Graph.CreateInlet(v42, t9);
@@ -281,10 +284,10 @@ namespace PamhagenSysCtrl.Windows {
Graph.CreateTwoWayPipe(v46, xv45); Graph.CreateTwoWayPipe(v46, xv45);
Graph.CreateTwoWayPipe(xv45, xv44); Graph.CreateTwoWayPipe(xv45, xv44);
var xt6 = new PipeJoin(t6X, tanksY + 80); var xt6 = new PipeJoin(t6X, tanksY + 110);
var xt7 = new PipeJoin(t7X, tanksY + 80); var xt7 = new PipeJoin(t7X, tanksY + 110);
var xt8 = new PipeJoin(t8X, tanksY + 80); var xt8 = new PipeJoin(t8X, tanksY + 110);
var p6 = new Pump("P6", t6X, tanksY + 110); var p6 = new Pump("P6", t6X, tanksY + 150);
Graph.CreateOutlet(t6, xt6); Graph.CreateOutlet(t6, xt6);
Graph.CreateOutlet(t7, xt7); Graph.CreateOutlet(t7, xt7);
Graph.CreateOutlet(t8, xt8); Graph.CreateOutlet(t8, xt8);
@@ -293,6 +296,49 @@ namespace PamhagenSysCtrl.Windows {
Graph.CreatePipe(xt7, xt6); Graph.CreatePipe(xt7, xt6);
Graph.CreatePipe(xt6, p6); Graph.CreatePipe(xt6, p6);
var v49 = CreateValve(49, t4X, tanksY + 220);
Graph.CreatePipe(xv47, v49);
var prY = 680;
var pr1X = 750;
var pr2X = 900;
var press1 = new Press("Presse 1", pr1X, prY, 200000, () => App.Plant?.FillLevelPress1 == FillState.Full);
var press2 = new Press("Presse 2", pr2X, prY, 150000, () => App.Plant?.FillLevelPress1 == FillState.Full);
var v50 = CreateValve(50, pr1X - 45, prY - 100);
var v51 = CreateValve(51, pr1X - 15, prY - 100);
var v52 = CreateValve(52, pr1X + 15, prY - 100);
var v53 = CreateValve(53, pr1X + 45, prY - 100);
var v54 = CreateValve(54, pr2X - 45, prY - 100);
var v55 = CreateValve(55, pr2X - 15, prY - 100);
var v56 = CreateValve(56, pr2X + 15, prY - 100);
var v57 = CreateValve(57, pr2X + 45, prY - 100);
var xp1 = new PipeJoin(pr1X - 15, 510);
var xp2 = new PipeJoin(pr1X + 15, 540);
var xp3 = new PipeJoin(pr2X - 45, 450);
var xp4 = new PipeJoin(pr2X + 45, 480);
Graph.CreatePipe(v6, xp1, true);
Graph.CreatePipe(v8, xp2, true);
Graph.CreatePipe(v49, xp3, true);
Graph.CreatePipe(p6, xp4, true);
Graph.CreatePipe(xp1, v51);
Graph.CreatePipe(xp1, v55);
Graph.CreatePipe(xp2, v52);
Graph.CreatePipe(xp2, v56);
Graph.CreatePipe(xp3, v50);
Graph.CreatePipe(xp3, v54);
Graph.CreatePipe(xp4, v53);
Graph.CreatePipe(xp4, v57);
Graph.CreateInlet(v50, press1);
Graph.CreateInlet(v51, press1);
Graph.CreateInlet(v52, press1);
Graph.CreateInlet(v53, press1);
Graph.CreateInlet(v54, press2);
Graph.CreateInlet(v55, press2);
Graph.CreateInlet(v56, press2);
Graph.CreateInlet(v57, press2);
Graph.Draw(SchemeCanvas); Graph.Draw(SchemeCanvas);
} }
@@ -300,8 +346,8 @@ namespace PamhagenSysCtrl.Windows {
return new($"V{n}", x, y, () => App.Plant?.IsValveOpen(4) ?? false, () => App.Plant?.WantValveOpen(4) ?? false); return new($"V{n}", x, y, () => App.Plant?.IsValveOpen(4) ?? false, () => App.Plant?.WantValveOpen(4) ?? false);
} }
private static Tank CreateTank(int n, double x, double y) { private static Tank CreateTank(int n, double x, double y, int capacity) {
return new($"Tank {n}", x, y, () => App.Plant?.TankFillLevels[n - 1] != FillState.Empty, () => App.Plant?.TankFillLevels[n - 1] != FillState.Full); return new($"Tank {n}", x, y, capacity, () => 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) {