曲线模块修改

Shuxia Ning

2025-01-07 5f51a2fe3461e1f88e75b0b6959719d25f657ef3

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/XhsProjectSimulationMgrPage.cs

@@ -124,11 +124,6 @@
                        //增加工况事件
                        this.simulationFunctionMgrCtrl1.AppendWorking(scheme, working);
                    };
                    page.SaveModelEvent += (rhs) =>
                    {
                        //保存模型事件
                        return this.simulationFunctionMgrCtrl1.SaveModel(scheme, rhs);
                    };
                    page.RefreshModelEvent += () =>
                    {
                        //刷新模型事件
@@ -207,7 +202,7 @@
                Modular = this.PageGuid.Modular,
                MoudingType = eMoudingType.Tab,
                Function = SimulationFunctionHelper.Simulation,
                TagName = projectSite.ID.ToString()
                TagName = $"{project.ID}-{projectSite.ID}-{scheme?.ID}"
            };
            var page = FindPage(guid);
            if (page == null)
@@ -237,7 +232,7 @@
                Modular = this.PageGuid.Modular,
                MoudingType = eMoudingType.Tab,
                Function = SimulationFunctionHelper.Simulation,
                TagName = projectSite.ID.ToString()
                TagName = $"{project.ID}-{projectSite.ID}-{scheme?.ID}"
            };
            var page = FindPage(guid);
            if (page == null)
@@ -258,23 +253,14 @@
                XhsProjectVmo project,
                XhsProjectSiteVmo projectSite,
                Yw.Model.HydroModelInfo hydroInfo,
                List<XhsSchemeVmo> allSchemeList,
                SvgImage svgImage
            )
        {
            //WaitFormHelper.ShowWaitForm(this.FindForm(), "正在加载模型，请稍侯...");
            //var dlg = new AddXhsSchemeDlg();
            //dlg.Shown += delegate { WaitFormHelper.HideWaitForm(this.FindForm()); };
            //dlg.ReloadDataEvent += (rhs) =>
            //{
            //    this.simulationFunctionMgrCtrl1.AppendScheme(rhs);
            //};
            //dlg.SetBindingData(project, projectSite, hydroInfo);
            //dlg.ShowDialog();

            WaitFormHelper.ShowWaitForm(this.FindForm(), "正在加载模型，请稍侯...");
            WaitFormHelper.ShowWaitForm(this.FindForm(), "正在加载，请稍侯...");
            var dlg = new CreateXhsSchemeDlg();
            dlg.Shown += delegate { WaitFormHelper.HideWaitForm(this.FindForm()); };
            dlg.SetBindingData(project, projectSite, hydroInfo);
            dlg.SetBindingData(project, projectSite, hydroInfo, allSchemeList);
            dlg.ReloadDataEvent += (rhs) =>
            {
                this.simulationFunctionMgrCtrl1.AppendScheme(rhs);