From 288e87195c7b604e87fe4b98aa759c5fff6e2346 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期三, 19 二月 2025 00:10:12 +0800
Subject: [PATCH] 能效分析
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs | 801 +++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 613 insertions(+), 188 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 6a21a93..1f14d3d 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,19 +1,11 @@
-锘縰sing Castle.Core.Logging;
-using DevExpress.CodeParser;
-using DevExpress.Diagram.Core.Native;
+锘縰sing DevExpress.Diagram.Core.Native;
using DevExpress.Mvvm.Native;
-using DevExpress.Utils.MVVM;
-using DevExpress.XtraMap;
-using HStation.WinFrmUI.PhartRelation;
+using DevExpress.Pdf.Native;
using Mapster;
-using NPOI.OpenXmlFormats.Dml;
-using NPOI.SS.Formula.Functions;
-using System.Diagnostics;
using Yw.EPAnet;
using Yw.Hydro;
using Yw.Model;
using Yw.Vmo;
-using Yw.WinFrmUI.Q3d;
namespace HStation.WinFrmUI
{
@@ -28,30 +20,54 @@
RegistBulkSetEvents();
}
- /// <summary>
- /// 鏂板宸ュ喌浜嬩欢
- /// </summary>
- public event Action<HydroWorkingVmo> AppendWorkingEvent;
+
+
+ #region 妯″瀷浜嬩欢
/// <summary>
- /// 淇濆瓨妯″瀷浜嬩欢
+ /// 鑾峰彇妯″瀷浜嬩欢
/// </summary>
- public event Func<Yw.Model.HydroModelInfo, Task<Yw.Model.HydroModelInfo>> SaveModelEvent;
-
+ public event Func<XhsSchemeVmo, Task<Yw.Model.HydroModelInfo>> GetModelEvent;
/// <summary>
/// 鍒锋柊妯″瀷浜嬩欢
/// </summary>
public event Func<Task<Yw.Model.HydroModelInfo>> RefreshModelEvent;
+ #endregion
+
+ #region 鏂规浜嬩欢
+
/// <summary>
/// 鏇存柊鏂规浜嬩欢
/// </summary>
public event Action<XhsSchemeVmo> UpdateSchemeEvent;
-
/// <summary>
/// 绉婚櫎鏂规浜嬩欢
/// </summary>
public event Action<XhsSchemeVmo> RemoveSchemeEvent;
+
+ #endregion
+
+ #region 宸ュ喌浜嬩欢
+
+ /// <summary>
+ /// 鏂板宸ュ喌浜嬩欢
+ /// </summary>
+ public event Action<HydroWorkingVmo> AppendWorkingEvent;
+ /// <summary>
+ /// 鏇存柊宸ュ喌浜嬩欢
+ /// </summary>
+ public event Action<HydroWorkingVmo> UpdateWorkingEvent;
+ /// <summary>
+ /// 绉婚櫎宸ュ喌浜嬩欢
+ /// </summary>
+ public event Action<HydroWorkingVmo> RemoveWorkingEvent;
+ /// <summary>
+ /// 閲嶈浇宸ュ喌浜嬩欢
+ /// </summary>
+ public event Action<Dictionary<HydroWorkingVmo, bool>> ReloadWorkingEvent;
+
+ #endregion
private HStation.Vmo.XhsProjectVmo _project = null;//椤圭洰
private HStation.Vmo.XhsProjectSiteVmo _projectSite = null;//椤圭洰绔�
@@ -239,6 +255,62 @@
return _propStatusHelper;
}
+ //鑾峰彇灞炴�х姸鎬丏b鍒楄〃
+ private async Task<List<HydroParterPropStatusInfo>> GetPropStatusDbList()
+ {
+ var helper = await GetPropStatusHelper();
+ return helper.GetPropStatusDbList();
+ }
+
+ #endregion
+
+ #region 鏇存敼鐘舵��
+
+ //鏀瑰彉杈呭姪绫�
+ private HydroChangeHelper _changeHelper = null;
+
+ //鑾峰彇鏀瑰彉杈呭姪绫�
+ private HydroChangeHelper GetChangeHelper()
+ {
+ if (_hydroInfo == null)
+ {
+ return default;
+ }
+ if (_changeHelper == null)
+ {
+ _changeHelper = new HydroChangeHelper(_hydroInfo);
+ }
+ return _changeHelper;
+ }
+
+ //闄勫姞鏀瑰彉鏋勪欢
+ private void AppendChangeParter(HydroParterInfo parter, eChangeType changeType)
+ {
+ var helper = GetChangeHelper();
+ helper.Append(parter, changeType);
+ }
+
+ //鑾峰彇澧炲姞鏋勪欢鍒楄〃
+ private List<HydroParterInfo> GetAddParterList()
+ {
+ var helper = GetChangeHelper();
+ return helper.GetAddParterList();
+ }
+
+ //鑾峰彇鏇存柊鏋勪欢鍒楄〃
+ private List<HydroParterInfo> GetUpdateParterList()
+ {
+ var helper = GetChangeHelper();
+ return helper.GetUpdateParterList();
+ }
+
+ //鑾峰彇绉婚櫎鏋勪欢鍒楄〃
+ private List<string> GetRemoveParters()
+ {
+ var helper = GetChangeHelper();
+ return helper.GetRemoveParters();
+ }
+
#endregion
#region BIM鎺т欢
@@ -283,7 +355,7 @@
this.tabPageBimface.Controls.Add(bimfaceCtrl);
}
- #endregion BIM鎺т欢
+ #endregion
#region Q3d鎺т欢
@@ -320,7 +392,7 @@
this.tabPageQ3d.Controls.Add(q3dCtrl);
}
- #endregion Q3d鎺т欢
+ #endregion
#region 灞炴�ф帶浠�
@@ -336,11 +408,12 @@
}
if (_propertyCtrl == null)
{
+ var changeHelper = GetChangeHelper();
var propStatusHelper = await GetPropStatusHelper();
_propertyCtrl = new SimulationPropertyCtrl();
_propertyCtrl.Dock = DockStyle.Fill;
_propertyCtrl.AllowEdit = true;
- _propertyCtrl.InitialData(propStatusHelper);
+ _propertyCtrl.InitialData(changeHelper, propStatusHelper);
_propertyCtrl.CalcuResult = () => GetCalcuResult();
_propertyCtrl.HydroViewEvent += (visual) =>
{
@@ -406,13 +479,6 @@
//鍒ゆ柇褰撳墠鏄惁鏈夊垎绾у睍绀猴紝鑻ユ湁鍒欐洿鏂板垎绾э紝鏈�濂芥槸鏇存柊鍗曚釜鍒嗙骇
var gradingHelper = await GetGradingHelper();
gradingHelper.Set(visual);
- };
- _propertyCtrl.FlowEffectPropertyValueChangedEvent += async (visual) =>
- {
- //娴佸悜灞炴�у彂鐢熸敼鍙�
- //鍒ゆ柇娴佸悜鏄惁鍔犺浇锛屽鏋滃姞杞藉垯鏇存柊娴佸悜锛屾渶濂芥槸鏇存柊鍗曚釜娴佸悜
- var flowEffectHelper = await GetFlowEffectHelper();
- flowEffectHelper.Set(visual);
};
}
return _propertyCtrl;
@@ -638,7 +704,7 @@
return helper.GetSourceList();
}
- #endregion 鍙鍒楄〃
+ #endregion
#region 瑙嗗浘鍒楄〃
@@ -675,7 +741,7 @@
return helper.GetVisual(code);
}
- #endregion 瑙嗗浘鍒楄〃
+ #endregion
#region 鏄庣粏鎺т欢
@@ -721,7 +787,7 @@
}
//鏄剧ず鏋勪欢鏄庣粏鎺т欢
- private void ShowVisualListCtrl()
+ private async void ShowVisualListCtrl()
{
if (_hydroInfo == null)
{
@@ -737,8 +803,10 @@
this.docPnlBottom.Height = 350;
}
var visualVmListHelper = GetVisualVmListHelper();
+ var changeHelper = GetChangeHelper();
+ var propStatusHelper = await GetPropStatusHelper();
var allVisualVmList = visualVmListHelper.GetVisualList();
- visualListCtrl.SetBindingData(allVisualVmList);
+ visualListCtrl.SetBindingData(allVisualVmList, changeHelper, propStatusHelper);
var calcuResult = GetCalcuResult();
if (calcuResult != null && calcuResult.Succeed)
{
@@ -775,7 +843,7 @@
ShowVisualListCtrl();
}
- #endregion 鏄庣粏鎺т欢
+ #endregion
#region 鏋勪欢鏄剧ず
@@ -826,7 +894,7 @@
#endregion 鏋勪欢鏄剧ず
- #endregion 鏋勪欢鏄庣粏
+ #endregion
#region 涓�閿樉闅�
@@ -874,6 +942,10 @@
#region 淇濆瓨淇℃伅
+ //淇濆瓨閿佸畾瀵硅薄
+ private object _locker_save = new();
+ private bool _isSaving = false;//姝ｅ湪淇濆瓨
+
//淇濆瓨
private async void barBtnSave_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
@@ -881,19 +953,71 @@
{
return;
}
- if (this.SaveModelEvent == null)
- {
- return;
- }
- var hydroInfo = await this.SaveModelEvent.Invoke(_hydroInfo);
- if (hydroInfo == null)
- {
- TipFormHelper.ShowError("淇濆瓨澶辫触锛�");
- return;
- }
- _hydroInfo = hydroInfo;
+ lock (_locker_save)
+ {
+ if (_isSaving)
+ {
+ this.FindForm().ShowAlertInfo("淇濆瓨", "姝ｅ湪淇濆瓨锛岃绋嶅悗閲嶈瘯锛�");
+ return;
+ }
+ }
+
+ _isSaving = true;
+
+ var changeHelper = GetChangeHelper();
+
+ var addParterList = changeHelper.GetAddParterList();
+ var updateParterList = changeHelper.GetUpdateParterList();
+ var removeParters = changeHelper.GetRemoveParters();
+
+ if (addParterList == null || addParterList.Count < 1)
+ {
+ if (updateParterList == null || updateParterList.Count < 1)
+ {
+ if (removeParters == null || removeParters.Count < 1)
+ {
+ TipFormHelper.ShowWarn("鏈娴嬪埌淇敼锛屾棤闇�淇濆瓨锛�");
+ _isSaving = false;
+ return;
+ }
+ }
+ }
+
+ WaitFormHelper.ShowWaitForm("姝ｅ湪淇濆瓨锛岃绋嶅悗...");
+
+
+ var bol = await BLLFactory<Yw.BLL.HydroModelInfo>.Instance
+ .Update(_hydroInfo, addParterList, updateParterList, removeParters);
+
+
+ if (!bol)
+ {
+ WaitFormHelper.HideWaitForm();
+ TipFormHelper.ShowError("姘村姏淇℃伅鏇存柊澶辫触锛�");
+ _isSaving = false;
+ return;
+ }
+ changeHelper.Reset();
+
+ var propStatusHelper = await GetPropStatusHelper();
+ var updatePropStatusList = propStatusHelper.GetUpdatePropStatusDbList();
+ if (updatePropStatusList != null && updatePropStatusList.Count > 0)
+ {
+ bol = await BLLFactory<Yw.BLL.HydroParterPropStatusInfo>.Instance.Update(_hydroInfo.ID, updatePropStatusList);
+ if (!bol)
+ {
+ WaitFormHelper.HideWaitForm();
+ TipFormHelper.ShowWarn("灞炴�х姸鎬佹洿鏂板け璐ワ紒");
+ _isSaving = false;
+ return;
+ }
+ }
+ propStatusHelper.Reset();
+
+ WaitFormHelper.HideWaitForm();
TipFormHelper.ShowSucceed("淇濆瓨鎴愬姛锛�");
+ _isSaving = false;
//Stopwatch sw = new Stopwatch();
//sw.Start();
@@ -911,11 +1035,13 @@
private void RegistBulkSetEvents()
{
//姘村簱
- this.barBtnSetReservoirList.ItemClick += delegate
+ this.barBtnSetReservoirList.ItemClick += async delegate
{
var allVisualViewModelList = GetVisualViewModelList();
+ var changeHelper = GetChangeHelper();
+ var propStatusHelper = await GetPropStatusHelper();
var dlg = new SetHydroReservoirListDlg();
- dlg.SetBindingData(allVisualViewModelList);
+ dlg.SetBindingData(allVisualViewModelList, changeHelper, propStatusHelper);
dlg.HydroClickInfoEvent += (visual) =>
{
SelectVisual(visual, eSimulationVisualSource.Set);
@@ -928,11 +1054,13 @@
dlg.ShowDialog();
};
//姘存睜
- this.barBtnSetTankList.ItemClick += delegate
+ this.barBtnSetTankList.ItemClick += async delegate
{
var allVisualViewModelList = GetVisualViewModelList();
+ var changeHelper = GetChangeHelper();
+ var propStatusHelper = await GetPropStatusHelper();
var dlg = new SetHydroTankListDlg();
- dlg.SetBindingData(allVisualViewModelList);
+ dlg.SetBindingData(allVisualViewModelList, changeHelper, propStatusHelper);
dlg.HydroClickInfoEvent += (visual) =>
{
SelectVisual(visual, eSimulationVisualSource.Set);
@@ -945,11 +1073,13 @@
dlg.ShowDialog();
};
//姘寸
- this.barBtnSetWaterboxList.ItemClick += delegate
+ this.barBtnSetWaterboxList.ItemClick += async delegate
{
var allVisualViewModelList = GetVisualViewModelList();
+ var changeHelper = GetChangeHelper();
+ var propStatusHelper = await GetPropStatusHelper();
var dlg = new SetHydroWaterboxListDlg();
- dlg.SetBindingData(allVisualViewModelList);
+ dlg.SetBindingData(allVisualViewModelList, changeHelper, propStatusHelper);
dlg.HydroClickInfoEvent += (visual) =>
{
SelectVisual(visual, eSimulationVisualSource.Set);
@@ -962,11 +1092,13 @@
dlg.ShowDialog();
};
//杩炴帴鑺傜偣
- this.barBtnSetJunctionList.ItemClick += delegate
+ this.barBtnSetJunctionList.ItemClick += async delegate
{
var allVisualViewModelList = GetVisualViewModelList();
+ var changeHelper = GetChangeHelper();
+ var propStatusHelper = await GetPropStatusHelper();
var dlg = new SetHydroJunctionListDlg();
- dlg.SetBindingData(allVisualViewModelList);
+ dlg.SetBindingData(allVisualViewModelList, changeHelper, propStatusHelper);
dlg.HydroClickInfoEvent += (visual) =>
{
SelectVisual(visual, eSimulationVisualSource.Set);
@@ -979,11 +1111,13 @@
dlg.ShowDialog();
};
//闂峰ご
- this.barBtnSetBluntheadList.ItemClick += delegate
+ this.barBtnSetBluntheadList.ItemClick += async delegate
{
var allVisualViewModelList = GetVisualViewModelList();
+ var changeHelper = GetChangeHelper();
+ var propStatusHelper = await GetPropStatusHelper();
var dlg = new SetHydroBluntheadListDlg();
- dlg.SetBindingData(allVisualViewModelList);
+ dlg.SetBindingData(allVisualViewModelList, changeHelper, propStatusHelper);
dlg.HydroClickInfoEvent += (visual) =>
{
SelectVisual(visual, eSimulationVisualSource.Set);
@@ -996,11 +1130,13 @@
dlg.ShowDialog();
};
//寮ご
- this.barBtnSetElbowsList.ItemClick += delegate
+ this.barBtnSetElbowsList.ItemClick += async delegate
{
var allVisualVmList = GetVisualViewModelList();
+ var changeHelper = GetChangeHelper();
+ var propStatusHelper = await GetPropStatusHelper();
var dlg = new SetHydroElbowListDlg();
- dlg.SetBindingData(allVisualVmList);
+ dlg.SetBindingData(allVisualVmList, changeHelper, propStatusHelper);
dlg.HydroClickInfoEvent += (visual) =>
{
SelectVisual(visual, eSimulationVisualSource.Set);
@@ -1013,11 +1149,13 @@
dlg.ShowDialog();
};
//涓夐��
- this.barBtnSetThreelinkList.ItemClick += delegate
+ this.barBtnSetThreelinkList.ItemClick += async delegate
{
var allVisualViewModelList = GetVisualViewModelList();
+ var changeHelper = GetChangeHelper();
+ var propStatusHelper = await GetPropStatusHelper();
var dlg = new SetHydroThreelinkListDlg();
- dlg.SetBindingData(allVisualViewModelList);
+ dlg.SetBindingData(allVisualViewModelList, changeHelper, propStatusHelper);
dlg.HydroClickInfoEvent += (visual) =>
{
SelectVisual(visual, eSimulationVisualSource.Set);
@@ -1030,11 +1168,13 @@
dlg.ShowDialog();
};
//鍥涢��
- this.barBtnSetFourlinkList.ItemClick += delegate
+ this.barBtnSetFourlinkList.ItemClick += async delegate
{
var allVisualViewModelList = GetVisualViewModelList();
+ var changeHelper = GetChangeHelper();
+ var propStatusHelper = await GetPropStatusHelper();
var dlg = new SetHydroFourlinkListDlg();
- dlg.SetBindingData(allVisualViewModelList);
+ dlg.SetBindingData(allVisualViewModelList, changeHelper, propStatusHelper);
dlg.HydroClickInfoEvent += (visual) =>
{
SelectVisual(visual, eSimulationVisualSource.Set);
@@ -1047,11 +1187,13 @@
dlg.ShowDialog();
};
//姘磋〃
- this.barBtnSetMeterList.ItemClick += delegate
+ this.barBtnSetMeterList.ItemClick += async delegate
{
var allVisualViewModelList = GetVisualViewModelList();
+ var changeHelper = GetChangeHelper();
+ var propStatusHelper = await GetPropStatusHelper();
var dlg = new SetHydroMeterListDlg();
- dlg.SetBindingData(allVisualViewModelList);
+ dlg.SetBindingData(allVisualViewModelList, changeHelper, propStatusHelper);
dlg.HydroClickInfoEvent += (visual) =>
{
SelectVisual(visual, eSimulationVisualSource.Set);
@@ -1064,11 +1206,13 @@
dlg.ShowDialog();
};
//娴侀噺璁�
- this.barBtnSetFlowmeterList.ItemClick += delegate
+ this.barBtnSetFlowmeterList.ItemClick += async delegate
{
var allVisualViewModelList = GetVisualViewModelList();
+ var changeHelper = GetChangeHelper();
+ var propStatusHelper = await GetPropStatusHelper();
var dlg = new SetHydroFlowmeterListDlg();
- dlg.SetBindingData(allVisualViewModelList);
+ dlg.SetBindingData(allVisualViewModelList, changeHelper, propStatusHelper);
dlg.HydroClickInfoEvent += (visual) =>
{
SelectVisual(visual, eSimulationVisualSource.Set);
@@ -1081,11 +1225,13 @@
dlg.ShowDialog();
};
//鍘嬪姏琛�
- this.barBtnSetPressmeterList.ItemClick += delegate
+ this.barBtnSetPressmeterList.ItemClick += async delegate
{
var allVisualViewModelList = GetVisualViewModelList();
+ var changeHelper = GetChangeHelper();
+ var propStatusHelper = await GetPropStatusHelper();
var dlg = new SetHydroPressmeterListDlg();
- dlg.SetBindingData(allVisualViewModelList);
+ dlg.SetBindingData(allVisualViewModelList, changeHelper, propStatusHelper);
dlg.HydroClickInfoEvent += (visual) =>
{
SelectVisual(visual, eSimulationVisualSource.Set);
@@ -1098,11 +1244,13 @@
dlg.ShowDialog();
};
//鍠峰槾
- this.barBtnSetNozzleList.ItemClick += delegate
+ this.barBtnSetNozzleList.ItemClick += async delegate
{
var allVisualViewModelList = GetVisualViewModelList();
+ var changeHelper = GetChangeHelper();
+ var propStatusHelper = await GetPropStatusHelper();
var dlg = new SetHydroNozzleListDlg();
- dlg.SetBindingData(allVisualViewModelList);
+ dlg.SetBindingData(allVisualViewModelList, changeHelper, propStatusHelper);
dlg.HydroClickInfoEvent += (visual) =>
{
SelectVisual(visual, eSimulationVisualSource.Set);
@@ -1115,11 +1263,13 @@
dlg.ShowDialog();
};
//鍐峰嵈濉�
- this.barBtnSetCoolingList.ItemClick += delegate
+ this.barBtnSetCoolingList.ItemClick += async delegate
{
var allVisualViewModelList = GetVisualViewModelList();
+ var changeHelper = GetChangeHelper();
+ var propStatusHelper = await GetPropStatusHelper();
var dlg = new SetHydroCoolingListDlg();
- dlg.SetBindingData(allVisualViewModelList);
+ dlg.SetBindingData(allVisualViewModelList, changeHelper, propStatusHelper);
dlg.HydroClickInfoEvent += (visual) =>
{
SelectVisual(visual, eSimulationVisualSource.Set);
@@ -1132,11 +1282,13 @@
dlg.ShowDialog();
};
//绠￠亾
- this.barBtnSetPipeList.ItemClick += delegate
+ this.barBtnSetPipeList.ItemClick += async delegate
{
var allVisualViewModelList = GetVisualViewModelList();
+ var changeHelper = GetChangeHelper();
+ var propStatusHelper = await GetPropStatusHelper();
var dlg = new SetHydroPipeListDlg();
- dlg.SetBindingData(allVisualViewModelList);
+ dlg.SetBindingData(allVisualViewModelList, changeHelper, propStatusHelper);
dlg.HydroClickInfoEvent += (visual) =>
{
SelectVisual(visual, eSimulationVisualSource.Set);
@@ -1149,11 +1301,13 @@
dlg.ShowDialog();
};
//杩囨浮浠�
- this.barBtnSetTranslationList.ItemClick += delegate
+ this.barBtnSetTranslationList.ItemClick += async delegate
{
var allVisualViewModelList = GetVisualViewModelList();
+ var changeHelper = GetChangeHelper();
+ var propStatusHelper = await GetPropStatusHelper();
var dlg = new SetHydroTranslationListDlg();
- dlg.SetBindingData(allVisualViewModelList);
+ dlg.SetBindingData(allVisualViewModelList, changeHelper, propStatusHelper);
dlg.HydroClickInfoEvent += (visual) =>
{
SelectVisual(visual, eSimulationVisualSource.Set);
@@ -1166,11 +1320,13 @@
dlg.ShowDialog();
};
//姘存车
- this.barBtnSetPumpList.ItemClick += delegate
+ this.barBtnSetPumpList.ItemClick += async delegate
{
var allVisualViewModelList = GetVisualViewModelList();
+ var changeHelper = GetChangeHelper();
+ var propStatusHelper = await GetPropStatusHelper();
var dlg = new SetHydroPumpListDlg();
- dlg.SetBindingData(allVisualViewModelList);
+ dlg.SetBindingData(allVisualViewModelList, changeHelper, propStatusHelper);
dlg.HydroClickInfoEvent += (visual) =>
{
SelectVisual(visual, eSimulationVisualSource.Set);
@@ -1183,11 +1339,13 @@
dlg.ShowDialog();
};
//闃�闂�
- this.barBtnSetValveList.ItemClick += delegate
+ this.barBtnSetValveList.ItemClick += async delegate
{
var allVisualViewModelList = GetVisualViewModelList();
+ var changeHelper = GetChangeHelper();
+ var propStatusHelper = await GetPropStatusHelper();
var dlg = new SetHydroValveListDlg();
- dlg.SetBindingData(allVisualViewModelList);
+ dlg.SetBindingData(allVisualViewModelList, changeHelper, propStatusHelper);
dlg.HydroClickInfoEvent += (visual) =>
{
SelectVisual(visual, eSimulationVisualSource.Set);
@@ -1200,11 +1358,13 @@
dlg.ShowDialog();
};
//鎹㈢儹鍣�
- this.barBtnSetExchangerList.ItemClick += delegate
+ this.barBtnSetExchangerList.ItemClick += async delegate
{
var allVisualViewModelList = GetVisualViewModelList();
+ var changeHelper = GetChangeHelper();
+ var propStatusHelper = await GetPropStatusHelper();
var dlg = new SetHydroExchangerListDlg();
- dlg.SetBindingData(allVisualViewModelList);
+ dlg.SetBindingData(allVisualViewModelList, changeHelper, propStatusHelper);
dlg.HydroClickInfoEvent += (visual) =>
{
SelectVisual(visual, eSimulationVisualSource.Set);
@@ -1217,11 +1377,13 @@
dlg.ShowDialog();
};
//鍘嬬缉鏈�
- this.barBtnSetCompressorList.ItemClick += delegate
+ this.barBtnSetCompressorList.ItemClick += async delegate
{
var allVisualViewModelList = GetVisualViewModelList();
+ var changeHelper = GetChangeHelper();
+ var propStatusHelper = await GetPropStatusHelper();
var dlg = new SetHydroCompressorListDlg();
- dlg.SetBindingData(allVisualViewModelList);
+ dlg.SetBindingData(allVisualViewModelList, changeHelper, propStatusHelper);
dlg.HydroClickInfoEvent += (visual) =>
{
SelectVisual(visual, eSimulationVisualSource.Set);
@@ -1450,7 +1612,7 @@
}
}
- #endregion 鎵归噺閰嶇疆
+ #endregion
#region 鏋勪欢鏌ヨ
@@ -1593,7 +1755,7 @@
markHelper.Set();
}
- #endregion 妯″瀷鏍囨敞
+ #endregion
#region 棰滆壊鍒嗙骇
@@ -1675,7 +1837,7 @@
gradingHelper.Set();
}
- #endregion 棰滆壊鍒嗙骇
+ #endregion
#region 浜哄伐鍒锋柊
@@ -1700,39 +1862,6 @@
ResetVisualList();
TipFormHelper.ShowSucceed("鍒锋柊鎴愬姛锛�");
}
- }
-
- #endregion 浜哄伐鍒锋柊
-
- #region 姘存祦鍔ㄧ敾
-
- //姘存祦鍔ㄧ敾杈呭姪绫�
- private SimulationFlowEffectHelper _flowEffectHelper = null;
-
- //鑾峰彇姘存祦鍔ㄧ敾杈呭姪绫�
- private async Task<SimulationFlowEffectHelper> GetFlowEffectHelper()
- {
- if (_hydroInfo == null)
- {
- return default;
- }
- if (_flowEffectHelper == null)
- {
- var visualListHelper = GetVisualListHelper();
- var bimfaceCtrl = await GetBimfaceCtrl();
- _flowEffectHelper = new SimulationFlowEffectHelper(visualListHelper, bimfaceCtrl);
- var calcuResult = GetCalcuResult();
- _flowEffectHelper.InitialData(calcuResult);
- }
- return _flowEffectHelper;
- }
-
- //姘存祦鍔ㄧ敾鏄惁鍙
- private async void barCkFlowEffect_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
- {
- var flowEffectHelper = await GetFlowEffectHelper();
- //flowEffectHelper.Visible = this.barCkFlowEffect.Checked;
- //flowEffectHelper.Set();
}
#endregion
@@ -1774,7 +1903,7 @@
return await helper.GetAnalyseList();
}
- #endregion 鐩戞祴鐐�
+ #endregion
#region 鐩戞祴鍊�
@@ -2372,6 +2501,78 @@
#endregion 姘存车鍒楄〃
+ #region 鍘嬪姏鍒囨崲
+
+ //璁＄畻鍘嬪姏鏄惁涓虹粷瀵瑰帇鍔�
+ private bool _calcuPressModeIsHead = false;
+
+ //璁＄畻缁撴灉鍘嬪姏鍒囨崲
+ private void barToggleSwitchPress_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ {
+ _calcuPressModeIsHead = !this.barToggleSwitchPress.Checked;
+ this.barToggleSwitchPress.Caption = _calcuPressModeIsHead ? "缁濆鍘嬪姏" : "鑷敱鍘嬪姏";
+ var workingHelper = GetWorkingHelper();
+ workingHelper.ResetResult(_calcuPressModeIsHead);
+ UpdateVisualListCtrl();
+ UpdatePropertyCtrl();
+ }
+
+
+ #endregion
+
+ #region 璇勪环瑙勫垯
+
+ //璇勪环瑙勫垯杈呭姪绫�
+ private SimulationEvaluationHelper _evaluationHelper = null;
+
+ //鑾峰彇璇勪环瑙勫垯杈呭姪绫�
+ private SimulationEvaluationHelper GetEvaluationHelper()
+ {
+ if (_evaluationHelper == null)
+ {
+ _evaluationHelper = new SimulationEvaluationHelper(_hydroInfo.ID);
+ }
+ return _evaluationHelper;
+ }
+
+ //鑾峰彇璇勪环瑙勫垯鍒楄〃
+ private async Task<List<Yw.Vmo.HydroEvaluationVmo>> GetEvaluationList()
+ {
+ var helper = GetEvaluationHelper();
+ return await helper.GetEvaluationList();
+ }
+
+ //璁剧疆璇勪环瑙勫垯鍒楄〃
+ private void SetEvaluationList(List<Yw.Vmo.HydroEvaluationVmo> allEvaluationList)
+ {
+ var helper = GetEvaluationHelper();
+ helper.SetEvaluationList(allEvaluationList);
+ }
+
+ //鏄剧ず璇勪环绐椾綋
+ private void ShowEvaluationDlg()
+ {
+ if (_hydroInfo == null)
+ {
+ return;
+ }
+ var dlg = new SetHydroEvaluationModelDlg();
+ dlg.SetBindingData(_hydroInfo.ID);
+ dlg.ReloadDataEvent += (rhs) =>
+ {
+ SetEvaluationList(rhs);
+ };
+ dlg.ShowDialog();
+ }
+
+ //璇勪环瑙勫垯
+ private void barBtnEvaluation_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ {
+ ShowEvaluationDlg();
+ }
+
+ #endregion
+
#region 姘村姏璁＄畻
//璁＄畻
@@ -2423,7 +2624,7 @@
WaitFormHelper.ShowWaitForm(this, "姝ｅ湪璁＄畻鍒嗘瀽涓紝璇风◢鍊�...");
await Task.Delay(3000);
- var calcuResult = _hydroInfo.Calcu(Yw.EPAnet.CalcuMode.MinorLoss);
+ var calcuResult = _hydroInfo.Calcu(Yw.EPAnet.CalcuMode.MinorLoss, _calcuPressModeIsHead);
WaitFormHelper.HideWaitForm();
workingHelper.InitialData(hydroInfo, working, checkResult, calcuResult);
if (calcuResult.Succeed)
@@ -2484,12 +2685,158 @@
Calcu();
}
- #endregion 姘村姏璁＄畻
+ #endregion
#region 瀵煎嚭鎶ュ憡
+ //鍒涘缓鎵撳嵃淇℃伅
+ private async Task<SimulationPrintViewModel> CreatePrintInfo()
+ {
+ if (_project == null)
+ {
+ return default;
+ }
+ if (_hydroInfo == null)
+ {
+ return default;
+ }
+
+ #region 宸ュ喌鍒楄〃
+
+ var allWorkingList = GetCheckedWorkingList();
+ if (allWorkingList == null || allWorkingList.Count < 1)
+ {
+ var working = GetWorking();
+ if (working == null)
+ {
+ TipFormHelper.ShowWarn("璇疯绠楁垨閫夋嫨宸ュ喌鍚庨噸璇曪紒");
+ return default;
+ }
+ allWorkingList = new List<HydroWorkingVmo>() { working };
+ }
+
+ #endregion
+
+ #region 閫夋嫨鑺傜偣
+
+ var selectedNode = GetSelectNode();
+ if (selectedNode == null)
+ {
+ return default;
+ }
+
+ #endregion
+
+ var vm = new SimulationPrintViewModel();
+
+ #region 椤圭洰
+
+ vm.Project = new SimulationPrintProjectViewModel(_project);
+ if (_hydroInfo == null)
+ {
+ return vm;
+ }
+
+ #endregion
+
+ #region 姘存车鍒楄〃
+
+ vm.PumpList = _hydroInfo.Pumps?.Select(x =>
+ {
+ var pump = new SimulationPrintPumpViewModel(x);
+ return pump;
+ }).ToList();
+
+ #endregion
+
+ #region 闄勫姞淇℃伅
+
+ var allMonitorList = await GetMonitorList();
+ var allEvaluationList = await GetEvaluationList();
+
+ #endregion
+
+ #region 鍩虹妯″瀷
+
+ var baseHydroInfo = _hydroInfo;
+ if (_scheme != null)
+ {
+ baseHydroInfo = await GetModelEvent?.Invoke(null);
+ }
+ var baseHydroInfoRhs = baseHydroInfo.Adapt<Yw.Model.HydroModelInfo>();
+
+ #endregion
+
+ #region 閬嶅巻宸ュ喌
+
+ vm.WorkingList = new List<SimulationPrintWorkingViewModel>();
+ foreach (var working in allWorkingList)
+ {
+ baseHydroInfoRhs.UpdateWorkingInfo(working.WorkingInfo);
+ var calcuResult = baseHydroInfoRhs.Calcu(Yw.EPAnet.CalcuMode.MinorLoss, _calcuPressModeIsHead, allEvaluationList);
+
+ var printWorking = new SimulationPrintWorkingViewModel(working);
+ vm.WorkingList.Add(printWorking);
+
+ //绮惧害璇勪及
+ printWorking.Accuracy = SimulationPrintAccuracyHelper.Create(baseHydroInfoRhs, allMonitorList, working, calcuResult, _calcuPressModeIsHead, allEvaluationList);
+ //姘存车鍒嗘瀽
+ printWorking.PumpAnaly = SimulationPrintPumpAnalyHelper.Create(baseHydroInfoRhs, working, calcuResult, _calcuPressModeIsHead, allEvaluationList);
+ //鐩戞祴鍒嗘瀽
+ printWorking.MonitorAnaly = SimulationPrintMonitorAnalyHelper.Create(baseHydroInfoRhs, allMonitorList, working, calcuResult, _calcuPressModeIsHead, allEvaluationList);
+ //鑳借�楀垎鏋�
+ printWorking.EnergyAnaly = SimulationPrintEnergyAnalyHelper.Create(baseHydroInfoRhs, working, calcuResult, _calcuPressModeIsHead, allEvaluationList);
+ //鎹熷け缁熻
+ printWorking.LossStatistics = HydroLossStatisticsHelper.Create(baseHydroInfoRhs, working, calcuResult, _calcuPressModeIsHead, allEvaluationList);
+ //鎹熷け鏇茬嚎
+ printWorking.LossCurve = HydroLossCurveHelper.Create(baseHydroInfoRhs, working, selectedNode, calcuResult, _calcuPressModeIsHead, allEvaluationList);
+ }
+
+ #endregion
+
+ #region 鏂规澶勭悊
+
+ if (_scheme != null)
+ {
+ var hydroInfo = _hydroInfo;
+ var hydroInfoRhs = hydroInfo.Adapt<Yw.Model.HydroModelInfo>();
+ vm.Scheme = new SimulationPrintSchemeViewModel(_scheme);
+ foreach (var working in allWorkingList)
+ {
+ hydroInfoRhs.UpdateWorkingInfo(working.WorkingInfo);
+ var calcuResult = hydroInfoRhs.Calcu(Yw.EPAnet.CalcuMode.MinorLoss, _calcuPressModeIsHead, allEvaluationList);
+
+ var printWorking = new SimulationPrintWorkingViewModel(working);
+ vm.Scheme.WorkingList.Add(printWorking);
+
+ //绮惧害璇勪及
+ printWorking.Accuracy = SimulationPrintAccuracyHelper.Create(hydroInfoRhs, allMonitorList, working, calcuResult, _calcuPressModeIsHead, allEvaluationList);
+ //姘存车鍒嗘瀽
+ printWorking.PumpAnaly = SimulationPrintPumpAnalyHelper.Create(hydroInfoRhs, working, calcuResult, _calcuPressModeIsHead, allEvaluationList);
+ //鐩戞祴鍒嗘瀽
+ printWorking.MonitorAnaly = SimulationPrintMonitorAnalyHelper.Create(hydroInfoRhs, allMonitorList, working, calcuResult, _calcuPressModeIsHead, allEvaluationList);
+ //鑳借�楀垎鏋�
+ printWorking.EnergyAnaly = SimulationPrintEnergyAnalyHelper.Create(hydroInfoRhs, working, calcuResult, _calcuPressModeIsHead, allEvaluationList);
+ //鎹熷け缁熻
+ printWorking.LossStatistics = HydroLossStatisticsHelper.Create(hydroInfoRhs, working, calcuResult, _calcuPressModeIsHead, allEvaluationList);
+ //鎹熷け鏇茬嚎
+ printWorking.LossCurve = HydroLossCurveHelper.Create(hydroInfoRhs, working, selectedNode, calcuResult, _calcuPressModeIsHead, allEvaluationList);
+ }
+ }
+
+ #endregion
+
+
+ return vm;
+ }
+
+ //瀵煎嚭word
private async void barBtnExportWord_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
+ var printInfo = await CreatePrintInfo();
+ var printDlg = new SimulationCommonReportDlg();
+ printDlg.SetBindingData(printInfo);
+ printDlg.ShowDialog();
if (_visual == null)
{
SelectInputSource();
@@ -2526,7 +2873,7 @@
dlg.ShowDialog();
}
- #endregion 瀵煎嚭鎶ュ憡
+ #endregion
#region 褰撳墠宸ュ喌
@@ -2591,7 +2938,7 @@
AddWorking();
}
- #endregion 褰撳墠宸ュ喌
+ #endregion
#region 閫夋嫨宸ュ喌
@@ -2603,11 +2950,17 @@
{
if (_workingCheckedListHelper == null)
{
- var visualListHelper = GetVisualListHelper();
- _workingCheckedListHelper = new SimulationWorkingCheckedListHelper(visualListHelper);
+ _workingCheckedListHelper = new SimulationWorkingCheckedListHelper();
_workingCheckedListHelper.InitialData(_allWorkingCheckedListDict);
}
return _workingCheckedListHelper;
+ }
+
+ //鑾峰彇宸ュ喌瀛楀吀
+ private Dictionary<HydroWorkingVmo, bool> GetWorkingDict()
+ {
+ var helper = GetWorkingCheckedListHelper();
+ return helper.GetWorkingDict();
}
//鑾峰彇宸ュ喌鍒楄〃
@@ -2645,7 +2998,44 @@
helper.Remove(working);
}
- #endregion 閫夋嫨宸ュ喌
+ /// <summary>
+ /// 閲嶈浇宸ュ喌閫夋嫨鍒楄〃
+ /// </summary>
+ public void ReloadWorkingCheckedList(Dictionary<HydroWorkingVmo, bool> dict)
+ {
+ var helper = GetWorkingCheckedListHelper();
+ helper.InitialData(dict);
+ }
+
+ //绠＄悊宸ュ喌
+ private void barBtnMgrWorking_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ {
+ var dict = GetWorkingDict();
+ var dlg = new HydroWorkingMgrDlg();
+ dlg.ReloadDataEvent += (dict) =>
+ {
+ this.ReloadWorkingEvent?.Invoke(dict);
+ };
+ dlg.UpdateDataEvent += (rhs) =>
+ {
+ this.UpdateWorkingEvent?.Invoke(rhs);
+ };
+ dlg.ApplyDataEvent += async (rhs) =>
+ {
+ _hydroInfo.UpdateWorkingInfo(rhs.WorkingInfo);
+ var monitorValueHelper = GetMonitorValueHelper();
+ var allMonitorValueList = await monitorValueHelper.GetAll();
+ allMonitorValueList.UpdateMonitorValue(rhs.MonitorInfo);
+ };
+ dlg.DeleteDataEvent += (rhs) =>
+ {
+ this.RemoveWorkingEvent?.Invoke(rhs);
+ };
+ dlg.SetBindingData(dict);
+ dlg.ShowDialog();
+ }
+
+ #endregion
#region 鐩戞祴鍒嗘瀽
@@ -2730,7 +3120,7 @@
ShowMonitorAnalyListCtrl();
}
- #endregion 鐩戞祴鍒嗘瀽
+ #endregion
#region 宸ュ喌鍒嗘瀽
@@ -2753,6 +3143,27 @@
}
}
}
+ }
+
+ //鑾峰彇閫夋嫨鑺傜偣
+ private HydroNodeInfo GetSelectNode()
+ {
+ if (_visual == null)
+ {
+ SelectInputSource();
+ if (_visual == null)
+ {
+ TipFormHelper.ShowWarn("璇烽�夋嫨鏋勪欢鍚庨噸璇曪紒");
+ return null;
+ }
+ }
+ HydroVisualInfo visual = _visual;
+ if (_visual is HydroLinkInfo linkInfo)
+ {
+ var visualListHelper = GetVisualListHelper();
+ visual = visualListHelper.GetVisual(linkInfo.StartCode);
+ }
+ return visual as HydroNodeInfo;
}
//绮惧害璇勪及
@@ -2834,11 +3245,18 @@
}
//鎹熷け缁熻
- private void barBtnWorkingLossStatistics_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ private async void barBtnWorkingLossStatistics_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
- var workingCheckedListHelper = GetWorkingCheckedListHelper();
- var allCheckedWorkingList = workingCheckedListHelper.GetCheckedWorkingList();
- if (allCheckedWorkingList == null || allCheckedWorkingList.Count < 1)
+ if (_hydroInfo == null)
+ {
+ return;
+ }
+ var hydroInfo = _hydroInfo.Adapt<Yw.Model.HydroModelInfo>();
+ var isHead = _calcuPressModeIsHead;
+ var allEvaluationList = await GetEvaluationList();
+
+ var workingList = GetCheckedWorkingList();
+ if (workingList == null || workingList.Count < 1)
{
var workingHelper = GetWorkingHelper();
if (!workingHelper.Initialized)
@@ -2846,16 +3264,15 @@
TipFormHelper.ShowWarn("璇疯绠楀悗閲嶈瘯锛�");
return;
}
- var dlg = new HydroSingleWorkingLossStatisticsDlg();
- dlg.SetBindingData(workingHelper.HydroInfo);
+ var dlg = new HydroLossStatisticsDlg();
+ dlg.SetBindingData(hydroInfo, workingHelper.Working, workingHelper.CalcuResult, isHead, allEvaluationList);
dlg.ShowDialog();
+ return;
}
- else
- {
- var dlg = new HydroMultiWorkingLossStatisticsDlg();
- dlg.SetBindingData(_hydroInfo, allCheckedWorkingList);
- dlg.ShowDialog();
- }
+
+ var workingDlg = new HydroLossStatisticsWorkingDlg();
+ workingDlg.SetBindingData(hydroInfo, workingList, isHead, allEvaluationList);
+ workingDlg.ShowDialog();
}
//缁煎悎鍒嗘瀽
@@ -2905,31 +3322,39 @@
}
}
- #endregion 宸ュ喌鍒嗘瀽
+ #endregion
#region 鎹熷け鏇茬嚎
- //鍗曞伐鍐垫崯澶辨洸绾挎帶浠�
- private HydroSingleWorkingLossCurveCtrl _singleWorkingLossCurveCtrl = null;
+ //鎹熷け鏇茬嚎浜や簰鎺т欢
+ private HydroLossCurveInteropCtrl _lossCurveInteropCtrl = null;
- //鑾峰彇鍗曞伐鍐垫崯澶辨洸绾挎帶浠�
- private HydroSingleWorkingLossCurveCtrl GetSingleWorkingLossCurveCtrl()
+ //鑾峰彇鎹熷け鏇茬嚎浜や簰鎺т欢
+ private HydroLossCurveInteropCtrl GetLossCurveInteropCtrl()
{
- if (_singleWorkingLossCurveCtrl == null)
+ if (_lossCurveInteropCtrl == null)
{
- _singleWorkingLossCurveCtrl = new HydroSingleWorkingLossCurveCtrl();
- _singleWorkingLossCurveCtrl.Dock = DockStyle.Fill;
- _singleWorkingLossCurveCtrl.HydroClickEvent += (code) =>
+ _lossCurveInteropCtrl = new HydroLossCurveInteropCtrl();
+ _lossCurveInteropCtrl.Dock = DockStyle.Fill;
+ _lossCurveInteropCtrl.HydroClickEvent += (code) =>
{
var visual = GetVisual(code);
SelectVisual(visual, eSimulationVisualSource.None);
};
+ _lossCurveInteropCtrl.HydroSpecialDisplayEvent += (list) =>
+ {
+ _bimfaceCtrl?.SetLogicOutlineGlowEffect(list);
+ };
+ _lossCurveInteropCtrl.HydroCancelSpecialDisplayEvent += () =>
+ {
+ _bimfaceCtrl?.RemoveLogicOutlineGlowEffect();
+ };
}
- return _singleWorkingLossCurveCtrl;
+ return _lossCurveInteropCtrl;
}
- //鍗曞伐鍐垫崯澶辨洸绾挎帶浠舵槸鍚﹀彲瑙�
- private bool IsSingleWorkingLossCurveCtrlVisible
+ //鎹熷け鏇茬嚎鎺т欢鏄惁鍙
+ private bool IsLossCurveInteropCtrlVisible
{
get
{
@@ -2937,7 +3362,7 @@
{
if (this.controlContainerBottom.Controls.Count > 0)
{
- if (this.controlContainerBottom.Controls[0] is HydroSingleWorkingLossCurveCtrl)
+ if (this.controlContainerBottom.Controls[0] is HydroLossCurveInteropCtrl)
{
return true;
}
@@ -2947,43 +3372,43 @@
}
}
- //鏄剧ず鍗曞伐鍐垫崯澶辨洸绾挎帶浠�
- private void ShowSingleWorkingLossCurveCtrl(Yw.Model.HydroModelInfo hydroInfo, HydroCalcuResult calcuResult, HydroVisualInfo visual)
+ //鏄剧ず鎹熷け鏇茬嚎鎺т欢
+ private void ShowLossCurveInteropCtrl
+ (
+ Yw.Model.HydroModelInfo hydroInfo,
+ HydroWorkingVmo working,
+ HydroNodeInfo node,
+ HydroCalcuResult calcuResult = null,
+ bool isHead = false,
+ List<HydroEvaluationVmo> allEvaluationList = null
+ )
{
- var singleWorkingLossCurveCtrl = GetSingleWorkingLossCurveCtrl();
- if (!IsSingleWorkingLossCurveCtrlVisible)
+ var ctrl = GetLossCurveInteropCtrl();
+ if (!IsLossCurveInteropCtrlVisible)
{
this.controlContainerBottom.Controls.Clear();
- this.controlContainerBottom.Controls.Add(singleWorkingLossCurveCtrl);
+ this.controlContainerBottom.Controls.Add(ctrl);
this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
this.docPnlBottom.Text = "鎹熷け鏇茬嚎";
this.docPnlBottom.Height = 350;
}
- singleWorkingLossCurveCtrl.SetBindingData(hydroInfo, calcuResult, visual);
+ ctrl.SetBindingData(hydroInfo, working, node, calcuResult, isHead, allEvaluationList);
}
//鎹熷け鏇茬嚎
- private void barBtnWorkingLossCurve_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ private async void barBtnLossCurve_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
- if (_visual == null)
+ var node = GetSelectNode();
+ if (node == null)
{
- SelectInputSource();
- if (_visual == null)
- {
- TipFormHelper.ShowWarn("璇烽�夋嫨鏋勪欢鍚庨噸璇曪紒");
- return;
- }
- }
- HydroVisualInfo visual = _visual;
- if (_visual is HydroLinkInfo linkInfo)
- {
- var visualListHelper = GetVisualListHelper();
- visual = visualListHelper.GetVisual(linkInfo.StartCode);
+ return;
}
- var workingCheckedListHelper = GetWorkingCheckedListHelper();
- var allCheckedWorkingList = workingCheckedListHelper.GetCheckedWorkingList();
- if (allCheckedWorkingList == null || allCheckedWorkingList.Count < 1)
+ var isHead = _calcuPressModeIsHead;
+ var allEvaluationList = await GetEvaluationList();
+
+ var workingList = GetCheckedWorkingList();
+ if (workingList == null || workingList.Count < 1)
{
var workingHelper = GetWorkingHelper();
if (!workingHelper.Initialized)
@@ -2991,21 +3416,16 @@
TipFormHelper.ShowWarn("璇疯绠楀悗閲嶈瘯锛�");
return;
}
- ShowSingleWorkingLossCurveCtrl(workingHelper.HydroInfo, workingHelper.CalcuResult, visual);
+ ShowLossCurveInteropCtrl(workingHelper.HydroInfo, workingHelper.Working, node, workingHelper.CalcuResult, isHead, allEvaluationList);
+ return;
}
- else
- {
- var dlg = new HydroMultiWorkingLossCurveDlg();
- dlg.HydroClickEvent += (code) =>
- {
- SelectVisual(code, eSimulationVisualSource.None);
- };
- dlg.SetBindingData(_hydroInfo, allCheckedWorkingList, visual);
- dlg.ShowDialog();
- }
+
+ var dlg = new HydroLossCurveMultiWorkingDlg();
+ dlg.SetBindingData(_hydroInfo, workingList, node, _calcuPressModeIsHead, allEvaluationList);
+ dlg.ShowDialog();
}
- #endregion 鎹熷け鏇茬嚎
+ #endregion
#region 鏂规绠＄悊
@@ -3081,5 +3501,10 @@
}
#endregion 鏂规绠＄悊
+
+
+
+
+
}
}
\ No newline at end of file
--
Gitblit v1.9.3