From 907a1579fecf2c160852cf99b3ea77c08eb481cc Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期二, 17 十二月 2024 09:44:04 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/00-core/HydroNodeViewModel.cs | 41 +++++++++++++++++++++++++++++++++++------
1 files changed, 35 insertions(+), 6 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 93c2deb..abe7777 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,8 +15,19 @@
/// </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>
/// 鑷敱鍘嬪姏
@@ -25,7 +36,7 @@
[DisplayName("鑷敱鍘嬪姏")]
[Display(Name = "鑷敱鍘嬪姏(m)")]
[DisplayUnit("m")]
- [IsHydroCalcuPro]
+ [HydroCalcuPro]
[PropertyOrder(10001)]
[ShowEditor(false)]
[Browsable(true)]
@@ -38,7 +49,7 @@
[DisplayName("缁濆鍘嬪姏")]
[Display(Name = "缁濆鍘嬪姏(m)")]
[DisplayUnit("m")]
- [IsHydroCalcuPro]
+ [HydroCalcuPro]
[PropertyOrder(10002)]
[ShowEditor(false)]
[Browsable(true)]
@@ -51,23 +62,40 @@
[DisplayName("闇�姘撮噺")]
[Display(Name = "闇�姘撮噺(m鲁/h)")]
[DisplayUnit("m鲁/h")]
- [IsHydroCalcuPro]
+ [HydroCalcuPro]
[PropertyOrder(10003)]
[ShowEditor(false)]
[Browsable(true)]
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)]
- 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)
@@ -75,6 +103,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