From d4898c5d7e1bbbbba384a0e29f29c066d6f502a7 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期一, 25 十一月 2024 17:44:18 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/05-elbows/01-elbowsinglematching/ElbowSingleMatchingViewModel.cs | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/05-elbows/01-elbowsinglematching/ElbowSingleMatchingViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/05-elbows/01-elbowsinglematching/ElbowSingleMatchingViewModel.cs
index dccc99d..bbd34a9 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/05-elbows/01-elbowsinglematching/ElbowSingleMatchingViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/05-elbows/01-elbowsinglematching/ElbowSingleMatchingViewModel.cs
@@ -1,4 +1,6 @@
-锘縩amespace HStation.WinFrmUI.Xhs
+锘縰sing HStation.Assets;
+
+namespace HStation.WinFrmUI
{
public class ElbowSingleMatchingViewModel
{
@@ -6,13 +8,15 @@
{
}
- public ElbowSingleMatchingViewModel(Vmo.ElbowMainVmo rhs)
+ public ElbowSingleMatchingViewModel(Vmo.AssetsElbowMainVmo rhs)
{
this.Caliber = rhs.Caliber;
this.ID = rhs.ID;
- this.Material = rhs.MaterialName;
+ this.Material = rhs.Material;
this.ModelType = rhs.Name;
- this.MinorLoss = rhs.Coefficient;
+ this.MinorLoss = rhs.MinorLoss;
+ this.Angle = rhs.Angle;
+ this.ElbowLengthType = rhs.ElbowLengthType;
}
/// <summary>
@@ -49,5 +53,21 @@
[DisplayName("鎹熷け绯绘暟")]
[Browsable(true)]
public double? MinorLoss { get; set; }
+
+ /// <summary>
+ /// 绠¤矾杩炴帴闀垮害
+ /// </summary>
+
+ [DisplayName("寮ご绫诲瀷")]
+ [Browsable(true)]
+ public eLengthType? ElbowLengthType { get; set; }
+
+ /// <summary>
+ /// 瑙掑害
+ /// </summary>
+
+ [DisplayName("瑙掑害")]
+ [Browsable(true)]
+ public int? Angle { get; set; }
}
}
\ No newline at end of file
--
Gitblit v1.9.3