From 54b0925cde5f2246ad59529f82a74753139eb104 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 02 十二月 2024 21:59:58 +0800
Subject: [PATCH] 完善性能曲线
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs | 130 ++++++++++++++++++++----------------------
1 files changed, 62 insertions(+), 68 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 2962264..5353bc2 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
@@ -2020,12 +2020,37 @@
#region 姘存车鍒楄〃
//鎬ц兘鏇茬嚎
- private void barBtnPumpCurve_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ private void PumpFeat()
{
-
+ if (_hydroInfo == null)
+ {
+ return;
+ }
+ var pumps = _hydroInfo.Pumps;
+ if (pumps == null || pumps.Count < 1)
+ {
+ XtraMessageBox.Show("鏃犳按娉典俊鎭�");
+ return;
+ }
+ var dlg = new SimulationPumpFeatDlg();
+ dlg.SaveEvent += async (list) =>
+ {
+ pumps.ForEach(x => x.UpdateWorkingInfo(list));
+ var visualVmListHelper = GetVisualVmListHelper();
+ visualVmListHelper.UpdateProperty(pumps.Select(x => x as Yw.Model.HydroVisualInfo).ToList());
+ SelectVisual(_visual, eVisualSource.None);
+ var gradingHelper = await GetGradingHelper();
+ gradingHelper.Set();
+ };
+ dlg.SetBindingData(_hydroInfo);
+ dlg.ShowDialog();
}
- #region 骞惰仈妯℃嫙
+ //鎬ц兘鏇茬嚎
+ private void barBtnPumpCurve_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ {
+ PumpFeat();
+ }
//骞惰仈妯℃嫙
private void PumpParallel()
@@ -2040,71 +2065,34 @@
XtraMessageBox.Show("鏃犳按娉典俊鎭�");
return;
}
- var vmList = new List<XhsSinglePumpViewModel>();
- foreach (var pump in pumps)
- {
- if (!pump.RatedN.HasValue)
- {
- continue;
- }
- var qh = _hydroInfo.Curves?.Find(t => t.Code == pump.CurveQH)?.CurveData;
- var qe = _hydroInfo.Curves?.Find(t => t.Code == pump.CurveQE)?.CurveData;
- var qp = _hydroInfo.Curves?.Find(t => t.Code == pump.CurveQP)?.CurveData;
- if (qh == null)
- {
- continue;
- }
-
- var qhPtList = qh.Select(x => new XhsSplinePointViewModel(x.X, x.Y)).ToList();
- var qePtList = qe?.Select(x => new XhsSplinePointViewModel(x.X, x.Y)).ToList();
- var qpPtList = qp?.Select(x => new XhsSplinePointViewModel(x.X, x.Y)).ToList();
-
- var vm = new XhsSinglePumpViewModel();
- vmList.Add(vm);
- vm.ID = pump.ID;
- vm.Name = pump.Name;
- vm.Code = pump.Code;
- vm.IsBp = true;
- vm.RunStatus = pump.LinkStatus == Yw.Hydro.LinkStatus.Open;
- vm.RatedHz = pump.RatedHz;
- vm.CurrentHz = Math.Round(pump.RatedHz * pump.SpeedRatio, 1);
- vm.RatedSpeed = pump.RatedN.Value;
- vm.CurrentSpeed = Math.Round(pump.RatedN.Value * pump.SpeedRatio, 1);
- vm.CurveQH = qhPtList;
- vm.CurveQE = qePtList;
- vm.CurveQP = qpPtList;
-
- }
-
- var dlg = new PumpParallelAnalyDlg();
- dlg.SetBindingData(vmList);
- dlg.ReloadDataEvent += (list) =>
+ var dlg = new SimulationPumpParallelDlg();
+ dlg.SaveEvent += async (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;
+ pump.LinkStatus = x.LinkStatus;
+ pump.SpeedRatio = x.SpeedRatio;
}
});
- var codes = list?.Select(x => x.Code).ToList();
- //UpdateVisualViewModelProperty(codes);
- //ShowSelectedProperty();
- UpdateVisualListCtrl();
- return true;
+ var visualVmListHelper = GetVisualVmListHelper();
+ visualVmListHelper.UpdateProperty(pumps.Select(x => x as Yw.Model.HydroVisualInfo).ToList());
+ SelectVisual(_visual, eVisualSource.None);
+ var gradingHelper = await GetGradingHelper();
+ gradingHelper.Set();
};
+ dlg.SetBindingData(_hydroInfo);
dlg.ShowDialog();
}
//骞惰仈妯℃嫙
private void barBtnPumpParallel_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
+
PumpParallel();
}
-
- #endregion
#endregion
@@ -2177,6 +2165,12 @@
var visualVmListHelper = GetVisualVmListHelper();
visualVmListHelper.UpdateCalcuProperty(calcuResult);
+
+ #endregion
+
+ #region 褰撳墠鏋勪欢
+
+ SelectVisual(_visual, eVisualSource.Calcu);
#endregion
@@ -2400,23 +2394,23 @@
}
- 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();
}
//鑳芥晥鍒嗘瀽
--
Gitblit v1.9.3