From 28999ee3f86d70c5be79f6f6a686c59e56bcad32 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期二, 24 十二月 2024 21:22:30 +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/11-pump/02-feat/SimulationSinglePumpFeatDlg.cs | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/11-pump/02-feat/SimulationSinglePumpFeatDlg.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/11-pump/02-feat/SimulationSinglePumpFeatDlg.cs
index 4fac94e..80608b7 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/11-pump/02-feat/SimulationSinglePumpFeatDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/11-pump/02-feat/SimulationSinglePumpFeatDlg.cs
@@ -22,21 +22,26 @@
/// <summary>
/// 缁戝畾鏁版嵁
/// </summary>
- public void SetBindingData(HydroPumpViewModel pumpViewModel)
+ public void SetBindingData(HydroPumpViewModel pumpViewModel, HydroCalcuResult calcuResult)
{
if (pumpViewModel == null)
{
return;
}
- SetBindingData(pumpViewModel.HydroInfo, pumpViewModel.Vmo);
+ SetBindingData(pumpViewModel.HydroInfo, pumpViewModel.Vmo, calcuResult);
}
/// <summary>
/// 缁戝畾鏁版嵁
/// </summary>
- public void SetBindingData(Yw.Model.HydroModelInfo hydroInfo, Yw.Model.HydroPumpInfo pumpInfo)
+ public void SetBindingData
+ (
+ Yw.Model.HydroModelInfo hydroInfo,
+ Yw.Model.HydroPumpInfo pumpInfo,
+ HydroCalcuResult calcuResult
+ )
{
- this.simulationSinglePumpFeatCtrl1.SetBindingData(hydroInfo, pumpInfo);
+ this.simulationSinglePumpFeatCtrl1.SetBindingData(hydroInfo, pumpInfo, calcuResult);
}
private void SimulationPumpFeatDlg_FormClosing(object sender, FormClosingEventArgs e)
--
Gitblit v1.9.3