From 4cb1f00f84d160f97afd0fb86cf600e1be667dd5 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期四, 17 十月 2024 11:22:15 +0800
Subject: [PATCH] 水力组件更新
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/02-bimface/XhsProjectSimulationBimfaceCtrl.cs | 25 +++++++++----------------
1 files changed, 9 insertions(+), 16 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 7967ca7..ef5424b 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
@@ -416,22 +416,22 @@
#endregion
- #region 寮曠嚎鏍囩
+ #region 涓氬姟鏍囨敞寮曠嚎鏍囩
/// <summary>
- /// 璁剧疆寮曠嚎鏍囩
+ /// 璁剧疆涓氬姟鏍囨敞寮曠嚎鏍囩
/// </summary>
- public async Task SetLeadLabels(List<LeadLabel> obj)
+ public async Task SetLogicMarkLeadLabels(List<LogicMarkLeadLabel> obj)
{
- await _bimfaceInteropContainer?.SetLeadLabels(obj);
+ await _bimfaceInteropContainer?.SetLogicMarkLeadLabels(obj);
}
/// <summary>
- /// 娓呴櫎寮曠嚎鏍囩
+ /// 娓呴櫎涓氬姟鏍囨敞寮曠嚎鏍囩
/// </summary>
- public async Task ClearLeadLabels()
+ public async Task ClearLogicMarkLeadLabels()
{
- await _bimfaceInteropContainer?.ClearLeadLabels();
+ await _bimfaceInteropContainer?.ClearLogicMarkLeadLabels();
}
#endregion
@@ -565,14 +565,7 @@
{
if (x is Yw.Model.HydroPumpInfo pump)
{
- double? speed = pump.RatedN;
- if (speed.HasValue)
- {
- if (pump.SpeedRatio.HasValue)
- {
- speed = speed.Value * pump.SpeedRatio.Value;
- }
- }
+ 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);
@@ -581,7 +574,7 @@
pumpCustomLabel.Data = new List<CustomLabelItem>()
{
new CustomLabelItem(){ Name="鐘舵��",Value=HydroLinkStatusHelper.GetStatusName(pump.LinkStatus),Unit=string.Empty},
- new CustomLabelItem(){ Name="杞��",Value=speed?.ToString(),Unit="r/min"},
+ 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"},
--
Gitblit v1.9.3