From a5f3c47ee959183e3059fc6672b4b07f99eb9c1a Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期三, 06 十一月 2024 15:28:58 +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/ValveMatchingViewModel.cs | 69 ++++++++++++++++++++++++++++------
1 files changed, 56 insertions(+), 13 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/01-viewmodel/ValveMatchingViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/01-viewmodel/ValveMatchingViewModel.cs
index 8cc13fd..350d928 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/01-viewmodel/ValveMatchingViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/01-viewmodel/ValveMatchingViewModel.cs
@@ -1,4 +1,5 @@
锘縰sing HStation.Assets;
+using HStation.Revit;
namespace HStation.WinFrmUI
{
@@ -7,6 +8,41 @@
/// </summary>
public class ValveMatchingViewModel
{
+ /// <summary>
+ ///
+ /// </summary>
+ public ValveMatchingViewModel() { }
+
+ /// <summary>
+ ///
+ /// </summary>
+ public ValveMatchingViewModel(Yw.Model.HydroValveInfo rhs, Yw.Model.HydroModelInfo hydroInfo, List<HydroCalcuResult> allCalcuResult)
+ {
+ this.ID = rhs.ID;
+ this.Name = rhs.Name;
+ this.Code = rhs.Code;
+ this.ModelType = rhs.ModelType;
+ this.DbLocked = rhs.DbLocked;
+ this.DbId = rhs.DbId;
+ this.CurveDbId = hydroInfo.Curves?.Find(x => x.Code == rhs.ValveSetting)?.DbId;
+ this.Material = rhs.Material;
+ this.Diameter = rhs.Diameter;
+ this.MinorLoss = rhs.MinorLoss;
+ switch (rhs.ValveType)
+ {
+ case Yw.Hydro.ValveType.PRV: this.ValveType = HStation.Assets.eValveType.PRV; break;
+ case Yw.Hydro.ValveType.PSV: this.ValveType = HStation.Assets.eValveType.PSV; break;
+ case Yw.Hydro.ValveType.PBV: this.ValveType = HStation.Assets.eValveType.PBV; break;
+ case Yw.Hydro.ValveType.TCV: this.ValveType = HStation.Assets.eValveType.TCV; break;
+ case Yw.Hydro.ValveType.FCV: this.ValveType = HStation.Assets.eValveType.FCV; break;
+ case Yw.Hydro.ValveType.GPV: this.ValveType = HStation.Assets.eValveType.GPV; break;
+ case Yw.Hydro.ValveType.CV: this.ValveType = HStation.Assets.eValveType.CV; break;
+ default: break;
+ }
+ this.ValveSetting = rhs.ValveSetting;
+
+ }
+
/// <summaryd>
/// ID
/// </summary>
@@ -50,6 +86,13 @@
public string DbId { get; set; }
/// <summary>
+ /// CurveDbId
+ /// </summary>
+ [DisplayName("CurveDbId")]
+ [Browsable(false)]
+ public string CurveDbId { get; set; }
+
+ /// <summary>
/// 鐩村緞
/// </summary>
[DisplayName("鐩村緞")]
@@ -75,7 +118,7 @@
/// </summary>
[DisplayName("闃�闂ㄧ被鍨�")]
[Browsable(true)]
- public string ValveType { get; set; }
+ public eValveType ValveType { get; set; }
/// <summary>
/// 闃�闂ㄨ缃�
@@ -83,13 +126,6 @@
[DisplayName("闃�闂ㄨ缃�")]
[Browsable(true)]
public string ValveSetting { get; set; }
-
- /// <summary>
- /// 闃�闂ㄥ紑搴�
- /// </summary>
- [DisplayName("闃�闂ㄥ紑搴�")]
- [Browsable(true)]
- public int ValveLift { get; set; }
/// <summary>
/// 鍖归厤鍨嬪彿
@@ -113,6 +149,13 @@
public double? MatchingDiameter { get; set; }
/// <summary>
+ /// MatchingCurveDbId
+ /// </summary>
+ [DisplayName("MatchingCurveDbId")]
+ [Browsable(false)]
+ public string MatchingCurveDbId { get; set; }
+
+ /// <summary>
/// 鍖归厤鏉愯川
/// </summary>
[DisplayName("鍖归厤鏉愯川")]
@@ -131,7 +174,7 @@
/// </summary>
[DisplayName("鍖归厤闃�闂ㄧ被鍨�")]
[Browsable(true)]
- public string MatchingValveType { get; set; }
+ public eValveType MatchingValveType { get; set; }
/// <summary>
/// 鍖归厤闃�闂ㄨ缃�
@@ -148,10 +191,10 @@
public List<CurvePointMatchingViewModel> MatchingCurveQL { get; set; }
/// <summary>
- /// 鍖归厤闃�闂ㄥ紑搴�
+ /// 鍖归厤寮�搴︽崯澶辨洸绾�
/// </summary>
- [DisplayName("鍖归厤闃�闂ㄥ紑搴�")]
- [Browsable(true)]
- public int MatchingValveLift { get; set; }
+ [DisplayName("鍖归厤寮�搴︽崯澶辨洸绾�")]
+ [Browsable(false)]
+ public List<CurvePointMatchingViewModel> MatchingCurveOL { get; set; }
}
}
\ No newline at end of file
--
Gitblit v1.9.3