From c653f2f6f2de553395b706de3a62fec5e4a6fbf7 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期四, 21 十一月 2024 17:52:18 +0800
Subject: [PATCH] 冲突
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/02-bimface/XhsProjectSimulationBimfaceCtrl.cs | 38 +++++++++++---------------------------
1 files changed, 11 insertions(+), 27 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 30b5d75..6d374b0 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
@@ -185,11 +185,7 @@
/// </summary>
public async Task TranslucentComponents(List<string> elementIds)
{
- if (_bimfaceInteropContainer == null)
- {
- return;
- }
- await _bimfaceInteropContainer.TranslucentComponents(elementIds);
+ await _bimfaceInteropContainer?.TranslucentComponents(elementIds);
}
/// <summary>
@@ -197,11 +193,7 @@
/// </summary>
public async Task OpaqueComponents(List<string> elementIds)
{
- if (_bimfaceInteropContainer == null)
- {
- return;
- }
- await _bimfaceInteropContainer.OpaqueComponents(elementIds);
+ await _bimfaceInteropContainer?.OpaqueComponents(elementIds);
}
#endregion
@@ -265,18 +257,14 @@
#endregion
- #region 缂╂斁
+ #region 缂╂斁涓庨�夋嫨
/// <summary>
/// 缂╂斁鑷虫瀯浠�
/// </summary>
- public async Task ZoomToComponent(string elementId)
+ public async Task ZoomToComponent(string code)
{
- if (_bimfaceInteropContainer == null)
- {
- return;
- }
- await _bimfaceInteropContainer.ZoomToComponent(elementId);
+ await _bimfaceInteropContainer?.ZoomToComponent(code);
}
/// <summary>
@@ -284,31 +272,27 @@
/// </summary>
public async Task ZoomToSelectedComponents()
{
- if (_bimfaceInteropContainer == null)
- {
- return;
- }
- await _bimfaceInteropContainer.ZoomToSelectedComponents();
+ await _bimfaceInteropContainer?.ZoomToSelectedComponents();
}
/// <summary>
/// 缂╂斁鑷抽�夋嫨鏋勪欢
/// </summary>
- public async Task ZoomAndSelectComponent(string elementId)
+ public async Task ZoomAndSelectComponent(string code)
{
- if (string.IsNullOrEmpty(elementId))
+ if (string.IsNullOrEmpty(code))
{
return;
}
- await _bimfaceInteropContainer.ZoomAndSelectComponents(new List<string>() { elementId });
+ await _bimfaceInteropContainer?.ZoomAndSelectComponents(new List<string>() { code });
}
/// <summary>
/// 缂╂斁鑷抽�夋嫨鏋勪欢
/// </summary>
- public async Task ZoomAndSelectComponents(List<string> elementIds)
+ public async Task ZoomAndSelectComponents(List<string> codes)
{
- await _bimfaceInteropContainer.ZoomAndSelectComponents(elementIds);
+ await _bimfaceInteropContainer?.ZoomAndSelectComponents(codes);
}
#endregion
--
Gitblit v1.9.3