From ca1ccd0dd9f2d6936368f07d14a2b29b309fd151 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期三, 04 十二月 2024 15:59:25 +0800
Subject: [PATCH] 增加单独匹配界面
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/01-property/XhsProjectSimulationPropertyCtrl.cs | 92 ++++++++++++++++++++++++----------------------
1 files changed, 48 insertions(+), 44 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 2975ce9..178e983 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
@@ -58,7 +58,7 @@
/// </summary>
public event Action<HydroVisualInfo> FlowEffectPropertyValueChangedEvent;
- #endregion
+ #endregion 浜嬩欢闆�
#region 灞炴�ц祴鍊�
@@ -71,7 +71,7 @@
set { this.hydroVisualPropertyCtrl1.SelectedObject = value; }
}
- #endregion
+ #endregion 灞炴�ц祴鍊�
#region 灞炴�ф洿鏂�
@@ -105,7 +105,7 @@
this.hydroVisualPropertyCtrl1.UpdateRows();
}
- #endregion
+ #endregion 灞炴�ф洿鏂�
#region 浜嬩欢瀹炵幇
@@ -122,52 +122,55 @@
{
case Yw.Hydro.ParterCatalog.Pump://姘存车
{
- var pumpInfo = vm.HydroInfo.Pumps?.Find(x => x.Code == vm.Code);
- if (pumpInfo == null)
- {
- break;
- }
+ /* 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 PumpSingleMatchingDlg();
- dlg.SetBindingData(input);
- dlg.ReloadDataEvent += (output) =>
- {
- bol = AssetsMatchingParasHelper.Apply(vm.HydroInfo, output);
- if (bol)
- {
- vm.UpdateProperty();
- }
- };
- dlg.ShowDialog();
+ var input = AssetsMatchingParasHelper.Create(vm.HydroInfo, pumpInfo, null);
+ var dlg = new PumpSingleMatchingDlg();
+ dlg.SetBindingData(input);
+ dlg.ReloadDataEvent += (output) =>
+ {
+ bol = AssetsMatchingParasHelper.Apply(vm.HydroInfo, output);
+ if (bol)
+ {
+ vm.UpdateProperty();
+ }
+ };
+ dlg.ShowDialog();*/
}
break;
+
case Yw.Hydro.ParterCatalog.Valve://闃�闂�
{
- var valveInfo = vm.HydroInfo.Valves?.Find(x => x.Code == vm.Code);
- if (valveInfo == null)
- {
- break;
- }
- var input = AssetsMatchingParasHelper.Create(vm.HydroInfo, valveInfo, null);
- var dlg = new ValveSingleMatchingDlg();
- dlg.SetBindingData(input);
- dlg.ReloadDataEvent += (rhs) =>
- {
- bol = AssetsMatchingParasHelper.Apply(vm.HydroInfo, rhs);
- if (bol)
- {
- vm.UpdateProperty();
- this.hydroVisualPropertyCtrl1.UpdateRows();
- }
- };
- dlg.ShowDialog();
+ /* var valveInfo = vm.HydroInfo.Valves?.Find(x => x.Code == vm.Code);
+ if (valveInfo == null)
+ {
+ break;
+ }
+ var input = AssetsMatchingParasHelper.Create(vm.HydroInfo, valveInfo, null);
+ var dlg = new ValveSingleMatchingDlg();
+ dlg.SetBindingData(input);
+ dlg.ReloadDataEvent += (rhs) =>
+ {
+ bol = AssetsMatchingParasHelper.Apply(vm.HydroInfo, rhs);
+ if (bol)
+ {
+ vm.UpdateProperty();
+ this.hydroVisualPropertyCtrl1.UpdateRows();
+ }
+ };
+ dlg.ShowDialog();*/
}
break;
+
case Yw.Hydro.ParterCatalog.Pipe://绠￠亾
{
}
break;
+
case Yw.Hydro.ParterCatalog.Elbow://寮ご
{
var elbowInfo = vm.HydroInfo.Elbows?.Find(x => x.Code == vm.Code);
@@ -175,12 +178,12 @@
{
break;
}
- var input = AssetsMatchingParasHelper.Create(vm.HydroInfo, elbowInfo, null);
+ var input = HydroMatchingHelper.Create(elbowInfo, vm.HydroInfo, null);
var dlg = new ElbowSingMatchingDlg();
dlg.SetBindingData(input);
dlg.ReloadDataEvent += (output) =>
{
- bol = AssetsMatchingParasHelper.Apply(vm.HydroInfo, output);
+ bol = HydroMatchingHelper.Apply(vm.HydroInfo, null, output);
if (bol)
{
vm.UpdateProperty();
@@ -190,14 +193,17 @@
dlg.ShowDialog();
}
break;
+
case Yw.Hydro.ParterCatalog.Threelink://涓夐��
{
}
break;
+
case Yw.Hydro.ParterCatalog.Fourlink://鍥涢��
{
}
break;
+
default: break;
}
return bol;
@@ -278,7 +284,7 @@
return false;
}
- #endregion
+ #endregion 浜嬩欢瀹炵幇
#region 浜嬩欢绌块��
@@ -326,8 +332,6 @@
this.FlowEffectPropertyValueChangedEvent?.Invoke(vm?.Vmo);
}
- #endregion
-
-
+ #endregion 浜嬩欢绌块��
}
}
\ No newline at end of file
--
Gitblit v1.9.3