From 6e73556d8e2517c7cf4f76efdbff9e3fed01fb5f Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期五, 20 十二月 2024 16:21:28 +0800
Subject: [PATCH] 泵匹配方法修改
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/01-property/SimulationPropertyCtrl.cs | 68 +++++++++++++++++++++-------------
1 files changed, 42 insertions(+), 26 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 3dcbe0f..c6ee66b 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
@@ -58,7 +58,7 @@
/// </summary>
public event Action<HydroVisualInfo> FlowEffectPropertyValueChangedEvent;
- #endregion
+ #endregion 浜嬩欢闆�
#region 灞炴�ц祴鍊�
@@ -80,7 +80,7 @@
set { this.hydroVisualPropertyCtrl1.SelectedObject = value; }
}
- #endregion
+ #endregion 灞炴�ц祴鍊�
#region 灞炴�ф洿鏂�
@@ -114,7 +114,7 @@
this.hydroVisualPropertyCtrl1.UpdateRows();
}
- #endregion
+ #endregion 灞炴�ф洿鏂�
#region 浜嬩欢瀹炵幇
@@ -131,7 +131,7 @@
{
var tankViewModel = vm as HydroTankViewModel;
var input = HydroMatchingHelper.Create(tankViewModel);
- var dlg = new SimulationTankSingleMatchingDlg();
+ var dlg = new AssetsTankSingleMatchingDlg();
dlg.ReloadDataEvent += (output) =>
{
HydroMatchingHelper.Apply(tankViewModel, output);
@@ -144,11 +144,12 @@
dlg.ShowDialog();
}
break;
+
case Yw.Hydro.ParterCatalog.Waterbox:
{
var tankViewModel = vm as HydroTankViewModel;
var input = HydroMatchingHelper.Create(tankViewModel);
- var dlg = new SimulationTankSingleMatchingDlg();
+ var dlg = new AssetsTankSingleMatchingDlg();
dlg.ReloadDataEvent += (output) =>
{
HydroMatchingHelper.Apply(tankViewModel, output);
@@ -161,6 +162,7 @@
dlg.ShowDialog();
}
break;
+
case Yw.Hydro.ParterCatalog.Blunthead:
{
var bluntheadViewModel = vm as HydroBluntheadViewModel;
@@ -178,6 +180,7 @@
dlg.ShowDialog();
}
break;
+
case Yw.Hydro.ParterCatalog.Elbow:
{
var elbowViewModel = vm as HydroElbowViewModel;
@@ -195,6 +198,7 @@
dlg.ShowDialog();
}
break;
+
case Yw.Hydro.ParterCatalog.Threelink:
{
var threelinkViewModel = vm as HydroThreelinkViewModel;
@@ -212,6 +216,7 @@
dlg.ShowDialog();
}
break;
+
case Yw.Hydro.ParterCatalog.Fourlink:
{
var fourlinkViewModel = vm as HydroFourlinkViewModel;
@@ -229,11 +234,12 @@
dlg.ShowDialog();
}
break;
+
case Yw.Hydro.ParterCatalog.Meter:
{
var meterViewModel = vm as HydroMeterViewModel;
var input = HydroMatchingHelper.Create(meterViewModel);
- var dlg = new SimulationMeterSingleMatchingDlg();
+ var dlg = new AssetsMeterSingleMatchingDlg();
dlg.ReloadDataEvent += (output) =>
{
HydroMatchingHelper.Apply(meterViewModel, output);
@@ -246,11 +252,12 @@
dlg.ShowDialog();
}
break;
+
case Yw.Hydro.ParterCatalog.Flowmeter:
{
var flowmeterViewModel = vm as HydroFlowmeterViewModel;
var input = HydroMatchingHelper.Create(flowmeterViewModel);
- var dlg = new SimulationFlowmeterSingleMatchingDlg();
+ var dlg = new AssetsFlowmeterSingleMatchingDlg();
dlg.ReloadDataEvent += (output) =>
{
HydroMatchingHelper.Apply(flowmeterViewModel, output);
@@ -263,11 +270,12 @@
dlg.ShowDialog();
}
break;
+
case Yw.Hydro.ParterCatalog.Pressmeter:
{
var pressmeterViewModel = vm as HydroPressmeterViewModel;
var input = HydroMatchingHelper.Create(pressmeterViewModel);
- var dlg = new SimulationPressmeterSingleMatchingDlg();
+ var dlg = new AssetsPressmeterSingleMatchingDlg();
dlg.ReloadDataEvent += (output) =>
{
HydroMatchingHelper.Apply(pressmeterViewModel, output);
@@ -280,6 +288,7 @@
dlg.ShowDialog();
}
break;
+
case Yw.Hydro.ParterCatalog.Nozzle:
{
var nozzleViewModel = vm as HydroNozzleViewModel;
@@ -297,6 +306,7 @@
dlg.ShowDialog();
}
break;
+
case Yw.Hydro.ParterCatalog.Hydrant:
{
var hydrantViewModel = vm as HydroHydrantViewModel;
@@ -314,6 +324,7 @@
dlg.ShowDialog();
}
break;
+
case Yw.Hydro.ParterCatalog.Pipe:
{
var pipeViewModel = vm as HydroPipeViewModel;
@@ -330,6 +341,7 @@
dlg.ShowDialog();
}
break;
+
case Yw.Hydro.ParterCatalog.Pump:
{
var pumpViewModel = vm as HydroPumpViewModel;
@@ -347,11 +359,12 @@
dlg.ShowDialog();
}
break;
+
case Yw.Hydro.ParterCatalog.Valve:
{
var valveViewModel = vm as HydroValveViewModel;
var input = HydroMatchingHelper.Create(valveViewModel);
- var dlg = new SimulationValveSingleMatchingDlg();
+ var dlg = new AssetsValveSingleMatchingDlg();
dlg.ReloadDataEvent += (output) =>
{
HydroMatchingHelper.Apply(valveViewModel, output);
@@ -364,11 +377,12 @@
dlg.ShowDialog();
}
break;
+
case Yw.Hydro.ParterCatalog.Exchanger:
{
var exchangerViewModel = vm as HydroExchangerViewModel;
var input = HydroMatchingHelper.Create(exchangerViewModel);
- var dlg = new SimulationExchangerSingleMatchingDlg();
+ var dlg = new AssetsExchangerSingleMatchingDlg();
dlg.ReloadDataEvent += (output) =>
{
HydroMatchingHelper.Apply(exchangerViewModel, output);
@@ -381,11 +395,12 @@
dlg.ShowDialog();
}
break;
+
case Yw.Hydro.ParterCatalog.Compressor:
{
var compressorViewModel = vm as HydroCompressorViewModel;
var input = HydroMatchingHelper.Create(compressorViewModel);
- var dlg = new SimulationCompressorSingleMatchingDlg();
+ var dlg = new AssetsCompressorSingleMatchingDlg();
dlg.ReloadDataEvent += (output) =>
{
HydroMatchingHelper.Apply(compressorViewModel, output);
@@ -398,8 +413,8 @@
dlg.ShowDialog();
}
break;
- default: break;
+ default: break;
}
}
@@ -417,13 +432,13 @@
if (long.TryParse(vm.DbId, out long longDbId))
{
var tankViewModel = vm as HydroTankViewModel;
- var dlg = new TankChartShowDlg();
- dlg.SetBingingData(longDbId);
+ var dlg = new AssetsTankCurveVOLViewDlg();
+ dlg.SetBindingData(longDbId);
dlg.ShowDialog();
}
-
}
break;
+
case HydroCurve.Pump:
{
var pumpViewModel = vm as HydroPumpViewModel;
@@ -439,45 +454,48 @@
dlg.ShowDialog();
}
break;
+
case HydroCurve.Valve:
{
if (long.TryParse(vm.DbId, out long longDbId))
{
var valveViewModel = vm as HydroValveViewModel;
- var dlg = new ValveChartShowDlg();
- dlg.SetBingingData(longDbId);
+ var dlg = new AssetsValveCurveViewDlg();
+ dlg.SetBindingData(longDbId);
dlg.ShowDialog();
}
}
break;
+
case HydroCurve.Exchanger:
{
if (long.TryParse(vm.DbId, out long longDbId))
{
var exchangerViewModel = vm as HydroExchangerViewModel;
- var dlg = new ExchangerChartShowDlg();
- dlg.SetBingingData(longDbId);
+ var dlg = new AssetsExchangerCurveQLViewDlg();
+ dlg.SetBindingData(longDbId);
dlg.ShowDialog();
}
-
}
break;
+
case HydroCurve.Compressor:
{
if (long.TryParse(vm.DbId, out long longDbId))
{
var compressorViewModel = vm as HydroCompressorViewModel;
- var dlg = new CompressorChartShowDlg();
- dlg.SetBingingData(longDbId);
+ var dlg = new AssetsCompressorCurveQLViewDlg();
+ dlg.SetBindingData(longDbId);
dlg.ShowDialog();
}
}
break;
+
default: break;
}
}
- #endregion
+ #endregion 浜嬩欢瀹炵幇
#region 浜嬩欢绌块��
@@ -525,8 +543,6 @@
this.FlowEffectPropertyValueChangedEvent?.Invoke(vm?.Vmo);
}
- #endregion
-
-
+ #endregion 浜嬩欢绌块��
}
}
\ No newline at end of file
--
Gitblit v1.9.3