From 23c96b939791260592a0612dcc528ac3b74dfe70 Mon Sep 17 00:00:00 2001 From: Lorenz Stechauner Date: Tue, 14 Jul 2026 00:10:06 +0200 Subject: [PATCH] Move graph creation to PamhagenGraph --- PamhagenSysCtrl/Helpers/PamhagenGraph.cs | 341 ++++++++++++++++++ PamhagenSysCtrl/Helpers/Pipeline/Tank.cs | 2 +- .../Windows/PlantSchemeWindow.xaml.cs | 340 +---------------- 3 files changed, 345 insertions(+), 338 deletions(-) create mode 100644 PamhagenSysCtrl/Helpers/PamhagenGraph.cs diff --git a/PamhagenSysCtrl/Helpers/PamhagenGraph.cs b/PamhagenSysCtrl/Helpers/PamhagenGraph.cs new file mode 100644 index 0000000..7724ae7 --- /dev/null +++ b/PamhagenSysCtrl/Helpers/PamhagenGraph.cs @@ -0,0 +1,341 @@ +using PamhagenSysCtrl.Helpers.Pipeline; + +namespace PamhagenSysCtrl.Helpers { + public class PamhagenGraph : Graph { + + public readonly Trough MW1; + public readonly Trough MW2; + + public PamhagenGraph() { + double mw2X = 100; + double mw1X = 250; + double mpY = 280; + 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", 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); + + CreateOutlet(MW1, mp1); + CreateOutlet(MW2, mp2); + CreatePipe(mp1, x1); + CreatePipe(mp2, x2); + + 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); + + CreatePipe(x1, v1); + CreatePipe(x1, v4); + CreatePipe(x2, v2); + CreatePipe(x2, v3); + + 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); + + CreatePipe(v1, x3, true); + CreatePipe(v3, x3, true); + CreatePipe(x3, x4, true); + CreatePipe(v2, x5, true); + CreatePipe(v4, x5, true); + CreatePipe(x5, x6, true); + + 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); + + CreatePipe(x4, v5); + CreatePipe(x4, v6); + CreatePipe(x6, v7); + CreatePipe(x6, v8); + CreatePipe(v7, v9); + + var xv15 = new PipeJoin(ltg1X, 300); + var xv11 = new PipeJoin(ltg2X, 330); + var x7 = new PipeJoin(ltg2X, 360); + + CreatePipe(v5, xv15); + CreatePipe(v9, x7); + CreatePipe(x7, xv11); + + 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); + + CreatePipe(v10, x7); + CreatePipe(xv11, v11); + CreatePipe(xv15, v15); + CreatePipe(xv15, v12); + CreatePipe(xv11, v13); + + var xv16 = new PipeJoin(ltg1X, 190); + var xv14 = new PipeJoin(ltg2X, 220); + + CreatePipe(v12, xv16); + CreatePipe(v13, xv14); + CreatePipe(v16, xv16); + CreatePipe(v14, xv14); + + 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); + + CreatePipe(xv16, xv20); + CreatePipe(xv14, xv21); + CreatePipe(v20, xv20); + CreatePipe(v21, xv21); + + var x8 = new PipeJoin(ltg1X - 80, 300); + var x9 = new PipeJoin(ltg1X - 80, 220); + var x10 = new PipeJoin(ltg1X - 80, 90); + + CreatePipe(v11, x8); + CreatePipe(v15, x8); + CreatePipe(x9, v14, true); + CreatePipe(x9, v16, true); + CreatePipe(x10, v20, true); + CreatePipe(x10, v21, true); + + 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, 100000); + CreatePipe(xv20, xv22, true); + CreatePipe(xv21, xv23, true); + CreatePipe(xv22, v22); + CreatePipe(xv23, v23); + CreateInlet(v22, t1); + CreateInlet(v23, t1); + + 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, 100000); + CreatePipe(xv22, xv24); + CreatePipe(xv23, xv25); + CreatePipe(xv24, v24); + CreatePipe(xv25, v25); + CreateInlet(v24, t2); + CreateInlet(v25, t2); + + 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, 100000); + CreatePipe(xv24, xv26); + CreatePipe(xv25, xv27); + CreatePipe(xv26, v26); + CreatePipe(xv27, v27); + CreateInlet(v26, t3); + CreateInlet(v27, t3); + + var v28 = CreateValve(28, (t3X + t4X) / 2, ltg7Y); + var v29 = CreateValve(29, (t3X + t4X) / 2, ltg6Y); + CreatePipe(xv26, v28); + CreatePipe(xv27, v29); + + 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, 100000); + CreatePipe(v28, xv30); + CreatePipe(v29, xv31); + CreatePipe(xv30, v30); + CreatePipe(xv31, v31); + CreateInlet(v30, t4); + CreateInlet(v31, t4); + + 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, 100000); + CreatePipe(xv30, xv32); + CreatePipe(xv31, xv33); + CreatePipe(xv32, v32); + CreatePipe(xv33, v33); + CreateInlet(v32, t5); + CreateInlet(v33, t5); + + var v34 = CreateValve(34, (t5X + t6X) / 2, ltg7Y); + var v35 = CreateValve(35, (t5X + t6X) / 2, ltg6Y); + CreatePipe(xv32, v34); + 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, 100000); + CreatePipe(v34, xv37); + CreatePipe(v35, xv36); + CreatePipe(xv37, v37); + CreatePipe(xv36, v36); + CreateInlet(v36, t6); + 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, 100000); + CreatePipe(xv37, xv39); + CreatePipe(xv36, xv38); + CreatePipe(xv38, v38); + CreatePipe(xv39, v39); + CreateInlet(v38, t7); + 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, 100000); + CreatePipe(xv38, xv40); + CreatePipe(xv39, xv41); + CreatePipe(xv40, v40); + CreatePipe(xv41, v41); + CreateInlet(v40, t8); + CreateInlet(v41, t8); + + var v42 = CreateValve(42, t9X + 15, tValveY); + var v43 = CreateValve(43, t9X - 15, tValveY); + var t9 = CreateTank(9, t9X, tanksY, 100000); + CreatePipe(xv40, v42); + CreatePipe(xv41, v43); + CreateInlet(v42, t9); + CreateInlet(v43, t9); + + var xp12 = new PipeJoin((t1X + t2X) / 2, tanksY + 80); + var p12 = new Pump("P1/2", (t1X + t2X) / 2, tanksY + 110); + CreateOutlet(t1, xp12); + CreateOutlet(t2, xp12); + 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); + CreateOutlet(t3, p3); + CreateOutlet(t4, p4); + 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); + CreatePipe(p12, v44); + CreatePipe(p3, v45); + CreatePipe(p4, v47); + CreatePipe(p5, v48); + CreatePipe(v44, xv44); + CreatePipe(v45, xv45); + CreatePipe(v47, xv47); + + CreatePipe(xv44, v10); + CreatePipe(v48, xv47, true); + CreateTwoWayPipe(xv47, v46); + CreateTwoWayPipe(v46, xv45); + CreateTwoWayPipe(xv45, xv44); + + 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); + CreateOutlet(t6, xt6); + CreateOutlet(t7, xt7); + CreateOutlet(t8, xt8); + CreateOutlet(t9, xt8); + CreatePipe(xt8, xt7); + CreatePipe(xt7, xt6); + CreatePipe(xt6, p6); + + var v49 = CreateValve(49, t4X, tanksY + 220); + 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); + + CreatePipe(v6, xp1, true); + CreatePipe(v8, xp2, true); + CreatePipe(v49, xp3, true); + CreatePipe(p6, xp4, true); + CreatePipe(xp1, v51); + CreatePipe(xp1, v55); + CreatePipe(xp2, v52); + CreatePipe(xp2, v56); + CreatePipe(xp3, v50); + CreatePipe(xp3, v54); + CreatePipe(xp4, v53); + CreatePipe(xp4, v57); + + CreateInlet(v50, press1); + CreateInlet(v51, press1); + CreateInlet(v52, press1); + CreateInlet(v53, press1); + CreateInlet(v54, press2); + CreateInlet(v55, press2); + CreateInlet(v56, press2); + CreateInlet(v57, press2); + } + + protected static Valve CreateValve(int n, double x, double y) { + return new($"V{n}", x, y, () => App.Plant?.IsValveOpen(4) ?? false, () => App.Plant?.WantValveOpen(4) ?? false); + } + + protected 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); + } + } +} diff --git a/PamhagenSysCtrl/Helpers/Pipeline/Tank.cs b/PamhagenSysCtrl/Helpers/Pipeline/Tank.cs index e392622..740b990 100644 --- a/PamhagenSysCtrl/Helpers/Pipeline/Tank.cs +++ b/PamhagenSysCtrl/Helpers/Pipeline/Tank.cs @@ -4,7 +4,7 @@ using System.Windows.Media; using System.Windows.Shapes; namespace PamhagenSysCtrl.Helpers.Pipeline { - class Tank : INode, ISink, ISource { + public class Tank : INode, ISink, ISource { public const double WIDTH = 60; public const double HEIGHT = 100; diff --git a/PamhagenSysCtrl/Windows/PlantSchemeWindow.xaml.cs b/PamhagenSysCtrl/Windows/PlantSchemeWindow.xaml.cs index 3b4938e..ef8a22e 100644 --- a/PamhagenSysCtrl/Windows/PlantSchemeWindow.xaml.cs +++ b/PamhagenSysCtrl/Windows/PlantSchemeWindow.xaml.cs @@ -7,349 +7,15 @@ using System.Windows.Media; namespace PamhagenSysCtrl.Windows { public partial class PlantSchemeWindow : Window { - private readonly Graph Graph; - private Trough MW1; - private Trough MW2; + private readonly PamhagenGraph Graph; public PlantSchemeWindow() { InitializeComponent(); App.Plant?.Update += OnUpdate; - - Graph = new Graph(); - - double mw2X = 100; - double mw1X = 250; - double mpY = 280; - 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", 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.CreateOutlet(MW1, mp1); - Graph.CreateOutlet(MW2, mp2); - Graph.CreatePipe(mp1, x1); - Graph.CreatePipe(mp2, x2); - - 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(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); - Graph.CreatePipe(x3, x4, true); - Graph.CreatePipe(v2, x5, true); - Graph.CreatePipe(v4, x5, true); - Graph.CreatePipe(x5, x6, true); - - 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); - Graph.CreatePipe(x4, v6); - Graph.CreatePipe(x6, v7); - Graph.CreatePipe(x6, v8); - Graph.CreatePipe(v7, v9); - - 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, 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); - Graph.CreatePipe(xv15, v15); - Graph.CreatePipe(xv15, v12); - Graph.CreatePipe(xv11, v13); - - 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, 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(ltg1X - 80, 300); - var x9 = new PipeJoin(ltg1X - 80, 220); - var x10 = new PipeJoin(ltg1X - 80, 90); - - 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(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, 100000); - 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(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, 100000); - 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(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, 100000); - 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, (t3X + t4X) / 2, ltg7Y); - var v29 = CreateValve(29, (t3X + t4X) / 2, ltg6Y); - Graph.CreatePipe(xv26, v28); - Graph.CreatePipe(xv27, v29); - - 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, 100000); - 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(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, 100000); - Graph.CreatePipe(xv30, xv32); - Graph.CreatePipe(xv31, xv33); - Graph.CreatePipe(xv32, v32); - Graph.CreatePipe(xv33, v33); - 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, 100000); - 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, 100000); - 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, 100000); - 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, 100000); - 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 + 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); - Graph.CreateOutlet(t9, xt8); - Graph.CreatePipe(xt8, xt7); - 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 = new(); Graph.Draw(SchemeCanvas); } - private static Valve CreateValve(int n, double x, double y) { - 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, 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) { var p = evt.GetPosition(SchemeCanvas); foreach (var e in Graph.Edges) { @@ -357,7 +23,7 @@ namespace PamhagenSysCtrl.Windows { } var hover = Graph.Update(p.X, p.Y); if (hover.Count > 0) { - var path = Graph.GetPath(MW1, hover.First(), (n) => n is not ISink); + var path = Graph.GetPath(Graph.MW1, hover.First(), (n) => n is not ISink); if (path != null) { foreach (var (edge, node) in path.Value.Hops) { edge.Highlight = Brushes.Green;