From 0f99d4d12f2eae29bbe343f4b3131f2faeccda5d Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期二, 14 一月 2025 17:31:20 +0800
Subject: [PATCH] 泵曲线修改
---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/04-link/02-pump/HydroPumpViewModel.cs | 177 +++++++++++++++++++++++-----------------------------------
1 files changed, 70 insertions(+), 107 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/04-link/02-pump/HydroPumpViewModel.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/04-link/02-pump/HydroPumpViewModel.cs
index 6cd0249..f7ee205 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/04-link/02-pump/HydroPumpViewModel.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/04-link/02-pump/HydroPumpViewModel.cs
@@ -16,25 +16,17 @@
public HydroPumpViewModel(Yw.Model.HydroPumpInfo rhs, Yw.Model.HydroModelInfo hydroInfo) : base(rhs, hydroInfo)
{
this.RatedP = rhs.RatedP;
- this.UpdatePropStatus(nameof(this.RatedP), rhs, nameof(rhs.RatedP));
this.RatedQ = rhs.RatedQ;
- this.UpdatePropStatus(nameof(this.RatedQ), rhs, nameof(rhs.RatedQ));
this.RatedH = rhs.RatedH;
- this.UpdatePropStatus(nameof(this.RatedH), rhs, nameof(rhs.RatedH));
this.RatedN = rhs.RatedN;
- this.UpdatePropStatus(nameof(this.RatedN), rhs, nameof(rhs.RatedN));
this.RatedHz = rhs.RatedHz;
- this.UpdatePropStatus(nameof(this.RatedHz), rhs, nameof(rhs.RatedHz));
+ this.InletDiameter = rhs.InletDiameter;
+ this.OutletDiameter = rhs.OutletDiameter;
this.SpeedRatio = rhs.SpeedRatio;
- this.UpdatePropStatus(nameof(this.SpeedRatio), rhs, nameof(rhs.SpeedRatio));
this.SpeedRatioPattern = rhs.SpeedRatioPattern;
- this.UpdatePropStatus(nameof(this.SpeedRatioPattern), rhs, nameof(rhs.SpeedRatioPattern));
this.CurveQH = rhs.CurveQH;
- this.UpdatePropStatus(nameof(this.CurveQH), rhs, nameof(rhs.CurveQH));
this.CurveQP = rhs.CurveQP;
- this.UpdatePropStatus(nameof(this.CurveQP), rhs, nameof(rhs.CurveQP));
this.CurveQE = rhs.CurveQE;
- this.UpdatePropStatus(nameof(this.CurveQE), rhs, nameof(rhs.CurveQE));
}
/// <summary>
@@ -43,8 +35,8 @@
[Category("鏁版嵁")]
[DisplayName("姘存车鐘舵��")]
[PropertyOrder(1003)]
- [Browsable(true)]
[TypeConverter(typeof(HydroPumpStatusConverter))]
+ [Browsable(true)]
public override string LinkStatus { get; set; }
/// <summary>
@@ -52,11 +44,11 @@
/// </summary>
[Category("鏁版嵁")]
[Display(Name = "棰濆畾娴侀噺(m鲁/h)")]
- [DisplayName("棰濆畾娴侀噺")]
[DisplayUnit("m鲁/h")]
+ [DisplayName("棰濆畾娴侀噺")]
[PropertyOrder(2001)]
[Browsable(true)]
- public double? RatedQ { get; set; }
+ public double RatedQ { get; set; }
/// <summary>
/// 棰濆畾鎵▼
@@ -67,7 +59,7 @@
[DisplayUnit("m")]
[PropertyOrder(2002)]
[Browsable(true)]
- public double? RatedH { get; set; }
+ public double RatedH { get; set; }
/// <summary>
/// 棰濆畾鍔熺巼
@@ -89,7 +81,7 @@
[DisplayUnit("r/min")]
[PropertyOrder(2004)]
[Browsable(true)]
- public double? RatedN { get; set; }
+ public double RatedN { get; set; }
/// <summary>
/// 棰濆畾棰戠巼
@@ -101,6 +93,28 @@
[PropertyOrder(2005)]
[Browsable(true)]
public double RatedHz { get; set; }
+
+ /// <summary>
+ /// 杩涘彛鍙ｅ緞
+ /// </summary>
+ [Category("鏁版嵁")]
+ [Display(Name = "杩涘彛鍙ｅ緞(mm)")]
+ [DisplayName("杩涘彛鍙ｅ緞")]
+ [DisplayUnit("mm")]
+ [PropertyOrder(2006)]
+ [Browsable(true)]
+ public double? InletDiameter { get; set; }
+
+ /// <summary>
+ /// 鍑哄彛鍙ｅ緞
+ /// </summary>
+ [Category("鏁版嵁")]
+ [Display(Name = "鍑哄彛鍙ｅ緞(mm)")]
+ [DisplayName("鍑哄彛鍙ｅ緞")]
+ [DisplayUnit("mm")]
+ [PropertyOrder(2007)]
+ [Browsable(true)]
+ public double? OutletDiameter { get; set; }
/// <summary>
/// 璁惧畾棰戠巼
@@ -168,8 +182,8 @@
[Category("鏁版嵁")]
[DisplayName("娴侀噺鎵▼鏇茬嚎")]
[PropertyOrder(2010)]
- [HydroCurvePro(HydroCurve.PumpQH, HydroCurveType.CurveQH)]
- [Browsable(false)]
+ [HydroCurvePro(HydroCurve.Pump, HydroCurveType.CurveQH)]
+ [Browsable(true)]
public string CurveQH { get; set; }
/// <summary>
@@ -178,8 +192,8 @@
[Category("鏁版嵁")]
[DisplayName("娴侀噺鍔熺巼鏇茬嚎")]
[PropertyOrder(2011)]
- [HydroCurvePro(HydroCurve.PumpQP, HydroCurveType.CurveQP)]
- [Browsable(false)]
+ [HydroCurvePro(HydroCurve.Pump, HydroCurveType.CurveQP)]
+ [Browsable(true)]
public string CurveQP { get; set; }
/// <summary>
@@ -188,8 +202,8 @@
[Category("鏁版嵁")]
[DisplayName("娴侀噺鏁堢巼鏇茬嚎")]
[PropertyOrder(2012)]
- [HydroCurvePro(HydroCurve.PumpQE, HydroCurveType.CurveQE)]
- [Browsable(false)]
+ [HydroCurvePro(HydroCurve.Pump, HydroCurveType.CurveQE)]
+ [Browsable(true)]
public string CurveQE { get; set; }
/// <summary>
@@ -197,83 +211,48 @@
/// </summary>
[Category("璁＄畻缁撴灉")]
[DisplayName("娴侀噺")]
- [PropertyOrder(10001)]
[DisplayUnit("m鲁/h")]
- [HydroCalcuPro]
- [ShowEditor(false)]
- [Browsable(false)]
- public override double? CalcuFlow { get; set; }
-
- /// <summary>
- /// 娴侀��
- /// </summary>
- [Category("璁＄畻缁撴灉")]
- [DisplayName("娴侀��")]
- [PropertyOrder(10002)]
- [DisplayUnit("m/s")]
- [HydroCalcuPro]
- [ShowEditor(false)]
- [Browsable(false)]
- public override double? CalcuVelocity { get; set; }
-
- /// <summary>
- /// 姘村ご鎹熷け
- /// </summary>
- [Category("璁＄畻缁撴灉")]
- [DisplayName("姘村ご鎹熷け")]
- [PropertyOrder(10003)]
- [DisplayUnit("m")]
- [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>
- /// 娴侀噺
- /// </summary>
- [Category("璁＄畻缁撴灉")]
- [DisplayName("娴侀噺")]
+ [Display(Name = "娴侀噺(m鲁/h)")]
[PropertyOrder(11001)]
- [DisplayUnit("m鲁/h")]
[HydroCalcuPro]
[ShowEditor(false)]
[Browsable(true)]
public double? CalcuQ { get; set; }
/// <summary>
+ /// 杩涘彛鍘嬪姏
+ /// </summary>
+ [Category("璁＄畻缁撴灉")]
+ [DisplayName("杩涘彛鍘嬪姏")]
+ [DisplayUnit("m")]
+ [Display(Name = "杩涘彛鍘嬪姏(m)")]
+ [PropertyOrder(11002)]
+ [HydroCalcuPro]
+ [ShowEditor(false)]
+ [Browsable(true)]
+ public virtual double? CalcuPr1 { get; set; }
+
+ /// <summary>
+ /// 鍑哄彛鍘嬪姏
+ /// </summary>
+ [Category("璁＄畻缁撴灉")]
+ [DisplayName("鍑哄彛鍘嬪姏")]
+ [DisplayUnit("m")]
+ [Display(Name = "鍑哄彛鍘嬪姏(m)")]
+ [PropertyOrder(11003)]
+ [HydroCalcuPro]
+ [ShowEditor(false)]
+ [Browsable(true)]
+ public virtual double? CalcuPr2 { get; set; }
+
+ /// <summary>
/// 鎵▼
/// </summary>
[Category("璁＄畻缁撴灉")]
[DisplayName("鎵▼")]
- [PropertyOrder(11002)]
[DisplayUnit("m")]
+ [Display(Name = "鎵▼(m)")]
+ [PropertyOrder(11004)]
[HydroCalcuPro]
[ShowEditor(false)]
[Browsable(true)]
@@ -284,8 +263,9 @@
/// </summary>
[Category("璁＄畻缁撴灉")]
[DisplayName("鍔熺巼")]
- [PropertyOrder(11003)]
[DisplayUnit("kW")]
+ [Display(Name = "鍔熺巼(kW)")]
+ [PropertyOrder(11005)]
[HydroCalcuPro]
[ShowEditor(false)]
[Browsable(true)]
@@ -296,8 +276,9 @@
/// </summary>
[Category("璁＄畻缁撴灉")]
[DisplayName("鏁堢巼")]
- [PropertyOrder(11004)]
[DisplayUnit("%")]
+ [Display(Name = "鏁堢巼(%)")]
+ [PropertyOrder(11006)]
[HydroCalcuPro]
[ShowEditor(false)]
[Browsable(true)]
@@ -320,50 +301,30 @@
{
base.UpdateProperty();
this.RatedP = this.Vmo.RatedP;
- this.UpdatePropStatus(nameof(this.RatedP), this.Vmo, nameof(this.Vmo.RatedP));
this.RatedQ = this.Vmo.RatedQ;
- this.UpdatePropStatus(nameof(this.RatedQ), this.Vmo, nameof(this.Vmo.RatedQ));
this.RatedH = this.Vmo.RatedH;
- this.UpdatePropStatus(nameof(this.RatedH), this.Vmo, nameof(this.Vmo.RatedH));
this.RatedN = this.Vmo.RatedN;
- this.UpdatePropStatus(nameof(this.RatedN), this.Vmo, nameof(this.Vmo.RatedN));
this.RatedHz = this.Vmo.RatedHz;
- this.UpdatePropStatus(nameof(this.RatedHz), this.Vmo, nameof(this.Vmo.RatedHz));
this.SpeedRatio = this.Vmo.SpeedRatio;
- this.UpdatePropStatus(nameof(this.SpeedRatio), this.Vmo, nameof(this.Vmo.SpeedRatio));
this.SpeedRatioPattern = this.Vmo.SpeedRatioPattern;
- this.UpdatePropStatus(nameof(this.SpeedRatioPattern), this.Vmo, nameof(this.Vmo.SpeedRatioPattern));
this.CurveQH = this.Vmo.CurveQH;
- this.UpdatePropStatus(nameof(this.CurveQH), this.Vmo, nameof(this.Vmo.CurveQH));
this.CurveQP = this.Vmo.CurveQP;
- this.UpdatePropStatus(nameof(this.CurveQP), this.Vmo, nameof(this.Vmo.CurveQP));
this.CurveQE = this.Vmo.CurveQE;
- 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));
}
@@ -376,6 +337,8 @@
if (rhs is HydroCalcuPumpResult calcuPumpProperty)
{
this.CalcuQ = calcuPumpProperty.CalcuQ.HasValue ? Math.Round(calcuPumpProperty.CalcuQ.Value, 1) : null;
+ this.CalcuPr1 = calcuPumpProperty.CalcuPr1.HasValue ? Math.Round(calcuPumpProperty.CalcuPr1.Value, 2) : null;
+ this.CalcuPr2 = calcuPumpProperty.CalcuPr2.HasValue ? Math.Round(calcuPumpProperty.CalcuPr2.Value, 2) : null;
this.CalcuH = calcuPumpProperty.CalcuH.HasValue ? Math.Round(calcuPumpProperty.CalcuH.Value, 2) : null;
this.CalcuP = calcuPumpProperty.CalcuP.HasValue ? Math.Round(calcuPumpProperty.CalcuP.Value, 1) : null;
this.CalcuE = calcuPumpProperty.CalcuE.HasValue ? Math.Round(calcuPumpProperty.CalcuE.Value, 1) : null;
--
Gitblit v1.9.3