From 13e69c09c5ac97e0294d64617dfb934e34bb4264 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期一, 02 十二月 2024 17:11:13 +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/01-viewmodel/ElbowMatchingViewModel.cs | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 insertions(+), 1 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/01-viewmodel/ElbowMatchingViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/01-viewmodel/ElbowMatchingViewModel.cs
index b5271c3..7f5807c 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/01-viewmodel/ElbowMatchingViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/01-viewmodel/ElbowMatchingViewModel.cs
@@ -1,4 +1,6 @@
-锘縩amespace HStation.WinFrmUI
+锘縰sing HStation.Assets;
+
+namespace HStation.WinFrmUI
{
/// <summary>
/// 寮ご鍖归厤ViewModel
@@ -55,6 +57,20 @@
public string Material { get; set; }
/// <summary>
+ /// 绠¤矾杩炴帴闀垮害
+ /// </summary>
+ [DisplayName("杩炴帴闀垮害")]
+ [Browsable(true)]
+ public HStation.Assets.eElbowType? ConnectionLength { get; set; }
+
+ /// <summary>
+ /// 瑙掑害
+ /// </summary>
+ [DisplayName("瑙掑害")]
+ [Browsable(true)]
+ public int? Angle { get; set; }
+
+ /// <summary>
/// 鍙ｅ緞
/// </summary>
[DisplayName("鍙ｅ緞")]
@@ -102,5 +118,19 @@
[DisplayName("鍖归厤鎹熷け绯绘暟")]
[Browsable(true)]
public double? MatchingMinorLoss { get; set; }
+
+ /// <summary>
+ /// 寮ご绫诲瀷
+ /// </summary>
+ [DisplayName("寮ご绫诲瀷")]
+ [Browsable(true)]
+ public HStation.Assets.eElbowType? MatchingConnectionLength { get; set; }
+
+ /// <summary>
+ /// 瑙掑害
+ /// </summary>
+ [DisplayName("鍖归厤瑙掑害")]
+ [Browsable(true)]
+ public int? MatchingAngle { get; set; }
}
}
\ No newline at end of file
--
Gitblit v1.9.3