From 1aa330646ad9f88abc580e17d08d727a0ecaae48 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期五, 15 十一月 2024 11:49:08 +0800
Subject: [PATCH] 核心界面优化整理
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs | 927 ++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 550 insertions(+), 377 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 417c85a..7359ca3 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
@@ -1,5 +1,6 @@
锘縢lobal using Yw.EPAnet;
using DevExpress.Mvvm.Native;
+using DevExpress.Office.Utils;
using DevExpress.Utils.Extensions;
using DevExpress.Xpo.Helpers;
using DevExpress.XtraBars.Ribbon;
@@ -31,9 +32,6 @@
private HStation.Vmo.XhsProjectSiteVmo _projectSite = null;//椤圭洰绔�
private Yw.Model.HydroModelInfo _hydroInfo = null;//姘村姏淇℃伅
-
- private Yw.WinFrmUI.HydroCheckResult _checkResult = null;//妫�鏌ョ粨鏋�
- private Yw.EPAnet.CalcuResult _calcuResult = null;//璁＄畻缁撴灉
/// <summary>
@@ -531,27 +529,7 @@
- #region INP瀵煎嚭
- //瀵煎嚭姘村姏INP鏂囦欢
- private void barBtnHydroExportInp_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
- {
- if (_hydroInfo == null)
- {
- return;
- }
- var fileName = Yw.WinFrmUI.FileDialogHelper.SaveInp("瀵煎嚭Inp鏂囦欢");
- if (string.IsNullOrEmpty(fileName))
- {
- return;
- }
- var netWork = Yw.Hydro.ParseHelper.ToNetwork(_hydroInfo);
- var result = netWork.ToInpString();
- File.WriteAllText(fileName, result);
- TipFormHelper.ShowSucceed("瀵煎嚭鎴愬姛");
- }
-
- #endregion INP瀵煎嚭
#region 鎵归噺閰嶇疆
@@ -1043,299 +1021,7 @@
#endregion
- #region 姘村姏璁＄畻
-
- #region 宸ュ喌
-
-
- //鏄剧ず宸ュ喌璁＄畻绐椾綋
- private void ShowWorkingCalcuDlg()
- {
- var dlg = new SetHydroWorkingInfoDlg();
- dlg.HydroViewEvent += async (parter) =>
- {
- _selectedVisual = parter as Yw.Model.HydroVisualInfo;
- if (_selectedVisual != null)
- {
- await _bimfaceCtrl?.ZoomAndSelectComponents(new List<string>() { _selectedVisual.Code });
- }
- ShowSelectedProperty();
- };
- 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.CalcuMinorLoss();
-
- WaitFormHelper.HideWaitForm();
- if (_calcuResult.Succeed)
- {
- GetCalcuResultList(false);
- UpdateVisualViewModelProperty();
- UpdateVisualViewModelCalcuProperty();
- UpdateVisualListCtrl();
- UpdateSelectedProperty();
- await _bimfaceCtrl?.SetLogicCalcuCustomLabels(_calcuResult);
- TipFormHelper.ShowSucceed("璁＄畻鎴愬姛锛�");
- var codes = _hydroInfo.Pumps.Select(x => x.Code).ToList();
- await _bimfaceCtrl?.ZoomAndSelectComponents(codes);
- }
- else
- {
- ShowCalcuFailedCtrl();
- TipFormHelper.ShowError("璁＄畻澶辫触锛�");
- }
- AutoApplyGrading();
- UpdateVisualListCtrl();
- ShowSelectedProperty();
- };
- dlg.SetBindingData(_hydroInfo);
- dlg.ShowDialog();
- }
-
- #endregion
-
- #region 璁＄畻澶辫触
-
- //璁＄畻澶辫触鎺т欢
- private HydroCalcuFailedCtrl _calcuFailedCtrl = null;
-
- //鑾峰彇璁＄畻澶辫触鎺т欢
- private HydroCalcuFailedCtrl GetCalcuFailedCtrl()
- {
- if (_calcuFailedCtrl == null)
- {
- _calcuFailedCtrl = new HydroCalcuFailedCtrl();
- _calcuFailedCtrl.Dock = DockStyle.Fill;
- }
- return _calcuFailedCtrl;
- }
-
- //鏄剧ず璁＄畻澶辫触鎺т欢
- private void ShowCalcuFailedCtrl()
- {
- if (_hydroInfo == null)
- {
- return;
- }
- if (_calcuResult == null)
- {
- return;
- }
- if (_calcuResult.Succeed)
- {
- return;
- }
- var calcuFailedCtrl = GetCalcuFailedCtrl();
- calcuFailedCtrl.SetBindingData(_calcuResult.FailedList);
- this.controlContainerBottom.Controls.Clear();
- this.controlContainerBottom.Controls.Add(calcuFailedCtrl);
- this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
- this.docPnlBottom.Text = "璁＄畻澶辫触鍘熷洜";
- this.docPnlBottom.Height = 350;
- }
-
- #endregion
-
- #region 璁＄畻缁撴灉
-
- //鎵�鏈夎绠楃粨鏋滃垪琛�
- private List<HydroCalcuResult> _allCalcuResultList = null;
-
- //鑾峰彇璁＄畻缁撴灉
- //true 浣跨敤缂撳瓨锛宖alse 涓嶄娇鐢ㄧ紦瀛�
- private List<HydroCalcuResult> GetCalcuResultList(bool isCache = true)
- {
- if (_hydroInfo == null)
- {
- return default;
- }
- if (_calcuResult == null)
- {
- return default;
- }
- if (!_calcuResult.Succeed)
- {
- return default;
- }
- if (isCache)
- {
- return _allCalcuResultList;
- }
-
- _allCalcuResultList = new List<HydroCalcuResult>();
-
- //鑺傜偣
- var allNodeList = _hydroInfo.GetAllNodes();
- if (allNodeList != null && allNodeList.Count > 0)
- {
- foreach (var node in allNodeList)
- {
- var calcuNode = _calcuResult.NodeList?.Find(x => x.Id == node.Code);
- if (calcuNode != null)
- {
- var calcuResult = new HydroCalcuNodeResult()
- {
- Code = node.Code,
- CalcuPress = calcuNode.Press,
- CalcuHead = calcuNode.Head,
- CalcuDemand = calcuNode.Demand
- };
- _allCalcuResultList.Add(calcuResult);
- }
- }
- }
-
- //绠℃
- var allLinkList = _hydroInfo.GetAllLinks();
- if (allLinkList != null && allLinkList.Count > 0)
- {
- foreach (var link in allLinkList)
- {
- var calcuLink = _calcuResult.LinkList?.Find(x => x.Id == link.Code);
- if (calcuLink != null)
- {
- var calcuResult = new HydroCalcuLinkResult()
- {
- Code = link.Code,
- CalcuFlow = calcuLink.Flow,
- CalcuVelocity = calcuLink.Velocity,
- CalcuHeadLoss = calcuLink.Headloss
- };
- _allCalcuResultList.Add(calcuResult);
- }
- }
- }
-
- //娴侀噺璁�
- var allFlowmeterList = _hydroInfo.Flowmeters;
- if (allFlowmeterList != null && allFlowmeterList.Count > 0)
- {
- foreach (var flowmeter in allFlowmeterList)
- {
- var calcuFlowmeterResult = _allCalcuResultList.Find(x => x.Code == flowmeter.Code) as HydroCalcuNodeResult;
- if (calcuFlowmeterResult != null)
- {
- var calcuFlowmeterNewResult = new HydroCalcuFlowmeterResult(calcuFlowmeterResult);
- var calcuFlowmeterLinkResultList = new List<HydroCalcuLinkResult>();
- var flowmeterLinkList = allLinkList?.Where(x => x.StartCode == flowmeter.Code || x.EndCode == flowmeter.Code).ToList();
- if (flowmeterLinkList != null && flowmeterLinkList.Count > 0)
- {
- foreach (var flowmeterLink in flowmeterLinkList)
- {
- var calcuFlowmeterLinkResult = _allCalcuResultList.Find(x => x.Code == flowmeterLink.Code) as HydroCalcuLinkResult;
- if (calcuFlowmeterLinkResult != null)
- {
- calcuFlowmeterLinkResultList.Add(calcuFlowmeterLinkResult);
- }
- }
- }
- if (calcuFlowmeterLinkResultList.Exists(x => x.CalcuFlow.HasValue))
- {
- calcuFlowmeterNewResult.CalcuQ = calcuFlowmeterLinkResultList.Where(x => x.CalcuFlow.HasValue).Average(x => x.CalcuFlow.Value);
- }
- _allCalcuResultList.Remove(calcuFlowmeterResult);
- _allCalcuResultList.Add(calcuFlowmeterNewResult);
- }
- }
- }
-
- //鍘嬪姏琛�
- var allPressmeterList = _hydroInfo.Pressmeters;
- if (allPressmeterList != null && allPressmeterList.Count > 0)
- {
- foreach (var pressmeter in allPressmeterList)
- {
- var calcuPressmeterResult = _allCalcuResultList.Find(x => x.Code == pressmeter.Code) as HydroCalcuNodeResult;
- if (calcuPressmeterResult != null)
- {
- var calcuPressmeterNewResult = new HydroCalcuPressmeterResult(calcuPressmeterResult);
- calcuPressmeterNewResult.CalcuPr = calcuPressmeterResult.CalcuPress;
- _allCalcuResultList.Remove(calcuPressmeterResult);
- _allCalcuResultList.Add(calcuPressmeterNewResult);
- }
- }
- }
-
- //姘存车
- var allPumpList = _hydroInfo.Pumps;
- if (allPumpList != null && allPumpList.Count > 0)
- {
- foreach (var pump in allPumpList)
- {
- var calcuPumpResult = _allCalcuResultList.Find(x => x.Code == pump.Code) as HydroCalcuLinkResult;
- if (calcuPumpResult != null)
- {
- var calcuPumpNewResult = new HydroCalcuPumpResult(calcuPumpResult);
- calcuPumpNewResult.CalcuQ = calcuPumpResult.CalcuFlow;
- if (calcuPumpNewResult.CalcuQ.HasValue)
- {
- var calcuNodeStartResult = _allCalcuResultList.Find(x => x.Code == pump.StartCode) as HydroCalcuNodeResult;
- var calcuNodeEndResult = _allCalcuResultList.Find(x => x.Code == pump.EndCode) as HydroCalcuNodeResult;
- if (calcuNodeStartResult != null && calcuNodeEndResult != null)
- {
- if (calcuNodeStartResult.CalcuPress.HasValue && calcuNodeEndResult.CalcuPress.HasValue)
- {
- calcuPumpNewResult.CalcuH = Math.Abs(calcuNodeStartResult.CalcuPress.Value - calcuNodeEndResult.CalcuPress.Value);
- }
- if (pump.LinkStatus == Yw.Hydro.PumpStatus.Open && pump.RatedN.HasValue)
- {
- var curveqp = _hydroInfo.Curves?.Find(x => x.Code == pump.CurveQP);
- if (curveqp != null)
- {
- if (curveqp.CurveData != null && curveqp.CurveData.Count > 3)
- {
- var point2dList = curveqp.CurveData.Select(x => new Yw.Geometry.Point2d(x.X, x.Y)).ToList();
- var point2dSimularList = point2dList.GetQPPointListByN(pump.RatedN.Value, pump.RatedN.Value * pump.SpeedRatio);
- var pumpCurveQp = new Yw.Pump.CurveQP(eFeatType.Cubic, point2dSimularList);
- calcuPumpNewResult.CalcuP = pumpCurveQp.FeatCurve.GetPointY(calcuPumpNewResult.CalcuQ.Value);
- }
- }
- }
- if (calcuPumpNewResult.CalcuH.HasValue && calcuPumpNewResult.CalcuP.HasValue)
- {
- calcuPumpNewResult.CalcuE = Yw.Pump.CalculationHelper.CalcuE(calcuPumpNewResult.CalcuQ.Value, calcuPumpNewResult.CalcuH.Value, calcuPumpNewResult.CalcuP.Value);
- }
- }
- }
- _allCalcuResultList.Remove(calcuPumpResult);
- _allCalcuResultList.Add(calcuPumpNewResult);
- }
- }
- }
-
- return _allCalcuResultList;
- }
-
- #endregion
-
- //姘村姏璁＄畻
- private void barBtnHydroCalcu_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
- {
- //ShowCalcuPrefixDlg();
- ShowWorkingCalcuDlg();
- }
-
- #endregion
#region 鏋勪欢鏌ヨ
@@ -1967,6 +1653,17 @@
await ClearMarkResultList();
}
+
+ #region 鏍囨敞鏄剧ず
+
+ //鏄惁鏄剧ず
+ private void barCkMark_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ {
+
+ }
+
+ #endregion
+
#endregion
#region 棰滆壊鍒嗙骇
@@ -2078,7 +1775,7 @@
{
Code = Yw.Hydro.ParterCatalog.Pipe,
Name = Yw.WinFrmUI.HydroParterCatalogHelper.GetName(Yw.Hydro.ParterCatalog.Pipe),
- PropName = HydroCalcuProp.CalcuFlow
+ PropName = HydroVisualCalcuProp.CalcuFlow
});
}
}
@@ -2145,9 +1842,9 @@
}
}
break;
- case HydroCalcuProp.CalcuFlow:
+ case HydroVisualCalcuProp.CalcuFlow:
{
- var gradingList = allCatalogGradingList.Where(x => x.PropName == HydroCalcuProp.CalcuFlow).OrderBy(t => t.SortCode).ToList();
+ var gradingList = allCatalogGradingList.Where(x => x.PropName == HydroVisualCalcuProp.CalcuFlow).OrderBy(t => t.SortCode).ToList();
if (gradingList != null && gradingList.Count > 0)
{
var calcuResult = allCalcuResultList?.Find(t => t.Code == pump.Code);
@@ -2170,9 +1867,9 @@
}
}
break;
- case HydroCalcuProp.CalcuVelocity:
+ case HydroVisualCalcuProp.CalcuVelocity:
{
- var gradingList = allCatalogGradingList.Where(x => x.PropName == HydroCalcuProp.CalcuVelocity).OrderBy(t => t.SortCode).ToList();
+ var gradingList = allCatalogGradingList.Where(x => x.PropName == HydroVisualCalcuProp.CalcuVelocity).OrderBy(t => t.SortCode).ToList();
if (gradingList != null && gradingList.Count > 0)
{
var calcuResult = allCalcuResultList?.Find(t => t.Code == pump.Code);
@@ -2195,9 +1892,9 @@
}
}
break;
- case HydroCalcuProp.CalcuHeadLoss:
+ case HydroVisualCalcuProp.CalcuHeadLoss:
{
- var gradingList = allCatalogGradingList.Where(x => x.PropName == HydroCalcuProp.CalcuHeadLoss).OrderBy(t => t.SortCode).ToList();
+ var gradingList = allCatalogGradingList.Where(x => x.PropName == HydroVisualCalcuProp.CalcuHeadLoss).OrderBy(t => t.SortCode).ToList();
if (gradingList != null && gradingList.Count > 0)
{
var calcuResult = allCalcuResultList?.Find(t => t.Code == pump.Code);
@@ -2252,9 +1949,9 @@
}
}
break;
- case HydroCalcuProp.CalcuFlow:
+ case HydroVisualCalcuProp.CalcuFlow:
{
- var gradingList = allCatalogGradingList.Where(x => x.PropName == HydroCalcuProp.CalcuFlow).OrderBy(t => t.SortCode).ToList();
+ var gradingList = allCatalogGradingList.Where(x => x.PropName == HydroVisualCalcuProp.CalcuFlow).OrderBy(t => t.SortCode).ToList();
if (gradingList != null && gradingList.Count > 0)
{
var calcuResult = allCalcuResultList?.Find(t => t.Code == valve.Code);
@@ -2277,9 +1974,9 @@
}
}
break;
- case HydroCalcuProp.CalcuVelocity:
+ case HydroVisualCalcuProp.CalcuVelocity:
{
- var gradingList = allCatalogGradingList.Where(x => x.PropName == HydroCalcuProp.CalcuVelocity).OrderBy(t => t.SortCode).ToList();
+ var gradingList = allCatalogGradingList.Where(x => x.PropName == HydroVisualCalcuProp.CalcuVelocity).OrderBy(t => t.SortCode).ToList();
if (gradingList != null && gradingList.Count > 0)
{
var calcuResult = allCalcuResultList?.Find(t => t.Code == valve.Code);
@@ -2302,9 +1999,9 @@
}
}
break;
- case HydroCalcuProp.CalcuHeadLoss:
+ case HydroVisualCalcuProp.CalcuHeadLoss:
{
- var gradingList = allCatalogGradingList.Where(x => x.PropName == HydroCalcuProp.CalcuHeadLoss).OrderBy(t => t.SortCode).ToList();
+ var gradingList = allCatalogGradingList.Where(x => x.PropName == HydroVisualCalcuProp.CalcuHeadLoss).OrderBy(t => t.SortCode).ToList();
if (gradingList != null && gradingList.Count > 0)
{
var calcuResult = allCalcuResultList?.Find(t => t.Code == valve.Code);
@@ -2341,9 +2038,9 @@
{
switch (x.PropName)
{
- case HydroCalcuProp.CalcuFlow:
+ case HydroVisualCalcuProp.CalcuFlow:
{
- var gradingList = allCatalogGradingList.Where(x => x.PropName == HydroCalcuProp.CalcuFlow).OrderBy(t => t.SortCode).ToList();
+ var gradingList = allCatalogGradingList.Where(x => x.PropName == HydroVisualCalcuProp.CalcuFlow).OrderBy(t => t.SortCode).ToList();
if (gradingList != null && gradingList.Count > 0)
{
var calcuResult = allCalcuResultList?.Find(t => t.Code == pipe.Code);
@@ -2366,9 +2063,9 @@
}
}
break;
- case HydroCalcuProp.CalcuVelocity:
+ case HydroVisualCalcuProp.CalcuVelocity:
{
- var gradingList = allCatalogGradingList.Where(x => x.PropName == HydroCalcuProp.CalcuVelocity).OrderBy(t => t.SortCode).ToList();
+ var gradingList = allCatalogGradingList.Where(x => x.PropName == HydroVisualCalcuProp.CalcuVelocity).OrderBy(t => t.SortCode).ToList();
if (gradingList != null && gradingList.Count > 0)
{
var calcuResult = allCalcuResultList?.Find(t => t.Code == pipe.Code);
@@ -2391,9 +2088,9 @@
}
}
break;
- case HydroCalcuProp.CalcuHeadLoss:
+ case HydroVisualCalcuProp.CalcuHeadLoss:
{
- var gradingList = allCatalogGradingList.Where(x => x.PropName == HydroCalcuProp.CalcuHeadLoss).OrderBy(t => t.SortCode).ToList();
+ var gradingList = allCatalogGradingList.Where(x => x.PropName == HydroVisualCalcuProp.CalcuHeadLoss).OrderBy(t => t.SortCode).ToList();
if (gradingList != null && gradingList.Count > 0)
{
var calcuResult = allCalcuResultList?.Find(t => t.Code == pipe.Code);
@@ -2499,9 +2196,9 @@
}
}
break;
- case HydroCalcuProp.CalcuFlow:
+ case HydroVisualCalcuProp.CalcuFlow:
{
- var gradingList = currentGradingList.Where(x => x.PropName == HydroCalcuProp.CalcuFlow).OrderBy(t => t.SortCode).ToList();
+ var gradingList = currentGradingList.Where(x => x.PropName == HydroVisualCalcuProp.CalcuFlow).OrderBy(t => t.SortCode).ToList();
if (gradingList != null && gradingList.Count > 0)
{
var calcuResult = allCalcuResultList?.Find(t => t.Code == pump.Code);
@@ -2524,9 +2221,9 @@
}
}
break;
- case HydroCalcuProp.CalcuVelocity:
+ case HydroVisualCalcuProp.CalcuVelocity:
{
- var gradingList = currentGradingList.Where(x => x.PropName == HydroCalcuProp.CalcuVelocity).OrderBy(t => t.SortCode).ToList();
+ var gradingList = currentGradingList.Where(x => x.PropName == HydroVisualCalcuProp.CalcuVelocity).OrderBy(t => t.SortCode).ToList();
if (gradingList != null && gradingList.Count > 0)
{
var calcuResult = allCalcuResultList?.Find(t => t.Code == pump.Code);
@@ -2549,9 +2246,9 @@
}
}
break;
- case HydroCalcuProp.CalcuHeadLoss:
+ case HydroVisualCalcuProp.CalcuHeadLoss:
{
- var gradingList = currentGradingList.Where(x => x.PropName == HydroCalcuProp.CalcuHeadLoss).OrderBy(t => t.SortCode).ToList();
+ var gradingList = currentGradingList.Where(x => x.PropName == HydroVisualCalcuProp.CalcuHeadLoss).OrderBy(t => t.SortCode).ToList();
if (gradingList != null && gradingList.Count > 0)
{
var calcuResult = allCalcuResultList?.Find(t => t.Code == pump.Code);
@@ -2606,9 +2303,9 @@
}
}
break;
- case HydroCalcuProp.CalcuFlow:
+ case HydroVisualCalcuProp.CalcuFlow:
{
- var gradingList = currentGradingList.Where(x => x.PropName == HydroCalcuProp.CalcuFlow).OrderBy(t => t.SortCode).ToList();
+ var gradingList = currentGradingList.Where(x => x.PropName == HydroVisualCalcuProp.CalcuFlow).OrderBy(t => t.SortCode).ToList();
if (gradingList != null && gradingList.Count > 0)
{
var calcuResult = allCalcuResultList?.Find(t => t.Code == valve.Code);
@@ -2631,9 +2328,9 @@
}
}
break;
- case HydroCalcuProp.CalcuVelocity:
+ case HydroVisualCalcuProp.CalcuVelocity:
{
- var gradingList = currentGradingList.Where(x => x.PropName == HydroCalcuProp.CalcuVelocity).OrderBy(t => t.SortCode).ToList();
+ var gradingList = currentGradingList.Where(x => x.PropName == HydroVisualCalcuProp.CalcuVelocity).OrderBy(t => t.SortCode).ToList();
if (gradingList != null && gradingList.Count > 0)
{
var calcuResult = allCalcuResultList?.Find(t => t.Code == valve.Code);
@@ -2656,9 +2353,9 @@
}
}
break;
- case HydroCalcuProp.CalcuHeadLoss:
+ case HydroVisualCalcuProp.CalcuHeadLoss:
{
- var gradingList = currentGradingList.Where(x => x.PropName == HydroCalcuProp.CalcuHeadLoss).OrderBy(t => t.SortCode).ToList();
+ var gradingList = currentGradingList.Where(x => x.PropName == HydroVisualCalcuProp.CalcuHeadLoss).OrderBy(t => t.SortCode).ToList();
if (gradingList != null && gradingList.Count > 0)
{
var calcuResult = allCalcuResultList?.Find(t => t.Code == valve.Code);
@@ -2695,9 +2392,9 @@
{
switch (propName)
{
- case HydroCalcuProp.CalcuFlow:
+ case HydroVisualCalcuProp.CalcuFlow:
{
- var gradingList = currentGradingList.Where(x => x.PropName == HydroCalcuProp.CalcuFlow).OrderBy(t => t.SortCode).ToList();
+ var gradingList = currentGradingList.Where(x => x.PropName == HydroVisualCalcuProp.CalcuFlow).OrderBy(t => t.SortCode).ToList();
if (gradingList != null && gradingList.Count > 0)
{
var calcuResult = allCalcuResultList?.Find(t => t.Code == pipe.Code);
@@ -2720,9 +2417,9 @@
}
}
break;
- case HydroCalcuProp.CalcuVelocity:
+ case HydroVisualCalcuProp.CalcuVelocity:
{
- var gradingList = currentGradingList.Where(x => x.PropName == HydroCalcuProp.CalcuVelocity).OrderBy(t => t.SortCode).ToList();
+ var gradingList = currentGradingList.Where(x => x.PropName == HydroVisualCalcuProp.CalcuVelocity).OrderBy(t => t.SortCode).ToList();
if (gradingList != null && gradingList.Count > 0)
{
var calcuResult = allCalcuResultList?.Find(t => t.Code == pipe.Code);
@@ -2745,9 +2442,9 @@
}
}
break;
- case HydroCalcuProp.CalcuHeadLoss:
+ case HydroVisualCalcuProp.CalcuHeadLoss:
{
- var gradingList = currentGradingList.Where(x => x.PropName == HydroCalcuProp.CalcuHeadLoss).OrderBy(t => t.SortCode).ToList();
+ var gradingList = currentGradingList.Where(x => x.PropName == HydroVisualCalcuProp.CalcuHeadLoss).OrderBy(t => t.SortCode).ToList();
if (gradingList != null && gradingList.Count > 0)
{
var calcuResult = allCalcuResultList?.Find(t => t.Code == pipe.Code);
@@ -2933,17 +2630,17 @@
#region 姘存祦鍔ㄧ敾
//鎵�鏈夋祦鍚戝垪琛�
- private List<Yw.WinFrmUI.Bimface.LogicFlowEffect> _allFlowEffectList = null;
+ private List<LogicFlowEffect> _allFlowEffectList = null;
//鑾峰彇娴佸悜鍒楄〃
- private List<Yw.WinFrmUI.Bimface.LogicFlowEffect> GetFlowEffectList()
+ private List<LogicFlowEffect> GetFlowEffectList()
{
+ if (_hydroInfo == null)
+ {
+ return default;
+ }
if (_allFlowEffectList == null)
{
- if (_hydroInfo == null)
- {
- return default;
- }
_allFlowEffectList = new List<LogicFlowEffect>();
var allCalcuResultList = GetCalcuResultList();
if (_hydroInfo.Pipes != null && _hydroInfo.Pipes.Count > 0)
@@ -3086,6 +2783,11 @@
UnloadFlowEffect();
}
+ private void barCkFlowEffect_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ {
+
+ }
+
#endregion
#region 閫夋嫨鏋勪欢
@@ -3158,6 +2860,46 @@
allVisualViewModelList.ForEach(x =>
{
x.UpdateProperty();
+ });
+ }
+ }
+
+ //鏇存柊鍙瑙嗗浘灞炴��
+ private void UpdateVisualViewModelProperty(List<string> codes)
+ {
+ if (codes == null || codes.Count < 1)
+ {
+ return;
+ }
+ var allVisualViewModelList = GetVisualViewModelList();
+ if (allVisualViewModelList != null && allVisualViewModelList.Count > 0)
+ {
+ allVisualViewModelList.ForEach(x =>
+ {
+ if (codes.Contains(x.Code))
+ {
+ x.UpdateProperty();
+ }
+ });
+ }
+ }
+
+ //鏇存柊鍙瑙嗗浘灞炴��
+ private void UpdateVisualViewModelProperty(List<Yw.Model.HydroVisualInfo> visualList)
+ {
+ if (visualList == null || visualList.Count < 1)
+ {
+ return;
+ }
+ var allVisualViewModelList = GetVisualViewModelList();
+ if (allVisualViewModelList != null && allVisualViewModelList.Count > 0)
+ {
+ allVisualViewModelList.ForEach(x =>
+ {
+ if (visualList.Exists(t => t.Code == x.Code))
+ {
+ x.UpdateProperty();
+ }
});
}
}
@@ -3544,17 +3286,45 @@
#endregion
- #region 姘村姏鏍￠獙
+ #region 妯℃嫙妫�鏌�
- //鏍￠獙鎺т欢
- private XhsProjectSimulationHydroCheckResultCtrl _checkCtrl = null;
+ #region 妫�鏌ョ粨鏋�
- //鑾峰彇鏍￠獙鎺т欢
- private XhsProjectSimulationHydroCheckResultCtrl GetCheckCtrl()
+ //妫�鏌ョ粨鏋滅紦瀛�
+ private HydroCheckResult _checkResult = null;
+
+ //鑾峰彇妫�鏌ョ粨鏋�
+ //needCheckAgain 鐢ㄤ簬纭畾鏄惁闇�瑕侀噸鏂版鏌�
+ private HydroCheckResult GetCheckResult(bool needCheckAgain = false)
+ {
+ if (_hydroInfo == null)
+ {
+ return default;
+ }
+ if (needCheckAgain)
+ {
+ _checkResult = _hydroInfo.Check();
+ }
+ if (_checkResult == null)
+ {
+ _checkResult = _hydroInfo.Check();
+ }
+ return _checkResult;
+ }
+
+ #endregion
+
+ #region 妫�鏌ユ帶浠�
+
+ //妫�鏌ユ帶浠�
+ private HydroCheckResultCtrl _checkCtrl = null;
+
+ //鑾峰彇妫�鏌ユ帶浠�
+ private HydroCheckResultCtrl GetCheckCtrl()
{
if (_checkCtrl == null)
{
- _checkCtrl = new XhsProjectSimulationHydroCheckResultCtrl();
+ _checkCtrl = new HydroCheckResultCtrl();
_checkCtrl.Dock = DockStyle.Fill;
_checkCtrl.HydroClickEvent += async (code) =>
{
@@ -3565,15 +3335,15 @@
var elementIds = new List<string>();
if (string.IsNullOrEmpty(code))
{
- _selectedVisual = null;
+ this.SelectedVisual = null;
}
else
{
- var allParterList = _hydroInfo.GetAllVisuals();
- _selectedVisual = allParterList?.Find(x => x.Code == code);
- if (_selectedVisual != null)
+ var allVisualViewModelList = GetVisualViewModelList();
+ this.SelectedVisual = allVisualViewModelList?.Find(x => x.Code == code)?.Vmo;
+ if (this.SelectedVisual != null)
{
- elementIds.Add(_selectedVisual.Code);
+ elementIds.Add(this.SelectedVisual.Code);
}
}
await _bimfaceCtrl?.ZoomAndSelectComponents(elementIds);
@@ -3584,35 +3354,438 @@
}
//鏄剧ず妫�鏌ユ帶浠�
- private void ShowCheckCtrl()
+ //needCheckAgain 鐢ㄤ簬纭畾鏄惁闇�瑕侀噸鏂版鏌�
+ private void ShowCheckCtrl(bool needCheckAgain = false)
{
- if (_checkResult == null)
+ var checkResult = GetCheckResult(needCheckAgain);
+ if (checkResult == null)
{
return;
}
var checkCtrl = GetCheckCtrl();
- checkCtrl.SetBindingData(_checkResult);
+ checkCtrl.SetBindingData(checkResult);
this.controlContainerBottom.Controls.Clear();
this.controlContainerBottom.Controls.Add(checkCtrl);
this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
this.docPnlBottom.Text = "妫�鏌ョ粨鏋�";
this.docPnlBottom.Height = 350;
-
}
- //姘村姏妫�鏌�
- private void barBtnHydroCheck_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ #endregion
+
+ //妫�鏌�
+ private void barBtnCheck_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ {
+ ShowCheckCtrl(true);
+ }
+
+ #endregion
+
+ #region 瀵煎嚭INP鏂囦欢
+
+ //瀵煎嚭INP鏂囦欢
+ private void barBtnExportInp_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
if (_hydroInfo == null)
{
return;
}
- _checkResult = _hydroInfo.Check();
- ShowCheckCtrl();
+ var fileName = FileDialogHelper.SaveInp("瀵煎嚭Inp鏂囦欢");
+ if (string.IsNullOrEmpty(fileName))
+ {
+ return;
+ }
+ var netWork = Yw.Hydro.ParseHelper.ToNetwork(_hydroInfo);
+ var result = netWork.ToInpString();
+ File.WriteAllText(fileName, result);
+ TipFormHelper.ShowSucceed("瀵煎嚭鎴愬姛");
}
#endregion
+ #region 骞惰仈鍒嗘瀽
+
+ //骞惰仈鍒嗘瀽
+ private void ParallelAnalysis()
+ {
+ if (_hydroInfo == null)
+ {
+ return;
+ }
+ var pumps = _hydroInfo.Pumps;
+ if (pumps == null || pumps.Count < 1)
+ {
+ XtraMessageBox.Show("鏃犳按娉典俊鎭�");
+ return;
+ }
+ var vmList = new List<XhsSinglePumpViewModel>();
+ foreach (var pump in pumps)
+ {
+ if (!pump.RatedN.HasValue)
+ {
+ continue;
+ }
+ var qh = _hydroInfo.Curves?.Find(t => t.Code == pump.CurveQH)?.CurveData;
+ var qe = _hydroInfo.Curves?.Find(t => t.Code == pump.CurveQE)?.CurveData;
+ var qp = _hydroInfo.Curves?.Find(t => t.Code == pump.CurveQP)?.CurveData;
+ if (qh == null)
+ {
+ continue;
+ }
+
+ var qhPtList = qh.Select(x => new XhsSplinePointViewModel(x.X, x.Y)).ToList();
+ var qePtList = qe?.Select(x => new XhsSplinePointViewModel(x.X, x.Y)).ToList();
+ var qpPtList = qp?.Select(x => new XhsSplinePointViewModel(x.X, x.Y)).ToList();
+
+ var vm = new XhsSinglePumpViewModel();
+ vmList.Add(vm);
+ vm.ID = pump.ID;
+ vm.Name = pump.Name;
+ vm.Code = pump.Code;
+ vm.IsBp = true;
+ vm.RunStatus = pump.LinkStatus == Yw.Hydro.LinkStatus.Open;
+ vm.RatedHz = pump.RatedHz;
+ vm.CurrentHz = Math.Round(pump.RatedHz * pump.SpeedRatio, 1);
+ vm.RatedSpeed = pump.RatedN.Value;
+ vm.CurrentSpeed = Math.Round(pump.RatedN.Value * pump.SpeedRatio, 1);
+ vm.CurveQH = qhPtList;
+ vm.CurveQE = qePtList;
+ vm.CurveQP = qpPtList;
+
+ }
+
+ var dlg = new PumpParallelAnalyDlg();
+ dlg.SetBindingData(vmList);
+ dlg.ReloadDataEvent += (list) =>
+ {
+ list?.ForEach(x =>
+ {
+ var pump = pumps.Find(t => t.Code == x.Code);
+ if (pump != null)
+ {
+ pump.LinkStatus = x.RunStatus ? Yw.Hydro.PumpStatus.Open : Yw.Hydro.PumpStatus.Closed;
+ pump.SpeedRatio = x.CurrentHz / pump.RatedHz;
+ }
+ });
+ var codes = list?.Select(x => x.Code).ToList();
+ UpdateVisualViewModelProperty(codes);
+ ShowSelectedProperty();
+ UpdateVisualListCtrl();
+ return true;
+ };
+ dlg.ShowDialog();
+ }
+
+ //骞惰仈
+ private void barBtnParallel_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ {
+ ParallelAnalysis();
+ }
+
+ #endregion
+
+ #region 妯℃嫙璁＄畻
+
+ //鎵�鏈夊伐鍐靛厓缁勫垪琛�
+ private Tuple<HydroWorkingVmo, HydroCheckResult, HydroCalcuResult> _allWorkingTupleList = null;
+
+
+ private Yw.EPAnet.CalcuResult _calcuResult = null;//璁＄畻缁撴灉
+
+
+
+
+ #region 宸ュ喌
+
+
+ //鏄剧ず宸ュ喌璁＄畻绐椾綋
+ private void ShowWorkingCalcuDlg()
+ {
+ var dlg = new SetHydroWorkingInfoDlg();
+ dlg.HydroViewEvent += async (parter) =>
+ {
+ _selectedVisual = parter as Yw.Model.HydroVisualInfo;
+ if (_selectedVisual != null)
+ {
+ await _bimfaceCtrl?.ZoomAndSelectComponents(new List<string>() { _selectedVisual.Code });
+ }
+ ShowSelectedProperty();
+ };
+ 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.CalcuMinorLoss();
+
+ WaitFormHelper.HideWaitForm();
+ if (_calcuResult.Succeed)
+ {
+ GetCalcuResultList(false);
+ UpdateVisualViewModelProperty();
+ UpdateVisualViewModelCalcuProperty();
+ UpdateVisualListCtrl();
+ UpdateSelectedProperty();
+ await _bimfaceCtrl?.SetLogicCalcuCustomLabels(_calcuResult);
+ TipFormHelper.ShowSucceed("璁＄畻鎴愬姛锛�");
+ var codes = _hydroInfo.Pumps.Select(x => x.Code).ToList();
+ await _bimfaceCtrl?.ZoomAndSelectComponents(codes);
+ }
+ else
+ {
+ ShowCalcuFailedCtrl();
+ TipFormHelper.ShowError("璁＄畻澶辫触锛�");
+ }
+ AutoApplyGrading();
+ UpdateVisualListCtrl();
+ ShowSelectedProperty();
+ };
+ dlg.SetBindingData(_hydroInfo);
+ dlg.ShowDialog();
+ }
+
+ #endregion
+
+ #region 璁＄畻澶辫触
+
+ //璁＄畻澶辫触鎺т欢
+ private HydroCalcuFailedCtrl _calcuFailedCtrl = null;
+
+ //鑾峰彇璁＄畻澶辫触鎺т欢
+ private HydroCalcuFailedCtrl GetCalcuFailedCtrl()
+ {
+ if (_calcuFailedCtrl == null)
+ {
+ _calcuFailedCtrl = new HydroCalcuFailedCtrl();
+ _calcuFailedCtrl.Dock = DockStyle.Fill;
+ }
+ return _calcuFailedCtrl;
+ }
+
+ //鏄剧ず璁＄畻澶辫触鎺т欢
+ private void ShowCalcuFailedCtrl()
+ {
+ if (_hydroInfo == null)
+ {
+ return;
+ }
+ if (_calcuResult == null)
+ {
+ return;
+ }
+ if (_calcuResult.Succeed)
+ {
+ return;
+ }
+ var calcuFailedCtrl = GetCalcuFailedCtrl();
+ calcuFailedCtrl.SetBindingData(_calcuResult.FailedList);
+ this.controlContainerBottom.Controls.Clear();
+ this.controlContainerBottom.Controls.Add(calcuFailedCtrl);
+ this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
+ this.docPnlBottom.Text = "璁＄畻澶辫触鍘熷洜";
+ this.docPnlBottom.Height = 350;
+ }
+
+ #endregion
+
+ #region 璁＄畻缁撴灉
+
+ //鎵�鏈夎绠楃粨鏋滃垪琛�
+ private List<HydroCalcuVisualResult> _allCalcuResultList = null;
+
+ //鑾峰彇璁＄畻缁撴灉
+ //true 浣跨敤缂撳瓨锛宖alse 涓嶄娇鐢ㄧ紦瀛�
+ private List<HydroCalcuVisualResult> GetCalcuResultList(bool isCache = true)
+ {
+ if (_hydroInfo == null)
+ {
+ return default;
+ }
+ if (_calcuResult == null)
+ {
+ return default;
+ }
+ if (!_calcuResult.Succeed)
+ {
+ return default;
+ }
+ if (isCache)
+ {
+ return _allCalcuResultList;
+ }
+
+ _allCalcuResultList = new List<HydroCalcuVisualResult>();
+
+ //鑺傜偣
+ var allNodeList = _hydroInfo.GetAllNodes();
+ if (allNodeList != null && allNodeList.Count > 0)
+ {
+ foreach (var node in allNodeList)
+ {
+ var calcuNode = _calcuResult.NodeList?.Find(x => x.Id == node.Code);
+ if (calcuNode != null)
+ {
+ var calcuResult = new HydroCalcuNodeResult()
+ {
+ Code = node.Code,
+ CalcuPress = calcuNode.Press,
+ CalcuHead = calcuNode.Head,
+ CalcuDemand = calcuNode.Demand
+ };
+ _allCalcuResultList.Add(calcuResult);
+ }
+ }
+ }
+
+ //绠℃
+ var allLinkList = _hydroInfo.GetAllLinks();
+ if (allLinkList != null && allLinkList.Count > 0)
+ {
+ foreach (var link in allLinkList)
+ {
+ var calcuLink = _calcuResult.LinkList?.Find(x => x.Id == link.Code);
+ if (calcuLink != null)
+ {
+ var calcuResult = new HydroCalcuLinkResult()
+ {
+ Code = link.Code,
+ CalcuFlow = calcuLink.Flow,
+ CalcuVelocity = calcuLink.Velocity,
+ CalcuHeadLoss = calcuLink.Headloss
+ };
+ _allCalcuResultList.Add(calcuResult);
+ }
+ }
+ }
+
+ //娴侀噺璁�
+ var allFlowmeterList = _hydroInfo.Flowmeters;
+ if (allFlowmeterList != null && allFlowmeterList.Count > 0)
+ {
+ foreach (var flowmeter in allFlowmeterList)
+ {
+ var calcuFlowmeterResult = _allCalcuResultList.Find(x => x.Code == flowmeter.Code) as HydroCalcuNodeResult;
+ if (calcuFlowmeterResult != null)
+ {
+ var calcuFlowmeterNewResult = new HydroCalcuFlowmeterResult(calcuFlowmeterResult);
+ var calcuFlowmeterLinkResultList = new List<HydroCalcuLinkResult>();
+ var flowmeterLinkList = allLinkList?.Where(x => x.StartCode == flowmeter.Code || x.EndCode == flowmeter.Code).ToList();
+ if (flowmeterLinkList != null && flowmeterLinkList.Count > 0)
+ {
+ foreach (var flowmeterLink in flowmeterLinkList)
+ {
+ var calcuFlowmeterLinkResult = _allCalcuResultList.Find(x => x.Code == flowmeterLink.Code) as HydroCalcuLinkResult;
+ if (calcuFlowmeterLinkResult != null)
+ {
+ calcuFlowmeterLinkResultList.Add(calcuFlowmeterLinkResult);
+ }
+ }
+ }
+ if (calcuFlowmeterLinkResultList.Exists(x => x.CalcuFlow.HasValue))
+ {
+ calcuFlowmeterNewResult.CalcuQ = calcuFlowmeterLinkResultList.Where(x => x.CalcuFlow.HasValue).Average(x => x.CalcuFlow.Value);
+ }
+ _allCalcuResultList.Remove(calcuFlowmeterResult);
+ _allCalcuResultList.Add(calcuFlowmeterNewResult);
+ }
+ }
+ }
+
+ //鍘嬪姏琛�
+ var allPressmeterList = _hydroInfo.Pressmeters;
+ if (allPressmeterList != null && allPressmeterList.Count > 0)
+ {
+ foreach (var pressmeter in allPressmeterList)
+ {
+ var calcuPressmeterResult = _allCalcuResultList.Find(x => x.Code == pressmeter.Code) as HydroCalcuNodeResult;
+ if (calcuPressmeterResult != null)
+ {
+ var calcuPressmeterNewResult = new HydroCalcuPressmeterResult(calcuPressmeterResult);
+ calcuPressmeterNewResult.CalcuPr = calcuPressmeterResult.CalcuPress;
+ _allCalcuResultList.Remove(calcuPressmeterResult);
+ _allCalcuResultList.Add(calcuPressmeterNewResult);
+ }
+ }
+ }
+
+ //姘存车
+ var allPumpList = _hydroInfo.Pumps;
+ if (allPumpList != null && allPumpList.Count > 0)
+ {
+ foreach (var pump in allPumpList)
+ {
+ var calcuPumpResult = _allCalcuResultList.Find(x => x.Code == pump.Code) as HydroCalcuLinkResult;
+ if (calcuPumpResult != null)
+ {
+ var calcuPumpNewResult = new HydroCalcuPumpResult(calcuPumpResult);
+ calcuPumpNewResult.CalcuQ = calcuPumpResult.CalcuFlow;
+ if (calcuPumpNewResult.CalcuQ.HasValue)
+ {
+ var calcuNodeStartResult = _allCalcuResultList.Find(x => x.Code == pump.StartCode) as HydroCalcuNodeResult;
+ var calcuNodeEndResult = _allCalcuResultList.Find(x => x.Code == pump.EndCode) as HydroCalcuNodeResult;
+ if (calcuNodeStartResult != null && calcuNodeEndResult != null)
+ {
+ if (calcuNodeStartResult.CalcuPress.HasValue && calcuNodeEndResult.CalcuPress.HasValue)
+ {
+ calcuPumpNewResult.CalcuH = Math.Abs(calcuNodeStartResult.CalcuPress.Value - calcuNodeEndResult.CalcuPress.Value);
+ }
+ if (pump.LinkStatus == Yw.Hydro.PumpStatus.Open && pump.RatedN.HasValue)
+ {
+ var curveqp = _hydroInfo.Curves?.Find(x => x.Code == pump.CurveQP);
+ if (curveqp != null)
+ {
+ if (curveqp.CurveData != null && curveqp.CurveData.Count > 3)
+ {
+ var point2dList = curveqp.CurveData.Select(x => new Yw.Geometry.Point2d(x.X, x.Y)).ToList();
+ var point2dSimularList = point2dList.GetQPPointListByN(pump.RatedN.Value, pump.RatedN.Value * pump.SpeedRatio);
+ var pumpCurveQp = new Yw.Pump.CurveQP(eFeatType.Cubic, point2dSimularList);
+ calcuPumpNewResult.CalcuP = pumpCurveQp.FeatCurve.GetPointY(calcuPumpNewResult.CalcuQ.Value);
+ }
+ }
+ }
+ if (calcuPumpNewResult.CalcuH.HasValue && calcuPumpNewResult.CalcuP.HasValue)
+ {
+ calcuPumpNewResult.CalcuE = Yw.Pump.CalculationHelper.CalcuE(calcuPumpNewResult.CalcuQ.Value, calcuPumpNewResult.CalcuH.Value, calcuPumpNewResult.CalcuP.Value);
+ }
+ }
+ }
+ _allCalcuResultList.Remove(calcuPumpResult);
+ _allCalcuResultList.Add(calcuPumpNewResult);
+ }
+ }
+ }
+
+ return _allCalcuResultList;
+ }
+
+ #endregion
+
+ //姘村姏璁＄畻
+ private void barBtnHydroCalcu_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ {
+ ShowWorkingCalcuDlg();
+ }
+
+ #endregion
+
+
--
Gitblit v1.9.3