From 9f5867ed019939452cb3008818e6177d4382c81a Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期六, 12 十月 2024 21:17:54 +0800
Subject: [PATCH] 核心界面逻辑完善
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs | 46 ++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 42 insertions(+), 4 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 2f0c690..92fe0c2 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
@@ -594,21 +594,59 @@
{
return;
}
+ _checkResult = _hydroInfo.Check();
+ if (!_checkResult.Succeed)
+ {
+ this.controlContainerBottom.Controls.Clear();
+ var checkResultCtrl = GetCheckResultCtrl();
+ checkResultCtrl.SetBindingData(_checkResult);
+ this.controlContainerBottom.Controls.Add(checkResultCtrl);
+ TipFormHelper.ShowWarn("鏍￠獙澶辫触锛岃妫�鏌ュ悗閲嶈瘯");
+ return;
+ }
+
var netWork = Yw.Hydro.ParseHelper.ToNetwork(_hydroInfo);
_calcuResult = netWork.Calcu();
if (_calcuResult.Succeed)
{
- this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
+ this.controlContainerBottom.Controls.Clear();
+ var parterListCtrl = GetParterListCtrl();
+ var calcuResultList = new List<IHydroCalcuResult>();
+ _calcuResult.NodeList?.ForEach(x =>
+ {
+ calcuResultList.Add(new HydroCalcuNodeResult()
+ {
+ Code = x.Id,
+ CalcuPress = x.Press,
+ CalcuHead = x.Head,
+ CalcuDemand = x.Demand,
+ });
+ });
+ _calcuResult.LinkList?.ForEach(x =>
+ {
+ calcuResultList.Add(new HydroCalcuLinkResult()
+ {
+ Code = x.Id,
+ CalcuFlow = x.Flow,
+ CalcuVelocity = x.Velocity,
+ CalcuHeadLoss = x.Headloss
+ });
+ });
+ parterListCtrl.SetBindingData(_hydroInfo, calcuResultList);
+ parterListCtrl.SetCalcuView();
+ this.controlContainerBottom.Controls.Add(parterListCtrl);
+ this.docPnlBottom.Text = "璁＄畻缁撴灉";
ShowProperty();
- TipFormHelper.ShowSucceed("璁＄畻鎴愬姛锛�");
await this.xhsProjectSimulationBimfaceCtrl1.ShowCalcuCustomLabels(_calcuResult);
+ TipFormHelper.ShowSucceed("璁＄畻鎴愬姛锛�");
}
else
{
_calcuCtrl.SetBindingData(_calcuResult.FailedList);
this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
- this.docPnlBottom.Text = "姘村姏璁＄畻澶辫触鍘熷洜";
+ this.docPnlBottom.Text = "璁＄畻澶辫触鍘熷洜";
this.docPnlBottom.Height = 350;
+ TipFormHelper.ShowError("璁＄畻澶辫触");
}
};
@@ -630,7 +668,7 @@
calcuCtrl.SetBindingData(_hydroInfo);
this.controlContainerBottom.Controls.Add(calcuCtrl);
this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
- this.docPnlBottom.Text = "姘村姏璁＄畻鍓嶆彁鏉′欢";
+ this.docPnlBottom.Text = "璁＄畻鍓嶆彁鏉′欢";
this.docPnlBottom.Height = 350;
}
--
Gitblit v1.9.3