From d06e2aa43a5c791058a75aa83ef17f936e2f5c0d Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期五, 27 九月 2024 09:20:53 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/01-property/XhsProjectSimulationPropertyCtrl.cs | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/01-property/XhsProjectSimulationPropertyCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/01-property/XhsProjectSimulationPropertyCtrl.cs
index 535af31..1bbbfa5 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/01-property/XhsProjectSimulationPropertyCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/01-property/XhsProjectSimulationPropertyCtrl.cs
@@ -18,17 +18,24 @@
this.hydroParterPropertyCtrl1.PropertyValueChangingEvent += HydroParterPropertyCtrl1_PropertyValueChangingEvent;
}
+ //姘村姏淇℃伅鏂规硶
+ private Func<Yw.Model.HydroModelInfo> _hydroInfoFunc = null;
+
/// <summary>
- /// 鑾峰彇姘村姏淇℃伅浜嬩欢
+ /// 缁戝畾鏁版嵁
/// </summary>
- public event Func<Yw.Model.HydroModelInfo> GetHydroInfoEvent;
+ public void SetBindingData(Func<Yw.Model.HydroModelInfo> hydroInfoFunc)
+ {
+ _hydroInfoFunc = hydroInfoFunc;
+ }
+
/// <summary>
/// 閫夋嫨缁勪欢
/// </summary>
public void SelectParter(long id)
{
- var hydroInfo = GetHydroInfoEvent?.Invoke();
+ var hydroInfo = _hydroInfoFunc?.Invoke();
if (hydroInfo == null)
{
this.hydroParterPropertyCtrl1.SelectedObject = null;
@@ -45,7 +52,7 @@
/// </summary>
public void SelectParter(string code)
{
- var hydroInfo = GetHydroInfoEvent?.Invoke();
+ var hydroInfo = _hydroInfoFunc?.Invoke();
if (hydroInfo == null)
{
this.hydroParterPropertyCtrl1.SelectedObject = null;
@@ -60,8 +67,6 @@
/// <summary>
/// 閫夋嫨缁勪欢
/// </summary>
- /// <param name="parter"></param>
- /// <param name="allParterList"></param>
public void SelectParter(Yw.Model.HydroParterInfo parter, List<Yw.Model.HydroParterInfo> allParterList)
{
var vm = Yw.WinFrmUI.HydroParterPropertyViewModelBuilder.CreateViewModel(parter, allParterList);
@@ -85,7 +90,7 @@
//鑾峰彇姘村姏淇℃伅浜嬩欢
private Yw.Model.HydroModelInfo HydroParterPropertyCtrl1_GetHydroInfoEvent()
{
- var hydroInfo = GetHydroInfoEvent?.Invoke();
+ var hydroInfo = _hydroInfoFunc?.Invoke();
return hydroInfo;
}
@@ -96,7 +101,7 @@
{
case Yw.WinFrmUI.HydroCurve.Pump:
{
- var hydroInfo = GetHydroInfoEvent?.Invoke();
+ var hydroInfo = _hydroInfoFunc?.Invoke();
if (hydroInfo == null)
{
return false;
@@ -174,5 +179,6 @@
{
return false;
}
+
}
}
\ No newline at end of file
--
Gitblit v1.9.3