From 2c9f613860b0f1f104da43f67895e221e6f7cf11 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期六, 23 十一月 2024 21:42:57 +0800
Subject: [PATCH] q3d 选择改变事件判断bug修复
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs | 2552 +++++++++++++++++++++++-----------------------------------
1 files changed, 1,031 insertions(+), 1,521 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs
index f1d7d30..dc08799 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs
@@ -1,26 +1,10 @@
-锘縢lobal using Yw.EPAnet;
-using DevExpress.CodeParser;
-using DevExpress.Diagram.Core.Native;
+锘縰sing DevExpress.Diagram.Core.Native;
using DevExpress.Mvvm.Native;
-using DevExpress.Office.Utils;
-using DevExpress.PivotGrid.QueryMode.TuplesTree;
-using DevExpress.Utils.Extensions;
-using DevExpress.Xpo.Helpers;
-using DevExpress.XtraBars.Ribbon;
-using DevExpress.XtraRichEdit.Layout;
-using DevExpress.XtraSpreadsheet.Commands;
using HStation.WinFrmUI.PhartRelation;
-using NetTaste;
using NPOI.SS.Formula.Functions;
using System.Diagnostics;
-using System.Windows.Media;
-using System.Windows.Media.Media3D;
-using Yw.Hydro;
using Yw.Model;
-using Yw.Pump;
using Yw.Vmo;
-using Yw.WinFrmUI.Bimface;
-using Yw.WinFrmUI.Hydro;
namespace HStation.WinFrmUI
{
@@ -86,9 +70,14 @@
ShowPropertyCtrl();
}
- private void InitialUI()
+ //鍒濆鍖朥I
+ private async void InitialUI()
{
- InitialCurrentWorking();
+ var workingTupleHelper = GetWorkingTupleHelper();
+ var allWorkingList = await workingTupleHelper.GetWorkingList();
+ InitialUIWorkingList(allWorkingList);
+ var working = allWorkingList?.LastOrDefault();
+ SetUIWorking(working);
}
@@ -100,6 +89,10 @@
//鑾峰彇 bimface 鎺т欢
private async Task<XhsProjectSimulationBimfaceCtrl> GetBimfaceCtrl()
{
+ if (_hydroInfo == null)
+ {
+ return default;
+ }
if (_bimfaceCtrl == null)
{
_bimfaceCtrl = new XhsProjectSimulationBimfaceCtrl();
@@ -113,14 +106,11 @@
}
InitialUI();
};
- _bimfaceCtrl.HydroMouseLeftClickEvent += (obj) =>
+ _bimfaceCtrl.HydroMouseLeftClickEvent += (code) =>
{//榧犳爣宸﹂敭鐐瑰嚮浜嬩欢
- if (_hydroInfo == null)
- {
- return;
- }
- //_selectedVisual = obj;
- ShowSelectedProperty();
+ var visualListHelper = GetVisualListHelper();
+ var visual = visualListHelper.GetVisual(code);
+ SelectVisual(visual, eVisualSource.Bimface);
};
}
return _bimfaceCtrl;
@@ -134,11 +124,6 @@
this.tabPageBimface.Controls.Add(bimfaceCtrl);
}
- private void SelectBimfaceParter()
- {
-
- }
-
#endregion
#region Q3d鎺т欢
@@ -149,20 +134,20 @@
//鑾峰彇 Q3d 鎺т欢
private XhsProjectSimulationQ3dCtrl GetQ3dCtrl()
{
+ if (_hydroInfo == null)
+ {
+ return default;
+ }
if (_q3dCtrl == null)
{
_q3dCtrl = new XhsProjectSimulationQ3dCtrl();
_q3dCtrl.Dock = DockStyle.Fill;
_q3dCtrl.InitialData(() => _hydroInfo);
- _q3dCtrl.SelectedPartersChangedEvent += (obj) =>
+ _q3dCtrl.SelectedPartersChangedEvent += (codes) =>
{
- if (_hydroInfo == null)
- {
- return;
- }
- var allParterList = _hydroInfo.GetAllVisuals();
- _selectedVisual = allParterList?.Find(x => x.Code == obj?.FirstOrDefault());
- ShowSelectedProperty();
+ var visualListHelper = GetVisualListHelper();
+ var visuals = visualListHelper.GetVisualList(codes);
+ SelectVisual(visuals?.LastOrDefault(), eVisualSource.Q3d);
};
}
return _q3dCtrl;
@@ -178,314 +163,6 @@
#endregion
- #region 鍙鍒楄〃
-
- //鎵�鏈夊彲瑙嗗瓧鍏�
- private Dictionary<string, HydroVisualInfo> _allVisualDict = null;
-
- //鑾峰彇鍙瀛楀吀
- private Dictionary<string, HydroVisualInfo> GetVisualDict()
- {
- if (_hydroInfo == null)
- {
- return default;
- }
- if (_allVisualDict == null)
- {
- _allVisualDict = new Dictionary<string, HydroVisualInfo>();
- var allVisualList = _hydroInfo.GetAllVisuals();
- allVisualList?.ForEach(x => _allVisualDict.Add(x.Code, x));
- }
- return _allVisualDict;
- }
-
- //鑾峰彇鍙鍒楄〃
- private List<HydroVisualInfo> GetVisualList()
- {
- var allVisualDict = GetVisualDict();
- return allVisualDict?.Values.ToList();
- }
-
- //鑾峰彇鑺傜偣鍒楄〃
- private List<HydroNodeInfo> GetNodeList()
- {
- if (_hydroInfo == null)
- {
- return default;
- }
- return _hydroInfo.GetAllNodes();
- }
-
- //鑾峰彇绠℃鍒楄〃
- private List<HydroLinkInfo> GetLinkList()
- {
- if (_hydroInfo == null)
- {
- return default;
- }
- return _hydroInfo.GetAllLinks();
- }
-
- //鑾峰彇鍙鏋勪欢
- private HydroVisualInfo GetVisual(string code)
- {
- var allVisualDict = GetVisualDict();
- if (allVisualDict == null)
- {
- return default;
- }
- if (allVisualDict.ContainsKey(code))
- {
- return allVisualDict[code];
- }
- return default;
- }
-
- #endregion
-
- #region 璁＄畻缁撴灉
-
- //璁＄畻缁撴灉
- private HydroCalcuResult _calcuResult = null;
-
- //鑾峰彇璁＄畻缁撴灉
- private HydroCalcuResult GetCalcuResult(string calcuMode, bool needCalcuAgain = false)
- {
- if (_hydroInfo == null)
- {
- return default;
- }
- if (needCalcuAgain)
- {
- _calcuResult = _hydroInfo.Calcu(calcuMode);
- }
- if (_calcuResult == null)
- {
- _calcuResult = _hydroInfo.Calcu(calcuMode);
- }
- return _calcuResult;
- }
-
- //鑾峰彇鍙缁勪欢璁＄畻缁撴灉鍒楄〃
- private List<HydroCalcuVisualResult> GetCalcuVisualResultList(string calcuMode, bool needCalcuAgain = false)
- {
- var calcuResult = GetCalcuResult(calcuMode, needCalcuAgain);
- if (calcuResult == null)
- {
- return default;
- }
- if (!calcuResult.Succeed)
- {
- return default;
- }
- return calcuResult.GetVisualList();
- }
-
- //鑾峰彇鑺傜偣璁＄畻缁撴灉鍒楄〃
- private List<HydroCalcuNodeResult> GetCalcuNodeResultList(string calcuMode, bool needCalcuAgain = false)
- {
- var calcuResult = GetCalcuResult(calcuMode, needCalcuAgain);
- if (calcuResult == null)
- {
- return default;
- }
- if (!calcuResult.Succeed)
- {
- return default;
- }
- return calcuResult.NodeList;
- }
-
- //鑾峰彇绠℃璁＄畻缁撴灉鍒楄〃
- private List<HydroCalcuLinkResult> GetCalcuLinkResultList(string calcuMode, bool needCalcuAgain = false)
- {
- var calcuResult = GetCalcuResult(calcuMode, needCalcuAgain);
- if (calcuResult == null)
- {
- return default;
- }
- if (!calcuResult.Succeed)
- {
- return default;
- }
- return calcuResult.LinkList;
- }
-
- //鎵�鏈夊彲瑙佽绠楀瓧鍏�
- private Dictionary<string, HydroCalcuVisualResult> _allCalcuVisualDict = null;
-
- //鑾峰彇鍙璁＄畻瀛楀吀
- private Dictionary<string, HydroCalcuVisualResult> GetCalcuVisualDict(string calcuMode, bool needCalcuAgain = false)
- {
- if (_hydroInfo == null)
- {
- return default;
- }
- var allCalcuVisualResultList = GetCalcuVisualResultList(calcuMode, needCalcuAgain);
- if (needCalcuAgain)
- {
- _allCalcuVisualDict = new Dictionary<string, HydroCalcuVisualResult>();
- allCalcuVisualResultList?.ForEach(x => _allCalcuVisualDict.Add(x.Code, x));
- }
- if (_allCalcuVisualDict == null)
- {
- _allCalcuVisualDict = new Dictionary<string, HydroCalcuVisualResult>();
- allCalcuVisualResultList?.ForEach(x => _allCalcuVisualDict.Add(x.Code, x));
- }
- return _allCalcuVisualDict;
- }
-
- //鑾峰彇鍙璁＄畻缁撴灉
- private HydroCalcuVisualResult GetCalcuVisualResult(string code, string calcuMode = Yw.EPAnet.CalcuMode.MinorLoss, bool needCalcuAgain = false)
- {
- var allCalcuVisualDict = GetCalcuVisualDict(calcuMode, needCalcuAgain);
- if (allCalcuVisualDict == null || allCalcuVisualDict.Count < 1)
- {
- return default;
- }
- if (allCalcuVisualDict.ContainsKey(code))
- {
- return allCalcuVisualDict[code];
- }
- return default;
- }
-
- //鑾峰彇鍙璁＄畻缁撴灉
- private HydroCalcuVisualResult GetCalcuVisualResult(Yw.Model.HydroVisualInfo visual, string calcuMode = Yw.EPAnet.CalcuMode.MinorLoss, bool needCalcuAgain = false)
- {
- return GetCalcuVisualResult(visual?.Code, calcuMode, needCalcuAgain);
- }
-
- #endregion
-
- #region 瑙嗗浘鍒楄〃
-
- //鎵�鏈夊彲瑙佽鍥惧瓧鍏�
- private Dictionary<string, HydroVisualViewModel> _allVisualViewModelDict = null;
-
- //鑾峰彇鍙瑙嗗浘瀛楀吀
- private Dictionary<string, HydroVisualViewModel> GetVisualViewModelDict()
- {
- if (_hydroInfo == null)
- {
- return default;
- }
- if (_allVisualViewModelDict == null)
- {
- _allVisualViewModelDict = new Dictionary<string, HydroVisualViewModel>();
- var allVisualDict = GetVisualDict();
- if (allVisualDict != null && allVisualDict.Count > 0)
- {
- foreach (var visualKeyValue in allVisualDict)
- {
- var vm = HydroVisualViewModelBuilder.CreateVisualViewModel(visualKeyValue.Value, _hydroInfo);
- var calcuVisualResult = GetCalcuVisualResult(visualKeyValue.Key);
- if (calcuVisualResult != null)
- {
- vm.UpdateCalcuProperty(calcuVisualResult);
- }
- _allVisualViewModelDict.Add(visualKeyValue.Key, vm);
- }
- }
- }
- return _allVisualViewModelDict;
- }
-
- //鑾峰彇鍙瑙嗗浘鍒楄〃
- private List<HydroVisualViewModel> GetVisualViewModelList()
- {
- var allVisualViewModelDict = GetVisualViewModelDict();
- return allVisualViewModelDict?.Values.ToList();
- }
-
- //鏇存柊鍙瑙嗗浘灞炴��
- private void UpdateVisualViewModelProperty()
- {
- var allVisualViewModelList = GetVisualViewModelList();
- allVisualViewModelList?.ForEach(x => x.UpdateProperty());
- }
-
- //鏇存柊鍙瑙嗗浘灞炴��
- private void UpdateVisualViewModelProperty(string code)
- {
- var allVisualViewModelDict = GetVisualViewModelDict();
- if (allVisualViewModelDict != null && allVisualViewModelDict.Count > 0)
- {
- if (allVisualViewModelDict.ContainsKey(code))
- {
- allVisualViewModelDict[code].UpdateProperty();
- }
- }
- }
-
- //鏇存柊鍙瑙嗗浘灞炴��
- private void UpdateVisualViewModelProperty(List<string> codes)
- {
- codes?.ForEach(x => UpdateVisualViewModelProperty(x));
- }
-
- //鏇存柊鍙瑙嗗浘灞炴��
- private void UpdateVisualViewModelProperty(List<HydroVisualInfo> visualList)
- {
- visualList?.ForEach(x => UpdateVisualViewModelProperty(x.Code));
- }
-
- //鏇存柊鍙瑙嗗浘璁＄畻灞炴��
- private void UpdateVisualViewModelCalcuProperty()
- {
- var allVisualViewModelDict = GetVisualViewModelDict();
- if (allVisualViewModelDict != null && allVisualViewModelDict.Count > 0)
- {
- foreach (var visualViewModelKeyValue in allVisualViewModelDict)
- {
- var calcuVisualResult = GetCalcuVisualResult(visualViewModelKeyValue.Key);
- if (calcuVisualResult != null)
- {
- visualViewModelKeyValue.Value.UpdateCalcuProperty(calcuVisualResult);
- }
- }
- }
- }
-
- //鑾峰彇鍙瑙嗗浘
- private HydroVisualViewModel GetVisualViewModel(string code)
- {
- if (string.IsNullOrEmpty(code))
- {
- return default;
- }
- var allVisualViewModelList = GetVisualViewModelList();
- return allVisualViewModelList?.Find(x => x.Code == code);
- }
-
- //鑾峰彇鍙瑙嗗浘
- private HydroVisualViewModel GetVisualViewModel(Yw.Model.HydroVisualInfo visual)
- {
- return GetVisualViewModel(visual?.Code);
- }
-
- #endregion
-
- #region 閫夋嫨鏋勪欢
-
- //閫夋嫨鏋勪欢
- private Yw.Model.HydroVisualInfo _selectedVisual = null;
-
- //閫夋嫨鏋勪欢
- private Yw.Model.HydroVisualInfo SelectedVisual
- {
- get { return _selectedVisual; }
- set
- {
-
- _selectedVisual = value;
- this.barBtnSetMonitor.Enabled = _selectedVisual != null;
- }
- }
-
-
- #endregion
-
#region 灞炴�ф帶浠�
//灞炴�ф帶浠�
@@ -494,33 +171,26 @@
//鑾峰彇灞炴�ф帶浠�
private XhsProjectSimulationPropertyCtrl GetPropertyCtrl()
{
+ if (_hydroInfo == null)
+ {
+ return default;
+ }
if (_propertyCtrl == null)
{
_propertyCtrl = new XhsProjectSimulationPropertyCtrl();
_propertyCtrl.Dock = DockStyle.Fill;
_propertyCtrl.HydroViewEvent += (visual) =>
{
- if (visual == null)
- {
- return;
- }
- _bimfaceCtrl?.ZoomToComponent(visual.Code);
+ SelectVisual(visual, eVisualSource.Property);
};
_propertyCtrl.BlinkLinkNodeEvent += async (link, linkNodeCode) =>
{ //寮鸿皟杩炴帴鑺傜偣
- if (_hydroInfo == null)
- {
- return;
- }
if (link == null)
{
return;
}
- if (string.IsNullOrEmpty(linkNodeCode))
- {
- return;
- }
- var linkNode = GetVisual(linkNodeCode);
+ var visualListHelper = GetVisualListHelper();
+ var linkNode = visualListHelper.GetVisual(linkNodeCode);
if (linkNode == null)
{
return;
@@ -528,7 +198,7 @@
var blinkCodes = new List<string>();
if (linkNode.GetType() == typeof(HydroJunctionInfo))
{
- var allLinkList = GetLinkList();
+ var allLinkList = visualListHelper.GetLinkList();
if (allLinkList == null || allLinkList.Count < 1)
{
return;
@@ -550,31 +220,36 @@
await Task.Delay(5000);
await _bimfaceCtrl?.ClearBlinkComponents();
};
- _propertyCtrl.PropertyValueChangedEvent += (visual) =>
+ _propertyCtrl.PropertyValueChangedEvent += async (visual) =>
{
if (visual == null)
{
return;
}
UpdateVisualListCtrl();
- //ApplyGradingResultList(visual);
+ var gradingHelper = await GetGradingHelper();
+ gradingHelper.Set();
};
- _propertyCtrl.MarkPropertyValueChangedEvent += (visual) =>
+ _propertyCtrl.MarkPropertyValueChangedEvent += async (visual) =>
{
//鏍囨敞灞炴�у彂鐢熸敼鍙�
//鍒ゆ柇褰撳墠鏄惁鏈夋爣娉ㄥ睍绀猴紝鑻ユ湁鍒欐洿鏂版爣娉紝鏈�濂芥槸鏇存柊鍗曚釜鏍囨敞
- //UpdateMark(visual);
+ var markHelper = await GetMarkHelper();
+ markHelper.Set(visual);
};
- _propertyCtrl.GradingPropertyValueChangedEvent += (parter) =>
+ _propertyCtrl.GradingPropertyValueChangedEvent += async (visual) =>
{
//鍒嗙骇灞炴�у彂鐢熸敼鍙�
//鍒ゆ柇褰撳墠鏄惁鏈夊垎绾у睍绀猴紝鑻ユ湁鍒欐洿鏂板垎绾э紝鏈�濂芥槸鏇存柊鍗曚釜鍒嗙骇
+ var gradingHelper = await GetGradingHelper();
+ gradingHelper.Set(visual);
};
- _propertyCtrl.FlowEffectPropertyValueChangedEvent += (visual) =>
+ _propertyCtrl.FlowEffectPropertyValueChangedEvent += async (visual) =>
{
//娴佸悜灞炴�у彂鐢熸敼鍙�
//鍒ゆ柇娴佸悜鏄惁鍔犺浇锛屽鏋滃姞杞藉垯鏇存柊娴佸悜锛屾渶濂芥槸鏇存柊鍗曚釜娴佸悜
- //UpdateFlowEffect(visual);
+ var flowEffectHelper = await GetFlowEffectHelper();
+ flowEffectHelper.Set(visual);
};
}
@@ -615,50 +290,13 @@
this.docPnlRight.Width = 300;
}
- //鏄剧ず閫夋嫨灞炴��
- private void ShowSelectedProperty()
- {
- ShowSelectedProperty(_selectedVisual);
- }
-
- //鏄剧ず閫夋嫨灞炴��
- private void ShowSelectedProperty(Yw.Model.HydroVisualInfo visual)
- {
- if (_hydroInfo == null)
- {
- return;
- }
- ShowPropertyCtrl();
- _selectedVisual = visual;
- if (_selectedVisual == null)
- {
- _propertyCtrl.SelectedObject = null;
- return;
- }
- _propertyCtrl.SelectedObject = GetVisualViewModel(_selectedVisual);
- }
-
- //鏇存柊閫夋嫨灞炴��
- private void UpdateSelectedProperty()
- {
- if (!IsPropertyCtrlVisible)
- {
- return;
- }
- if (_selectedVisual == null)
- {
- return;
- }
- _propertyCtrl?.UpdateRows();
- }
-
//璁剧疆灞炴�ф帶浠�
- private void SetPropertyCtrl(Yw.Model.HydroVisualInfo visual)
+ private void SetPropertyCtrl(HydroVisualInfo visual)
{
- if (visual == null)
- {
-
- }
+ ShowPropertyCtrl();
+ var visualVmListHelper = GetVisualVmListHelper();
+ var vm = visualVmListHelper.GetVisual(visual);
+ _propertyCtrl.SelectedObject = vm;
}
//鏇存柊灞炴�ф帶浠�
@@ -666,6 +304,300 @@
{
_propertyCtrl?.UpdateRows();
}
+
+ //娓呯悊灞炴�ф帶浠�
+ private void ClearPropertyCtrl()
+ {
+ if (_propertyCtrl != null)
+ {
+ _propertyCtrl.SelectedObject = null;
+ }
+ }
+
+ #endregion
+
+ #region 閫夋嫨鏋勪欢
+
+ //鍙鏉ユ簮
+ protected enum eVisualSource
+ {
+ None,
+ Bimface,
+ Q3d,
+ Property,
+ List,
+ Search,
+ Monitor,
+ Check,
+ Calcu,
+ Warning,
+ }
+
+ //閫夋嫨鏋勪欢
+ private Yw.Model.HydroVisualInfo _visual = null;
+
+ //閫夋嫨鏋勪欢
+ private void SelectVisual(HydroVisualInfo visual, eVisualSource source)
+ {
+ _visual = visual;
+ switch (source)
+ {
+ case eVisualSource.None:
+ {
+ _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
+ this.barBtnSetMonitor.Enabled = visual != null;
+ SetPropertyCtrl(visual);
+ }
+ break;
+ case eVisualSource.Bimface:
+ {
+ this.barBtnSetMonitor.Enabled = visual != null;
+ SetPropertyCtrl(visual);
+ }
+ break;
+ case eVisualSource.Q3d:
+ {
+ _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
+ this.barBtnSetMonitor.Enabled = visual != null;
+ SetPropertyCtrl(visual);
+ }
+ break;
+ case eVisualSource.Property:
+ {
+ _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
+ this.barBtnSetMonitor.Enabled = visual != null;
+ }
+ break;
+ case eVisualSource.List:
+ {
+ _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
+ this.barBtnSetMonitor.Enabled = visual != null;
+ SetPropertyCtrl(visual);
+ }
+ break;
+ case eVisualSource.Search:
+ {
+ _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
+ this.barBtnSetMonitor.Enabled = visual != null;
+ SetPropertyCtrl(visual);
+ }
+ break;
+ case eVisualSource.Monitor:
+ {
+ _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
+ this.barBtnSetMonitor.Enabled = visual != null;
+ SetPropertyCtrl(visual);
+ }
+ break;
+ case eVisualSource.Check:
+ {
+ _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
+ this.barBtnSetMonitor.Enabled = visual != null;
+ SetPropertyCtrl(visual);
+ }
+ break;
+ case eVisualSource.Calcu:
+ {
+ _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
+ this.barBtnSetMonitor.Enabled = visual != null;
+ SetPropertyCtrl(visual);
+ }
+ break;
+ case eVisualSource.Warning:
+ {
+ _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
+ this.barBtnSetMonitor.Enabled = visual != null;
+ SetPropertyCtrl(visual);
+ }
+ break;
+ default: break;
+ }
+ }
+
+ #endregion
+
+ #region 鏋勪欢鏄庣粏
+
+ #region 鍙鍒楄〃
+
+ //鍙鍒楄〃杈呭姪绫�
+ private SimulationVisualListHelper _visualListHelper = null;
+
+ //鑾峰彇鍙鍒楄〃杈呭姪绫�
+ private SimulationVisualListHelper GetVisualListHelper()
+ {
+ if (_visualListHelper == null)
+ {
+ _visualListHelper = new SimulationVisualListHelper();
+ _visualListHelper.InitialData(_hydroInfo);
+ }
+ return _visualListHelper;
+ }
+
+ #endregion
+
+ #region 瑙嗗浘鍒楄〃
+
+ //鍙瑙嗗浘鍒楄〃杈呭姪绫�
+ private SimulationVisualVmListHelper _visualVmListHelper = null;
+
+ //鑾峰彇鍙瑙嗗浘鍒楄〃杈呭姪绫�
+ private SimulationVisualVmListHelper GetVisualVmListHelper()
+ {
+ if (_hydroInfo == null)
+ {
+ return default;
+ }
+ if (_visualVmListHelper == null)
+ {
+ var visualListHelper = GetVisualListHelper();
+ var calcuResultHelper = GetCalcuResultHelper();
+ _visualVmListHelper = new SimulationVisualVmListHelper(visualListHelper, calcuResultHelper);
+ }
+ return _visualVmListHelper;
+ }
+
+ #endregion
+
+ #region 鏄庣粏鎺т欢
+
+ //鏋勪欢鏄庣粏鎺т欢
+ private Yw.WinFrmUI.HydroVisualListCtrl _visualListCtrl = null;
+
+ //鑾峰彇鏋勪欢鏄庣粏鎺т欢
+ private Yw.WinFrmUI.HydroVisualListCtrl GetVisualListCtrl()
+ {
+ if (_visualListCtrl == null)
+ {
+ _visualListCtrl = new HydroVisualListCtrl();
+ _visualListCtrl.Dock = DockStyle.Fill;
+ _visualListCtrl.HydroClickInfoEvent += (visual) =>
+ {
+ SelectVisual(visual, eVisualSource.List);
+ };
+ _visualListCtrl.HydroChangedInfoEvent += (visualList) =>
+ {
+ SelectVisual(_visual, eVisualSource.List);
+ };
+ }
+ return _visualListCtrl;
+ }
+
+ //鏋勪欢鏄庣粏鎺т欢鏄惁鍙
+ private bool IsVisualListCtrlVisible
+ {
+ get
+ {
+ if (this.docPnlBottom.Visibility == DevExpress.XtraBars.Docking.DockVisibility.Visible)
+ {
+ if (this.controlContainerBottom.Controls.Count > 0)
+ {
+ if (this.controlContainerBottom.Controls[0] is HydroVisualListCtrl)
+ {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+ }
+
+ //鏄剧ず鏋勪欢鏄庣粏鎺т欢
+ private void ShowVisualListCtrl()
+ {
+ if (_hydroInfo == null)
+ {
+ return;
+ }
+ var visualListCtrl = GetVisualListCtrl();
+ if (!IsVisualListCtrlVisible)
+ {
+ this.controlContainerBottom.Controls.Clear();
+ this.controlContainerBottom.Controls.Add(visualListCtrl);
+ this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
+ this.docPnlBottom.Text = "鏋勪欢鏄庣粏";
+ this.docPnlBottom.Height = 350;
+ }
+ var visualVmListHelper = GetVisualVmListHelper();
+ var allVisualVmList = visualVmListHelper.GetVisualList();
+ visualListCtrl.SetBindingData(allVisualVmList);
+ var calcuResult = GetCalcuResult();
+ if (calcuResult != null && calcuResult.Succeed)
+ {
+ visualListCtrl.SetCalcuView();
+ }
+ else
+ {
+ visualListCtrl.SetNormalView();
+ }
+ }
+
+ //鏇存柊鏋勪欢鏄庣粏鎺т欢
+ private void UpdateVisualListCtrl()
+ {
+ if (!IsVisualListCtrlVisible)
+ {
+ return;
+ }
+ _visualListCtrl?.UpdateBindingData();
+ }
+
+ //鏋勪欢鏄庣粏
+ private void barBtnVisualList_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ {
+ ShowVisualListCtrl();
+ }
+
+ #endregion
+
+ #region 鏋勪欢鏄剧ず
+
+ //鏋勪欢鍙杈呭姪绫�
+ private SimulationVisualVisibleHelper _visualVisibleHelper = null;
+
+ //鑾峰彇鏋勪欢鍙杈呭姪绫�
+ private async Task<SimulationVisualVisibleHelper> GetVisualVisibleHelper()
+ {
+ if (_hydroInfo == null)
+ {
+ return default;
+ }
+ if (_visualVisibleHelper == null)
+ {
+ var visualListHelper = GetVisualListHelper();
+ var bimfaceCtrl = await GetBimfaceCtrl();
+ _visualVisibleHelper = new SimulationVisualVisibleHelper(visualListHelper, bimfaceCtrl);
+ _visualVisibleHelper.InitialData(_hydroInfo);
+ }
+ return _visualVisibleHelper;
+ }
+
+ //璁剧疆鏋勪欢鍙鎬�
+ private async void SetVisualVisible()
+ {
+ if (_hydroInfo == null)
+ {
+ return;
+ }
+ var visualVisibleHelper = await GetVisualVisibleHelper();
+ var allVisibleList = visualVisibleHelper.Items;
+ var dlg = new SetHydroVisualVisibleDlg();
+ dlg.SetBindingData(allVisibleList);
+ dlg.ReloadDataEvent += (list) =>
+ {
+ visualVisibleHelper.Items = list;
+ visualVisibleHelper.Set();
+ };
+ dlg.ShowDialog();
+ }
+
+ //璁剧疆鏋勪欢鏄剧ず
+ private void barBtnSetVisualVisible_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ {
+ SetVisualVisible();
+ }
+
+ #endregion
#endregion
@@ -685,14 +617,14 @@
return;
}
var allParterList = _hydroInfo.GetAllVisuals();
- _selectedVisual = allParterList?.Find(x => x.Code == code);
+ _visual = allParterList?.Find(x => x.Code == code);
var elementIds = new List<string>();
- if (_selectedVisual != null)
+ if (_visual != null)
{
- elementIds.Add(_selectedVisual.Code);
+ elementIds.Add(_visual.Code);
}
await _bimfaceCtrl?.ZoomAndSelectComponents(elementIds);
- ShowSelectedProperty();
+ //ShowSelectedProperty();
};
_matchingListCtrl.ApplyMatchingEvent += (output) =>
{
@@ -718,7 +650,7 @@
}
this.controlContainerBottom.Controls.Clear();
var matchingListCtrl = GetMatchingListCtrl();
- var input = AssetsMatchingParasHelper.Create(_hydroInfo, GetCalcuVisualResultList(Yw.EPAnet.CalcuMode.MinorLoss, false));
+ var input = AssetsMatchingParasHelper.Create(_hydroInfo, null);
matchingListCtrl.SetBindingData(input);
this.controlContainerBottom.Controls.Add(matchingListCtrl);
this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
@@ -748,17 +680,17 @@
return;
}
var allParterList = _hydroInfo.GetAllVisuals();
- _selectedVisual = allParterList?.Find(x => x.Code == parter.Code);
+ _visual = allParterList?.Find(x => x.Code == parter.Code);
var elementIds = new List<string>() { parter.Code };
await _bimfaceCtrl?.ZoomAndSelectComponents(elementIds);
- ShowSelectedProperty();
+ //ShowSelectedProperty();
};
_unMatchingListCtrl.ViewModelEvent += async (parters) =>//鏌ョ湅妯″瀷
{
var codes = parters?.Select(x => x.Code).Distinct().ToList();
await _bimfaceCtrl?.ZoomAndSelectComponents(codes);
- _selectedVisual = null;
- ShowSelectedProperty();
+ _visual = null;
+ //ShowSelectedProperty();
};
}
return _unMatchingListCtrl;
@@ -786,39 +718,27 @@
#region 涓�閿樉闅�
- //鏄鹃殣缂栫爜鍒楄〃
- private List<string> _fastShowHiddenCodeList = null;
-
- //涓�閿樉闅�
- private async void FastShowHidden()
+ //璁剧疆瑁呴グ浠跺彲瑙佹��
+ private async void SetDecoratorVisible(bool isDecoratorVisible)
{
- if (_hydroInfo == null)
+ var codes = _hydroInfo.Decorators?.Select(x => x.Code).Distinct().ToList();
+ if (isDecoratorVisible)
{
- return;
- }
- if (_hydroInfo.Decorators == null || _hydroInfo.Decorators.Count < 1)
- {
- return;
- }
- if (_fastShowHiddenCodeList == null)
- {
- _fastShowHiddenCodeList = _hydroInfo.Decorators.Select(x => x.Code).ToList();
- await _bimfaceCtrl?.HideComponents(_fastShowHiddenCodeList);
+ await _bimfaceCtrl?.ShowComponents(codes);
}
else
{
- await _bimfaceCtrl?.ShowComponents(_fastShowHiddenCodeList);
- _fastShowHiddenCodeList = null;
+ await _bimfaceCtrl?.HideComponents(codes);
}
}
- //瑙﹀彂涓�閿樉闅�
- private void barBtnFastShowHidden_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ //璁剧疆
+ private void barCkDecorator_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
- FastShowHidden();
+ SetDecoratorVisible(this.barCkDecorator.Checked);
}
- #endregion
+ #endregion
#region 淇濆瓨淇℃伅
@@ -1258,29 +1178,19 @@
{
if (_searchCtrl == null)
{
+ var visualVmListHelper = GetVisualVmListHelper();
+ var allVisualVmList = visualVmListHelper.GetVisualList();
_searchCtrl = new HydroVisualSearchListCtrl();
_searchCtrl.Dock = DockStyle.Fill;
- var allVisualViewModelList = GetVisualViewModelList();
- _searchCtrl.InitialData(allVisualViewModelList);
- _searchCtrl.HydroClickInfoEvent += async (visual) =>
+ _searchCtrl.InitialData(allVisualVmList);
+ _searchCtrl.HydroClickInfoEvent += (visual) =>
{
- ShowSelectedProperty(visual);
- await _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
+ SelectVisual(visual, eVisualSource.Check);
};
- _searchCtrl.HydroSearchInfoEvent += async (list) =>
+ _searchCtrl.HydroSearchInfoEvent += (list) =>
{
- var elementIds = new List<string>();
- if (list != null && list.Count > 0)
- {
- _selectedVisual = list.First();
- list.ForEach(x => elementIds.Add(x.Code));
- }
- else
- {
- _selectedVisual = null;
- }
- ShowSelectedProperty();
- await _bimfaceCtrl?.ZoomAndSelectComponents(elementIds);
+ var visual = list?.FirstOrDefault();
+ SelectVisual(visual, eVisualSource.Search);
};
}
return _searchCtrl;
@@ -1351,118 +1261,35 @@
#region 妯″瀷鏍囨敞
- #region 鏍囨敞璁剧疆
+ //鏍囨敞杈呭姪绫�
+ private SimulationMarkHelper _markHelper = null;
- //鎵�鏈夋爣娉ㄨ缃垪琛�
- private List<HydroMarkSetViewModel> _allMarkSetList = null;
-
- //鑾峰彇鏍囨敞璁剧疆鍒楄〃
- private List<HydroMarkSetViewModel> GetMarkSetList()
+ //鑾峰彇鏍囨敞杈呭姪绫�
+ private async Task<SimulationMarkHelper> GetMarkHelper()
{
- if (_hydroInfo == null)
+ if (_markHelper == null)
{
- return default;
+ var visualListHelper = GetVisualListHelper();
+ var bimfaceCtrl = await GetBimfaceCtrl();
+ _markHelper = new SimulationMarkHelper(visualListHelper, bimfaceCtrl);
}
- if (_allMarkSetList == null)
- {
- _allMarkSetList = HydroMarkHelper.GetSetList(_hydroInfo);
- }
- return _allMarkSetList;
+ return _markHelper;
}
- #endregion
-
- #region 鏍囨敞缁撴灉
-
- //鎵�鏈夋爣娉ㄧ粨鏋滃垪琛�
- private List<HydroMarkResultViewModel> _allMarkResultList = null;
-
- //鑾峰彇鏍囨敞缁撴灉鍒楄〃
- //UseCache 鏄惁浣跨敤缂撳瓨
- private List<HydroMarkResultViewModel> GetMarkResultList(bool useCache = true)
- {
- if (_hydroInfo == null)
- {
- return default;
- }
- if (!useCache)
- {
- var allSetList = GetMarkSetList();
- _allMarkResultList = HydroMarkHelper.GetResultList(_hydroInfo, allSetList);
- }
- if (_allMarkResultList == null)
- {
- var allSetList = GetMarkSetList();
- _allMarkResultList = HydroMarkHelper.GetResultList(_hydroInfo, allSetList);
- }
- return _allMarkResultList;
- }
-
- #endregion
-
- #region 鏍囨敞鏄剧ず
-
- //鏍囨敞鏄惁鏄剧ず
- private bool _isMarkVisible = false;
-
- //鏇存柊鏍囨敞
- private async void UpdateMark(Yw.Model.HydroVisualInfo visual)
- {
- var allSetList = GetMarkSetList();
- var result = HydroMarkHelper.GetResult(visual, allSetList);
- if (result == null)
- {
- return;
- }
- var allResultList = GetMarkResultList(true);
- allResultList.Remove(x => x.Code == visual.Code);
- allResultList.Add(result);
- if (_isMarkVisible)
- {
- var leadLabel = new LogicMarkLeadLabel() { Id = result.Code, Text = result.Text, Distance = null };
- await _bimfaceCtrl?.UpdateLogicMarkLeadLabel(leadLabel);
- }
- }
-
- //鏇存柊鏍囨敞鍒楄〃
- private void UpdateMarkList(List<Yw.Model.HydroVisualInfo> visuals)
- {
- if (visuals == null || visuals.Count < 1)
- {
- visuals.ForEach(x => UpdateMark(x));
- }
- }
-
- //搴旂敤鏍囨敞鍒楄〃
- //UseCache 鏄惁浣跨敤缂撳瓨
- private async void ApplyMarkList(bool useCache = true)
- {
- if (_isMarkVisible)
- {
- var allResultList = GetMarkResultList(useCache);
- var leadLabels = allResultList?.Select(x => new LogicMarkLeadLabel(x.Code, x.Text, null)).ToList();
- await _bimfaceCtrl?.SetLogicMarkLeadLabels(leadLabels);
- }
- else
- {
- await _bimfaceCtrl?.ClearLogicMarkLeadLabels();
- }
- }
-
- //鏄剧ず鏍囨敞璁剧疆绐椾綋
- private void ShowSetMarkDlg()
+ //鏄剧ず鏍囨敞鍒楄〃
+ private async void ShowMarkList()
{
if (_hydroInfo == null)
{
return;
}
- var allMarkSetList = GetMarkSetList();
+ var markHelper = await GetMarkHelper();
var dlg = new SetHydroMarkDlg();
- dlg.SetBindingData(allMarkSetList);
+ dlg.SetBindingData(markHelper.Sets);
dlg.ReloadDataEvent += (list) =>
{
- _allMarkSetList = list;
- ApplyMarkList(false);
+ markHelper.Sets = list;
+ markHelper.Set();
};
dlg.ShowDialog();
}
@@ -1470,251 +1297,98 @@
//璁剧疆鏍囨敞
private void barBtnSetMark_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
- ShowSetMarkDlg();
+ ShowMarkList();
}
//鏄惁鏄剧ず
- private void barCkMark_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ private async void barCkMark_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
- _isMarkVisible = this.barCkMark.Checked;
- ApplyMarkList(true);
+ var markHelper = await GetMarkHelper();
+ markHelper.Visible = this.barCkMark.Checked;
+ markHelper.Set();
}
-
- #endregion
#endregion
#region 棰滆壊鍒嗙骇
- #region 棰滆壊閰嶇疆
+ //棰滆壊鍒嗙骇杈呭姪绫�
+ private SimulationGradingHelper _gradingHelper = null;
- //鎵�鏈夐鑹插垎绾ч厤缃垪琛�
- private List<HydroGradingVmo> _allGradingList = null;
-
- //鑾峰彇棰滆壊鍒嗙骇閰嶇疆鍒楄〃
- private async Task<List<HydroGradingVmo>> GetGradingList()
+ //鑾峰彇棰滆壊鍒嗙骇杈呭姪绫�
+ private async Task<SimulationGradingHelper> GetGradingHelper()
{
- if (_hydroInfo == null)
+ if (_gradingHelper == null)
{
- return default;
+ var visualListHelper = GetVisualListHelper();
+ var calcuResultHelper = GetCalcuResultHelper();
+ var bimfaceCtrl = await GetBimfaceCtrl();
+ _gradingHelper = new SimulationGradingHelper(visualListHelper, calcuResultHelper, bimfaceCtrl);
}
- if (_allGradingList == null)
- {
- _allGradingList = await HydroGradingHelper.GetGradingList(_hydroInfo);
- }
- return _allGradingList;
+ return _gradingHelper;
}
- //鏄剧ず棰滆壊鍒嗙骇绐椾綋
- private async void ShowGradingDlg()
+ //璁剧疆棰滆壊鍒嗙骇鍒楄〃
+ private async void SetGradingList()
{
if (_hydroInfo == null)
{
return;
}
- var allGradingList = await GetGradingList();
+ var gradingHelper = await GetGradingHelper();
+ var allGradingList = await gradingHelper.GetGradingList();
var dlg = new SetHydroGradingTreeDlg();
dlg.SetBindingData(_hydroInfo, allGradingList);
dlg.ReloadDataEvent += (list) =>
{
- _allGradingList = list;
- ApplyGradingResultList(false);
+ gradingHelper.SetGradingList(list);
+ gradingHelper.Set();
};
dlg.ApplyDataEvent += (catalog, propName) =>
{
- UpdateGradingApplyList(catalog, propName);
- ApplyGradingResultList(false);
+ gradingHelper.UpdateApply(catalog, propName);
+ gradingHelper.Set();
};
dlg.ShowDialog();
}
//閰嶇疆棰滆壊鍒嗙骇
- private void barBtnGradingSet_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ private void barBtnSetGradingList_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
- ShowGradingDlg();
+ SetGradingList();
}
- #endregion
-
- #region 搴旂敤鍒嗙骇
-
- //棰滆壊鍒嗙骇搴旂敤鍒楄〃
- private List<HydroGradingApplyViewModel> _allGradingApplyList = null;
-
- //鑾峰彇棰滆壊鍒嗙骇搴旂敤鍒楄〃
- private List<HydroGradingApplyViewModel> GetGradingApplyList()
- {
- if (_hydroInfo == null)
- {
- return default;
- }
- if (_allGradingApplyList == null)
- {
- _allGradingApplyList = HydroGradingHelper.GetApplyList(_hydroInfo);
- }
- return _allGradingApplyList;
- }
-
- //鏇存柊棰滆壊鍒嗙骇搴旂敤鍒楄〃
- private void UpdateGradingApplyList(string catalog, string propName)
- {
- var allGradingApplyList = GetGradingApplyList();
- if (allGradingApplyList == null || allGradingApplyList.Count < 1)
- {
- return;
- }
- var apply = allGradingApplyList.Find(x => x.Catalog == catalog);
- if (apply == null)
- {
- return;
- }
- apply.PropName = propName;
- }
-
- //鏄剧ず棰滆壊鍒嗙骇搴旂敤绐椾綋
- private void ShowGradingApplyDlg()
+ //搴旂敤棰滆壊鍒嗙骇鍒楄〃
+ private async void ApplyGradingList()
{
if (_hydroInfo == null)
{
return;
}
- var allGradingApplyList = GetGradingApplyList();
- if (allGradingApplyList == null || allGradingApplyList.Count < 1)
- {
- return;
- }
+ var gradingHelper = await GetGradingHelper();
var dlg = new ApplyHydroGradingDlg();
- dlg.SetBindingData(allGradingApplyList);
- dlg.ReloadDataEvent += (obj) =>
+ dlg.SetBindingData(gradingHelper.Applies);
+ dlg.ReloadDataEvent += (list) =>
{
- _allGradingApplyList = obj;
- ApplyGradingResultList(false);
+ gradingHelper.Applies = list;
+ gradingHelper.Set();
};
dlg.ShowDialog();
}
//搴旂敤棰滆壊鍒嗙骇
- private void barBtnGradingApply_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ private void barBtnApplyGradingList_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
- ShowGradingApplyDlg();
- }
-
- #endregion
-
- #region 搴旂敤缁撴灉
-
- //鎵�鏈夐鑹插垎绾х粨鏋滃垪琛�
- private List<HydroGradingResultViewModel> _allGradingResultList = null;
-
- //鑾峰彇棰滆壊鍒嗙骇缁撴灉鍒楄〃
- //UseCache鏄惁浣跨敤缂撳瓨
- private async Task<List<HydroGradingResultViewModel>> GetGradingResultList(bool useCache = true)
- {
- if (_hydroInfo == null)
- {
- return default;
- }
- var allGradingList = await GetGradingList();
- var allGradingApplyList = GetGradingApplyList();
- var allCalcuResultList = GetCalcuVisualResultList(Yw.EPAnet.CalcuMode.MinorLoss, false);
- if (!useCache)
- {
- _allGradingResultList = HydroGradingHelper.GetResultList(_hydroInfo, allGradingList, allGradingApplyList, allCalcuResultList);
- }
- if (_allGradingResultList == null)
- {
- _allGradingResultList = HydroGradingHelper.GetResultList(_hydroInfo, allGradingList, allGradingApplyList, allCalcuResultList);
- }
- return _allGradingResultList;
- }
-
- #endregion
-
- #region 缁撴灉灞曠ず
-
- //棰滆壊鍒嗙骇鏄惁鏄剧ず
- private bool _isGradingVisible = false;
-
- //搴旂敤棰滆壊鍒嗙骇缁撴灉鍒楄〃
- //UseCache鏄惁浣跨敤缂撳瓨
- private async void ApplyGradingResultList(bool useCache = true)
- {
- if (_hydroInfo == null)
- {
- return;
- }
- var allGradingResultList = await GetGradingResultList(useCache);
- if (allGradingResultList == null || allGradingResultList.Count < 1)
- {
- return;
- }
- if (_isGradingVisible)
- {
- var groupList = allGradingResultList.GroupBy(x => x.Color).ToList();
- groupList.ForEach(async x => await _bimfaceCtrl?.OverrideComponentsColor(x.Select(t => t.Code).Distinct().ToList(), x.Key, 1));
- }
- else
- {
- var codes = allGradingResultList.Select(x => x.Code).Distinct().ToList();
- await _bimfaceCtrl?.RestoreComponentsColor(codes);
- }
- }
-
- //搴旂敤棰滆壊鍒嗙骇缁撴灉鍒楄〃
- private async void ApplyGradingResultList(Yw.Model.HydroVisualInfo visual)
- {
- if (visual == null)
- {
- return;
- }
- var allGradingList = await GetGradingList();
- var allGradingApplyList = GetGradingApplyList();
- var allGradingResultList = await GetGradingResultList(true);
- var allCalcuResultList = GetCalcuVisualResultList(Yw.EPAnet.CalcuMode.MinorLoss, false);
- var oldResult = allGradingResultList?.Find(x => x.Code == visual.Code);
- if (oldResult != null)
- {
- allGradingResultList.Remove(oldResult);
- }
- var newResult = HydroGradingHelper.GetResult(visual, allGradingList, allGradingApplyList, allCalcuResultList);
- if (newResult != null)
- {
- allGradingResultList.Add(newResult);
- }
- if (_isGradingVisible)
- {
- if (newResult == null)
- {
- if (oldResult != null)
- {
- await _bimfaceCtrl?.RestoreComponentsColor(oldResult.Code);
- }
- }
- else
- {
- await _bimfaceCtrl?.OverrideComponentsColor(newResult.Code, newResult.Color, 1);
- }
- }
- }
-
- //搴旂敤棰滆壊鍒嗙骇缁撴灉鍒楄〃
- private void ApplyGradingResultList(List<Yw.Model.HydroVisualInfo> visualList)
- {
- if (visualList == null || visualList.Count < 1)
- {
- return;
- }
- visualList.ForEach(x => ApplyGradingResultList(x));
+ ApplyGradingList();
}
//棰滆壊鍒嗙骇灞曠ず
- private void barCkGrading_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ private async void barCkGrading_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
- _isGradingVisible = this.barCkGrading.Checked;
- ApplyGradingResultList(true);
+ var gradingHelper = await GetGradingHelper();
+ gradingHelper.Visible = this.barCkGrading.Checked;
+ gradingHelper.Set();
}
-
- #endregion
#endregion
@@ -1741,10 +1415,13 @@
sw.Stop();
TimeSpan ts2 = sw.Elapsed;
Console.WriteLine("Stopwatch鎬诲叡鑺辫垂{0}ms.", ts2.TotalMilliseconds);
- _selectedVisual = null;
+ _visual = null;
await _bimfaceCtrl?.ZoomAndSelectComponents(null);
- ShowSelectedProperty();
+ //ShowSelectedProperty();
TipFormHelper.ShowSucceed("鏁版嵁宸插埛鏂�");
+
+ var visualListHelper = GetVisualListHelper();
+ visualListHelper.InitialData(_hydroInfo);
}
}
@@ -1752,198 +1429,139 @@
#region 姘存祦鍔ㄧ敾
- //姘存祦鍔ㄧ敾鏄惁鍙
- private bool _isFlowEffectVisible = false;
+ //姘存祦鍔ㄧ敾杈呭姪绫�
+ private SimulationFlowEffectHelper _flowEffectHelper = null;
- //鎵�鏈夋按娴佸姩鐢诲垪琛�
- private List<LogicFlowEffect> _allFlowEffectList = null;
-
- //鑾峰彇娴佸悜鍒楄〃
- private List<LogicFlowEffect> GetFlowEffectList()
+ //鑾峰彇姘存祦鍔ㄧ敾杈呭姪绫�
+ private async Task<SimulationFlowEffectHelper> GetFlowEffectHelper()
{
if (_hydroInfo == null)
{
return default;
}
- if (_allFlowEffectList == null)
+ if (_flowEffectHelper == null)
{
- _allFlowEffectList = new List<LogicFlowEffect>();
- var allCalcuResultList = GetCalcuVisualResultList(Yw.EPAnet.CalcuMode.MinorLoss, false);
- if (_hydroInfo.Pipes != null && _hydroInfo.Pipes.Count > 0)
- {
- foreach (var parter in _hydroInfo.Pipes)
- {
- var flowEffect = new LogicFlowEffect();
- _allFlowEffectList.Add(flowEffect);
- flowEffect.Id = parter.Code;
- flowEffect.Rotation = 90;
- flowEffect.SpeedX = 0.1;
- if (parter.FlowDirectionX == Yw.Hydro.FlowDirection.None)
- {
- flowEffect.SpeedX = 0;
- }
- else if (parter.FlowDirectionX == Yw.Hydro.FlowDirection.Positive)
- {
- flowEffect.SpeedX = 0.1;
- }
- else
- {
- flowEffect.SpeedX = -0.1;
- }
-
- if (parter.FlowDirectionY == Yw.Hydro.FlowDirection.None)
- {
- flowEffect.SpeedY = 0;
- }
- else if (parter.FlowDirectionY == Yw.Hydro.FlowDirection.Positive)
- {
- flowEffect.SpeedY = 0.1;
- }
- else
- {
- flowEffect.SpeedY = -0.1;
- }
-
- var calcuResult = allCalcuResultList?.Find(x => x.Code == parter.Code) as HydroCalcuLinkResult;
- if (calcuResult != null)
- {
- if (calcuResult.CalcuVelocity < 0)
- {
- flowEffect.SpeedX = -flowEffect.SpeedX;
- }
- }
- }
- }
+ var visualListHelper = GetVisualListHelper();
+ var bimfaceCtrl = await GetBimfaceCtrl();
+ _flowEffectHelper = new SimulationFlowEffectHelper(visualListHelper, bimfaceCtrl);
+ var calcuResult = GetCalcuResult();
+ _flowEffectHelper.InitialData(calcuResult);
}
- return _allFlowEffectList;
- }
-
- //鍔犺浇姘存祦鍔ㄧ敾
- private async void LoadFlowEffect()
- {
- if (_hydroInfo == null)
- {
- return;
- }
- var allFlowEffectList = GetFlowEffectList();
- await _bimfaceCtrl?.LoadFlowEffect(allFlowEffectList);
- }
-
- //鍗歌浇姘存祦鍔ㄧ敾
- private async void UnloadFlowEffect()
- {
- if (_hydroInfo == null)
- {
- return;
- }
- await _bimfaceCtrl?.UnloadFlowEffect();
- }
-
- //璁剧疆姘村姏鍔ㄧ敾
- private void SetFlowEffect()
- {
- if (_isFlowEffectVisible)
- {
- LoadFlowEffect();
- }
- else
- {
- UnloadFlowEffect();
- }
- }
-
- //鏇存柊姘存祦鍔ㄧ敾
- private async void UpdateFlowEffect(Yw.Model.HydroVisualInfo visual)
- {
- if (_hydroInfo == null)
- {
- return;
- }
- var allFlowEffectList = GetFlowEffectList();
- var flowEffect = _allFlowEffectList?.Find(x => x.Id == visual.Code);
- if (flowEffect == null)
- {
- return;
- }
- if (visual.FlowDirectionX == Yw.Hydro.FlowDirection.None)
- {
- flowEffect.SpeedX = 0;
- }
- else if (visual.FlowDirectionX == Yw.Hydro.FlowDirection.Positive)
- {
- flowEffect.SpeedX = 0.1;
- }
- else
- {
- flowEffect.SpeedX = -0.1;
- }
-
- if (visual.FlowDirectionY == Yw.Hydro.FlowDirection.None)
- {
- flowEffect.SpeedY = 0;
- }
- else if (visual.FlowDirectionY == Yw.Hydro.FlowDirection.Positive)
- {
- flowEffect.SpeedY = 0.1;
- }
- else
- {
- flowEffect.SpeedY = -0.1;
- }
-
- var allCalcuResultList = GetCalcuVisualResultList(Yw.EPAnet.CalcuMode.MinorLoss, false);
- var calcuResult = allCalcuResultList?.Find(x => x.Code == visual.Code) as HydroCalcuLinkResult;
- if (calcuResult != null)
- {
- if (calcuResult.CalcuVelocity < 0)
- {
- flowEffect.SpeedX = -flowEffect.SpeedX;
- }
- }
- if (_isFlowEffectVisible)
- {
- await _bimfaceCtrl?.UpdateFlowEffect(flowEffect);
- }
+ return _flowEffectHelper;
}
//姘存祦鍔ㄧ敾鏄惁鍙
- private void barCkFlowEffect_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ private async void barCkFlowEffect_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
- _isFlowEffectVisible = this.barCkFlowEffect.Checked;
- SetFlowEffect();
+ var flowEffectHelper = await GetFlowEffectHelper();
+ flowEffectHelper.Visible = this.barCkFlowEffect.Checked;
+ flowEffectHelper.Set();
}
#endregion
- #region 鏋勪欢鎺т欢
+ #region 鐩戞祴鍒楄〃
- //鏋勪欢鏄庣粏鎺т欢
- private Yw.WinFrmUI.HydroVisualListCtrl _visualListCtrl = null;
+ #region 鐩戞祴鐐�
- //鑾峰彇鏋勪欢鏄庣粏鎺т欢
- private Yw.WinFrmUI.HydroVisualListCtrl GetVisualListCtrl()
+ //鐩戞祴鐐硅緟鍔╃被
+ private SimulationMonitorHelper _monitorHelper = null;
+
+ //鑾峰彇鐩戞祴鐐硅緟鍔╃被
+ private SimulationMonitorHelper GetMonitorHelper()
{
- if (_visualListCtrl == null)
+ if (_hydroInfo == null)
{
- _visualListCtrl = new HydroVisualListCtrl();
- _visualListCtrl.Dock = DockStyle.Fill;
- _visualListCtrl.HydroClickInfoEvent += async (visual) =>
- {
- ShowSelectedProperty(visual);
- await _bimfaceCtrl?.ZoomAndSelectComponent(_selectedVisual?.Code);
- };
- _visualListCtrl.HydroChangedInfoEvent += (visualList) =>
- {
- UpdateMarkList(visualList);
- UpdateSelectedProperty();
- ApplyGradingResultList();
- };
+ return default;
}
- return _visualListCtrl;
+ if (_monitorHelper == null)
+ {
+ _monitorHelper = new SimulationMonitorHelper(_hydroInfo.ID);
+ }
+ return _monitorHelper;
}
- //鏋勪欢鏄庣粏鎺т欢鏄惁鍙
- private bool IsVisualListCtrlVisible
+ //璁剧疆鐩戞祴鐐瑰垪琛�
+ private async void SetMonitorList(HydroVisualInfo visual)
+ {
+ if (_hydroInfo == null)
+ {
+ return;
+ }
+ var monitorHelper = GetMonitorHelper();
+ var allMonitorList = await monitorHelper.Get();
+ var dlg = new SetHydroMonitorListDlg();
+ dlg.SetBindingData(_hydroInfo, visual, allMonitorList);
+ dlg.ReloadDataEvent += async (list) =>
+ {
+ var bol = await BLLFactory<Yw.BLL.HydroMonitor>.Instance.Save(_hydroInfo.ID, visual.Code, list);
+ if (!bol)
+ {
+ TipFormHelper.ShowError("璁剧疆澶辫触锛�");
+ return;
+ }
+ TipFormHelper.ShowSucceed("璁剧疆鎴愬姛锛�");
+ var monitorList = await monitorHelper.Update(visual.Code);
+ var monitorValueHelper = GetMonitorValueHelper();
+ monitorValueHelper.Update(visual.Code, monitorList);
+ var monitorMarkerHelper = await GetMonitorMarkerHelper();
+ monitorMarkerHelper.Update(visual.Code, monitorList);
+ monitorMarkerHelper.Set();
+ };
+ dlg.ShowDialog();
+ }
+
+ //璁剧疆鐩戞祴鐐�
+ private void barBtnSetMonitor_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ {
+ SetMonitorList(_visual);
+ }
+
+ #endregion
+
+ #region 鐩戞祴鍊�
+
+ //鐩戞祴鍊艰緟鍔╃被
+ private SimulationMonitorValueHelper _monitorValueHelper = null;
+
+ //鑾峰彇鐩戞祴鍊艰緟鍔╃被
+ private SimulationMonitorValueHelper GetMonitorValueHelper()
+ {
+ if (_monitorValueHelper == null)
+ {
+ var visualListHelper = GetVisualListHelper();
+ var monitorHelper = GetMonitorHelper();
+ _monitorValueHelper = new SimulationMonitorValueHelper(visualListHelper, monitorHelper);
+ }
+ return _monitorValueHelper;
+ }
+
+ #endregion
+
+ #region 鐩戞祴鍊兼帶浠�
+
+ //鐩戞祴鍊煎垪琛ㄦ帶浠�
+ private HydroMonitorValueListCtrl _monitorValueListCtrl = null;
+
+ //鑾峰彇鐩戞祴鍊煎垪琛ㄦ帶浠�
+ private HydroMonitorValueListCtrl GetMonitorValueListCtrl()
+ {
+ if (_monitorValueListCtrl == null)
+ {
+ _monitorValueListCtrl = new HydroMonitorValueListCtrl();
+ _monitorValueListCtrl.Dock = DockStyle.Fill;
+ _monitorValueListCtrl.HydroViewEvent += (code) =>
+ {
+ var visualListHelper = GetVisualListHelper();
+ var visual = visualListHelper.GetVisual(code);
+ SelectVisual(visual, eVisualSource.Monitor);
+ };
+ }
+ return _monitorValueListCtrl;
+ }
+
+ //鐩戞祴鍊煎垪琛ㄦ帶浠舵槸鍚﹀彲瑙�
+ private bool IsMonitorValueListCtrlVisible
{
get
{
@@ -1951,7 +1569,7 @@
{
if (this.controlContainerBottom.Controls.Count > 0)
{
- if (this.controlContainerBottom.Controls[0] is HydroVisualListCtrl)
+ if (this.controlContainerBottom.Controls[0] is HydroMonitorValueListCtrl)
{
return true;
}
@@ -1961,236 +1579,21 @@
}
}
- //鏄剧ず鏋勪欢鏄庣粏鎺т欢
- private void ShowVisualListCtrl()
- {
- if (_hydroInfo == null)
- {
- return;
- }
- if (IsVisualListCtrlVisible)
- {
- return;
- }
-
- var visualListCtrl = GetVisualListCtrl();
- var allVisualViewModelList = GetVisualViewModelList();
- visualListCtrl.SetBindingData(allVisualViewModelList);
- var allCalcuResultList = GetCalcuVisualResultList(Yw.EPAnet.CalcuMode.MinorLoss, false);
- if (allCalcuResultList == null || allCalcuResultList.Count < 1)
- {
- visualListCtrl.SetNormalView();
- }
- else
- {
- visualListCtrl.SetCalcuView();
- }
- this.controlContainerBottom.Controls.Clear();
- this.controlContainerBottom.Controls.Add(visualListCtrl);
- this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
- this.docPnlBottom.Text = "鏋勪欢鏄庣粏";
- this.docPnlBottom.Height = 350;
- }
-
- //鏇存柊鏋勪欢鏄庣粏鎺т欢
- private void UpdateVisualListCtrl()
- {
- if (!IsVisualListCtrlVisible)
- {
- return;
- }
- _visualListCtrl?.UpdateBindingData();
- }
-
- //鏋勪欢鏄庣粏
- private void barBtnHydroVisualList_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
- {
- ShowVisualListCtrl();
- }
-
- #endregion
-
- #region 鐩戞祴鍒楄〃
-
- //鎵�鏈夌洃娴嬪垪琛�
- private List<HydroMonitorVmo> _allMonitorList = null;
-
- //鑾峰彇鐩戞祴鍒楄〃
- private async Task<List<HydroMonitorVmo>> GetMonitorList()
- {
- if (_hydroInfo == null)
- {
- return default;
- }
- if (_allMonitorList == null)
- {
- _allMonitorList = await BLLFactory<Yw.BLL.HydroMonitor>.Instance.GetByModelID(_hydroInfo.ID);
- if (_allMonitorList == null)
- {
- _allMonitorList = new List<HydroMonitorVmo>();
- }
- }
- return _allMonitorList;
- }
-
- //鏇存柊鐩戞祴鍒楄〃
- private async void UpdateMonitorList(string code)
- {
- if (_hydroInfo == null)
- {
- return;
- }
- var allMonitorList = await GetMonitorList();
- allMonitorList.RemoveAll(x => x.Relation == code);
- var monitorList = await BLLFactory<Yw.BLL.HydroMonitor>.Instance.GetByRelation(_hydroInfo.ID, code);
- if (monitorList != null && monitorList.Count > 0)
- {
- allMonitorList.AddRange(monitorList);
- }
- UpdateMonitorValueList(code, monitorList);
- SetLogicMonitorList();
- }
-
- //璁剧疆閫夋嫨鏋勪欢鐩戞祴鐐瑰垪琛�
- private async void SetSelectVisualMonitorList()
- {
- if (_hydroInfo == null)
- {
- return;
- }
- if (_selectedVisual == null)
- {
- return;
- }
- var allMonitorList = await GetMonitorList();
- var dlg = new SetHydroVisualMonitorDlg();
- dlg.SetBindingData(_hydroInfo, _selectedVisual, allMonitorList);
- dlg.ReloadDataEvent += async (hydroInfo, visual, list) =>
- {
- if (hydroInfo == null)
- {
- return;
- }
- if (visual == null)
- {
- return;
- }
- var bol = await BLLFactory<Yw.BLL.HydroMonitor>.Instance.Save(hydroInfo.ID, visual.Code, list);
- if (!bol)
- {
- TipFormHelper.ShowError("璁剧疆澶辫触");
- return;
- }
- TipFormHelper.ShowSucceed("璁剧疆鎴愬姛");
- UpdateMonitorList(visual.Code);
- };
- dlg.ShowDialog();
- }
-
- //璁剧疆鐩戞祴鐐�
- private void barBtnSetMonitor_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
- {
- SetSelectVisualMonitorList();
- }
-
- #endregion
-
- #region 鐩戞祴鍒楄〃
-
-
-
- #region 鐩戞祴鍊煎垪琛�
-
- //鎵�鏈夌洃娴嬪�煎垪琛�
- private List<HydroVisualMonitorValueViewModel> _allMonitorValueList = null;
-
- //鑾峰彇鐩戞祴鍊煎垪琛�
- private async Task<List<HydroVisualMonitorValueViewModel>> GetMonitorValueList()
- {
- if (_allMonitorValueList == null)
- {
- _allMonitorValueList = new List<HydroVisualMonitorValueViewModel>();
- var allMonitorList = await GetMonitorList();
- var allVisualViewModelList = GetVisualViewModelList();
- allMonitorList.ForEach(x =>
- {
- var visual = allVisualViewModelList.Find(t => t.Code == x.Relation);
- if (visual != null)
- {
- var vm = new HydroVisualMonitorValueViewModel(visual.Vmo, x);
- _allMonitorValueList.Add(vm);
- }
- });
- }
- return _allMonitorValueList;
- }
-
- //鏇存柊鐩戞祴鍊煎垪琛�
- private async void UpdateMonitorValueList(string code, List<HydroMonitorVmo> monitorList)
- {
- if (string.IsNullOrEmpty(code))
- {
- return;
- }
- var visual = GetVisualViewModel(code)?.Vmo;
- if (visual == null)
- {
- return;
- }
- var allMonitorValueList = await GetMonitorValueList();
- var monitorValueList = allMonitorValueList.Where(x => x.Vmo.Relation == code).ToList();
- monitorValueList?.ForEach(x =>
- {
- var result = monitorList?.Exists(t => t.Relation == x.Vmo.Relation && t.PropName == x.Vmo.PropName);
- if (!(result.HasValue && result.Value))
- {
- allMonitorValueList.Remove(x);
- }
- });
- monitorList?.ForEach(x =>
- {
- var result = monitorValueList?.Exists(t => t.Vmo.Relation == x.Relation && t.Vmo.PropName == x.PropName);
- if (!(result.HasValue && result.Value))
- {
- var vm = new HydroVisualMonitorValueViewModel(visual, x);
- allMonitorValueList.Add(vm);
- }
- });
- }
-
- #endregion
-
- #region 鐩戞祴鍊煎垪琛ㄦ帶浠�
-
- //鐩戞祴鍊煎垪琛ㄦ帶浠�
- private HydroVisualMonitorValueListCtrl _monitorValueListCtrl = null;
-
- //鑾峰彇鐩戞祴鍊煎垪琛ㄦ帶浠�
- private HydroVisualMonitorValueListCtrl GetMonitorValueListCtrl()
- {
- if (_monitorValueListCtrl == null)
- {
- _monitorValueListCtrl = new HydroVisualMonitorValueListCtrl();
- _monitorValueListCtrl.Dock = DockStyle.Fill;
- _monitorValueListCtrl.HydroViewEvent += (code) =>
- {
- _bimfaceCtrl?.ZoomToComponent(code);
- };
- }
- return _monitorValueListCtrl;
- }
-
//鏄剧ず鐩戞祴鍊煎垪琛ㄦ帶浠�
private async void ShowMonitorValueListCtrl()
{
var monitorValueListCtrl = GetMonitorValueListCtrl();
- var allMonitorValueList = await GetMonitorValueList();
+ if (!IsMonitorValueListCtrlVisible)
+ {
+ this.controlContainerBottom.Controls.Clear();
+ this.controlContainerBottom.Controls.Add(monitorValueListCtrl);
+ this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
+ this.docPnlBottom.Text = "鐩戞祴鍊�";
+ this.docPnlBottom.Height = 350;
+ }
+ var monitorValueHelper = GetMonitorValueHelper();
+ var allMonitorValueList = await monitorValueHelper.Get();
monitorValueListCtrl.SetBindingData(allMonitorValueList);
- this.controlContainerBottom.Controls.Clear();
- this.controlContainerBottom.Controls.Add(monitorValueListCtrl);
- this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
- this.docPnlBottom.Text = "鐩戞祴鍊�";
- this.docPnlBottom.Height = 350;
}
//璁剧疆鐩戞祴鍊�
@@ -2201,79 +1604,36 @@
#endregion
- #region 鐩戞祴鍒楄〃鏄剧ず
+ #region 鐩戞祴鐐规爣璁�
- //鐩戞祴鏄惁鏄剧ず
- private bool _isMonitorVisible = false;
+ //鐩戞祴鏍囪杈呭姪绫�
+ private SimulationMonitorMarkerHelper _monitorMarkerHelper = null;
- //鑾峰彇涓氬姟鐩戞祴鍒楄〃
- private async Task<List<LogicMonitor>> GetLogicMonitorList()
+ //鑾峰彇鐩戞祴鏍囪杈呭姪绫�
+ private async Task<SimulationMonitorMarkerHelper> GetMonitorMarkerHelper()
{
- var allMonitorList = await GetMonitorList();
- var allLogicMonitorList = allMonitorList.Select(x =>
+ if (_monitorMarkerHelper == null)
{
- var logicMonitor = new LogicMonitor();
- logicMonitor.Id = x.Relation;
- logicMonitor.PropName = x.PropName;
- logicMonitor.Description = x.Description;
- return logicMonitor;
- }).ToList();
- return allLogicMonitorList;
- }
-
- //璁剧疆涓氬姟鐩戞祴鍒楄〃
- private async void SetLogicMonitorList()
- {
- if (_isMonitorVisible)
- {
- var allLogicMonitorList = await GetLogicMonitorList();
- await _bimfaceCtrl?.SetLogicMonitors(allLogicMonitorList);
+ var monitorHelper = GetMonitorHelper();
+ var bimfaceCtrl = await GetBimfaceCtrl();
+ _monitorMarkerHelper = new SimulationMonitorMarkerHelper(monitorHelper, bimfaceCtrl);
}
- else
- {
- await _bimfaceCtrl?.ClearLogicMonitors();
- }
+ return _monitorMarkerHelper;
}
//鏄剧ず鐘舵�佹敼鍙�
- private void barCkMonitor_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ private async void barCkMonitor_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
- _isMonitorVisible = this.barCkMonitor.Checked;
- SetLogicMonitorList();
- }
-
-
- #endregion
-
- #endregion
-
- #region 妫�鏌ョ粨鏋�
-
- //妫�鏌ョ粨鏋滅紦瀛�
- private HydroCheckResult _checkResult = null;
-
- //鑾峰彇妫�鏌ョ粨鏋�
- //needCheckAgain 鐢ㄤ簬纭畾鏄惁闇�瑕侀噸鏂版鏌�
- private HydroCheckResult GetCheckResult(bool needCheckAgain = false)
- {
- if (_hydroInfo == null)
- {
- return default;
- }
- if (needCheckAgain)
- {
- _checkResult = _hydroInfo.Check();
- }
- if (_checkResult == null)
- {
- _checkResult = _hydroInfo.Check();
- }
- return _checkResult;
+ var monitorMarkerHelper = await GetMonitorMarkerHelper();
+ monitorMarkerHelper.Visible = this.barCkMonitor.Checked;
+ monitorMarkerHelper.Set();
}
#endregion
- #region 妫�鏌ユ帶浠�
+ #endregion
+
+ #region 妯″瀷妫�鏌�
//妫�鏌ユ帶浠�
private HydroCheckResultCtrl _checkCtrl = null;
@@ -2281,59 +1641,100 @@
//鑾峰彇妫�鏌ユ帶浠�
private HydroCheckResultCtrl GetCheckCtrl()
{
+ if (_hydroInfo == null)
+ {
+ return default;
+ }
if (_checkCtrl == null)
{
_checkCtrl = new HydroCheckResultCtrl();
_checkCtrl.Dock = DockStyle.Fill;
- _checkCtrl.HydroClickEvent += async (code) =>
+ _checkCtrl.HydroClickEvent += (code) =>
{
- if (_hydroInfo == null)
- {
- return;
- }
- var elementIds = new List<string>();
- if (string.IsNullOrEmpty(code))
- {
- this.SelectedVisual = null;
- }
- else
- {
- var allVisualViewModelList = GetVisualViewModelList();
- this.SelectedVisual = allVisualViewModelList?.Find(x => x.Code == code)?.Vmo;
- if (this.SelectedVisual != null)
- {
- elementIds.Add(this.SelectedVisual.Code);
- }
- }
- await _bimfaceCtrl?.ZoomAndSelectComponents(elementIds);
- ShowSelectedProperty();
+ var visualListHelper = GetVisualListHelper();
+ var visual = visualListHelper.GetVisual(code);
+ SelectVisual(visual, eVisualSource.Check);
};
}
return _checkCtrl;
}
- //鏄剧ず妫�鏌ユ帶浠�
- //needCheckAgain 鐢ㄤ簬纭畾鏄惁闇�瑕侀噸鏂版鏌�
- private void ShowCheckCtrl(bool needCheckAgain = false)
+ //妫�鏌ユ帶浠舵槸鍚﹀彲瑙�
+ private bool IsCheckCtrlVisible
{
- var checkResult = GetCheckResult(needCheckAgain);
+ get
+ {
+ if (this.docPnlBottom.Visibility == DevExpress.XtraBars.Docking.DockVisibility.Visible)
+ {
+ if (this.controlContainerBottom.Controls.Count > 0)
+ {
+ if (this.controlContainerBottom.Controls[0] is HydroCheckResultCtrl)
+ {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+ }
+
+ //鏄剧ず妫�鏌ユ帶浠�
+ private void ShowCheckCtrl(HydroCheckResult checkResult)
+ {
if (checkResult == null)
{
return;
}
var checkCtrl = GetCheckCtrl();
+ if (!IsCheckCtrlVisible)
+ {
+ this.controlContainerBottom.Controls.Clear();
+ this.controlContainerBottom.Controls.Add(checkCtrl);
+ this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
+ this.docPnlBottom.Text = "妫�鏌ョ粨鏋�";
+ this.docPnlBottom.Height = 350;
+ }
checkCtrl.SetBindingData(checkResult);
- this.controlContainerBottom.Controls.Clear();
- this.controlContainerBottom.Controls.Add(checkCtrl);
- this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
- this.docPnlBottom.Text = "妫�鏌ョ粨鏋�";
- this.docPnlBottom.Height = 350;
+ }
+
+ //鏄剧ず妫�鏌ユ帶浠�
+ private void ShowCheckCtrl()
+ {
+ var checkResult = GetCheckResult();
+ ShowCheckCtrl(checkResult);
}
//妫�鏌�
private void barBtnCheck_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
- ShowCheckCtrl(true);
+ if (_hydroInfo == null)
+ {
+ return;
+ }
+ var checkResult = _hydroInfo.Check();
+ ShowCheckCtrl(checkResult);
+ }
+
+ #endregion
+
+ #region 妯″瀷璁＄畻
+
+ #region 璁＄畻缁撴灉
+
+ //璁＄畻缁撴灉杈呭姪绫�
+ private SimulationCalcuResultHelper _calcuResultHelper = null;
+
+ //鑾峰彇璁＄畻缁撴灉杈呭姪绫�
+ private SimulationCalcuResultHelper GetCalcuResultHelper()
+ {
+ if (_calcuResultHelper == null)
+ {
+ var workingHelper = GetWorkingHelper();
+ _calcuResultHelper = new SimulationCalcuResultHelper(workingHelper);
+ var calcuResult = GetCalcuResult();
+ _calcuResultHelper.InitialData();
+ }
+ return _calcuResultHelper;
}
#endregion
@@ -2354,6 +1755,25 @@
return _calcuFailedCtrl;
}
+ //璁＄畻澶辫触鎺т欢鏄惁鍙
+ private bool IsCalcuFailedCtrlVisible
+ {
+ get
+ {
+ if (this.docPnlBottom.Visibility == DevExpress.XtraBars.Docking.DockVisibility.Visible)
+ {
+ if (this.controlContainerBottom.Controls.Count > 0)
+ {
+ if (this.controlContainerBottom.Controls[0] is HydroCalcuFailedCtrl)
+ {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+ }
+
//鏄剧ず璁＄畻澶辫触鎺т欢
private void ShowCalcuFailedCtrl(HydroCalcuResult calcuResult)
{
@@ -2369,21 +1789,119 @@
{
return;
}
-
var calcuFailedCtrl = GetCalcuFailedCtrl();
+ if (!IsCalcuFailedCtrlVisible)
+ {
+ this.controlContainerBottom.Controls.Clear();
+ this.controlContainerBottom.Controls.Add(calcuFailedCtrl);
+ this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
+ this.docPnlBottom.Text = "璁＄畻澶辫触鍘熷洜";
+ this.docPnlBottom.Height = 350;
+ }
calcuFailedCtrl.SetBindingData(calcuResult.FailedList);
- this.controlContainerBottom.Controls.Clear();
- this.controlContainerBottom.Controls.Add(calcuFailedCtrl);
- this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
- this.docPnlBottom.Text = "璁＄畻澶辫触鍘熷洜";
- this.docPnlBottom.Height = 350;
}
- //鏄剧ず璁＄畻澶辫触鎺т欢
- private void ShowCalcuFailedCtrl()
+ #endregion
+
+ #region 璁＄畻璀﹀憡
+
+ //璁＄畻璀﹀憡鎺т欢
+ private HydroCalcuWarningCtrl _calcuWarningCtrl = null;
+
+ //鑾峰彇璁＄畻璀﹀憡鎺т欢
+ private HydroCalcuWarningCtrl GetCalcuWarningCtrl()
{
- ShowCalcuFailedCtrl(_calcuResult);
+ if (_calcuWarningCtrl == null)
+ {
+ _calcuWarningCtrl = new HydroCalcuWarningCtrl();
+ _calcuWarningCtrl.Dock = DockStyle.Fill;
+ _calcuWarningCtrl.HydroClickEvent += (code) =>
+ {
+ var visualListHelper = GetVisualListHelper();
+ var visual = visualListHelper.GetVisual(code);
+ SelectVisual(visual, eVisualSource.Warning);
+ };
+ }
+ return _calcuWarningCtrl;
}
+
+ //璁＄畻璀﹀憡鎺т欢鏄惁鍙
+ private bool IsCalcuWarningCtrlVisible
+ {
+ get
+ {
+ if (this.docPnlBottom.Visibility == DevExpress.XtraBars.Docking.DockVisibility.Visible)
+ {
+ if (this.controlContainerBottom.Controls.Count > 0)
+ {
+ if (this.controlContainerBottom.Controls[0] is HydroCalcuWarningCtrl)
+ {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+ }
+
+ //鏄剧ず璁＄畻璀﹀憡鎺т欢
+ private void ShowCalcuWarningCtrl(HydroCalcuResult calcuResult)
+ {
+ if (_hydroInfo == null)
+ {
+ return;
+ }
+ if (calcuResult == null)
+ {
+ return;
+ }
+ if (!calcuResult.Succeed)
+ {
+ return;
+ }
+ var calcuWaringCtrl = GetCalcuWarningCtrl();
+ if (!IsCalcuWarningCtrlVisible)
+ {
+ this.controlContainerBottom.Controls.Clear();
+ this.controlContainerBottom.Controls.Add(calcuWaringCtrl);
+ this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
+ this.docPnlBottom.Text = "璁＄畻璀﹀憡";
+ this.docPnlBottom.Height = 350;
+ }
+ var visualListHelper = GetVisualListHelper();
+ var allVisualDict = visualListHelper.GetVisualDict();
+ calcuWaringCtrl.SetBindingData(calcuResult.WainingList, allVisualDict);
+ }
+
+ #endregion
+
+ #region 璁＄畻鏍囩
+
+ //璁＄畻鏍囩杈呭姪绫�
+ private SimulationCalcuResultLabelHelper _calcuResultLabelHelper = null;
+
+ //鑾峰彇璁＄畻鏍囩杈呭姪绫�
+ private async Task<SimulationCalcuResultLabelHelper> GetCalcuResultLabelHelper()
+ {
+ if (_calcuResultLabelHelper == null)
+ {
+ var visualListHelper = GetVisualListHelper();
+ var calcuResultHelper = GetCalcuResultHelper();
+ var bimfaceCtrl = await GetBimfaceCtrl();
+ _calcuResultLabelHelper = new SimulationCalcuResultLabelHelper(visualListHelper, calcuResultHelper, bimfaceCtrl);
+ }
+ return _calcuResultLabelHelper;
+ }
+
+ //璁剧疆璁＄畻鏍囩鏄惁鏄剧ず
+ private async void barCkCalcu_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ {
+ var calcuResultLabelHelper = await GetCalcuResultLabelHelper();
+ calcuResultLabelHelper.Visible = this.barCkCalcu.Checked;
+ calcuResultLabelHelper.Set();
+ }
+
+ #endregion
#endregion
@@ -2396,36 +1914,29 @@
{
return;
}
- var checkResult = GetCheckResult(true);
- if (checkResult == null)
- {
- return;
- }
+ var checkResult = _hydroInfo.Check();
if (!checkResult.Succeed)
{
- ShowCheckCtrl(false);
+ ShowCheckCtrl(checkResult);
TipFormHelper.ShowWarn("妫�鏌ュけ璐ュ鑷存棤娉曡繘琛岃瘯绠楋紝鍋滄绠＄綉淇锛�");
return;
}
var calcuResult = _hydroInfo.Calcu(Yw.EPAnet.CalcuMode.Simple);
- if (calcuResult == null)
- {
- return;
- }
if (!calcuResult.Succeed)
{
ShowCalcuFailedCtrl(calcuResult);
TipFormHelper.ShowWarn("璇曠畻澶辫触锛屽仠姝㈢缃戜慨澶嶏紒");
return;
}
- var allLinks = _hydroInfo.GetAllLinks();
- if (allLinks != null && allLinks.Count < 1)
+ var visualListHelper = GetVisualListHelper();
+ var allLinkList = visualListHelper.GetLinkList();
+ if (allLinkList != null && allLinkList.Count < 1)
{
TipFormHelper.ShowError("妯″瀷涓湭鍖呭惈绠℃淇℃伅锛屽仠姝㈢缃戜慨澶嶏紒");
return;
}
int count = 0;
- foreach (var link in allLinks)
+ foreach (var link in allLinkList)
{
var calcuLink = calcuResult.LinkList?.Find(x => x.Code == link.Code);
if (calcuLink == null)
@@ -2444,9 +1955,10 @@
count++;
}
}
- UpdateVisualViewModelProperty();
+ var visualVmListHelper = GetVisualVmListHelper();
+ visualVmListHelper.UpdateProperty();
UpdateVisualListCtrl();
- UpdateSelectedProperty();
+ UpdatePropertyCtrl();
TipFormHelper.ShowSucceed($"淇瀹屾垚锛屽叡淇绠℃({count})涓紒");
}
@@ -2480,7 +1992,7 @@
#endregion
- #region 骞惰仈鍒嗘瀽
+ #region 骞惰仈璁＄畻
//骞惰仈鍒嗘瀽
private void ParallelAnalysis()
@@ -2545,8 +2057,8 @@
}
});
var codes = list?.Select(x => x.Code).ToList();
- UpdateVisualViewModelProperty(codes);
- ShowSelectedProperty();
+ //UpdateVisualViewModelProperty(codes);
+ //ShowSelectedProperty();
UpdateVisualListCtrl();
return true;
};
@@ -2563,91 +2075,39 @@
#region 宸ュ喌璁＄畻
- //鎵�鏈夊伐鍐靛垪琛�
- private List<HydroWorkingVmo> _allWorkingList = null;
+ //宸ュ喌鍏冪粍杈呭姪绫�
+ private SimulationWorkingTupleHelper _workingTupleHelper = null;
- //鑾峰彇宸ュ喌鍒楄〃
- private async Task<List<HydroWorkingVmo>> GetWorkingList()
+ //鑾峰彇宸ュ喌鍏冪粍杈呭姪绫�
+ private SimulationWorkingTupleHelper GetWorkingTupleHelper()
{
- if (_allWorkingList == null)
+ if (_workingTupleHelper == null)
{
- _allWorkingList = await BLLFactory<Yw.BLL.HydroWorking>.Instance.GetByModelID(_hydroInfo.ID);
- if (_allWorkingList == null)
- {
- _allWorkingList = new List<HydroWorkingVmo>();
- }
+ var visualListHelper = GetVisualListHelper();
+ _workingTupleHelper = new SimulationWorkingTupleHelper(visualListHelper);
}
- return _allWorkingList;
+ return _workingTupleHelper;
}
- //鎵�鏈夊伐鍐靛厓缁勫垪琛�
- private List<Tuple<HydroWorkingVmo, HydroCheckResult, HydroCalcuResult>> _allWorkingTupleList = null;
-
- //鑾峰彇宸ュ喌鍏冪粍鍒楄〃
- private async Task<List<Tuple<HydroWorkingVmo, HydroCheckResult, HydroCalcuResult>>> GetWorkingTupleList()
+ //璁剧疆宸ュ喌绐椾綋
+ private async void CalcuWorking()
{
if (_hydroInfo == null)
{
- return default;
+ return;
}
- if (_allWorkingTupleList == null)
- {
- _allWorkingTupleList = new List<Tuple<HydroWorkingVmo, HydroCheckResult, HydroCalcuResult>>();
- var allWorkingList = await GetWorkingList();
- if (allWorkingList.Count > 0)
- {
- allWorkingList.ForEach(x =>
- {
- var checkResult = _hydroInfo.Check();
- HydroCalcuResult calcuResult = null;
- if (checkResult != null && checkResult.Succeed)
- {
- calcuResult = _hydroInfo.Calcu(Yw.EPAnet.CalcuMode.MinorLoss);
- }
- _allWorkingTupleList.Add(new Tuple<HydroWorkingVmo, HydroCheckResult, HydroCalcuResult>(x, checkResult, calcuResult));
- });
- }
- }
- return _allWorkingTupleList;
- }
-
- //娣诲姞宸ュ喌鍏冪粍
- private async void AppendWorkingTuple(HydroWorkingVmo working, HydroCheckResult check, HydroCalcuResult calcu)
- {
- var allWorkingTupleList = await GetWorkingTupleList();
- allWorkingTupleList.Add(new Tuple<HydroWorkingVmo, HydroCheckResult, HydroCalcuResult>(working, check, calcu));
- }
-
- //绉婚櫎宸ュ喌鍏冪粍
- private async void RemoveWorkingTuple(HydroWorkingVmo working)
- {
- var allWorkingTupleList = await GetWorkingTupleList();
- if (allWorkingTupleList.Count > 0)
- {
- allWorkingTupleList.RemoveAll(x => x.Item1.ID == working.ID);
- }
- }
-
- //鏄剧ず宸ュ喌璁＄畻绐椾綋
- private void ShowWorkingCalcuDlg()
- {
+ var workingTupleHelper = GetWorkingTupleHelper();
+ var allWorkingList = await workingTupleHelper.GetWorkingList();
+ var monitorValueHelper = GetMonitorValueHelper();
+ var allMonitorValueList = await monitorValueHelper.Get();
var dlg = new SetHydroWorkingDlg();
- dlg.HydroViewEvent += async (visual) =>
+ dlg.SetBindingData(_hydroInfo, allWorkingList, allMonitorValueList);
+ dlg.HydroViewEvent += (visual) =>
{
- _selectedVisual = visual;
- if (_selectedVisual != null)
- {
- await _bimfaceCtrl?.ZoomAndSelectComponents(new List<string>() { _selectedVisual.Code });
- }
- ShowSelectedProperty();
+ SelectVisual(visual, eVisualSource.Calcu);
};
dlg.HydroCalcuEvent += async (working) =>
{
- if (_hydroInfo == null)
- {
- return;
- }
- var allWorkingList = await GetWorkingList();
var vmo = new HydroWorkingVmo();
vmo.ModelID = _hydroInfo.ID;
vmo.Name = working.Name;
@@ -2661,195 +2121,185 @@
TipFormHelper.ShowError("鍒涘缓宸ュ喌澶辫触锛岃绠楀彇娑堬紒");
return;
}
- allWorkingList.Add(vmo);
_hydroInfo.UpdateWorkingInfo(working.WorkingInfo);
+
//鏍￠獙
- _checkResult = _hydroInfo.Check();
- if (!_checkResult.Succeed)
+ var checkResult = _hydroInfo.Check();
+ if (!checkResult.Succeed)
{
- _allWorkingTupleList.Add(new Tuple<HydroWorkingVmo, HydroCheckResult, HydroCalcuResult>(vmo, _checkResult, null));
- ShowCheckCtrl();
- TipFormHelper.ShowWarn("鏍￠獙澶辫触锛岃妫�鏌ュ悗閲嶈瘯");
- return;
- }
-
- WaitFormHelper.ShowWaitForm(this, "姝ｅ湪璁＄畻鍒嗘瀽涓紝璇风◢鍊�...");
-
-
- //await Task.Delay(5000);
- _calcuResult = _hydroInfo.Calcu(Yw.EPAnet.CalcuMode.MinorLoss);
-
-
- WaitFormHelper.HideWaitForm();
- if (_calcuResult.Succeed)
- {
- _allWorkingTupleList.Add(new Tuple<HydroWorkingVmo, HydroCheckResult, HydroCalcuResult>(vmo, _checkResult, _calcuResult));
- UpdateVisualViewModelProperty();
- UpdateVisualViewModelCalcuProperty();
- UpdateVisualListCtrl();
- UpdateSelectedProperty();
- //await _bimfaceCtrl?.SetLogicCalcuCustomLabelsCalcuResult(_calcuResult);
- TipFormHelper.ShowSucceed("璁＄畻鎴愬姛锛�");
- var codes = _hydroInfo.Pumps.Select(x => x.Code).ToList();
- await _bimfaceCtrl?.ZoomAndSelectComponents(codes);
+ ShowCheckCtrl(checkResult);
+ workingTupleHelper.AppendTuple(vmo, checkResult, null);
+ SetUIWorking(vmo);
+ TipFormHelper.ShowError("鏍￠獙澶辫触锛岃妫�鏌ュ悗閲嶈瘯");
}
else
{
- ShowCalcuFailedCtrl();
- TipFormHelper.ShowError("璁＄畻澶辫触锛�");
+ WaitFormHelper.ShowWaitForm(this, "姝ｅ湪璁＄畻鍒嗘瀽涓紝璇风◢鍊�...");
+ //await Task.Delay(3000);
+ var calcuResult = _hydroInfo.Calcu(Yw.EPAnet.CalcuMode.MinorLoss);
+ WaitFormHelper.HideWaitForm();
+ workingTupleHelper.AppendTuple(vmo, checkResult, calcuResult);
+ if (calcuResult.Succeed)
+ {
+ if (calcuResult.WainingList != null && calcuResult.WainingList.Count > 0)
+ {
+ ShowCalcuWarningCtrl(calcuResult);
+ }
+ TipFormHelper.ShowSucceed("璁＄畻鎴愬姛锛�");
+ }
+ else
+ {
+ ShowCalcuFailedCtrl(calcuResult);
+ TipFormHelper.ShowError("璁＄畻澶辫触锛�");
+ }
}
- ApplyGradingResultList(false);
- UpdateVisualListCtrl();
- ShowSelectedProperty();
+ AppendUIWorking(vmo);
+ SetUIWorking(vmo);
};
- dlg.SetBindingData(_hydroInfo, _allWorkingList, _allMonitorValueList);
+
dlg.ShowDialog();
}
- //姘村姏璁＄畻
- private void barBtnHydroCalcu_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ //宸ュ喌璁＄畻
+ private void barBtnWorkingCalcu_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
- ShowWorkingCalcuDlg();
+ CalcuWorking();
}
#endregion
- #region 璁＄畻鏍囩
-
- //璁＄畻鏍囩鏄惁鏄剧ず
- private bool _isCalcuLabelsVisible = false;
-
- //鎵�鏈夎绠楁爣绛�
- private List<LogicCalcuCustomLabel> _allCalcuLabels = null;
-
- //鑾峰彇璁＄畻鏍囩
- private List<LogicCalcuCustomLabel> GetCalcuLabels()
- {
- if (_hydroInfo == null)
- {
- return default;
- }
- var allCalcuResultList = GetCalcuVisualResultList(Yw.EPAnet.CalcuMode.MinorLoss, false);
- if (allCalcuResultList == null || allCalcuResultList.Count < 1)
- {
- return default;
- }
- var list = new List<LogicCalcuCustomLabel>();
-
- _hydroInfo.Pumps?.ForEach(x =>
- {
- var hz = Math.Round(x.RatedHz * x.SpeedRatio);
- var calcuPumpResult = GetCalcuVisualResult(x.Code) as HydroCalcuLinkResult;
- if (calcuPumpResult != null)
- {
- var calcuPumpStartResult = GetCalcuVisualResult(x.StartCode) as HydroCalcuNodeResult;
- var calcuPumpEndResult = GetCalcuVisualResult(x.EndCode) as HydroCalcuNodeResult;
- var pumpCustomLabel = new LogicCalcuCustomLabel();
- pumpCustomLabel.Id = x.Code;
- pumpCustomLabel.Distance = 20000;
- pumpCustomLabel.Data = new List<LogicCalcuCustomLabelItem>()
- {
- new LogicCalcuCustomLabelItem(){ Name="鐘舵��",Value=HydroLinkStatusHelper.GetStatusName(x.LinkStatus),Unit=string.Empty},
- new LogicCalcuCustomLabelItem(){ Name="棰戠巼",Value=hz.ToString(),Unit=string.Empty},
- new LogicCalcuCustomLabelItem(){ Name="娴侀噺",Value=Math.Round(calcuPumpResult.CalcuFlow.Value,1).ToString(),Unit="m鲁/h"},
- new LogicCalcuCustomLabelItem(){ Name="杩涘彛鍘嬪姏",Value=Math.Round(calcuPumpStartResult.CalcuHead.Value,4).ToString(),Unit="m"},
- new LogicCalcuCustomLabelItem(){ Name="鍑哄彛鍘嬪姏",Value=Math.Round(calcuPumpEndResult.CalcuHead.Value,4).ToString(),Unit="m"},
- };
- list.Add(pumpCustomLabel);
- }
- });
-
- _hydroInfo.GetAllEmitters()?.ForEach(x =>
- {
- var calcuEmitter = GetCalcuVisualResult(x.Code) as HydroCalcuNodeResult;
- var emitterCustomLabel = new LogicCalcuCustomLabel();
- emitterCustomLabel.Id = x.Code;
- emitterCustomLabel.Distance = 30000;
- emitterCustomLabel.Data = new List<LogicCalcuCustomLabelItem>()
- {
- new LogicCalcuCustomLabelItem(){ Name="娴侀噺",Value=Math.Round(calcuEmitter.CalcuDemand.Value,1).ToString(),Unit="m鲁/h"},
- new LogicCalcuCustomLabelItem(){ Name="鍘嬪姏",Value=Math.Round(calcuEmitter.CalcuDemand.Value,4).ToString(),Unit="m"}
- };
- list.Add(emitterCustomLabel);
- });
- return list;
- }
-
- //璁剧疆璁＄畻鏍囩
- private void SetCalcuLabels()
- {
- if (_isCalcuLabelsVisible)
- {
- var allCalcuLabels = GetCalcuLabels();
- _bimfaceCtrl?.SetLogicCalcuCustomLabels(allCalcuLabels);
- }
- else
- {
- _bimfaceCtrl?.ClearLogicCalcuCustomLabels();
- }
- }
-
- //璁剧疆璁＄畻鏍囩鏄惁鏄剧ず
- private void barCkCalcuLabels_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
- {
- _isCalcuLabelsVisible = this.barCkCalcuLabels.Checked;
- }
-
- #endregion
+ #region 宸ュ喌鍒嗘瀽
#region 褰撳墠宸ュ喌
- //褰撳墠宸ュ喌
- private Yw.Vmo.HydroWorkingVmo _currentWorking = null;
+ //宸ュ喌杈呭姪绫�
+ private SimulationWorkingHelper _workingHelper = null;
- //鍒濆鍖栧綋鍓嶅伐鍐�
- private async void InitialCurrentWorking()
+ //鑾峰彇宸ュ喌杈呭姪绫�
+ private SimulationWorkingHelper GetWorkingHelper()
{
- var allWorkingList = await GetWorkingList();
+ if (_workingHelper == null)
+ {
+ _workingHelper = new SimulationWorkingHelper();
+ }
+ return _workingHelper;
+ }
+
+ //鑾峰彇宸ュ喌
+ private HydroWorkingVmo GetWorking()
+ {
+ var workingHelper = GetWorkingHelper();
+ return workingHelper.Working;
+ }
+
+ //鑾峰彇妫�鏌ョ粨鏋�
+ private HydroCheckResult GetCheckResult()
+ {
+ var workingHelper = GetWorkingHelper();
+ return workingHelper.CheckResult;
+ }
+
+ //鑾峰彇璁＄畻缁撴灉
+ private HydroCalcuResult GetCalcuResult()
+ {
+ var workingHelper = GetWorkingHelper();
+ return workingHelper.CalcuResult;
+ }
+
+ //鍒濆鍖朥I宸ュ喌鍒楄〃
+ private void InitialUIWorkingList(List<HydroWorkingVmo> allWorkingList)
+ {
this.repositoryItemImageComboBox1.Items.BeginUpdate();
this.repositoryItemImageComboBox1.Items.Clear();
if (allWorkingList != null && allWorkingList.Count > 0)
{
allWorkingList.ForEach(x => this.repositoryItemImageComboBox1.Items.Add(x.Name, x, -1));
- this.barEditCurrentWorking.EditValue = allWorkingList.Last();
}
this.repositoryItemImageComboBox1.Items.EndUpdate();
}
- //澧炲姞褰撳墠宸ュ喌
- private void AppendCurrentWorking(HydroWorkingVmo working)
+ //澧炲姞UI宸ュ喌
+ private void AppendUIWorking(HydroWorkingVmo working)
{
this.repositoryItemImageComboBox1.Items.BeginUpdate();
this.repositoryItemImageComboBox1.Items.Add(working.Name, working, -1);
this.repositoryItemImageComboBox1.Items.EndUpdate();
+ }
+
+ //璁剧疆UI宸ュ喌
+ private void SetUIWorking(HydroWorkingVmo working)
+ {
this.barEditCurrentWorking.EditValue = working;
}
- //璁剧疆褰撳墠宸ュ喌
- private async void SetCurrentWorking(HydroWorkingVmo working)
+ //褰撳墠宸ュ喌鍙戠敓鏀瑰彉
+ private async void barEditCurrentWorking_EditValueChanged(object sender, EventArgs e)
{
+ if (_hydroInfo == null)
+ {
+ return;
+ }
+ var working = this.barEditCurrentWorking.EditValue as HydroWorkingVmo;
if (working == null)
{
return;
}
- this.barEditCurrentWorking.EditValue = working;
- _currentWorking = working;
- var allWorkingTupleList = await GetWorkingTupleList();
- var tuple = allWorkingTupleList?.Find(x => x.Item1.ID == working.ID);
- if (tuple == null)
+
+ #region 宸ュ喌鍏冪粍
+
+ var workingTupleHelper = GetWorkingTupleHelper();
+ var workingTuple = await workingTupleHelper.GetTuple(working);
+ if (workingTuple == null)
{
return;
}
- _checkResult = tuple.Item2;
- _calcuResult = tuple.Item3;
- }
- //褰撳墠宸ュ喌鍙戠敓鏀瑰彉
- private void barEditCurrentWorking_EditValueChanged(object sender, EventArgs e)
- {
- var working = this.barEditCurrentWorking.EditValue as HydroWorkingVmo;
- SetCurrentWorking(working);
+ #endregion
+
+ #region 褰撳墠宸ュ喌
+
+ var workingHelper = GetWorkingHelper();
+ workingHelper.InitialData(workingTuple.Item1, workingTuple.Item2, workingTuple.Item3);
+
+ #endregion
+
+ #region 姘村姏淇℃伅
+
+ var workingInfo = JsonHelper.Json2Object<HydroWorkingInfoViewModel>(working.WorkingInfo);
+ _hydroInfo.UpdateWorkingInfo(workingInfo);
+
+
+ #endregion
+
+ #region 宸ュ喌鎺т欢
+
+ UpdateWorkingCtrl();
+ SelectWorkingCtrl(working);
+
+ #endregion
+
+ #region 璁＄畻缁撴灉
+
+ var calcuResultHelper = GetCalcuResultHelper();
+ calcuResultHelper.InitialData();
+
+ #endregion
+
+ #region 瑙嗗浘鍒楄〃
+
+ var visualVmListHelper = GetVisualVmListHelper();
+ visualVmListHelper.UpdateCalcuProperty(workingHelper.CalcuResult);
+
+ #endregion
+
+ #region 璁＄畻鏍囩
+
+ var calcuResultLabelHelper = await GetCalcuResultLabelHelper();
+ calcuResultLabelHelper.Set();
+
+ #endregion
+
}
#endregion
@@ -2860,17 +2310,15 @@
private HydroWorkingTreeCtrl _workingCtrl = null;
//鑾峰彇宸ュ喌鎺т欢
- private async Task<HydroWorkingTreeCtrl> GetWorkingCtrl()
+ private HydroWorkingTreeCtrl GetWorkingCtrl()
{
if (_workingCtrl == null)
{
_workingCtrl = new HydroWorkingTreeCtrl();
_workingCtrl.Dock = DockStyle.Fill;
- var allWorkingList = await GetWorkingList();
- _workingCtrl.SetBindingData(allWorkingList);
- _workingCtrl.FocusedChangedEvent += (vmo) =>
+ _workingCtrl.HydroClickEvent += (working) =>
{
-
+ SetUIWorking(working);
};
}
return _workingCtrl;
@@ -2898,33 +2346,41 @@
//鏄剧ず宸ュ喌鎺т欢
private async void ShowWorkingCtrl()
{
- if (IsWorkingCtrlVisible)
+ var workingCtrl = GetWorkingCtrl();
+ if (!IsWorkingCtrlVisible)
{
- return;
+ this.controlContainerRight.Controls.Clear();
+ this.controlContainerRight.Controls.Add(workingCtrl);
+ this.docPnlRight.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
+ this.docPnlRight.Text = "宸ュ喌";
+ this.docPnlRight.Width = 300;
}
- var workingCtrl = await GetWorkingCtrl();
- this.controlContainerRight.Controls.Clear();
- this.controlContainerRight.Controls.Add(workingCtrl);
- this.docPnlRight.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
- this.docPnlRight.Text = "宸ュ喌";
- this.docPnlRight.Width = 300;
- }
-
- //闅愯棌宸ュ喌鎺т欢
- private void HideWorkingCtrl()
- {
- if (IsWorkingCtrlVisible)
- {
- this.docPnlRight.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
- }
+ var workingTupleHelper = GetWorkingTupleHelper();
+ var allWorkingList = await workingTupleHelper.GetWorkingList();
+ workingCtrl.SetBindingData(allWorkingList);
}
//鏇存柊宸ュ喌鎺т欢
private async void UpdateWorkingCtrl()
{
- var workingCtrl = await GetWorkingCtrl();
- var allWorkingList = await GetWorkingList();
+ if (!IsWorkingCtrlVisible)
+ {
+ return;
+ }
+ var workingTupleHelper = GetWorkingTupleHelper();
+ var allWorkingList = await workingTupleHelper.GetWorkingList();
+ var workingCtrl = GetWorkingCtrl();
workingCtrl.SetBindingData(allWorkingList);
+ }
+
+ //閫夋嫨宸ュ喌鎺т欢
+ private void SelectWorkingCtrl(HydroWorkingVmo working)
+ {
+ if (IsWorkingCtrlVisible)
+ {
+ var workingCtrl = GetWorkingCtrl();
+ workingCtrl.Select(working);
+ }
}
//宸ュ喌鍒楄〃鐐瑰嚮
@@ -2937,10 +2393,57 @@
#region 宸ュ喌璇勪及
+ //璇勪及
+ private async void Evaluate()
+ {
+ if (_hydroInfo == null)
+ {
+ return;
+ }
+ var working = GetWorking();
+ if (working == null)
+ {
+ TipFormHelper.ShowWarn("灏氭湭璁＄畻锛岃璁＄畻鍚庨噸璇曪紒");
+ return;
+ }
+ var checkResult = GetCheckResult();
+ if (checkResult == null)
+ {
+ return;
+ }
+ if (!checkResult.Succeed)
+ {
+ ShowCheckCtrl(checkResult);
+ TipFormHelper.ShowWarn("妫�鏌ュけ璐ワ紝鍋滄璇勪及锛�");
+ return;
+ }
+ var calcuResult = GetCalcuResult();
+ if (!calcuResult.Succeed)
+ {
+ ShowCalcuFailedCtrl(calcuResult);
+ TipFormHelper.ShowWarn("璁＄畻澶辫触锛屽仠姝㈣瘎浼帮紒");
+ return;
+ }
+ if (calcuResult.WainingList != null && calcuResult.WainingList.Count > 0)
+ {
+ ShowCalcuWarningCtrl(calcuResult);
+ TipFormHelper.ShowWarn("璇峰叧娉ㄨ鍛婁俊鎭紒");
+ }
+ var visualListHelper = GetVisualListHelper();
+ var allVisualDict = visualListHelper.GetVisualDict();
+ var monitorHelper = GetMonitorHelper();
+ var allMonitorList = await monitorHelper.Get();
+ var allWorkingMonitorList = JsonHelper.Json2Object<List<HydroWorkingMonitorViewModel>>(working.MonitorInfo);
+ var allCalcuResultDict = calcuResult.GetVisualDict();
+ var dlg = new HydroWorkingEvaluationDlg();
+ dlg.SetBindingData(allVisualDict, allMonitorList, allWorkingMonitorList, allCalcuResultDict);
+ dlg.ShowDialog();
+ }
+ //绮惧害璇勪及
private void barBtnWorkingEvaluation_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
- XtraMessageBox.Show("姝ｅ湪寮�鍙戜腑锛屾暚璇锋湡寰咃紒");
+ Evaluate();
}
#endregion
@@ -2958,7 +2461,8 @@
{
return;
}
- var allCalcuResultList = GetCalcuVisualResultList(Yw.EPAnet.CalcuMode.MinorLoss, false);
+
+ var calcuResultHelper = GetCalcuResultHelper();
var vmList = new List<XhsSinglePumpViewModel>();
foreach (var pump in _hydroInfo.Pumps)
{
@@ -2993,26 +2497,27 @@
vm.CurveQE = qePtList;
vm.CurveQP = qpPtList;
- if (allCalcuResultList != null && allCalcuResultList.Count > 0)
+ var calcuResultVisualDict = calcuResultHelper.GetVisualDict();
+ if (calcuResultVisualDict != null && calcuResultVisualDict.Count > 0)
{
- var calcuResult = allCalcuResultList.Find(x => x.Code == pump.Code) as HydroCalcuLinkResult;
- if (calcuResult != null)
- {
- if (calcuResult.CalcuFlow.HasValue)
- {
- vm.CalcuQ = Math.Abs(calcuResult.CalcuFlow.Value);
- }
+ //var calcuResult = allCalcuResultList.Find(x => x.Code == pump.Code) as HydroCalcuLinkResult;
+ //if (calcuResult != null)
+ //{
+ // if (calcuResult.CalcuFlow.HasValue)
+ // {
+ // vm.CalcuQ = Math.Abs(calcuResult.CalcuFlow.Value);
+ // }
- var calcuResultStart = allCalcuResultList.Find(x => x.Code == pump.StartCode) as HydroCalcuNodeResult;
- var calcuResultEnd = allCalcuResultList.Find(x => x.Code == pump.EndCode) as HydroCalcuNodeResult;
- if (calcuResultStart != null && calcuResultEnd != null)
- {
- if (calcuResultStart.CalcuHead.HasValue && calcuResultEnd.CalcuHead.HasValue)
- {
- vm.CalcuH = Math.Round(Math.Abs(calcuResultStart.CalcuHead.Value - calcuResultEnd.CalcuHead.Value), 4);
- }
- }
- }
+ // var calcuResultStart = allCalcuResultList.Find(x => x.Code == pump.StartCode) as HydroCalcuNodeResult;
+ // var calcuResultEnd = allCalcuResultList.Find(x => x.Code == pump.EndCode) as HydroCalcuNodeResult;
+ // if (calcuResultStart != null && calcuResultEnd != null)
+ // {
+ // if (calcuResultStart.CalcuHead.HasValue && calcuResultEnd.CalcuHead.HasValue)
+ // {
+ // vm.CalcuH = Math.Round(Math.Abs(calcuResultStart.CalcuHead.Value - calcuResultEnd.CalcuHead.Value), 4);
+ // }
+ // }
+ //}
}
}
@@ -3030,7 +2535,7 @@
pump.SpeedRatio = Math.Round(x.CurrentHz / pump.RatedHz, 1);
}
});
- ShowSelectedProperty();
+ //ShowSelectedProperty();
return true;
};
dlg.ShowDialog();
@@ -3070,9 +2575,14 @@
{
XtraMessageBox.Show("姝ｅ湪寮�鍙戜腑锛屾暚璇锋湡寰咃紒");
}
+
+ #endregion
+
#endregion
+
+
}
}
\ No newline at end of file
--
Gitblit v1.9.3