From ce1cc10e518ddac71cfefd433f8a6af9fb46ed40 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期五, 27 九月 2024 12:01:02 +0800
Subject: [PATCH] 更改事件名称
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/01-property/XhsProjectSimulationPropertyCtrl.cs | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 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 510cdb9..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,11 +18,16 @@
this.hydroParterPropertyCtrl1.PropertyValueChangingEvent += HydroParterPropertyCtrl1_PropertyValueChangingEvent;
}
- /// <summary>
- /// 鑾峰彇姘村姏淇℃伅浜嬩欢
- /// </summary>
- public event Func<Yw.Model.HydroModelInfo> GetHydroInfoEvent;
+ //姘村姏淇℃伅鏂规硶
+ private Func<Yw.Model.HydroModelInfo> _hydroInfoFunc = null;
+ /// <summary>
+ /// 缁戝畾鏁版嵁
+ /// </summary>
+ public void SetBindingData(Func<Yw.Model.HydroModelInfo> hydroInfoFunc)
+ {
+ _hydroInfoFunc = hydroInfoFunc;
+ }
/// <summary>
@@ -30,7 +35,7 @@
/// </summary>
public void SelectParter(long id)
{
- var hydroInfo = GetHydroInfoEvent?.Invoke();
+ var hydroInfo = _hydroInfoFunc?.Invoke();
if (hydroInfo == null)
{
this.hydroParterPropertyCtrl1.SelectedObject = null;
@@ -47,7 +52,7 @@
/// </summary>
public void SelectParter(string code)
{
- var hydroInfo = GetHydroInfoEvent?.Invoke();
+ var hydroInfo = _hydroInfoFunc?.Invoke();
if (hydroInfo == null)
{
this.hydroParterPropertyCtrl1.SelectedObject = null;
@@ -62,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);
@@ -87,7 +90,7 @@
//鑾峰彇姘村姏淇℃伅浜嬩欢
private Yw.Model.HydroModelInfo HydroParterPropertyCtrl1_GetHydroInfoEvent()
{
- var hydroInfo = GetHydroInfoEvent?.Invoke();
+ var hydroInfo = _hydroInfoFunc?.Invoke();
return hydroInfo;
}
@@ -98,7 +101,7 @@
{
case Yw.WinFrmUI.HydroCurve.Pump:
{
- var hydroInfo = GetHydroInfoEvent?.Invoke();
+ var hydroInfo = _hydroInfoFunc?.Invoke();
if (hydroInfo == null)
{
return false;
@@ -113,10 +116,9 @@
curveDbId = curveQh?.DbId;
}
var dlg = new PumpMainCurveChoiceDlg();
- dlg.SetBindingData(dbId, modelType);
- dlg.CurveinfoEvent += (dbid, curveid, curveinfo) =>
+ dlg.SetBindingData(dbId, modelType, curveDbId);
+ dlg.SelectCurveInfoEvent += (dbId, curveId, curveInfo) =>
{
-
};
dlg.ShowDialog();
return true;
--
Gitblit v1.9.3