From 750b85dc4c5562b9c0dc9b8c463e5cc5f0ad2553 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期一, 11 十一月 2024 15:45:32 +0800
Subject: [PATCH] 添加方案
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/02-bimface/XhsProjectSimulationBimfaceCtrl.cs | 138 ++++++++++++++++++++++++++-------------------
1 files changed, 79 insertions(+), 59 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 d0fdb54..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);
}
@@ -412,37 +415,39 @@
await _bimfaceInteropContainer?.ClearLogicCalcuCustomLabels();
return;
}
- var obj = new List<CustomLabel>();
+ var obj = new List<LogicCalcuCustomLabel>();
var allParterList = hydroInfo.GetAllParters();
allParterList?.ForEach(x =>
{
if (x is Yw.Model.HydroPumpInfo pump)
{
- var hz = pump.RatedHz * pump.SpeedRatio;
+ var hz = Math.Round(pump.RatedHz * pump.SpeedRatio);
var calcuPump = calcuResult.LinkList.Find(x => x.Id == pump.Code);
var calcuPumpStart = calcuResult.NodeList.Find(x => x.Id == pump.StartCode);
var calcuPumpEnd = calcuResult.NodeList.Find(x => x.Id == pump.EndCode);
- var pumpCustomLabel = new CustomLabel();
+ var pumpCustomLabel = new LogicCalcuCustomLabel();
pumpCustomLabel.Id = pump.Code;
- pumpCustomLabel.Data = new List<CustomLabelItem>()
+ pumpCustomLabel.Distance = 10000;
+ pumpCustomLabel.Data = new List<LogicCalcuCustomLabelItem>()
{
- new CustomLabelItem(){ Name="鐘舵��",Value=HydroLinkStatusHelper.GetStatusName(pump.LinkStatus),Unit=string.Empty},
- new CustomLabelItem(){ Name="棰戠巼",Value=hz.ToString(),Unit=string.Empty},
- new CustomLabelItem(){ Name="娴侀噺",Value=Math.Round(calcuPump.Flow,1).ToString(),Unit="m鲁/h"},
- new CustomLabelItem(){ Name="杩涘彛鍘嬪姏",Value=Math.Round(calcuPumpStart.Head,4).ToString(),Unit="m"},
- new CustomLabelItem(){ Name="鍑哄彛鍘嬪姏",Value=Math.Round(calcuPumpEnd.Head,4).ToString(),Unit="m"},
+ new LogicCalcuCustomLabelItem(){ Name="鐘舵��",Value=HydroLinkStatusHelper.GetStatusName(pump.LinkStatus),Unit=string.Empty},
+ new LogicCalcuCustomLabelItem(){ Name="棰戠巼",Value=hz.ToString(),Unit=string.Empty},
+ new LogicCalcuCustomLabelItem(){ Name="娴侀噺",Value=Math.Round(calcuPump.Flow,1).ToString(),Unit="m鲁/h"},
+ new LogicCalcuCustomLabelItem(){ Name="杩涘彛鍘嬪姏",Value=Math.Round(calcuPumpStart.Head,4).ToString(),Unit="m"},
+ new LogicCalcuCustomLabelItem(){ Name="鍑哄彛鍘嬪姏",Value=Math.Round(calcuPumpEnd.Head,4).ToString(),Unit="m"},
};
obj.Add(pumpCustomLabel);
}
else if (x is Yw.Model.HydroEmitterInfo emitter)
{
var calcuEmitter = calcuResult.NodeList.Find(x => x.Id == emitter.Code);
- var emitterCustomLabel = new CustomLabel();
+ var emitterCustomLabel = new LogicCalcuCustomLabel();
emitterCustomLabel.Id = emitter.Code;
- emitterCustomLabel.Data = new List<CustomLabelItem>()
+ emitterCustomLabel.Distance = 10000;
+ emitterCustomLabel.Data = new List<LogicCalcuCustomLabelItem>()
{
- new CustomLabelItem(){ Name="娴侀噺",Value=Math.Round(calcuEmitter.Demand,1).ToString(),Unit="m鲁/h"},
- new CustomLabelItem(){ Name="鍘嬪姏",Value=Math.Round(calcuEmitter.Head,4).ToString(),Unit="m"}
+ new LogicCalcuCustomLabelItem(){ Name="娴侀噺",Value=Math.Round(calcuEmitter.Demand,1).ToString(),Unit="m鲁/h"},
+ new LogicCalcuCustomLabelItem(){ Name="鍘嬪姏",Value=Math.Round(calcuEmitter.Head,4).ToString(),Unit="m"}
};
obj.Add(emitterCustomLabel);
}
@@ -480,8 +485,57 @@
#endregion
- #region 涓氬姟
+ #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
#region 杩炴帴鏋勪欢棰滆壊
@@ -550,40 +604,6 @@
_linkComponentIds.AddRange(elementIds);
await _bimfaceInteropContainer?.OverrideComponentsColor(elementIds, _linkEndComponentColor, _linkComponentTransparency);
}
-
- #endregion
-
- #region 璁剧疆Open鏋勪欢棰滆壊
-
- private const string _openComponentColor = "#2E8B57";
- private const double _openComponentTransparency = 0.8;
- private List<string> _openComponentIds = null;//Open鏋勪欢id鍒楄〃
-
- /// <summary>
- /// 璁剧疆Open鏋勪欢棰滆壊
- /// </summary>
- public async Task SetOpenComponentsColor(List<string> elementIds)
- {
- if (_openComponentIds != null && _openComponentIds.Count > 0)
- {
- await _bimfaceInteropContainer.RestoreComponentsColor(_openComponentIds);
- }
- _openComponentIds = elementIds;
- if (elementIds == null || elementIds.Count < 1)
- {
- return;
- }
- if (_bimfaceInteropContainer == null)
- {
- return;
- }
- await _bimfaceInteropContainer.OverrideComponentsColor(elementIds, _openComponentColor, _openComponentTransparency);
- }
-
- #endregion
-
-
-
#endregion
--
Gitblit v1.9.3