From ff457d72c09f3f0d49e6b79d9461bf596e8945bf Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期二, 10 十二月 2024 17:34:31 +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/09-energy/SimulationSingleWorkingEnergyCtrl.cs | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/09-energy/SimulationSingleWorkingEnergyCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/09-energy/SimulationSingleWorkingEnergyCtrl.cs
index a453f9e..0c4cdaa 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/09-energy/SimulationSingleWorkingEnergyCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/09-energy/SimulationSingleWorkingEnergyCtrl.cs
@@ -27,21 +27,34 @@
private HydroWorkingVmo _working = null;//宸ュ喌
private Yw.Model.HydroModelInfo _hydroInfo = null;//姘村姏淇℃伅
+ private List<HydroMonitorVmo> _allMonitorList = null;//鐩戞祴鍒楄〃
private Dictionary<string, HydroCalcuVisualResult> _allCalcuResultVisualDict = null;//鎵�鏈夎绠楃粨鏋滃彲瑙佸瓧鍏�
/// <summary>
/// 缁戝畾鏁版嵁
/// </summary>
- public void SetBindingData(HydroWorkingVmo working, Yw.Model.HydroModelInfo hydroInfo, HydroCalcuResult calcuResult)
+ public void SetBindingData
+ (
+ HydroWorkingVmo working,
+ Yw.Model.HydroModelInfo hydroInfo,
+ List<HydroMonitorVmo> allMonitorList,
+ HydroCalcuResult calcuResult
+ )
{
var allCalcuResultVisualDict = calcuResult?.GetVisualDict();
- SetBindingData(working, hydroInfo, allCalcuResultVisualDict);
+ SetBindingData(working, hydroInfo, allMonitorList, allCalcuResultVisualDict);
}
/// <summary>
/// 缁戝畾鏁版嵁
/// </summary>
- public void SetBindingData(HydroWorkingVmo working, Yw.Model.HydroModelInfo hydroInfo, Dictionary<string, HydroCalcuVisualResult> allCalcuResultVisualDict)
+ public void SetBindingData
+ (
+ HydroWorkingVmo working,
+ Yw.Model.HydroModelInfo hydroInfo,
+ List<HydroMonitorVmo> allMonitorList,
+ Dictionary<string, HydroCalcuVisualResult> allCalcuResultVisualDict
+ )
{
if (working == null)
{
@@ -57,9 +70,10 @@
}
_working = working;
_hydroInfo = hydroInfo;
+ _allMonitorList = allMonitorList;
_allCalcuResultVisualDict = allCalcuResultVisualDict;
this.hydroEnergyTotalHorizViewCtrl1.SetBindingData(_hydroInfo, _allCalcuResultVisualDict);
- this.simulationSingleWorkingPumpCtrl1.SetBindingData(_working, _hydroInfo, null, _allCalcuResultVisualDict);
+ this.simulationSingleWorkingPumpCtrl1.SetBindingData(_working, _hydroInfo, _allMonitorList, _allCalcuResultVisualDict);
}
--
Gitblit v1.9.3