From 4cb1f00f84d160f97afd0fb86cf600e1be667dd5 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期四, 17 十月 2024 11:22:15 +0800
Subject: [PATCH] 水力组件更新
---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-parter/03-link/01-pipe/00-core/HydroPipeViewModel.cs | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-parter/17-pipe/HydroPipeViewModel.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-parter/03-link/01-pipe/00-core/HydroPipeViewModel.cs
similarity index 97%
rename from WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-parter/17-pipe/HydroPipeViewModel.cs
rename to WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-parter/03-link/01-pipe/00-core/HydroPipeViewModel.cs
index d25c054..5e6bc79 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-parter/17-pipe/HydroPipeViewModel.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-parter/03-link/01-pipe/00-core/HydroPipeViewModel.cs
@@ -8,16 +8,16 @@
/// <summary>
///
/// </summary>
- public HydroPipeViewModel() { }
+ public HydroPipeViewModel() : base() { }
/// <summary>
///
/// </summary>
public HydroPipeViewModel(Yw.Model.HydroPipeInfo rhs) : base(rhs)
{
+ this.Material = rhs.Material;
this.Diameter = rhs.Diameter;
this.Length = rhs.Length;
- this.Material = rhs.Material;
this.Roughness = rhs.Roughness;
this.MinorLoss = rhs.MinorLoss;
@@ -29,9 +29,9 @@
/// </summary>
public HydroPipeViewModel(Yw.Model.HydroPipeInfo rhs, Yw.WinFrmUI.HydroCalcuLinkResult calcuResult) : base(rhs, calcuResult)
{
+ this.Material = rhs.Material;
this.Diameter = rhs.Diameter;
this.Length = rhs.Length;
- this.Material = rhs.Material;
this.Roughness = rhs.Roughness;
this.MinorLoss = rhs.MinorLoss;
@@ -45,6 +45,12 @@
public override string LinkStatus { get; set; }
/// <summary>
+ /// 鏉愯川
+ /// </summary>
+ [DisplayName("鏉愯川")]
+ public string Material { get; set; }
+
+ /// <summary>
/// 鐩村緞锛坢m锛�
/// </summary>
[DisplayName("鐩村緞(mm)")]
@@ -55,12 +61,6 @@
/// </summary>
[DisplayName("闀垮害(m)")]
public double Length { get; set; }
-
- /// <summary>
- /// 鏉愯川
- /// </summary>
- [DisplayName("鏉愯川")]
- public string Material { get; set; }
/// <summary>
/// 绮楃硻绯绘暟
--
Gitblit v1.9.3