冲突

duheng

2025-02-19 a5b25c4f314079d293bf159ed6f0d7dcbadadbb7

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

@@ -2789,7 +2789,7 @@
                //损失统计
                printWorking.LossStatistics = HydroLossStatisticsHelper.Create(baseHydroInfoRhs, working, calcuResult, _calcuPressModeIsHead, allEvaluationList);
                //损失曲线
                printWorking.LossCurve = SimulationPrintLossCurveHelper.Create(baseHydroInfoRhs, working, selectedNode, calcuResult, _calcuPressModeIsHead, allEvaluationList);
                printWorking.LossCurve = HydroLossCurveHelper.Create(baseHydroInfoRhs, working, selectedNode, calcuResult, _calcuPressModeIsHead, allEvaluationList);
            }

            #endregion
@@ -2820,7 +2820,7 @@
                    //损失统计
                    printWorking.LossStatistics = HydroLossStatisticsHelper.Create(hydroInfoRhs, working, calcuResult, _calcuPressModeIsHead, allEvaluationList);
                    //损失曲线
                    printWorking.LossCurve = SimulationPrintLossCurveHelper.Create(hydroInfoRhs, working, selectedNode, calcuResult, _calcuPressModeIsHead, allEvaluationList);
                    printWorking.LossCurve = HydroLossCurveHelper.Create(hydroInfoRhs, working, selectedNode, calcuResult, _calcuPressModeIsHead, allEvaluationList);
                }
            }

@@ -3326,35 +3326,35 @@

        #region 损失曲线

        //单工况损失曲线控件
        private HydroSingleWorkingLossCurveInteropCtrl _singleWorkingLossCurveCtrl = null;
        //损失曲线交互控件
        private HydroLossCurveInteropCtrl _lossCurveInteropCtrl = null;

        //获取单工况损失曲线控件
        private HydroSingleWorkingLossCurveInteropCtrl GetSingleWorkingLossCurveCtrl()
        //获取损失曲线交互控件
        private HydroLossCurveInteropCtrl GetLossCurveInteropCtrl()
        {
            if (_singleWorkingLossCurveCtrl == null)
            if (_lossCurveInteropCtrl == null)
            {
                _singleWorkingLossCurveCtrl = new HydroSingleWorkingLossCurveInteropCtrl();
                _singleWorkingLossCurveCtrl.Dock = DockStyle.Fill;
                _singleWorkingLossCurveCtrl.HydroClickEvent += (code) =>
                _lossCurveInteropCtrl = new HydroLossCurveInteropCtrl();
                _lossCurveInteropCtrl.Dock = DockStyle.Fill;
                _lossCurveInteropCtrl.HydroClickEvent += (code) =>
                {
                    var visual = GetVisual(code);
                    SelectVisual(visual, eSimulationVisualSource.None);
                };
                _singleWorkingLossCurveCtrl.HydroSpecialDisplayEvent += (list) =>
                _lossCurveInteropCtrl.HydroSpecialDisplayEvent += (list) =>
                {
                    _bimfaceCtrl?.SetLogicOutlineGlowEffect(list);
                };
                _singleWorkingLossCurveCtrl.HydroCancelSpecialDisplayEvent += () =>
                _lossCurveInteropCtrl.HydroCancelSpecialDisplayEvent += () =>
                {
                    _bimfaceCtrl?.RemoveLogicOutlineGlowEffect();
                };
            }
            return _singleWorkingLossCurveCtrl;
            return _lossCurveInteropCtrl;
        }

        //单工况损失曲线控件是否可见
        private bool IsSingleWorkingLossCurveCtrlVisible
        //损失曲线控件是否可见
        private bool IsLossCurveInteropCtrlVisible
        {
            get
            {
@@ -3362,7 +3362,7 @@
                {
                    if (this.controlContainerBottom.Controls.Count > 0)
                    {
                        if (this.controlContainerBottom.Controls[0] is HydroSingleWorkingLossCurveInteropCtrl)
                        if (this.controlContainerBottom.Controls[0] is HydroLossCurveInteropCtrl)
                        {
                            return true;
                        }
@@ -3372,43 +3372,43 @@
            }
        }

        //显示单工况损失曲线控件
        private void ShowSingleWorkingLossCurveCtrl(Yw.Model.HydroModelInfo hydroInfo, HydroCalcuResult calcuResult, HydroVisualInfo visual)
        //显示损失曲线控件
        private void ShowLossCurveInteropCtrl
            (
                Yw.Model.HydroModelInfo hydroInfo,
                HydroWorkingVmo working,
                HydroNodeInfo node,
                HydroCalcuResult calcuResult = null,
                bool isHead = false,
                List<HydroEvaluationVmo> allEvaluationList = null
            )
        {
            var singleWorkingLossCurveCtrl = GetSingleWorkingLossCurveCtrl();
            if (!IsSingleWorkingLossCurveCtrlVisible)
            var ctrl = GetLossCurveInteropCtrl();
            if (!IsLossCurveInteropCtrlVisible)
            {
                this.controlContainerBottom.Controls.Clear();
                this.controlContainerBottom.Controls.Add(singleWorkingLossCurveCtrl);
                this.controlContainerBottom.Controls.Add(ctrl);
                this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
                this.docPnlBottom.Text = "损失曲线";
                this.docPnlBottom.Height = 350;
            }
            singleWorkingLossCurveCtrl.SetBindingData(hydroInfo, calcuResult, visual);
            ctrl.SetBindingData(hydroInfo, working, node, calcuResult, isHead, allEvaluationList);
        }

        //损失曲线
        private void barBtnWorkingLossCurve_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
        private async void barBtnLossCurve_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
        {
            if (_visual == null)
            var node = GetSelectNode();
            if (node == null)
            {
                SelectInputSource();
                if (_visual == null)
                {
                    TipFormHelper.ShowWarn("请选择构件后重试！");
                    return;
                }
            }
            HydroVisualInfo visual = _visual;
            if (_visual is HydroLinkInfo linkInfo)
            {
                var visualListHelper = GetVisualListHelper();
                visual = visualListHelper.GetVisual(linkInfo.StartCode);
                return;
            }

            var workingCheckedListHelper = GetWorkingCheckedListHelper();
            var allCheckedWorkingList = workingCheckedListHelper.GetCheckedWorkingList();
            if (allCheckedWorkingList == null || allCheckedWorkingList.Count < 1)
            var isHead = _calcuPressModeIsHead;
            var allEvaluationList = await GetEvaluationList();

            var workingList = GetCheckedWorkingList();
            if (workingList == null || workingList.Count < 1)
            {
                var workingHelper = GetWorkingHelper();
                if (!workingHelper.Initialized)
@@ -3416,18 +3416,13 @@
                    TipFormHelper.ShowWarn("请计算后重试！");
                    return;
                }
                ShowSingleWorkingLossCurveCtrl(workingHelper.HydroInfo, workingHelper.CalcuResult, visual);
                ShowLossCurveInteropCtrl(workingHelper.HydroInfo, workingHelper.Working, node, workingHelper.CalcuResult, isHead, allEvaluationList);
                return;
            }
            else
            {
                var dlg = new HydroMultiWorkingLossCurveDlg();
                dlg.HydroClickEvent += (code) =>
                {
                    SelectVisual(code, eSimulationVisualSource.None);
                };
                dlg.SetBindingData(_hydroInfo, allCheckedWorkingList, visual);
                dlg.ShowDialog();
            }

            var dlg = new HydroLossCurveMultiWorkingDlg();
            dlg.SetBindingData(_hydroInfo, workingList, node, _calcuPressModeIsHead, allEvaluationList);
            dlg.ShowDialog();
        }

        #endregion