From 3270519d3036ad96ad8a05e323f0134b304d79dd Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期二, 24 九月 2024 11:35:18 +0800
Subject: [PATCH] 水力模拟核心界面整理
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/XhsProjectSimulationCorePage.cs | 119 ++++++++++++++++++++++++++++++++++-------------------------
1 files changed, 68 insertions(+), 51 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/XhsProjectSimulationCorePage.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/XhsProjectSimulationCorePage.cs
index f5f15d2..ed1b412 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/XhsProjectSimulationCorePage.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/XhsProjectSimulationCorePage.cs
@@ -4,6 +4,7 @@
using HStation.WinFrmUI.Xhs.Core;
using NPOI.SS.Formula.Functions;
using Yw.WinFrmUI.HydroL2d;
+using Yw.WinFrmUI.HydroL3d;
namespace HStation.WinFrmUI
{
@@ -105,29 +106,7 @@
}
}
- //姘村姏楠岃瘉
- private void barBtnHydroCheck_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
- {
- if (_hydroInfo == null)
- {
- return;
- }
- this.docPnlHydroCheck.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
- this.docPnlHydroCalcu.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
- this.docPnlHydroParterList.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
- this.docPnlUnMatchingList.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
- var netWork = Yw.Hydro.ParseHelper.ToNetwork(_hydroInfo);
- _checkResult = netWork.Check();
- if (_checkResult.Succeed)
- {
- TipFormHelper.ShowSucceed("鏍￠獙閫氳繃锛�");
- return;
- }
- this.xhsProjectSimulationHydroCheckFailedCtrl1.SetBindingData(_checkResult.FailedList);
- this.docPnlHydroCheck.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
- this.docPnlHydroCheck.Height = 350;
- }
//姘村姏璁＄畻
private void barBtnHydroCalcu_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
@@ -254,23 +233,7 @@
}
}
- //淇濆瓨
- private async void barBtnSave_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
- {
- if (_hydroInfo == null)
- {
- return;
- }
- var id = await BLLFactory<Yw.BLL.HydroModelInfo>.Instance.Save(_hydroInfo);
- if (id < 1)
- {
- TipFormHelper.ShowError("淇濆瓨澶辫触锛�");
- return;
- }
- _hydroInfo = await BLLFactory<Yw.BLL.HydroModelInfo>.Instance.GetByID(id);
- //this.xhsProjectSimulationPropertyCtrl1.SetMatching(_hydroInfo);
- TipFormHelper.ShowSucceed("淇濆瓨鎴愬姛锛�");
- }
+
//鑷姩鍖归厤
private void barBtnAllAutoMatching_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
@@ -365,18 +328,7 @@
};
}
- //姘村姏鏍￠獙鐐瑰嚮
- private async void xhsProjectSimulationHydroCheckFailedCtrl1_HydroClickEvent(string obj)
- {
- if (_hydroInfo == null)
- {
- return;
- }
- await this.xhsProjectSimulationBimfaceCtrl1.SetSelectedComponents(new List<string>() { obj });
- var allParterList = _hydroInfo.GetAllParters();
- _parter = allParterList.Find(x => x.Code == obj);
- ShowProperty();
- }
+
//姘村姏鏋勪欢鏄庣粏闈㈡澘鐐瑰嚮浜嬩欢
private async void hydroParterListCtrl1_HydroClickEvent(Yw.Model.HydroParterInfo parter)
@@ -386,6 +338,49 @@
await this.xhsProjectSimulationBimfaceCtrl1.SetSelectedComponents(new List<string>() { _parter.Code });
ShowProperty();
}
+
+ #region 姘村姏鏍￠獙
+
+ //姘村姏楠岃瘉
+ private void barBtnHydroCheck_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ {
+ if (_hydroInfo == null)
+ {
+ return;
+ }
+ this.docPnlHydroCheck.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
+ this.docPnlHydroCalcu.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
+ this.docPnlHydroParterList.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
+ this.docPnlUnMatchingList.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
+ this.docPnlMatchingList.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
+
+ var netWork = Yw.Hydro.ParseHelper.ToNetwork(_hydroInfo);
+ _checkResult = netWork.Check();
+ if (_checkResult.Succeed)
+ {
+ TipFormHelper.ShowSucceed("鏍￠獙閫氳繃锛�");
+ return;
+ }
+ this.xhsProjectSimulationHydroCheckFailedCtrl1.SetBindingData(_checkResult.FailedList);
+ this.docPnlHydroCheck.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
+ this.docPnlHydroCheck.Height = 350;
+ }
+
+ //姘村姏鏍￠獙鐐瑰嚮
+ private async void xhsProjectSimulationHydroCheckFailedCtrl1_HydroClickEvent(string code)
+ {
+ if (_hydroInfo == null)
+ {
+ return;
+ }
+ var allParterList = _hydroInfo.GetAllParters();
+ _parter = allParterList.Find(x => x.Code == code);
+ var elementIds = new List<string>() { _parter.Code };
+ await this.xhsProjectSimulationBimfaceCtrl1.ZoomAndSelectComponents(elementIds);
+ ShowProperty();
+ }
+
+ #endregion
#region 鏈尮閰嶅垪琛�
@@ -429,5 +424,27 @@
#endregion
+ #region 淇濆瓨姘村姏淇℃伅
+
+ //淇濆瓨
+ private async void barBtnSave_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ {
+ if (_hydroInfo == null)
+ {
+ return;
+ }
+ var id = await BLLFactory<Yw.BLL.HydroModelInfo>.Instance.Save(_hydroInfo);
+ if (id < 1)
+ {
+ TipFormHelper.ShowError("淇濆瓨澶辫触锛�");
+ return;
+ }
+ _hydroInfo = await BLLFactory<Yw.BLL.HydroModelInfo>.Instance.GetByID(id);
+ TipFormHelper.ShowSucceed("淇濆瓨鎴愬姛锛�");
+ }
+
+
+ #endregion
+
}
}
\ No newline at end of file
--
Gitblit v1.9.3