水力组件更新

lixiaojun

2024-10-17 4cb1f00f84d160f97afd0fb86cf600e1be667dd5

 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"},