[WIP] Pipe joins

PamhagenSysCtrl/App.xaml.cs

@@ -67,6 +67,9 @@ namespace PamhagenSysCtrl {
 
         public static async Task CheckForUpdates(bool showResult = false) {
             if (Config.UpdateUrl == null) return;
+            foreach (Window w in Current.Windows) {
+                if (w is UpdateDialog) return;
+            }
 
             try {
                 var latest = await UpdateService.GetLatestInstallerUrl(Config.UpdateUrl);

PamhagenSysCtrl/Helpers/PamhagenGraph.cs

@@ -94,10 +94,10 @@ namespace PamhagenSysCtrl.Helpers {
             CreatePipe(MP1, x1);
             CreatePipe(MP2, x2);
 
-            var v1 = CreateValve(1, mw1X, mpY + 16);
+            var v1 = CreateValve(1, mw1X, mpY + 16, 2);
-            var v2 = CreateValve(2, mw2X, mpY + 16);
+            var v2 = CreateValve(2, mw2X, mpY + 16, 0);
-            var v3 = CreateValve(3, mw2X + 6, mpY + 16);
+            var v3 = CreateValve(3, mw2X + 6, mpY + 16, 2);
-            var v4 = CreateValve(4, mw1X - 6, mpY + 16);
+            var v4 = CreateValve(4, mw1X - 6, mpY + 16, 0);
 
             CreatePipe(x1, v1);
             CreatePipe(x1, v4);
@@ -116,11 +116,11 @@ namespace PamhagenSysCtrl.Helpers {
             CreatePipe(v4, x5, true);
             CreatePipe(x5, x6, true);
 
-            var v5 = CreateValve(5, x1X + 6, ltg1Y);
+            var v5 = CreateValve(5, x1X + 6, ltg1Y, 1);
-            var v6 = CreateValve(6, x1X + 6, ltg2Y + 8);
+            var v6 = CreateValve(6, x1X + 6, ltg2Y + 8, 3);
-            var v7 = CreateValve(7, x1X + 6, ltg2Y);
+            var v7 = CreateValve(7, x1X + 6, ltg2Y, 3);
-            var v8 = CreateValve(8, x1X - 6, ltg2Y + 8);
+            var v8 = CreateValve(8, x1X - 6, ltg2Y + 8, 0);
-            var v9 = CreateValve(9, ltg2X, ltg5Y + 8);
+            var v9 = CreateValve(9, ltg2X, ltg5Y + 8, 2);
 
             CreatePipe(x4, v5);
             CreatePipe(x4, v6, true);
@@ -136,13 +136,13 @@ namespace PamhagenSysCtrl.Helpers {
             CreatePipe(v9, x7);
             CreatePipe(x7, xv11);
 
-            var v10 = CreateValve(10, ltg2X + 8, ltg5Y);
+            var v10 = CreateValve(10, ltg2X + 8, ltg5Y, 3);
-            var v11 = CreateValve(11, ltg1X - 6, wt1Y + 14);
+            var v11 = CreateValve(11, ltg1X - 6, wt1Y + 14, 3);
-            var v12 = CreateValve(12, ltg1X, wt1Y);
+            var v12 = CreateValve(12, ltg1X, wt1Y, 0);
-            var v13 = CreateValve(13, ltg2X, wt1Y);
+            var v13 = CreateValve(13, ltg2X, wt1Y, 2);
-            var v14 = CreateValve(14, ltg1X - 6, wt1Y - 8);
+            var v14 = CreateValve(14, ltg1X - 6, wt1Y - 8, 3);
-            var v15 = CreateValve(15, ltg1X - 6, wt1Y + 8);
+            var v15 = CreateValve(15, ltg1X - 6, wt1Y + 8, 1);
-            var v16 = CreateValve(16, ltg1X - 6, wt1Y - 14);
+            var v16 = CreateValve(16, ltg1X - 6, wt1Y - 14, 1);
             CreatePipe(v10, x7);
             CreatePipe(xv11, v11);
             CreatePipe(xv15, v15);
@@ -156,8 +156,8 @@ namespace PamhagenSysCtrl.Helpers {
             CreatePipe(v16, xv16);
             CreatePipe(v14, xv14);
 
-            var v20 = CreateValve(20, ltg1X - 6, wt2Y - 14);
+            var v20 = CreateValve(20, ltg1X - 6, wt2Y - 14, 1);
-            var v21 = CreateValve(21, ltg1X - 6, wt2Y - 8);
+            var v21 = CreateValve(21, ltg1X - 6, wt2Y - 8, 3);
             var xv20 = new PipeJoin(ltg1X, wt2Y - 14);
             var xv21 = new PipeJoin(ltg2X, wt2Y - 8);
             CreatePipe(xv16, xv20);
@@ -167,9 +167,9 @@ namespace PamhagenSysCtrl.Helpers {
 
             var wt1 = new HeatExchanger("WT Most", wtX, wt1Y);
             var wt2 = new HeatExchanger("WT Warmwasser", wtX, wt2Y);
-            var v17 = CreateValve(17, wtX + 14, wt1Y);
+            var v17 = CreateValve(17, wtX + 14, wt1Y, 2);
-            var v18 = CreateValve(18, wtX + 8, wt1Y + 8);
+            var v18 = CreateValve(18, wtX + 8, wt1Y + 8, 3);
-            var v19 = CreateValve(19, wtX + 8, (wt1Y + wt2Y) / 2);
+            var v19 = CreateValve(19, wtX + 8, (wt1Y + wt2Y) / 2, 0);
             var xwt1 = new PipeJoin(wtX + 24, wt1Y + 8);
             var xwt2 = new PipeJoin(wtX + 14, wt1Y + 8);
             var xwt3 = new PipeJoin(wtX + 8, wt1Y - 8);
@@ -196,8 +196,8 @@ namespace PamhagenSysCtrl.Helpers {
 
             var xv22 = new PipeJoin(t1X - 3, ltg7Y);
             var xv23 = new PipeJoin(t1X + 3, ltg6Y);
-            var v22 = CreateValve(22, t1X - 3, tValveY);
+            var v22 = CreateValve(22, t1X - 3, tValveY, 0);
-            var v23 = CreateValve(23, t1X + 3, tValveY);
+            var v23 = CreateValve(23, t1X + 3, tValveY, 2);
             Tank1 = CreateTank(1, t1X, tanksY, 35000);
             CreatePipe(xv20, xv22, true, label: "Ltg. 7", labelOffsetX: 10);
             CreatePipe(xv21, xv23, true, label: "Ltg. 6", labelOffsetX: 4);
@@ -208,8 +208,8 @@ namespace PamhagenSysCtrl.Helpers {
 
             var xv24 = new PipeJoin(t2X - 3, ltg7Y);
             var xv25 = new PipeJoin(t2X + 3, ltg6Y);
-            var v24 = CreateValve(24, t2X - 3, tValveY);
+            var v24 = CreateValve(24, t2X - 3, tValveY, 0);
-            var v25 = CreateValve(25, t2X + 3, tValveY);
+            var v25 = CreateValve(25, t2X + 3, tValveY, 2);
             Tank2 = CreateTank(2, t2X, tanksY, 35000);
             CreatePipe(xv22, xv24);
             CreatePipe(xv23, xv25);
@@ -220,8 +220,8 @@ namespace PamhagenSysCtrl.Helpers {
 
             var xv26 = new PipeJoin(t3X - 3, ltg7Y);
             var xv27 = new PipeJoin(t3X + 3, ltg6Y);
-            var v26 = CreateValve(26, t3X - 3, tValveY);
+            var v26 = CreateValve(26, t3X - 3, tValveY, 0);
-            var v27 = CreateValve(27, t3X + 3, tValveY);
+            var v27 = CreateValve(27, t3X + 3, tValveY, 2);
             Tank3 = CreateTank(3, t3X, tanksY, 35000);
             CreatePipe(xv24, xv26);
             CreatePipe(xv25, xv27);
@@ -230,15 +230,15 @@ namespace PamhagenSysCtrl.Helpers {
             CreateInlet(v26, Tank3);
             CreateInlet(v27, Tank3);
 
-            var v28 = CreateValve(28, (t3X + t4X) / 2, ltg7Y);
+            var v28 = CreateValve(28, (t3X + t4X) / 2, ltg7Y, 1);
-            var v29 = CreateValve(29, (t3X + t4X) / 2, ltg6Y);
+            var v29 = CreateValve(29, (t3X + t4X) / 2, ltg6Y, 3);
             CreatePipe(xv26, v28);
             CreatePipe(xv27, v29);
 
             var xv30 = new PipeJoin(t4X - 3, ltg7Y);
             var xv31 = new PipeJoin(t4X + 3, ltg6Y);
-            var v30 = CreateValve(30, t4X - 3, tValveY);
+            var v30 = CreateValve(30, t4X - 3, tValveY, 0);
-            var v31 = CreateValve(31, t4X + 3, tValveY);
+            var v31 = CreateValve(31, t4X + 3, tValveY, 2);
             Tank4 = CreateTank(4, t4X, tanksY, 35000);
             CreatePipe(v28, xv30);
             CreatePipe(v29, xv31);
@@ -249,8 +249,8 @@ namespace PamhagenSysCtrl.Helpers {
 
             var xv32 = new PipeJoin(t5X - 3, ltg7Y);
             var xv33 = new PipeJoin(t5X + 3, ltg6Y);
-            var v32 = CreateValve(32, t5X - 3, tValveY);
+            var v32 = CreateValve(32, t5X - 3, tValveY, 0);
-            var v33 = CreateValve(33, t5X + 3, tValveY);
+            var v33 = CreateValve(33, t5X + 3, tValveY, 2);
             Tank5 = CreateTank(5, t5X, tanksY, 35000);
             CreatePipe(xv30, xv32, label: "Ltg. 7", labelOffsetX: 6);
             CreatePipe(xv31, xv33, label: "Ltg. 6", labelOffsetX: 0);
@@ -259,15 +259,15 @@ namespace PamhagenSysCtrl.Helpers {
             CreateInlet(v32, Tank5);
             CreateInlet(v33, Tank5);
 
-            var v34 = CreateValve(34, (t5X + t6X) / 2, ltg7Y);
+            var v34 = CreateValve(34, (t5X + t6X) / 2, ltg7Y, 1);
-            var v35 = CreateValve(35, (t5X + t6X) / 2, ltg6Y);
+            var v35 = CreateValve(35, (t5X + t6X) / 2, ltg6Y, 3);
             CreatePipe(xv32, v34);
             CreatePipe(xv33, v35);
 
             var xv36 = new PipeJoin(t6X + 3, ltg6Y);
             var xv37 = new PipeJoin(t6X - 3, ltg7Y);
-            var v36 = CreateValve(36, t6X + 3, tValveY);
+            var v36 = CreateValve(36, t6X + 3, tValveY, 2);
-            var v37 = CreateValve(37, t6X - 3, tValveY);
+            var v37 = CreateValve(37, t6X - 3, tValveY, 0);
             Tank6 = CreateTank(6, t6X, tanksY, 35000);
             CreatePipe(v34, xv37);
             CreatePipe(v35, xv36);
@@ -278,8 +278,8 @@ namespace PamhagenSysCtrl.Helpers {
 
             var xv38 = new PipeJoin(t7X + 3, ltg6Y);
             var xv39 = new PipeJoin(t7X - 3, ltg7Y);
-            var v38 = CreateValve(38, t7X + 3, tValveY);
+            var v38 = CreateValve(38, t7X + 3, tValveY, 2);
-            var v39 = CreateValve(39, t7X - 3, tValveY);
+            var v39 = CreateValve(39, t7X - 3, tValveY, 0);
             Tank7 = CreateTank(7, t7X, tanksY, 35000);
             CreatePipe(xv37, xv39);
             CreatePipe(xv36, xv38);
@@ -290,8 +290,8 @@ namespace PamhagenSysCtrl.Helpers {
 
             var xv40 = new PipeJoin(t8X + 3, ltg6Y);
             var xv41 = new PipeJoin(t8X - 3, ltg7Y);
-            var v40 = CreateValve(40, t8X + 3, tValveY);
+            var v40 = CreateValve(40, t8X + 3, tValveY, 2);
-            var v41 = CreateValve(41, t8X - 3, tValveY);
+            var v41 = CreateValve(41, t8X - 3, tValveY, 0);
             Tank8 = CreateTank(8, t8X, tanksY, 35000);
             CreatePipe(xv38, xv40, label: "Ltg. 6", labelOffsetX: 0);
             CreatePipe(xv39, xv41, label: "Ltg. 7", labelOffsetX: 6);
@@ -300,8 +300,8 @@ namespace PamhagenSysCtrl.Helpers {
             CreateInlet(v40, Tank8);
             CreateInlet(v41, Tank8);
 
-            var v42 = CreateValve(42, t9X + 3, tValveY);
+            var v42 = CreateValve(42, t9X + 3, tValveY, 2);
-            var v43 = CreateValve(43, t9X - 3, tValveY);
+            var v43 = CreateValve(43, t9X - 3, tValveY, 0);
             Tank9 = CreateTank(9, t9X, tanksY, 35000);
             CreatePipe(xv40, v42);
             CreatePipe(xv41, v43);
@@ -321,11 +321,11 @@ namespace PamhagenSysCtrl.Helpers {
             CreateOutlet(Tank4, P4);
             CreateOutlet(Tank5, P5);
 
-            var v44 = CreateValve(44, (t1X + t2X) / 2, tanksY + 30);
+            var v44 = CreateValve(44, (t1X + t2X) / 2, tanksY + 30, 2);
-            var v45 = CreateValve(45, t3X, tanksY + 30);
+            var v45 = CreateValve(45, t3X, tanksY + 30, 2);
-            var v46 = CreateValve(46, (t3X + t4X) / 2, ltg5Y);
+            var v46 = CreateValve(46, (t3X + t4X) / 2, ltg5Y, 3);
-            var v47 = CreateValve(47, t4X, tanksY + 30);
+            var v47 = CreateValve(47, t4X, tanksY + 30, 2);
-            var v48 = CreateValve(48, t5X, tanksY + 30);
+            var v48 = CreateValve(48, t5X, tanksY + 30, 2);
             var xv44 = new PipeJoin((t1X + t2X) / 2, tanksY + 36);
             var xv45 = new PipeJoin(t3X, tanksY + 36);
             var xv47 = new PipeJoin(t4X, tanksY + 36);
@@ -355,7 +355,7 @@ namespace PamhagenSysCtrl.Helpers {
             CreatePipe(xt7, xt6);
             CreatePipe(xt6, P6);
 
-            var v49 = CreateValve(49, t4X, tanksY + 44);
+            var v49 = CreateValve(49, t4X, tanksY + 44, 2);
             CreatePipe(xv47, v49);
 
             var prX = (pr1X + pr2X) / 2;
@@ -363,14 +363,14 @@ namespace PamhagenSysCtrl.Helpers {
             var pr2cX = prX + 3;
             Press1 = new Press("Presse 1", pr1X, prY, 20000, () => FillState.Unknown);
             Press2 = new Press("Presse 2", pr2X, prY, 15000, () => FillState.Unknown);
-            var v50 = CreateValve(50, pr2cX + 6, ltg3Y);
+            var v50 = CreateValve(50, pr2cX + 6, ltg3Y, 1);
-            var v51 = CreateValve(51, pr1cX - 6, ltg3Y);
+            var v51 = CreateValve(51, pr1cX - 6, ltg3Y, 1);
-            var v52 = CreateValve(52, pr1cX - 6, ltg4Y);
+            var v52 = CreateValve(52, pr1cX - 6, ltg4Y, 3);
-            var v53 = CreateValve(53, pr2cX + 6, ltg4Y);
+            var v53 = CreateValve(53, pr2cX + 6, ltg4Y, 3);
-            var v54 = CreateValve(54, pr2cX + 6, ltg8Y);
+            var v54 = CreateValve(54, pr2cX + 6, ltg8Y, 1);
-            var v55 = CreateValve(55, pr1cX - 6, ltg8Y);
+            var v55 = CreateValve(55, pr1cX - 6, ltg8Y, 1);
-            var v56 = CreateValve(56, pr1cX - 6, ltg9Y);
+            var v56 = CreateValve(56, pr1cX - 6, ltg9Y, 3);
-            var v57 = CreateValve(57, pr2cX + 6, ltg9Y);
+            var v57 = CreateValve(57, pr2cX + 6, ltg9Y, 3);
             var xp1 = new PipeJoin(pr1cX - 14, ltg3Y);
             var xp2 = new PipeJoin(pr1cX - 14, ltg4Y);
             var xp3 = new PipeJoin(pr2cX + 14, ltg8Y);
@@ -404,16 +404,16 @@ namespace PamhagenSysCtrl.Helpers {
             CreatePipe(xp5, xp6);
             CreatePipe(xp7, xp8);
 
-            var zv1 = new CenterValve("ZV1", pr1cX, prY - 8, () => App.Plant?.Press1HasClearance ?? false);
+            var zv1 = new ExternalValve("ZV1", pr1cX, prY - 8, 0, () => App.Plant?.Press1HasClearance ?? false);
-            var zv2 = new CenterValve("ZV2", pr2cX, prY - 8, () => App.Plant?.Press2HasClearance ?? false);
+            var zv2 = new ExternalValve("ZV2", pr2cX, prY - 8, 2, () => App.Plant?.Press2HasClearance ?? false);
             CreatePipe(xp6, zv1, true);
             CreatePipe(xp8, zv2, true);
             CreateInlet(zv1, Press1, true);
             CreateInlet(zv2, Press2, true);
         }
 
-        protected Valve CreateValve(int n, double x, double y) {
+        protected ControlledValve CreateValve(int n, double x, double y, int o) {
-            return new(n, x, y, () => App.Plant?.IsValveOpen(n) ?? false, (v) => App.Plant?.ManualControlMode ?? false ? App.Plant.WantValveOpen(n) : SelectedPaths.Any(p => p.Hops.Any(h => h.Node == v)));
+            return new(n, x, y, o, () => App.Plant?.IsValveOpen(n) ?? false, (v) => App.Plant?.ManualControlMode ?? false ? App.Plant.WantValveOpen(n) : SelectedPaths.Any(p => p.Hops.Any(h => h.Node == v)));
         }
 
         protected static Tank CreateTank(int n, double x, double y, int capacity) {
@@ -423,23 +423,23 @@ namespace PamhagenSysCtrl.Helpers {
         private int PathCost(Path p) {
             return
                 1000 * p.Hops.Count(h => h.Node is Valve) +
-                (p.Hops.Any(h => h.Node is Valve v && v.Nr == 15) && !p.Hops.Any(h => h.Node is Valve v && (v.Nr == 16 || v.Nr == 20)) ? 10 : 0) +
+                (p.Hops.Any(h => h.Node is ControlledValve v && v.Nr == 15) && !p.Hops.Any(h => h.Node is ControlledValve v && (v.Nr == 16 || v.Nr == 20)) ? 10 : 0) +
-                (p.Hops.Any(h => h.Node is Valve v && v.Nr == 11) && !p.Hops.Any(h => h.Node is Valve v && (v.Nr == 14 || v.Nr == 21)) ? 10 : 0) +
+                (p.Hops.Any(h => h.Node is ControlledValve v && v.Nr == 11) && !p.Hops.Any(h => h.Node is ControlledValve v && (v.Nr == 14 || v.Nr == 21)) ? 10 : 0) +
-                (p.Hops.Any(h => h.Node is Valve v && v.Nr == 6) ? 10 : 0) +
+                (p.Hops.Any(h => h.Node is ControlledValve v && v.Nr == 6) ? 10 : 0) +
                 p.Bends;
         }
 
         public Path? GetFreePath(IEnumerable<INode> points, bool overrideStart = false) {
             if (overrideStart) {
-                return GetPath(points, (n) => n is not ISink && (n is not Valve v || !v.LockedForPaths.Any(p => p.Start != points.First())), PathCost);
+                return GetPath(points, (n) => n is not ISink && (n is not ControlledValve v || !v.LockedForPaths.Any(p => p.Start != points.First())), PathCost);
             } else {
-                return GetPath(points, (n) => n is not ISink && (n is not Valve v || !v.IsLocked), PathCost);
+                return GetPath(points, (n) => n is not ISink && (n is not ControlledValve v || !v.IsLocked), PathCost);
             }
         }
 
-        public void TraverseSubgraph(INode start, Func<INode, bool> invalid, HashSet<IEdge>? _visited = null, Action<INode, bool, IEdge>? edgeAction = null, Action<Valve>? valveAction = null, bool reverse = false) {
+        public void TraverseSubgraph(INode start, Func<INode, bool> invalid, HashSet<IEdge>? _visited = null, Action<INode, bool, IEdge>? edgeAction = null, Action<ControlledValve>? valveAction = null, bool reverse = false) {
             var visited = _visited ?? [];
-            if (start is Valve v) {
+            if (start is ControlledValve v) {
                 valveAction?.Invoke(v);
             }
             if (invalid(start)) {
@@ -467,7 +467,7 @@ namespace PamhagenSysCtrl.Helpers {
             UpdateValvesAdjacientToPath(path, true, false);
             if (App.Plant is PamhagenPlant plant) {
                 foreach (var (_, node) in path.Hops) {
-                    if (node is Valve v) {
+                    if (node is ControlledValve v) {
                         plant.OpenV(v.Nr);
                     }
                 }
@@ -480,7 +480,7 @@ namespace PamhagenSysCtrl.Helpers {
             foreach (var p in _selectedPaths) UpdateValvesAdjacientToPath(p, true);
             if (App.Plant is PamhagenPlant plant) {
                 foreach (var (_, node) in path.Hops) {
-                    if (node is Valve v) {
+                    if (node is ControlledValve v) {
                         plant.CloseV(v.Nr);
                     }
                 }
@@ -489,7 +489,7 @@ namespace PamhagenSysCtrl.Helpers {
 
         private void UpdateValvesAdjacientToPath(Path path, bool locked, bool? wantOpen = null) {
             foreach (var (edge, node) in path.Hops) {
-                TraverseSubgraph(node, (n) => n is Valve || n is ISink || n is Pump, valveAction: (v) => {
+                TraverseSubgraph(node, (n) => n is ControlledValve || n is ISink || n is Pump, valveAction: (v) => {
                     if (locked) {
                         v.LockedForPaths.Add(path);
                     } else {
@@ -512,6 +512,7 @@ namespace PamhagenSysCtrl.Helpers {
             HashSet<IEdge> visited = [];
             foreach (var (edge, node) in path.Hops) {
                 edge.Highlight = color1;
+                (edge.Start as PipeJoin)?.Highlight = color1;
                 if (flowArrows > MotorState.Halt) {
                     var dir = edge.End == node;
                     if (flowArrows == MotorState.Backward) dir = !dir;
@@ -520,16 +521,21 @@ namespace PamhagenSysCtrl.Helpers {
                 }
                 visited.Add(edge);
                 if (node is Pump) color = color2;
-                TraverseSubgraph(node, (n) => n is Valve || n is ISink || n is Pump, visited, edgeAction: (s, r, e) => e.Highlight = color);
+                TraverseSubgraph(node, (n) => n is Valve || n is ISink || n is Pump, visited, edgeAction: (s, r, e) => {
+                    (s as PipeJoin)?.Highlight = color;
+                    e.Highlight = color;
+                });
             }
         }
 
         public void ColorPipesByValves(INode start, Brush? color1, MotorState flowArrows, Brush? color2) {
             var flowPathOffset = 0.0;
-            TraverseSubgraph(start, (n) => n is ISink || n is Outlet || !((n as Valve)?.IsOpen ?? (n as CenterValve)?.IsOpen ?? true), null,
+            TraverseSubgraph(start, (n) => n is ISink || n is Outlet || !((n as Valve)?.IsOpen ?? (n as ExternalValve)?.IsOpen ?? true), null,
                 edgeAction: (s, r, e) => {
                     if (((e.Start as Valve)?.IsOpen ?? true) && ((e.End as Valve)?.IsOpen ?? true)) {
                         e.Highlight = color1;
+                        (e.Start as PipeJoin)?.Highlight = color1;
+                        (e.End as PipeJoin)?.Highlight = color1;
                         if (flowArrows == MotorState.Forward || flowArrows == MotorState.Backward) {
                             var dir = e.Start == s;
                             if (r) dir = !dir;

PamhagenSysCtrl/Helpers/Pipeline/CenterValve.cs

@@ -1,71 +0,0 @@
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Media;
-using System.Windows.Shapes;
-
-namespace PamhagenSysCtrl.Helpers.Pipeline {
-    public class CenterValve : INode {
-
-        public const double DIAMETER = 4.8;
-
-        public double CenterX { get; set; }
-        public double CenterY { get; set; }
-        public string Label { get; set; }
-        public Brush? Highlight { get; set; }
-
-        public bool IsOpen => CallbackIsOpen();
-        public ISet<IEdge> Inputs { get; init; }
-        public ISet<IEdge> Outputs { get; init; }
-
-        protected Func<bool> CallbackIsOpen;
-
-        private Shape? _circle;
-        private TextBlock? _text;
-
-        public CenterValve(string label, double x, double y, Func<bool> cbOpen) {
-            CenterX = x;
-            CenterY = y;
-            Label = label;
-            CallbackIsOpen = cbOpen;
-            Inputs = new HashSet<IEdge>();
-            Outputs = new HashSet<IEdge>();
-        }
-
-        public void Draw(Canvas canvas) {
-            _circle = new Ellipse() {
-                Fill = Brushes.DarkGray,
-                Stroke = Brushes.Black,
-            };
-            _text = new() {
-                Text = Label,
-                TextAlignment = TextAlignment.Center,
-                VerticalAlignment = VerticalAlignment.Center,
-                SnapsToDevicePixels = true,
-            };
-            canvas.Children.Add(_circle);
-            canvas.Children.Add(_text);
-        }
-
-        public void Scale(double scale) {
-            var border = Graph.ToBorder(scale);
-            Graph.SetCenter(_circle, CenterX, CenterY, DIAMETER, DIAMETER, scale);
-            _circle?.StrokeThickness = border;
-            _text?.Width = DIAMETER * scale;
-            _text?.Height = DIAMETER * scale;
-            _text?.FontSize = 2 * scale;
-            _text?.SetValue(Canvas.LeftProperty, (CenterX - DIAMETER / 2 + 0.1) * scale);
-            _text?.SetValue(Canvas.TopProperty, (CenterY - DIAMETER / 2 + 1.1) * scale);
-        }
-
-        public bool IsInside(double x, double y) {
-            return Math.Sqrt(Math.Pow(CenterX - x, 2) + Math.Pow(CenterY - y, 2)) <= DIAMETER / 2;
-        }
-
-        public void Update(bool isHovering, bool isPressed) {
-            _circle?.Fill =
-              !IsOpen ? PamhagenBrushes.Red :
-              IsOpen ? PamhagenBrushes.Green :
-              Highlight ?? Brushes.DarkGray;
-        }
-    }
-}

PamhagenSysCtrl/Helpers/Pipeline/ControlledValve.cs

@@ -0,0 +1,44 @@
+using System.Windows;
+using System.Windows.Media;
+
+namespace PamhagenSysCtrl.Helpers.Pipeline {
+    public class ControlledValve : Valve {
+
+        public int Nr { get; set; }
+        public override string Label => $"V{Nr}";
+
+        public readonly ISet<Path> LockedForPaths = new HashSet<Path>();
+        public bool IsLocked => LockedForPaths.Any();
+        public bool WantOpen => CallbackWantOpen(this);
+
+        protected Func<Valve, bool> CallbackWantOpen;
+
+        public ControlledValve(int nr, double x, double y, int orientation, Func<bool> cbOpen, Func<Valve, bool> cbWant) :
+            base(x, y, orientation, cbOpen) {
+            Nr = nr;
+            CallbackWantOpen = cbWant;
+        }
+
+        public override void Update(bool isHovering, bool isPressed) {
+            if (App.Plant?.ManualControlMode ?? false) {
+                _text?.Visibility = Visibility.Visible;
+                _triangles?.Fill =
+                    !WantOpen && !IsOpen && !isHovering ? PamhagenBrushes.Red :
+                    !WantOpen && !IsOpen ? PamhagenBrushes.Green :
+                    !WantOpen && IsOpen ? PamhagenBrushes.DimRed :
+                    WantOpen && !IsOpen ? PamhagenBrushes.DimGreen :
+                    WantOpen && IsOpen && !isHovering ? PamhagenBrushes.Green :
+                    WantOpen && IsOpen ? PamhagenBrushes.Red :
+                    Highlight ?? (isHovering ? Brushes.LightGray : Brushes.DarkGray);
+            } else {
+                _text?.Visibility = isHovering ? Visibility.Visible : Visibility.Hidden;
+                _triangles?.Fill =
+                    IsLocked && !WantOpen && !IsOpen ? PamhagenBrushes.DimOrange :
+                    IsLocked && !WantOpen && IsOpen ? PamhagenBrushes.Red :
+                    IsLocked && WantOpen && !IsOpen ? PamhagenBrushes.Yellow :
+                    IsLocked && WantOpen && IsOpen ? PamhagenBrushes.Green :
+                    Highlight ?? (isHovering ? Brushes.LightGray : Brushes.DarkGray);
+            }
+        }
+    }
+}

PamhagenSysCtrl/Helpers/Pipeline/ExternalValve.cs

@@ -0,0 +1,22 @@
+using System.Windows;
+using System.Windows.Media;
+
+namespace PamhagenSysCtrl.Helpers.Pipeline {
+    public class ExternalValve : Valve {
+
+        public override string Label { get; }
+
+        public ExternalValve(string label, double x, double y, int orientation, Func<bool> cbOpen) :
+            base(x, y, orientation, cbOpen) {
+            Label = label;
+        }
+
+        public override void Update(bool isHovering, bool isPressed) {
+            _text?.Visibility = isHovering || (App.Plant?.ManualControlMode ?? false) ? Visibility.Visible : Visibility.Hidden;
+            _triangles?.Fill =
+                !IsOpen ? PamhagenBrushes.Red :
+                IsOpen ? PamhagenBrushes.Green :
+                Highlight ?? Brushes.DarkGray;
+        }
+    }
+}

PamhagenSysCtrl/Helpers/Pipeline/PipeJoin.cs

@@ -1,7 +1,6 @@
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
-using System.Windows.Shapes;
 
 namespace PamhagenSysCtrl.Helpers.Pipeline {
     public class PipeJoin : INode {
@@ -12,11 +11,12 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
         public double CenterX { get; set; }
         public double CenterY { get; set; }
         public string Label => "";
+        public Brush? Highlight { get; set; }
 
         public ISet<IEdge> Inputs { get; init; }
         public ISet<IEdge> Outputs { get; init; }
 
-        private Polygon? _rect;
+        private System.Windows.Shapes.Path? _rect;
 
         public PipeJoin(double x, double y) {
             CenterX = x;
@@ -26,8 +26,8 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
         }
 
         public void Draw(Canvas canvas) {
-            _rect = new Polygon() {
+            _rect = new System.Windows.Shapes.Path() {
-                Fill = Brushes.Black,
+                Fill = Brushes.DarkGray,
                 Stroke = Brushes.Black,
             };
             canvas.Children.Add(_rect);
@@ -43,43 +43,66 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
             var il = Inputs.Any(e => (e.Start.CenterX < CenterX && (e.Orientation || e.Start.CenterY == CenterY)) || (e.IsTwoWay && e.End.CenterX < CenterX && (e.Orientation || e.End.CenterY == CenterY)));
             var ol = Outputs.Any(e => (e.End.CenterX < CenterX && (!e.Orientation || e.End.CenterY == CenterY)) || (e.IsTwoWay && e.Start.CenterX < CenterX && (!e.Orientation || e.Start.CenterY == CenterY)));
 
-            var points = new List<Point> {
+            var size = new Size(SIZE / 2 * scale, SIZE / 2 * scale);
-                new(0, 0)
+            var geo = new StreamGeometry();
-            };
+            using (var ctx = geo.Open()) {
-            if (ot && it) {
+                var points = new List<Point> {
-                points.AddRange([new(SIZE / 2 - POINT, 0), new(SIZE / 2, -POINT / 2), new(SIZE / 2, POINT / 2), new(SIZE / 2 + POINT, 0)]);
+                    new(0, 0)
-            } else if (ot) {
+                };
-                points.AddRange([new(SIZE / 2 - POINT, 0), new(SIZE / 2, -POINT), new(SIZE / 2 + POINT, 0)]);
+
-            } else if (it) {
+                ctx.BeginFigure(new((SIZE / 2 - POINT) * scale, 0), true, false);
-                points.AddRange([new(SIZE / 2 - POINT, 0), new(SIZE / 2, POINT), new(SIZE / 2 + POINT, 0)]);
+                if (ot && it) {
-            }
+                    points.AddRange([new(SIZE / 2, -POINT / 2), new(SIZE / 2, POINT / 2), new(SIZE / 2 + POINT, 0)]);
-            points.Add(new(SIZE, 0));
+                } else if (ot) {
-            if (or && ir) {
+                    ctx.PolyLineTo([new(SIZE / 2 * scale, -POINT * scale), new((SIZE / 2 + POINT) * scale, 0)], true, false);
-                points.AddRange([new(SIZE, SIZE / 2 - POINT), new(SIZE + POINT / 2, SIZE / 2), new(SIZE - POINT / 2, SIZE / 2), new(SIZE, SIZE / 2 + POINT)]);
+                } else if (it) {
-            } else if (or) {
+                    ctx.PolyLineTo([new(SIZE / 2 * scale, POINT * scale), new((SIZE / 2 + POINT) * scale, 0)], true, false);
-                points.AddRange([new(SIZE, SIZE / 2 - POINT), new(SIZE + POINT, SIZE / 2), new(SIZE, SIZE / 2 + POINT)]);
+                } else {
-            } else if (ir) {
+                    ctx.ArcTo(new((SIZE / 2 + POINT) * scale, 0), size, 0, false, SweepDirection.Clockwise, true, false);
-                points.AddRange([new(SIZE, SIZE / 2 - POINT), new(SIZE - POINT, SIZE / 2), new(SIZE, SIZE / 2 + POINT)]);
+                }
-            }
+
-            points.Add(new(SIZE, SIZE));
+                ctx.ArcTo(new(SIZE * scale, (SIZE / 2 - POINT) * scale), size, 0, false, SweepDirection.Clockwise, true, false);
-            if (ob && ib) {
+                points.Add(new(SIZE, 0));
-                points.AddRange([new(SIZE / 2 + POINT, SIZE), new(SIZE / 2, SIZE + POINT / 2), new(SIZE / 2, SIZE - POINT / 2), new(SIZE / 2 - POINT, SIZE)]);
+                if (or && ir) {
-            } else if (ob) {
+                    points.AddRange([new(SIZE, SIZE / 2 - POINT), new(SIZE + POINT / 2, SIZE / 2), new(SIZE - POINT / 2, SIZE / 2), new(SIZE, SIZE / 2 + POINT)]);
-                points.AddRange([new(SIZE / 2 + POINT, SIZE), new(SIZE / 2, SIZE + POINT), new(SIZE / 2 - POINT, SIZE)]);
+                } else if (or) {
-            } else if (ib) {
+                    ctx.PolyLineTo([new((SIZE + POINT) * scale, SIZE / 2 * scale), new(SIZE * scale, (SIZE / 2 + POINT) * scale)], true, false);
-                points.AddRange([new(SIZE / 2 + POINT, SIZE), new(SIZE / 2, SIZE - POINT), new(SIZE / 2 - POINT, SIZE)]);
+                } else if (ir) {
-            }
+                    ctx.PolyLineTo([new((SIZE - POINT) * scale, SIZE / 2 * scale), new(SIZE * scale, (SIZE / 2 + POINT) * scale)], true, false);
-            points.Add(new(0, SIZE));
+                } else {
-            if (ol && il) {
+                    ctx.ArcTo(new(SIZE * scale, (SIZE / 2 + POINT) * scale), size, 0, false, SweepDirection.Clockwise, true, false);
-                points.AddRange([new(0, SIZE / 2 + POINT), new(-POINT / 2, SIZE / 2), new(POINT / 2, SIZE / 2), new(0, SIZE / 2 - POINT)]);
+                }
-            } else if (ol) {
+
-                points.AddRange([new(0, SIZE / 2 + POINT), new(-POINT, SIZE / 2), new(0, SIZE / 2 - POINT)]);
+                ctx.ArcTo(new((SIZE / 2 + POINT) * scale, SIZE * scale), size, 0, false, SweepDirection.Clockwise, true, false);
-            } else if (il) {
+                points.Add(new(SIZE, SIZE));
-                points.AddRange([new(0, SIZE / 2 + POINT), new(POINT, SIZE / 2), new(0, SIZE / 2 - POINT)]);
+                if (ob && ib) {
+                    points.AddRange([new(SIZE / 2 + POINT, SIZE), new(SIZE / 2, SIZE + POINT / 2), new(SIZE / 2, SIZE - POINT / 2), new(SIZE / 2 - POINT, SIZE)]);
+                } else if (ob) {
+                    ctx.PolyLineTo([new(SIZE / 2 * scale, (SIZE + POINT) * scale), new((SIZE / 2 - POINT) * scale, SIZE * scale)], true, false);
+                } else if (ib) {
+                    ctx.PolyLineTo([new(SIZE / 2 * scale, (SIZE - POINT) * scale), new((SIZE / 2 - POINT) * scale, SIZE * scale)], true, false);
+                } else {
+                    ctx.ArcTo(new((SIZE / 2 - POINT) * scale, SIZE * scale), size, 0, false, SweepDirection.Clockwise, true, false);
+                }
+
+                ctx.ArcTo(new(0, (SIZE / 2 + POINT) * scale), size, 0, false, SweepDirection.Clockwise, true, false);
+                points.Add(new(0, SIZE));
+                if (ol && il) {
+                    points.AddRange([new(0, SIZE / 2 + POINT), new(-POINT / 2, SIZE / 2), new(POINT / 2, SIZE / 2), new(0, SIZE / 2 - POINT)]);
+                } else if (ol) {
+                    ctx.PolyLineTo([new(-POINT * scale, SIZE / 2 * scale), new(0, (SIZE / 2 - POINT) * scale)], true, false);
+                } else if (il) {
+                    ctx.PolyLineTo([new(POINT * scale, SIZE / 2 * scale), new(0, (SIZE / 2 - POINT) * scale)], true, false);
+                } else {
+                    ctx.ArcTo(new(0, (SIZE / 2 - POINT) * scale), size, 0, false, SweepDirection.Clockwise, true, false);
+                }
+
+                ctx.ArcTo(new((SIZE / 2 - POINT) * scale, 0), size, 0, false, SweepDirection.Clockwise, true, false);
             }
 
-            _rect?.Points = [.. points.Select(p => new Point(p.X * scale, p.Y * scale))];
+            _rect?.Data = geo;
-            _rect?.StrokeThickness = 2;
+            // [.. points.Select(p => new Point(p.X * scale, p.Y * scale))];
+            _rect?.StrokeThickness = Graph.ToBorder(scale);
             _rect?.SetValue(Canvas.LeftProperty, (CenterX - SIZE / 2) * scale);
             _rect?.SetValue(Canvas.TopProperty, (CenterY - SIZE / 2) * scale);
         }
@@ -89,7 +112,7 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
         }
 
         public void Update(bool isHovering, bool isPressed) {
-            _rect?.Stroke = isHovering ? Brushes.Black : Brushes.Black;
+            _rect?.Fill = Highlight ?? Brushes.DarkGray;
         }
     }
 }

PamhagenSysCtrl/Helpers/Pipeline/Pump.cs

@@ -26,7 +26,7 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
         protected Func<Pump, bool> CallbackSelected;
 
         private Ellipse? _circle;
-        private Polygon? _triangle;
+        private Polyline? _triangle;
         private TextBlock? _text;
 
         public Pump(string label, double x, double y, Func<MotorState> cbState, Func<bool> cbClearance, Func<Pump, bool> cbSelected) {
@@ -45,9 +45,11 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
                 Fill = Brushes.WhiteSmoke,
                 Stroke = Brushes.Black,
             };
-            _triangle = new Polygon() {
+            _triangle = new Polyline() {
-                Fill = Brushes.Transparent,
                 Stroke = Brushes.Black,
+                StrokeStartLineCap = PenLineCap.Square,
+                StrokeLineJoin = PenLineJoin.Round,
+                StrokeEndLineCap = PenLineCap.Square,
             };
             _text = new() {
                 Text = Label,
@@ -63,12 +65,12 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
             var border = Graph.ToBorder(scale);
             _circle?.StrokeThickness = border;
             Graph.SetCenter(_circle, CenterX, CenterY, DIAMETER, DIAMETER, scale);
-            var dx = Math.Cos(Math.PI / 6) * (DIAMETER / 2);
+            var dx = Math.Cos(Math.PI / 9.5) * (DIAMETER / 2);
-            var dy = Math.Sin(Math.PI / 6) * (DIAMETER / 2);
+            var dy = Math.Sin(Math.PI / 9.5) * (DIAMETER / 2);
             _triangle?.Points = [
                 Graph.ToPx(CenterX - dx, CenterY - dy, scale, dxpx: border, dypx: border / 2, round: false),
-                Graph.ToPx(CenterX + dx, CenterY - dy, scale, dxpx: -border, dypx: border / 2, round: false),
                 Graph.ToPx(CenterX, CenterY + DIAMETER / 2, scale, dypx: -border, round: false),
+                Graph.ToPx(CenterX + dx, CenterY - dy, scale, dxpx: -border, dypx: border / 2, round: false),
             ];
             _triangle?.StrokeThickness = border;
             _text?.FontSize = 14;

PamhagenSysCtrl/Helpers/Pipeline/Valve.cs

@@ -4,88 +4,134 @@ using System.Windows.Media;
 using System.Windows.Shapes;
 
 namespace PamhagenSysCtrl.Helpers.Pipeline {
-    public class Valve : INode {
+    public abstract class Valve : INode {
 
-        public const double DIAMETER = 4.8;
+        public const double LENGTH = 4.8;
+        public const double WIDTH = 2.6;
 
         public double CenterX { get; set; }
         public double CenterY { get; set; }
-        public int Nr { get; set; }
+        public abstract string Label { get; }
-        public string Label => $"V{Nr}";
         public Brush? Highlight { get; set; }
 
-        public readonly ISet<Path> LockedForPaths = new HashSet<Path>();
+        public int Orientation { get; set; }
 
-        public bool IsLocked => LockedForPaths.Any();
         public bool IsOpen => CallbackIsOpen();
-        public bool WantOpen => CallbackWantOpen(this);
         public ISet<IEdge> Inputs { get; init; }
         public ISet<IEdge> Outputs { get; init; }
 
         protected Func<bool> CallbackIsOpen;
-        protected Func<Valve, bool> CallbackWantOpen;
 
-        private Shape? _circle;
+        protected Rectangle? _background;
-        private TextBlock? _text;
+        protected Polygon? _triangles;
+        protected Polyline? _topLine;
+        protected Polyline? _bottomLine;
+        protected TextBlock? _text;
 
-        public Valve(int nr, double x, double y, Func<bool> cbOpen, Func<Valve, bool> cbWant) {
+        public Valve(double x, double y, int orientation, Func<bool> cbOpen) {
             CenterX = x;
             CenterY = y;
-            Nr = nr;
             CallbackIsOpen = cbOpen;
-            CallbackWantOpen = cbWant;
             Inputs = new HashSet<IEdge>();
             Outputs = new HashSet<IEdge>();
+            Orientation = orientation;
         }
 
         public void Draw(Canvas canvas) {
-            _circle = new Ellipse() {
+            _background = new Rectangle() {
+                Fill = Brushes.White,
+            };
+            _triangles = new Polygon() {
                 Fill = Brushes.DarkGray,
                 Stroke = Brushes.Black,
             };
+            _topLine = new Polyline() {
+                Stroke = Brushes.Black,
+            };
+            _bottomLine = new Polyline() {
+                Stroke = Brushes.Black,
+            };
             _text = new() {
                 Text = Label,
-                TextAlignment = TextAlignment.Center,
                 VerticalAlignment = VerticalAlignment.Center,
                 SnapsToDevicePixels = true,
             };
-            canvas.Children.Add(_circle);
+            canvas.Children.Add(_background);
+            canvas.Children.Add(_triangles);
+            canvas.Children.Add(_topLine);
+            canvas.Children.Add(_bottomLine);
             canvas.Children.Add(_text);
         }
 
         public void Scale(double scale) {
             var border = Graph.ToBorder(scale);
-            Graph.SetCenter(_circle, CenterX, CenterY, DIAMETER, DIAMETER, scale);
+            if (Orientation == 0 || Orientation == 2) {
-            _circle?.StrokeThickness = border;
+                Graph.SetCenter(_background, CenterX, CenterY, LENGTH / 2, LENGTH, scale);
-            _text?.Width = DIAMETER * scale;
+                _triangles?.Points = [
-            _text?.Height = DIAMETER * scale;
+                    Graph.ToPx(CenterX - WIDTH / 2, CenterY - LENGTH / 2, scale),
-            _text?.FontSize = 2 * scale;
+                    Graph.ToPx(CenterX + WIDTH / 2, CenterY + LENGTH / 2, scale),
-            _text?.SetValue(Canvas.LeftProperty, (CenterX - DIAMETER / 2 + 0.1) * scale);
+                    Graph.ToPx(CenterX - WIDTH / 2, CenterY + LENGTH / 2, scale),
-            _text?.SetValue(Canvas.TopProperty, (CenterY - DIAMETER / 2 + 1.1) * scale);
+                    Graph.ToPx(CenterX + WIDTH / 2, CenterY - LENGTH / 2, scale),
+                ];
+                _topLine?.Points = [
+                    Graph.ToPx(CenterX - WIDTH / 2, CenterY - LENGTH / 4, scale),
+                    Graph.ToPx(CenterX - WIDTH / 4, CenterY, scale),
+                    Graph.ToPx(CenterX - WIDTH / 2, CenterY + LENGTH / 4, scale),
+                ];
+                _bottomLine?.Points = [
+                    Graph.ToPx(CenterX + WIDTH / 2, CenterY - LENGTH / 4, scale),
+                    Graph.ToPx(CenterX + WIDTH / 4, CenterY, scale),
+                    Graph.ToPx(CenterX + WIDTH / 2, CenterY + LENGTH / 4, scale),
+                ];
+            } else {
+                Graph.SetCenter(_background, CenterX, CenterY, LENGTH, LENGTH / 2, scale);
+                _triangles?.Points = [
+                    Graph.ToPx(CenterX - LENGTH / 2, CenterY - WIDTH / 2, scale),
+                    Graph.ToPx(CenterX + LENGTH / 2, CenterY + WIDTH / 2, scale),
+                    Graph.ToPx(CenterX + LENGTH / 2, CenterY - WIDTH / 2, scale),
+                    Graph.ToPx(CenterX - LENGTH / 2, CenterY + WIDTH / 2, scale),
+                ];
+                _topLine?.Points = [
+                    Graph.ToPx(CenterX - LENGTH / 4, CenterY - WIDTH / 2, scale),
+                    Graph.ToPx(CenterX, CenterY - WIDTH / 4, scale),
+                    Graph.ToPx(CenterX + LENGTH / 4, CenterY - WIDTH / 2, scale),
+                ];
+                _bottomLine?.Points = [
+                    Graph.ToPx(CenterX - LENGTH / 4, CenterY + WIDTH / 2, scale),
+                    Graph.ToPx(CenterX, CenterY + WIDTH / 4, scale),
+                    Graph.ToPx(CenterX + LENGTH / 4, CenterY + WIDTH / 2, scale),
+                ];
+            }
+            _triangles?.StrokeThickness = border;
+            _topLine?.StrokeThickness = border;
+            _bottomLine?.StrokeThickness = border;
+            _text?.Width = 40;
+            _text?.Height = 16;
+            _text?.FontSize = 12;
+            _text?.TextAlignment = Orientation == 0 ? TextAlignment.Right : Orientation == 2 ? TextAlignment.Left : TextAlignment.Center;
+            if (Orientation == 0) {
+                _text?.SetValue(Canvas.LeftProperty, (CenterX - WIDTH / 1.5) * scale - 40);
+                _text?.SetValue(Canvas.TopProperty, CenterY * scale - 8);
+            } else if (Orientation == 2) {
+                _text?.SetValue(Canvas.LeftProperty, (CenterX + WIDTH / 1.5) * scale);
+                _text?.SetValue(Canvas.TopProperty, CenterY * scale - 8 );
+            } else if (Orientation == 1) {
+                _text?.SetValue(Canvas.LeftProperty, CenterX * scale - 20);
+                _text?.SetValue(Canvas.TopProperty, (CenterY - WIDTH / 2) * scale - 16);
+            } else {
+                _text?.SetValue(Canvas.LeftProperty, CenterX * scale - 20);
+                _text?.SetValue(Canvas.TopProperty, (CenterY + WIDTH / 2) * scale);
+            }
         }
 
         public bool IsInside(double x, double y) {
-            return Math.Sqrt(Math.Pow(CenterX - x, 2) + Math.Pow(CenterY - y, 2)) <= DIAMETER / 2;
+            if (Orientation == 0 || Orientation == 2) {
-        }
+                return Math.Abs(x - CenterX) <= WIDTH / 2 && Math.Abs(y - CenterY) <= LENGTH / 2;
-
-        public void Update(bool isHovering, bool isPressed) {
-            if (App.Plant?.ManualControlMode ?? false) {
-                _circle?.Fill =
-                    !WantOpen && !IsOpen && !isHovering ? PamhagenBrushes.Red :
-                    !WantOpen && !IsOpen ? PamhagenBrushes.Green :
-                    !WantOpen && IsOpen ? PamhagenBrushes.DimRed :
-                    WantOpen && !IsOpen ? PamhagenBrushes.DimGreen :
-                    WantOpen && IsOpen && !isHovering ? PamhagenBrushes.Green :
-                    WantOpen && IsOpen ? PamhagenBrushes.Red :
-                    Highlight ?? (isHovering ? Brushes.LightGray : Brushes.DarkGray);
             } else {
-                _circle?.Fill =
+                return Math.Abs(x - CenterX) <= LENGTH / 2 && Math.Abs(y - CenterY) <= WIDTH / 2;
-                    IsLocked && !WantOpen && !IsOpen ? PamhagenBrushes.DimOrange :
-                    IsLocked && !WantOpen && IsOpen ? PamhagenBrushes.Red :
-                    IsLocked && WantOpen && !IsOpen ? PamhagenBrushes.Yellow :
-                    IsLocked && WantOpen && IsOpen ? PamhagenBrushes.Green :
-                    Highlight ?? (isHovering ? Brushes.LightGray : Brushes.DarkGray);
             }
         }
+
+        public abstract void Update(bool isHovering, bool isPressed);
     }
 }

PamhagenSysCtrl/Helpers/T1Error.cs

@@ -53,11 +53,47 @@ namespace PamhagenSysCtrl.Helpers {
         }
         public static string GetName(this T1Error error) {
             return error switch {
+                T1Error.UNKNOWN_ERROR => "Unknown error",
                 T1Error.NO_ERROR => "No error",
                 T1Error.SYSTEM_POWER_ON => "System power on",
                 T1Error.SYSTEM_POWER_OFF => "System power off",
-                // TODO
+                T1Error.RAM_CHECK_ERROR => "RAM check error",
-                _ => "Unknown error",
+                T1Error.PROGRAM_BCC_ERROR => "Program BCC error",
+                T1Error.BATTERY_VOLTAGE_DROP => "Battery voltage drop",
+                T1Error.EEPROM_BCC_ERROR => "EEPROM BCC error",
+                T1Error.EEPROM_WARNING => "EEPROM warning",
+                T1Error.SYSTEM_RAM_CHECK_ERROR => "System RAM check error",
+                T1Error.SYSTEM_ROM_BCC_ERROR => "System ROM BCC error",
+                T1Error.PERIPHERAL_LSI_ERROR => "Peripheral LSI error",
+                T1Error.CLOCK_CALENDAR_CHECK_ERROR => "Clock-calendar check error",
+                T1Error.ILLEGAL_SYSTEM_INTERRUPT => "Illegal system interrupt",
+                T1Error.WD_TIMER_ERROR => "WD timer error",
+                T1Error.IO_BUS_ERROR => "I/O bus error",
+                T1Error.IO_MISMATCH => "I/O mismatch",
+                T1Error.IO_NO_ANSWER => "I/O no answer",
+                T1Error.IO_PARITY_ERROR => "I/O parity error",
+                T1Error.ILLEGAL_IO_REGISTER => "Illegal I/O register",
+                T1Error.COMMUNICATION_BUSY => "Communication busy",
+                T1Error.FORMAT_ERROR => "Format error",
+                T1Error.SCAN_TIME_OVER => "Scan time over",
+                T1Error.NO_END_IRET_ERROR => "No END/IRET error",
+                T1Error.PAIR_INSTRUCTION_ERROR => "Pair instruction error",
+                T1Error.OPERAND_ERROR => "Operand error",
+                T1Error.INVALID_PROGRAM => "Invalid program",
+                T1Error.NO_SUBROUTINE_ENTRY => "No subroutine entry",
+                T1Error.NO_RET_ERROR => "No RET error",
+                T1Error.SUBROUTINE_NESTING_ERROR => "Subroutine nesting error",
+                T1Error.LOOP_NESTING_ERROR => "Loop nesting error",
+                T1Error.INVALID_FUNCTION_INSTRUCTION => "Invalid function instruction",
+                T1Error.PASSWORD_PROTECT => "Password protect",
+                T1Error.ILLEGAL_INSTRUCTION => "Illegal instruction",
+                T1Error.REGISTER_ADDRESS_ERROR => "Register address error",
+                T1Error.BOUNDARY_ERROR => "Boundary error",
+                T1Error.MEMORY_FULL => "Memory full",
+                T1Error.MODE_MISMATCH => "Mode mismatch",
+                T1Error.REGISTER_ADDRESS_SIZE_ERROR => "Register address/size error",
+                T1Error.DUPLICATE_ENTRY_NR => "Duplicate entry No.",
+                _ => error.ToString(),
             };
         }
         public static string? GetDescription(this T1Error error) {
@@ -65,7 +101,42 @@ namespace PamhagenSysCtrl.Helpers {
                 T1Error.NO_ERROR => "No error recorded",
                 T1Error.SYSTEM_POWER_ON => "Power on (no error)",
                 T1Error.SYSTEM_POWER_OFF => "Power off (no error)",
-                // TODO
+                T1Error.RAM_CHECK_ERROR => "RAM read/write error has been detected",
+                T1Error.PROGRAM_BCC_ERROR => "Program BCC (memory check code) error has been detected",
+                T1Error.BATTERY_VOLTAGE_DROP => "Data invalidity of RAM (back-up area) has been detected",
+                T1Error.EEPROM_BCC_ERROR => "BCC error of built-in EEPROM has been detected",
+                T1Error.EEPROM_WARNING => "EEPROM write operation has exceeded 100,000 times",
+                T1Error.SYSTEM_RAM_CHECK_ERROR => "System RAM read/write error has been detected",
+                T1Error.SYSTEM_ROM_BCC_ERROR => "BCC error of system ROM has been detected",
+                T1Error.PERIPHERAL_LSI_ERROR => "CPU hardware error has been detected",
+                T1Error.CLOCK_CALENDAR_CHECK_ERROR => "Invalid clock-calendar data has been detected",
+                T1Error.ILLEGAL_SYSTEM_INTERRUPT => "Unregistered interrupt has occurred",
+                T1Error.WD_TIMER_ERROR => "Watchdog timer error has occurred",
+                T1Error.IO_BUS_ERROR => "I/O bus error has been detected",
+                T1Error.IO_MISMATCH => "Registered I/O allocation table and actual I/O configuration are not identical",
+                T1Error.IO_NO_ANSWER => "No response from I/O module has been received",
+                T1Error.IO_PARITY_ERROR => "I/O bus parity error has been detected",
+                T1Error.ILLEGAL_IO_REGISTER => "Excess I/O register allocation has been detected",
+                T1Error.COMMUNICATION_BUSY => "The T1/T1S is busy in processing for other peripheral communications",
+                T1Error.FORMAT_ERROR => "Received request is invalid (detected by the T1/T1S)",
+                T1Error.SCAN_TIME_OVER => "Scan time has exceeded 200 ms",
+                T1Error.NO_END_IRET_ERROR => "END or IRET instruction has not been programmed",
+                T1Error.PAIR_INSTRUCTION_ERROR => "Illegal combination of pair instructions has been programmed",
+                T1Error.OPERAND_ERROR => "Illegal operand has been detected",
+                T1Error.INVALID_PROGRAM => "Program abnormality has been detected",
+                T1Error.NO_SUBROUTINE_ENTRY => "Subroutine corresponding to CALL instruction has not been programmed",
+                T1Error.NO_RET_ERROR => "RET (subroutine return) instruction has not been in a subroutine",
+                T1Error.SUBROUTINE_NESTING_ERROR => "CALL instruction has been programmed in a subroutine (subroutine nesting)",
+                T1Error.LOOP_NESTING_ERROR => "Nesting of FOR-NEXT loop has been programmed",
+                T1Error.INVALID_FUNCTION_INSTRUCTION => "Function instruction which is not supported by T1/T1S has been programmed",
+                T1Error.PASSWORD_PROTECT => "Requested operation is protected by password",
+                T1Error.ILLEGAL_INSTRUCTION => "Illegal instruction has been detected",
+                T1Error.REGISTER_ADDRESS_ERROR => "Excess register address range has been programmed",
+                T1Error.BOUNDARY_ERROR => "Illegal register address is designated by index modification",
+                T1Error.MEMORY_FULL => "Program memory is insufficient for the requested command",
+                T1Error.MODE_MISMATCH => "Received command is invalid in the current T1/T1S operation mode",
+                T1Error.REGISTER_ADDRESS_SIZE_ERROR => "Specified register range exceeds the limit",
+                T1Error.DUPLICATE_ENTRY_NR => "Multiple subroutines which has same subroutine number have been programmed",
                 _ => null,
             };
         }

PamhagenSysCtrl/PamhagenSysCtrl.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <TargetFramework>net10.0-windows</TargetFramework>
-    <Version>0.0.3</Version>
+    <Version>0.0.4</Version>
     <Product>Anlagensteuerung Pamhagen</Product>
     <AssemblyTitle>Anlagensteuerung Pamhagen</AssemblyTitle>
     <AssemblyName>PamhagenSysCtrl</AssemblyName>
@@ -16,8 +16,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="10.0.10" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="10.0.11" />
-    <PackageReference Include="System.IO.Ports" Version="10.0.10" />
+    <PackageReference Include="System.IO.Ports" Version="10.0.11" />
   </ItemGroup>
 
 </Project>

PamhagenSysCtrl/Windows/PlantSchemeWindow.xaml

@@ -175,19 +175,18 @@
                         <RowDefinition Height="80"/>
                     </Grid.RowDefinitions>
 
-                    <Button x:Name="FastSelectButton_EntryTrough_Start" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="2"
+                    <Button x:Name="FastSelectButton_EntryTrough_Stop" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="2"
-                            FontSize="14" FontWeight="Bold"
-                            Click="FastSelectButton_EntryTroughStart_Click" MouseEnter="FastSelectButton_Enter" MouseLeave="FastSelectButton_Leave"
-                            BorderThickness="2">
-                        <TextBlock TextAlignment="Center">Auffangwanne<LineBreak/><Run x:Name="FastSelectButton_EntryTrough_Start_Run" FontSize="18">Schnecke Start</Run></TextBlock>
-                    </Button>
-                    <Button x:Name="FastSelectButton_EntryTrough_Stop" Grid.Column="2" Grid.Row="0" Grid.ColumnSpan="2"
                             FontSize="14" FontWeight="Bold"
                             Click="FastSelectButton_EntryTroughStop_Click" MouseEnter="FastSelectButton_Enter" MouseLeave="FastSelectButton_Leave"
                             BorderThickness="2">
                         <TextBlock TextAlignment="Center">Auffangwanne<LineBreak/><Run x:Name="FastSelectButton_EntryTrough_Stop_Run" FontSize="18">Schnecke Stop</Run></TextBlock>
                     </Button>
-
+                    <Button x:Name="FastSelectButton_EntryTrough_Start" Grid.Column="2" Grid.Row="0" Grid.ColumnSpan="2"
+                            FontSize="14" FontWeight="Bold"
+                            Click="FastSelectButton_EntryTroughStart_Click" MouseEnter="FastSelectButton_Enter" MouseLeave="FastSelectButton_Leave"
+                            BorderThickness="2">
+                        <TextBlock TextAlignment="Center">Auffangwanne<LineBreak/><Run x:Name="FastSelectButton_EntryTrough_Start_Run" FontSize="18">Schnecke Start</Run></TextBlock>
+                    </Button>
 
                     <Button x:Name="FastSelectButton_MW2" Grid.Column="0" Grid.Row="2"
                             Content="MW2   &#x2B9C;" FontSize="16" FontWeight="Bold"
@@ -198,31 +197,31 @@
                             Click="FastSelectButton_MW1_Click" MouseEnter="FastSelectButton_Enter" MouseLeave="FastSelectButton_Leave"
                             BorderThickness="2"/>
 
-                    <Button x:Name="FastSelectButton_MP2_Stop" Grid.Column="0" Grid.Row="4"
+                    <Button x:Name="FastSelectButton_MP2_Forward" Grid.Column="0" Grid.Row="4"
-                            FontSize="16" FontWeight="Bold"
-                            Click="FastSelectButton_MP2_Stop_Click" MouseEnter="FastSelectButton_Enter" MouseLeave="FastSelectButton_Leave"
-                            BorderThickness="2">
-                        <TextBlock TextAlignment="Center"><Run x:Name="FastSelectButton_MP2_Stop_Run" FontSize="24">MP2</Run><LineBreak/>Stop</TextBlock>
-                    </Button>
-                    <Button x:Name="FastSelectButton_MP2_Forward" Grid.Column="0" Grid.Row="5"
                             FontSize="16" FontWeight="Bold"
                             Click="FastSelectButton_MP2_Forward_Click" MouseEnter="FastSelectButton_Enter" MouseLeave="FastSelectButton_Leave"
                             BorderThickness="2">
                         <TextBlock TextAlignment="Center"><Run x:Name="FastSelectButton_MP2_Forward_Run" FontSize="24">MP2</Run><LineBreak/><Run x:Name="MP2_Target">Vor</Run></TextBlock>
                     </Button>
-
+                    <Button x:Name="FastSelectButton_MP2_Stop" Grid.Column="0" Grid.Row="5"
-                    <Button x:Name="FastSelectButton_MP1_Stop" Grid.Column="3" Grid.Row="4"
                             FontSize="16" FontWeight="Bold"
-                            Click="FastSelectButton_MP1_Stop_Click" MouseEnter="FastSelectButton_Enter" MouseLeave="FastSelectButton_Leave"
+                            Click="FastSelectButton_MP2_Stop_Click" MouseEnter="FastSelectButton_Enter" MouseLeave="FastSelectButton_Leave"
                             BorderThickness="2">
-                        <TextBlock TextAlignment="Center"><Run x:Name="FastSelectButton_MP1_Stop_Run" FontSize="24">MP1</Run><LineBreak/>Stop</TextBlock>
+                        <TextBlock TextAlignment="Center"><Run x:Name="FastSelectButton_MP2_Stop_Run" FontSize="24">MP2</Run><LineBreak/>Stop</TextBlock>
                     </Button>
-                    <Button x:Name="FastSelectButton_MP1_Forward" Grid.Column="3" Grid.Row="5"
+
+                    <Button x:Name="FastSelectButton_MP1_Forward" Grid.Column="3" Grid.Row="4"
                             FontSize="16" FontWeight="Bold"
                             Click="FastSelectButton_MP1_Forward_Click" MouseEnter="FastSelectButton_Enter" MouseLeave="FastSelectButton_Leave"
                             BorderThickness="2">
                         <TextBlock TextAlignment="Center"><Run x:Name="FastSelectButton_MP1_Forward_Run" FontSize="24">MP1</Run><LineBreak/><Run x:Name="MP1_Target">Vor</Run></TextBlock>
                     </Button>
+                    <Button x:Name="FastSelectButton_MP1_Stop" Grid.Column="3" Grid.Row="5"
+                            FontSize="16" FontWeight="Bold"
+                            Click="FastSelectButton_MP1_Stop_Click" MouseEnter="FastSelectButton_Enter" MouseLeave="FastSelectButton_Leave"
+                            BorderThickness="2">
+                        <TextBlock TextAlignment="Center"><Run x:Name="FastSelectButton_MP1_Stop_Run" FontSize="24">MP1</Run><LineBreak/>Stop</TextBlock>
+                    </Button>
                 </Grid>
             </Border>
         </Grid>

PamhagenSysCtrl/Windows/PlantSchemeWindow.xaml.cs

@@ -349,7 +349,7 @@ namespace PamhagenSysCtrl.Windows {
             }
             foreach (var c in clicked) {
                 if (App.Plant?.ManualControlMode ?? false) {
-                    if (c is Valve v) {
+                    if (c is ControlledValve v) {
                         if (v.WantOpen) {
                             App.Plant.CloseV(v.Nr);
                         } else {
@@ -502,6 +502,8 @@ namespace PamhagenSysCtrl.Windows {
             foreach (var n in Graph.Nodes) {
                 if (n is Pump p) {
                     p.Highlight = null;
+                } else if (n is PipeJoin j) {
+                    j.Highlight = null;
                 }
             }
 
@@ -564,14 +566,14 @@ namespace PamhagenSysCtrl.Windows {
 
                 if (Graph.SelectedPaths.Select(p => (Path?)p).FirstOrDefault(p => p?.Start == Graph.MW1) is Path pmw1) {
                     MP1_Target.Text = "\u2b9e " + string.Join(" \u2b9e ", pmw1.Hops
-                        .Select(h => h.Node is Valve || h.Node is Pump || h.Node is CenterValve ? null : h.Node.Label)
+                        .Select(h => h.Node is Valve || h.Node is Pump ? null : h.Node.Label)
                         .Where(l => !string.IsNullOrWhiteSpace(l)));
                 } else {
                     MP1_Target.Text = "Vor";
                 }
                 if (Graph.SelectedPaths.Select(p => (Path?)p).FirstOrDefault(p => p?.Start == Graph.MW2) is Path pmw2) {
                     MP2_Target.Text = "\u2b9e " + string.Join(" \u2b9e ", pmw2.Hops
-                        .Select(h => h.Node is Valve || h.Node is Pump || h.Node is CenterValve ? null : h.Node.Label)
+                        .Select(h => h.Node is Valve || h.Node is Pump ? null : h.Node.Label)
                         .Where(l => !string.IsNullOrWhiteSpace(l)));
                 } else {
                     MP2_Target.Text = "Vor";
@@ -605,7 +607,7 @@ namespace PamhagenSysCtrl.Windows {
                 App.Plant?.CloseV(i);
             }
             foreach (var p in add) {
-                if (p.Hops.Any(h => h.Node is Valve v && v.IsLocked)) continue;
+                if (p.Hops.Any(h => h.Node is ControlledValve v && v.IsLocked)) continue;
                 Graph.AddPath(p);
             }
         }
@@ -617,7 +619,7 @@ namespace PamhagenSysCtrl.Windows {
             foreach (var src in sources) {
                 var paths = new List<Path>();
                 foreach (var sink in sinks) {
-                    paths.AddRange(Graph.GetPaths(src, sink, null, (n) => n is not ISink && (n is not Valve v || p.WantValveOpen(v.Nr))));
+                    paths.AddRange(Graph.GetPaths(src, sink, null, (n) => n is not ISink && (n is not ControlledValve v || p.WantValveOpen(v.Nr))));
                 }
                 if (paths.Count == 1)
                     yield return paths.First();

README.md

@@ -12,7 +12,7 @@ About
 **Product:** Anlagensteuerung Pamhagen  
 **Description:** Interface to a LPC and graphical user interface for controlling the plant/system  
 **Type:** HMI and PLC Control Software  
-**Version:** 0.0.3 ([Changelog](./CHANGELOG.md))  
+**Version:** 0.0.4 ([Changelog](./CHANGELOG.md))  
 **License:** [GNU General Public License 3.0 (GPLv3)](./LICENSE)  
 **Source code:** https://git.necronda.net/winzer/pamhagen-sysctrl  
 **Developement period:** 2026
@@ -30,7 +30,7 @@ Packaging: [WiX Toolset](https://www.firegiant.com/wixtoolset/)
 **Produkt:** Anlagensteuerung Pamhagen  
 **Beschreibung:** Schnittstelle zu einer SPS und grafische Benutzeroberfläche für die Steuerung der Anlage  
 **Typ:** HMI- und SPS-Steuerungssoftware  
-**Version:** 0.0.3 ([Änderungsprotokoll](./CHANGELOG.md))  
+**Version:** 0.0.4 ([Änderungsprotokoll](./CHANGELOG.md))  
 **Lizenz:** [GNU General Public License 3.0 (GPLv3)](./LICENSE)  
 **Quellcode:** https://git.necronda.net/winzer/pamhagen-sysctrl  
 **Entwicklungszeitraum:** 2026