From 59f2c4c04e06d77de7f10ab96d1a5c73ccd01262 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期四, 05 十二月 2024 16:23:42 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/01-property/SimulationPropertyCtrl.cs | 163 ++++++++---------------------------------------------
1 files changed, 26 insertions(+), 137 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 ff7114b..19d6ff5 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 灞炴�ц祴鍊�
@@ -71,7 +71,7 @@
set { this.hydroVisualPropertyCtrl1.SelectedObject = value; }
}
- #endregion
+ #endregion 灞炴�ц祴鍊�
#region 灞炴�ф洿鏂�
@@ -132,6 +132,7 @@
dlg.ShowDialog();
}
break;
+
case Yw.Hydro.ParterCatalog.Waterbox:
{
var tankViewModel = vm as HydroTankViewModel;
@@ -146,20 +147,12 @@
dlg.ShowDialog();
}
break;
+
case Yw.Hydro.ParterCatalog.Blunthead:
{
- var bluntheadViewModel = vm as HydroBluntheadViewModel;
- var input = HydroMatchingHelper.Create(bluntheadViewModel);
- var dlg = new SimulationBluntheadSingleMatchingDlg();
- dlg.ReloadDataEvent += (output) =>
- {
- HydroMatchingHelper.Apply(bluntheadViewModel, output);
- this.hydroVisualPropertyCtrl1.UpdateRows();
- };
- dlg.SetBindingData(input);
- dlg.ShowDialog();
}
break;
+
case Yw.Hydro.ParterCatalog.Elbow:
{
var elbowViewModel = vm as HydroElbowViewModel;
@@ -174,104 +167,42 @@
dlg.ShowDialog();
}
break;
+
case Yw.Hydro.ParterCatalog.Threelink:
{
- var threelinkViewModel = vm as HydroThreelinkViewModel;
- var input = HydroMatchingHelper.Create(threelinkViewModel);
- var dlg = new SimulationThreelinkSingleMatchingDlg();
- dlg.ReloadDataEvent += (output) =>
- {
- HydroMatchingHelper.Apply(threelinkViewModel, output);
- this.hydroVisualPropertyCtrl1.UpdateRows();
- };
- dlg.SetBindingData(input);
- dlg.ShowDialog();
}
break;
+
case Yw.Hydro.ParterCatalog.Fourlink:
{
- var fourlinkViewModel = vm as HydroFourlinkViewModel;
- var input = HydroMatchingHelper.Create(fourlinkViewModel);
- var dlg = new SimulationFourlinkSingleMatchingDlg();
- dlg.ReloadDataEvent += (output) =>
- {
- HydroMatchingHelper.Apply(fourlinkViewModel, output);
- this.hydroVisualPropertyCtrl1.UpdateRows();
- };
- dlg.SetBindingData(input);
- dlg.ShowDialog();
}
break;
+
case Yw.Hydro.ParterCatalog.Meter:
{
- var meterViewModel = vm as HydroMeterViewModel;
- var input = HydroMatchingHelper.Create(meterViewModel);
- var dlg = new SimulationMeterSingleMatchingDlg();
- dlg.ReloadDataEvent += (output) =>
- {
- HydroMatchingHelper.Apply(meterViewModel, output);
- this.hydroVisualPropertyCtrl1.UpdateRows();
- };
- dlg.SetBindingData(input);
- dlg.ShowDialog();
}
break;
+
case Yw.Hydro.ParterCatalog.Flowmeter:
{
- var flowmeterViewModel = vm as HydroFlowmeterViewModel;
- var input = HydroMatchingHelper.Create(flowmeterViewModel);
- var dlg = new SimulationFlowmeterSingleMatchingDlg();
- dlg.ReloadDataEvent += (output) =>
- {
- HydroMatchingHelper.Apply(flowmeterViewModel, output);
- this.hydroVisualPropertyCtrl1.UpdateRows();
- };
- dlg.SetBindingData(input);
- dlg.ShowDialog();
}
break;
+
case Yw.Hydro.ParterCatalog.Pressmeter:
{
- var pressmeterViewModel = vm as HydroPressmeterViewModel;
- var input = HydroMatchingHelper.Create(pressmeterViewModel);
- var dlg = new SimulationPressmeterSingleMatchingDlg();
- dlg.ReloadDataEvent += (output) =>
- {
- HydroMatchingHelper.Apply(pressmeterViewModel, output);
- this.hydroVisualPropertyCtrl1.UpdateRows();
- };
- dlg.SetBindingData(input);
- dlg.ShowDialog();
}
break;
+
case Yw.Hydro.ParterCatalog.Nozzle:
{
- var nozzleViewModel = vm as HydroNozzleViewModel;
- var input = HydroMatchingHelper.Create(nozzleViewModel);
- var dlg = new SimulationSprinklerSingleMatchingDlg();
- dlg.ReloadDataEvent += (output) =>
- {
- HydroMatchingHelper.Apply(nozzleViewModel, output);
- this.hydroVisualPropertyCtrl1.UpdateRows();
- };
- dlg.SetBindingData(input);
- dlg.ShowDialog();
}
break;
+
case Yw.Hydro.ParterCatalog.Hydrant:
{
- var hydrantViewModel = vm as HydroHydrantViewModel;
- var input = HydroMatchingHelper.Create(hydrantViewModel);
- var dlg = new SimulationHydrantSingleMatchingDlg();
- dlg.ReloadDataEvent += (output) =>
- {
- HydroMatchingHelper.Apply(hydrantViewModel, output);
- this.hydroVisualPropertyCtrl1.UpdateRows();
- };
- dlg.SetBindingData(input);
- dlg.ShowDialog();
}
break;
+
case Yw.Hydro.ParterCatalog.Pipe:
{
var pipeViewModel = vm as HydroPipeViewModel;
@@ -285,6 +216,7 @@
dlg.ShowDialog();
}
break;
+
case Yw.Hydro.ParterCatalog.Pump:
{
var pumpViewModel = vm as HydroPumpViewModel;
@@ -299,50 +231,23 @@
dlg.ShowDialog();
}
break;
+
case Yw.Hydro.ParterCatalog.Valve:
{
- var valveViewModel = vm as HydroValveViewModel;
- var input = HydroMatchingHelper.Create(valveViewModel);
- var dlg = new SimulationValveSingleMatchingDlg();
- dlg.ReloadDataEvent += (output) =>
- {
- HydroMatchingHelper.Apply(valveViewModel, output);
- this.hydroVisualPropertyCtrl1.UpdateRows();
- };
- dlg.SetBindingData(input);
- dlg.ShowDialog();
}
break;
+
case Yw.Hydro.ParterCatalog.Exchanger:
{
- var exchangerViewModel = vm as HydroExchangerViewModel;
- var input = HydroMatchingHelper.Create(exchangerViewModel);
- var dlg = new SimulationExchangerSingleMatchingDlg();
- dlg.ReloadDataEvent += (output) =>
- {
- HydroMatchingHelper.Apply(exchangerViewModel, output);
- this.hydroVisualPropertyCtrl1.UpdateRows();
- };
- dlg.SetBindingData(input);
- dlg.ShowDialog();
}
break;
+
case Yw.Hydro.ParterCatalog.Compressor:
{
- var compressorViewModel = vm as HydroCompressorViewModel;
- var input = HydroMatchingHelper.Create(compressorViewModel);
- var dlg = new SimulationCompressorSingleMatchingDlg();
- dlg.ReloadDataEvent += (output) =>
- {
- HydroMatchingHelper.Apply(compressorViewModel, output);
- this.hydroVisualPropertyCtrl1.UpdateRows();
- };
- dlg.SetBindingData(input);
- dlg.ShowDialog();
}
break;
- default: break;
+ default: break;
}
}
@@ -357,52 +262,36 @@
{
case HydroCurve.Tank:
{
- var tankViewModel = vm as HydroTankViewModel;
- var dlg = new TankChartShowDlg();
- dlg.ShowDialog();
}
break;
+
case HydroCurve.Pump:
{
var pumpViewModel = vm as HydroPumpViewModel;
- var dlg = new SimulationSinglePumpFeatDlg();
- dlg.SaveEvent += (working) =>
- {
- pumpViewModel.Vmo.LinkStatus = working.LinkStatus;
- pumpViewModel.Vmo.SpeedRatio = working.CurrentHz / pumpViewModel.Vmo.RatedHz;
- pumpViewModel.UpdateProperty();
- this.hydroVisualPropertyCtrl1.UpdateRows();
- };
- dlg.SetBindingData(pumpViewModel);
- dlg.ShowDialog();
+ //var dlg = new PumpChartShowDlg();
}
break;
+
case HydroCurve.Valve:
{
- var valveViewModel = vm as HydroValveViewModel;
- var dlg = new ValveChartShowDlg();
- dlg.ShowDialog();
}
break;
+
case HydroCurve.Exchanger:
{
- var exchangerViewModel = vm as HydroExchangerViewModel;
- var dlg = new ExchangerChartShowDlg();
- dlg.ShowDialog();
}
break;
+
case HydroCurve.Compressor:
{
- var compressorViewModel = vm as HydroCompressorViewModel;
- var dlg = new CompressorChartShowDlg();
- dlg.ShowDialog();
}
break;
+
default: break;
}
}
- #endregion
+ #endregion 浜嬩欢瀹炵幇
#region 浜嬩欢绌块��
@@ -450,6 +339,6 @@
this.FlowEffectPropertyValueChangedEvent?.Invoke(vm?.Vmo);
}
- #endregion
+ #endregion 浜嬩欢绌块��
}
}
\ No newline at end of file
--
Gitblit v1.9.3