增加计算局部损失和沿程损失

lixiaojun

2024-11-30 b59d9e9a62dd2cea04be784880cf454364003e1e

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/04-link/02-pump/HydroPumpViewModel.cs

@@ -150,7 +150,7 @@
        [Category("数据")]
        [DisplayName("性能曲线")]
        [PropertyOrder(2009)]
        [IsHydroCurvePro(HydroCurve.Pump)]
        [HydroCurvePro(HydroCurve.Pump)]
        [Browsable(true)]
        public string Curve
        {
@@ -170,7 +170,7 @@
        [Category("数据")]
        [DisplayName("流量扬程曲线")]
        [PropertyOrder(2010)]
        [IsHydroCurvePro(HydroCurve.PumpQH)]
        [HydroCurvePro(HydroCurve.PumpQH)]
        [Browsable(false)]
        public string CurveQH { get; set; }

@@ -180,7 +180,7 @@
        [Category("数据")]
        [DisplayName("流量功率曲线")]
        [PropertyOrder(2011)]
        [IsHydroCurvePro(HydroCurve.PumpQP)]
        [HydroCurvePro(HydroCurve.PumpQP)]
        [Browsable(false)]
        public string CurveQP { get; set; }

@@ -190,7 +190,7 @@
        [Category("数据")]
        [DisplayName("流量效率曲线")]
        [PropertyOrder(2012)]
        [IsHydroCurvePro(HydroCurve.PumpQE)]
        [HydroCurvePro(HydroCurve.PumpQE)]
        [Browsable(false)]
        public string CurveQE { get; set; }

@@ -202,7 +202,7 @@
        [DisplayName("流量")]
        [PropertyOrder(10001)]
        [DisplayUnit("m³/h")]
        [IsHydroCalcuPro]
        [HydroCalcuPro]
        [ShowEditor(false)]
        [Browsable(false)]
        public override double? CalcuFlow { get; set; }
@@ -214,7 +214,7 @@
        [DisplayName("流速")]
        [PropertyOrder(10002)]
        [DisplayUnit("m/s")]
        [IsHydroCalcuPro]
        [HydroCalcuPro]
        [ShowEditor(false)]
        [Browsable(false)]
        public override double? CalcuVelocity { get; set; }
@@ -226,10 +226,36 @@
        [DisplayName("水头损失")]
        [PropertyOrder(10003)]
        [DisplayUnit("m")]
        [IsHydroCalcuPro]
        [HydroCalcuPro]
        [ShowEditor(false)]
        [Browsable(false)]
        public override double? CalcuHeadLoss { get; set; }

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

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


        /// <summary>
@@ -239,7 +265,7 @@
        [DisplayName("流量")]
        [PropertyOrder(11001)]
        [DisplayUnit("m³/h")]
        [IsHydroCalcuPro]
        [HydroCalcuPro]
        [ShowEditor(false)]
        [Browsable(true)]
        public double? CalcuQ { get; set; }
@@ -251,7 +277,7 @@
        [DisplayName("扬程")]
        [PropertyOrder(11002)]
        [DisplayUnit("m")]
        [IsHydroCalcuPro]
        [HydroCalcuPro]
        [ShowEditor(false)]
        [Browsable(true)]
        public double? CalcuH { get; set; }
@@ -263,7 +289,7 @@
        [DisplayName("功率")]
        [PropertyOrder(11003)]
        [DisplayUnit("kW")]
        [IsHydroCalcuPro]
        [HydroCalcuPro]
        [ShowEditor(false)]
        [Browsable(true)]
        public double? CalcuP { get; set; }
@@ -275,7 +301,7 @@
        [DisplayName("效率")]
        [PropertyOrder(11004)]
        [DisplayUnit("%")]
        [IsHydroCalcuPro]
        [HydroCalcuPro]
        [ShowEditor(false)]
        [Browsable(true)]
        public double? CalcuE { get; set; }
@@ -343,7 +369,7 @@
        /// <summary>
        /// 更新计算属性
        /// </summary>
        public override void UpdateCalcuProperty(HydroCalcuResult rhs)
        public override void UpdateCalcuProperty(HydroCalcuVisualResult rhs)
        {
            base.UpdateCalcuProperty(rhs);
            if (rhs is HydroCalcuPumpResult calcuPumpProperty)