From 7995765ee80e2772a20db9a7687048e6d5e12950 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期四, 05 十二月 2024 21:58:26 +0800
Subject: [PATCH] 修复阀门类型
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/00-core/03-calcu/01-result/SimulationCalcuResultHelper.cs | 67 ++++++++++++++++++++++++++-------
1 files changed, 52 insertions(+), 15 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/00-core/03-calcu/01-result/SimulationCalcuResultHelper.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/00-core/03-calcu/01-result/SimulationCalcuResultHelper.cs
index 727b387..da2de26 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/00-core/03-calcu/01-result/SimulationCalcuResultHelper.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/00-core/03-calcu/01-result/SimulationCalcuResultHelper.cs
@@ -1,4 +1,6 @@
-锘縩amespace HStation.WinFrmUI
+锘縰sing Yw.Vmo;
+
+namespace HStation.WinFrmUI
{
/// <summary>
/// 璁＄畻缁撴灉杈呭姪绫�
@@ -8,26 +10,61 @@
/// <summary>
///
/// </summary>
- public SimulationCalcuResultHelper() { }
+ public SimulationCalcuResultHelper(SimulationWorkingHelper workingHelper)
+ {
+ _workingHelper = workingHelper;
+ workingHelper.InitialEvent += () => Initial();
+ Initial();
+ }
- private HydroCalcuResult _calcuResult = null;//璁＄畻缁撴灉
+ private SimulationWorkingHelper _workingHelper = null;//宸ュ喌杈呭姪绫�
private Dictionary<string, HydroCalcuVisualResult> _dict;//璁＄畻缁撴灉鍙瀛楀吀
+
+
+ //鍒濆鍖�
+ private void Initial()
+ {
+ _dict = _workingHelper.CalcuResult?.GetVisualDict();
+ }
+
+ /// <summary>
+ /// 鏄惁鍒濆鍖�
+ /// </summary>
+ public bool Initialized
+ {
+ get { return _workingHelper.Initialized; }
+ }
+
+ /// <summary>
+ /// 姘村姏淇℃伅
+ /// </summary>
+ public Yw.Model.HydroModelInfo HydroInfo
+ {
+ get { return _workingHelper.HydroInfo; }
+ }
+
+ /// <summary>
+ /// 宸ュ喌
+ /// </summary>
+ public HydroWorkingVmo Working
+ {
+ get { return _workingHelper.Working; }
+ }
+
+ /// <summary>
+ /// 妫�鏌ョ粨鏋�
+ /// </summary>
+ public HydroCheckResult CheckResult
+ {
+ get { return _workingHelper.CheckResult; }
+ }
/// <summary>
/// 璁＄畻缁撴灉
/// </summary>
public HydroCalcuResult CalcuResult
{
- get { return _calcuResult; }
- }
-
- /// <summary>
- /// 鍒濆鍖栨暟鎹�
- /// </summary>
- public void InitialData(HydroCalcuResult calcuResult)
- {
- _calcuResult = calcuResult;
- _dict = _calcuResult.GetVisualDict();
+ get { return _workingHelper.CalcuResult; }
}
/// <summary>
@@ -67,7 +104,7 @@
/// </summary>
public List<HydroCalcuNodeResult> GetNodeList()
{
- return CalcuResult?.NodeList?.ToList();
+ return this.CalcuResult?.NodeList?.ToList();
}
/// <summary>
@@ -75,7 +112,7 @@
/// </summary>
public List<HydroCalcuLinkResult> GetLinkList()
{
- return CalcuResult?.LinkList?.ToList();
+ return this.CalcuResult?.LinkList?.ToList();
}
--
Gitblit v1.9.3