From 6d4be4121ae5995577bb21abe88b79777c64be62 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期二, 19 十一月 2024 16:31:02 +0800
Subject: [PATCH] 用水模块 冲突
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/02-bimface/XhsProjectSimulationBimfaceCtrl.cs | 138 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 121 insertions(+), 17 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/02-bimface/XhsProjectSimulationBimfaceCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/02-bimface/XhsProjectSimulationBimfaceCtrl.cs
index bfaf03e..cdef64a 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/02-bimface/XhsProjectSimulationBimfaceCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/02-bimface/XhsProjectSimulationBimfaceCtrl.cs
@@ -1,5 +1,4 @@
-锘縰sing DevExpress.Xpo.Helpers;
-using Yw.WinFrmUI.Bimface;
+锘縰sing Yw.WinFrmUI.Bimface;
namespace HStation.WinFrmUI
{
@@ -13,11 +12,11 @@
/// <summary>
/// 姘村姏鐐瑰嚮浜嬩欢锛堝寘鍚乏閿拰鍙抽敭锛�
/// </summary>
- public event Action<Yw.Model.HydroParterInfo> HydroClickEvent;
+ public event Action<Yw.Model.HydroVisualInfo> HydroClickEvent;
/// <summary>
/// 姘村姏鐐瑰嚮浜嬩欢锛堜粎宸﹂敭锛�
/// </summary>
- public event Action<Yw.Model.HydroParterInfo> HydroMouseLeftClickEvent;
+ public event Action<Yw.Model.HydroVisualInfo> HydroMouseLeftClickEvent;
/// <summary>
/// 鍔犺浇瀹屾垚浜嬩欢
/// </summary>
@@ -90,7 +89,7 @@
{
return;
}
- var allParterList = hydroInfo.GetAllParters();
+ var allParterList = hydroInfo.GetAllVisuals();
var parter = allParterList?.Find(x => x.Code == obj.ObjectId);
this.HydroClickEvent.Invoke(parter);
}
@@ -112,7 +111,7 @@
{
return;
}
- var allParterList = hydroInfo.GetAllParters();
+ var allParterList = hydroInfo.GetAllVisuals();
var parter = allParterList?.Find(x => x.Code == obj.ObjectId);
this.HydroMouseLeftClickEvent.Invoke(parter);
}
@@ -161,8 +160,6 @@
/// <summary>
/// 鏄剧ず鏋勪欢
/// </summary>
- /// <param name="elementIds">鏋勪欢id鍒楄〃</param>
- /// <returns></returns>
public async Task ShowComponents(List<string> elementIds)
{
if (_bimfaceInteropContainer == null)
@@ -175,8 +172,6 @@
/// <summary>
/// 闅愯棌鏋勪欢
/// </summary>
- /// <param name="elementIds">鏋勪欢id鍒楄〃</param>
- /// <returns></returns>
public async Task HideComponents(List<string> elementIds)
{
if (_bimfaceInteropContainer == null)
@@ -189,7 +184,6 @@
/// <summary>
/// 鏄剧ず鎵�鏈夋瀯浠�
/// </summary>
- /// <returns></returns>
public async Task ShowAllComponents()
{
if (_bimfaceInteropContainer == null)
@@ -321,12 +315,20 @@
/// <summary>
/// 缂╂斁鑷抽�夋嫨鏋勪欢
/// </summary>
- public async Task ZoomAndSelectComponents(List<string> elementIds)
+ public async Task ZoomAndSelectComponent(string elementId)
{
- if (_bimfaceInteropContainer == null)
+ if (string.IsNullOrEmpty(elementId))
{
return;
}
+ await _bimfaceInteropContainer.ZoomAndSelectComponents(new List<string>() { elementId });
+ }
+
+ /// <summary>
+ /// 缂╂斁鑷抽�夋嫨鏋勪欢
+ /// </summary>
+ public async Task ZoomAndSelectComponents(List<string> elementIds)
+ {
await _bimfaceInteropContainer.ZoomAndSelectComponents(elementIds);
}
@@ -370,11 +372,19 @@
/// </summary>
public async Task OverrideComponentsColor(List<string> elementIds, string color, double transparency)
{
- if (_bimfaceInteropContainer == null)
+ await _bimfaceInteropContainer?.OverrideComponentsColor(elementIds, color, transparency);
+ }
+
+ /// <summary>
+ /// 璁剧疆寮鸿皟鏋勪欢
+ /// </summary>
+ public async Task OverrideComponentsColor(string elementId, string color, double transparency)
+ {
+ if (string.IsNullOrEmpty(elementId))
{
return;
}
- await _bimfaceInteropContainer.OverrideComponentsColor(elementIds, color, transparency);
+ await _bimfaceInteropContainer.OverrideComponentsColor(new List<string>() { elementId }, color, transparency);
}
/// <summary>
@@ -382,11 +392,19 @@
/// </summary>
public async Task RestoreComponentsColor(List<string> elementIds)
{
- if (_bimfaceInteropContainer == null)
+ await _bimfaceInteropContainer?.RestoreComponentsColor(elementIds);
+ }
+
+ /// <summary>
+ /// 鎭㈠鏋勪欢棰滆壊
+ /// </summary>
+ public async Task RestoreComponentsColor(string elementId)
+ {
+ if (string.IsNullOrEmpty(elementId))
{
return;
}
- await _bimfaceInteropContainer.RestoreComponentsColor(elementIds);
+ await _bimfaceInteropContainer?.RestoreComponentsColor(new List<string>() { elementId });
}
#endregion
@@ -473,11 +491,79 @@
}
/// <summary>
+ /// 鏇存柊涓氬姟鏍囨敞寮曠嚎鏍囩
+ /// </summary>
+ public async Task UpdateLogicMarkLeadLabel(LogicMarkLeadLabel obj)
+ {
+ await _bimfaceInteropContainer?.UpdateLogicMarkLeadLabel(obj);
+ }
+
+ /// <summary>
+ /// 鏇存柊涓氬姟鏍囨敞寮曠嚎鏍囩
+ /// </summary>
+ public async Task UpdateLogicMarkLeadLabels(List<LogicMarkLeadLabel> obj)
+ {
+ await _bimfaceInteropContainer?.UpdateLogicMarkLeadLabels(obj);
+ }
+
+ /// <summary>
/// 娓呴櫎涓氬姟鏍囨敞寮曠嚎鏍囩
/// </summary>
public async Task ClearLogicMarkLeadLabels()
{
await _bimfaceInteropContainer?.ClearLogicMarkLeadLabels();
+ }
+
+ #endregion
+
+ #region 涓氬姟姘存祦鍔ㄧ敾
+
+ /// <summary>
+ /// 鍔犺浇姘存祦鍔ㄧ敾
+ /// </summary>
+ public async Task LoadFlowEffect(LogicFlowEffect obj)
+ {
+ await _bimfaceInteropContainer?.LoadFlowEffect(obj);
+ }
+
+ /// <summary>
+ /// 鍔犺浇姘存祦鍔ㄧ敾
+ /// </summary>
+ public async Task LoadFlowEffect(List<LogicFlowEffect> obj)
+ {
+ await _bimfaceInteropContainer?.LoadFlowEffectList(obj);
+ }
+
+ /// <summary>
+ /// 鏇存柊姘存祦鍔ㄧ敾
+ /// </summary>
+ public async Task UpdateFlowEffect(LogicFlowEffect obj)
+ {
+ await _bimfaceInteropContainer?.UpdateFlowEffect(obj);
+ }
+
+ /// <summary>
+ /// 鏇存柊姘存祦鍔ㄧ敾
+ /// </summary>
+ public async Task UpdateFlowEffectList(List<LogicFlowEffect> obj)
+ {
+ await _bimfaceInteropContainer?.UpdateFlowEffectList(obj);
+ }
+
+ /// <summary>
+ /// 鍗歌浇姘存祦鍔ㄧ敾
+ /// </summary>
+ public async Task UnloadFlowEffect()
+ {
+ await _bimfaceInteropContainer?.UnloadFlowEffect();
+ }
+
+ /// <summary>
+ /// 閫氳繃Id鍗歌浇姘存祦鍔ㄧ敾
+ /// </summary>
+ public async Task UnloadFlowEffectById(string Id)
+ {
+ await _bimfaceInteropContainer?.UnloadFlowEffectById(Id);
}
#endregion
@@ -552,7 +638,25 @@
#endregion
+ #region 涓氬姟鐩戞祴鐐�
+ /// <summary>
+ /// 璁剧疆涓氬姟鐩戞祴鐐�
+ /// </summary>
+ public async Task SetLogicMonitors(List<LogicMonitor> obj)
+ {
+ await _bimfaceInteropContainer?.SetLogicMonitors(obj);
+ }
+
+ /// <summary>
+ /// 娓呴櫎涓氬姟鐩戞祴鐐�
+ /// </summary>
+ public async Task ClearLogicMonitors()
+ {
+ await _bimfaceInteropContainer?.ClearLogicMonitors();
+ }
+
+ #endregion
}
}
--
Gitblit v1.9.3