水泵分析优化

lixiaojun

2024-12-11 e47f92df1569e16a19deed592f773591da02d890

 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, HydroCurveType.CurveQH)]
        [Browsable(false)]
        public string CurveQH { get; set; }

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

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


        /// <summary>
        /// 流量
@@ -202,7 +201,7 @@
        [DisplayName("流量")]
        [PropertyOrder(10001)]
        [DisplayUnit("m³/h")]
        [IsHydroCalcuPro(true)]
        [HydroCalcuPro]
        [ShowEditor(false)]
        [Browsable(false)]
        public override double? CalcuFlow { get; set; }
@@ -214,7 +213,7 @@
        [DisplayName("流速")]
        [PropertyOrder(10002)]
        [DisplayUnit("m/s")]
        [IsHydroCalcuPro(true)]
        [HydroCalcuPro]
        [ShowEditor(false)]
        [Browsable(false)]
        public override double? CalcuVelocity { get; set; }
@@ -226,10 +225,36 @@
        [DisplayName("水头损失")]
        [PropertyOrder(10003)]
        [DisplayUnit("m")]
        [IsHydroCalcuPro(true)]
        [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 +264,7 @@
        [DisplayName("流量")]
        [PropertyOrder(11001)]
        [DisplayUnit("m³/h")]
        [IsHydroCalcuPro(true)]
        [HydroCalcuPro]
        [ShowEditor(false)]
        [Browsable(true)]
        public double? CalcuQ { get; set; }
@@ -251,7 +276,7 @@
        [DisplayName("扬程")]
        [PropertyOrder(11002)]
        [DisplayUnit("m")]
        [IsHydroCalcuPro(true)]
        [HydroCalcuPro]
        [ShowEditor(false)]
        [Browsable(true)]
        public double? CalcuH { get; set; }
@@ -263,7 +288,7 @@
        [DisplayName("功率")]
        [PropertyOrder(11003)]
        [DisplayUnit("kW")]
        [IsHydroCalcuPro(true)]
        [HydroCalcuPro]
        [ShowEditor(false)]
        [Browsable(true)]
        public double? CalcuP { get; set; }
@@ -275,7 +300,7 @@
        [DisplayName("效率")]
        [PropertyOrder(11004)]
        [DisplayUnit("%")]
        [IsHydroCalcuPro(true)]
        [HydroCalcuPro]
        [ShowEditor(false)]
        [Browsable(true)]
        public double? CalcuE { get; set; }
@@ -286,6 +311,9 @@
        [Browsable(false)]
        public new Yw.Model.HydroPumpInfo Vmo { get; set; }

        /// <summary>
        /// 
        /// </summary>
        public override void UpdateProperty()
        {
            base.UpdateProperty();
@@ -311,11 +339,36 @@
            this.UpdatePropStatus(nameof(this.CurveQE), this.Vmo, nameof(this.Vmo.CurveQE));
        }

        public override void UpdateVmoProperty()
        {
            base.UpdateVmoProperty();
            this.Vmo.RatedQ = this.RatedQ;
            this.Vmo.UpdatePropStatus(nameof(this.Vmo.RatedQ), this, nameof(this.RatedQ));
            this.Vmo.RatedH = this.RatedH;
            this.Vmo.UpdatePropStatus(nameof(this.Vmo.RatedH), this, nameof(this.RatedH));
            this.Vmo.RatedP = this.RatedP;
            this.Vmo.UpdatePropStatus(nameof(this.Vmo.RatedP), this, nameof(this.RatedP));
            this.Vmo.RatedN = this.RatedN;
            this.Vmo.UpdatePropStatus(nameof(this.Vmo.RatedN), this, nameof(this.RatedN));
            this.Vmo.RatedHz = this.RatedHz;
            this.Vmo.UpdatePropStatus(nameof(this.Vmo.RatedHz), this, nameof(this.RatedHz));
            this.Vmo.SpeedRatio = this.SpeedRatio;
            this.Vmo.UpdatePropStatus(nameof(this.Vmo.SpeedRatio), this, nameof(this.SpeedRatio));
            this.Vmo.SpeedRatioPattern = this.SpeedRatioPattern;
            this.Vmo.UpdatePropStatus(nameof(this.Vmo.SpeedRatioPattern), this, nameof(this.SpeedRatioPattern));
            this.Vmo.CurveQH = this.CurveQH;
            this.Vmo.UpdatePropStatus(nameof(this.Vmo.CurveQH), this, nameof(this.CurveQH));
            this.Vmo.CurveQP = this.CurveQP;
            this.Vmo.UpdatePropStatus(nameof(this.Vmo.CurveQP), this, nameof(this.CurveQP));
            this.Vmo.CurveQE = this.CurveQE;
            this.Vmo.UpdatePropStatus(nameof(this.Vmo.CurveQE), this, nameof(this.CurveQE));
        }


        /// <summary>
        /// 更新计算属性
        /// </summary>
        public override void UpdateCalcuProperty(HydroCalcuResult rhs)
        public override void UpdateCalcuProperty(HydroCalcuVisualResult rhs)
        {
            base.UpdateCalcuProperty(rhs);
            if (rhs is HydroCalcuPumpResult calcuPumpProperty)