From e0df433d23b1afffa0b04389ad8b915a91f8debc Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期三, 04 十二月 2024 23:40:34 +0800
Subject: [PATCH] 对接部分匹配
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/08-working/XhsProjectSimulationWorkingPage.cs | 229 +++++++++++++++++++++++++++++++--------------------------
1 files changed, 124 insertions(+), 105 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/08-working/XhsProjectSimulationWorkingPage.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/08-working/XhsProjectSimulationWorkingPage.cs
index 77e20f8..c8b8fbe 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/08-working/XhsProjectSimulationWorkingPage.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/08-working/XhsProjectSimulationWorkingPage.cs
@@ -167,10 +167,10 @@
#region 灞炴�ф帶浠�
//灞炴�ф帶浠�
- private XhsProjectSimulationPropertyCtrl _propertyCtrl = null;
+ private HydroVisualPropertyViewCtrl _propertyCtrl = null;
//鑾峰彇灞炴�ф帶浠�
- private XhsProjectSimulationPropertyCtrl GetPropertyCtrl()
+ private HydroVisualPropertyViewCtrl GetPropertyCtrl()
{
if (_hydroInfo == null)
{
@@ -178,11 +178,11 @@
}
if (_propertyCtrl == null)
{
- _propertyCtrl = new XhsProjectSimulationPropertyCtrl();
+ _propertyCtrl = new HydroVisualPropertyViewCtrl();
_propertyCtrl.Dock = DockStyle.Fill;
- _propertyCtrl.HydroViewEvent += (visual) =>
+ _propertyCtrl.HydroViewEvent += (visualViewModel) =>
{
- SelectVisual(visual, eVisualSource.Property);
+ SelectVisual(GetVisual(visualViewModel), eVisualSource.Property);
};
_propertyCtrl.BlinkLinkNodeEvent += async (link, linkNodeCode) =>
{ //寮鸿皟杩炴帴鑺傜偣
@@ -221,38 +221,6 @@
await Task.Delay(5000);
await _bimfaceCtrl?.ClearBlinkComponents();
};
- _propertyCtrl.PropertyValueChangedEvent += async (visual) =>
- {
- if (visual == null)
- {
- return;
- }
- UpdateVisualListCtrl();
- var gradingHelper = await GetGradingHelper();
- gradingHelper.Set();
- };
- _propertyCtrl.MarkPropertyValueChangedEvent += async (visual) =>
- {
- //鏍囨敞灞炴�у彂鐢熸敼鍙�
- //鍒ゆ柇褰撳墠鏄惁鏈夋爣娉ㄥ睍绀猴紝鑻ユ湁鍒欐洿鏂版爣娉紝鏈�濂芥槸鏇存柊鍗曚釜鏍囨敞
- var markHelper = await GetMarkHelper();
- markHelper.Set(visual);
- };
- _propertyCtrl.GradingPropertyValueChangedEvent += async (visual) =>
- {
- //鍒嗙骇灞炴�у彂鐢熸敼鍙�
- //鍒ゆ柇褰撳墠鏄惁鏈夊垎绾у睍绀猴紝鑻ユ湁鍒欐洿鏂板垎绾э紝鏈�濂芥槸鏇存柊鍗曚釜鍒嗙骇
- var gradingHelper = await GetGradingHelper();
- gradingHelper.Set(visual);
- };
- _propertyCtrl.FlowEffectPropertyValueChangedEvent += async (visual) =>
- {
- //娴佸悜灞炴�у彂鐢熸敼鍙�
- //鍒ゆ柇娴佸悜鏄惁鍔犺浇锛屽鏋滃姞杞藉垯鏇存柊娴佸悜锛屾渶濂芥槸鏇存柊鍗曚釜娴佸悜
- var flowEffectHelper = await GetFlowEffectHelper();
- flowEffectHelper.Set(visual);
- };
-
}
return _propertyCtrl;
}
@@ -266,7 +234,7 @@
{
if (this.controlContainerRight.Controls.Count > 0)
{
- if (this.controlContainerRight.Controls[0] is XhsProjectSimulationPropertyCtrl)
+ if (this.controlContainerRight.Controls[0] is SimulationPropertyCtrl)
{
return true;
}
@@ -425,6 +393,23 @@
return _visualListHelper;
}
+ //鑾峰彇鍙鏋勪欢
+ private Yw.Model.HydroVisualInfo GetVisual(string code)
+ {
+ if (string.IsNullOrEmpty(code))
+ {
+ return default;
+ }
+ var visualListHelper = GetVisualListHelper();
+ return visualListHelper.GetVisual(code);
+ }
+
+ //鑾峰彇鍙鏋勪欢
+ private Yw.Model.HydroVisualInfo GetVisual(HydroVisualViewModel visualViewModel)
+ {
+ return GetVisual(visualViewModel?.Code);
+ }
+
#endregion
#region 瑙嗗浘鍒楄〃
@@ -448,6 +433,23 @@
return _visualVmListHelper;
}
+ //鑾峰彇鍙瑙嗗浘
+ private HydroVisualViewModel GetVisualViewModel(string code)
+ {
+ if (string.IsNullOrEmpty(code))
+ {
+ return default;
+ }
+ var visualVmListHelper = GetVisualVmListHelper();
+ return visualVmListHelper.GetVisual(code);
+ }
+
+ //鑾峰彇鍙瑙嗗浘
+ private HydroVisualViewModel GetVisualViewModel(Yw.Model.HydroVisualInfo visual)
+ {
+ return GetVisualViewModel(visual?.Code);
+ }
+
#endregion
#region 鏄庣粏鎺т欢
@@ -465,10 +467,6 @@
_visualListCtrl.HydroClickInfoEvent += (visual) =>
{
SelectVisual(visual, eVisualSource.List);
- };
- _visualListCtrl.HydroChangedInfoEvent += (visualList) =>
- {
- SelectVisual(_visual, eVisualSource.List);
};
}
return _visualListCtrl;
@@ -512,15 +510,7 @@
var visualVmListHelper = GetVisualVmListHelper();
var allVisualVmList = visualVmListHelper.GetVisualList();
visualListCtrl.SetBindingData(allVisualVmList);
- var calcuResult = GetCalcuResult();
- if (calcuResult != null && calcuResult.Succeed)
- {
- visualListCtrl.SetCalcuView();
- }
- else
- {
- visualListCtrl.SetNormalView();
- }
+ visualListCtrl.SetResultView();
}
//鏇存柊鏋勪欢鏄庣粏鎺т欢
@@ -1364,7 +1354,7 @@
#endregion
- #region 骞惰仈璁＄畻
+ #region 骞惰仈妯℃嫙
//骞惰仈鍒嗘瀽
private void ParallelAnalysis()
@@ -1415,26 +1405,26 @@
}
- var dlg = new PumpParallelAnalyDlg();
- dlg.SetBindingData(vmList);
- dlg.ReloadDataEvent += (list) =>
- {
- list?.ForEach(x =>
- {
- var pump = pumps.Find(t => t.Code == x.Code);
- if (pump != null)
- {
- pump.LinkStatus = x.RunStatus ? Yw.Hydro.PumpStatus.Open : Yw.Hydro.PumpStatus.Closed;
- pump.SpeedRatio = x.CurrentHz / pump.RatedHz;
- }
- });
- var codes = list?.Select(x => x.Code).ToList();
- //UpdateVisualViewModelProperty(codes);
- //ShowSelectedProperty();
- UpdateVisualListCtrl();
- return true;
- };
- dlg.ShowDialog();
+ //var dlg = new PumpParallelAnalyDlg();
+ //dlg.SetBindingData(vmList);
+ //dlg.ReloadDataEvent += (list) =>
+ //{
+ // list?.ForEach(x =>
+ // {
+ // var pump = pumps.Find(t => t.Code == x.Code);
+ // if (pump != null)
+ // {
+ // pump.LinkStatus = x.RunStatus ? Yw.Hydro.PumpStatus.Open : Yw.Hydro.PumpStatus.Closed;
+ // pump.SpeedRatio = x.CurrentHz / pump.RatedHz;
+ // }
+ // });
+ // var codes = list?.Select(x => x.Code).ToList();
+ // //UpdateVisualViewModelProperty(codes);
+ // //ShowSelectedProperty();
+ // UpdateVisualListCtrl();
+ // return true;
+ //};
+ //dlg.ShowDialog();
}
//骞惰仈鍒嗘瀽
@@ -1529,22 +1519,25 @@
#region 宸ュ喌鍒嗘瀽
- #region 宸ュ喌璇勪及
-
-
-
//绮惧害璇勪及
- private void barBtnWorkingEvaluation_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ private async void barBtnWorkingEvaluation_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
+ var monitorHelper = GetMonitorHelper();
+ var allMonitorList = await monitorHelper.Get();
+ var workingHelper = GetWorkingHelper();
+ if (!workingHelper.Initialized)
+ {
+ TipFormHelper.ShowWarn("宸ュ喌璁＄畻澶辫触锛�");
+ return;
+ }
+ var dlg = new HydroSingleWorkingEvaluationDlg();
+ dlg.SetBindingData(workingHelper.HydroInfo, allMonitorList, workingHelper.Working, workingHelper.CalcuResult);
+ dlg.ShowDialog();
}
- #endregion
-
- #region 宸ュ喌骞惰仈
-
- //骞惰仈鍒嗘瀽
- private void barBtnAnaly_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ //姘存车鍒嗘瀽
+ private void barBtnPumpAnaly_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
if (_hydroInfo == null)
{
@@ -1615,31 +1608,34 @@
}
- var dlg = new PumpParallelAnalyDlg();
- dlg.SetBindingData(vmList);
- dlg.ReloadDataEvent += (list) =>
- {
- list?.ForEach(x =>
- {
- var pump = _hydroInfo.Pumps?.Find(t => t.Code == x.Code);
- if (pump != null)
- {
- pump.LinkStatus = x.RunStatus ? Yw.Hydro.PumpStatus.Open : Yw.Hydro.PumpStatus.Closed;
- pump.SpeedRatio = Math.Round(x.CurrentHz / pump.RatedHz, 1);
- }
- });
- //ShowSelectedProperty();
- return true;
- };
- dlg.ShowDialog();
+ //var dlg = new PumpParallelAnalyDlg();
+ //dlg.SetBindingData(vmList);
+ //dlg.ReloadDataEvent += (list) =>
+ //{
+ // list?.ForEach(x =>
+ // {
+ // var pump = _hydroInfo.Pumps?.Find(t => t.Code == x.Code);
+ // if (pump != null)
+ // {
+ // pump.LinkStatus = x.RunStatus ? Yw.Hydro.PumpStatus.Open : Yw.Hydro.PumpStatus.Closed;
+ // pump.SpeedRatio = Math.Round(x.CurrentHz / pump.RatedHz, 1);
+ // }
+ // });
+ // //ShowSelectedProperty();
+ // return true;
+ //};
+ //dlg.ShowDialog();
}
-
- #endregion
//鑳芥晥鍒嗘瀽
private void barBtnWorkingPower_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
var workingHelper = GetWorkingHelper();
+ if (!workingHelper.Initialized)
+ {
+ TipFormHelper.ShowWarn("宸ュ喌璁＄畻澶辫触锛�");
+ return;
+ }
var dlg = new SimulationSingleWorkingEnergyDlg();
dlg.SetBindingData(workingHelper.HydroInfo, workingHelper.CalcuResult);
dlg.ShowDialog();
@@ -1666,7 +1662,7 @@
visual = visualListHelper.GetVisual(linkInfo.StartCode);
}
- var dlg = new HydroSingleLossCurveDlg();
+ var dlg = new HydroSingleWorkingLossCurveDlg();
dlg.SetBindingData(workingHelper.HydroInfo, workingHelper.CalcuResult, visual);
dlg.ShowDialog();
}
@@ -1686,9 +1682,32 @@
}
//缁煎悎鍒嗘瀽
- private void barBtnWorkingAnaly_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ private async void barBtnWorkingAnaly_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
- XtraMessageBox.Show("姝ｅ湪寮�鍙戜腑锛屾暚璇锋湡寰咃紒");
+ if (_visual == null)
+ {
+ TipFormHelper.ShowWarn("璇烽�夋嫨鏋勪欢鍚庨噸璇曪紒");
+ return;
+ }
+ HydroVisualInfo visual = _visual;
+ if (_visual is HydroLinkInfo linkInfo)
+ {
+ var visualListHelper = GetVisualListHelper();
+ visual = visualListHelper.GetVisual(linkInfo.StartCode);
+ }
+
+ var monitorHelper = GetMonitorHelper();
+ var allMonitorList = await monitorHelper.Get();
+
+ var workingHelper = GetWorkingHelper();
+ if (!workingHelper.Initialized)
+ {
+ TipFormHelper.ShowWarn("宸ュ喌璁＄畻澶辫触锛�");
+ return;
+ }
+ var dlg = new SimulationSingleWorkingAnalyDlg();
+ dlg.SetBindingData(workingHelper.HydroInfo, allMonitorList, workingHelper.Working, workingHelper.CalcuResult, visual);
+ dlg.ShowDialog();
}
#endregion
--
Gitblit v1.9.3