From 7507591ef45cfa8f1080f6dbf68b411edcc7f086 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期日, 03 十一月 2024 15:42:56 +0800
Subject: [PATCH] 水力存储优化
---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-parter/02-node/00-core/HydroNodeViewModel.cs | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-parter/02-node/00-core/HydroNodeViewModel.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-parter/02-node/00-core/HydroNodeViewModel.cs
index be45482..8ff3a8d 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-parter/02-node/00-core/HydroNodeViewModel.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-parter/02-node/00-core/HydroNodeViewModel.cs
@@ -15,7 +15,6 @@
/// </summary>
public HydroNodeViewModel(Yw.Model.HydroNodeInfo rhs) : base(rhs)
{
- this.Quality = rhs.Quality;
this.Vmo = rhs;
}
@@ -24,9 +23,12 @@
/// </summary>
public HydroNodeViewModel(Yw.Model.HydroNodeInfo rhs, Yw.WinFrmUI.HydroCalcuNodeResult calcuResult) : this(rhs)
{
- 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); ;
+ if (calcuResult != null)
+ {
+ this.CalcuPress = calcuResult.CalcuPress.HasValue ? Math.Round(calcuResult.CalcuPress.Value, 2) : null;
+ this.CalcuHead = calcuResult.CalcuHead.HasValue ? Math.Round(calcuResult.CalcuHead.Value, 2) : null;
+ this.CalcuDemand = calcuResult.CalcuDemand.HasValue ? Math.Round(calcuResult.CalcuDemand.Value, 1) : null;
+ }
}
/// <summary>
@@ -60,5 +62,17 @@
[Browsable(false)]
public new Yw.Model.HydroNodeInfo Vmo { get; set; }
+ /// <summary>
+ ///
+ /// </summary>
+ public override void Update()
+ {
+ base.Update();
+ if (this.Vmo == null)
+ {
+ return;
+ }
+ }
+
}
}
--
Gitblit v1.9.3