From 819d81bf994c10c8cd0252ebb8c6660eb4c82166 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期六, 12 十月 2024 17:47:59 +0800
Subject: [PATCH] 曲线

---
 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs |   31 +++++++++++++++++++++----------
 1 files changed, 21 insertions(+), 10 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 09c0c58..3e572b7 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
@@ -5,6 +5,7 @@
 using NPOI.SS.Formula.Functions;
 using Yw.WinFrmUI.HydroL2d;
 using Yw.WinFrmUI.HydroL3d;
+using static DevExpress.Utils.Drawing.Helpers.NativeMethods;
 
 namespace HStation.WinFrmUI
 {
@@ -496,17 +497,27 @@
                 return;
             }
             var pumps = _hydroInfo.Pumps;
-            var vmList = pumps.Select(x => new HStation.WinFrmUI.PhartRelation.Perform2dMultiViewModel()
+            var vmList = new List<Yw.WinFrmUI.Phart.PumpSerialParallelViewModel>();
+            foreach (var x in pumps)
             {
-                Id = x.Code,
-                Name = x.Code,
-                SpeedRatio = x.SpeedRatio ?? 1,
-                PointsQH = _hydroInfo.Curves?.Find(t => t.Code == x.CurveQH)?.CurveData?.Select(z => new PhartRelation.PerformPoint2dViewModel() { X = z.X, Y = z.Y }).ToList(),
-                PointsQP = _hydroInfo.Curves?.Find(t => t.Code == x.CurveQP)?.CurveData?.Select(z => new PhartRelation.PerformPoint2dViewModel() { X = z.X, Y = z.Y }).ToList(),
-                PointsQE = _hydroInfo.Curves?.Find(t => t.Code == x.CurveQE)?.CurveData?.Select(z => new PhartRelation.PerformPoint2dViewModel() { X = z.X, Y = z.Y }).ToList(),
-            }).ToList();
-            var dlg = new HStation.WinFrmUI.PhartRelation.PumpPerform2dMultiViewDlg();
-            dlg.SetBindingData(vmList,null, false, true);
+                var vm = new Yw.WinFrmUI.Phart.PumpSerialParallelViewModel();
+                vm.Id = x.Code;
+                vm.Name = x.Code;
+                //vm.IsBp = ;
+                vm.RatedSpeed = 590;
+                vm.CurrentSpeed = 590;
+                vm.CurrentHz = 50;
+                var PointsQH = _hydroInfo.Curves?.Find(t => t.Code == x.CurveQH)?.CurveData?.Select(z => new Yw.Geometry.Point2d() { X = z.X, Y = z.Y }).ToList();
+                var PointsQP = _hydroInfo.Curves?.Find(t => t.Code == x.CurveQP)?.CurveData?.Select(z => new Yw.Geometry.Point2d { X = z.X, Y = z.Y }).ToList();
+                var PointsQE = _hydroInfo.Curves?.Find(t => t.Code == x.CurveQE)?.CurveData?.Select(z => new Yw.Geometry.Point2d { X = z.X, Y = z.Y }).ToList();
+
+                vm.Qh = new Yw.Geometry.CubicSpline2d(PointsQH);
+                vm.Qe = new Yw.Geometry.CubicSpline2d(PointsQE);
+                vm.Qp = new Yw.Geometry.CubicSpline2d(PointsQP);
+                vmList.Add(vm);
+            } 
+            var dlg = new HStation.WinFrmUI.PhartRelation.PumpSerialParallelChartDlg();
+            dlg.SetBindingData(vmList, null, true);
             dlg.ShowDialog();
         }
 

--
Gitblit v1.9.3