From a97513ccbb97b2c471e90b032fabdd2e709b7f32 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期一, 23 十二月 2024 17:28:36 +0800
Subject: [PATCH] 曲线修改
---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/10-working/02-visual/02-tank/SetHydroWorkingTankCtrl.cs | 43 +++++++++++++++++--------------------------
1 files changed, 17 insertions(+), 26 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/10-working/02-visual/02-tank/SetHydroWorkingTankCtrl.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/10-working/02-visual/02-tank/SetHydroWorkingTankCtrl.cs
index f827ac1..108c77d 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/10-working/02-visual/02-tank/SetHydroWorkingTankCtrl.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/10-working/02-visual/02-tank/SetHydroWorkingTankCtrl.cs
@@ -8,47 +8,34 @@
this.layoutControl1.SetupLayoutControl();
}
//200,80
+
/// <summary>
/// 鏌ョ湅缁勪欢浜嬩欢
/// </summary>
public event Action<Yw.Model.HydroVisualInfo> HydroViewEvent;
-
- private Yw.Model.HydroVisualInfo _visual = null;//鏋勪欢
- private HydroWorkingTankViewModel _working = null;//宸ュ喌
+
+ private Yw.Model.HydroTankInfo _visual = null;//缁勪欢
+ private HydroWorkingTankViewModel _working = null; //宸ュ喌
/// <summary>
/// 缁戝畾鏁版嵁
/// </summary>
- public void SetBindingData(Yw.Model.HydroVisualInfo visual)
+ public void SetBindingData(Yw.Model.HydroVisualInfo visual, HydroWorkingVisualViewModel working = null)
{
- var tank = visual as Yw.Model.HydroTankInfo;
- if (tank == null)
- {
- return;
- }
- _visual = tank;
- this.layoutGroupCaption.Text = HydroParterCatalogHelper.GetName(Yw.Hydro.ParterCatalog.Tank);
- if (!string.IsNullOrEmpty(visual.Name))
- {
- this.layoutGroupCaption.Text = visual.Name;
- }
- _working = new HydroWorkingTankViewModel(tank);
- UpdateBindingData(_working);
- }
-
- /// <summary>
- /// 鏇存柊缁戝畾
- /// </summary>
- public void UpdateBindingData(HydroWorkingVisualViewModel workingInfo)
- {
+ _visual = visual as Yw.Model.HydroTankInfo;
if (_visual == null)
{
return;
}
- _working = workingInfo as HydroWorkingTankViewModel;
+ this.layoutGroupCaption.Text = HydroParterCatalogHelper.GetName(Yw.Hydro.ParterCatalog.Tank);
+ if (!string.IsNullOrEmpty(_visual.Name))
+ {
+ this.layoutGroupCaption.Text = _visual.Name;
+ }
+ _working = working as HydroWorkingTankViewModel;
if (_working == null)
{
- return;
+ _working = new HydroWorkingTankViewModel(_visual);
}
this.txtInitLevel.EditValue = _working.InitLevel;
}
@@ -58,6 +45,10 @@
/// </summary>
public HydroWorkingVisualViewModel GetWorking()
{
+ if (_visual == null)
+ {
+ return default;
+ }
if (_working == null)
{
return default;
--
Gitblit v1.9.3