From b59d9e9a62dd2cea04be784880cf454364003e1e Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期六, 30 十一月 2024 13:43:26 +0800
Subject: [PATCH] 增加计算局部损失和沿程损失
---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/04-link/02-pump/HydroPumpViewModel.cs | 50 ++++++++++++++++++++++++++++++++++++++------------
1 files changed, 38 insertions(+), 12 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 3546593..3d263a5 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
@@ -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)
--
Gitblit v1.9.3