From 4a5989c23c468d376a8abe72abe1a534708dbfe2 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期三, 27 十一月 2024 20:18:51 +0800
Subject: [PATCH] 增加方案工况
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/XhsProjectSimulationSchemeMgrPage.cs | 193 +++++++++++++++++++++++------------------------
1 files changed, 94 insertions(+), 99 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/XhsProjectSimulationSchemeMgrPage.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/XhsProjectSimulationSchemeMgrPage.cs
index 754ab94..98fc5ad 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/XhsProjectSimulationSchemeMgrPage.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/XhsProjectSimulationSchemeMgrPage.cs
@@ -1,12 +1,7 @@
锘縢lobal using Yw.EPAnet;
using DevExpress.Mvvm.Native;
-using DevExpress.Xpo.Helpers;
-using DevExpress.XtraRichEdit.Layout;
-using DevExpress.XtraSpreadsheet.Commands;
using HStation.WinFrmUI.PhartRelation;
using System.Diagnostics;
-using System.Windows.Media;
-using System.Windows.Media.Media3D;
using Yw.Pump;
using Yw.Vmo;
using Yw.WinFrmUI.Bimface;
@@ -93,7 +88,7 @@
{
_bimfaceCtrl = new XhsProjectSimulationBimfaceCtrl();
_bimfaceCtrl.Dock = DockStyle.Fill;
- await _bimfaceCtrl.InitialData(_project, _projectSite, () => _hydroInfo);
+ await _bimfaceCtrl.InitialData(_project, _projectSite);
_bimfaceCtrl.LoadCompletedEvent += () =>
{//view鍔犺浇瀹屾垚浜嬩欢
if (_hydroInfo == null)
@@ -108,7 +103,7 @@
{
return;
}
- _selectedVisual = obj;
+ //_selectedVisual = obj;
ShowSelectedProperty();
};
}
@@ -179,57 +174,57 @@
{
_propertyCtrl = new XhsProjectSimulationPropertyCtrl();
_propertyCtrl.Dock = DockStyle.Fill;
- _propertyCtrl.InitialData(() => _hydroInfo, () => GetCalcuResultList());
- _propertyCtrl.BlinkLinkParterEvent += async (code, linkCode) =>
- { //寮鸿皟杩炴帴缁勪欢
- if (string.IsNullOrEmpty(code))
- {
- return;
- }
- if (string.IsNullOrEmpty(linkCode))
- {
- return;
- }
- if (_hydroInfo == null)
- {
- return;
- }
- var allVisualList = _hydroInfo.GetAllVisuals();
- if (allVisualList == null || allVisualList.Count < 1)
- {
- return;
- }
- var linkParter = allVisualList.Find(x => x.Code == linkCode);
- if (linkParter == null)
- {
- return;
- }
- var blinkCodes = new List<string>();
- if (linkParter.GetType() == typeof(Yw.Model.HydroJunctionInfo))
- {
- var allLinkList = _hydroInfo.GetAllLinks();
- if (allLinkList == null || allLinkList.Count < 1)
- {
- return;
- }
- var linkList = allLinkList.Where(x => (x.StartCode == linkParter.Code || x.EndCode == linkParter.Code) && x.Code != code).ToList();
- if (linkList == null || linkList.Count < 1)
- {
- return;
- }
- blinkCodes.AddRange(linkList.Select(x => x.Code));
- }
- else
- {
- blinkCodes.Add(linkCode);
- }
+ //_propertyCtrl.InitialData(() => _hydroInfo, () => GetCalcuResultList());
+ //_propertyCtrl.BlinkLinkNodeEvent += async (code, linkCode) =>
+ //{ //寮鸿皟杩炴帴缁勪欢
+ // if (string.IsNullOrEmpty(code))
+ // {
+ // return;
+ // }
+ // if (string.IsNullOrEmpty(linkCode))
+ // {
+ // return;
+ // }
+ // if (_hydroInfo == null)
+ // {
+ // return;
+ // }
+ // var allVisualList = _hydroInfo.GetAllVisuals();
+ // if (allVisualList == null || allVisualList.Count < 1)
+ // {
+ // return;
+ // }
+ // var linkParter = allVisualList.Find(x => x.Code == linkCode);
+ // if (linkParter == null)
+ // {
+ // return;
+ // }
+ // var blinkCodes = new List<string>();
+ // if (linkParter.GetType() == typeof(Yw.Model.HydroJunctionInfo))
+ // {
+ // var allLinkList = _hydroInfo.GetAllLinks();
+ // if (allLinkList == null || allLinkList.Count < 1)
+ // {
+ // return;
+ // }
+ // var linkList = allLinkList.Where(x => (x.StartCode == linkParter.Code || x.EndCode == linkParter.Code) && x.Code != code).ToList();
+ // if (linkList == null || linkList.Count < 1)
+ // {
+ // return;
+ // }
+ // blinkCodes.AddRange(linkList.Select(x => x.Code));
+ // }
+ // else
+ // {
+ // blinkCodes.Add(linkCode);
+ // }
- await _bimfaceCtrl?.SetBlinkComponents(blinkCodes);
- await Task.Delay(5000);
- await _bimfaceCtrl?.ClearBlinkComponents();
- };
+ // await _bimfaceCtrl?.SetBlinkComponents(blinkCodes);
+ // await Task.Delay(5000);
+ // await _bimfaceCtrl?.ClearBlinkComponents();
+ //};
- _propertyCtrl.ViewParterEvent += (parter) =>
+ _propertyCtrl.HydroViewEvent += (parter) =>
{
if (parter == null)
{
@@ -256,11 +251,11 @@
//鍒嗙骇灞炴�у彂鐢熸敼鍙�
//鍒ゆ柇褰撳墠鏄惁鏈夊垎绾у睍绀猴紝鑻ユ湁鍒欐洿鏂板垎绾э紝鏈�濂芥槸鏇存柊鍗曚釜鍒嗙骇
};
- _propertyCtrl.FlowDirectionPropertyValueChangedEvent += async (parter) =>
+ _propertyCtrl.FlowEffectPropertyValueChangedEvent += async (parter) =>
{
//娴佸悜灞炴�у彂鐢熸敼鍙�
//鍒ゆ柇娴佸悜鏄惁鍔犺浇锛屽鏋滃姞杞藉垯鏇存柊娴佸悜锛屾渶濂芥槸鏇存柊鍗曚釜娴佸悜
- UpdateFlowEffect(parter);
+ //UpdateFlowEffect(parter);
//await _bimfaceCtrl?.UnloadFlowEffectById(parter.Code);
};
@@ -1060,52 +1055,52 @@
}
ShowSelectedProperty();
};
- dlg.HydroCalcuEvent += async (hydroInfo, workingInfo) =>
- {
- if (_hydroInfo == null)
- {
- return;
- }
- _hydroInfo.UpdateWorkingInfo(workingInfo);
- //鏍￠獙
- _checkResult = _hydroInfo.Check();
- if (!_checkResult.Succeed)
- {
- ShowCheckCtrl();
- TipFormHelper.ShowWarn("鏍￠獙澶辫触锛岃妫�鏌ュ悗閲嶈瘯");
- return;
- }
+ //dlg.HydroCalcuEvent += async (hydroInfo, workingInfo) =>
+ //{
+ // if (_hydroInfo == null)
+ // {
+ // return;
+ // }
+ // _hydroInfo.UpdateWorkingInfo(workingInfo);
+ // //鏍￠獙
+ // _checkResult = _hydroInfo.Check();
+ // if (!_checkResult.Succeed)
+ // {
+ // ShowCheckCtrl();
+ // TipFormHelper.ShowWarn("鏍￠獙澶辫触锛岃妫�鏌ュ悗閲嶈瘯");
+ // return;
+ // }
- WaitFormHelper.ShowWaitForm(this, "姝ｅ湪璁＄畻鍒嗘瀽涓紝璇风◢鍊�...");
+ // WaitFormHelper.ShowWaitForm(this, "姝ｅ湪璁＄畻鍒嗘瀽涓紝璇风◢鍊�...");
- await Task.Delay(5000);
+ // await Task.Delay(5000);
- var netWork = Yw.Hydro.ParseHelper.ToNetwork(_hydroInfo);
- _calcuResult = netWork.CalcuMinorLoss();
+ // var netWork = Yw.Hydro.ParseHelper.ToNetwork(_hydroInfo);
+ // _calcuResult = netWork.CalcuMinorLoss();
- WaitFormHelper.HideWaitForm();
- if (_calcuResult.Succeed)
- {
- GetCalcuResultList(false);
- UpdateVisualViewModelCalcuProperty();
- UpdateVisualListCtrl();
- UpdateSelectedProperty();
- await _bimfaceCtrl?.SetLogicCalcuCustomLabels(_calcuResult);
- TipFormHelper.ShowSucceed("璁＄畻鎴愬姛锛�");
- var codes = _hydroInfo.Pumps.Select(x => x.Code).ToList();
- await _bimfaceCtrl?.ZoomAndSelectComponents(codes);
- }
- else
- {
- ShowCalcuFailedCtrl();
- TipFormHelper.ShowError("璁＄畻澶辫触锛�");
- }
- AutoApplyGrading();
- UpdateVisualListCtrl();
- ShowSelectedProperty();
- };
- dlg.SetBindingData(_hydroInfo);
+ // WaitFormHelper.HideWaitForm();
+ // if (_calcuResult.Succeed)
+ // {
+ // GetCalcuResultList(false);
+ // UpdateVisualViewModelCalcuProperty();
+ // UpdateVisualListCtrl();
+ // UpdateSelectedProperty();
+ // await _bimfaceCtrl?.SetLogicCalcuCustomLabels(_calcuResult);
+ // TipFormHelper.ShowSucceed("璁＄畻鎴愬姛锛�");
+ // var codes = _hydroInfo.Pumps.Select(x => x.Code).ToList();
+ // await _bimfaceCtrl?.ZoomAndSelectComponents(codes);
+ // }
+ // else
+ // {
+ // ShowCalcuFailedCtrl();
+ // TipFormHelper.ShowError("璁＄畻澶辫触锛�");
+ // }
+ // AutoApplyGrading();
+ // UpdateVisualListCtrl();
+ // ShowSelectedProperty();
+ //};
+ //dlg.SetBindingData(_hydroInfo);
dlg.ShowDialog();
}
--
Gitblit v1.9.3