From 82dfff29bca77a1e11459fb7a69f729a09f4345c Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期五, 18 十月 2024 15:05:05 +0800
Subject: [PATCH] 计算优化，标注优化
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/02-bimface/XhsProjectSimulationBimfaceCtrl.cs | 133 +++++++++++++++++--------------------------
1 files changed, 53 insertions(+), 80 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/02-bimface/XhsProjectSimulationBimfaceCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/02-bimface/XhsProjectSimulationBimfaceCtrl.cs
index ef5424b..e689503 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/02-bimface/XhsProjectSimulationBimfaceCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/02-bimface/XhsProjectSimulationBimfaceCtrl.cs
@@ -388,30 +388,71 @@
#endregion
- #region 鑷畾涔夋爣绛�
+ #region 涓氬姟璁＄畻鑷畾涔夋爣绛�
/// <summary>
- /// 璁剧疆鑷畾涔夋爣绛�
+ /// 鏄剧ず涓氬姟璁＄畻鑷畾涔夋爣绛�
/// </summary>
- public async Task SetCustomLabels(List<CustomLabel> obj)
+ public async Task SetLogicCalcuCustomLabels(CalcuResult calcuResult)
{
- if (_bimfaceInteropContainer == null)
+ var hydroInfo = _hydroInfoFunc?.Invoke();
+ if (hydroInfo == null)
{
return;
}
- await _bimfaceInteropContainer.SetCustomLabels(obj);
+ if (calcuResult == null)
+ {
+ return;
+ }
+ if (!calcuResult.Succeed)
+ {
+ await _bimfaceInteropContainer?.ClearLogicCalcuCustomLabels();
+ return;
+ }
+ var obj = new List<CustomLabel>();
+ var allParterList = hydroInfo.GetAllParters();
+ allParterList?.ForEach(x =>
+ {
+ if (x is Yw.Model.HydroPumpInfo pump)
+ {
+ var hz = pump.RatedHz * pump.SpeedRatio;
+ var calcuPump = calcuResult.LinkList.Find(x => x.Id == pump.Code);
+ var calcuPumpStart = calcuResult.NodeList.Find(x => x.Id == pump.StartCode);
+ var calcuPumpEnd = calcuResult.NodeList.Find(x => x.Id == pump.EndCode);
+ var pumpCustomLabel = new CustomLabel();
+ pumpCustomLabel.Id = pump.Code;
+ pumpCustomLabel.Data = new List<CustomLabelItem>()
+ {
+ new CustomLabelItem(){ Name="鐘舵��",Value=HydroLinkStatusHelper.GetStatusName(pump.LinkStatus),Unit=string.Empty},
+ new CustomLabelItem(){ Name="棰戠巼",Value=hz.ToString(),Unit=string.Empty},
+ new CustomLabelItem(){ Name="娴侀噺",Value=Math.Round(calcuPump.Flow,1).ToString(),Unit="m鲁/h"},
+ new CustomLabelItem(){ Name="杩涘彛鍘嬪姏",Value=Math.Round(calcuPumpStart.Head,4).ToString(),Unit="m"},
+ new CustomLabelItem(){ Name="鍑哄彛鍘嬪姏",Value=Math.Round(calcuPumpEnd.Head,4).ToString(),Unit="m"},
+ };
+ obj.Add(pumpCustomLabel);
+ }
+ else if (x is Yw.Model.HydroEmitterInfo emitter)
+ {
+ var calcuEmitter = calcuResult.NodeList.Find(x => x.Id == emitter.Code);
+ var emitterCustomLabel = new CustomLabel();
+ emitterCustomLabel.Id = emitter.Code;
+ emitterCustomLabel.Data = new List<CustomLabelItem>()
+ {
+ new CustomLabelItem(){ Name="娴侀噺",Value=Math.Round(calcuEmitter.Demand,1).ToString(),Unit="m鲁/h"},
+ new CustomLabelItem(){ Name="鍘嬪姏",Value=Math.Round(calcuEmitter.Head,4).ToString(),Unit="m"}
+ };
+ obj.Add(emitterCustomLabel);
+ }
+ });
+ await _bimfaceInteropContainer?.SetLogicCalcuCustomLabels(obj);
}
/// <summary>
- /// 娓呴櫎鑷畾涔夋爣绛�
+ /// 娓呴櫎涓氬姟璁＄畻鑷畾涔夋爣绛�
/// </summary>
- public async Task ClearCustomLabels()
+ public async Task ClearLogicCalcuCustomLabels()
{
- if (_bimfaceInteropContainer == null)
- {
- return;
- }
- await _bimfaceInteropContainer.ClearCustomLabels();
+ await _bimfaceInteropContainer?.ClearLogicCalcuCustomLabels();
}
#endregion
@@ -538,76 +579,8 @@
#endregion
- #region 鑷畾涔夋爣绛�
-
- /// <summary>
- /// 鏄剧ず璁＄畻鑷畾涔夋爣绛�
- /// </summary>
- public async Task ShowCalcuCustomLabels(CalcuResult calcuResult)
- {
- var hydroInfo = _hydroInfoFunc?.Invoke();
- if (hydroInfo == null)
- {
- return;
- }
- if (calcuResult == null)
- {
- return;
- }
- if (!calcuResult.Succeed)
- {
- await _bimfaceInteropContainer.ClearCustomLabels();
- return;
- }
- var obj = new List<CustomLabel>();
- var allParterList = hydroInfo.GetAllParters();
- allParterList?.ForEach(x =>
- {
- if (x is Yw.Model.HydroPumpInfo pump)
- {
- var hz = pump.RatedHz * pump.SpeedRatio;
- var calcuPump = calcuResult.LinkList.Find(x => x.Id == pump.Code);
- var calcuPumpStart = calcuResult.NodeList.Find(x => x.Id == pump.StartCode);
- var calcuPumpEnd = calcuResult.NodeList.Find(x => x.Id == pump.EndCode);
- var pumpCustomLabel = new CustomLabel();
- pumpCustomLabel.Id = pump.Code;
- pumpCustomLabel.Data = new List<CustomLabelItem>()
- {
- new CustomLabelItem(){ Name="鐘舵��",Value=HydroLinkStatusHelper.GetStatusName(pump.LinkStatus),Unit=string.Empty},
- new CustomLabelItem(){ Name="棰戠巼",Value=hz.ToString(),Unit=string.Empty},
- new CustomLabelItem(){ Name="娴侀噺",Value=Math.Round(calcuPump.Flow,1).ToString(),Unit="m鲁/h"},
- new CustomLabelItem(){ Name="杩涘彛鍘嬪姏",Value=Math.Round(calcuPumpStart.Head,4).ToString(),Unit="m"},
- new CustomLabelItem(){ Name="鍑哄彛鍘嬪姏",Value=Math.Round(calcuPumpEnd.Head,4).ToString(),Unit="m"},
- };
- obj.Add(pumpCustomLabel);
- }
- else if (x is Yw.Model.HydroEmitterInfo emitter)
- {
- var calcuEmitter = calcuResult.NodeList.Find(x => x.Id == emitter.Code);
- var emitterCustomLabel = new CustomLabel();
- emitterCustomLabel.Id = emitter.Code;
- emitterCustomLabel.Data = new List<CustomLabelItem>()
- {
- new CustomLabelItem(){ Name="娴侀噺",Value=Math.Round(calcuEmitter.Demand,1).ToString(),Unit="m鲁/h"},
- new CustomLabelItem(){ Name="鍘嬪姏",Value=Math.Round(calcuEmitter.Head,4).ToString(),Unit="m"}
- };
- obj.Add(emitterCustomLabel);
- }
- });
- if (_bimfaceInteropContainer == null)
- {
- return;
- }
- await _bimfaceInteropContainer.SetCustomLabels(obj);
- }
-
- #endregion
-
- #region 鏍囨敞
-
- #endregion
#endregion
--
Gitblit v1.9.3