From b826e3716742abba49ab2a851b943ea8328db66e Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期二, 24 十二月 2024 11:19:45 +0800
Subject: [PATCH] 水池匹配修改

---
 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/00-core/03-calcu/01-result/SimulationCalcuResultHelper.cs |  105 +++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 75 insertions(+), 30 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 52d3293..0168620 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,74 +10,117 @@
         /// <summary>
         /// 
         /// </summary>
-        public SimulationCalcuResultHelper() { }
+        public SimulationCalcuResultHelper
+            (
+                SimulationWorkingHelper workingHelper
+            )
+        {
+            _workingHelper = workingHelper;
+            workingHelper.InitialEvent += () => Initial();
+            Initial();
+        }
+
+        /// <summary>
+        /// 鍒濆鍖栦簨浠�
+        /// </summary>
+        public event Action InitialEvent;
+
+        private SimulationWorkingHelper _workingHelper = null;//宸ュ喌杈呭姪绫�
+        private Dictionary<string, HydroCalcuVisualResult> _dict;//璁＄畻缁撴灉鍙瀛楀吀
+
+        //鍒濆鍖�
+        private void Initial()
+        {
+            _dict = _workingHelper.CalcuResult?.GetVisualDict();
+            this.InitialEvent?.Invoke();
+        }
+
+        /// <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; }
-            set
-            {
-                _dict = value?.GetVisualDict();
-                _calcuResult = value;
-            }
+            get { return _workingHelper.CalcuResult; }
         }
-        private HydroCalcuResult _calcuResult = null;
-
-        private Dictionary<string, HydroCalcuVisualResult> _dict;//鍙瀛楀吀
 
         /// <summary>
-        /// 鑾峰彇鍙缁撴灉瀛楀吀
+        /// 鑾峰彇鍙瀛楀吀
         /// </summary>
-        public Dictionary<string, HydroCalcuVisualResult> GetVisualResultDict()
+        public Dictionary<string, HydroCalcuVisualResult> GetVisualDict()
         {
             return _dict;
         }
 
         /// <summary>
-        /// 鑾峰彇鍙缁撴灉鍒楄〃
+        /// 鑾峰彇鍙鍒楄〃
         /// </summary>
-        public List<HydroCalcuVisualResult> GetVisualResultList()
+        public List<HydroCalcuVisualResult> GetVisualList()
         {
-            if (CalcuResult == null)
-            {
-                return default;
-            }
             return _dict?.Values.ToList();
         }
 
         /// <summary>
-        /// 鑾峰彇鍙缁撴灉
+        /// 鑾峰彇鍙
         /// </summary>
-        public HydroCalcuVisualResult GetVisualResult(string code)
+        public HydroCalcuVisualResult GetVisual(string code)
         {
             return _dict?.GetValue(code);
         }
 
         /// <summary>
-        /// 鑾峰彇鍙缁撴灉鍒楄〃
+        /// 鑾峰彇鍙鍒楄〃
         /// </summary>
-        public List<HydroCalcuVisualResult> GetVisualResultList(List<string> codes)
+        public List<HydroCalcuVisualResult> GetVisualList(List<string> codes)
         {
-            return codes?.Select(x => GetVisualResult(x)).Where(x => x != null).ToList();
+            return codes?.Select(x => GetVisual(x)).Where(x => x != null).ToList();
         }
 
         /// <summary>
-        /// 鑾峰彇鑺傜偣缁撴灉鍒楄〃
+        /// 鑾峰彇鑺傜偣鍒楄〃
         /// </summary>
-        public List<HydroCalcuNodeResult> GetNodeResultList()
+        public List<HydroCalcuNodeResult> GetNodeList()
         {
-            return CalcuResult?.NodeList?.ToList();
+            return this.CalcuResult?.NodeList?.ToList();
         }
 
         /// <summary>
-        /// 鑾峰彇绠℃缁撴灉鍒楄〃
+        /// 鑾峰彇绠℃鍒楄〃
         /// </summary>
-        public List<HydroCalcuLinkResult> GetLinkResultList()
+        public List<HydroCalcuLinkResult> GetLinkList()
         {
-            return CalcuResult?.LinkList?.ToList();
+            return this.CalcuResult?.LinkList?.ToList();
         }
 
 

--
Gitblit v1.9.3