Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

Shuxia Ning

2024-10-29 edfb5be5dc9037152975bd4354e95d5eff78ce2d

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

@@ -1376,7 +1376,7 @@
        private List<HydroMarkSetViewModel> _allMarkList = null;

        //显示标注窗体
        private async void ShowMarkDlg()
        private void ShowMarkDlg()
        {
            if (_hydroInfo == null)
            {
@@ -1432,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();
        }

        //设置标注
@@ -1467,7 +1463,7 @@
            {
                return;
            }
            var dlg = new SetHydroGradingModelDlg();
            var dlg = new SetHydroGradingModelTreeDlg();
            dlg.SetBindingData(_hydroInfo.ID);
            dlg.ShowDialog();
        }