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 | 98 ++++++++++++++++++++++--------------------------
1 files changed, 45 insertions(+), 53 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 669f7cb..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
@@ -1,4 +1,5 @@
-锘縰sing HStation.WinFrmUI.PhartRelation;
+锘縰sing DevExpress.Utils.MVVM;
+using HStation.WinFrmUI.PhartRelation;
using HStation.WinFrmUI.Xhs;
using Yw.Model;
@@ -57,7 +58,7 @@
/// </summary>
public event Action<HydroVisualInfo> FlowEffectPropertyValueChangedEvent;
- #endregion
+ #endregion 浜嬩欢闆�
#region 灞炴�ц祴鍊�
@@ -70,7 +71,7 @@
set { this.hydroVisualPropertyCtrl1.SelectedObject = value; }
}
- #endregion
+ #endregion 灞炴�ц祴鍊�
#region 灞炴�ф洿鏂�
@@ -120,93 +121,102 @@
case Yw.Hydro.ParterCatalog.Tank:
{
var tankViewModel = vm as HydroTankViewModel;
- var input = HydroMatchingHelper.Create(tankViewModel.Vmo, tankViewModel.HydroInfo);
+ var input = HydroMatchingHelper.Create(tankViewModel);
var dlg = new SimulationTankSingleMatchingDlg();
dlg.ReloadDataEvent += (output) =>
{
- HydroMatchingHelper.Apply(tankViewModel.HydroInfo, tankViewModel.Vmo, output);
- tankViewModel.UpdateProperty();
+ HydroMatchingHelper.Apply(tankViewModel, output);
this.hydroVisualPropertyCtrl1.UpdateRows();
};
dlg.SetBindingData(input);
dlg.ShowDialog();
}
break;
+
case Yw.Hydro.ParterCatalog.Waterbox:
{
var tankViewModel = vm as HydroTankViewModel;
- var input = HydroMatchingHelper.Create(tankViewModel.Vmo, tankViewModel.HydroInfo);
+ var input = HydroMatchingHelper.Create(tankViewModel);
var dlg = new SimulationTankSingleMatchingDlg();
dlg.ReloadDataEvent += (output) =>
{
- HydroMatchingHelper.Apply(tankViewModel.HydroInfo, tankViewModel.Vmo, output);
- tankViewModel.UpdateProperty();
+ HydroMatchingHelper.Apply(tankViewModel, output);
this.hydroVisualPropertyCtrl1.UpdateRows();
};
dlg.SetBindingData(input);
dlg.ShowDialog();
}
break;
+
case Yw.Hydro.ParterCatalog.Blunthead:
{
-
}
break;
+
case Yw.Hydro.ParterCatalog.Elbow:
{
var elbowViewModel = vm as HydroElbowViewModel;
- var input = HydroMatchingHelper.Create(elbowViewModel.Vmo, elbowViewModel.HydroInfo);
+ var input = HydroMatchingHelper.Create(elbowViewModel);
var dlg = new SimulationElbowSingleMatchingDlg();
dlg.ReloadDataEvent += (output) =>
{
- HydroMatchingHelper.Apply(elbowViewModel.HydroInfo, elbowViewModel.Vmo, output);
- elbowViewModel.UpdateProperty();
+ HydroMatchingHelper.Apply(elbowViewModel, output);
this.hydroVisualPropertyCtrl1.UpdateRows();
};
dlg.SetBindingData(input);
dlg.ShowDialog();
}
break;
+
case Yw.Hydro.ParterCatalog.Threelink:
{
-
}
break;
+
case Yw.Hydro.ParterCatalog.Fourlink:
{
-
}
break;
+
case Yw.Hydro.ParterCatalog.Meter:
{
-
}
break;
+
case Yw.Hydro.ParterCatalog.Flowmeter:
{
-
}
break;
+
case Yw.Hydro.ParterCatalog.Pressmeter:
{
-
}
break;
+
case Yw.Hydro.ParterCatalog.Nozzle:
{
-
}
break;
+
case Yw.Hydro.ParterCatalog.Hydrant:
{
-
}
break;
+
case Yw.Hydro.ParterCatalog.Pipe:
{
-
+ var pipeViewModel = vm as HydroPipeViewModel;
+ var input = HydroMatchingHelper.Create(pipeViewModel);
+ var dlg = new SimulationPipeSingleMatchingDlg();
+ dlg.ReloadDataEvent += (output) =>
+ {
+ HydroMatchingHelper.Apply(pipeViewModel, output);
+ this.hydroVisualPropertyCtrl1.UpdateRows();
+ };
+ dlg.ShowDialog();
}
break;
+
case Yw.Hydro.ParterCatalog.Pump:
{
var pumpViewModel = vm as HydroPumpViewModel;
@@ -214,31 +224,30 @@
var dlg = new SimulationPumpSingleMatchingDlg();
dlg.ReloadDataEvent += (output) =>
{
- HydroMatchingHelper.Apply(pumpViewModel.HydroInfo, pumpViewModel.Vmo, output);
- pumpViewModel.UpdateProperty();
+ HydroMatchingHelper.Apply(pumpViewModel, output);
this.hydroVisualPropertyCtrl1.UpdateRows();
};
dlg.SetBindingData(input);
dlg.ShowDialog();
}
break;
+
case Yw.Hydro.ParterCatalog.Valve:
{
-
}
break;
+
case Yw.Hydro.ParterCatalog.Exchanger:
{
-
}
break;
+
case Yw.Hydro.ParterCatalog.Compressor:
{
-
}
break;
- default: break;
+ default: break;
}
}
@@ -253,53 +262,36 @@
{
case HydroCurve.Tank:
{
-
}
break;
+
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();
- //return true;
+ var pumpViewModel = vm as HydroPumpViewModel;
+ //var dlg = new PumpChartShowDlg();
}
break;
+
case HydroCurve.Valve:
{
-
}
break;
+
case HydroCurve.Exchanger:
{
-
}
break;
+
case HydroCurve.Compressor:
{
-
}
break;
+
default: break;
}
}
- #endregion
+ #endregion 浜嬩欢瀹炵幇
#region 浜嬩欢绌块��
@@ -347,6 +339,6 @@
this.FlowEffectPropertyValueChangedEvent?.Invoke(vm?.Vmo);
}
- #endregion
+ #endregion 浜嬩欢绌块��
}
}
\ No newline at end of file
--
Gitblit v1.9.3