From 217c17853daef559040a66aced4a613c4308e4ca Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期三, 23 十月 2024 13:04:23 +0800
Subject: [PATCH] 曲线并联
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs | 40 ++++++++++++++++++++++++----------------
1 files changed, 24 insertions(+), 16 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 66c2bcd..56bc317 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,5 +1,6 @@
锘縢lobal using Yw.EPAnet;
using DevExpress.Mvvm.Native;
+using HStation.WinFrmUI.PhartRelation;
using Yw.WinFrmUI.Bimface;
using Yw.WinFrmUI.Hydro;
@@ -692,14 +693,14 @@
//{
// return;
//}
- var pumps = _hydroInfo.Pumps?.Where(x => x.LinkStatus == Yw.Hydro.LinkStatus.Open).ToList();
-
+ //var pumps = _hydroInfo.Pumps?.Where(x => x.LinkStatus == Yw.Hydro.LinkStatus.Open).ToList();
+ var pumps = _hydroInfo.Pumps;
var curve_list = _hydroInfo.Curves;
if (curve_list == null || !curve_list.Any())
{
return;
}
- var vmList = new List<Yw.WinFrmUI.Phart.PumpSerialParallelViewModel>();
+ var vmList = new List<XhsSinglePumpViewModel>();
foreach (var x in pumps)
{
if (!x.RatedN.HasValue)
@@ -718,26 +719,33 @@
var rated_speed = x.RatedN.Value;
var speed_ratio = x.SpeedRatio;
- var qh_pt_list = qh.Select(x => new Yw.Geometry.Point2d(x.X, x.Y)).ToList();
- var qe_pt_list = qe?.Select(x => new Yw.Geometry.Point2d(x.X, x.Y)).ToList();
- var qp_pt_list = qp?.Select(x => new Yw.Geometry.Point2d(x.X, x.Y)).ToList();
+ var qh_pt_list = qh.Select(x => new XhsSplinePointViewModel(x.X, x.Y)).ToList();
+ var qe_pt_list = qe?.Select(x => new XhsSplinePointViewModel(x.X, x.Y)).ToList();
+ var qp_pt_list = qp?.Select(x => new XhsSplinePointViewModel(x.X, x.Y)).ToList();
- var vm = new Yw.WinFrmUI.Phart.PumpSerialParallelViewModel();
- vm.Id = x.Code;
+ var vm = new XhsSinglePumpViewModel();
+ vm.ID = x.ID;
vm.Name = x.Name;
- //vm.IsBp = ;
+ vm.ID = x.ID;
+ vm.Name = x.Name;
+ vm.Code = x.Code;
+ //vm.IsBp = x.IsBp;
+ vm.RunStatus = x.LinkStatus == Yw.Hydro.LinkStatus.Open;
+ vm.RatedHz = x.RatedHz;
+ vm.CurrentHz = x.RatedHz;
vm.RatedSpeed = rated_speed;
- vm.CurrentSpeed = Math.Round(rated_speed * speed_ratio);
- vm.CurrentHz = Math.Round(vm.CurrentSpeed / vm.RatedSpeed * 50, 1);
+ vm.CurrentSpeed = rated_speed;
+ vm.CurveQH = qh_pt_list;
+ vm.CurveQE = qe_pt_list;
+ vm.CurveQP = qp_pt_list;
+ //vm.CalcuQ = x.c;
+ //vm.CalcuH = x.CalcuH;
- vm.Qh = new Yw.Geometry.CubicSpline2d(qh_pt_list);
- vm.Qe = new Yw.Geometry.CubicSpline2d(qe_pt_list);
- vm.Qp = new Yw.Geometry.CubicSpline2d(qp_pt_list);
vmList.Add(vm);
}
- var dlg = new HStation.WinFrmUI.PhartRelation.PumpSerialParallelChartDlg();
- dlg.SetBindingData(vmList, null, true);
+ var dlg = new HStation.WinFrmUI.PhartRelation.PumpParallelChartDlg();
+ dlg.SetBindingData(vmList);
dlg.ShowDialog();
}
--
Gitblit v1.9.3