From 278e94cb1b045288d1205f36b67f60cb5224754c Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期三, 06 十一月 2024 11:50:19 +0800
Subject: [PATCH] 属性调整
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/01-property/XhsProjectSimulationPropertyCtrl.cs | 34 +++++++++++++++++++++++-----------
1 files changed, 23 insertions(+), 11 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 9899f2e..be19733 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
@@ -13,12 +13,14 @@
InitializeComponent();
this.hydroParterPropertyCtrl1.PropertyValueChangedEvent += HydroParterPropertyCtrl1_PropertyValueChangedEvent;
- this.hydroParterPropertyCtrl1.PropertyValueChangingEvent += HydroParterPropertyCtrl1_PropertyValueChangingEvent;
this.hydroParterPropertyCtrl1.MatchingDbEvent += HydroParterPropertyCtrl1_MatchingDbEvent;
this.hydroParterPropertyCtrl1.SetCurveEvent += HydroParterPropertyCtrl1_SetCurveEvent;
this.hydroParterPropertyCtrl1.SetPatternEvent += HydroParterPropertyCtrl1_SetPatternEvent;
this.hydroParterPropertyCtrl1.BlinkLinkParterEvent += HydroParterPropertyCtrl1_BlinkLinkParterEvent;
+ this.hydroParterPropertyCtrl1.ViewParterEvent += HydroParterPropertyCtrl1_ViewParterEvent;
}
+
+
/// <summary>
@@ -31,7 +33,12 @@
/// <summary>
/// 灞炴�у�兼敼鍙樹簨浠�
/// </summary>
- public event Func<Yw.Model.HydroParterInfo, bool> PropertyValueChangedEvent;
+ public event Action<Yw.Model.HydroParterInfo> PropertyValueChangedEvent;
+
+ /// <summary>
+ /// 鏌ョ湅鏋勪欢浜嬩欢
+ /// </summary>
+ public event Action<Yw.Model.HydroParterInfo> ViewParterEvent;
//姘村姏淇℃伅鏂规硶
private Func<Yw.Model.HydroModelInfo> _hydroInfoFunc = null;
@@ -44,7 +51,6 @@
{
_hydroInfoFunc = hydroInfoFunc;
_allHydroCalcuResultListFunc = allHydroCalcuResultListFunc;
- this.hydroParterPropertyCtrl1.InitialData(hydroInfoFunc);
}
//鑾峰彇姘村姏淇℃伅
@@ -225,17 +231,13 @@
}
//灞炴�у彂鐢熸敼鍙�
- private bool HydroParterPropertyCtrl1_PropertyValueChangedEvent(HydroParterViewModel parterViewModel)
+ private void HydroParterPropertyCtrl1_PropertyValueChangedEvent(HydroParterViewModel vm)
{
- if (parterViewModel == null)
+ if (vm == null)
{
- return false;
+ return;
}
- if (this.PropertyValueChangedEvent == null)
- {
- return false;
- }
- return this.PropertyValueChangedEvent.Invoke(parterViewModel.Vmo);
+ this.PropertyValueChangedEvent?.Invoke(vm.Vmo);
}
//灞炴�ф鍦ㄥ彂鐢熸敼鍙�
@@ -347,6 +349,16 @@
this.BlinkLinkParterEvent?.Invoke(code, linkCode);
}
+ //鏌ョ湅鏋勪欢
+ private void HydroParterPropertyCtrl1_ViewParterEvent(HydroParterViewModel vm)
+ {
+ if (vm == null)
+ {
+ return;
+ }
+ this.ViewParterEvent?.Invoke(vm.Vmo);
+ }
+
}
}
\ No newline at end of file
--
Gitblit v1.9.3