From 28ba54f194f1301c45aa30b44cd7b612855b8963 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期五, 18 四月 2025 11:10:33 +0800
Subject: [PATCH] 改变光源，管理器修改
---
Yw.WpfUI.Test.Core/MainWindow.xaml.cs | 42 ++++++------------------------------------
1 files changed, 6 insertions(+), 36 deletions(-)
diff --git a/Yw.WpfUI.Test.Core/MainWindow.xaml.cs b/Yw.WpfUI.Test.Core/MainWindow.xaml.cs
index 4895755..0dd29ce 100644
--- a/Yw.WpfUI.Test.Core/MainWindow.xaml.cs
+++ b/Yw.WpfUI.Test.Core/MainWindow.xaml.cs
@@ -69,18 +69,8 @@
var pipe3d = new PipeL3d();
pipe3d.Id = pipe.Id;
pipe3d.Name = pipe.Name;
- pipe3d.StartPosition = new PointL3d()
- {
- X = (float)pipe.StartNode.Position.X,
- Y = (float)pipe.StartNode.Position.Y,
- Z = (float)pipe.StartNode.GetElev()
- };
- pipe3d.EndPosition = new PointL3d()
- {
- X = (float)pipe.EndNode.Position.X,
- Y = (float)pipe.EndNode.Position.Y,
- Z = (float)pipe.EndNode.GetElev()
- };
+ pipe3d.StartNode = nw3d.Nodes.Find(x => x.Id == pipe.StartNodeId);
+ pipe3d.EndNode = nw3d.Nodes.Find(x => x.Id == pipe.EndNodeId);
nw3d.Append(pipe3d, out msg);
}
@@ -89,18 +79,8 @@
var pump3d = new PumpL3d();
pump3d.Id = pump.Id;
pump3d.Name = pump.Name;
- pump3d.StartPosition = new PointL3d()
- {
- X = (float)pump.StartNode.Position.X,
- Y = (float)pump.StartNode.Position.Y,
- Z = (float)pump.StartNode.GetElev()
- };
- pump3d.EndPosition = new PointL3d()
- {
- X = (float)pump.EndNode.Position.X,
- Y = (float)pump.EndNode.Position.Y,
- Z = (float)pump.EndNode.GetElev()
- };
+ pump3d.StartNode = nw3d.Nodes.Find(x => x.Id == pump.StartNodeId);
+ pump3d.EndNode = nw3d.Nodes.Find(x => x.Id == pump.EndNodeId);
nw3d.Append(pump3d, out msg);
}
@@ -109,18 +89,8 @@
var valve3d = new ValveL3d();
valve3d.Id = valve.Id;
valve3d.Name = valve.Name;
- valve3d.StartPosition = new PointL3d()
- {
- X = (float)valve.StartNode.Position.X,
- Y = (float)valve.StartNode.Position.Y,
- Z = (float)valve.StartNode.GetElev()
- };
- valve3d.EndPosition = new PointL3d()
- {
- X = (float)valve.EndNode.Position.X,
- Y = (float)valve.EndNode.Position.Y,
- Z = (float)valve.EndNode.GetElev()
- };
+ valve3d.StartNode = nw3d.Nodes.Find(x => x.Id == valve.StartNodeId);
+ valve3d.EndNode = nw3d.Nodes.Find(x => x.Id == valve.EndNodeId);
nw3d.Append(valve3d, out msg);
}
--
Gitblit v1.9.3