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/01-viewmodel/ValveMatchingViewModel.cs | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 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 3d393b1..a38c376 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,5 +1,4 @@
锘縰sing HStation.Assets;
-using HStation.Revit;
namespace HStation.WinFrmUI
{
@@ -9,14 +8,15 @@
public class ValveMatchingViewModel
{
/// <summary>
- ///
+ ///
/// </summary>
- public ValveMatchingViewModel() { }
+ public ValveMatchingViewModel()
+ { }
/// <summary>
- ///
+ ///
/// </summary>
- public ValveMatchingViewModel(Yw.Model.HydroValveInfo rhs, Yw.Model.HydroModelInfo hydroInfo, List<HydroCalcuResult> allCalcuResult)
+ public ValveMatchingViewModel(Yw.Model.HydroValveInfo rhs, Yw.Model.HydroModelInfo hydroInfo, List<HydroCalcuVisualResult> allCalcuResult)
{
this.ID = rhs.ID;
this.Name = rhs.Name;
@@ -40,7 +40,6 @@
default: break;
}
this.ValveSetting = rhs.ValveSetting;
-
}
/// <summaryd>
@@ -88,7 +87,7 @@
/// <summary>
/// CurveDbId
/// </summary>
- [DisplayName("ChartDbId")]
+ [DisplayName("CurveDbId")]
[Browsable(false)]
public string CurveDbId { get; set; }
@@ -118,7 +117,7 @@
/// </summary>
[DisplayName("闃�闂ㄧ被鍨�")]
[Browsable(true)]
- public eValveType ValveType { get; set; }
+ public HStation.Assets.eValveType ValveType { get; set; }
/// <summary>
/// 闃�闂ㄨ缃�
@@ -174,7 +173,7 @@
/// </summary>
[DisplayName("鍖归厤闃�闂ㄧ被鍨�")]
[Browsable(true)]
- public eValveType MatchingValveType { get; set; }
+ public HStation.Assets.eValveType? MatchingValveType { get; set; }
/// <summary>
/// 鍖归厤闃�闂ㄨ缃�
--
Gitblit v1.9.3