From 208ca42e1c20afafbe48d66259d553ee81eb48ed Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期三, 13 十一月 2024 11:02:43 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/02-bimface/XhsProjectSimulationBimfaceCtrl.cs | 71 ++++++++++++++++++++++++++++-------
1 files changed, 57 insertions(+), 14 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 6725615..29225f6 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
@@ -13,11 +13,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 +90,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 +112,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 +161,6 @@
/// <summary>
/// 鏄剧ず鏋勪欢
/// </summary>
- /// <param name="elementIds">鏋勪欢id鍒楄〃</param>
- /// <returns></returns>
public async Task ShowComponents(List<string> elementIds)
{
if (_bimfaceInteropContainer == null)
@@ -175,8 +173,6 @@
/// <summary>
/// 闅愯棌鏋勪欢
/// </summary>
- /// <param name="elementIds">鏋勪欢id鍒楄〃</param>
- /// <returns></returns>
public async Task HideComponents(List<string> elementIds)
{
if (_bimfaceInteropContainer == null)
@@ -189,7 +185,6 @@
/// <summary>
/// 鏄剧ず鎵�鏈夋瀯浠�
/// </summary>
- /// <returns></returns>
public async Task ShowAllComponents()
{
if (_bimfaceInteropContainer == null)
@@ -321,12 +316,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);
}
@@ -485,11 +488,51 @@
#region 涓氬姟姘存祦鍔ㄧ敾
/// <summary>
- ///
+ /// 鍔犺浇姘存祦鍔ㄧ敾
/// </summary>
- public async Task LoadAllFlowMaterialList(List<LogicFlowEffect> obj)
+ public async Task LoadFlowEffect(LogicFlowEffect obj)
{
- await _bimfaceInteropContainer?.LoadAllFlowMaterialList(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
--
Gitblit v1.9.3