From 299013bc2d9eb529a309b3ee63e22ed24f87aebe Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期六, 12 十月 2024 18:45:39 +0800
Subject: [PATCH] 增减计算前提于切换
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs | 50 +++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 41 insertions(+), 9 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 6daccb3..6e79b7b 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
@@ -17,6 +17,8 @@
this.PageTitle.HeaderSvgImage = this.svgImg32[0];
this.xhsProjectSimulationSearchCtrl1.ApplySearchEvent += XhsProjectSimulationSearchCtrl1_ApplySearchEvent;
+ this.xhsProjectSimulationCalcuCtrl1.CancelEvent += XhsProjectSimulationCalcuCtrl1_CancelEvent;
+ this.xhsProjectSimulationCalcuCtrl1.OkEvent += XhsProjectSimulationCalcuCtrl1_OkEvent;
this.docPnlHydroCheck.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
this.docPnlHydroCalcu.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
@@ -522,30 +524,60 @@
return;
}
- var dlg = new XhsProjectSimulationCalcuPrefixDlg();
- dlg.ShowDialog();
-
+ this.docPnlMatchingList.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
+ this.docPnlUnMatchingList.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
+ this.docPnlHydroParterList.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
+ this.docPnlSearch.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
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;
- this.docPnlSearch.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
+ this.xhsProjectSimulationCalcuCtrl1.SetBindingData(_hydroInfo);
+ this.docPnlHydroCalcu.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
+ this.docPnlHydroCalcu.Height = 350;
+
+
+
+ //var netWork = Yw.Hydro.ParseHelper.ToNetwork(_hydroInfo);
+ //_calcuResult = netWork.Calcu();
+ //if (_calcuResult.Succeed)
+ //{
+ // ShowProperty();
+ // TipFormHelper.ShowSucceed("璁＄畻鎴愬姛锛�");
+ //}
+ //else
+ //{
+ // this.xhsProjectSimulationHydroCalcuFailedCtrl1.SetBindingData(_calcuResult.FailedList);
+ // this.docPnlHydroCalcu.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
+ // this.docPnlHydroCalcu.Height = 350;
+ //}
+ //await this.xhsProjectSimulationBimfaceCtrl1.ShowCalcuCustomLabels(_calcuResult);
+ }
+
+ //鍙栨秷
+ private void XhsProjectSimulationCalcuCtrl1_CancelEvent()
+ {
+ this.docPnlHydroCalcu.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
+ }
+
+ //纭
+ private async void XhsProjectSimulationCalcuCtrl1_OkEvent()
+ {
var netWork = Yw.Hydro.ParseHelper.ToNetwork(_hydroInfo);
_calcuResult = netWork.Calcu();
if (_calcuResult.Succeed)
{
+ this.docPnlHydroCalcu.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
ShowProperty();
TipFormHelper.ShowSucceed("璁＄畻鎴愬姛锛�");
+ await this.xhsProjectSimulationBimfaceCtrl1.ShowCalcuCustomLabels(_calcuResult);
}
else
{
- this.xhsProjectSimulationHydroCalcuFailedCtrl1.SetBindingData(_calcuResult.FailedList);
+ this.xhsProjectSimulationCalcuCtrl1.SetBindingData(_calcuResult.FailedList);
this.docPnlHydroCalcu.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
this.docPnlHydroCalcu.Height = 350;
}
- await this.xhsProjectSimulationBimfaceCtrl1.ShowCalcuCustomLabels(_calcuResult);
+
}
#endregion
--
Gitblit v1.9.3