winzer/pamhagen-sysctrl
2
0
Fork 0
Code Issues Pull Requests Actions Releases 4 Activity

[WIP] Scaling
Test / Run tests (push) Successful in 14s
Details

Browse Source
This commit is contained in:
lorenz.stechauner
2026-08-12 16:39:02 +02:00
parent 2dee3a9ae9
commit 31e1347376
22 changed files with 430 additions and 409 deletions
Download Patch File Download Diff File Expand all files Collapse all files
PamhagenSysCtrl/Helpers/PamhagenGraph.cs
+152 -152
View File
@@ -31,66 +31,66 @@ namespace PamhagenSysCtrl.Helpers {
public readonly Tank Tank9; public readonly Tank Tank9;
public PamhagenGraph() { public PamhagenGraph() {
double mw2X = 180; double mw2X = 36;
double mw1X = 300; double mw1X = 60;
double mpY = 380; double mpY = 76;
double ltg1Y = 510; double ltg1Y = 102;
double ltg2Y = ltg1Y + 30; double ltg2Y = ltg1Y + 6;
double ltg1X = 600; double ltg1X = 120;
double ltg2X = ltg1X + 30; double ltg2X = ltg1X + 6;
double ltg6Y = 160; double ltg6Y = 32;
double ltg7Y = ltg6Y - 30; double ltg7Y = ltg6Y - 6;
double tanksY = 280; double tanksY = 56;
double tValveY = ((tanksY - 50) + ltg6Y) / 2 + 5; double tValveY = ((tanksY - 10) + ltg6Y) / 2 + 1;
double wtX = ltg1X - 180; double wtX = ltg1X - 36;
double wt2Y = 225; double wt2Y = 45;
double wt1Y = wt2Y + 135; double wt1Y = wt2Y + 27;
double x1X = wtX + 40; double x1X = wtX + 8;
double t1X = 735; double t1X = 147;
double t2X = t1X + 80; double t2X = t1X + 16;
double t3X = t2X + 80; double t3X = t2X + 16;
double t4X = t3X + 80 + 30; double t4X = t3X + 16 + 6;
double t5X = t4X + 80; double t5X = t4X + 16;
double t6X = t5X + 80 + 30; double t6X = t5X + 16 + 6;
double t7X = t6X + 80; double t7X = t6X + 16;
double t8X = t7X + 80; double t8X = t7X + 16;
double t9X = t8X + 80; double t9X = t8X + 16;
var prY = 720; var prY = 144;
var pr1X = 730; var pr1X = 146;
var pr2X = 920; var pr2X = 184;
var trough = new EntryTrough("Auffangwanne", mw1X + 70, 100, () => App.Plant?.IsTroughAugerActive ?? false); var trough = new EntryTrough("Auffangwanne", mw1X + 14, 20, () => App.Plant?.IsTroughAugerActive ?? false);
Nodes.Add(trough); Nodes.Add(trough);
Auger1 = new EncasedAuger("", (mw1X + mw2X) / 2 - 100, 200, () => App.Plant?.IsAuger1Active ?? false); Auger1 = new EncasedAuger("", (mw1X + mw2X) / 2 - 20, 40, () => App.Plant?.IsAuger1Active ?? false);
var auger0 = new EncasedAuger("Pressen-\nQuerschnecke", 40, 200, () => App.Plant?.IsPresseQuerSchneckeActive ?? false, 180, clickable: false); var auger0 = new EncasedAuger("Pressen-\nQuerschnecke", 8, 40, () => App.Plant?.IsPresseQuerSchneckeActive ?? false, 180, clickable: false);
Auger3 = new EncasedAuger("", 120, 80, () => App.Plant?.IsAuger3Active ?? false, 135); Auger3 = new EncasedAuger("", 24, 16, () => App.Plant?.IsAuger3Active ?? false, 135);
var belt = new ConveyorBelt("", 90, 160, () => App.Plant?.IsAuger2Active ?? false); var belt = new ConveyorBelt("", 18, 32, () => App.Plant?.IsAuger2Active ?? false);
Nodes.Add(belt); Nodes.Add(belt);
Nodes.Add(Auger1); Nodes.Add(Auger1);
Nodes.Add(auger0); Nodes.Add(auger0);
Nodes.Add(Auger3); Nodes.Add(Auger3);
var rebler = new Rebler("Rebler", (mw1X + mw2X) / 2, 200, () => App.Plant?.IsReblerActive ?? false); var rebler = new Rebler("Rebler", (mw1X + mw2X) / 2, 40, () => App.Plant?.IsReblerActive ?? false);
Nodes.Add(rebler); Nodes.Add(rebler);
var switcher = new Switcher("", (mw1X + mw2X) / 2, 260, () => App.Plant?.TroughSelector ?? 0, () => App.Plant == null ? 0 : App.Plant.WantMW1Selected ? 1 : 2); var switcher = new Switcher("", (mw1X + mw2X) / 2, 52, () => App.Plant?.TroughSelector ?? 0, () => App.Plant == null ? 0 : App.Plant.WantMW1Selected ? 1 : 2);
Nodes.Add(switcher); Nodes.Add(switcher);
MW1 = new Trough("MW1", mw1X, mpY - 70, () => App.Plant?.FillLevelMW1 ?? FillState.Unknown); MW1 = new Trough("MW1", mw1X, mpY - 14, () => App.Plant?.FillLevelMW1 ?? FillState.Unknown);
MW2 = new Trough("MW2", mw2X, mpY - 70, () => App.Plant?.FillLevelMW2 ?? FillState.Unknown); MW2 = new Trough("MW2", mw2X, mpY - 14, () => App.Plant?.FillLevelMW2 ?? FillState.Unknown);
MP1 = new Pump("MP1", mw1X, mpY, () => App.Plant?.MP1 ?? default, () => App.Plant?.MP1HasClearance ?? false, (x) => SelectedPaths.Any(p => p.Hops.Any(h => h.Node == x))); MP1 = new Pump("MP1", mw1X, mpY, () => App.Plant?.MP1 ?? default, () => App.Plant?.MP1HasClearance ?? false, (x) => SelectedPaths.Any(p => p.Hops.Any(h => h.Node == x)));
MP2 = new Pump("MP2", mw2X, mpY, () => App.Plant?.MP2 ?? default, () => App.Plant?.MP2HasClearance ?? false, (x) => SelectedPaths.Any(p => p.Hops.Any(h => h.Node == x))); MP2 = new Pump("MP2", mw2X, mpY, () => App.Plant?.MP2 ?? default, () => App.Plant?.MP2HasClearance ?? false, (x) => SelectedPaths.Any(p => p.Hops.Any(h => h.Node == x)));
var x1 = new PipeJoin(mw1X, mpY + 40); var x1 = new PipeJoin(mw1X, mpY + 8);
var x2 = new PipeJoin(mw2X, mpY + 40); var x2 = new PipeJoin(mw2X, mpY + 8);
CreateOutlet(MW1, MP1); CreateOutlet(MW1, MP1);
CreateOutlet(MW2, MP2); CreateOutlet(MW2, MP2);
CreatePipe(MP1, x1); CreatePipe(MP1, x1);
CreatePipe(MP2, x2); CreatePipe(MP2, x2);
var v1 = CreateValve(1, mw1X, mpY + 80); var v1 = CreateValve(1, mw1X, mpY + 16);
var v2 = CreateValve(2, mw2X, mpY + 80); var v2 = CreateValve(2, mw2X, mpY + 16);
var v3 = CreateValve(3, mw2X + 30, mpY + 80); var v3 = CreateValve(3, mw2X + 6, mpY + 16);
var v4 = CreateValve(4, mw1X - 30, mpY + 80); var v4 = CreateValve(4, mw1X - 6, mpY + 16);
CreatePipe(x1, v1); CreatePipe(x1, v1);
CreatePipe(x1, v4); CreatePipe(x1, v4);
@@ -99,8 +99,8 @@ namespace PamhagenSysCtrl.Helpers {
var x3 = new PipeJoin(mw1X, ltg1Y); var x3 = new PipeJoin(mw1X, ltg1Y);
var x4 = new PipeJoin(x1X, ltg1Y); var x4 = new PipeJoin(x1X, ltg1Y);
var x5 = new PipeJoin(mw1X - 30, ltg2Y); var x5 = new PipeJoin(mw1X - 6, ltg2Y);
var x6 = new PipeJoin(x1X - 30, ltg2Y); var x6 = new PipeJoin(x1X - 6, ltg2Y);
CreatePipe(v1, x3, true); CreatePipe(v1, x3, true);
CreatePipe(v3, x3, true); CreatePipe(v3, x3, true);
@@ -109,50 +109,50 @@ namespace PamhagenSysCtrl.Helpers {
CreatePipe(v4, x5, true); CreatePipe(v4, x5, true);
CreatePipe(x5, x6, true); CreatePipe(x5, x6, true);
var v5 = CreateValve(5, x1X + 30, ltg1Y); var v5 = CreateValve(5, x1X + 6, ltg1Y);
var v6 = CreateValve(6, x1X + 30, ltg2Y + 40); var v6 = CreateValve(6, x1X + 6, ltg2Y + 8);
var v7 = CreateValve(7, x1X + 30, ltg2Y); var v7 = CreateValve(7, x1X + 6, ltg2Y);
var v8 = CreateValve(8, x1X - 30, ltg2Y + 40); var v8 = CreateValve(8, x1X - 6, ltg2Y + 8);
var v9 = CreateValve(9, ltg2X, 500); var v9 = CreateValve(9, ltg2X, 100);
CreatePipe(x4, v5); CreatePipe(x4, v5);
CreatePipe(x4, v6, true); CreatePipe(x4, v6, true);
CreatePipe(x6, v7); CreatePipe(x6, v7);
CreatePipe(x6, v8); CreatePipe(x6, v8);
CreatePipe(v7, v9, label: "Ltg. 2", labelOffsetX: 30); CreatePipe(v7, v9, label: "Ltg. 2", labelOffsetX: 6);
var xv15 = new PipeJoin(ltg1X, wt1Y + 40); var xv15 = new PipeJoin(ltg1X, wt1Y + 8);
var xv11 = new PipeJoin(ltg2X, wt1Y + 70); var xv11 = new PipeJoin(ltg2X, wt1Y + 14);
var x7 = new PipeJoin(ltg2X, 460); var x7 = new PipeJoin(ltg2X, 92);
CreatePipe(v5, xv15, label: "Ltg. 1", labelOffsetX: 30); CreatePipe(v5, xv15, label: "Ltg. 1", labelOffsetX: 6);
CreatePipe(v9, x7); CreatePipe(v9, x7);
CreatePipe(x7, xv11); CreatePipe(x7, xv11);
var v10 = CreateValve(10, ltg2X + 40, 460); var v10 = CreateValve(10, ltg2X + 8, 92);
var v11 = CreateValve(11, ltg1X - 30, wt1Y + 70); var v11 = CreateValve(11, ltg1X - 6, wt1Y + 14);
var v12 = CreateValve(12, ltg1X, wt1Y); var v12 = CreateValve(12, ltg1X, wt1Y);
var v13 = CreateValve(13, ltg2X, wt1Y); var v13 = CreateValve(13, ltg2X, wt1Y);
var v14 = CreateValve(14, ltg1X - 30, wt1Y - 40); var v14 = CreateValve(14, ltg1X - 6, wt1Y - 8);
var v15 = CreateValve(15, ltg1X - 30, wt1Y + 40); var v15 = CreateValve(15, ltg1X - 6, wt1Y + 8);
var v16 = CreateValve(16, ltg1X - 30, wt1Y - 70); var v16 = CreateValve(16, ltg1X - 6, wt1Y - 14);
CreatePipe(v10, x7); CreatePipe(v10, x7);
CreatePipe(xv11, v11); CreatePipe(xv11, v11);
CreatePipe(xv15, v15); CreatePipe(xv15, v15);
CreatePipe(xv15, v12); CreatePipe(xv15, v12);
CreatePipe(xv11, v13); CreatePipe(xv11, v13);
var xv16 = new PipeJoin(ltg1X, wt1Y - 70); var xv16 = new PipeJoin(ltg1X, wt1Y - 14);
var xv14 = new PipeJoin(ltg2X, wt1Y - 40); var xv14 = new PipeJoin(ltg2X, wt1Y - 8);
CreatePipe(v12, xv16); CreatePipe(v12, xv16);
CreatePipe(v13, xv14); CreatePipe(v13, xv14);
CreatePipe(v16, xv16); CreatePipe(v16, xv16);
CreatePipe(v14, xv14); CreatePipe(v14, xv14);
var v20 = CreateValve(20, ltg1X - 30, wt2Y - 70); var v20 = CreateValve(20, ltg1X - 6, wt2Y - 14);
var v21 = CreateValve(21, ltg1X - 30, wt2Y - 40); var v21 = CreateValve(21, ltg1X - 6, wt2Y - 8);
var xv20 = new PipeJoin(ltg1X, wt2Y - 70); var xv20 = new PipeJoin(ltg1X, wt2Y - 14);
var xv21 = new PipeJoin(ltg2X, wt2Y - 40); var xv21 = new PipeJoin(ltg2X, wt2Y - 8);
CreatePipe(xv16, xv20); CreatePipe(xv16, xv20);
CreatePipe(xv14, xv21); CreatePipe(xv14, xv21);
CreatePipe(v20, xv20); CreatePipe(v20, xv20);
@@ -160,15 +160,15 @@ namespace PamhagenSysCtrl.Helpers {
var wt1 = new HeatExchanger("WT Most", wtX, wt1Y); var wt1 = new HeatExchanger("WT Most", wtX, wt1Y);
var wt2 = new HeatExchanger("WT Warmwasser", wtX, wt2Y); var wt2 = new HeatExchanger("WT Warmwasser", wtX, wt2Y);
var v17 = CreateValve(17, wtX + 70, wt1Y); var v17 = CreateValve(17, wtX + 14, wt1Y);
var v18 = CreateValve(18, wtX + 40, wt1Y + 40); var v18 = CreateValve(18, wtX + 8, wt1Y + 8);
var v19 = CreateValve(19, wtX + 40, (wt1Y + wt2Y) / 2); var v19 = CreateValve(19, wtX + 8, (wt1Y + wt2Y) / 2);
var xwt1 = new PipeJoin(wtX + 120, wt1Y + 40); var xwt1 = new PipeJoin(wtX + 24, wt1Y + 8);
var xwt2 = new PipeJoin(wtX + 70, wt1Y + 40); var xwt2 = new PipeJoin(wtX + 14, wt1Y + 8);
var xwt3 = new PipeJoin(wtX + 40, wt1Y - 40); var xwt3 = new PipeJoin(wtX + 8, wt1Y - 8);
var xwt4 = new PipeJoin(wtX + 120, wt1Y - 40); var xwt4 = new PipeJoin(wtX + 24, wt1Y - 8);
var xwt5 = new PipeJoin(wtX + 40, wt2Y + 40); var xwt5 = new PipeJoin(wtX + 8, wt2Y + 8);
var xwt6 = new PipeJoin(wtX + 120, wt2Y - 40); var xwt6 = new PipeJoin(wtX + 24, wt2Y - 8);
CreatePipe(v11, xwt1); CreatePipe(v11, xwt1);
CreatePipe(v15, xwt1); CreatePipe(v15, xwt1);
CreatePipe(xwt1, xwt2); CreatePipe(xwt1, xwt2);
@@ -187,22 +187,22 @@ namespace PamhagenSysCtrl.Helpers {
CreatePipe(v19, xwt5); CreatePipe(v19, xwt5);
CreatePipe(xwt5, wt2); CreatePipe(xwt5, wt2);
var xv22 = new PipeJoin(t1X - 15, ltg7Y); var xv22 = new PipeJoin(t1X - 3, ltg7Y);
var xv23 = new PipeJoin(t1X + 15, ltg6Y); var xv23 = new PipeJoin(t1X + 3, ltg6Y);
var v22 = CreateValve(22, t1X - 15, tValveY); var v22 = CreateValve(22, t1X - 3, tValveY);
var v23 = CreateValve(23, t1X + 15, tValveY); var v23 = CreateValve(23, t1X + 3, tValveY);
Tank1 = CreateTank(1, t1X, tanksY, 35000); Tank1 = CreateTank(1, t1X, tanksY, 35000);
CreatePipe(xv20, xv22, true, label: "Ltg. 7", labelOffsetX: 50); CreatePipe(xv20, xv22, true, label: "Ltg. 7", labelOffsetX: 10);
CreatePipe(xv21, xv23, true, label: "Ltg. 6", labelOffsetX: 20); CreatePipe(xv21, xv23, true, label: "Ltg. 6", labelOffsetX: 4);
CreatePipe(xv22, v22); CreatePipe(xv22, v22);
CreatePipe(xv23, v23); CreatePipe(xv23, v23);
CreateInlet(v22, Tank1); CreateInlet(v22, Tank1);
CreateInlet(v23, Tank1); CreateInlet(v23, Tank1);
var xv24 = new PipeJoin(t2X - 15, ltg7Y); var xv24 = new PipeJoin(t2X - 3, ltg7Y);
var xv25 = new PipeJoin(t2X + 15, ltg6Y); var xv25 = new PipeJoin(t2X + 3, ltg6Y);
var v24 = CreateValve(24, t2X - 15, tValveY); var v24 = CreateValve(24, t2X - 3, tValveY);
var v25 = CreateValve(25, t2X + 15, tValveY); var v25 = CreateValve(25, t2X + 3, tValveY);
Tank2 = CreateTank(2, t2X, tanksY, 35000); Tank2 = CreateTank(2, t2X, tanksY, 35000);
CreatePipe(xv22, xv24); CreatePipe(xv22, xv24);
CreatePipe(xv23, xv25); CreatePipe(xv23, xv25);
@@ -211,10 +211,10 @@ namespace PamhagenSysCtrl.Helpers {
CreateInlet(v24, Tank2); CreateInlet(v24, Tank2);
CreateInlet(v25, Tank2); CreateInlet(v25, Tank2);
var xv26 = new PipeJoin(t3X - 15, ltg7Y); var xv26 = new PipeJoin(t3X - 3, ltg7Y);
var xv27 = new PipeJoin(t3X + 15, ltg6Y); var xv27 = new PipeJoin(t3X + 3, ltg6Y);
var v26 = CreateValve(26, t3X - 15, tValveY); var v26 = CreateValve(26, t3X - 3, tValveY);
var v27 = CreateValve(27, t3X + 15, tValveY); var v27 = CreateValve(27, t3X + 3, tValveY);
Tank3 = CreateTank(3, t3X, tanksY, 35000); Tank3 = CreateTank(3, t3X, tanksY, 35000);
CreatePipe(xv24, xv26); CreatePipe(xv24, xv26);
CreatePipe(xv25, xv27); CreatePipe(xv25, xv27);
@@ -228,10 +228,10 @@ namespace PamhagenSysCtrl.Helpers {
CreatePipe(xv26, v28); CreatePipe(xv26, v28);
CreatePipe(xv27, v29); CreatePipe(xv27, v29);
var xv30 = new PipeJoin(t4X - 15, ltg7Y); var xv30 = new PipeJoin(t4X - 3, ltg7Y);
var xv31 = new PipeJoin(t4X + 15, ltg6Y); var xv31 = new PipeJoin(t4X + 3, ltg6Y);
var v30 = CreateValve(30, t4X - 15, tValveY); var v30 = CreateValve(30, t4X - 3, tValveY);
var v31 = CreateValve(31, t4X + 15, tValveY); var v31 = CreateValve(31, t4X + 3, tValveY);
Tank4 = CreateTank(4, t4X, tanksY, 35000); Tank4 = CreateTank(4, t4X, tanksY, 35000);
CreatePipe(v28, xv30); CreatePipe(v28, xv30);
CreatePipe(v29, xv31); CreatePipe(v29, xv31);
@@ -240,12 +240,12 @@ namespace PamhagenSysCtrl.Helpers {
CreateInlet(v30, Tank4); CreateInlet(v30, Tank4);
CreateInlet(v31, Tank4); CreateInlet(v31, Tank4);
var xv32 = new PipeJoin(t5X - 15, ltg7Y); var xv32 = new PipeJoin(t5X - 3, ltg7Y);
var xv33 = new PipeJoin(t5X + 15, ltg6Y); var xv33 = new PipeJoin(t5X + 3, ltg6Y);
var v32 = CreateValve(32, t5X - 15, tValveY); var v32 = CreateValve(32, t5X - 3, tValveY);
var v33 = CreateValve(33, t5X + 15, tValveY); var v33 = CreateValve(33, t5X + 3, tValveY);
Tank5 = CreateTank(5, t5X, tanksY, 35000); Tank5 = CreateTank(5, t5X, tanksY, 35000);
CreatePipe(xv30, xv32, label: "Ltg. 7", labelOffsetX: 30); CreatePipe(xv30, xv32, label: "Ltg. 7", labelOffsetX: 6);
CreatePipe(xv31, xv33, label: "Ltg. 6", labelOffsetX: 0); CreatePipe(xv31, xv33, label: "Ltg. 6", labelOffsetX: 0);
CreatePipe(xv32, v32); CreatePipe(xv32, v32);
CreatePipe(xv33, v33); CreatePipe(xv33, v33);
@@ -257,10 +257,10 @@ namespace PamhagenSysCtrl.Helpers {
CreatePipe(xv32, v34); CreatePipe(xv32, v34);
CreatePipe(xv33, v35); CreatePipe(xv33, v35);
var xv36 = new PipeJoin(t6X + 15, ltg6Y); var xv36 = new PipeJoin(t6X + 3, ltg6Y);
var xv37 = new PipeJoin(t6X - 15, ltg7Y); var xv37 = new PipeJoin(t6X - 3, ltg7Y);
var v36 = CreateValve(36, t6X + 15, tValveY); var v36 = CreateValve(36, t6X + 3, tValveY);
var v37 = CreateValve(37, t6X - 15, tValveY); var v37 = CreateValve(37, t6X - 3, tValveY);
Tank6 = CreateTank(6, t6X, tanksY, 35000); Tank6 = CreateTank(6, t6X, tanksY, 35000);
CreatePipe(v34, xv37); CreatePipe(v34, xv37);
CreatePipe(v35, xv36); CreatePipe(v35, xv36);
@@ -269,10 +269,10 @@ namespace PamhagenSysCtrl.Helpers {
CreateInlet(v36, Tank6); CreateInlet(v36, Tank6);
CreateInlet(v37, Tank6); CreateInlet(v37, Tank6);
var xv38 = new PipeJoin(t7X + 15, ltg6Y); var xv38 = new PipeJoin(t7X + 3, ltg6Y);
var xv39 = new PipeJoin(t7X - 15, ltg7Y); var xv39 = new PipeJoin(t7X - 3, ltg7Y);
var v38 = CreateValve(38, t7X + 15, tValveY); var v38 = CreateValve(38, t7X + 3, tValveY);
var v39 = CreateValve(39, t7X - 15, tValveY); var v39 = CreateValve(39, t7X - 3, tValveY);
Tank7 = CreateTank(7, t7X, tanksY, 35000); Tank7 = CreateTank(7, t7X, tanksY, 35000);
CreatePipe(xv37, xv39); CreatePipe(xv37, xv39);
CreatePipe(xv36, xv38); CreatePipe(xv36, xv38);
@@ -281,47 +281,47 @@ namespace PamhagenSysCtrl.Helpers {
CreateInlet(v38, Tank7); CreateInlet(v38, Tank7);
CreateInlet(v39, Tank7); CreateInlet(v39, Tank7);
var xv40 = new PipeJoin(t8X + 15, ltg6Y); var xv40 = new PipeJoin(t8X + 3, ltg6Y);
var xv41 = new PipeJoin(t8X - 15, ltg7Y); var xv41 = new PipeJoin(t8X - 3, ltg7Y);
var v40 = CreateValve(40, t8X + 15, tValveY); var v40 = CreateValve(40, t8X + 3, tValveY);
var v41 = CreateValve(41, t8X - 15, tValveY); var v41 = CreateValve(41, t8X - 3, tValveY);
Tank8 = CreateTank(8, t8X, tanksY, 35000); Tank8 = CreateTank(8, t8X, tanksY, 35000);
CreatePipe(xv38, xv40, label: "Ltg. 6", labelOffsetX: 0); CreatePipe(xv38, xv40, label: "Ltg. 6", labelOffsetX: 0);
CreatePipe(xv39, xv41, label: "Ltg. 7", labelOffsetX: 30); CreatePipe(xv39, xv41, label: "Ltg. 7", labelOffsetX: 6);
CreatePipe(xv40, v40); CreatePipe(xv40, v40);
CreatePipe(xv41, v41); CreatePipe(xv41, v41);
CreateInlet(v40, Tank8); CreateInlet(v40, Tank8);
CreateInlet(v41, Tank8); CreateInlet(v41, Tank8);
var v42 = CreateValve(42, t9X + 15, tValveY); var v42 = CreateValve(42, t9X + 3, tValveY);
var v43 = CreateValve(43, t9X - 15, tValveY); var v43 = CreateValve(43, t9X - 3, tValveY);
Tank9 = CreateTank(9, t9X, tanksY, 35000); Tank9 = CreateTank(9, t9X, tanksY, 35000);
CreatePipe(xv40, v42); CreatePipe(xv40, v42);
CreatePipe(xv41, v43); CreatePipe(xv41, v43);
CreateInlet(v42, Tank9); CreateInlet(v42, Tank9);
CreateInlet(v43, Tank9); CreateInlet(v43, Tank9);
var xp12 = new PipeJoin((t1X + t2X) / 2, tanksY + 80); var xp12 = new PipeJoin((t1X + t2X) / 2, tanksY + 16);
P12 = new Pump("P1/2", (t1X + t2X) / 2, tanksY + 110, () => App.Plant?.P12 ?? default, () => App.Plant?.P12HasClearance ?? false, (x) => SelectedPaths.Any(p => p.Hops.Any(h => h.Node == x))); P12 = new Pump("P1/2", (t1X + t2X) / 2, tanksY + 22, () => App.Plant?.P12 ?? default, () => App.Plant?.P12HasClearance ?? false, (x) => SelectedPaths.Any(p => p.Hops.Any(h => h.Node == x)));
CreateOutlet(Tank1, xp12); CreateOutlet(Tank1, xp12);
CreateOutlet(Tank2, xp12); CreateOutlet(Tank2, xp12);
CreatePipe(xp12, P12); CreatePipe(xp12, P12);
P3 = new Pump("P3", t3X, tanksY + 110, () => App.Plant?.P3 ?? default, () => App.Plant?.P3HasClearance ?? false, (x) => SelectedPaths.Any(p => p.Hops.Any(h => h.Node == x))); P3 = new Pump("P3", t3X, tanksY + 22, () => App.Plant?.P3 ?? default, () => App.Plant?.P3HasClearance ?? false, (x) => SelectedPaths.Any(p => p.Hops.Any(h => h.Node == x)));
P4 = new Pump("P4", t4X, tanksY + 110, () => App.Plant?.P4 ?? default, () => App.Plant?.P4HasClearance ?? false, (x) => SelectedPaths.Any(p => p.Hops.Any(h => h.Node == x))); P4 = new Pump("P4", t4X, tanksY + 22, () => App.Plant?.P4 ?? default, () => App.Plant?.P4HasClearance ?? false, (x) => SelectedPaths.Any(p => p.Hops.Any(h => h.Node == x)));
P5 = new Pump("P5", t5X, tanksY + 110, () => App.Plant?.P5 ?? default, () => App.Plant?.P5HasClearance ?? false, (x) => SelectedPaths.Any(p => p.Hops.Any(h => h.Node == x))); P5 = new Pump("P5", t5X, tanksY + 22, () => App.Plant?.P5 ?? default, () => App.Plant?.P5HasClearance ?? false, (x) => SelectedPaths.Any(p => p.Hops.Any(h => h.Node == x)));
CreateOutlet(Tank3, P3); CreateOutlet(Tank3, P3);
CreateOutlet(Tank4, P4); CreateOutlet(Tank4, P4);
CreateOutlet(Tank5, P5); CreateOutlet(Tank5, P5);
var v44 = CreateValve(44, (t1X + t2X) / 2, tanksY + 150); var v44 = CreateValve(44, (t1X + t2X) / 2, tanksY + 30);
var v45 = CreateValve(45, t3X, tanksY + 150); var v45 = CreateValve(45, t3X, tanksY + 30);
var v46 = CreateValve(46, (t3X + t4X) / 2, tanksY + 180); var v46 = CreateValve(46, (t3X + t4X) / 2, tanksY + 36);
var v47 = CreateValve(47, t4X, tanksY + 150); var v47 = CreateValve(47, t4X, tanksY + 30);
var v48 = CreateValve(48, t5X, tanksY + 150); var v48 = CreateValve(48, t5X, tanksY + 30);
var xv44 = new PipeJoin((t1X + t2X) / 2, tanksY + 180); var xv44 = new PipeJoin((t1X + t2X) / 2, tanksY + 36);
var xv45 = new PipeJoin(t3X, tanksY + 180); var xv45 = new PipeJoin(t3X, tanksY + 36);
var xv47 = new PipeJoin(t4X, tanksY + 180); var xv47 = new PipeJoin(t4X, tanksY + 36);
CreatePipe(P12, v44); CreatePipe(P12, v44);
CreatePipe(P3, v45); CreatePipe(P3, v45);
CreatePipe(P4, v47); CreatePipe(P4, v47);
@@ -336,10 +336,10 @@ namespace PamhagenSysCtrl.Helpers {
CreateTwoWayPipe(v46, xv45); CreateTwoWayPipe(v46, xv45);
CreateTwoWayPipe(xv45, xv44); CreateTwoWayPipe(xv45, xv44);
var xt6 = new PipeJoin(t6X, tanksY + 110); var xt6 = new PipeJoin(t6X, tanksY + 22);
var xt7 = new PipeJoin(t7X, tanksY + 110); var xt7 = new PipeJoin(t7X, tanksY + 22);
var xt8 = new PipeJoin(t8X, tanksY + 110); var xt8 = new PipeJoin(t8X, tanksY + 22);
P6 = new Pump("P6", t6X, tanksY + 150, () => App.Plant?.P6 ?? default, () => App.Plant?.P6HasClearance ?? false, (x) => SelectedPaths.Any(p => p.Hops.Any(h => h.Node == x))); P6 = new Pump("P6", t6X, tanksY + 30, () => App.Plant?.P6 ?? default, () => App.Plant?.P6HasClearance ?? false, (x) => SelectedPaths.Any(p => p.Hops.Any(h => h.Node == x)));
CreateOutlet(Tank6, xt6); CreateOutlet(Tank6, xt6);
CreateOutlet(Tank7, xt7); CreateOutlet(Tank7, xt7);
CreateOutlet(Tank8, xt8); CreateOutlet(Tank8, xt8);
@@ -348,33 +348,33 @@ namespace PamhagenSysCtrl.Helpers {
CreatePipe(xt7, xt6); CreatePipe(xt7, xt6);
CreatePipe(xt6, P6); CreatePipe(xt6, P6);
var v49 = CreateValve(49, t4X, tanksY + 220); var v49 = CreateValve(49, t4X, tanksY + 44);
CreatePipe(xv47, v49); CreatePipe(xv47, v49);
var prX = (pr1X + pr2X) / 2; var prX = (pr1X + pr2X) / 2;
var pr1cX = prX - 15; var pr1cX = prX - 3;
var pr2cX = prX + 15; var pr2cX = prX + 3;
Press1 = new Press("Presse 1", pr1X, prY, 20000, () => FillState.Unknown); Press1 = new Press("Presse 1", pr1X, prY, 20000, () => FillState.Unknown);
Press2 = new Press("Presse 2", pr2X, prY, 15000, () => FillState.Unknown); Press2 = new Press("Presse 2", pr2X, prY, 15000, () => FillState.Unknown);
var v50 = CreateValve(50, pr2cX + 30, 580); var v50 = CreateValve(50, pr2cX + 6, 116);
var v51 = CreateValve(51, pr1cX - 30, 580); var v51 = CreateValve(51, pr1cX - 6, 116);
var v52 = CreateValve(52, pr1cX - 30, 610); var v52 = CreateValve(52, pr1cX - 6, 122);
var v53 = CreateValve(53, pr2cX + 30, 610); var v53 = CreateValve(53, pr2cX + 6, 122);
var v54 = CreateValve(54, pr2cX + 30, 550); var v54 = CreateValve(54, pr2cX + 6, 110);
var v55 = CreateValve(55, pr1cX - 30, 550); var v55 = CreateValve(55, pr1cX - 6, 110);
var v56 = CreateValve(56, pr1cX - 30, 640); var v56 = CreateValve(56, pr1cX - 6, 128);
var v57 = CreateValve(57, pr2cX + 30, 640); var v57 = CreateValve(57, pr2cX + 6, 128);
var xp1 = new PipeJoin(pr1cX - 70, 580); var xp1 = new PipeJoin(pr1cX - 14, 116);
var xp2 = new PipeJoin(pr1cX - 70, 610); var xp2 = new PipeJoin(pr1cX - 14, 122);
var xp3 = new PipeJoin(pr2cX + 70, 550); var xp3 = new PipeJoin(pr2cX + 14, 110);
var xp4 = new PipeJoin(pr2cX + 70, 640); var xp4 = new PipeJoin(pr2cX + 14, 128);
var xp5 = new PipeJoin(pr1cX, 580); var xp5 = new PipeJoin(pr1cX, 116);
var xp6 = new PipeJoin(pr1cX, 610); var xp6 = new PipeJoin(pr1cX, 122);
var xp7 = new PipeJoin(pr2cX, 550); var xp7 = new PipeJoin(pr2cX, 110);
var xp8 = new PipeJoin(pr2cX, 640); var xp8 = new PipeJoin(pr2cX, 128);
CreatePipe(v6, xp1, true, label: "Ltg. 3", labelOffsetX: 30); CreatePipe(v6, xp1, true, label: "Ltg. 3", labelOffsetX: 6);
CreatePipe(v8, xp2, true, label: "Ltg. 4", labelOffsetX: 90); CreatePipe(v8, xp2, true, label: "Ltg. 4", labelOffsetX: 18);
CreatePipe(v49, xp3, true, label: "Ltg. 8"); CreatePipe(v49, xp3, true, label: "Ltg. 8");
CreatePipe(P6, xp4, true, label: "Ltg. 9"); CreatePipe(P6, xp4, true, label: "Ltg. 9");
CreatePipe(xp1, v51, true); CreatePipe(xp1, v51, true);
@@ -397,8 +397,8 @@ namespace PamhagenSysCtrl.Helpers {
CreatePipe(xp5, xp6); CreatePipe(xp5, xp6);
CreatePipe(xp7, xp8); CreatePipe(xp7, xp8);
var zv1 = new CenterValve("ZV1", pr1cX, prY - 40, () => App.Plant?.Press1HasClearance ?? false); var zv1 = new CenterValve("ZV1", pr1cX, prY - 8, () => App.Plant?.Press1HasClearance ?? false);
var zv2 = new CenterValve("ZV2", pr2cX, prY - 40, () => App.Plant?.Press2HasClearance ?? false); var zv2 = new CenterValve("ZV2", pr2cX, prY - 8, () => App.Plant?.Press2HasClearance ?? false);
CreatePipe(xp6, zv1, true); CreatePipe(xp6, zv1, true);
CreatePipe(xp8, zv2, true); CreatePipe(xp8, zv2, true);
CreateInlet(zv1, Press1, true); CreateInlet(zv1, Press1, true);
PamhagenSysCtrl/Helpers/Pipeline/CenterValve.cs
+14 -11
View File
@@ -6,7 +6,7 @@ using System.Windows.Shapes;
namespace PamhagenSysCtrl.Helpers.Pipeline { namespace PamhagenSysCtrl.Helpers.Pipeline {
public class CenterValve : INode { public class CenterValve : INode {
public const double DIAMETER = 24; public const double DIAMETER = 4.8;
public double CenterX { get; set; } public double CenterX { get; set; }
public double CenterY { get; set; } public double CenterY { get; set; }
@@ -33,29 +33,32 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
public void Draw(Canvas canvas) { public void Draw(Canvas canvas) {
_circle = new Ellipse() { _circle = new Ellipse() {
Height = DIAMETER,
Width = DIAMETER,
Fill = Brushes.DarkGray, Fill = Brushes.DarkGray,
Stroke = Brushes.Black, Stroke = Brushes.Black,
StrokeThickness = 2,
}; };
_circle.SetValue(Canvas.LeftProperty, CenterX - DIAMETER / 2);
_circle.SetValue(Canvas.TopProperty, CenterY - DIAMETER / 2);
_text = new() { _text = new() {
Text = Label, Text = Label,
FontSize = 10,
Width = DIAMETER,
Height = DIAMETER,
TextAlignment = TextAlignment.Center, TextAlignment = TextAlignment.Center,
VerticalAlignment = VerticalAlignment.Center, VerticalAlignment = VerticalAlignment.Center,
SnapsToDevicePixels = true, SnapsToDevicePixels = true,
}; };
_text.SetValue(Canvas.LeftProperty, CenterX - DIAMETER / 2 + 0.5);
_text.SetValue(Canvas.TopProperty, CenterY - DIAMETER / 2 + 5.5);
canvas.Children.Add(_circle); canvas.Children.Add(_circle);
canvas.Children.Add(_text); canvas.Children.Add(_text);
} }
public void Scale(double scale) {
_circle?.Width = DIAMETER * scale;
_circle?.Height = DIAMETER * scale;
_circle?.StrokeThickness = 2;
_circle?.SetValue(Canvas.LeftProperty, (CenterX - DIAMETER / 2) * scale);
_circle?.SetValue(Canvas.TopProperty, (CenterY - DIAMETER / 2) * scale);
_text?.FontSize = 10;
_text?.Width = DIAMETER * scale;
_text?.Height = DIAMETER * scale;
_text?.SetValue(Canvas.LeftProperty, (CenterX - DIAMETER / 2) * scale + 0.5);
_text?.SetValue(Canvas.TopProperty, (CenterY - DIAMETER / 2) * scale + 5.5);
}
public bool IsInside(double x, double y) { public bool IsInside(double x, double y) {
return Math.Sqrt(Math.Pow(CenterX - x, 2) + Math.Pow(CenterY - y, 2)) <= DIAMETER / 2; return Math.Sqrt(Math.Pow(CenterX - x, 2) + Math.Pow(CenterY - y, 2)) <= DIAMETER / 2;
} }
PamhagenSysCtrl/Helpers/Pipeline/ConveyorBelt.cs
+14 -9
View File
@@ -7,8 +7,8 @@ using System.Windows.Shapes;
namespace PamhagenSysCtrl.Helpers.Pipeline { namespace PamhagenSysCtrl.Helpers.Pipeline {
public class ConveyorBelt : INode { public class ConveyorBelt : INode {
public const double WIDTH = 30; public const double WIDTH = 6;
public const double HEIGHT = 120; public const double HEIGHT = 24;
public double CenterX { get; set; } public double CenterX { get; set; }
public double CenterY { get; set; } public double CenterY { get; set; }
@@ -47,15 +47,10 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
public void Draw(Canvas canvas) { public void Draw(Canvas canvas) {
_rect = new Rectangle() { _rect = new Rectangle() {
Width = WIDTH,
Height = HEIGHT,
Stroke = Brushes.Black, Stroke = Brushes.Black,
StrokeThickness = 2,
Fill = Brushes.WhiteSmoke, Fill = Brushes.WhiteSmoke,
StrokeLineJoin = PenLineJoin.Round, StrokeLineJoin = PenLineJoin.Round,
}; };
_rect.SetValue(Canvas.LeftProperty, CenterX - WIDTH / 2);
_rect.SetValue(Canvas.TopProperty, CenterY - HEIGHT / 2);
var d = 15; var d = 15;
int n = (int)(HEIGHT / d) + 2; int n = (int)(HEIGHT / d) + 2;
@@ -80,8 +75,8 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
Storyboard.SetTarget(slideUp, _polyline); Storyboard.SetTarget(slideUp, _polyline);
Storyboard.SetTargetProperty(slideUp, new PropertyPath(Canvas.TopProperty)); Storyboard.SetTargetProperty(slideUp, new PropertyPath(Canvas.TopProperty));
var clipCanvas = new Canvas() { var clipCanvas = new Canvas() {
Width = WIDTH - 15, Width = WIDTH - 3,
Height = HEIGHT - 8, Height = HEIGHT - 1.6,
ClipToBounds = true, ClipToBounds = true,
}; };
clipCanvas.SetValue(Canvas.TopProperty, CenterY - HEIGHT / 2 + 4); clipCanvas.SetValue(Canvas.TopProperty, CenterY - HEIGHT / 2 + 4);
@@ -92,7 +87,17 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
canvas.Children.Add(clipCanvas); canvas.Children.Add(clipCanvas);
_storyboard.Begin(); _storyboard.Begin();
_storyboard.Pause(); _storyboard.Pause();
}
public void Scale(double scale) {
_rect?.Width = WIDTH * scale;
_rect?.Height = HEIGHT * scale;
_rect?.StrokeThickness = 2;
_rect?.SetValue(Canvas.LeftProperty, (CenterX - WIDTH / 2) * scale);
_rect?.SetValue(Canvas.TopProperty, (CenterY - HEIGHT / 2) * scale);
// TODO clipCanvas
// TODO _polyline
} }
public bool IsInside(double x, double y) { public bool IsInside(double x, double y) {
PamhagenSysCtrl/Helpers/Pipeline/EncasedAuger.cs
+4
View File
@@ -81,6 +81,10 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
_auger.Draw(canvas); _auger.Draw(canvas);
} }
public void Scale(double scale) {
}
public bool IsInside(double x, double y) { public bool IsInside(double x, double y) {
return Math.Sqrt(Math.Pow(CenterX - x, 2) + Math.Pow(CenterY - y, 2)) <= WIDTH / 2; return Math.Sqrt(Math.Pow(CenterX - x, 2) + Math.Pow(CenterY - y, 2)) <= WIDTH / 2;
} }
PamhagenSysCtrl/Helpers/Pipeline/EntryTrough.cs
+4
View File
@@ -98,6 +98,10 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
_auger.Draw(canvas); _auger.Draw(canvas);
} }
public void Scale(double scale) {
}
public bool IsInside(double x, double y) { public bool IsInside(double x, double y) {
return Math.Abs(x - CenterX) <= WIDTH / 2 && Math.Abs(y - CenterY) <= HEIGHT / 2; return Math.Abs(x - CenterX) <= WIDTH / 2 && Math.Abs(y - CenterY) <= HEIGHT / 2;
} }
PamhagenSysCtrl/Helpers/Pipeline/FlowArrows.cs
-8
View File
@@ -33,14 +33,6 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
canvas.Children.Add(_layer); canvas.Children.Add(_layer);
} }
public static FlowArrows Create(Canvas canvas, Line first, Line second) {
return new FlowArrows(canvas, [
new Point(first.X1, first.Y1),
new Point(first.X2, first.Y2),
new Point(second.X2, second.Y2),
]);
}
public static FlowArrows Create(Canvas canvas, Polyline path) { public static FlowArrows Create(Canvas canvas, Polyline path) {
return new FlowArrows(canvas, [.. path.Points]); return new FlowArrows(canvas, [.. path.Points]);
} }
PamhagenSysCtrl/Helpers/Pipeline/Graph.cs
+14 -3
View File
@@ -102,7 +102,7 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
} }
} }
public void Draw(Canvas canvas) { public void Draw(Canvas canvas, double scale) {
canvas.Children.Add(new Rectangle() { canvas.Children.Add(new Rectangle() {
Fill = Brushes.White, Fill = Brushes.White,
Width = 5000, Width = 5000,
@@ -110,14 +110,25 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
}); });
foreach (var e in Edges) { foreach (var e in Edges) {
e.Draw(canvas); e.Draw(canvas);
e.Scale(scale);
} }
foreach (var n in Nodes) { foreach (var n in Nodes) {
n.Draw(canvas); n.Draw(canvas);
n.Scale(scale);
} }
} }
public ISet<INode> GetHover(double x, double y) { public void Scale(double scale) {
return Nodes.Where(n => n.IsInside(x, y)).ToHashSet(); foreach (var e in Edges) {
e.Scale(scale);
}
foreach (var n in Nodes) {
n.Scale(scale);
}
}
public ISet<INode> GetHover(double x, double y, double scale) {
return Nodes.Where(n => n.IsInside(x / scale, y / scale)).ToHashSet();
} }
public void Update(ISet<INode> hovering, bool isPressed) { public void Update(ISet<INode> hovering, bool isPressed) {
PamhagenSysCtrl/Helpers/Pipeline/HeatExchanger.cs
+14 -11
View File
@@ -6,8 +6,8 @@ using System.Windows.Shapes;
namespace PamhagenSysCtrl.Helpers.Pipeline { namespace PamhagenSysCtrl.Helpers.Pipeline {
public class HeatExchanger : INode { public class HeatExchanger : INode {
public const double WIDTH = 30; public const double WIDTH = 6;
public const double HEIGHT = 120; public const double HEIGHT = 24;
public double CenterX { get; set; } public double CenterX { get; set; }
public double CenterY { get; set; } public double CenterY { get; set; }
@@ -28,29 +28,32 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
public void Draw(Canvas canvas) { public void Draw(Canvas canvas) {
_rect = new Rectangle() { _rect = new Rectangle() {
Width = WIDTH,
Height = HEIGHT,
Stroke = Brushes.Black, Stroke = Brushes.Black,
StrokeThickness = 2,
Fill = Brushes.WhiteSmoke, Fill = Brushes.WhiteSmoke,
}; };
_text = new() { _text = new() {
Text = Label, Text = Label,
FontSize = 12,
Width = HEIGHT,
TextAlignment = TextAlignment.Center, TextAlignment = TextAlignment.Center,
VerticalAlignment = VerticalAlignment.Center, VerticalAlignment = VerticalAlignment.Center,
RenderTransform = new RotateTransform(270), RenderTransform = new RotateTransform(270),
SnapsToDevicePixels = true, SnapsToDevicePixels = true,
}; };
_rect.SetValue(Canvas.LeftProperty, CenterX - WIDTH / 2);
_rect.SetValue(Canvas.TopProperty, CenterY - HEIGHT / 2);
_text.SetValue(Canvas.LeftProperty, CenterX - 9);
_text.SetValue(Canvas.TopProperty, CenterY + HEIGHT / 2);
canvas.Children.Add(_rect); canvas.Children.Add(_rect);
canvas.Children.Add(_text); canvas.Children.Add(_text);
} }
public void Scale(double scale) {
_rect?.Width = WIDTH * scale;
_rect?.Height = HEIGHT * scale;
_rect?.StrokeThickness = 2;
_rect?.SetValue(Canvas.LeftProperty, (CenterX - WIDTH / 2) * scale);
_rect?.SetValue(Canvas.TopProperty, (CenterY - HEIGHT / 2) * scale);
_text?.FontSize = 12;
_text?.Width = HEIGHT * scale;
_text?.SetValue(Canvas.LeftProperty, (CenterX * scale) - 9);
_text?.SetValue(Canvas.TopProperty, (CenterY + HEIGHT / 2) * scale);
}
public bool IsInside(double x, double y) { public bool IsInside(double x, double y) {
return Math.Abs(x - CenterX) <= WIDTH / 2 && Math.Abs(y - CenterY) <= HEIGHT / 2; return Math.Abs(x - CenterX) <= WIDTH / 2 && Math.Abs(y - CenterY) <= HEIGHT / 2;
} }
PamhagenSysCtrl/Helpers/Pipeline/IEdge.cs
+1
View File
@@ -14,6 +14,7 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
public double FlowLength { get; } public double FlowLength { get; }
public void Draw(Canvas canvas); public void Draw(Canvas canvas);
public void Scale(double scale);
public void Update(); public void Update();
} }
} }
PamhagenSysCtrl/Helpers/Pipeline/INode.cs
+1 -1
View File
@@ -10,8 +10,8 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
public ISet<IEdge> Outputs { get; } public ISet<IEdge> Outputs { get; }
public void Draw(Canvas canvas); public void Draw(Canvas canvas);
public void Scale(double scale);
public void Update(bool isHovering, bool isPressed); public void Update(bool isHovering, bool isPressed);
public bool IsInside(double x, double y); public bool IsInside(double x, double y);
} }
} }
PamhagenSysCtrl/Helpers/Pipeline/Inlet.cs
+24 -49
View File
@@ -15,10 +15,15 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
public (bool TowardEnd, double PathOffset)? Flow { get; set; } public (bool TowardEnd, double PathOffset)? Flow { get; set; }
public double FlowLength => _flowArrows?.Length ?? 0; public double FlowLength => _flowArrows?.Length ?? 0;
private Line? _outer1; public double X1 => Start.CenterX;
private Line? _outer2; public double Y1 => Start.CenterY;
private Line? _inner1; public double X2 => Start.CenterX;
private Line? _inner2; public double Y2 => Orientation ? Sink.CenterY - 2 : Sink.TopY - 2;
public double X3 => Orientation ? Sink.CenterX : Start.CenterX + (Start.CenterX == End.CenterX ? 0 : Start.CenterX > End.CenterX ? -4 : 4);
public double Y3 => Orientation ? Sink.CenterY - 2 : Sink.TopY + 4;
private Polyline? _outer;
private Polyline? _inner;
private FlowArrows? _flowArrows; private FlowArrows? _flowArrows;
public Inlet(INode start, ISink end, bool orientation = false) { public Inlet(INode start, ISink end, bool orientation = false) {
@@ -28,62 +33,32 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
} }
public void Draw(Canvas canvas) { public void Draw(Canvas canvas) {
var x1 = Start.CenterX; _outer = new Polyline() {
var y1 = Start.CenterY; Points = [new(X1, Y1), new(X2, Y2), new (X3, Y3)],
var x2 = Start.CenterX;
var y2 = Orientation ? Sink.CenterY - 10 : Sink.TopY - 10;
var x3 = Orientation ? Sink.CenterX : Start.CenterX + (Start.CenterX == End.CenterX ? 0 : Start.CenterX > End.CenterX ? -20 : 20);
var y3 = Orientation ? Sink.CenterY - 10 : Sink.TopY + 20;
_outer1 = new Line() {
X1 = x1,
Y1 = y1,
X2 = x2,
Y2 = y2,
StrokeThickness = 10,
Stroke = Brushes.Black,
StrokeStartLineCap = PenLineCap.Round,
StrokeEndLineCap = PenLineCap.Round,
};
_inner1 = new Line() {
X1 = x1,
Y1 = y1,
X2 = x2,
Y2 = y2,
StrokeThickness = 6,
Stroke = Brushes.DarkGray,
StrokeStartLineCap = PenLineCap.Round,
StrokeEndLineCap = PenLineCap.Round,
};
_outer2 = new Line() {
X1 = x2,
Y1 = y2,
X2 = x3,
Y2 = y3,
StrokeThickness = 10,
Stroke = Brushes.Black, Stroke = Brushes.Black,
StrokeStartLineCap = PenLineCap.Round, StrokeStartLineCap = PenLineCap.Round,
StrokeEndLineCap = PenLineCap.Flat, StrokeEndLineCap = PenLineCap.Flat,
}; };
_inner2 = new Line() { _inner = new Polyline() {
X1 = x2, Points = [new(X1, Y1), new(X2, Y2), new(X3, Y3)],
Y1 = y2,
X2 = x3,
Y2 = y3,
StrokeThickness = 6,
Stroke = Brushes.DarkGray, Stroke = Brushes.DarkGray,
StrokeStartLineCap = PenLineCap.Round, StrokeStartLineCap = PenLineCap.Round,
StrokeEndLineCap = PenLineCap.Flat, StrokeEndLineCap = PenLineCap.Flat,
}; };
canvas.Children.Add(_outer1); canvas.Children.Add(_outer);
canvas.Children.Add(_outer2); canvas.Children.Add(_inner);
canvas.Children.Add(_inner1); _flowArrows = FlowArrows.Create(canvas, _inner);
canvas.Children.Add(_inner2); }
_flowArrows = FlowArrows.Create(canvas, _inner1!, _inner2!);
public void Scale(double scale) {
_outer?.RenderTransform = new ScaleTransform(scale, scale);
_outer?.StrokeThickness = 10 / scale;
_inner?.RenderTransform = new ScaleTransform(scale, scale);
_inner?.StrokeThickness = 6 / scale;
} }
public void Update() { public void Update() {
_inner1?.Stroke = Highlight ?? Brushes.DarkGray; _inner?.Stroke = Highlight ?? Brushes.DarkGray;
_inner2?.Stroke = Highlight ?? Brushes.DarkGray;
_flowArrows?.Update(Flow); _flowArrows?.Update(Flow);
} }
} }
PamhagenSysCtrl/Helpers/Pipeline/Outlet.cs
+28 -52
View File
@@ -5,7 +5,7 @@ using System.Windows.Shapes;
namespace PamhagenSysCtrl.Helpers.Pipeline { namespace PamhagenSysCtrl.Helpers.Pipeline {
public class Outlet : IEdge { public class Outlet : IEdge {
public const double POINT = 16; public const double POINT = 3.2;
public INode Start => Source; public INode Start => Source;
public INode End { get; set; } public INode End { get; set; }
@@ -17,12 +17,17 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
public (bool TowardEnd, double PathOffset)? Flow { get; set; } public (bool TowardEnd, double PathOffset)? Flow { get; set; }
public double FlowLength => _flowArrows?.Length ?? 0; public double FlowLength => _flowArrows?.Length ?? 0;
public double X1 => Start.CenterX;
public double Y1 => Source.BottomY;
public double X2 => Orientation ? Start.CenterX : End.CenterX;
public double Y2 => Orientation ? End.CenterY : Start.CenterY;
public double X3 => End.CenterX;
public double Y3 => End.CenterY;
private Polygon? _hopper; private Polygon? _hopper;
private FlowArrows? _flowArrows; private FlowArrows? _flowArrows;
private Line? _outer1; private Polyline? _outer;
private Line? _outer2; private Polyline? _inner;
private Line? _inner1;
private Line? _inner2;
public Outlet(ISource start, INode end) { public Outlet(ISource start, INode end) {
Source = start; Source = start;
@@ -31,69 +36,40 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
} }
public void Draw(Canvas canvas) { public void Draw(Canvas canvas) {
var x1 = Start.CenterX ;
var y1 = Source.BottomY;
var x2 = Orientation ? Start.CenterX : End.CenterX;
var y2 = Orientation ? End.CenterY : Start.CenterY;
var x3 = End.CenterX;
var y3 = End.CenterY;
_hopper = new Polygon() { _hopper = new Polygon() {
Points = [new(x1 - POINT, y1 - 2), new(x1 + POINT, y1 - 2), new(x1, y1 + POINT)], Points = [new(X1 - POINT, Y1 - 0.4), new(X1 + POINT, Y1 - 0.4), new(X1, Y1 + POINT)],
Fill = Brushes.DarkGray, Fill = Brushes.DarkGray,
Stroke = Brushes.Black, Stroke = Brushes.Black,
StrokeThickness = 2,
}; };
_outer1 = new Line() { _outer = new Polyline() {
X1 = x1, Points = [new(X1, Y1), new(X2, Y2), new(X3, Y3)],
Y1 = y1,
X2 = x2,
Y2 = y2,
StrokeThickness = 10,
Stroke = Brushes.Black, Stroke = Brushes.Black,
StrokeStartLineCap = PenLineCap.Round, StrokeStartLineCap = PenLineCap.Round,
StrokeEndLineCap = PenLineCap.Round, StrokeEndLineCap = PenLineCap.Round,
}; };
_inner1 = new Line() { _inner = new Polyline() {
X1 = x1, Points = [new(X1, Y1), new(X2, Y2), new(X3, Y3)],
Y1 = y1,
X2 = x2,
Y2 = y2,
StrokeThickness = 6,
Stroke = Brushes.DarkGray, Stroke = Brushes.DarkGray,
StrokeStartLineCap = PenLineCap.Round, StrokeStartLineCap = PenLineCap.Round,
StrokeEndLineCap = PenLineCap.Round, StrokeEndLineCap = PenLineCap.Round,
}; };
_outer2 = new Line() { canvas.Children.Add(_outer);
X1 = x2,
Y1 = y2,
X2 = x3,
Y2 = y3,
StrokeThickness = 10,
Stroke = Brushes.Black,
StrokeStartLineCap = PenLineCap.Round,
StrokeEndLineCap = PenLineCap.Round,
};
_inner2 = new Line() {
X1 = x2,
Y1 = y2,
X2 = x3,
Y2 = y3,
StrokeThickness = 6,
Stroke = Brushes.DarkGray,
StrokeStartLineCap = PenLineCap.Round,
StrokeEndLineCap = PenLineCap.Round,
};
canvas.Children.Add(_outer1);
canvas.Children.Add(_outer2);
canvas.Children.Add(_hopper); canvas.Children.Add(_hopper);
canvas.Children.Add(_inner1); canvas.Children.Add(_inner);
canvas.Children.Add(_inner2); _flowArrows = FlowArrows.Create(canvas, _inner);
_flowArrows = FlowArrows.Create(canvas, _inner1!, _inner2!); }
public void Scale(double scale) {
_hopper?.RenderTransform = new ScaleTransform(scale, scale);
_hopper?.StrokeThickness = 2 / scale;
_outer?.RenderTransform = new ScaleTransform(scale, scale);
_outer?.StrokeThickness = 10 / scale;
_inner?.RenderTransform = new ScaleTransform(scale, scale);
_inner?.StrokeThickness = 6 / scale;
} }
public void Update() { public void Update() {
_inner1?.Stroke = Highlight ?? Brushes.DarkGray; _inner?.Stroke = Highlight ?? Brushes.DarkGray;
_inner2?.Stroke = Highlight ?? Brushes.DarkGray;
_hopper?.Fill = Highlight ?? Brushes.DarkGray; _hopper?.Fill = Highlight ?? Brushes.DarkGray;
_flowArrows?.Update(Flow); _flowArrows?.Update(Flow);
} }
PamhagenSysCtrl/Helpers/Pipeline/Pipe.cs
+20 -14
View File
@@ -15,6 +15,13 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
public (bool TowardEnd, double PathOffset)? Flow { get; set; } public (bool TowardEnd, double PathOffset)? Flow { get; set; }
public double FlowLength => _flowArrows?.Length ?? 0; public double FlowLength => _flowArrows?.Length ?? 0;
public double X1 => Start.CenterX;
public double Y1 => Start.CenterY;
public double X2 => Orientation ? Start.CenterX : End.CenterX;
public double Y2 => Orientation ? End.CenterY : Start.CenterY;
public double X3 => End.CenterX;
public double Y3 => End.CenterY;
private Polyline? _outer; private Polyline? _outer;
private Polyline? _inner; private Polyline? _inner;
private TextBlock? _text; private TextBlock? _text;
@@ -31,23 +38,15 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
} }
public void Draw(Canvas canvas) { public void Draw(Canvas canvas) {
var x1 = Start.CenterX;
var y1 = Start.CenterY;
var x2 = Orientation ? Start.CenterX : End.CenterX;
var y2 = Orientation ? End.CenterY : Start.CenterY;
var x3 = End.CenterX;
var y3 = End.CenterY;
_outer = new Polyline() { _outer = new Polyline() {
Points = [new(x1, y1), new(x2, y2), new(x3, y3)], Points = [new(X1, Y1), new(X2, Y2), new(X3, Y3)],
StrokeThickness = 10,
Stroke = Brushes.Black, Stroke = Brushes.Black,
StrokeStartLineCap = PenLineCap.Round, StrokeStartLineCap = PenLineCap.Round,
StrokeEndLineCap = PenLineCap.Round, StrokeEndLineCap = PenLineCap.Round,
StrokeLineJoin = PenLineJoin.Round, StrokeLineJoin = PenLineJoin.Round,
}; };
_inner = new Polyline() { _inner = new Polyline() {
Points = [new(x1, y1), new(x2, y2), new(x3, y3)], Points = [new(X1, Y1), new(X2, Y2), new(X3, Y3)],
StrokeThickness = 6,
Stroke = Brushes.DarkGray, Stroke = Brushes.DarkGray,
StrokeStartLineCap = PenLineCap.Round, StrokeStartLineCap = PenLineCap.Round,
StrokeEndLineCap = PenLineCap.Round, StrokeEndLineCap = PenLineCap.Round,
@@ -58,20 +57,27 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
if (Label != null) { if (Label != null) {
_text = new() { _text = new() {
Text = Label, Text = Label,
FontSize = 12,
Width = 50,
TextAlignment = TextAlignment.Center, TextAlignment = TextAlignment.Center,
VerticalAlignment = VerticalAlignment.Bottom, VerticalAlignment = VerticalAlignment.Bottom,
HorizontalAlignment = HorizontalAlignment.Center, HorizontalAlignment = HorizontalAlignment.Center,
SnapsToDevicePixels = true, SnapsToDevicePixels = true,
}; };
_text.SetValue(Canvas.LeftProperty, _textOffsetX != null ? (Orientation ? x2 : x1) + _textOffsetX : (Orientation ? (x2 + x3) / 2 : (x1 + x2) / 2) - 25);
_text.SetValue(Canvas.TopProperty, y2 - 22);
canvas.Children.Add(_text); canvas.Children.Add(_text);
} }
_flowArrows = FlowArrows.Create(canvas, _inner); _flowArrows = FlowArrows.Create(canvas, _inner);
} }
public void Scale(double scale) {
_outer?.RenderTransform = new ScaleTransform(scale, scale);
_outer?.StrokeThickness = 10 / scale;
_inner?.RenderTransform = new ScaleTransform(scale, scale);
_inner?.StrokeThickness = 6 / scale;
_text?.FontSize = 12;
_text?.Width = 10 * scale;
_text?.SetValue(Canvas.LeftProperty, (_textOffsetX != null ? (Orientation ? X2 : X1) + _textOffsetX : (Orientation ? (X2 + X3) / 2 : (X1 + X2) / 2) - 5) * scale);
_text?.SetValue(Canvas.TopProperty, Y2 * scale - 22);
}
public void Update() { public void Update() {
_inner?.Stroke = Highlight ?? Brushes.DarkGray; _inner?.Stroke = Highlight ?? Brushes.DarkGray;
_flowArrows?.Update(Flow); _flowArrows?.Update(Flow);
PamhagenSysCtrl/Helpers/Pipeline/PipeJoin.cs
+9 -5
View File
@@ -6,8 +6,8 @@ using System.Windows.Shapes;
namespace PamhagenSysCtrl.Helpers.Pipeline { namespace PamhagenSysCtrl.Helpers.Pipeline {
public class PipeJoin : INode { public class PipeJoin : INode {
public const double SIZE = 18; public const double SIZE = 3.6;
public const double POINT = 4; public const double POINT = 0.8;
public double CenterX { get; set; } public double CenterX { get; set; }
public double CenterY { get; set; } public double CenterY { get; set; }
@@ -74,13 +74,17 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
Points = [..points], Points = [..points],
Fill = Brushes.Black, Fill = Brushes.Black,
Stroke = Brushes.Black, Stroke = Brushes.Black,
StrokeThickness = 2,
}; };
_rect.SetValue(Canvas.LeftProperty, CenterX - SIZE / 2);
_rect.SetValue(Canvas.TopProperty, CenterY - SIZE / 2);
canvas.Children.Add(_rect); canvas.Children.Add(_rect);
} }
public void Scale(double scale) {
_rect?.RenderTransform = new ScaleTransform(scale, scale);
_rect?.StrokeThickness = 2 / scale;
_rect?.SetValue(Canvas.LeftProperty, (CenterX - SIZE / 2) * scale);
_rect?.SetValue(Canvas.TopProperty, (CenterY - SIZE / 2) * scale);
}
public bool IsInside(double x, double y) { public bool IsInside(double x, double y) {
return Math.Abs(x - CenterX) <= SIZE / 2 && Math.Abs(y - CenterY) <= SIZE / 2; return Math.Abs(x - CenterX) <= SIZE / 2 && Math.Abs(y - CenterY) <= SIZE / 2;
} }
PamhagenSysCtrl/Helpers/Pipeline/Press.cs
+19 -16
View File
@@ -1,13 +1,12 @@
using System.Windows; using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
using System.Windows.Media; using System.Windows.Media;
using System.Windows.Media.Media3D;
using System.Windows.Shapes; using System.Windows.Shapes;
namespace PamhagenSysCtrl.Helpers.Pipeline { namespace PamhagenSysCtrl.Helpers.Pipeline {
public class Press : INode, ISink { public class Press : INode, ISink {
public const double DIAMETER = 120; public const double DIAMETER = 24;
public double CenterX { get; set; } public double CenterX { get; set; }
public double CenterY { get; set; } public double CenterY { get; set; }
@@ -40,39 +39,43 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
public void Draw(Canvas canvas) { public void Draw(Canvas canvas) {
_circle = new Ellipse() { _circle = new Ellipse() {
Width = DIAMETER,
Height = DIAMETER,
Stroke = Brushes.Black, Stroke = Brushes.Black,
StrokeThickness = 2,
Fill = Brushes.WhiteSmoke, Fill = Brushes.WhiteSmoke,
}; };
_frame = new Polygon() { _frame = new Polygon() {
Points = [ Points = [
new(CenterX - DIAMETER / 2 - 10, CenterY), new(CenterX + DIAMETER / 2 + 10, CenterY), new(CenterX - DIAMETER / 2 - 2, CenterY), new(CenterX + DIAMETER / 2 + 2, CenterY),
new(CenterX + DIAMETER / 2 + 10, CenterY + DIAMETER / 2 + 30), new(CenterX + DIAMETER / 2 - 20, CenterY + DIAMETER / 2 + 30), new(CenterX + DIAMETER / 2 + 2, CenterY + DIAMETER / 2 + 6), new(CenterX + DIAMETER / 2 - 4, CenterY + DIAMETER / 2 + 6),
new(CenterX + DIAMETER / 2 - 20, CenterY + DIAMETER / 2 + 10), new(CenterX - DIAMETER / 2 + 20, CenterY + DIAMETER / 2 + 10), new(CenterX + DIAMETER / 2 - 4, CenterY + DIAMETER / 2 + 2), new(CenterX - DIAMETER / 2 + 4, CenterY + DIAMETER / 2 + 2),
new(CenterX - DIAMETER / 2 + 20, CenterY + DIAMETER / 2 + 30), new(CenterX - DIAMETER / 2 - 10, CenterY + DIAMETER / 2 + 30) new(CenterX - DIAMETER / 2 + 4, CenterY + DIAMETER / 2 + 6), new(CenterX - DIAMETER / 2 - 2, CenterY + DIAMETER / 2 + 6)
], ],
Stroke = Brushes.Black, Stroke = Brushes.Black,
StrokeThickness = 2,
Fill = Brushes.WhiteSmoke, Fill = Brushes.WhiteSmoke,
}; };
_text = new() { _text = new() {
Text = CapacityLiters.HasValue ? $"{Label}\n{CapacityLiters:N0}" : Label, Text = CapacityLiters.HasValue ? $"{Label}\n{CapacityLiters:N0}" : Label,
FontSize = 14,
Width = DIAMETER,
TextAlignment = TextAlignment.Center, TextAlignment = TextAlignment.Center,
VerticalAlignment = VerticalAlignment.Center, VerticalAlignment = VerticalAlignment.Center,
}; };
_circle.SetValue(Canvas.LeftProperty, CenterX - DIAMETER / 2);
_circle.SetValue(Canvas.TopProperty, CenterY - DIAMETER / 2);
_text.SetValue(Canvas.LeftProperty, CenterX - DIAMETER / 2);
_text.SetValue(Canvas.TopProperty, CenterY - (CapacityLiters.HasValue ? 20 : 10));
canvas.Children.Add(_frame); canvas.Children.Add(_frame);
canvas.Children.Add(_circle); canvas.Children.Add(_circle);
canvas.Children.Add(_text); canvas.Children.Add(_text);
} }
public void Scale(double scale) {
_circle?.Width = DIAMETER * scale;
_circle?.Height = DIAMETER * scale;
_circle?.StrokeThickness = 2;
_circle?.SetValue(Canvas.LeftProperty, (CenterX - DIAMETER / 2) * scale);
_circle?.SetValue(Canvas.TopProperty, (CenterY - DIAMETER / 2) * scale);
_frame?.RenderTransform = new ScaleTransform(scale, scale);
_frame?.StrokeThickness = 2 / scale;
_text?.FontSize = 14;
_text?.Width = DIAMETER * scale;
_text?.SetValue(Canvas.LeftProperty, (CenterX - DIAMETER / 2) * scale);
_text?.SetValue(Canvas.TopProperty, (CenterY * scale) - (CapacityLiters.HasValue ? 20 : 10));
}
public bool IsInside(double x, double y) { public bool IsInside(double x, double y) {
return Math.Sqrt(Math.Pow(CenterX - x, 2) + Math.Pow(CenterY - y, 2)) <= DIAMETER / 2 || (Math.Abs(x - CenterX) <= DIAMETER / 2 + 10 && y >= CenterY && y <= CenterY + DIAMETER / 2 + 30); return Math.Sqrt(Math.Pow(CenterX - x, 2) + Math.Pow(CenterY - y, 2)) <= DIAMETER / 2 || (Math.Abs(x - CenterX) <= DIAMETER / 2 + 10 && y >= CenterY && y <= CenterY + DIAMETER / 2 + 30);
} }
PamhagenSysCtrl/Helpers/Pipeline/Pump.cs
+17 -13
View File
@@ -6,7 +6,7 @@ using System.Windows.Shapes;
namespace PamhagenSysCtrl.Helpers.Pipeline { namespace PamhagenSysCtrl.Helpers.Pipeline {
public class Pump : INode { public class Pump : INode {
public const double DIAMETER = 24; public const double DIAMETER = 4.8;
public double CenterX { get; set; } public double CenterX { get; set; }
public double CenterY { get; set; } public double CenterY { get; set; }
@@ -42,35 +42,39 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
public void Draw(Canvas canvas) { public void Draw(Canvas canvas) {
_circle = new Ellipse() { _circle = new Ellipse() {
Height = DIAMETER,
Width = DIAMETER,
Fill = Brushes.WhiteSmoke, Fill = Brushes.WhiteSmoke,
Stroke = Brushes.Black, Stroke = Brushes.Black,
StrokeThickness = 2,
}; };
var dx = Math.Cos(Math.PI / 6) * (DIAMETER / 2 - 2); var dx = Math.Cos(Math.PI / 6) * (DIAMETER / 2 - 0.4);
var dy = Math.Sin(Math.PI / 6) * (DIAMETER / 2 - 2); var dy = Math.Sin(Math.PI / 6) * (DIAMETER / 2 - 0.4);
_triangle = new Polygon() { _triangle = new Polygon() {
Points = [new(CenterX - dx, CenterY - dy), new(CenterX + dx, CenterY - dy), new(CenterX, CenterY + DIAMETER / 2 - 2)], Points = [new(CenterX - dx, CenterY - dy), new(CenterX + dx, CenterY - dy), new(CenterX, CenterY + DIAMETER / 2 - 0.4)],
Fill = Brushes.Transparent, Fill = Brushes.Transparent,
Stroke = Brushes.Black, Stroke = Brushes.Black,
StrokeThickness = 2,
}; };
_text = new() { _text = new() {
Text = Label, Text = Label,
FontSize = 14,
TextAlignment = TextAlignment.Left, TextAlignment = TextAlignment.Left,
VerticalAlignment = VerticalAlignment.Center, VerticalAlignment = VerticalAlignment.Center,
}; };
_circle.SetValue(Canvas.LeftProperty, CenterX - DIAMETER / 2);
_circle.SetValue(Canvas.TopProperty, CenterY - DIAMETER / 2);
_text.SetValue(Canvas.LeftProperty, CenterX + DIAMETER / 2 + 2);
_text.SetValue(Canvas.TopProperty, CenterY - 10);
canvas.Children.Add(_circle); canvas.Children.Add(_circle);
canvas.Children.Add(_triangle); canvas.Children.Add(_triangle);
canvas.Children.Add(_text); canvas.Children.Add(_text);
} }
public void Scale(double scale) {
_circle?.Width = DIAMETER * scale;
_circle?.Height = DIAMETER * scale;
_circle?.StrokeThickness = 2;
_circle?.SetValue(Canvas.LeftProperty, (CenterX - DIAMETER / 2) * scale);
_circle?.SetValue(Canvas.TopProperty, (CenterY - DIAMETER / 2) * scale);
_triangle?.RenderTransform = new ScaleTransform(scale, scale);
_triangle?.StrokeThickness = 2 / scale;
_text?.FontSize = 14;
_text?.SetValue(Canvas.LeftProperty, (CenterX + DIAMETER / 2) * scale + 2);
_text?.SetValue(Canvas.TopProperty, CenterY * scale - 10);
}
public bool IsInside(double x, double y) { public bool IsInside(double x, double y) {
return Math.Sqrt(Math.Pow(CenterX - x, 2) + Math.Pow(CenterY - y, 2)) <= DIAMETER / 2; return Math.Sqrt(Math.Pow(CenterX - x, 2) + Math.Pow(CenterY - y, 2)) <= DIAMETER / 2;
} }
PamhagenSysCtrl/Helpers/Pipeline/Rebler.cs
+25 -17
View File
@@ -6,8 +6,8 @@ using System.Windows.Shapes;
namespace PamhagenSysCtrl.Helpers.Pipeline { namespace PamhagenSysCtrl.Helpers.Pipeline {
public class Rebler : INode { public class Rebler : INode {
public const double WIDTH = 120; public const double WIDTH = 24;
public const double HEIGHT = 60; public const double HEIGHT = 12;
public double CenterX { get; set; } public double CenterX { get; set; }
public double CenterY { get; set; } public double CenterY { get; set; }
@@ -37,8 +37,6 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
public void Draw(Canvas canvas) { public void Draw(Canvas canvas) {
_rect = new Rectangle() { _rect = new Rectangle() {
Width = WIDTH,
Height = HEIGHT,
Fill = Brushes.WhiteSmoke, Fill = Brushes.WhiteSmoke,
Stroke = Brushes.Black, Stroke = Brushes.Black,
StrokeThickness = 2, StrokeThickness = 2,
@@ -47,36 +45,30 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
var right = CenterX + WIDTH / 2; var right = CenterX + WIDTH / 2;
var top = CenterY - HEIGHT / 2; var top = CenterY - HEIGHT / 2;
var bottom = CenterY + HEIGHT / 2; var bottom = CenterY + HEIGHT / 2;
var hx = right - 20; var hx = right - 4;
var h = 15; var h = 3;
var w = 25; var w = 5;
_hopperOuter = new Polygon() { _hopperOuter = new Polygon() {
Points = [new(hx - w, top - h), new(hx - w + 5, top + 2), new(hx + w - 5, top + 2), new(hx + w, top - h)], Points = [new(hx - w, top - h), new(hx - w + 1, top + 0.4), new(hx + w - 1, top + 0.4), new(hx + w, top - h)],
Fill = Brushes.Black, Fill = Brushes.Black,
}; };
_hopperInner = new Polygon() { _hopperInner = new Polygon() {
Points = [new(hx - w + 2, top - h), new(hx - w + 5 + 2, top + 2), new(hx + w - 5 - 2, top + 2), new(hx + w - 2, top - h)], Points = [new(hx - w + 0.4, top - h), new(hx - w + 1 + 0.4, top + 0.4), new(hx + w - 1 - 0.4, top + 0.4), new(hx + w - 0.4, top - h)],
Fill = Brushes.WhiteSmoke, Fill = Brushes.WhiteSmoke,
}; };
_bottomOuter = new Polygon() { _bottomOuter = new Polygon() {
Points = [new(left + 20, bottom), new(right - 20, bottom), new(right - 15, bottom + 10), new(left + 15, bottom + 10)], Points = [new(left + 4, bottom), new(right - 4, bottom), new(right - 3, bottom + 2), new(left + 3, bottom + 2)],
Fill = Brushes.Black, Fill = Brushes.Black,
}; };
_bottomInner = new Polygon() { _bottomInner = new Polygon() {
Points = [new(left + 20 + 2, bottom), new(right - 20 - 2, bottom), new(right - 15 - 2, bottom + 10), new(left + 15 + 2, bottom + 10)], Points = [new(left + 4 + 0.4, bottom), new(right - 4 - 0.4, bottom), new(right - 3 - 0.4, bottom + 2), new(left + 3 + 0.4, bottom + 2)],
Fill = Brushes.WhiteSmoke, Fill = Brushes.WhiteSmoke,
}; };
_text = new() { _text = new() {
Text = Label, Text = Label,
FontSize = 12,
Width = WIDTH,
TextAlignment = TextAlignment.Center, TextAlignment = TextAlignment.Center,
VerticalAlignment = VerticalAlignment.Center, VerticalAlignment = VerticalAlignment.Center,
}; };
_rect.SetValue(Canvas.LeftProperty, CenterX - WIDTH / 2);
_rect.SetValue(Canvas.TopProperty, CenterY - HEIGHT / 2);
_text.SetValue(Canvas.LeftProperty, CenterX - WIDTH / 2);
_text.SetValue(Canvas.TopProperty, CenterY - 8);
canvas.Children.Add(_hopperOuter); canvas.Children.Add(_hopperOuter);
canvas.Children.Add(_bottomOuter); canvas.Children.Add(_bottomOuter);
canvas.Children.Add(_rect); canvas.Children.Add(_rect);
@@ -85,6 +77,22 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
canvas.Children.Add(_text); canvas.Children.Add(_text);
} }
public void Scale(double scale) {
_rect?.Width = WIDTH * scale;
_rect?.Height = HEIGHT * scale;
_rect?.StrokeThickness = 2;
_rect?.SetValue(Canvas.LeftProperty, (CenterX - WIDTH / 2) * scale);
_rect?.SetValue(Canvas.TopProperty, (CenterY - HEIGHT / 2) * scale);
_hopperOuter?.RenderTransform = new ScaleTransform(scale, scale);
_hopperInner?.RenderTransform = new ScaleTransform(scale, scale);
_bottomOuter?.RenderTransform = new ScaleTransform(scale, scale);
_bottomInner?.RenderTransform = new ScaleTransform(scale, scale);
_text?.FontSize = 12;
_text?.Width = WIDTH * scale;
_text?.SetValue(Canvas.LeftProperty, (CenterX - WIDTH / 2) * scale);
_text?.SetValue(Canvas.TopProperty, (CenterY * scale) - 8);
}
public bool IsInside(double x, double y) { public bool IsInside(double x, double y) {
return Math.Abs(x - CenterX) <= WIDTH / 2 && Math.Abs(y - CenterY) <= HEIGHT / 2; return Math.Abs(x - CenterX) <= WIDTH / 2 && Math.Abs(y - CenterY) <= HEIGHT / 2;
} }
PamhagenSysCtrl/Helpers/Pipeline/Switcher.cs
+23 -10
View File
@@ -6,8 +6,8 @@ using System.Windows.Shapes;
namespace PamhagenSysCtrl.Helpers.Pipeline { namespace PamhagenSysCtrl.Helpers.Pipeline {
public class Switcher : INode { public class Switcher : INode {
public const double WIDTH = 100; public const double WIDTH = 20;
public const double HEIGHT = 50; public const double HEIGHT = 10;
public double CenterX { get; set; } public double CenterX { get; set; }
public double CenterY { get; set; } public double CenterY { get; set; }
@@ -34,21 +34,15 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
} }
public void Draw(Canvas canvas) { public void Draw(Canvas canvas) {
_mainTransform = new RotateTransform(0, CenterX, CenterY); _mainTransform = new RotateTransform(0);
_shadowTransform = new RotateTransform(0, CenterX, CenterY); _shadowTransform = new RotateTransform(0);
_main = new Line() { _main = new Line() {
X1 = CenterX - WIDTH / 2, Y1 = CenterY,
X2 = CenterX + WIDTH / 2, Y2 = CenterY,
StrokeThickness = 5,
Stroke = Brushes.Black, Stroke = Brushes.Black,
StrokeStartLineCap = PenLineCap.Square, StrokeStartLineCap = PenLineCap.Square,
StrokeEndLineCap = PenLineCap.Square, StrokeEndLineCap = PenLineCap.Square,
RenderTransform = _mainTransform, RenderTransform = _mainTransform,
}; };
_shadow = new Line() { _shadow = new Line() {
X1 = CenterX - WIDTH / 2, Y1 = CenterY,
X2 = CenterX + WIDTH / 2, Y2 = CenterY,
StrokeThickness = 5,
Stroke = Brushes.DarkGray, Stroke = Brushes.DarkGray,
StrokeStartLineCap = PenLineCap.Square, StrokeStartLineCap = PenLineCap.Square,
StrokeEndLineCap = PenLineCap.Square, StrokeEndLineCap = PenLineCap.Square,
@@ -58,6 +52,25 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
canvas.Children.Add(_main); canvas.Children.Add(_main);
} }
public void Scale(double scale) {
_mainTransform?.CenterX = CenterX * scale;
_mainTransform?.CenterY = CenterY * scale;
_shadowTransform?.CenterX = CenterX * scale;
_shadowTransform?.CenterY = CenterY * scale;
_main?.X1 = (CenterX - WIDTH / 2) * scale;
_main?.Y1 = CenterY * scale;
_main?.X2 = (CenterX + WIDTH / 2) * scale;
_main?.Y2 = CenterY * scale;
_main?.StrokeThickness = 1 * scale;
_shadow?.X1 = (CenterX - WIDTH / 2) * scale;
_shadow?.Y1 = CenterY * scale;
_shadow?.X2 = (CenterX + WIDTH / 2) * scale;
_shadow?.Y2 = CenterY * scale;
_shadow?.StrokeThickness = 1 * scale;
}
public bool IsInside(double x, double y) { public bool IsInside(double x, double y) {
return Math.Abs(x - CenterX) <= WIDTH / 2 && Math.Abs(y - CenterY) <= HEIGHT / 2; return Math.Abs(x - CenterX) <= WIDTH / 2 && Math.Abs(y - CenterY) <= HEIGHT / 2;
} }
PamhagenSysCtrl/Helpers/Pipeline/Tank.cs
+14 -11
View File
@@ -6,8 +6,8 @@ using System.Windows.Shapes;
namespace PamhagenSysCtrl.Helpers.Pipeline { namespace PamhagenSysCtrl.Helpers.Pipeline {
public class Tank : INode, ISink, ISource { public class Tank : INode, ISink, ISource {
public const double WIDTH = 60; public const double WIDTH = 12;
public const double HEIGHT = 100; public const double HEIGHT = 20;
public double CenterX { get; set; } public double CenterX { get; set; }
public double CenterY { get; set; } public double CenterY { get; set; }
@@ -40,27 +40,30 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
public void Draw(Canvas canvas) { public void Draw(Canvas canvas) {
_rect = new Rectangle() { _rect = new Rectangle() {
Width = WIDTH,
Height = HEIGHT,
Stroke = Brushes.Black, Stroke = Brushes.Black,
StrokeThickness = 2,
Fill = Brushes.WhiteSmoke, Fill = Brushes.WhiteSmoke,
}; };
_text = new() { _text = new() {
Text = CapacityLiters.HasValue ? $"{Label}\n{CapacityLiters:N0}" : Label, Text = CapacityLiters.HasValue ? $"{Label}\n{CapacityLiters:N0}" : Label,
FontSize = 12,
Width = WIDTH,
TextAlignment = TextAlignment.Center, TextAlignment = TextAlignment.Center,
VerticalAlignment = VerticalAlignment.Center, VerticalAlignment = VerticalAlignment.Center,
}; };
_rect.SetValue(Canvas.LeftProperty, CenterX - WIDTH / 2);
_rect.SetValue(Canvas.TopProperty, CenterY - HEIGHT / 2);
_text.SetValue(Canvas.LeftProperty, CenterX - WIDTH / 2);
_text.SetValue(Canvas.TopProperty, CenterY - (CapacityLiters.HasValue ? 16 : 8));
canvas.Children.Add(_rect); canvas.Children.Add(_rect);
canvas.Children.Add(_text); canvas.Children.Add(_text);
} }
public void Scale(double scale) {
_rect?.Height = HEIGHT * scale;
_rect?.Width = WIDTH * scale;
_rect?.StrokeThickness = 2;
_rect?.SetValue(Canvas.LeftProperty, (CenterX - WIDTH / 2) * scale);
_rect?.SetValue(Canvas.TopProperty, (CenterY - HEIGHT / 2) * scale);
_text?.Width = WIDTH * scale;
_text?.FontSize = 12;
_text?.SetValue(Canvas.LeftProperty, (CenterX - WIDTH / 2) * scale);
_text?.SetValue(Canvas.TopProperty, (CenterY * scale) - (CapacityLiters.HasValue ? 16 : 8));
}
public bool IsInside(double x, double y) { public bool IsInside(double x, double y) {
return Math.Abs(x - CenterX) <= WIDTH / 2 && Math.Abs(y - CenterY) <= HEIGHT / 2; return Math.Abs(x - CenterX) <= WIDTH / 2 && Math.Abs(y - CenterY) <= HEIGHT / 2;
} }
PamhagenSysCtrl/Helpers/Pipeline/Trough.cs
+17 -14
View File
@@ -6,8 +6,8 @@ using System.Windows.Shapes;
namespace PamhagenSysCtrl.Helpers.Pipeline { namespace PamhagenSysCtrl.Helpers.Pipeline {
public class Trough : INode, ISource { public class Trough : INode, ISource {
public const double WIDTH = 100; public const double WIDTH = 20;
public const double HEIGHT = 60; public const double HEIGHT = 12;
public double CenterX { get; set; } public double CenterX { get; set; }
public double CenterY { get; set; } public double CenterY { get; set; }
@@ -35,33 +35,36 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
public void Draw(Canvas canvas) { public void Draw(Canvas canvas) {
_outer = new Rectangle() { _outer = new Rectangle() {
Width = WIDTH,
Height = HEIGHT,
Fill = Brushes.Black, Fill = Brushes.Black,
}; };
_inner = new Rectangle() { _inner = new Rectangle() {
Width = WIDTH - 4,
Height = HEIGHT - 2,
Fill = Brushes.WhiteSmoke, Fill = Brushes.WhiteSmoke,
}; };
_text = new() { _text = new() {
Text = Label, Text = Label,
FontSize = 14,
Width = WIDTH,
TextAlignment = TextAlignment.Center, TextAlignment = TextAlignment.Center,
VerticalAlignment = VerticalAlignment.Center, VerticalAlignment = VerticalAlignment.Center,
}; };
_outer.SetValue(Canvas.LeftProperty, CenterX - WIDTH / 2);
_outer.SetValue(Canvas.TopProperty, CenterY - HEIGHT / 2);
_inner.SetValue(Canvas.LeftProperty, CenterX - WIDTH / 2 + 2);
_inner.SetValue(Canvas.TopProperty, CenterY - HEIGHT / 2);
_text.SetValue(Canvas.LeftProperty, CenterX - WIDTH / 2);
_text.SetValue(Canvas.TopProperty, CenterY - 10);
canvas.Children.Add(_outer); canvas.Children.Add(_outer);
canvas.Children.Add(_inner); canvas.Children.Add(_inner);
canvas.Children.Add(_text); canvas.Children.Add(_text);
} }
public void Scale(double scale) {
_outer?.Width = WIDTH * scale;
_outer?.Height = HEIGHT * scale;
_inner?.Width = WIDTH * scale - 4;
_inner?.Height = HEIGHT * scale - 2;
_text?.Width = WIDTH * scale;
_text?.FontSize = 14;
_outer?.SetValue(Canvas.LeftProperty, (CenterX - WIDTH / 2) * scale);
_outer?.SetValue(Canvas.TopProperty, (CenterY - HEIGHT / 2) * scale);
_inner?.SetValue(Canvas.LeftProperty, (CenterX - WIDTH / 2) * scale + 2);
_inner?.SetValue(Canvas.TopProperty, (CenterY - HEIGHT / 2) * scale);
_text?.SetValue(Canvas.LeftProperty, (CenterX - WIDTH / 2) * scale);
_text?.SetValue(Canvas.TopProperty, (CenterY * scale) - 10);
}
public bool IsInside(double x, double y) { public bool IsInside(double x, double y) {
return Math.Abs(x - CenterX) <= WIDTH / 2 && Math.Abs(y - CenterY) <= HEIGHT / 2; return Math.Abs(x - CenterX) <= WIDTH / 2 && Math.Abs(y - CenterY) <= HEIGHT / 2;
} }
PamhagenSysCtrl/Helpers/Pipeline/Valve.cs
+14 -11
View File
@@ -6,7 +6,7 @@ using System.Windows.Shapes;
namespace PamhagenSysCtrl.Helpers.Pipeline { namespace PamhagenSysCtrl.Helpers.Pipeline {
public class Valve : INode { public class Valve : INode {
public const double DIAMETER = 24; public const double DIAMETER = 4.8;
public double CenterX { get; set; } public double CenterX { get; set; }
public double CenterY { get; set; } public double CenterY { get; set; }
@@ -40,29 +40,32 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
public void Draw(Canvas canvas) { public void Draw(Canvas canvas) {
_circle = new Ellipse() { _circle = new Ellipse() {
Height = DIAMETER,
Width = DIAMETER,
Fill = Brushes.DarkGray, Fill = Brushes.DarkGray,
Stroke = Brushes.Black, Stroke = Brushes.Black,
StrokeThickness = 2,
}; };
_circle.SetValue(Canvas.LeftProperty, CenterX - DIAMETER / 2);
_circle.SetValue(Canvas.TopProperty, CenterY - DIAMETER / 2);
_text = new() { _text = new() {
Text = Label, Text = Label,
FontSize = 10,
Width = DIAMETER,
Height = DIAMETER,
TextAlignment = TextAlignment.Center, TextAlignment = TextAlignment.Center,
VerticalAlignment = VerticalAlignment.Center, VerticalAlignment = VerticalAlignment.Center,
SnapsToDevicePixels = true, SnapsToDevicePixels = true,
}; };
_text.SetValue(Canvas.LeftProperty, CenterX - DIAMETER / 2 + 0.5);
_text.SetValue(Canvas.TopProperty, CenterY - DIAMETER / 2 + 5.5);
canvas.Children.Add(_circle); canvas.Children.Add(_circle);
canvas.Children.Add(_text); canvas.Children.Add(_text);
} }
public void Scale(double scale) {
_circle?.Width = DIAMETER * scale;
_circle?.Height = DIAMETER * scale;
_circle?.StrokeThickness = 2;
_circle?.SetValue(Canvas.LeftProperty, (CenterX - DIAMETER / 2) * scale);
_circle?.SetValue(Canvas.TopProperty, (CenterY - DIAMETER / 2) * scale);
_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) { public bool IsInside(double x, double y) {
return Math.Sqrt(Math.Pow(CenterX - x, 2) + Math.Pow(CenterY - y, 2)) <= DIAMETER / 2; return Math.Sqrt(Math.Pow(CenterX - x, 2) + Math.Pow(CenterY - y, 2)) <= DIAMETER / 2;
} }
PamhagenSysCtrl/Windows/PlantSchemeWindow.xaml.cs
+2 -2
View File
@@ -44,7 +44,7 @@ namespace PamhagenSysCtrl.Windows {
InitializeComponent(); InitializeComponent();
Menu_Help_CheckForUpdates.IsEnabled = App.Config.UpdateUrl != null; Menu_Help_CheckForUpdates.IsEnabled = App.Config.UpdateUrl != null;
Graph = new(); Graph = new();
Graph.Draw(SchemeCanvas); Graph.Draw(SchemeCanvas, 5);
FastSelectPaths = new Dictionary<Button, (ISource, Pump, ISink)> { FastSelectPaths = new Dictionary<Button, (ISource, Pump, ISink)> {
[FastSelectButton_MW1_Press1] = (Graph.MW1, Graph.MP1, Graph.Press1), [FastSelectButton_MW1_Press1] = (Graph.MW1, Graph.MP1, Graph.Press1),
[FastSelectButton_MW2_Press1] = (Graph.MW2, Graph.MP2, Graph.Press1), [FastSelectButton_MW2_Press1] = (Graph.MW2, Graph.MP2, Graph.Press1),
@@ -401,7 +401,7 @@ namespace PamhagenSysCtrl.Windows {
SetFastSelectButton(b.Key, 0, false); SetFastSelectButton(b.Key, 0, false);
} }
_hover = Graph.GetHover(pos.X, pos.Y); _hover = Graph.GetHover(pos.X, pos.Y, 5);
var hoverButtons = FastSelectPaths.Where(b => b.Key.IsMouseOver).ToDictionary(); var hoverButtons = FastSelectPaths.Where(b => b.Key.IsMouseOver).ToDictionary();
Path? hoverPathDeactivate = null; Path? hoverPathDeactivate = null;
if (App.Plant?.ManualControlMode ?? false) { if (App.Plant?.ManualControlMode ?? false) {