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/Windows/PlantSchemeWindow.xaml.cs
+81 -35
View File
@@ -17,6 +17,9 @@ namespace PamhagenSysCtrl.Windows {
Graph = new Graph();
double mw2X = 100;
double mw1X = 250;
double mpY = 280;
double ltg1Y = 410;
double ltg2Y = ltg1Y + 30;
double ltg1X = 600;
@@ -35,32 +38,32 @@ namespace PamhagenSysCtrl.Windows {
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);
var mp2 = new Pump("MP2", 50, 80);
var x1 = new PipeJoin(200, 120);
var x2 = new PipeJoin(50, 120);
MW1 = new Trough("MW1", mw1X, mpY - 40, () => App.Plant?.FillLevelA1 != FillState.Empty);
MW2 = new Trough("MW2", mw2X, mpY - 40, () => App.Plant?.FillLevelA1 != FillState.Empty);
var mp1 = new Pump("MP1", mw1X, mpY);
var mp2 = new Pump("MP2", mw2X, mpY);
var x1 = new PipeJoin(mw1X, mpY + 40);
var x2 = new PipeJoin(mw2X, mpY + 40);
Graph.CreatePipe(MW1, mp1);
Graph.CreatePipe(MW2, mp2);
Graph.CreateOutlet(MW1, mp1);
Graph.CreateOutlet(MW2, mp2);
Graph.CreatePipe(mp1, x1);
Graph.CreatePipe(mp2, x2);
var v1 = CreateValve(1, 200, 150);
var v2 = CreateValve(2, 50, 150);
var v3 = CreateValve(3, 80, 150);
var v4 = CreateValve(4, 170, 150);
var v1 = CreateValve(1, mw1X, mpY + 70);
var v2 = CreateValve(2, mw2X, mpY + 70);
var v3 = CreateValve(3, mw2X + 30, mpY + 70);
var v4 = CreateValve(4, mw1X - 30, mpY + 70);
Graph.CreatePipe(x1, v1);
Graph.CreatePipe(x1, v4);
Graph.CreatePipe(x2, v2);
Graph.CreatePipe(x2, v3);
var x3 = new PipeJoin(200, 180);
var x4 = new PipeJoin(200, ltg1Y);
var x5 = new PipeJoin(50, 210);
var x6 = new PipeJoin(50, ltg2Y);
var x3 = new PipeJoin(mw1X, mpY + 100);
var x4 = new PipeJoin(mw1X, ltg1Y);
var x5 = new PipeJoin(mw2X, mpY + 130);
var x6 = new PipeJoin(mw2X, ltg2Y);
Graph.CreatePipe(v1, x3, true);
Graph.CreatePipe(v3, x3, true);
@@ -69,10 +72,10 @@ namespace PamhagenSysCtrl.Windows {
Graph.CreatePipe(v4, x5, true);
Graph.CreatePipe(x5, x6, true);
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 v5 = CreateValve(5, mw1X + 50, ltg1Y);
var v6 = CreateValve(6, mw1X, ltg2Y + 40);
var v7 = CreateValve(7, (mw2X + mw1X) / 2, ltg2Y);
var v8 = CreateValve(8, mw2X, ltg2Y + 40);
var v9 = CreateValve(9, ltg2X, 400);
Graph.CreatePipe(x4, v5);
@@ -136,7 +139,7 @@ namespace PamhagenSysCtrl.Windows {
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);
var t1 = CreateTank(1, t1X, tanksY, 100000);
Graph.CreatePipe(xv20, xv22, true);
Graph.CreatePipe(xv21, xv23, true);
Graph.CreatePipe(xv22, v22);
@@ -148,7 +151,7 @@ namespace PamhagenSysCtrl.Windows {
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);
var t2 = CreateTank(2, t2X, tanksY, 100000);
Graph.CreatePipe(xv22, xv24);
Graph.CreatePipe(xv23, xv25);
Graph.CreatePipe(xv24, v24);
@@ -160,7 +163,7 @@ namespace PamhagenSysCtrl.Windows {
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);
var t3 = CreateTank(3, t3X, tanksY, 100000);
Graph.CreatePipe(xv24, xv26);
Graph.CreatePipe(xv25, xv27);
Graph.CreatePipe(xv26, v26);
@@ -177,7 +180,7 @@ namespace PamhagenSysCtrl.Windows {
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);
var t4 = CreateTank(4, t4X, tanksY, 100000);
Graph.CreatePipe(v28, xv30);
Graph.CreatePipe(v29, xv31);
Graph.CreatePipe(xv30, v30);
@@ -189,7 +192,7 @@ namespace PamhagenSysCtrl.Windows {
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);
var t5 = CreateTank(5, t5X, tanksY, 100000);
Graph.CreatePipe(xv30, xv32);
Graph.CreatePipe(xv31, xv33);
Graph.CreatePipe(xv32, v32);
@@ -206,7 +209,7 @@ namespace PamhagenSysCtrl.Windows {
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);
var t6 = CreateTank(6, t6X, tanksY, 100000);
Graph.CreatePipe(v34, xv37);
Graph.CreatePipe(v35, xv36);
Graph.CreatePipe(xv37, v37);
@@ -218,7 +221,7 @@ namespace PamhagenSysCtrl.Windows {
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);
var t7 = CreateTank(7, t7X, tanksY, 100000);
Graph.CreatePipe(xv37, xv39);
Graph.CreatePipe(xv36, xv38);
Graph.CreatePipe(xv38, v38);
@@ -230,7 +233,7 @@ namespace PamhagenSysCtrl.Windows {
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);
var t8 = CreateTank(8, t8X, tanksY, 100000);
Graph.CreatePipe(xv38, xv40);
Graph.CreatePipe(xv39, xv41);
Graph.CreatePipe(xv40, v40);
@@ -240,7 +243,7 @@ namespace PamhagenSysCtrl.Windows {
var v42 = CreateValve(42, 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(xv41, v43);
Graph.CreateInlet(v42, t9);
@@ -281,10 +284,10 @@ namespace PamhagenSysCtrl.Windows {
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);
var xt6 = new PipeJoin(t6X, tanksY + 110);
var xt7 = new PipeJoin(t7X, tanksY + 110);
var xt8 = new PipeJoin(t8X, tanksY + 110);
var p6 = new Pump("P6", t6X, tanksY + 150);
Graph.CreateOutlet(t6, xt6);
Graph.CreateOutlet(t7, xt7);
Graph.CreateOutlet(t8, xt8);
@@ -293,6 +296,49 @@ namespace PamhagenSysCtrl.Windows {
Graph.CreatePipe(xt7, xt6);
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);
}
@@ -300,8 +346,8 @@ 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($"Tank {n}", x, y, () => App.Plant?.TankFillLevels[n - 1] != FillState.Empty, () => App.Plant?.TankFillLevels[n - 1] != FillState.Full);
private static Tank CreateTank(int n, double x, double y, int capacity) {
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) {