From 3effbd15ec04bbc39514c6904fa71d00631c96eb Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 04 十一月 2024 01:36:42 +0800
Subject: [PATCH] 整合属性研究

---
 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/01-property/XhsProjectSimulationPropertyCtrl.cs |   33 ++++++++++++++++++++-------------
 1 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/01-property/XhsProjectSimulationPropertyCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/01-property/XhsProjectSimulationPropertyCtrl.cs
index 6eee46b..5d8aa94 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/01-property/XhsProjectSimulationPropertyCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/01-property/XhsProjectSimulationPropertyCtrl.cs
@@ -30,12 +30,12 @@
 
         //姘村姏淇℃伅鏂规硶
         private Func<Yw.Model.HydroModelInfo> _hydroInfoFunc = null;
-        private Func<List<IHydroCalcuResult>> _allHydroCalcuResultListFunc = null;
+        private Func<List<HydroCalcuResult>> _allHydroCalcuResultListFunc = null;
 
         /// <summary>
         /// 鍒濆鍖栨暟鎹�
         /// </summary>
-        public void InitialData(Func<Yw.Model.HydroModelInfo> hydroInfoFunc, Func<List<IHydroCalcuResult>> allHydroCalcuResultListFunc)
+        public void InitialData(Func<Yw.Model.HydroModelInfo> hydroInfoFunc, Func<List<HydroCalcuResult>> allHydroCalcuResultListFunc)
         {
             _hydroInfoFunc = hydroInfoFunc;
             _allHydroCalcuResultListFunc = allHydroCalcuResultListFunc;
@@ -55,7 +55,7 @@
             }
             var allParterList = hydroInfo.GetAllParters();
             var parter = allParterList.Find(x => x.ID == id);
-            var vm = Yw.WinFrmUI.HydroParterPropertyViewModelBuilder.CreateViewModel(parter, allParterList);
+            var vm = Yw.WinFrmUI.HydroParterPropertyViewModelBuilder.CreateViewModel(parter, hydroInfo);
             this.hydroParterPropertyCtrl1.SelectedObject = vm;
         }
 
@@ -72,7 +72,7 @@
             }
             var allParterList = hydroInfo.GetAllParters();
             var parter = allParterList.Find(x => x.Code == code);
-            var vm = Yw.WinFrmUI.HydroParterPropertyViewModelBuilder.CreateViewModel(parter, allParterList);
+            var vm = Yw.WinFrmUI.HydroParterPropertyViewModelBuilder.CreateViewModel(parter, hydroInfo);
             this.hydroParterPropertyCtrl1.SelectedObject = vm;
         }
 
@@ -81,14 +81,20 @@
         /// </summary>
         public void SelectParter(Yw.Model.HydroParterInfo parter, List<Yw.Model.HydroParterInfo> allParterList)
         {
-            var vm = Yw.WinFrmUI.HydroParterPropertyViewModelBuilder.CreateViewModel(parter, allParterList);
+            var hydroInfo = _hydroInfoFunc?.Invoke();
+            if (hydroInfo == null)
+            {
+                this.hydroParterPropertyCtrl1.SelectedObject = null;
+                return;
+            }
+            var vm = Yw.WinFrmUI.HydroParterPropertyViewModelBuilder.CreateViewModel(parter, hydroInfo);
             this.hydroParterPropertyCtrl1.SelectedObject = vm;
         }
 
         /// <summary>
         /// 鏇存柊璁＄畻灞炴��
         /// </summary>
-        public void UpdateCalcuProperty(Yw.WinFrmUI.IHydroCalcuResult rhs)
+        public void UpdateCalcuProperty(Yw.WinFrmUI.HydroCalcuResult rhs)
         {
             var vm = this.hydroParterPropertyCtrl1.SelectedObject;
             if (vm == null)
@@ -100,7 +106,7 @@
         }
 
         //閫夋嫨鏇茬嚎
-        private bool HydroParterPropertyCtrl1_SetCurveEvent(HydroParterPropertyViewModel propViewModel, string curveType)
+        private bool HydroParterPropertyCtrl1_SetCurveEvent(HydroParterViewModel propViewModel, string curveType)
         {
             var hydroInfo = _hydroInfoFunc?.Invoke();
             if (hydroInfo == null)
@@ -124,7 +130,8 @@
                             var bol = AssetsMatchingParasHelper.Apply(hydroInfo, output);
                             if (bol)
                             {
-                                propViewModel.UpdateProperty(pumpInfo, hydroInfo.GetAllParters());
+                                propViewModel.Update();
+                                this.hydroParterPropertyCtrl1.UpdateRows();
                             }
                             return bol;
                         };
@@ -157,7 +164,7 @@
         }
 
         //閫夋嫨妯″紡
-        private bool HydroParterPropertyCtrl1_SetPatternEvent(HydroParterPropertyViewModel propViewModel, string patternType)
+        private bool HydroParterPropertyCtrl1_SetPatternEvent(HydroParterViewModel propViewModel, string patternType)
         {
             switch (patternType)
             {
@@ -177,19 +184,19 @@
         }
 
         //灞炴�у彂鐢熸敼鍙�
-        private bool HydroParterPropertyCtrl1_PropertyValueChangedEvent(HydroParterPropertyViewModel obj)
+        private bool HydroParterPropertyCtrl1_PropertyValueChangedEvent(HydroParterViewModel obj)
         {
             return false;
         }
 
         //灞炴�ф鍦ㄥ彂鐢熸敼鍙�
-        private bool HydroParterPropertyCtrl1_PropertyValueChangingEvent(HydroParterPropertyViewModel arg)
+        private bool HydroParterPropertyCtrl1_PropertyValueChangingEvent(HydroParterViewModel arg)
         {
             return false;
         }
 
         //鍖归厤Db
-        private bool HydroParterPropertyCtrl1_MatchingDbEvent(HydroParterPropertyViewModel propertyViewModel)
+        private bool HydroParterPropertyCtrl1_MatchingDbEvent(HydroParterViewModel propertyViewModel)
         {
             var bol = false;
             if (propertyViewModel == null)
@@ -220,7 +227,7 @@
                             bol = AssetsMatchingParasHelper.Apply(hydroInfo, output);
                             if (bol)
                             {
-                                propertyViewModel.UpdateProperty(pumpInfo, hydroInfo.GetAllParters());
+                                propertyViewModel.Update();
                             }
                         };
                         dlg.ShowDialog();

--
Gitblit v1.9.3