From 4cb1f00f84d160f97afd0fb86cf600e1be667dd5 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期四, 17 十月 2024 11:22:15 +0800
Subject: [PATCH] 水力组件更新
---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-parter/02-node/00-core/HydroNodeViewModel.cs | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-parter/01-junction/HydroNodeViewModel.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-parter/02-node/00-core/HydroNodeViewModel.cs
similarity index 77%
rename from WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-parter/01-junction/HydroNodeViewModel.cs
rename to WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-parter/02-node/00-core/HydroNodeViewModel.cs
index 03d8f53..be45482 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-parter/01-junction/HydroNodeViewModel.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-parter/02-node/00-core/HydroNodeViewModel.cs
@@ -3,12 +3,12 @@
/// <summary>
///
/// </summary>
- public class HydroNodeViewModel : HydroParterViewModel, IHydroCalcuNodeResult
+ public class HydroNodeViewModel : HydroVisualViewModel, IHydroCalcuNodeResult
{
/// <summary>
///
/// </summary>
- public HydroNodeViewModel() { }
+ public HydroNodeViewModel() : base() { }
/// <summary>
///
@@ -24,9 +24,9 @@
/// </summary>
public HydroNodeViewModel(Yw.Model.HydroNodeInfo rhs, Yw.WinFrmUI.HydroCalcuNodeResult calcuResult) : this(rhs)
{
- this.CalcuPress = calcuResult?.CalcuPress;
- this.CalcuHead = calcuResult?.CalcuHead;
- this.CalcuDemand = calcuResult?.CalcuDemand;
+ this.CalcuPress = calcuResult?.CalcuPress ?? Math.Round(calcuResult.CalcuPress.Value, 2);
+ this.CalcuHead = calcuResult?.CalcuHead ?? Math.Round(calcuResult.CalcuHead.Value, 2);
+ this.CalcuDemand = calcuResult?.CalcuDemand ?? Math.Round(calcuResult.CalcuDemand.Value, 1); ;
}
/// <summary>
--
Gitblit v1.9.3