lixiaojun
2024-10-29 cc89c6b8112cfccd270951a9177c6ac0e5307d79
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs
@@ -457,7 +457,7 @@
            return _checkCtrl;
        }
        //显示校验控件
        //显示检查控件
        private void ShowCheckCtrl()
        {
            if (_checkResult == null)
@@ -469,12 +469,12 @@
            this.controlContainerBottom.Controls.Clear();
            this.controlContainerBottom.Controls.Add(checkCtrl);
            this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
            this.docPnlBottom.Text = "校验结果";
            this.docPnlBottom.Text = "检查结果";
            this.docPnlBottom.Height = 350;
        }
        //水力验证
        //水力检查
        private void barBtnHydroCheck_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
        {
            if (_hydroInfo == null)
@@ -1007,7 +1007,7 @@
            }
            var dlg = new PumpParallelChartDlg();
            var dlg = new PumpParallelAnalyDlg();
            dlg.SetBindingData(vmList);
            dlg.ReloadDataEvent += (list) =>
            {
@@ -1082,10 +1082,7 @@
                }
            };
            if (dlg.ShowDialog() == DialogResult.Cancel)
            {
                await _bimfaceCtrl?.ClearLogicCalcuCustomLabels();
            }
            dlg.ShowDialog();
        }
        #endregion
@@ -1379,7 +1376,7 @@
        private List<HydroMarkSetViewModel> _allMarkList = null;
        //显示标注窗体
        private async void ShowMarkDlg()
        private void ShowMarkDlg()
        {
            if (_hydroInfo == null)
            {
@@ -1435,17 +1432,13 @@
                }
            }
            var dlg = new SetHydroMarkDlg();
            dlg.InitialData(() => _hydroInfo);
            dlg.SetBindingData(_allMarkList);
            dlg.SetBindingData(_hydroInfo, _allMarkList);
            dlg.ReloadDataEvent += async (allResultList) =>
            {
                var leadLabels = allResultList?.Select(x => new LogicMarkLeadLabel(x.Code, x.Text)).ToList();
                var leadLabels = allResultList?.Select(x => new LogicMarkLeadLabel(x.Code, x.Text, 100000)).ToList();
                await _bimfaceCtrl?.SetLogicMarkLeadLabels(leadLabels);
            };
            if (dlg.ShowDialog() != DialogResult.OK)
            {
                await _bimfaceCtrl?.ClearLogicMarkLeadLabels();
            }
            dlg.ShowDialog();
        }
        //设置标注
@@ -1470,7 +1463,7 @@
            {
                return;
            }
            var dlg = new SetHydroGradingModelDlg();
            var dlg = new SetHydroGradingModelTreeDlg();
            dlg.SetBindingData(_hydroInfo.ID);
            dlg.ShowDialog();
        }