Add Tanks 1-5

This commit is contained in:
2026-07-13 10:49:07 +02:00
parent aece4e202e
commit 011f90233c
7 changed files with 226 additions and 37 deletions
+101 -32
View File
@@ -62,13 +62,13 @@ namespace PamhagenSysCtrl.Windows {
Graph.CreatePipe(x6, v8);
Graph.CreatePipe(v7, v9);
var x7 = new PipeJoin(390, 210);
var x8 = new PipeJoin(360, 240);
var x9 = new PipeJoin(320, 240);
var xv15 = new PipeJoin(390, 210);
var xv11 = new PipeJoin(360, 240);
var x7 = new PipeJoin(320, 240);
Graph.CreatePipe(v5, x7);
Graph.CreatePipe(v9, x9);
Graph.CreatePipe(x9, x8);
Graph.CreatePipe(v5, xv15);
Graph.CreatePipe(v9, x7);
Graph.CreatePipe(x7, xv11);
var v10 = CreateValve(10, 320, 280);
var v11 = CreateValve(11, 360, 180);
@@ -78,40 +78,105 @@ namespace PamhagenSysCtrl.Windows {
var v15 = CreateValve(15, 390, 180);
var v16 = CreateValve(16, 520, 180);
Graph.CreatePipe(v10, x9);
Graph.CreatePipe(x8, v11);
Graph.CreatePipe(x7, v15);
Graph.CreatePipe(x7, v12);
Graph.CreatePipe(x8, v13);
Graph.CreatePipe(v10, x7);
Graph.CreatePipe(xv11, v11);
Graph.CreatePipe(xv15, v15);
Graph.CreatePipe(xv15, v12);
Graph.CreatePipe(xv11, v13);
var x10 = new PipeJoin(520, 210);
var x11 = new PipeJoin(490, 240);
var xv16 = new PipeJoin(520, 210);
var xv14 = new PipeJoin(490, 240);
Graph.CreatePipe(v12, x10);
Graph.CreatePipe(v13, x11);
Graph.CreatePipe(x10, v16);
Graph.CreatePipe(x11, v14);
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 x12 = new PipeJoin(650, 210);
var x13 = new PipeJoin(620, 240);
var xv20 = new PipeJoin(650, 210);
var xv21 = new PipeJoin(620, 240);
Graph.CreatePipe(x10, x12);
Graph.CreatePipe(x11, x13);
Graph.CreatePipe(x12, v20);
Graph.CreatePipe(x13, v21);
Graph.CreatePipe(xv16, xv20);
Graph.CreatePipe(xv14, xv21);
Graph.CreatePipe(v20, xv20);
Graph.CreatePipe(v21, xv21);
var x14 = new PipeJoin(390, 140);
var x15 = new PipeJoin(490, 140);
var x16 = new PipeJoin(620, 140);
var x8 = new PipeJoin(390, 140);
var x9 = new PipeJoin(490, 140);
var x10 = new PipeJoin(620, 140);
Graph.CreatePipe(v11, x14, true);
Graph.CreatePipe(v15, x14, true);
Graph.CreatePipe(v14, x15, true);
Graph.CreatePipe(v16, x15, true);
Graph.CreatePipe(v20, x16, true);
Graph.CreatePipe(v21, x16, true);
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);
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);
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);
Graph.CreatePipe(xv22, xv24);
Graph.CreatePipe(xv23, xv25);
Graph.CreatePipe(xv24, v24);
Graph.CreatePipe(xv25, v25);
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);
Graph.CreatePipe(xv24, xv26);
Graph.CreatePipe(xv25, xv27);
Graph.CreatePipe(xv26, v26);
Graph.CreatePipe(xv27, v27);
Graph.CreateInlet(v26, t3);
Graph.CreateInlet(v27, t3);
var v28 = CreateValve(28, 950, 210);
var v29 = CreateValve(29, 950, 240);
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);
Graph.CreatePipe(v28, xv30);
Graph.CreatePipe(v29, xv31);
Graph.CreatePipe(xv30, v30);
Graph.CreatePipe(xv31, v31);
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);
Graph.CreatePipe(xv30, xv32);
Graph.CreatePipe(xv31, xv33);
Graph.CreatePipe(xv32, v32);
Graph.CreatePipe(xv33, v33);
Graph.CreateInlet(v32, t5);
Graph.CreateInlet(v33, t5);
Graph.Draw(SchemeCanvas);
}
@@ -120,6 +185,10 @@ namespace PamhagenSysCtrl.Windows {
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) {
return new($"T{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) {