From 19e6eb0b172154f9b44323a4174ff9b61628439d Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期六, 12 四月 2025 20:44:00 +0800
Subject: [PATCH] WpfUI 绘制重构
---
Yw.WpfUI.Test.Core/MainWindow.xaml.cs | 75 ++++++++++++++++++-------------------
1 files changed, 36 insertions(+), 39 deletions(-)
diff --git a/Yw.WpfUI.Test.Core/MainWindow.xaml.cs b/Yw.WpfUI.Test.Core/MainWindow.xaml.cs
index 9751edb..00740dd 100644
--- a/Yw.WpfUI.Test.Core/MainWindow.xaml.cs
+++ b/Yw.WpfUI.Test.Core/MainWindow.xaml.cs
@@ -22,7 +22,7 @@
{
var nw = LoadEpaNetwork();
var nw3d = Get3dNetwork(nw);
- this.viewer.Initial(nw3d);
+ this.editer.Initial(nw3d);
//BuildSimpleNetwork(this.viewport,nw3d.Nodes,nw3d.Links);
}
@@ -129,48 +129,45 @@
}
- public void BuildSimpleNetwork(HelixViewport3D viewport, List<NodeL3d> nodes, List<LinkL3d> pipes)
+ private void AddJunction_Click(object sender, RoutedEventArgs e)
{
-
- // 娓呯┖鐜版湁鍐呭
- viewport.Children.Clear();
-
- // 娣诲姞鍏夋簮
- viewport.Children.Add(new DefaultLights());
-
- // 鍒涘缓鑺傜偣闆嗗悎锛堢偣绮剧伒鎶�鏈級
- var pointsVisual = new PointsVisual3D
- {
- Size = 5, // 鏄剧ず澶у皬锛堝睆骞曞儚绱狅級
- Color = Colors.Red,
-
- };
-
-
- nodes.ForEach(x => pointsVisual.Points.Add(new Point3D(x.Position.X, x.Position.Y, x.Position.Z)));
-
- viewport.Children.Add(pointsVisual);
-
- // 2. 鏄剧ず绠￠亾绾挎锛堜娇鐢↙inesVisual3D锛�
- var linesVisual = new LinesVisual3D
- {
- Points = new Point3DCollection(pipes.Count * 2), // 棰勫垎閰嶅唴瀛�
- Color = Colors.Blue,
- Thickness = 2.0
- };
-
- foreach (var pipe in pipes)
- {
- linesVisual.Points.Add(new Point3D(pipe.StartPosition.X, pipe.StartPosition.Y, pipe.StartPosition.Z));
- linesVisual.Points.Add(new Point3D(pipe.EndPosition.X, pipe.EndPosition.Y, pipe.EndPosition.Z));
- }
-
- viewport.Children.Add(linesVisual);
- // 4. 鑷姩缂╂斁鍒板悎閫傚ぇ灏�
- viewport.ZoomExtents();
+ this.editer.StartAddJunction();
}
+ private void AddReservoir_Click(object sender, RoutedEventArgs e)
+ {
+ this.editer.StartAddReservoir();
+ }
+ private void AddTank_Click(object sender, RoutedEventArgs e)
+ {
+ this.editer.StartAddTank();
+ }
+
+ private void AddPipe_Click(object sender, RoutedEventArgs e)
+ {
+ this.editer.StartAddPipe();
+ }
+
+ private void AddHorizPipe_Click(object sender, RoutedEventArgs e)
+ {
+
+ }
+
+ private void AddVertPipe_Click(object sender, RoutedEventArgs e)
+ {
+
+ }
+
+ private void AddPump_Click(object sender, RoutedEventArgs e)
+ {
+ this.editer.StartAddPump();
+ }
+
+ private void AddValve_Click(object sender, RoutedEventArgs e)
+ {
+ this.editer.StartAddValve();
+ }
}
--
Gitblit v1.9.3