From 146ca8c7eefe74d3b73c00a73e99e94e903be401 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期四, 06 二月 2025 15:04:21 +0800
Subject: [PATCH] 增加工况管理功能和计算结果自由压力与绝对压力切换
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs | 455 ++++++++++++++++++++++++++++++--------------------------
1 files changed, 244 insertions(+), 211 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 895ddb0..eadd199 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,21 +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.Office.Utils;
-using DevExpress.Utils.MVVM;
-using DevExpress.Xpo.Helpers;
-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
{
@@ -30,25 +20,50 @@
RegistBulkSetEvents();
}
- /// <summary>
- /// 鏂板宸ュ喌浜嬩欢
- /// </summary>
- public event Action<HydroWorkingVmo> AppendWorkingEvent;
+
+
+ #region 妯″瀷浜嬩欢
/// <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;//椤圭洰绔�
@@ -389,11 +404,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) =>
{
@@ -459,14 +475,6 @@
//鍒ゆ柇褰撳墠鏄惁鏈夊垎绾у睍绀猴紝鑻ユ湁鍒欐洿鏂板垎绾э紝鏈�濂芥槸鏇存柊鍗曚釜鍒嗙骇
var gradingHelper = await GetGradingHelper();
gradingHelper.Set(visual);
- };
- _propertyCtrl.ParterChangedEvent += (parter, changeType) =>
- {
- if (parter == null)
- {
- return;
- }
- AppendChangeParter(parter, changeType);
};
}
return _propertyCtrl;
@@ -692,7 +700,7 @@
return helper.GetSourceList();
}
- #endregion 鍙鍒楄〃
+ #endregion
#region 瑙嗗浘鍒楄〃
@@ -729,7 +737,7 @@
return helper.GetVisual(code);
}
- #endregion 瑙嗗浘鍒楄〃
+ #endregion
#region 鏄庣粏鎺т欢
@@ -750,10 +758,6 @@
_visualListCtrl.HydroChangedInfoEvent += (visualList) =>
{
SelectVisual(_visual, eSimulationVisualSource.List);
- };
- _visualListCtrl.ParterChangedEvent += (parter, changeType) =>
- {
- AppendChangeParter(parter, changeType);
};
}
return _visualListCtrl;
@@ -779,7 +783,7 @@
}
//鏄剧ず鏋勪欢鏄庣粏鎺т欢
- private void ShowVisualListCtrl()
+ private async void ShowVisualListCtrl()
{
if (_hydroInfo == null)
{
@@ -795,8 +799,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)
{
@@ -833,7 +839,7 @@
ShowVisualListCtrl();
}
- #endregion 鏄庣粏鎺т欢
+ #endregion
#region 鏋勪欢鏄剧ず
@@ -948,38 +954,62 @@
{
if (_isSaving)
{
- TipFormHelper.ShowWarn("姝ｅ湪淇濆瓨锛岃绋嶅悗閲嶈瘯锛�");
+ this.FindForm().ShowAlertInfo("淇濆瓨", "姝ｅ湪淇濆瓨锛岃绋嶅悗閲嶈瘯锛�");
return;
}
}
_isSaving = true;
- var addParterList = GetAddParterList();
- var updateParterList = GetUpdateParterList();
- var removeParters = GetRemoveParters();
+ var changeHelper = GetChangeHelper();
- this.FindForm().ShowAlertInfo("姘村姏淇℃伅淇濆瓨", "姝ｅ湪鏇存柊姘村姏淇℃伅锛�");
+ 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)
{
- this.FindForm().ShowAlertInfo("姘村姏淇℃伅淇濆瓨", "姘村姏淇℃伅鏇存柊澶辫触锛�");
+ WaitFormHelper.HideWaitForm();
+ TipFormHelper.ShowError("姘村姏淇℃伅鏇存柊澶辫触锛�");
+ _isSaving = false;
return;
}
- this.FindForm().ShowAlertInfo("姘村姏淇℃伅淇濆瓨", "姘村姏淇℃伅鏇存柊鎴愬姛锛�");
+ changeHelper.Reset();
- this.FindForm().ShowAlertInfo("姘村姏淇℃伅淇濆瓨", "姝ｅ湪淇濆瓨灞炴�х姸鎬侊紒");
- var propStatusDbList = await GetPropStatusDbList();
- bol = await BLLFactory<Yw.BLL.HydroParterPropStatusInfo>.Instance.Save(_hydroInfo.ID, propStatusDbList);
- if (bol)
+ var propStatusHelper = await GetPropStatusHelper();
+ var updatePropStatusList = propStatusHelper.GetUpdatePropStatusDbList();
+ if (updatePropStatusList != null && updatePropStatusList.Count > 0)
{
- this.FindForm().ShowAlertInfo("姘村姏淇℃伅淇濆瓨", "灞炴�х姸鎬佷繚瀛樻垚鍔燂紒");
+ bol = await BLLFactory<Yw.BLL.HydroParterPropStatusInfo>.Instance.Update(_hydroInfo.ID, updatePropStatusList);
+ if (!bol)
+ {
+ WaitFormHelper.HideWaitForm();
+ TipFormHelper.ShowWarn("灞炴�х姸鎬佹洿鏂板け璐ワ紒");
+ _isSaving = false;
+ return;
+ }
}
- else
- {
- this.FindForm().ShowAlertInfo("姘村姏淇℃伅淇濆瓨", "灞炴�х姸鎬佷繚瀛樺け璐ワ紒");
- }
+ propStatusHelper.Reset();
+
+ WaitFormHelper.HideWaitForm();
+ TipFormHelper.ShowSucceed("淇濆瓨鎴愬姛锛�");
_isSaving = false;
//Stopwatch sw = new Stopwatch();
@@ -998,11 +1028,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);
@@ -1011,19 +1043,17 @@
{
SelectVisual(visuals?.FirstOrDefault(), eSimulationVisualSource.Set);
UpdateVisualListCtrl();
- };
- dlg.ParterChangedEvent += (parter, changeType) =>
- {
- AppendChangeParter(parter, changeType);
};
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);
@@ -1032,19 +1062,17 @@
{
SelectVisual(visuals?.FirstOrDefault(), eSimulationVisualSource.Set);
UpdateVisualListCtrl();
- };
- dlg.ParterChangedEvent += (parter, changeType) =>
- {
- AppendChangeParter(parter, changeType);
};
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);
@@ -1053,19 +1081,17 @@
{
SelectVisual(visuals?.FirstOrDefault(), eSimulationVisualSource.Set);
UpdateVisualListCtrl();
- };
- dlg.ParterChangedEvent += (parter, changeType) =>
- {
- AppendChangeParter(parter, changeType);
};
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);
@@ -1074,19 +1100,17 @@
{
SelectVisual(visuals?.FirstOrDefault(), eSimulationVisualSource.Set);
UpdateVisualListCtrl();
- };
- dlg.ParterChangedEvent += (parter, changeType) =>
- {
- AppendChangeParter(parter, changeType);
};
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);
@@ -1095,19 +1119,17 @@
{
SelectVisual(visuals?.FirstOrDefault(), eSimulationVisualSource.Set);
UpdateVisualListCtrl();
- };
- dlg.ParterChangedEvent += (parter, changeType) =>
- {
- AppendChangeParter(parter, changeType);
};
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);
@@ -1116,19 +1138,17 @@
{
SelectVisual(visuals?.FirstOrDefault(), eSimulationVisualSource.Set);
UpdateVisualListCtrl();
- };
- dlg.ParterChangedEvent += (parter, changeType) =>
- {
- AppendChangeParter(parter, changeType);
};
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);
@@ -1137,19 +1157,17 @@
{
SelectVisual(visuals?.FirstOrDefault(), eSimulationVisualSource.Set);
UpdateVisualListCtrl();
- };
- dlg.ParterChangedEvent += (parter, changeType) =>
- {
- AppendChangeParter(parter, changeType);
};
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);
@@ -1158,19 +1176,17 @@
{
SelectVisual(visuals?.FirstOrDefault(), eSimulationVisualSource.Set);
UpdateVisualListCtrl();
- };
- dlg.ParterChangedEvent += (parter, changeType) =>
- {
- AppendChangeParter(parter, changeType);
};
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);
@@ -1179,19 +1195,17 @@
{
SelectVisual(visuals?.FirstOrDefault(), eSimulationVisualSource.Set);
UpdateVisualListCtrl();
- };
- dlg.ParterChangedEvent += (parter, changeType) =>
- {
- AppendChangeParter(parter, changeType);
};
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);
@@ -1200,19 +1214,17 @@
{
SelectVisual(visuals?.FirstOrDefault(), eSimulationVisualSource.Set);
UpdateVisualListCtrl();
- };
- dlg.ParterChangedEvent += (parter, changeType) =>
- {
- AppendChangeParter(parter, changeType);
};
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);
@@ -1221,19 +1233,17 @@
{
SelectVisual(visuals?.FirstOrDefault(), eSimulationVisualSource.Set);
UpdateVisualListCtrl();
- };
- dlg.ParterChangedEvent += (parter, changeType) =>
- {
- AppendChangeParter(parter, changeType);
};
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);
@@ -1242,19 +1252,17 @@
{
SelectVisual(visuals?.FirstOrDefault(), eSimulationVisualSource.Set);
UpdateVisualListCtrl();
- };
- dlg.ParterChangedEvent += (parter, changeType) =>
- {
- AppendChangeParter(parter, changeType);
};
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);
@@ -1263,19 +1271,17 @@
{
SelectVisual(visuals?.FirstOrDefault(), eSimulationVisualSource.Set);
UpdateVisualListCtrl();
- };
- dlg.ParterChangedEvent += (parter, changeType) =>
- {
- AppendChangeParter(parter, changeType);
};
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);
@@ -1284,19 +1290,17 @@
{
SelectVisual(visuals?.FirstOrDefault(), eSimulationVisualSource.Set);
UpdateVisualListCtrl();
- };
- dlg.ParterChangedEvent += (parter, changeType) =>
- {
- AppendChangeParter(parter, changeType);
};
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);
@@ -1305,19 +1309,17 @@
{
SelectVisual(visuals?.FirstOrDefault(), eSimulationVisualSource.Set);
UpdateVisualListCtrl();
- };
- dlg.ParterChangedEvent += (parter, changeType) =>
- {
- AppendChangeParter(parter, changeType);
};
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);
@@ -1326,19 +1328,17 @@
{
SelectVisual(visuals?.FirstOrDefault(), eSimulationVisualSource.Set);
UpdateVisualListCtrl();
- };
- dlg.ParterChangedEvent += (parter, changeType) =>
- {
- AppendChangeParter(parter, changeType);
};
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);
@@ -1347,19 +1347,17 @@
{
SelectVisual(visuals?.FirstOrDefault(), eSimulationVisualSource.Set);
UpdateVisualListCtrl();
- };
- dlg.ParterChangedEvent += (parter, changeType) =>
- {
- AppendChangeParter(parter, changeType);
};
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);
@@ -1368,19 +1366,17 @@
{
SelectVisual(visuals?.FirstOrDefault(), eSimulationVisualSource.Set);
UpdateVisualListCtrl();
- };
- dlg.ParterChangedEvent += (parter, changeType) =>
- {
- AppendChangeParter(parter, changeType);
};
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);
@@ -1389,10 +1385,6 @@
{
SelectVisual(visuals?.FirstOrDefault(), eSimulationVisualSource.Set);
UpdateVisualListCtrl();
- };
- dlg.ParterChangedEvent += (parter, changeType) =>
- {
- AppendChangeParter(parter, changeType);
};
dlg.ShowDialog();
};
@@ -1866,39 +1858,6 @@
}
#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
#region 鐩戞祴鐐�
@@ -2535,6 +2494,25 @@
#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 姘村姏璁＄畻
//璁＄畻
@@ -2586,7 +2564,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)
@@ -2647,7 +2625,7 @@
Calcu();
}
- #endregion 姘村姏璁＄畻
+ #endregion
#region 瀵煎嚭鎶ュ憡
@@ -2689,7 +2667,7 @@
dlg.ShowDialog();
}
- #endregion 瀵煎嚭鎶ュ憡
+ #endregion
#region 褰撳墠宸ュ喌
@@ -2754,7 +2732,7 @@
AddWorking();
}
- #endregion 褰撳墠宸ュ喌
+ #endregion
#region 閫夋嫨宸ュ喌
@@ -2766,11 +2744,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();
}
//鑾峰彇宸ュ喌鍒楄〃
@@ -2808,7 +2792,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 鐩戞祴鍒嗘瀽
@@ -2893,7 +2914,7 @@
ShowMonitorAnalyListCtrl();
}
- #endregion 鐩戞祴鍒嗘瀽
+ #endregion
#region 宸ュ喌鍒嗘瀽
@@ -3073,19 +3094,27 @@
#region 鎹熷け鏇茬嚎
//鍗曞伐鍐垫崯澶辨洸绾挎帶浠�
- private HydroSingleWorkingLossCurveCtrl _singleWorkingLossCurveCtrl = null;
+ private HydroSingleWorkingLossCurveInteropCtrl _singleWorkingLossCurveCtrl = null;
//鑾峰彇鍗曞伐鍐垫崯澶辨洸绾挎帶浠�
- private HydroSingleWorkingLossCurveCtrl GetSingleWorkingLossCurveCtrl()
+ private HydroSingleWorkingLossCurveInteropCtrl GetSingleWorkingLossCurveCtrl()
{
if (_singleWorkingLossCurveCtrl == null)
{
- _singleWorkingLossCurveCtrl = new HydroSingleWorkingLossCurveCtrl();
+ _singleWorkingLossCurveCtrl = new HydroSingleWorkingLossCurveInteropCtrl();
_singleWorkingLossCurveCtrl.Dock = DockStyle.Fill;
_singleWorkingLossCurveCtrl.HydroClickEvent += (code) =>
{
var visual = GetVisual(code);
SelectVisual(visual, eSimulationVisualSource.None);
+ };
+ _singleWorkingLossCurveCtrl.HydroSpecialDisplayEvent += (list) =>
+ {
+ _bimfaceCtrl?.SetLogicOutlineGlowEffect(list);
+ };
+ _singleWorkingLossCurveCtrl.HydroCancelSpecialDisplayEvent += () =>
+ {
+ _bimfaceCtrl?.RemoveLogicOutlineGlowEffect();
};
}
return _singleWorkingLossCurveCtrl;
@@ -3100,7 +3129,7 @@
{
if (this.controlContainerBottom.Controls.Count > 0)
{
- if (this.controlContainerBottom.Controls[0] is HydroSingleWorkingLossCurveCtrl)
+ if (this.controlContainerBottom.Controls[0] is HydroSingleWorkingLossCurveInteropCtrl)
{
return true;
}
@@ -3168,7 +3197,7 @@
}
}
- #endregion 鎹熷け鏇茬嚎
+ #endregion
#region 鏂规绠＄悊
@@ -3244,5 +3273,9 @@
}
#endregion 鏂规绠＄悊
+
+
+
+
}
}
\ No newline at end of file
--
Gitblit v1.9.3