From 9242291f2a1d7c7186f502d451f77f601af194d0 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 30 十二月 2024 14:44:19 +0800
Subject: [PATCH] 修改导入
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/XhsProjectSimulationMgrPage.cs | 307 +++++++++++++++++++++-----------------------------
1 files changed, 129 insertions(+), 178 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/XhsProjectSimulationMgrPage.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/XhsProjectSimulationMgrPage.cs
index 37f5caf..1ec4c8a 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/XhsProjectSimulationMgrPage.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/XhsProjectSimulationMgrPage.cs
@@ -15,22 +15,20 @@
this.PageTitle.Caption = "姘村姏妯℃嫙";
this.PageTitle.HeaderSvgImage = this.svgImg32[0];
this.PageTitle.SvgImageSize = new Size(24, 24);
- this.simulationFunctionMgrCtrl1.ShowProjectSiteInfoEvent += XhsProjectSimulationFunctionMgrCtrl1_ShowProjectSiteInfoEvent;
- this.simulationFunctionMgrCtrl1.ShowProjectSiteSimulationEvent += XhsProjectSimulationFunctionMgrCtrl1_ShowProjectSiteSimulationEvent;
- this.simulationFunctionMgrCtrl1.ShowProjectSiteWorkingEvent += XhsProjectSimulationFunctionMgrCtrl1_ShowProjectSiteWorkingEvent;
- this.simulationFunctionMgrCtrl1.ProjectSiteWorkingUpdateEvent += XhsProjectSimulationFunctionMgrCtrl1_ProjectSiteWorkingUpdateEvent;
- this.simulationFunctionMgrCtrl1.ProjectSiteWorkingRemoveEvent += XhsProjectSimulationFunctionMgrCtrl1_ProjectSiteWorkingRemoveEvent;
- this.simulationFunctionMgrCtrl1.ProjectSiteWorkingCheckedEvent += XhsProjectSimulationFunctionMgrCtrl1_ProjectSiteWorkingCheckedEvent;
- this.simulationFunctionMgrCtrl1.CreateProjectSiteSchemeEvent += XhsProjectSimulationFunctionMgrCtrl1_CreateProjectSiteSchemeEvent;
- this.simulationFunctionMgrCtrl1.ShowProjectSiteSchemeEvent += XhsProjectSimulationFunctionMgrCtrl1_ShowProjectSiteSchemeEvent;
- this.simulationFunctionMgrCtrl1.ShowProjectSiteSchemeWorkingEvent += XhsProjectSimulationFunctionMgrCtrl1_ShowProjectSiteSchemeWorkingEvent;
- this.simulationFunctionMgrCtrl1.ProjectSiteSchemeWorkingCheckedEvent += SimulationFunctionMgrCtrl1_ProjectSiteSchemeWorkingCheckedEvent;
- this.simulationFunctionMgrCtrl1.ProjectSiteSchemeWorkingUpdateEvent += SimulationFunctionMgrCtrl1_ProjectSiteSchemeWorkingUpdateEvent;
- this.simulationFunctionMgrCtrl1.ProjectSiteSchemeWorkingRemoveEvent += SimulationFunctionMgrCtrl1_ProjectSiteSchemeWorkingRemoveEvent;
+ this.simulationFunctionMgrCtrl1.ShowProjectSiteInfoEvent += SimulationFunctionMgrCtrl1_ShowProjectSiteInfoEvent;
+ this.simulationFunctionMgrCtrl1.ShowProjectSiteSimulationEvent += SimulationFunctionMgrCtrl1_ShowProjectSiteSimulationEvent;
+ this.simulationFunctionMgrCtrl1.ProjectSiteWorkingAppendEvent += SimulationFunctionMgrCtrl1_ProjectSiteWorkingAppendEvent;
+ this.simulationFunctionMgrCtrl1.ProjectSiteWorkingUpdateEvent += SimulationFunctionMgrCtrl1_ProjectSiteWorkingUpdateEvent;
+ this.simulationFunctionMgrCtrl1.ProjectSiteWorkingRemoveEvent += SimulationFunctionMgrCtrl1_ProjectSiteWorkingRemoveEvent;
+ this.simulationFunctionMgrCtrl1.ProjectSiteWorkingCheckedEvent += SimulationFunctionMgrCtrl1_ProjectSiteWorkingCheckedEvent;
+ this.simulationFunctionMgrCtrl1.CreateProjectSiteSchemeEvent += SimulationFunctionMgrCtrl1_CreateProjectSiteSchemeEvent;
+ this.simulationFunctionMgrCtrl1.ProjectSiteSchemeAppendEvent += SimulationFunctionMgrCtrl1_ProjectSiteSchemeAppendEvent;
+ this.simulationFunctionMgrCtrl1.ProjectSiteSchemeUpdateEvent += SimulationFunctionMgrCtrl1_ProjectSiteSchemeUpdateEvent;
+ this.simulationFunctionMgrCtrl1.ProjectSiteSchemeRemoveEvent += SimulationFunctionMgrCtrl1_ProjectSiteSchemeRemoveEvent;
}
private XhsProjectVmo _project = null;//椤圭洰
- private object _locker = new object();//閿佸畾瀵硅薄
+ private object _locker = new();//閿佸畾瀵硅薄
/// <summary>
/// 鍒濆鍖栨暟鎹簮
@@ -70,8 +68,13 @@
#region 鍔熻兘闈㈡澘
//鏄剧ず椤圭洰绔欐鍐典簨浠�
- private void XhsProjectSimulationFunctionMgrCtrl1_ShowProjectSiteInfoEvent
- (XhsProjectVmo project, XhsProjectSiteVmo projectSite, Yw.Model.HydroModelInfo hydroInfo, SvgImage svgImage)
+ private void SimulationFunctionMgrCtrl1_ShowProjectSiteInfoEvent
+ (
+ XhsProjectVmo project,
+ XhsProjectSiteVmo projectSite,
+ Yw.Model.HydroModelInfo hydroInfo,
+ SvgImage svgImage
+ )
{
lock (_locker)
{
@@ -80,6 +83,7 @@
Modular = this.PageGuid.Modular,
MoudingType = eMoudingType.Tab,
Function = SimulationFunctionHelper.Info,
+ TagName = $"{project.ID}-{projectSite.ID}"
};
if (!IsExistPage(guid, true))
{
@@ -92,8 +96,15 @@
}
//鏄剧ず椤圭洰绔欐按鍔涙ā鎷熶簨浠�
- private void XhsProjectSimulationFunctionMgrCtrl1_ShowProjectSiteSimulationEvent
- (XhsProjectVmo project, XhsProjectSiteVmo projectSite, Yw.Model.HydroModelInfo hydroInfo, Dictionary<HydroWorkingVmo, bool> allWorkingCheckedListDict, SvgImage svgImage)
+ private void SimulationFunctionMgrCtrl1_ShowProjectSiteSimulationEvent
+ (
+ XhsProjectVmo project,
+ XhsProjectSiteVmo projectSite,
+ XhsSchemeVmo scheme,
+ Yw.Model.HydroModelInfo hydroInfo,
+ Dictionary<HydroWorkingVmo, bool> allWorkingCheckedListDict,
+ SvgImage svgImage
+ )
{
lock (_locker)
{
@@ -102,7 +113,7 @@
Modular = this.PageGuid.Modular,
MoudingType = eMoudingType.Tab,
Function = SimulationFunctionHelper.Simulation,
- TagName = projectSite.ID.ToString()
+ TagName = $"{project.ID}-{projectSite.ID}-{scheme?.ID}"
};
if (!IsExistPage(guid, true))
{
@@ -110,55 +121,64 @@
page.PageTitle.HeaderSvgImage = svgImage;
page.AppendWorkingEvent += (working) =>
{
- this.simulationFunctionMgrCtrl1.AppendWorking(working);
+ //澧炲姞宸ュ喌浜嬩欢
+ this.simulationFunctionMgrCtrl1.AppendWorking(scheme, working);
};
- page.SetBindingData(project, projectSite, hydroInfo, allWorkingCheckedListDict);
+ page.SaveModelEvent += (rhs) =>
+ {
+ //淇濆瓨妯″瀷浜嬩欢
+ return this.simulationFunctionMgrCtrl1.SaveModel(scheme, rhs);
+ };
+ page.RefreshModelEvent += () =>
+ {
+ //鍒锋柊妯″瀷浜嬩欢
+ return this.simulationFunctionMgrCtrl1.RefreshModel(scheme);
+ };
+ page.UpdateSchemeEvent += (rhs) =>
+ {
+ //鏇存柊鏂规浜嬩欢
+ this.simulationFunctionMgrCtrl1.UpdateScheme(rhs);
+ };
+ page.RemoveSchemeEvent += (rhs) =>
+ {
+ //绉婚櫎鏂规浜嬩欢
+ this.simulationFunctionMgrCtrl1.RemoveScheme(rhs);
+ };
+ page.SetBindingData(project, projectSite, scheme, hydroInfo, allWorkingCheckedListDict);
CreatePage(page, guid);
}
}
}
- //鏄剧ず椤圭洰绔欏伐鍐典簨浠�
- private void XhsProjectSimulationFunctionMgrCtrl1_ShowProjectSiteWorkingEvent
- (XhsProjectVmo project, XhsProjectSiteVmo projectSite, Yw.Model.HydroModelInfo hydroInfo, HydroWorkingVmo working, SvgImage svgImage)
+ /// <summary>
+ /// 椤圭洰绔欏伐鍐靛鍔犱簨浠�
+ /// </summary>
+ private void SimulationFunctionMgrCtrl1_ProjectSiteWorkingAppendEvent
+ (
+ XhsProjectVmo project,
+ XhsProjectSiteVmo projectSite,
+ XhsSchemeVmo scheme,
+ HydroWorkingVmo working
+ )
{
- lock (_locker)
- {
- var guid = new PageGuid()
- {
- Modular = this.PageGuid.Modular,
- MoudingType = eMoudingType.Tab,
- Function = SimulationFunctionHelper.Working,
- TagName = working.ID.ToString()
- };
- if (!IsExistPage(guid, true))
- {
- var page = new XhsProjectSimulationWorkingPage();
- page.UpdateWorkingEvent += (rhs) =>
- {
- this.simulationFunctionMgrCtrl1.UpdateWorking(rhs);
- };
- page.RemoveWorkingEvent += (rhs) =>
- {
- this.simulationFunctionMgrCtrl1.RemoveWorking(rhs);
- };
- page.PageTitle.HeaderSvgImage = svgImage;
- page.SetBindingData(project, projectSite, hydroInfo, working);
- CreatePage(page, guid);
- }
- }
+ //鐩墠澧炲姞宸ュ喌閮芥槸閫氳繃妯℃嫙鐣岄潰澧炲姞鐨勶紝鍔熻兘绠＄悊鎺т欢灞炰簬琚�氱煡鐨勶紝鍏朵粬鍦版柟鏆傛椂涓嶅叧蹇冨伐鍐靛鍔�
}
//椤圭洰绔欏伐鍐垫洿鏂颁簨浠�
- private void XhsProjectSimulationFunctionMgrCtrl1_ProjectSiteWorkingUpdateEvent
- (XhsProjectVmo project, XhsProjectSiteVmo projectSite, Yw.Model.HydroModelInfo hydroInfo, HydroWorkingVmo working)
+ private void SimulationFunctionMgrCtrl1_ProjectSiteWorkingUpdateEvent
+ (
+ XhsProjectVmo project,
+ XhsProjectSiteVmo projectSite,
+ XhsSchemeVmo scheme,
+ HydroWorkingVmo working
+ )
{
var guid = new PageGuid()
{
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)
@@ -174,8 +194,13 @@
}
//椤圭洰绔欏伐鍐电Щ闄や簨浠�
- private void XhsProjectSimulationFunctionMgrCtrl1_ProjectSiteWorkingRemoveEvent
- (XhsProjectVmo project, XhsProjectSiteVmo projectSite, Yw.Model.HydroModelInfo hydroInfo, HydroWorkingVmo working)
+ private void SimulationFunctionMgrCtrl1_ProjectSiteWorkingRemoveEvent
+ (
+ XhsProjectVmo project,
+ XhsProjectSiteVmo projectSite,
+ XhsSchemeVmo scheme,
+ HydroWorkingVmo working
+ )
{
var guid = new PageGuid()
{
@@ -198,8 +223,14 @@
}
//椤圭洰绔欏伐鍐甸�夋嫨鏀瑰彉浜嬩欢
- private void XhsProjectSimulationFunctionMgrCtrl1_ProjectSiteWorkingCheckedEvent
- (XhsProjectVmo project, XhsProjectSiteVmo projectSite, Yw.Model.HydroModelInfo hydroInfo, HydroWorkingVmo working, bool hasChecked)
+ private void SimulationFunctionMgrCtrl1_ProjectSiteWorkingCheckedEvent
+ (
+ XhsProjectVmo project,
+ XhsProjectSiteVmo projectSite,
+ XhsSchemeVmo scheme,
+ HydroWorkingVmo working,
+ bool hasChecked
+ )
{
var guid = new PageGuid()
{
@@ -222,147 +253,67 @@
}
//椤圭洰绔欐柟妗堝垱寤轰簨浠�
- private void XhsProjectSimulationFunctionMgrCtrl1_CreateProjectSiteSchemeEvent
- (XhsProjectVmo project, XhsProjectSiteVmo projectSite, Yw.Model.HydroModelInfo hydroInfo, SvgImage svgImage)
+ private void SimulationFunctionMgrCtrl1_CreateProjectSiteSchemeEvent
+ (
+ XhsProjectVmo project,
+ XhsProjectSiteVmo projectSite,
+ Yw.Model.HydroModelInfo hydroInfo,
+ 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(), "姝ｅ湪鍔犺浇妯″瀷锛岃绋嶄警...");
- var dlg = new AddXhsSchemeDlg();
+ var dlg = new CreateXhsSchemeDlg();
dlg.Shown += delegate { WaitFormHelper.HideWaitForm(this.FindForm()); };
+ dlg.SetBindingData(project, projectSite, hydroInfo);
dlg.ReloadDataEvent += (rhs) =>
{
this.simulationFunctionMgrCtrl1.AppendScheme(rhs);
};
- dlg.SetBindingData(project, projectSite, hydroInfo);
dlg.ShowDialog();
}
- //鏄剧ず椤圭洰绔欐柟妗堜簨浠�
- private void XhsProjectSimulationFunctionMgrCtrl1_ShowProjectSiteSchemeEvent
- (XhsProjectVmo project, XhsProjectSiteVmo projectSite, XhsSchemeVmo scheme, Yw.Model.HydroModelInfo hydroInfo, Dictionary<HydroWorkingVmo, bool> dict, SvgImage svgImage)
+ //椤圭洰绔欐柟妗堝鍔犱簨浠�
+ private void SimulationFunctionMgrCtrl1_ProjectSiteSchemeAppendEvent
+ (
+ XhsProjectVmo project,
+ XhsProjectSiteVmo projectSite,
+ XhsSchemeVmo scheme
+ )
{
- lock (_locker)
- {
- var guid = new PageGuid()
- {
- Modular = this.PageGuid.Modular,
- MoudingType = eMoudingType.Tab,
- Function = SimulationFunctionHelper.Scheme,
- TagName = scheme.ID.ToString()
- };
- if (!IsExistPage(guid, true))
- {
- var page = new XhsProjectSimulationSchemePage();
- page.PageTitle.HeaderSvgImage = svgImage;
- page.AppendWorkingEvent += (working) =>
- {
- this.simulationFunctionMgrCtrl1.AppendSchemeWorking(scheme, working);
- };
- page.SetBindingData(project, projectSite, scheme, hydroInfo, dict);
- CreatePage(page, guid);
- }
- }
+ //琚姩
}
- //鏄剧ず椤圭洰绔欐柟妗堝伐鍐典簨浠�
- private void XhsProjectSimulationFunctionMgrCtrl1_ShowProjectSiteSchemeWorkingEvent
- (XhsProjectVmo project, XhsProjectSiteVmo projectSite, XhsSchemeVmo scheme, Yw.Model.HydroModelInfo hydroInfo, HydroWorkingVmo working, SvgImage svgImage)
+ //椤圭洰绔欐柟妗堟洿鏂颁簨浠�
+ private void SimulationFunctionMgrCtrl1_ProjectSiteSchemeUpdateEvent
+ (
+ XhsProjectVmo project,
+ XhsProjectSiteVmo projectSite,
+ XhsSchemeVmo scheme
+ )
{
- lock (_locker)
- {
- var guid = new PageGuid()
- {
- Modular = this.PageGuid.Modular,
- MoudingType = eMoudingType.Tab,
- Function = SimulationFunctionHelper.Working,
- TagName = working.ID.ToString()
- };
- if (!IsExistPage(guid, true))
- {
- var page = new XhsProjectSimulationWorkingPage();
- page.PageTitle.HeaderSvgImage = svgImage;
- page.UpdateWorkingEvent += (rhs) =>
- {
- this.simulationFunctionMgrCtrl1.UpdateSchemeWorking(scheme, rhs);
- };
- page.RemoveWorkingEvent += (rhs) =>
- {
- this.simulationFunctionMgrCtrl1.RemoveSchemeWorking(scheme, rhs);
- };
- page.SetBindingData(project, projectSite, scheme, hydroInfo, working);
- CreatePage(page, guid);
- }
- }
+ //琚姩
}
- //椤圭洰绔欐柟妗堝伐鍐甸�夋嫨鏀瑰彉浜嬩欢
- private void SimulationFunctionMgrCtrl1_ProjectSiteSchemeWorkingCheckedEvent(XhsSchemeVmo scheme, HydroWorkingVmo working, bool hasChecked)
+ //椤圭洰绔欐柟妗堢Щ闄や簨浠�
+ private void SimulationFunctionMgrCtrl1_ProjectSiteSchemeRemoveEvent
+ (
+ XhsProjectVmo project,
+ XhsProjectSiteVmo projectSite,
+ XhsSchemeVmo scheme
+ )
{
- var guid = new PageGuid()
- {
- Modular = this.PageGuid.Modular,
- MoudingType = eMoudingType.Tab,
- Function = SimulationFunctionHelper.Scheme,
- TagName = scheme.ID.ToString()
- };
- var page = FindPage(guid);
- if (page == null)
- {
- return;
- }
- var ctrl = page as XhsProjectSimulationSchemePage;
- if (ctrl == null)
- {
- return;
- }
- ctrl.UpdateWorkingCheckedList(working, hasChecked);
+ //琚姩
}
-
- //椤圭洰绔欐柟妗堝伐鍐垫洿鏂颁簨浠�
- private void SimulationFunctionMgrCtrl1_ProjectSiteSchemeWorkingUpdateEvent(XhsSchemeVmo scheme, HydroWorkingVmo working)
- {
- var guid = new PageGuid()
- {
- Modular = this.PageGuid.Modular,
- MoudingType = eMoudingType.Tab,
- Function = SimulationFunctionHelper.Scheme,
- TagName = scheme.ID.ToString()
- };
- var page = FindPage(guid);
- if (page == null)
- {
- return;
- }
- var ctrl = page as XhsProjectSimulationSchemePage;
- if (ctrl == null)
- {
- return;
- }
-
- }
-
- //椤圭洰绔欐柟妗堝伐鍐电Щ闄や簨浠�
- private void SimulationFunctionMgrCtrl1_ProjectSiteSchemeWorkingRemoveEvent(XhsSchemeVmo scheme, HydroWorkingVmo working)
- {
- var guid = new PageGuid()
- {
- Modular = this.PageGuid.Modular,
- MoudingType = eMoudingType.Tab,
- Function = SimulationFunctionHelper.Scheme,
- TagName = scheme.ID.ToString()
- };
- var page = FindPage(guid);
- if (page == null)
- {
- return;
- }
- var ctrl = page as XhsProjectSimulationSchemePage;
- if (ctrl == null)
- {
- return;
- }
-
- }
-
#endregion
--
Gitblit v1.9.3