From c2b56fc9401718620dd2a280557b8c716e4ad05a Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 23 十二月 2024 17:49:41 +0800
Subject: [PATCH] 整体优化

---
 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/02-change/03-pipe/CreateXhsSchemePipeChangeViewMdoel.cs |  124 +++++++++++++++++++++++++----------------
 1 files changed, 76 insertions(+), 48 deletions(-)

diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/02-change/03-pipe/CreateXhsSchemePipeChangeViewMdoel.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/02-change/03-pipe/CreateXhsSchemePipeChangeViewMdoel.cs
index a20bf67..092e8e1 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/02-change/03-pipe/CreateXhsSchemePipeChangeViewMdoel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/02-change/03-pipe/CreateXhsSchemePipeChangeViewMdoel.cs
@@ -1,70 +1,98 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Yw.Model;
+锘縰sing DevExpress.Utils.Svg;
 
 namespace HStation.WinFrmUI
 {
-    public class CreateXhsSchemePipeChangeViewMdoel
+    public class CreateXhsSchemePipeChangeViewMdoel 
     {
-        public CreateXhsSchemePipeChangeViewMdoel()
+
+        public CreateXhsSchemePipeChangeViewMdoel() { }
+        public CreateXhsSchemePipeChangeViewMdoel(HydroPipeViewModel rhs, SvgImage svg)
         {
-
+            this.ViewModel = rhs;
+            this.SvgImage = svg;
         }
-
-
-        /// <summary>
-        /// 鏍囪瘑
-        /// </summary>
-        public string Id { get; set; }
 
         /// <summary>
         /// 鍚嶇О
         /// </summary>
-        public string Name { get; set; }
+        public string Name
+        {
+            get { return ViewModel.Name; }
+            set { ViewModel.Name = value; }
+        }
 
         /// <summary>
-        /// 缂栫爜
+        /// 妯″瀷绫诲瀷
         /// </summary>
-        public string Code { get; set; }
-
+        public string ModelType
+        {
+            get { return ViewModel.ModelType; }
+            set { ViewModel.ModelType = value; }
+        }
 
         /// <summary>
-        /// 鏉愭枡
+        /// 鏉愯川
         /// </summary> 
-        public string Material { get; set; }
-
-        //
-        // 鎽樿:
-        //     鐩村緞锛坢m锛�
-        [SysProp("Diameter", null)]
-        public double Diameter { get; set; }
-
-        //
-        // 鎽樿:
-        //     闀垮害 (m)
-        [SysProp("Length", null)]
-        public double Length { get; set; }
-
-        //
-        // 鎽樿:
-        //     绮楃硻绯绘暟
-        [SysProp("Roughness", null)]
-        public double Roughness { get; set; }
-
-        //
-        // 鎽樿:
-        //     灞�闃荤郴鏁�
-        [SysProp("MinorLoss", null)]
-        public double MinorLoss { get; set; }
-
+        public string Material
+        {
+            get { return ViewModel.Material; }
+            set { ViewModel.Material = value; }
+        }
 
         /// <summary>
-        /// 绠℃鐘舵��
+        /// 鐩村緞
+        /// </summary> 
+        public double Diameter
+        {
+            get { return ViewModel.Diameter; }
+            set { ViewModel.Diameter = value; }
+        }
+         
+        /// <summary>
+        /// 闀垮害
+        /// </summary> 
+        public double Length
+        {
+            get { return ViewModel.Length; }
+            set { ViewModel.Length = value; }
+        }
+
+        /// <summary>
+        /// 绮楃硻绯绘暟
+        /// </summary> 
+        public double Roughness
+        {
+            get { return ViewModel.Roughness; }
+            set { ViewModel.Roughness = value; }
+        }
+
+        /// <summary>
+        /// 灞�闃荤郴鏁�
+        /// </summary> 
+        public double MinorLoss
+        {
+            get { return ViewModel.MinorLoss; }
+            set { ViewModel.MinorLoss = value; }
+        }
+       
+        /// <summary>
+        /// 鐘舵��
+        /// </summary> 
+        public string LinkStatus
+        {
+            get { return ViewModel.LinkStatus; }
+            set { ViewModel.LinkStatus = value; }
+        }
+
+        /// <summary>
+        /// ViewMdoel
         /// </summary>
-        public string LinkStatus { get; set; }
+        public HydroPipeViewModel ViewModel { get; set; }
+
+        /// <summary>
+        /// 鍥剧墖
+        /// </summary>
+        public SvgImage SvgImage { get; set; }
 
     }
 }

--
Gitblit v1.9.3