HStation/XHS.V1.0.git

			@@ -1,5 +1,4 @@
			using 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>
			/// 匹配阀门设置