HStation/XHS.V1.0.git

			@@ -16,10 +16,11 @@
			public HydroTranslationViewModel(Yw.Model.HydroTranslationInfo rhs, Yw.Model.HydroModelInfo hydroInfo) : base(rhs, hydroInfo)
			{
			this.Elev = Math.Round(rhs.Elev, 4);
			this.TranslationType = rhs.TranslationType;
			this.Material = rhs.Material;
			this.Length = Math.Round(rhs.Length, 0);
			this.Roughness = Math.Round(rhs.Roughness, 0);
			this.MinorLoss = Math.Round(rhs.MinorLoss, 0);
			this.Length = Math.Round(rhs.Length, 4);
			this.Roughness = rhs.Roughness;
			this.MinorLoss = rhs.MinorLoss;
			this.StartDiameter = Math.Round(rhs.StartDiameter, 0);
			this.EndDiameter = Math.Round(rhs.EndDiameter, 0);
			}
			@@ -36,12 +37,22 @@
			public virtual double Elev { get; set; }

			/// <summary>
			/// 过渡件类型
			/// </summary>
			[Category("数据")]
			[Display(Name = "过渡件类型")]
			[DisplayName("过渡件类型")]
			[PropertyOrder(2002)]
			[Browsable(true)]
			public string TranslationType { get; set; }

			/// <summary>
			/// 材质
			/// </summary>
			[Category("数据")]
			[Display(Name = "材质")]
			[DisplayName("材质")]
			[PropertyOrder(2002)]
			[PropertyOrder(2003)]
			[Browsable(true)]
			public string Material { get; set; }

			@@ -52,8 +63,8 @@
			[Display(Name = "长度(m)")]
			[DisplayName("长度")]
			[DisplayUnit("m")]
			[PropertyOrder(2003)]
			[Browsable(true)]
			[PropertyOrder(2004)]
			[Browsable(false)]
			public double Length { get; set; }

			/// <summary>
			@@ -63,8 +74,8 @@
			[Display(Name = "粗糙系数")]
			[DisplayName("粗糙系数")]
			[Description("海森威廉公式系数")]
			[PropertyOrder(2004)]
			[Browsable(true)]
			[PropertyOrder(2005)]
			[Browsable(false)]
			public double Roughness { get; set; }

			/// <summary>
			@@ -74,7 +85,7 @@
			[Display(Name = "局阻系数")]
			[DisplayName("局阻系数")]
			[Description("局部阻力系数")]
			[PropertyOrder(2005)]
			[PropertyOrder(2006)]
			[Browsable(true)]
			public double MinorLoss { get; set; }

			@@ -166,19 +177,6 @@
			public override double? CalcuMinorLoss { get; set; }

			/// <summary>
			/// 沿程损失
			/// </summary>
			[Category("计算结果")]
			[DisplayName("沿程损失")]
			[DisplayUnit("m")]
			[Display(Name = "沿程损失(m)")]
			[PropertyOrder(19009)]
			[HydroCalcuPro]
			[ShowEditor(false)]
			[Browsable(true)]
			public override double? CalcuFrictionLoss { get; set; }

			/// <summary>
			///
			/// </summary>
			[Browsable(false)]
			@@ -196,6 +194,8 @@
			public override void UpdateProperty()
			{
			base.UpdateProperty();
			this.Elev = Math.Round(this.Vmo.Elev, 4);
			this.TranslationType = this.Vmo.TranslationType;
			this.Material = this.Vmo.Material;
			this.Length = Math.Round(this.Vmo.Length, 4);
			this.Roughness = this.Vmo.Roughness;
			@@ -210,6 +210,8 @@
			public override void UpdateVmoProperty()
			{
			base.UpdateVmoProperty();
			this.Vmo.Elev = this.Elev;
			this.TranslationType = this.TranslationType;
			this.Vmo.Material = this.Material;
			this.Vmo.Length = this.Length;
			this.Vmo.Roughness = this.Roughness;