From f373ad1f566c9c8679547f4205d86eb6e0836d59 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 06 一月 2025 17:22:13 +0800
Subject: [PATCH] 修改保存逻辑
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/01-property/SimulationPropertyCtrl.cs | 53 ++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 40 insertions(+), 13 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 6a6dcb2..11c72dc 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
@@ -22,10 +22,10 @@
this.hydroVisualPropertyCtrl1.PropertyValueChangedEvent += HydroVisualPropertyCtrl1_PropertyValueChangedEvent;
this.hydroVisualPropertyCtrl1.MarkPropertyValueChangedEvent += HydroVisualPropertyCtrl1_MarkPropertyValueChangedEvent;
this.hydroVisualPropertyCtrl1.GradingPropertyValueChangedEvent += HydroPVisualPropertyCtrl1_GradingPropertyValueChangedEvent;
- this.hydroVisualPropertyCtrl1.FlowEffectPropertyValueChangedEvent += HydroVisualPropertyCtrl1_FlowEffectPropertyValueChangedEvent;
+ this.hydroVisualPropertyCtrl1.ParterChangedEvent += HydroVisualPropertyCtrl1_ParterChangedEvent;
}
- #region 浜嬩欢闆�
+ #region 浜嬩欢闆嗗悎
/// <summary>
/// 鏋勪欢鏌ョ湅浜嬩欢
@@ -55,11 +55,19 @@
public event Action<HydroVisualInfo> GradingPropertyValueChangedEvent;
/// <summary>
- /// 姘存祦鍔ㄧ敾灞炴�у�兼敼鍙樹簨浠�
+ /// 鏋勪欢鏀瑰彉浜嬩欢
/// </summary>
- public event Action<HydroVisualInfo> FlowEffectPropertyValueChangedEvent;
+ public event Action<HydroParterInfo, eChangeType> ParterChangedEvent;
#endregion
+
+ /// <summary>
+ /// 鍒濆鍖栨暟鎹�
+ /// </summary>
+ public void InitialData(HydroPropStatusHelper propStatusHelper)
+ {
+ this.hydroVisualPropertyCtrl1.InitialData(propStatusHelper);
+ }
#region 灞炴�ц祴鍊�
@@ -173,7 +181,7 @@
{
var bluntheadViewModel = vm as HydroBluntheadViewModel;
var input = HydroMatchingHelper.Create(bluntheadViewModel);
- var dlg = new SimulationBluntheadSingleMatchingDlg();
+ var dlg = new AssetsBluntheadSingleMatchingDlg();
dlg.ReloadDataEvent += (output) =>
{
HydroMatchingHelper.Apply(bluntheadViewModel, output);
@@ -209,7 +217,7 @@
{
var threelinkViewModel = vm as HydroThreelinkViewModel;
var input = HydroMatchingHelper.Create(threelinkViewModel);
- var dlg = new SimulationThreelinkSingleMatchingDlg();
+ var dlg = new AssetsThreelinkSingleMatchingDlg();
dlg.ReloadDataEvent += (output) =>
{
HydroMatchingHelper.Apply(threelinkViewModel, output);
@@ -227,7 +235,7 @@
{
var fourlinkViewModel = vm as HydroFourlinkViewModel;
var input = HydroMatchingHelper.Create(fourlinkViewModel);
- var dlg = new SimulationFourlinkSingleMatchingDlg();
+ var dlg = new AssetsFourlinkSingleMatchingDlg();
dlg.ReloadDataEvent += (output) =>
{
HydroMatchingHelper.Apply(fourlinkViewModel, output);
@@ -299,7 +307,7 @@
{
var nozzleViewModel = vm as HydroNozzleViewModel;
var input = HydroMatchingHelper.Create(nozzleViewModel);
- var dlg = new SimulationSprinklerSingleMatchingDlg();
+ var dlg = new AssetsSprinklerSingleMatchingDlg();
dlg.ReloadDataEvent += (output) =>
{
HydroMatchingHelper.Apply(nozzleViewModel, output);
@@ -317,10 +325,28 @@
{
var hydrantViewModel = vm as HydroHydrantViewModel;
var input = HydroMatchingHelper.Create(hydrantViewModel);
- var dlg = new SimulationHydrantSingleMatchingDlg();
+ var dlg = new AssetsHydrantSingleMatchingDlg();
dlg.ReloadDataEvent += (output) =>
{
HydroMatchingHelper.Apply(hydrantViewModel, output);
+ this.hydroVisualPropertyCtrl1.UpdateRows();
+ this.PropertyValueChangedEvent?.Invoke(vm.Vmo);
+ this.MarkPropertyValueChangedEvent?.Invoke(vm.Vmo);
+ this.GradingPropertyValueChangedEvent?.Invoke(vm.Vmo);
+ };
+ dlg.SetBindingData(input);
+ dlg.ShowDialog();
+ }
+ break;
+
+ case Yw.Hydro.ParterCatalog.Cooling:
+ {
+ var coolingViewModel = vm as HydroCoolingViewModel;
+ var input = HydroMatchingHelper.Create(coolingViewModel);
+ var dlg = new AssetsCoolingSingleMatchingDlg();
+ dlg.ReloadDataEvent += (output) =>
+ {
+ HydroMatchingHelper.Apply(coolingViewModel, output);
this.hydroVisualPropertyCtrl1.UpdateRows();
this.PropertyValueChangedEvent?.Invoke(vm.Vmo);
this.MarkPropertyValueChangedEvent?.Invoke(vm.Vmo);
@@ -335,7 +361,7 @@
{
var pipeViewModel = vm as HydroPipeViewModel;
var input = HydroMatchingHelper.Create(pipeViewModel);
- var dlg = new SimulationPipeSingleMatchingDlg();
+ var dlg = new AssetsPipeSingleMatchingDlg();
dlg.ReloadDataEvent += (output) =>
{
HydroMatchingHelper.Apply(pipeViewModel, output);
@@ -559,12 +585,13 @@
this.GradingPropertyValueChangedEvent?.Invoke(vm?.Vmo);
}
- //姘存祦鍔ㄧ敾灞炴�у彂鐢熸敼鍙�
- private void HydroVisualPropertyCtrl1_FlowEffectPropertyValueChangedEvent(HydroVisualViewModel vm)
+ //鏋勪欢鏀瑰彉浜嬩欢
+ private void HydroVisualPropertyCtrl1_ParterChangedEvent(HydroParterInfo parter, eChangeType changeType)
{
- this.FlowEffectPropertyValueChangedEvent?.Invoke(vm?.Vmo);
+ this.ParterChangedEvent?.Invoke(parter, changeType);
}
+
#endregion
--
Gitblit v1.9.3