From 1a2bcaa7bec4f0bc681e55d1ccc61b14427c98ce Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期六, 25 一月 2025 12:45:20 +0800
Subject: [PATCH] 增加构件自定义参数
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/XhsProjectSimulationMgrPage.cs | 27 ++++++---------------------
1 files changed, 6 insertions(+), 21 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/XhsProjectSimulationMgrPage.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/XhsProjectSimulationMgrPage.cs
index 1ec4c8a..7db75a9 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/XhsProjectSimulationMgrPage.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/XhsProjectSimulationMgrPage.cs
@@ -1,5 +1,4 @@
-锘縰sing DevExpress.Drawing;
-using DevExpress.Utils.Svg;
+锘縰sing DevExpress.Utils.Svg;
using DevExpress.XtraBars.Docking;
using DevExpress.XtraBars.Docking2010.Views;
using Yw.Vmo;
@@ -124,11 +123,6 @@
//澧炲姞宸ュ喌浜嬩欢
this.simulationFunctionMgrCtrl1.AppendWorking(scheme, working);
};
- page.SaveModelEvent += (rhs) =>
- {
- //淇濆瓨妯″瀷浜嬩欢
- return this.simulationFunctionMgrCtrl1.SaveModel(scheme, rhs);
- };
page.RefreshModelEvent += () =>
{
//鍒锋柊妯″瀷浜嬩欢
@@ -207,7 +201,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 +231,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 +252,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);
--
Gitblit v1.9.3