From 60908c00556f4f53d82f5588ae3013f80c443590 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期四, 14 十一月 2024 17:22:58 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/10-working/02-waterbox/SetHydroWaterboxWorkingInfoCtrl.cs | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/10-working/01-waterbox/SetHydroWaterboxWorkingInfoCtrl.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/10-working/02-waterbox/SetHydroWaterboxWorkingInfoCtrl.cs
similarity index 78%
rename from WinFrmUI/Yw.WinFrmUI.Hydro.Core/10-working/01-waterbox/SetHydroWaterboxWorkingInfoCtrl.cs
rename to WinFrmUI/Yw.WinFrmUI.Hydro.Core/10-working/02-waterbox/SetHydroWaterboxWorkingInfoCtrl.cs
index c1bfefe..2d6c15c 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/10-working/01-waterbox/SetHydroWaterboxWorkingInfoCtrl.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/10-working/02-waterbox/SetHydroWaterboxWorkingInfoCtrl.cs
@@ -1,6 +1,6 @@
锘縩amespace Yw.WinFrmUI
{
- public partial class SetHydroWaterboxWorkingInfoCtrl : DevExpress.XtraEditors.XtraUserControl, ISetHydroParterWorkingInfoCtrl
+ public partial class SetHydroWaterboxWorkingInfoCtrl : DevExpress.XtraEditors.XtraUserControl, ISetHydroVisualWorkingInfoCtrl
{
public SetHydroWaterboxWorkingInfoCtrl()
{
@@ -12,22 +12,22 @@
/// <summary>
/// 鏌ョ湅缁勪欢浜嬩欢
/// </summary>
- public event Action<Yw.Model.HydroParterInfo> HydroViewEvent;
+ public event Action<Yw.Model.HydroVisualInfo> HydroViewEvent;
- private Yw.Model.HydroParterInfo _parter = null;//鏋勪欢
+ private Yw.Model.HydroVisualInfo _visual = null;//鏋勪欢
private HydroWaterboxWorkingInfoViewModel _workingInfo = null;//宸ュ喌淇℃伅
/// <summary>
/// 缁戝畾鏁版嵁
/// </summary>
- public void SetBindingData(Yw.Model.HydroParterInfo parter)
+ public void SetBindingData(Yw.Model.HydroVisualInfo parter)
{
var waterbox = parter as Yw.Model.HydroWaterboxInfo;
if (waterbox == null)
{
return;
}
- _parter = waterbox;
+ _visual = waterbox;
this.layoutGroupCaption.Text = HydroParterCatalogHelper.GetName(Yw.Hydro.ParterCatalog.Waterbox);
if (!string.IsNullOrEmpty(parter.Name))
{
@@ -40,9 +40,9 @@
/// <summary>
/// 鏇存柊缁戝畾
/// </summary>
- public void UpdateBindingData(HydroParterWorkingInfoViewModel workingInfo)
+ public void UpdateBindingData(HydroVisualWorkingInfoViewModel workingInfo)
{
- if (_parter == null)
+ if (_visual == null)
{
return;
}
@@ -57,7 +57,7 @@
/// <summary>
/// 鑾峰彇宸ュ喌
/// </summary>
- public HydroParterWorkingInfoViewModel GetWorkingInfo()
+ public HydroVisualWorkingInfoViewModel GetWorkingInfo()
{
if (_workingInfo == null)
{
@@ -71,11 +71,11 @@
//鏌ョ湅缁勪欢
private void layoutGroupCaption_CustomButtonClick(object sender, DevExpress.XtraBars.Docking2010.BaseButtonEventArgs e)
{
- if (_parter == null)
+ if (_visual == null)
{
return;
}
- this.HydroViewEvent?.Invoke(_parter);
+ this.HydroViewEvent?.Invoke(_visual);
}
--
Gitblit v1.9.3