优化计算前提，计算逻辑还需要继续优化

lixiaojun

2024-10-18 5043208b24f45b3e3c630a596b9e83373096a78a

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs

@@ -1,5 +1,6 @@
global using Yw.EPAnet;
using NetTaste;
using Yw.WinFrmUI.Bimface;
using Yw.WinFrmUI.Hydro;

namespace HStation.WinFrmUI
{
@@ -11,7 +12,6 @@
            this.PageTitle.Caption = "水力模拟";
            this.PageTitle.HeaderSvgImage = this.svgImg32[0];
            this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;

        }

        private HStation.Vmo.XhsProjectVmo _project = null;//项目
@@ -62,39 +62,58 @@
                return;
            }
            this.PageTitle.Caption = $"{_project.Name}\r\n水力模拟";
            await this.xhsProjectSimulationBimfaceCtrl1.SetBindingData(_project, _projectSite, () => _hydroInfo);
            this.xhsProjectSimulationQ3dCtrl1.SetBindingData(_hydroInfo);
            this.xhsProjectSimulationPropertyCtrl1.InitialData(() => _hydroInfo);
            var bimfaceCtrl = GetBimfaceCtrl();
            this.tabPageBimface.Controls.Clear();
            this.tabPageBimface.Controls.Add(bimfaceCtrl);
            await bimfaceCtrl.InitialData(_project, _projectSite, () => _hydroInfo);
            var q3dCtrl = GetQ3dCtrl();
            this.tabPageQ3d.Controls.Clear();
            this.tabPageQ3d.Controls.Add(q3dCtrl);
            q3dCtrl.InitialData(() => _hydroInfo);
            var propertyCtrl = GetPropertyCtrl();
            this.controlContainerRight.Controls.Clear();
            this.controlContainerRight.Controls.Add(propertyCtrl);
            propertyCtrl.InitialData(() => _hydroInfo);
        }

        #region Bimface

        //bimface 加载完成事件
        private async void xhsProjectSimulationBimfaceCtrl1_LoadCompletedEvent()
        //获取 bimface 控件
        private XhsProjectSimulationBimfaceCtrl GetBimfaceCtrl()
        {
            if (_hydroInfo == null)
            if (_bimfaceCtrl == null)
            {
                return;
                _bimfaceCtrl = new XhsProjectSimulationBimfaceCtrl();
                _bimfaceCtrl.Dock = DockStyle.Fill;
                _bimfaceCtrl.LoadCompletedEvent += async () =>
                {//view加载完成事件
                    if (_hydroInfo == null)
                    {
                        return;
                    }
                    var elementIds = new List<string>();
                    var pumps = _hydroInfo.Pumps?.Where(x => x.LinkStatus == Yw.Hydro.PumpStatus.Open).ToList();
                    pumps?.ForEach(x => elementIds.Add(x.Code));
                    var valves = _hydroInfo.Valves?.Where(x => x.LinkStatus == Yw.Hydro.ValveStatus.Open).ToList();
                    valves?.ForEach(x => elementIds.Add(x.Code));
                    await _bimfaceCtrl?.SetOpenComponentsColor(elementIds);
                };
                _bimfaceCtrl.HydroMouseLeftClickEvent += (obj) =>
                {//鼠标左键点击事件
                    if (_hydroInfo == null)
                    {
                        return;
                    }
                    _parter = obj;
                    ShowProperty();
                    SetBimfaceLinkColor();
                };
            }
            var elementIds = new List<string>();
            var pumps = _hydroInfo.Pumps?.Where(x => x.LinkStatus == Yw.Hydro.PumpStatus.Open).ToList();
            pumps?.ForEach(x => elementIds.Add(x.Code));
            var valves = _hydroInfo.Valves?.Where(x => x.LinkStatus == Yw.Hydro.ValveStatus.Open).ToList();
            valves?.ForEach(x => elementIds.Add(x.Code));
            await this.xhsProjectSimulationBimfaceCtrl1.SetOpenComponentsColor(elementIds);
            return _bimfaceCtrl;
        }

        //bimface 水力点击事件
        private void xhsProjectSimulationBimfaceCtrl1_HydroClickEvent(Yw.Model.HydroParterInfo obj)
        {
            if (_hydroInfo == null)
            {
                return;
            }
            _parter = obj;
            ShowProperty();
            SetBimfaceLinkColor();
        }
        //bimface控件
        private XhsProjectSimulationBimfaceCtrl _bimfaceCtrl = null;

        //设置Bimface连接颜色
        private async void SetBimfaceLinkColor()
@@ -103,73 +122,106 @@
            {
                return;
            }
            var elementIds = new List<string>();
            if (_parter != null)
            {
                if (_parter is Yw.Model.HydroLinkInfo linker)
                if (_parter is Yw.Model.HydroLinkInfo link)
                {
                    var allParterList = _hydroInfo.GetAllParters();
                    var allLinkerList = _hydroInfo.GetAllLinks();
                    var startParter = allParterList?.Find(x => x.Code == linker.StartCode);
                    await _bimfaceCtrl?.RestoreLinkComponentsColor();

                    var allVisualList = _hydroInfo.GetAllVisuals();
                    var allLinkList = _hydroInfo.GetAllLinks();
                    var startParter = allVisualList?.Find(x => x.Code == link.StartCode);
                    if (startParter != null)
                    {
                        var startElementIds = new List<string>();
                        if (startParter.GetType() == typeof(Yw.Model.HydroJunctionInfo))
                        {
                            var startLinkList = allLinkerList?.Where(x => x.StartCode == startParter.Code || x.EndCode == startParter.Code).ToList();
                            if (startLinkList != null)
                            var startLinkList = allLinkList?.Where(x => x.StartCode == startParter.Code || x.EndCode == startParter.Code && x.Code != _parter.Code).ToList();
                            if (startLinkList != null && startLinkList.Count > 0)
                            {
                                elementIds.AddRange(startLinkList.Select(x => x.Code).Where(x => x != _parter.Code));
                                startElementIds.AddRange(startLinkList.Select(x => x.Code));
                            }
                        }
                        else
                        {
                            elementIds.Add(linker.StartCode);
                            startElementIds.Add(startParter.Code);
                        }
                        if (startElementIds.Count > 0)
                        {
                            await _bimfaceCtrl?.SetLinkStartComponentsColor(startElementIds);
                        }
                    }
                    var endParter = allParterList?.Find(x => x.Code == linker.EndCode);
                    var endParter = allVisualList?.Find(x => x.Code == link.EndCode);
                    if (endParter != null)
                    {
                        var endElementIds = new List<string>();
                        if (endParter.GetType() == typeof(Yw.Model.HydroJunctionInfo))
                        {
                            var endLinkList = allLinkerList?.Where(x => x.StartCode == endParter.Code || x.EndCode == endParter.Code).ToList();
                            if (endLinkList != null)
                            var endLinkList = allLinkList?.Where(x => x.StartCode == endParter.Code || x.EndCode == endParter.Code && x.Code != _parter.Code).ToList();
                            if (endLinkList != null && endLinkList.Count > 0)
                            {
                                elementIds.AddRange(endLinkList.Select(x => x.Code).Where(x => x != _parter.Code));
                                endElementIds.AddRange(endLinkList.Select(x => x.Code));
                            }
                        }
                        else
                        {
                            elementIds.Add(linker.EndCode);
                            endElementIds.Add(endParter.Code);
                        }
                        if (endElementIds.Count > 0)
                        {
                            await _bimfaceCtrl?.SetLinkEndComponentsColor(endElementIds);
                        }
                    }
                }
            }
            await this.xhsProjectSimulationBimfaceCtrl1.SetLinkComponentsColor(elementIds);
        }

        #endregion
        #endregion Bimface

        #region Q3d

        //点击事件
        private void xhsProjectSimulationQ3dCtrl1_ClickParterEvent(string code)
        //获取Q3d控件
        private XhsProjectSimulationQ3dCtrl GetQ3dCtrl()
        {
            if (_hydroInfo == null)
            if (_q3dCtrl == null)
            {
                return;
                _q3dCtrl = new XhsProjectSimulationQ3dCtrl();
                _q3dCtrl.Dock = DockStyle.Fill;
                _q3dCtrl.SelectedPartersChangedEvent += (obj) =>
                {
                    if (_hydroInfo == null)
                    {
                        return;
                    }
                    var allParterList = _hydroInfo.GetAllParters();
                    _parter = allParterList?.Find(x => x.Code == obj?.FirstOrDefault());
                    ShowProperty();
                };
            }
            var allParterList = _hydroInfo.GetAllParters();
            _parter = allParterList?.Find(x => x.Code == code);
            ShowProperty();
            return _q3dCtrl;
        }

        #endregion
        //Q3d控件
        private XhsProjectSimulationQ3dCtrl _q3dCtrl = null;

        #endregion Q3d

        #region 属性面板

        //获取属性控件
        private XhsProjectSimulationPropertyCtrl GetPropertyCtrl()
        {
            if (_propertyCtrl == null)
            {
                _propertyCtrl = new XhsProjectSimulationPropertyCtrl();
                _propertyCtrl.Dock = DockStyle.Fill;
            }
            return _propertyCtrl;
        }

        private XhsProjectSimulationPropertyCtrl _propertyCtrl = null;//属性控件

        #endregion
        #endregion 属性面板

        #region 自动匹配

@@ -193,7 +245,7 @@
                    {
                        elementIds.Add(_parter.Code);
                    }
                    await this.xhsProjectSimulationBimfaceCtrl1.ZoomAndSelectComponents(elementIds);
                    await _bimfaceCtrl?.ZoomAndSelectComponents(elementIds);
                    ShowProperty();
                    SetBimfaceLinkColor();
                };
@@ -208,6 +260,7 @@
            }
            return _matchingListCtrl;
        }

        //匹配列表控件
        private XhsProjectSimulationMatchingListCtrl _matchingListCtrl = null;

@@ -228,8 +281,7 @@
            this.docPnlBottom.Height = 350;
        }


        #endregion
        #endregion 自动匹配

        #region 未匹配列表

@@ -253,20 +305,21 @@
                    var allParterList = _hydroInfo.GetAllParters();
                    _parter = allParterList?.Find(x => x.Code == parter.Code);
                    var elementIds = new List<string>() { parter.Code };
                    await this.xhsProjectSimulationBimfaceCtrl1.ZoomAndSelectComponents(elementIds);
                    await _bimfaceCtrl?.ZoomAndSelectComponents(elementIds);
                    ShowProperty();
                    SetBimfaceLinkColor();
                };
                _unMatchingListCtrl.ViewModelEvent += async (parters) =>//查看模型
                {
                    var codes = parters?.Select(x => x.Code).Distinct().ToList();
                    await this.xhsProjectSimulationBimfaceCtrl1.ZoomAndSelectComponents(codes);
                    await _bimfaceCtrl?.ZoomAndSelectComponents(codes);
                    _parter = null;
                    ShowProperty();
                };
            }
            return _unMatchingListCtrl;
        }

        private XhsProjectSimulationUnMatchingListCtrl _unMatchingListCtrl = null;//未匹配列表

        //未匹配列表
@@ -285,9 +338,7 @@
            this.docPnlBottom.Height = 350;
        }



        #endregion
        #endregion 未匹配列表

        #region 一键显隐

@@ -308,16 +359,16 @@
            if (_fastShowHideCodeList == null)
            {
                _fastShowHideCodeList = _hydroInfo.Decorators.Select(x => x.Code).ToList();
                await this.xhsProjectSimulationBimfaceCtrl1.HideComponents(_fastShowHideCodeList);
                await _bimfaceCtrl?.HideComponents(_fastShowHideCodeList);
            }
            else
            {
                await this.xhsProjectSimulationBimfaceCtrl1.ShowComponents(_fastShowHideCodeList);
                await _bimfaceCtrl?.ShowComponents(_fastShowHideCodeList);
                _fastShowHideCodeList = null;
            }
        }

        #endregion
        #endregion 一键显隐

        #region 水力校验

@@ -348,13 +399,14 @@
                            elementIds.Add(_parter.Code);
                        }
                    }
                    await this.xhsProjectSimulationBimfaceCtrl1.ZoomAndSelectComponents(elementIds);
                    await _bimfaceCtrl?.ZoomAndSelectComponents(elementIds);
                    ShowProperty();
                    SetBimfaceLinkColor();
                };
            }
            return _checkResultCtrl;
        }

        //校验结果控件
        private XhsProjectSimulationHydroCheckResultCtrl _checkResultCtrl = null;

@@ -375,7 +427,7 @@
            this.docPnlBottom.Height = 350;
        }

        #endregion
        #endregion 水力校验

        #region 保存水力信息

@@ -396,7 +448,7 @@
            TipFormHelper.ShowSucceed("保存成功！");
        }

        #endregion
        #endregion 保存水力信息

        #region 构件明细

@@ -415,13 +467,14 @@
                    }
                    var allParterList = _hydroInfo.GetAllParters();
                    _parter = allParterList?.Find(x => x.Code == parter.Code);
                    await this.xhsProjectSimulationBimfaceCtrl1.ZoomAndSelectComponents(new List<string>() { _parter.Code });
                    await _bimfaceCtrl?.ZoomAndSelectComponents(new List<string>() { _parter.Code });
                    ShowProperty();
                    SetBimfaceLinkColor();
                };
            }
            return _parterListCtrl;
        }

        //构件明细控件
        private Yw.WinFrmUI.HydroParterListCtrl _parterListCtrl = null;

@@ -441,8 +494,7 @@
            this.docPnlBottom.Height = 350;
        }


        #endregion
        #endregion 构件明细

        #region INP导出

@@ -464,7 +516,7 @@
            TipFormHelper.ShowSucceed("导出成功");
        }

        #endregion
        #endregion INP导出

        #region 业务方法

@@ -475,12 +527,14 @@
            {
                return;
            }

            if (_parter == null)
            {
                this.xhsProjectSimulationPropertyCtrl1.SelectParter(null);
                _propertyCtrl?.SelectParter(null);
                return;
            }
            this.xhsProjectSimulationPropertyCtrl1.SelectParter(_parter.Code);

            _propertyCtrl?.SelectParter(_parter.Code);
            if (_calcuResult != null)
            {
                if (_calcuResult.Succeed)
@@ -511,14 +565,14 @@

                        if (calcuProperty != null)
                        {
                            this.xhsProjectSimulationPropertyCtrl1.UpdateCalcuProperty(calcuProperty);
                            _propertyCtrl?.UpdateCalcuProperty(calcuProperty);
                        }
                    }
                }
            }
        }

        #endregion
        #endregion 业务方法

        #region 配置

@@ -528,7 +582,7 @@
            this.rmSet.ShowPopup(MousePosition, true);
        }

        #endregion
        #endregion 配置

        #region 性能曲线

@@ -548,34 +602,56 @@
                return;
            }
            var pumps = _hydroInfo.Pumps;
            var curve_list = _hydroInfo.Curves;
            if (curve_list == null || !curve_list.Any())
            {
                return;
            }
            var vmList = new List<Yw.WinFrmUI.Phart.PumpSerialParallelViewModel>();
            foreach (var x in pumps)
            {
                if (!x.RatedN.HasValue)
                {
                    continue;
                }
                var qh = curve_list.Find(t => t.Code == x.CurveQH)?.CurveData;
                var qe = curve_list.Find(t => t.Code == x.CurveQE)?.CurveData;
                var qp = curve_list.Find(t => t.Code == x.CurveQP)?.CurveData;

                if (qh == null)
                {
                    continue;
                }

                var rated_speed = x.RatedN.Value;
                var speed_ratio = x.SpeedRatio;

                var qh_pt_list = qh.Select(x => new Yw.Geometry.Point2d(x.X, x.Y)).ToList();
                var qe_pt_list = qe?.Select(x => new Yw.Geometry.Point2d(x.X, x.Y)).ToList();
                var qp_pt_list = qp?.Select(x => new Yw.Geometry.Point2d(x.X, x.Y)).ToList();

                var vm = new Yw.WinFrmUI.Phart.PumpSerialParallelViewModel();
                vm.Id = x.Code;
                vm.Name = x.Code;
                //vm.IsBp = ;
                //vm.RatedSpeed = 590;
                //vm.CurrentSpeed = 590;
                //vm.CurrentHz = 50;
                var PointsQH = _hydroInfo.Curves?.Find(t => t.Code == x.CurveQH)?.CurveData?.Select(z => new Yw.Geometry.Point2d() { X = z.X, Y = z.Y }).ToList();
                var PointsQP = _hydroInfo.Curves?.Find(t => t.Code == x.CurveQP)?.CurveData?.Select(z => new Yw.Geometry.Point2d { X = z.X, Y = z.Y }).ToList();
                var PointsQE = _hydroInfo.Curves?.Find(t => t.Code == x.CurveQE)?.CurveData?.Select(z => new Yw.Geometry.Point2d { X = z.X, Y = z.Y }).ToList();
                vm.RatedSpeed = rated_speed;
                vm.CurrentSpeed = Math.Round(rated_speed * speed_ratio);
                vm.CurrentHz = Math.Round(vm.CurrentSpeed / vm.RatedSpeed * 50, 1);

                vm.Qh = new Yw.Geometry.CubicSpline2d(PointsQH);
                vm.Qe = new Yw.Geometry.CubicSpline2d(PointsQE);
                vm.Qp = new Yw.Geometry.CubicSpline2d(PointsQP);
                vm.Qh = new Yw.Geometry.CubicSpline2d(qh_pt_list);
                vm.Qe = new Yw.Geometry.CubicSpline2d(qe_pt_list);
                vm.Qp = new Yw.Geometry.CubicSpline2d(qp_pt_list);
                vmList.Add(vm);
            }

            var dlg = new HStation.WinFrmUI.PhartRelation.PumpSerialParallelChartDlg();
            dlg.SetBindingData(vmList, null, true);
            dlg.ShowDialog();
        }

        #endregion
        #endregion 性能曲线

        #region 水力计算


        //获取计算控件
        private XhsProjectSimulationCalcuCtrl GetCalcuCtrl()
@@ -594,28 +670,147 @@
                        {
                            return;
                        }
                        _checkResult = _hydroInfo.Check();
                        if (!_checkResult.Succeed)
                        {
                            this.controlContainerBottom.Controls.Clear();
                            var checkResultCtrl = GetCheckResultCtrl();
                            checkResultCtrl.SetBindingData(_checkResult);
                            this.controlContainerBottom.Controls.Add(checkResultCtrl);
                            TipFormHelper.ShowWarn("校验失败，请检查后重试");
                            return;
                        }

                        var netWork = Yw.Hydro.ParseHelper.ToNetwork(_hydroInfo);
                        _calcuResult = netWork.Calcu();
                        if (_calcuResult.Succeed)
                        {
                            this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
                            this.controlContainerBottom.Controls.Clear();
                            var parterListCtrl = GetParterListCtrl();
                            var calcuResultList = new List<IHydroCalcuResult>();
                            _calcuResult.NodeList?.ForEach(x =>
                            {
                                calcuResultList.Add(new HydroCalcuNodeResult()
                                {
                                    Code = x.Id,
                                    CalcuPress = x.Press,
                                    CalcuHead = x.Head,
                                    CalcuDemand = x.Demand,
                                });
                            });
                            _calcuResult.LinkList?.ForEach(x =>
                            {
                                calcuResultList.Add(new HydroCalcuLinkResult()
                                {
                                    Code = x.Id,
                                    CalcuFlow = x.Flow,
                                    CalcuVelocity = x.Velocity,
                                    CalcuHeadLoss = x.Headloss
                                });
                            });
                            parterListCtrl.SetBindingData(_hydroInfo, calcuResultList);
                            parterListCtrl.SetCalcuView();
                            this.controlContainerBottom.Controls.Add(parterListCtrl);
                            this.docPnlBottom.Text = "计算结果";
                            ShowProperty();
                            await _bimfaceCtrl?.ShowCalcuCustomLabels(_calcuResult);
                            TipFormHelper.ShowSucceed("计算成功！");
                            await this.xhsProjectSimulationBimfaceCtrl1.ShowCalcuCustomLabels(_calcuResult);
                        }
                        else
                        {
                            _calcuCtrl.SetBindingData(_calcuResult.FailedList);
                            this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
                            this.docPnlBottom.Text = "水力计算失败原因";
                            this.docPnlBottom.Text = "计算失败原因";
                            this.docPnlBottom.Height = 350;
                            TipFormHelper.ShowError("计算失败");
                        }

                    };
            }
            return _calcuCtrl;
        }

        private XhsProjectSimulationCalcuCtrl _calcuCtrl = null;//计算控件
        private SetHydroCalcuPrefixCtrl _calcuPrefixCtrl = null;

        private SetHydroCalcuPrefixCtrl GetCalcuPrefixCtrl()
        {
            if (_calcuPrefixCtrl == null)
            {
                _calcuPrefixCtrl = new SetHydroCalcuPrefixCtrl();
                _calcuPrefixCtrl.Dock = DockStyle.Fill;
                _calcuPrefixCtrl.InitialData(() => _hydroInfo);
                _calcuPrefixCtrl.HydroViewEvent += async (parter) =>
                {
                    if (parter == null)
                    {
                        return;
                    }
                    await _bimfaceCtrl.ZoomAndSelectComponents(new List<string>() { parter.Code });
                };
                _calcuPrefixCtrl.HydroCalcuEvent += async (hydroInfo) =>
                {
                    if (hydroInfo == null)
                    {
                        return;
                    }
                    _checkResult = hydroInfo.Check();
                    if (!_checkResult.Succeed)
                    {
                        this.controlContainerBottom.Controls.Clear();
                        var checkResultCtrl = GetCheckResultCtrl();
                        checkResultCtrl.SetBindingData(_checkResult);
                        this.controlContainerBottom.Controls.Add(checkResultCtrl);
                        TipFormHelper.ShowWarn("校验失败，请检查后重试");
                        return;
                    }

                    var netWork = Yw.Hydro.ParseHelper.ToNetwork(hydroInfo);
                    _calcuResult = netWork.Calcu();
                    if (_calcuResult.Succeed)
                    {
                        this.controlContainerBottom.Controls.Clear();
                        var parterListCtrl = GetParterListCtrl();
                        var calcuResultList = new List<IHydroCalcuResult>();
                        _calcuResult.NodeList?.ForEach(x =>
                        {
                            calcuResultList.Add(new HydroCalcuNodeResult()
                            {
                                Code = x.Id,
                                CalcuPress = x.Press,
                                CalcuHead = x.Head,
                                CalcuDemand = x.Demand,
                            });
                        });
                        _calcuResult.LinkList?.ForEach(x =>
                        {
                            calcuResultList.Add(new HydroCalcuLinkResult()
                            {
                                Code = x.Id,
                                CalcuFlow = x.Flow,
                                CalcuVelocity = x.Velocity,
                                CalcuHeadLoss = x.Headloss
                            });
                        });
                        parterListCtrl.SetBindingData(_hydroInfo, calcuResultList);
                        parterListCtrl.SetCalcuView();
                        this.controlContainerBottom.Controls.Add(parterListCtrl);
                        this.docPnlBottom.Text = "计算结果";
                        ShowProperty();
                        await _bimfaceCtrl?.ShowCalcuCustomLabels(_calcuResult);
                        TipFormHelper.ShowSucceed("计算成功！");
                    }
                    else
                    {
                        _calcuCtrl.SetBindingData(_calcuResult.FailedList);
                        this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
                        this.docPnlBottom.Text = "计算失败原因";
                        this.docPnlBottom.Height = 350;
                        TipFormHelper.ShowError("计算失败");
                    }
                };
            }
            return _calcuPrefixCtrl;
        }

        //水力计算
        private void barBtnHydroCalcu_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
@@ -624,17 +819,14 @@
            {
                return;
            }

            this.controlContainerBottom.Controls.Clear();
            var calcuCtrl = GetCalcuCtrl();
            calcuCtrl.SetBindingData(_hydroInfo);
            this.controlContainerBottom.Controls.Add(calcuCtrl);
            this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
            this.docPnlBottom.Text = "水力计算前提条件";
            this.docPnlBottom.Height = 350;
            var calcuPrefixCtrl = GetCalcuPrefixCtrl();
            calcuPrefixCtrl.SetBindingData();
            this.controlContainerRight.Controls.Clear();
            this.controlContainerRight.Controls.Add(calcuPrefixCtrl);
            this.docPnlRight.Text = "前提条件";
            this.docPnlRight.Width = SetHydroCalcuPrefixCtrl.ControlMinWidth;
            this.docPnlRight.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
        }



        #endregion

@@ -666,13 +858,14 @@
                    {
                        _parter = null;
                    }
                    await this.xhsProjectSimulationBimfaceCtrl1.ZoomAndSelectComponents(elementIds);
                    await _bimfaceCtrl?.ZoomAndSelectComponents(elementIds);
                    ShowProperty();
                    SetBimfaceLinkColor();
                };
            }
            return _searchCtrl;
        }

        private XhsProjectSimulationSearchCtrl _searchCtrl = null;//查询组件

        //查询
@@ -691,9 +884,78 @@
            this.docPnlBottom.Height = 350;
        }

        #endregion
        #endregion 构件查询

        #region 标注

        private List<HydroMarkSetViewModel> _allMarkList = null;

        //标注
        private void barBtnMark_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
        {
            if (_hydroInfo == null)
            {
                return;
            }
            if (_allMarkList == null)
            {
                _allMarkList = new List<HydroMarkSetViewModel>();
                if (_hydroInfo.Waterboxs != null && _hydroInfo.Waterboxs.Count > 0)
                {
                    _allMarkList.Add(new HydroMarkSetViewModel()
                    {
                        Code = Yw.Hydro.ParterCatalog.Waterbox,
                        Name = Yw.WinFrmUI.HydroParterCatalogHelper.GetCatalogName(Yw.Hydro.ParterCatalog.Waterbox),
                        MarkType = (int)eWaterboxMarkType.None
                    });
                }
                if (_hydroInfo.Pumps != null && _hydroInfo.Pumps.Count > 0)
                {
                    _allMarkList.Add(new HydroMarkSetViewModel()
                    {
                        Code = Yw.Hydro.ParterCatalog.Pump,
                        Name = Yw.WinFrmUI.HydroParterCatalogHelper.GetCatalogName(Yw.Hydro.ParterCatalog.Pump),
                        MarkType = (int)eWaterboxMarkType.None
                    });
                }
                if (_hydroInfo.Valves != null && _hydroInfo.Valves.Count > 0)
                {
                    _allMarkList.Add(new HydroMarkSetViewModel()
                    {
                        Code = Yw.Hydro.ParterCatalog.Valve,
                        Name = Yw.WinFrmUI.HydroParterCatalogHelper.GetCatalogName(Yw.Hydro.ParterCatalog.Valve),
                        MarkType = (int)eWaterboxMarkType.None
                    });
                }
                if (_hydroInfo.Pipes != null && _hydroInfo.Pipes.Count > 0)
                {
                    _allMarkList.Add(new HydroMarkSetViewModel()
                    {
                        Code = Yw.Hydro.ParterCatalog.Pipe,
                        Name = Yw.WinFrmUI.HydroParterCatalogHelper.GetCatalogName(Yw.Hydro.ParterCatalog.Pipe),
                        MarkType = (int)eWaterboxMarkType.None
                    });
                }
                if (_hydroInfo.Nozzles != null && _hydroInfo.Nozzles.Count > 0)
                {
                    _allMarkList.Add(new HydroMarkSetViewModel()
                    {
                        Code = Yw.Hydro.ParterCatalog.Nozzle,
                        Name = Yw.WinFrmUI.HydroParterCatalogHelper.GetCatalogName(Yw.Hydro.ParterCatalog.Nozzle),
                        MarkType = (int)eWaterboxMarkType.None
                    });
                }
            }
            var dlg = new SetHydroMarkDlg();
            dlg.SetBindingData(() => _hydroInfo, _allMarkList);
            dlg.ReloadDataEvent += async (obj) =>
            {
                var leadLabels = obj?.Select(x => new LogicMarkLeadLabel() { Id = x.Code, Text = x.Text }).ToList();
                await _bimfaceCtrl?.SetLogicMarkLeadLabels(leadLabels);
            };
            dlg.ShowDialog();
        }

        #endregion 标注
    }
}