From 80ec78f9c85466b09ac4a4101d5073c26f37021e Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 06 一月 2025 09:14:32 +0800
Subject: [PATCH] 水力计算bug修复
---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/00-core/HydroNodeViewModel.cs | 44 ++++++++++++++++++++++++++------------------
1 files changed, 26 insertions(+), 18 deletions(-)
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 1e37ee0..6c851f3 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
@@ -15,19 +15,9 @@
/// </summary>
public HydroNodeViewModel(Yw.Model.HydroNodeInfo rhs, Yw.Model.HydroModelInfo hydroInfo) : base(rhs, hydroInfo)
{
- this.Vmo = rhs;
+
}
- /// <summary>
- /// X娴佸悜
- /// </summary>
- [Category("鎷撴墤缁撴瀯")]
- [DisplayName("X娴佸悜")]
- [HydroFlowDirectionPro]
- [PropertyOrder(101)]
- [Browsable(false)]
- [TypeConverter(typeof(HydroFlowDirectionConverter))]
- public override string FlowDirectionX { get; set; }
/// <summary>
/// 鑷敱鍘嬪姏
@@ -39,7 +29,7 @@
[HydroCalcuPro]
[PropertyOrder(10001)]
[ShowEditor(false)]
- [Browsable(true)]
+ [Browsable(false)]
public virtual double? CalcuPress { get; set; }
/// <summary>
@@ -47,12 +37,12 @@
/// </summary>
[Category("璁＄畻缁撴灉")]
[DisplayName("缁濆鍘嬪姏")]
- [Display(Name = "缁濆鍘嬪姏(m)")]
[DisplayUnit("m")]
+ [Display(Name = "缁濆鍘嬪姏(m)")]
[HydroCalcuPro]
[PropertyOrder(10002)]
[ShowEditor(false)]
- [Browsable(true)]
+ [Browsable(false)]
public virtual double? CalcuHead { get; set; }
/// <summary>
@@ -60,25 +50,42 @@
/// </summary>
[Category("璁＄畻缁撴灉")]
[DisplayName("闇�姘撮噺")]
- [Display(Name = "闇�姘撮噺(m鲁/h)")]
[DisplayUnit("m鲁/h")]
+ [Display(Name = "闇�姘撮噺(m鲁/h)")]
[HydroCalcuPro]
[PropertyOrder(10003)]
[ShowEditor(false)]
- [Browsable(true)]
+ [Browsable(false)]
public virtual double? CalcuDemand { get; set; }
+
+ /// <summary>
+ /// 灞�閮ㄦ崯澶�
+ /// </summary>
+ [Category("璁＄畻缁撴灉")]
+ [DisplayName("灞�閮ㄦ崯澶�")]
+ [DisplayUnit("m")]
+ [Display(Name = "灞�閮ㄦ崯澶�(m)")]
+ [HydroCalcuPro]
+ [PropertyOrder(19001)]
+ [ShowEditor(false)]
+ [Browsable(false)]
+ public virtual double? CalcuMinorLoss { get; set; }
/// <summary>
///
/// </summary>
[Browsable(false)]
- public new Yw.Model.HydroNodeInfo Vmo { get; set; }
+ public new Yw.Model.HydroNodeInfo Vmo
+ {
+ get { return _vmo as Yw.Model.HydroNodeInfo; }
+ set { _vmo = value; }
+ }
/// <summary>
/// 鏇存柊璁＄畻灞炴��
/// </summary>
- public override void UpdateCalcuProperty(HydroCalcuResult rhs)
+ public override void UpdateCalcuProperty(HydroCalcuVisualResult rhs)
{
base.UpdateCalcuProperty(rhs);
if (rhs is HydroCalcuNodeResult calcuNodeProperty)
@@ -86,6 +93,7 @@
this.CalcuPress = calcuNodeProperty.CalcuPress.HasValue ? Math.Round(calcuNodeProperty.CalcuPress.Value, 2) : null;
this.CalcuHead = calcuNodeProperty.CalcuHead.HasValue ? Math.Round(calcuNodeProperty.CalcuHead.Value, 2) : null;
this.CalcuDemand = calcuNodeProperty.CalcuDemand.HasValue ? Math.Round(calcuNodeProperty.CalcuDemand.Value, 1) : null;
+ this.CalcuMinorLoss = calcuNodeProperty.CalcuMinorLoss.HasValue ? Math.Round(calcuNodeProperty.CalcuMinorLoss.Value, 4) : null;
}
}
--
Gitblit v1.9.3