From b2b2686f9c49e9ce7c27fffaf76347b38f03f0aa Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期三, 15 一月 2025 11:34:20 +0800
Subject: [PATCH] 增加水泵改变监测和调整上下游监测
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/01-property/SimulationPropertyCtrl.cs | 33 ++++++++++++++-------------------
1 files changed, 14 insertions(+), 19 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/01-property/SimulationPropertyCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/01-property/SimulationPropertyCtrl.cs
index ac976da..ecb3f89 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/01-property/SimulationPropertyCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/01-property/SimulationPropertyCtrl.cs
@@ -1,8 +1,4 @@
-锘縰sing DevExpress.Utils.MVVM;
-using HStation.WinFrmUI.PhartRelation;
-using HStation.WinFrmUI.Xhs;
-using Yw.Model;
-using Yw.WinFrmUI.HydroW3d;
+锘縰sing Yw.Model;
namespace HStation.WinFrmUI
{
@@ -22,7 +18,6 @@
this.hydroVisualPropertyCtrl1.PropertyValueChangedEvent += HydroVisualPropertyCtrl1_PropertyValueChangedEvent;
this.hydroVisualPropertyCtrl1.MarkPropertyValueChangedEvent += HydroVisualPropertyCtrl1_MarkPropertyValueChangedEvent;
this.hydroVisualPropertyCtrl1.GradingPropertyValueChangedEvent += HydroPVisualPropertyCtrl1_GradingPropertyValueChangedEvent;
- this.hydroVisualPropertyCtrl1.FlowEffectPropertyValueChangedEvent += HydroVisualPropertyCtrl1_FlowEffectPropertyValueChangedEvent;
}
#region 浜嬩欢闆嗗悎
@@ -54,19 +49,21 @@
/// </summary>
public event Action<HydroVisualInfo> GradingPropertyValueChangedEvent;
- /// <summary>
- /// 姘存祦鍔ㄧ敾灞炴�у�兼敼鍙樹簨浠�
- /// </summary>
- public event Action<HydroVisualInfo> FlowEffectPropertyValueChangedEvent;
+ private HydroChangeHelper _changeHelper = null;//鏀瑰彉杈呭姪绫�
+ private HydroPropStatusHelper _propStatusHelper = null;//灞炴�х姸鎬佽緟鍔╃被
#endregion
/// <summary>
/// 鍒濆鍖栨暟鎹�
/// </summary>
- public void InitialData(HydroPropStatusHelper propStatusHelper)
+ public void InitialData
+ (
+ HydroChangeHelper changeHelper,
+ HydroPropStatusHelper propStatusHelper
+ )
{
- this.hydroVisualPropertyCtrl1.InitialData(propStatusHelper);
+ this.hydroVisualPropertyCtrl1.InitialData(changeHelper, propStatusHelper);
}
#region 灞炴�ц祴鍊�
@@ -220,7 +217,7 @@
var dlg = new AssetsThreelinkSingleMatchingDlg();
dlg.ReloadDataEvent += (output) =>
{
- HydroMatchingHelper.Apply(threelinkViewModel, output);
+ HydroMatchingHelper.Apply(threelinkViewModel, output, _changeHelper, _propStatusHelper);
this.hydroVisualPropertyCtrl1.UpdateRows();
this.PropertyValueChangedEvent?.Invoke(vm.Vmo);
this.MarkPropertyValueChangedEvent?.Invoke(vm.Vmo);
@@ -370,6 +367,7 @@
this.MarkPropertyValueChangedEvent?.Invoke(vm.Vmo);
this.GradingPropertyValueChangedEvent?.Invoke(vm.Vmo);
};
+ dlg.SetBindingData(input);
dlg.ShowDialog();
}
break;
@@ -381,7 +379,7 @@
var dlg = new SimulationPumpSingleMatchingDlg();
dlg.ReloadDataEvent += (output) =>
{
- HydroMatchingHelper.Apply(pumpViewModel, output);
+ HydroMatchingHelper.Apply(pumpViewModel, output, _changeHelper, _propStatusHelper);
this.hydroVisualPropertyCtrl1.UpdateRows();
this.PropertyValueChangedEvent?.Invoke(vm.Vmo);
this.MarkPropertyValueChangedEvent?.Invoke(vm.Vmo);
@@ -585,12 +583,9 @@
this.GradingPropertyValueChangedEvent?.Invoke(vm?.Vmo);
}
- //姘存祦鍔ㄧ敾灞炴�у彂鐢熸敼鍙�
- private void HydroVisualPropertyCtrl1_FlowEffectPropertyValueChangedEvent(HydroVisualViewModel vm)
- {
- this.FlowEffectPropertyValueChangedEvent?.Invoke(vm?.Vmo);
- }
#endregion
+
+
}
}
\ No newline at end of file
--
Gitblit v1.9.3