From ff39bbf7e3a3d02f7f051ce1bee06cec007be3ff Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期六, 30 十一月 2024 13:15:26 +0800
Subject: [PATCH] epa 计算节点局部损失字段修改
---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-calcu/04-link/00-core/HydroCalcuLinkResult.cs | 20 +++++++++
WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-calcu/04-link/00-core/IHydroCalcuLinkResult.cs | 10 +++++
Hydro/Yw.EPAnet.Calcu.Core/03-calcu/02-node/ICalcuNode.cs | 2
WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-calcu/03-node/00-core/HydroCalcuNodeResult.cs | 8 +++
WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-calcu/03-node/00-core/IHydroCalcuNodeResult.cs | 5 ++
Hydro/Yw.EPAnet.Calcu.Core/03-calcu/02-node/CalcuNode.cs | 4 +-
WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/00-core/HydroNodeViewModel.cs | 13 ++++++
7 files changed, 57 insertions(+), 5 deletions(-)
diff --git a/Hydro/Yw.EPAnet.Calcu.Core/03-calcu/02-node/CalcuNode.cs b/Hydro/Yw.EPAnet.Calcu.Core/03-calcu/02-node/CalcuNode.cs
index ebf7f4d..75e8b7b 100644
--- a/Hydro/Yw.EPAnet.Calcu.Core/03-calcu/02-node/CalcuNode.cs
+++ b/Hydro/Yw.EPAnet.Calcu.Core/03-calcu/02-node/CalcuNode.cs
@@ -18,7 +18,7 @@
this.Press = rhs.Press;
this.Head = rhs.Head;
this.Demand = rhs.Demand;
- this.Minorloss = rhs.Minorloss;
+ this.MinorLoss = rhs.MinorLoss;
}
/// <summary>
@@ -40,6 +40,6 @@
/// 灞�閮ㄦ按澶存崯澶憋紙鍗曚綅m锛�
/// 鍙湁寮ご鏈夎鍊�
/// </summary>
- public double Minorloss { get; set; }
+ public double MinorLoss { get; set; }
}
}
diff --git a/Hydro/Yw.EPAnet.Calcu.Core/03-calcu/02-node/ICalcuNode.cs b/Hydro/Yw.EPAnet.Calcu.Core/03-calcu/02-node/ICalcuNode.cs
index c09513a..6ea9be7 100644
--- a/Hydro/Yw.EPAnet.Calcu.Core/03-calcu/02-node/ICalcuNode.cs
+++ b/Hydro/Yw.EPAnet.Calcu.Core/03-calcu/02-node/ICalcuNode.cs
@@ -24,6 +24,6 @@
/// 灞�閮ㄦ按澶存崯澶憋紙鍗曚綅m锛�
/// 鍙湁寮ご鏈夎鍊�
/// </summary>
- double Minorloss { get; set; }
+ double MinorLoss { get; set; }
}
}
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-calcu/03-node/00-core/HydroCalcuNodeResult.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-calcu/03-node/00-core/HydroCalcuNodeResult.cs
index 463d8e1..28862a8 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-calcu/03-node/00-core/HydroCalcuNodeResult.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-calcu/03-node/00-core/HydroCalcuNodeResult.cs
@@ -28,6 +28,7 @@
this.CalcuPress = rhs.CalcuPress;
this.CalcuHead = rhs.CalcuHead;
this.CalcuDemand = rhs.CalcuDemand;
+ this.CalcuMinorLoss = rhs.CalcuMinorLoss;
}
/// <summary>
@@ -38,6 +39,7 @@
this.CalcuPress = rhs.CalcuPress;
this.CalcuHead = rhs.CalcuHead;
this.CalcuDemand = rhs.CalcuDemand;
+ this.CalcuMinorLoss = rhs.CalcuMinorLoss;
}
/// <summary>
@@ -48,6 +50,7 @@
this.CalcuPress = rhs.Press;
this.CalcuHead = rhs.Head;
this.CalcuDemand = rhs.Demand;
+ this.CalcuMinorLoss = rhs.MinorLoss;
}
/// <summary>
@@ -65,6 +68,9 @@
/// </summary>
public double? CalcuDemand { get; set; }
-
+ /// <summary>
+ /// 灞�閮ㄦ崯澶憋紙m锛�
+ /// </summary>
+ public double? CalcuMinorLoss { get; set; }
}
}
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-calcu/03-node/00-core/IHydroCalcuNodeResult.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-calcu/03-node/00-core/IHydroCalcuNodeResult.cs
index 06b7cfd..dd4ae6d 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-calcu/03-node/00-core/IHydroCalcuNodeResult.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-calcu/03-node/00-core/IHydroCalcuNodeResult.cs
@@ -19,6 +19,11 @@
/// 闇�姘撮噺锛坢鲁/h锛�
/// </summary>
double? CalcuDemand { get; set; }
+
+ /// <summary>
+ /// 灞�閮ㄦ崯澶憋紙m锛�
+ /// </summary>
+ double? CalcuMinorLoss { get; set; }
}
}
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-calcu/04-link/00-core/HydroCalcuLinkResult.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-calcu/04-link/00-core/HydroCalcuLinkResult.cs
index 30947cf..ec6877b 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-calcu/04-link/00-core/HydroCalcuLinkResult.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-calcu/04-link/00-core/HydroCalcuLinkResult.cs
@@ -1,4 +1,6 @@
-锘縩amespace Yw.WinFrmUI
+锘縰sing SqlSugar;
+
+namespace Yw.WinFrmUI
{
/// <summary>
/// 姘村姏璁＄畻绠℃灞炴��
@@ -28,6 +30,8 @@
this.CalcuFlow = rhs.Flow;
this.CalcuVelocity = rhs.Velocity;
this.CalcuHeadLoss = rhs.Headloss;
+ this.CalcuMinorLoss = rhs.MinorLoss;
+ this.CalcuFrictionLoss = rhs.FrictionLoss;
}
/// <summary>
@@ -38,6 +42,8 @@
this.CalcuFlow = rhs.CalcuFlow;
this.CalcuVelocity = rhs.CalcuVelocity;
this.CalcuHeadLoss = rhs.CalcuHeadLoss;
+ this.CalcuMinorLoss = rhs.CalcuMinorLoss;
+ this.CalcuFrictionLoss = rhs.CalcuFrictionLoss;
}
/// <summary>
@@ -48,6 +54,8 @@
this.CalcuFlow = rhs.CalcuFlow;
this.CalcuVelocity = rhs.CalcuVelocity;
this.CalcuHeadLoss = rhs.CalcuHeadLoss;
+ this.CalcuMinorLoss = rhs.CalcuMinorLoss;
+ this.CalcuFrictionLoss = rhs.CalcuFrictionLoss;
}
/// <summary>
@@ -64,5 +72,15 @@
/// 姘村ご鎹熷け锛坢锛�
/// </summary>
public double? CalcuHeadLoss { get; set; }
+
+ /// <summary>
+ /// 灞�閮ㄦ崯澶憋紙m锛�
+ /// </summary>
+ public double? CalcuMinorLoss { get; set; }
+
+ /// <summary>
+ /// 娌跨▼鎹熷け锛坢锛�
+ /// </summary>
+ public double? CalcuFrictionLoss { get; set; }
}
}
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-calcu/04-link/00-core/IHydroCalcuLinkResult.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-calcu/04-link/00-core/IHydroCalcuLinkResult.cs
index 957637d..1d6ed52 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-calcu/04-link/00-core/IHydroCalcuLinkResult.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-calcu/04-link/00-core/IHydroCalcuLinkResult.cs
@@ -19,5 +19,15 @@
/// 姘村ご鎹熷け锛坢锛�
/// </summary>
double? CalcuHeadLoss { get; set; }
+
+ /// <summary>
+ /// 灞�閮ㄦ崯澶憋紙m锛�
+ /// </summary>
+ double? CalcuMinorLoss { get; set; }
+
+ /// <summary>
+ /// 娌跨▼鎹熷け锛坢锛�
+ /// </summary>
+ double? CalcuFrictionLoss { get; set; }
}
}
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/00-core/HydroNodeViewModel.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/00-core/HydroNodeViewModel.cs
index 8c8c641..0c79651 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/00-core/HydroNodeViewModel.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/00-core/HydroNodeViewModel.cs
@@ -69,6 +69,19 @@
public virtual double? CalcuDemand { get; set; }
/// <summary>
+ /// 灞�閮ㄦ崯澶�
+ /// </summary>
+ [Category("璁＄畻缁撴灉")]
+ [DisplayName("灞�閮ㄦ崯澶�")]
+ [Display(Name = "灞�閮ㄦ崯澶�(m)")]
+ [DisplayUnit("m")]
+ [HydroCalcuPro]
+ [PropertyOrder(10004)]
+ [ShowEditor(false)]
+ [Browsable(true)]
+ public virtual double? CalcuMinorLoss { get; set; }
+
+ /// <summary>
///
/// </summary>
[Browsable(false)]
--
Gitblit v1.9.3