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/Windows/PlantSchemeWindow.xaml.cs
+180 -65
View File
@@ -2,6 +2,7 @@
using PamhagenSysCtrl.Helpers.Pipeline;
using System.Windows;
using System.Windows.Input;
using System.Windows.Media;
namespace PamhagenSysCtrl.Windows {
public partial class PlantSchemeWindow : Window {
@@ -16,6 +17,24 @@ namespace PamhagenSysCtrl.Windows {
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);
MW2 = new Trough("MW2", 50, 50, () => App.Plant?.FillLevelA1 != FillState.Empty);
var mp1 = new Pump("MP1", 200, 80);
@@ -39,9 +58,9 @@ namespace PamhagenSysCtrl.Windows {
Graph.CreatePipe(x2, v3);
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 x6 = new PipeJoin(50, 240);
var x6 = new PipeJoin(50, ltg2Y);
Graph.CreatePipe(v1, x3, true);
Graph.CreatePipe(v3, x3, true);
@@ -50,11 +69,11 @@ namespace PamhagenSysCtrl.Windows {
Graph.CreatePipe(v4, x5, true);
Graph.CreatePipe(x5, x6, true);
var v5 = CreateValve(5, 250, 210);
var v6 = CreateValve(6, 200, 280);
var v7 = CreateValve(7, 125, 240);
var v8 = CreateValve(8, 50, 280);
var v9 = CreateValve(9, 280, 240);
var v5 = CreateValve(5, 250, ltg1Y);
var v6 = CreateValve(6, 200, ltg2Y + 40);
var v7 = CreateValve(7, 125, ltg2Y);
var v8 = CreateValve(8, 50, ltg2Y + 40);
var v9 = CreateValve(9, ltg2X, 400);
Graph.CreatePipe(x4, v5);
Graph.CreatePipe(x4, v6);
@@ -62,21 +81,21 @@ namespace PamhagenSysCtrl.Windows {
Graph.CreatePipe(x6, v8);
Graph.CreatePipe(v7, v9);
var xv15 = new PipeJoin(390, 210);
var xv11 = new PipeJoin(360, 240);
var x7 = new PipeJoin(320, 240);
var xv15 = new PipeJoin(ltg1X, 300);
var xv11 = new PipeJoin(ltg2X, 330);
var x7 = new PipeJoin(ltg2X, 360);
Graph.CreatePipe(v5, xv15);
Graph.CreatePipe(v9, x7);
Graph.CreatePipe(x7, xv11);
var v10 = CreateValve(10, 320, 280);
var v11 = CreateValve(11, 360, 180);
var v12 = CreateValve(12, 440, 210);
var v13 = CreateValve(13, 440, 240);
var v14 = CreateValve(14, 490, 180);
var v15 = CreateValve(15, 390, 180);
var v16 = CreateValve(16, 520, 180);
var v10 = CreateValve(10, ltg2X + 40, 360);
var v11 = CreateValve(11, ltg1X - 40, 330);
var v12 = CreateValve(12, ltg1X, 260);
var v13 = CreateValve(13, ltg2X, 260);
var v14 = CreateValve(14, ltg1X - 40, 220);
var v15 = CreateValve(15, ltg1X - 40, 300);
var v16 = CreateValve(16, ltg1X - 40, 190);
Graph.CreatePipe(v10, x7);
Graph.CreatePipe(xv11, v11);
@@ -84,52 +103,52 @@ namespace PamhagenSysCtrl.Windows {
Graph.CreatePipe(xv15, v12);
Graph.CreatePipe(xv11, v13);
var xv16 = new PipeJoin(520, 210);
var xv14 = new PipeJoin(490, 240);
var xv16 = new PipeJoin(ltg1X, 190);
var xv14 = new PipeJoin(ltg2X, 220);
Graph.CreatePipe(v12, xv16);
Graph.CreatePipe(v13, xv14);
Graph.CreatePipe(v16, xv16);
Graph.CreatePipe(v14, xv14);
var v20 = CreateValve(20, 650, 180);
var v21 = CreateValve(21, 620, 180);
var xv20 = new PipeJoin(650, 210);
var xv21 = new PipeJoin(620, 240);
var v20 = CreateValve(20, ltg1X - 40, 60);
var v21 = CreateValve(21, ltg1X - 40, 90);
var xv20 = new PipeJoin(ltg1X, 60);
var xv21 = new PipeJoin(ltg2X, 90);
Graph.CreatePipe(xv16, xv20);
Graph.CreatePipe(xv14, xv21);
Graph.CreatePipe(v20, xv20);
Graph.CreatePipe(v21, xv21);
var x8 = new PipeJoin(390, 140);
var x9 = new PipeJoin(490, 140);
var x10 = new PipeJoin(620, 140);
var x8 = new PipeJoin(ltg1X - 80, 300);
var x9 = new PipeJoin(ltg1X - 80, 220);
var x10 = new PipeJoin(ltg1X - 80, 90);
Graph.CreatePipe(v11, x8, true);
Graph.CreatePipe(v15, x8, true);
Graph.CreatePipe(x9, v14);
Graph.CreatePipe(x9, v16);
Graph.CreatePipe(x10, v20);
Graph.CreatePipe(x10, v21);
Graph.CreatePipe(v11, x8);
Graph.CreatePipe(v15, x8);
Graph.CreatePipe(x9, v14, true);
Graph.CreatePipe(x9, v16, true);
Graph.CreatePipe(x10, v20, true);
Graph.CreatePipe(x10, v21, true);
var xv22 = new PipeJoin(720, 210);
var xv23 = new PipeJoin(750, 240);
var v22 = CreateValve(22, 720, 280);
var v23 = CreateValve(23, 750, 280);
var t1 = CreateTank(1, 735, 360);
Graph.CreatePipe(xv20, xv22);
Graph.CreatePipe(xv21, xv23);
var xv22 = new PipeJoin(t1X - 15, ltg7Y);
var xv23 = new PipeJoin(t1X + 15, ltg6Y);
var v22 = CreateValve(22, t1X - 15, tValveY);
var v23 = CreateValve(23, t1X + 15, tValveY);
var t1 = CreateTank(1, t1X, tanksY);
Graph.CreatePipe(xv20, xv22, true);
Graph.CreatePipe(xv21, xv23, true);
Graph.CreatePipe(xv22, v22);
Graph.CreatePipe(xv23, v23);
Graph.CreateInlet(v22, t1);
Graph.CreateInlet(v23, t1);
var xv24 = new PipeJoin(800, 210);
var xv25 = new PipeJoin(830, 240);
var v24 = CreateValve(24, 800, 280);
var v25 = CreateValve(25, 830, 280);
var t2 = CreateTank(2, 815, 360);
var xv24 = new PipeJoin(t2X - 15, ltg7Y);
var xv25 = new PipeJoin(t2X + 15, ltg6Y);
var v24 = CreateValve(24, t2X - 15, tValveY);
var v25 = CreateValve(25, t2X + 15, tValveY);
var t2 = CreateTank(2, t2X, tanksY);
Graph.CreatePipe(xv22, xv24);
Graph.CreatePipe(xv23, xv25);
Graph.CreatePipe(xv24, v24);
@@ -137,11 +156,11 @@ namespace PamhagenSysCtrl.Windows {
Graph.CreateInlet(v24, t2);
Graph.CreateInlet(v25, t2);
var xv26 = new PipeJoin(880, 210);
var xv27 = new PipeJoin(910, 240);
var v26 = CreateValve(26, 880, 280);
var v27 = CreateValve(27, 910, 280);
var t3 = CreateTank(3, 895, 360);
var xv26 = new PipeJoin(t3X - 15, ltg7Y);
var xv27 = new PipeJoin(t3X + 15, ltg6Y);
var v26 = CreateValve(26, t3X - 15, tValveY);
var v27 = CreateValve(27, t3X + 15, tValveY);
var t3 = CreateTank(3, t3X, tanksY);
Graph.CreatePipe(xv24, xv26);
Graph.CreatePipe(xv25, xv27);
Graph.CreatePipe(xv26, v26);
@@ -149,16 +168,16 @@ namespace PamhagenSysCtrl.Windows {
Graph.CreateInlet(v26, t3);
Graph.CreateInlet(v27, t3);
var v28 = CreateValve(28, 950, 210);
var v29 = CreateValve(29, 950, 240);
var v28 = CreateValve(28, (t3X + t4X) / 2, ltg7Y);
var v29 = CreateValve(29, (t3X + t4X) / 2, ltg6Y);
Graph.CreatePipe(xv26, v28);
Graph.CreatePipe(xv27, v29);
var xv30 = new PipeJoin(990, 210);
var xv31 = new PipeJoin(1020, 240);
var v30 = CreateValve(30, 990, 280);
var v31 = CreateValve(31, 1020, 280);
var t4 = CreateTank(4, 1005, 360);
var xv30 = new PipeJoin(t4X - 15, ltg7Y);
var xv31 = new PipeJoin(t4X + 15, ltg6Y);
var v30 = CreateValve(30, t4X - 15, tValveY);
var v31 = CreateValve(31, t4X + 15, tValveY);
var t4 = CreateTank(4, t4X, tanksY);
Graph.CreatePipe(v28, xv30);
Graph.CreatePipe(v29, xv31);
Graph.CreatePipe(xv30, v30);
@@ -166,11 +185,11 @@ namespace PamhagenSysCtrl.Windows {
Graph.CreateInlet(v30, t4);
Graph.CreateInlet(v31, t4);
var xv32 = new PipeJoin(1070, 210);
var xv33 = new PipeJoin(1100, 240);
var v32 = CreateValve(32, 1070, 280);
var v33 = CreateValve(33, 1100, 280);
var t5 = CreateTank(5, 1085, 360);
var xv32 = new PipeJoin(t5X - 15, ltg7Y);
var xv33 = new PipeJoin(t5X + 15, ltg6Y);
var v32 = CreateValve(32, t5X - 15, tValveY);
var v33 = CreateValve(33, t5X + 15, tValveY);
var t5 = CreateTank(5, t5X, tanksY);
Graph.CreatePipe(xv30, xv32);
Graph.CreatePipe(xv31, xv33);
Graph.CreatePipe(xv32, v32);
@@ -178,6 +197,102 @@ namespace PamhagenSysCtrl.Windows {
Graph.CreateInlet(v32, 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);
}
@@ -186,20 +301,20 @@ namespace PamhagenSysCtrl.Windows {
}
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) {
var p = evt.GetPosition(SchemeCanvas);
foreach (var e in Graph.Edges) {
e.Highlight = false;
e.Highlight = null;
}
var hover = Graph.Update(p.X, p.Y);
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) {
foreach (var (edge, node) in path.Value.Hops) {
edge.Highlight = true;
edge.Highlight = Brushes.Green;
}
}
Graph.Update(p.X, p.Y);