From 32b374b27fba81f58cd6dc0119aecc0a1414e7e9 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期五, 27 九月 2024 20:19:29 +0800
Subject: [PATCH] 优化bimface 连接管道颜色
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs | 108 +++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 74 insertions(+), 34 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 5b768cb..b2ce9b1 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
@@ -76,35 +76,7 @@
this.xhsProjectSimulationPropertyCtrl1.SetBindingData(() => _hydroInfo);
}
- //姘村姏璁＄畻
- private async void barBtnHydroCalcu_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);
- _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);
- }
-
-
+ #region INP瀵煎嚭
//瀵煎嚭姘村姏INP鏂囦欢
private void barBtnHydroExportInp_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
@@ -124,7 +96,7 @@
TipFormHelper.ShowSucceed("瀵煎嚭鎴愬姛");
}
-
+ #endregion
#region Bimface
@@ -162,12 +134,45 @@
{
return;
}
- List<string> elementIds = null;
+ var elementIds = new List<string>();
if (_parter != null)
{
if (_parter is Yw.Model.HydroLinkInfo linker)
{
- elementIds = new List<string>() { linker.StartCode, linker.EndCode };
+ var allParterList = _hydroInfo.GetAllParters();
+ var allLinkerList = _hydroInfo.GetAllLinks();
+ var startParter = allParterList?.Find(x => x.Code == linker.StartCode);
+ if (startParter != null)
+ {
+ if (startParter.GetType() == typeof(Yw.Model.HydroJunctionInfo))
+ {
+ var startLinkList = allLinkerList?.Where(x => x.StartCode == startParter.Code || x.EndCode == startParter.Code).ToList();
+ if (startLinkList != null)
+ {
+ elementIds.AddRange(startLinkList.Select(x => x.Code).Where(x => x != _parter.Code));
+ }
+ }
+ else
+ {
+ elementIds.Add(linker.StartCode);
+ }
+ }
+ var endParter = allParterList?.Find(x => x.Code == linker.EndCode);
+ if (endParter != null)
+ {
+ if (endParter.GetType() == typeof(Yw.Model.HydroJunctionInfo))
+ {
+ var endLinkList = allLinkerList?.Where(x => x.StartCode == endParter.Code || x.EndCode == endParter.Code).ToList();
+ if (endLinkList != null)
+ {
+ elementIds.AddRange(endLinkList.Select(x => x.Code).Where(x => x != _parter.Code));
+ }
+ }
+ else
+ {
+ elementIds.Add(linker.EndCode);
+ }
+ }
}
}
await this.xhsProjectSimulationBimfaceCtrl1.SetLinkComponentsColor(elementIds);
@@ -446,7 +451,7 @@
}
}
- #endregion 涓氬姟鏂规硶
+ #endregion
#region 閰嶇疆
@@ -460,7 +465,7 @@
#region 鎬ц兘鏇茬嚎
-
+ //鎬ц兘鏇茬嚎
private void barBtnFeatCurve_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
if (_hydroInfo == null)
@@ -491,5 +496,40 @@
}
#endregion
+
+ #region 姘村姏璁＄畻
+
+ //姘村姏璁＄畻
+ private async void barBtnHydroCalcu_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);
+ _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);
+ }
+
+ #endregion
+
+
}
}
\ No newline at end of file
--
Gitblit v1.9.3