From b4a3cd00731396b2a032e19c1ef968316f051709 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期五, 08 十一月 2024 11:01:30 +0800
Subject: [PATCH] 计算优化
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs | 61 ++++++++++++++++++++++++++++++
1 files changed, 60 insertions(+), 1 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs
index 06abb3b..6ab634a 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs
@@ -98,6 +98,7 @@
{
return;
}
+ ApplyGrading();
};
_bimfaceCtrl.HydroMouseLeftClickEvent += (obj) =>
{//榧犳爣宸﹂敭鐐瑰嚮浜嬩欢
@@ -1275,6 +1276,63 @@
dlg.ShowDialog();
}
+ //鏄剧ず宸ュ喌璁＄畻绐椾綋
+ private void ShowWorkingCalcuDlg()
+ {
+ var dlg = new SetHydroWorkingInfoDlg();
+ dlg.HydroViewEvent += async (parter) =>
+ {
+ _selectedParter = parter;
+ if (_selectedParter != null)
+ {
+ await _bimfaceCtrl?.ZoomAndSelectComponents(new List<string>() { _selectedParter.Code });
+ }
+ ShowProperty();
+ };
+ dlg.HydroCalcuEvent += async (hydroInfo, workingInfo) =>
+ {
+ if (_hydroInfo == null)
+ {
+ return;
+ }
+ _hydroInfo.UpdateWorkingInfo(workingInfo);
+ //鏍￠獙
+ _checkResult = _hydroInfo.Check();
+ if (!_checkResult.Succeed)
+ {
+ ShowCheckCtrl();
+ TipFormHelper.ShowWarn("鏍￠獙澶辫触锛岃妫�鏌ュ悗閲嶈瘯");
+ return;
+ }
+
+ WaitFormHelper.ShowWaitForm(this, "姝ｅ湪璁＄畻鍒嗘瀽涓紝璇风◢鍊�...");
+
+
+ await Task.Delay(5000);
+
+ var netWork = Yw.Hydro.ParseHelper.ToNetwork(_hydroInfo);
+ _calcuResult = netWork.Calcu();
+
+ WaitFormHelper.HideWaitForm();
+ if (_calcuResult.Succeed)
+ {
+ GetCalcuResultList(false);
+ await _bimfaceCtrl?.SetLogicCalcuCustomLabels(_calcuResult);
+ TipFormHelper.ShowSucceed("璁＄畻鎴愬姛锛�");
+ }
+ else
+ {
+ ShowCalcuFailedCtrl();
+ TipFormHelper.ShowError("璁＄畻澶辫触锛�");
+ }
+ AutoApplyGrading();
+ UpdateParterListProperty();
+ ShowProperty();
+ };
+ dlg.SetBindingData(_hydroInfo);
+ dlg.ShowDialog();
+ }
+
#endregion
#region 璁＄畻澶辫触
@@ -1494,7 +1552,8 @@
//姘村姏璁＄畻
private void barBtnHydroCalcu_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
- ShowCalcuPrefixDlg();
+ //ShowCalcuPrefixDlg();
+ ShowWorkingCalcuDlg();
}
#endregion
--
Gitblit v1.9.3