From 5471826644fd99d24dd862bac7dd7bc87aab5415 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期三, 04 十二月 2024 17:40:45 +0800
Subject: [PATCH] 修改压力损失与能量损失界面
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/01-property/XhsProjectSimulationPropertyCtrl.cs | 87 +++++++++++++++++--------------------------
1 files changed, 34 insertions(+), 53 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 38a4fb0..148feda 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
@@ -1,5 +1,6 @@
锘縰sing HStation.WinFrmUI.PhartRelation;
using HStation.WinFrmUI.Xhs;
+using Yw.Model;
namespace HStation.WinFrmUI
{
@@ -28,34 +29,34 @@
/// <summary>
/// 鏋勪欢鏌ョ湅浜嬩欢
/// </summary>
- public event Action<HydroVisualViewModel> HydroViewEvent;
+ public event Action<HydroVisualInfo> HydroViewEvent;
/// <summary>
/// 寮鸿皟杩炴帴缁勪欢浜嬩欢
/// 绗竴涓弬鏁颁负缁勪欢
/// 绗簩涓弬鏁颁负杩炴帴鑺傜偣Code
/// </summary>
- public event Action<HydroLinkViewModel, string> BlinkLinkNodeEvent;
+ public event Action<HydroLinkInfo, string> BlinkLinkNodeEvent;
/// <summary>
/// 灞炴�у�兼敼鍙樹簨浠�
/// </summary>
- public event Action<HydroVisualViewModel> PropertyValueChangedEvent;
+ public event Action<HydroVisualInfo> PropertyValueChangedEvent;
/// <summary>
/// 鏍囨敞灞炴�у�兼敼鍙樹簨浠�
/// </summary>
- public event Action<HydroVisualViewModel> MarkPropertyValueChangedEvent;
+ public event Action<HydroVisualInfo> MarkPropertyValueChangedEvent;
/// <summary>
/// 鍒嗙骇灞炴�у�兼敼鍙樹簨浠�
/// </summary>
- public event Action<HydroVisualViewModel> GradingPropertyValueChangedEvent;
+ public event Action<HydroVisualInfo> GradingPropertyValueChangedEvent;
/// <summary>
/// 姘存祦鍔ㄧ敾灞炴�у�兼敼鍙樹簨浠�
/// </summary>
- public event Action<HydroVisualViewModel> FlowEffectPropertyValueChangedEvent;
+ public event Action<HydroVisualInfo> FlowEffectPropertyValueChangedEvent;
#endregion
@@ -203,35 +204,35 @@
}
//閫夋嫨鏇茬嚎
- private bool HydroVisualPropertyCtrl1_SetCurveEvent(HydroVisualViewModel vm, string curveType)
+ private bool HydroVisualPropertyCtrl1_SetCurveEvent(HydroVisualViewModel vm, string curve, string curveType)
{
if (vm == null)
{
return false;
}
- switch (curveType)
+ switch (curve)
{
case HydroCurve.Pump:
{
- var pumpInfo = vm.HydroInfo.Pumps?.Find(x => x.Code == vm.Code);
- if (pumpInfo == null)
- {
- break;
- }
- var input = AssetsMatchingParasHelper.Create(vm.HydroInfo, pumpInfo, null);
- var dlg = new SinglePumpAnalyDlg();
- dlg.SetBindindData(input);
- dlg.ReloadDataEvent += (output) =>
- {
- var bol = AssetsMatchingParasHelper.Apply(vm.HydroInfo, output);
- if (bol)
- {
- vm.UpdateProperty();
- this.hydroVisualPropertyCtrl1.UpdateRows();
- }
- return bol;
- };
- dlg.ShowDialog();
+ //var pumpInfo = vm.HydroInfo.Pumps?.Find(x => x.Code == vm.Code);
+ //if (pumpInfo == null)
+ //{
+ // break;
+ //}
+ //var input = AssetsMatchingParasHelper.Create(vm.HydroInfo, pumpInfo, null);
+ //var dlg = new SinglePumpAnalyDlg();
+ //dlg.SetBindindData(input);
+ //dlg.ReloadDataEvent += (output) =>
+ //{
+ // var bol = AssetsMatchingParasHelper.Apply(vm.HydroInfo, output);
+ // if (bol)
+ // {
+ // vm.UpdateProperty();
+ // this.hydroVisualPropertyCtrl1.UpdateRows();
+ // }
+ // return bol;
+ //};
+ //dlg.ShowDialog();
return true;
}
case HydroCurve.PumpQH:
@@ -284,11 +285,7 @@
//鏋勪欢鏌ョ湅浜嬩欢
private void HydroVisualPropertyCtrl1_HydroViewEvent(HydroVisualViewModel vm)
{
- if (vm == null)
- {
- return;
- }
- this.HydroViewEvent?.Invoke(vm);
+ this.HydroViewEvent?.Invoke(vm?.Vmo);
}
//寮鸿皟杩炴帴鑺傜偣
@@ -302,47 +299,31 @@
{
return;
}
- this.BlinkLinkNodeEvent?.Invoke(vm, linkNodeCode);
+ this.BlinkLinkNodeEvent?.Invoke(vm?.Vmo, linkNodeCode);
}
//灞炴�у彂鐢熸敼鍙�
private void HydroVisualPropertyCtrl1_PropertyValueChangedEvent(HydroVisualViewModel vm)
{
- if (vm == null)
- {
- return;
- }
- this.PropertyValueChangedEvent?.Invoke(vm);
+ this.PropertyValueChangedEvent?.Invoke(vm?.Vmo);
}
//鏍囨敞灞炴�у彂鐢熸敼鍙�
private void HydroVisualPropertyCtrl1_MarkPropertyValueChangedEvent(HydroVisualViewModel vm)
{
- if (vm == null)
- {
- return;
- }
- this.MarkPropertyValueChangedEvent?.Invoke(vm);
+ this.MarkPropertyValueChangedEvent?.Invoke(vm?.Vmo);
}
//鍒嗙骇灞炴�у彂鐢熸敼鍙�
private void HydroPVisualPropertyCtrl1_GradingPropertyValueChangedEvent(HydroVisualViewModel vm)
{
- if (vm == null)
- {
- return;
- }
- this.GradingPropertyValueChangedEvent?.Invoke(vm);
+ this.GradingPropertyValueChangedEvent?.Invoke(vm?.Vmo);
}
//姘存祦鍔ㄧ敾灞炴�у彂鐢熸敼鍙�
private void HydroVisualPropertyCtrl1_FlowEffectPropertyValueChangedEvent(HydroVisualViewModel vm)
{
- if (vm == null)
- {
- return;
- }
- this.FlowEffectPropertyValueChangedEvent?.Invoke(vm);
+ this.FlowEffectPropertyValueChangedEvent?.Invoke(vm?.Vmo);
}
#endregion
--
Gitblit v1.9.3