From bcc7f0563d92efd7013ec36e1d9ad7871b631454 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期五, 08 十一月 2024 14:52:00 +0800
Subject: [PATCH] 优化水力特性
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/02-bimface/XhsProjectSimulationBimfaceCtrl.cs | 316 +++++++++++++++++++++++++++++----------------------
1 files changed, 179 insertions(+), 137 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 7e28757..50ebf13 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,4 +1,5 @@
-锘縰sing Yw.WinFrmUI.Bimface;
+锘縰sing DevExpress.Xpo.Helpers;
+using Yw.WinFrmUI.Bimface;
namespace HStation.WinFrmUI
{
@@ -160,8 +161,6 @@
/// <summary>
/// 鏄剧ず鏋勪欢
/// </summary>
- /// <param name="elementIds">鏋勪欢id鍒楄〃</param>
- /// <returns></returns>
public async Task ShowComponents(List<string> elementIds)
{
if (_bimfaceInteropContainer == null)
@@ -174,8 +173,6 @@
/// <summary>
/// 闅愯棌鏋勪欢
/// </summary>
- /// <param name="elementIds">鏋勪欢id鍒楄〃</param>
- /// <returns></returns>
public async Task HideComponents(List<string> elementIds)
{
if (_bimfaceInteropContainer == null)
@@ -188,7 +185,6 @@
/// <summary>
/// 鏄剧ず鎵�鏈夋瀯浠�
/// </summary>
- /// <returns></returns>
public async Task ShowAllComponents()
{
if (_bimfaceInteropContainer == null)
@@ -320,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);
}
@@ -333,28 +337,31 @@
#region 寮鸿皟鏋勪欢
+ private const string _blinkColor = "#32D3A6";//寮鸿皟鏋勪欢棰滆壊
+ private const double _blinkTransparency = 0.8d; //寮鸿皟鏋勪欢閫忔槑搴�
+
/// <summary>
/// 璁剧疆寮鸿皟鏋勪欢
/// </summary>
public async Task SetBlinkComponents(List<string> elementIds, string color, double transparency)
{
- if (_bimfaceInteropContainer == null)
- {
- return;
- }
- await _bimfaceInteropContainer.SetBlinkComponents(elementIds, color, transparency);
+ await _bimfaceInteropContainer?.SetBlinkComponents(elementIds, color, transparency);
+ }
+
+ /// <summary>
+ /// 璁剧疆寮鸿皟鏋勪欢
+ /// </summary>
+ public async Task SetBlinkComponents(List<string> elementIds)
+ {
+ await _bimfaceInteropContainer?.SetBlinkComponents(elementIds, _blinkColor, _blinkTransparency);
}
/// <summary>
/// 娓呴櫎寮鸿皟鏋勪欢
/// </summary>
- public async Task SetBlinkComponents()
+ public async Task ClearBlinkComponents()
{
- if (_bimfaceInteropContainer == null)
- {
- return;
- }
- await _bimfaceInteropContainer.ClearBlinkComponents();
+ await _bimfaceInteropContainer?.ClearBlinkComponents();
}
#endregion
@@ -376,7 +383,7 @@
/// <summary>
/// 鎭㈠鏋勪欢棰滆壊
/// </summary>
- public async Task SetBlinkComponents(List<string> elementIds)
+ public async Task RestoreComponentsColor(List<string> elementIds)
{
if (_bimfaceInteropContainer == null)
{
@@ -387,100 +394,12 @@
#endregion
- #region 鑷畾涔夋爣绛�
+ #region 涓氬姟璁＄畻鑷畾涔夋爣绛�
/// <summary>
- /// 璁剧疆鑷畾涔夋爣绛�
+ /// 鏄剧ず涓氬姟璁＄畻鑷畾涔夋爣绛�
/// </summary>
- public async Task SetCustomLabels(List<CustomLabel> obj)
- {
- if (_bimfaceInteropContainer == null)
- {
- return;
- }
- await _bimfaceInteropContainer.SetCustomLabels(obj);
- }
-
- /// <summary>
- /// 娓呴櫎鑷畾涔夋爣绛�
- /// </summary>
- public async Task ClearCustomLabels()
- {
- if (_bimfaceInteropContainer == null)
- {
- return;
- }
- await _bimfaceInteropContainer.ClearCustomLabels();
- }
-
- #endregion
-
- #region 涓氬姟
-
- #region 杩炴帴鏋勪欢棰滆壊
-
- private const string _linkComponentColor = "#008B00";
- private const double _linkComponentTransparency = 0.8;
- private List<string> _linkComponentIds = null;//杩炴帴鏋勪欢id鍒楄〃
-
- /// <summary>
- /// 璁剧疆杩炴帴鏋勪欢棰滆壊
- /// </summary>
- public async Task SetLinkComponentsColor(List<string> elementIds)
- {
- if (_linkComponentIds != null && _linkComponentIds.Count > 0)
- {
- await _bimfaceInteropContainer.RestoreComponentsColor(_linkComponentIds);
- }
- _linkComponentIds = elementIds;
- if (elementIds == null || elementIds.Count < 1)
- {
- return;
- }
- if (_bimfaceInteropContainer == null)
- {
- return;
- }
- await _bimfaceInteropContainer.OverrideComponentsColor(elementIds, _linkComponentColor, _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
-
- #region 鑷畾涔夋爣绛�
-
- /// <summary>
- /// 鏄剧ず璁＄畻鑷畾涔夋爣绛�
- /// </summary>
- public async Task ShowCalcuCustomLabels(CalcuResult calcuResult)
+ public async Task SetLogicCalcuCustomLabels(CalcuResult calcuResult)
{
var hydroInfo = _hydroInfoFunc?.Invoke();
if (hydroInfo == null)
@@ -493,60 +412,183 @@
}
if (!calcuResult.Succeed)
{
- await _bimfaceInteropContainer.ClearCustomLabels();
+ 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)
{
- double? speed = pump.RatedN;
- if (speed.HasValue)
- {
- if (pump.SpeedRatio.HasValue)
- {
- speed = speed.Value * pump.SpeedRatio.Value;
- }
- }
+ 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=speed?.ToString(),Unit="r/min"},
- 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);
}
});
- if (_bimfaceInteropContainer == null)
- {
- return;
- }
- await _bimfaceInteropContainer.SetCustomLabels(obj);
+ await _bimfaceInteropContainer?.SetLogicCalcuCustomLabels(obj);
+ }
+
+ /// <summary>
+ /// 娓呴櫎涓氬姟璁＄畻鑷畾涔夋爣绛�
+ /// </summary>
+ public async Task ClearLogicCalcuCustomLabels()
+ {
+ await _bimfaceInteropContainer?.ClearLogicCalcuCustomLabels();
}
#endregion
+ #region 涓氬姟鏍囨敞寮曠嚎鏍囩
+
+ /// <summary>
+ /// 璁剧疆涓氬姟鏍囨敞寮曠嚎鏍囩
+ /// </summary>
+ public async Task SetLogicMarkLeadLabels(List<LogicMarkLeadLabel> obj)
+ {
+ await _bimfaceInteropContainer?.SetLogicMarkLeadLabels(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 UnloadFlowEffect()
+ {
+ await _bimfaceInteropContainer?.UnloadFlowEffect();
+ }
+
+ /// <summary>
+ /// 閫氳繃Id鍗歌浇姘存祦鍔ㄧ敾
+ /// </summary>
+ public async Task UnloadFlowEffectById(string Id)
+ {
+ await _bimfaceInteropContainer?.UnloadFlowEffectById(Id);
+ }
+
+ #endregion
+
+ #region 杩炴帴鏋勪欢棰滆壊
+
+ private const string _linkComponentColor = "#008B00";//杩炴帴鏋勪欢棰滆壊
+ private const string _linkStartComponentColor = "#094EF7";//杩炴帴寮�濮嬫瀯浠堕鑹�
+ private const string _linkEndComponentColor = "#ECBF08";//杩炴帴缁撴潫鏋勪欢棰滆壊
+ private const double _linkComponentTransparency = 0.8;
+ private List<string> _linkComponentIds = null;//杩炴帴鏋勪欢id鍒楄〃
+
+ /// <summary>
+ /// 璁剧疆杩炴帴鏋勪欢棰滆壊
+ /// </summary>
+ public async Task SetLinkComponentsColor(List<string> elementIds)
+ {
+ await RestoreLinkComponentsColor();
+ _linkComponentIds = elementIds;
+ if (_linkComponentIds == null || _linkComponentIds.Count < 1)
+ {
+ return;
+ }
+ await _bimfaceInteropContainer?.OverrideComponentsColor(_linkComponentIds, _linkComponentColor, _linkComponentTransparency);
+ }
+
+ /// <summary>
+ /// 鎭㈠杩炴帴鏋勪欢棰滆壊
+ /// </summary>
+ public async Task RestoreLinkComponentsColor()
+ {
+ if (_linkComponentIds == null || _linkComponentIds.Count < 1)
+ {
+ return;
+ }
+ await _bimfaceInteropContainer?.RestoreComponentsColor(_linkComponentIds);
+ }
+
+ /// <summary>
+ /// 璁剧疆杩炴帴寮�濮嬫瀯浠堕鑹�
+ /// </summary>
+ public async Task SetLinkStartComponentsColor(List<string> elementIds)
+ {
+ if (elementIds == null || elementIds.Count < 1)
+ {
+ return;
+ }
+ if (_linkComponentIds == null)
+ {
+ _linkComponentIds = new List<string>();
+ }
+ _linkComponentIds.AddRange(elementIds);
+ await _bimfaceInteropContainer?.OverrideComponentsColor(elementIds, _linkStartComponentColor, _linkComponentTransparency);
+ }
+
+ /// <summary>
+ /// 璁剧疆杩炴帴缁撴潫鏋勪欢棰滆壊
+ /// </summary>
+ public async Task SetLinkEndComponentsColor(List<string> elementIds)
+ {
+ if (elementIds == null || elementIds.Count < 1)
+ {
+ return;
+ }
+ if (_linkComponentIds == null)
+ {
+ _linkComponentIds = new List<string>();
+ }
+ _linkComponentIds.AddRange(elementIds);
+ await _bimfaceInteropContainer?.OverrideComponentsColor(elementIds, _linkEndComponentColor, _linkComponentTransparency);
+ }
+
#endregion
--
Gitblit v1.9.3