From 4bb44a9c6b32cf299f3103f66d720992ec4a89a2 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 17 二月 2025 21:07:49 +0800
Subject: [PATCH] 增加精度分析

---
 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/11-pump/03-analy/SimulationSingleWorkingPumpAnalyCtrl.cs |  113 +-------------------------------------------------------
 1 files changed, 2 insertions(+), 111 deletions(-)

diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/11-pump/03-analy/SimulationSingleWorkingPumpAnalyCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/11-pump/03-analy/SimulationSingleWorkingPumpAnalyCtrl.cs
index 71a6956..eb7df11 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/11-pump/03-analy/SimulationSingleWorkingPumpAnalyCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/11-pump/03-analy/SimulationSingleWorkingPumpAnalyCtrl.cs
@@ -1,18 +1,4 @@
-锘縰sing DevExpress.XtraEditors;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using Yw.Geometry;
-using Yw.Pump;
-using Yw.WinFrmUI.Phart;
-
-namespace HStation.WinFrmUI
+锘縩amespace HStation.WinFrmUI
 {
     public partial class SimulationSingleWorkingPumpAnalyCtrl : DevExpress.XtraEditors.XtraUserControl
     {
@@ -52,105 +38,10 @@
             {
                 return;
             }
-            var vm = CreateViewModel(pump);
-            this.pumpVariableSpeedViewChart1.SetBindingData(vm);
-            this.pumpVariableSpeedViewChart1.SetDesignPoint(70,80);
+            this.simulationPumpAnalyChartCtrl1.SetBindingData(_hydroInfo, pump, _allCalcuResultVisualDict);
         }
 
-        //鍒涘缓
-        private PumpVariableSpeedViewViewModel CreateViewModel(Yw.Model.HydroPumpInfo pump)
-        {
-            if (_hydroInfo == null)
-            {
-                return default;
-            }
-            var vm = new PumpVariableSpeedViewViewModel();
-            vm.Id = pump.Code;
-            vm.Name = pump.Name;
-            vm.CurveName = $"棰濆畾鏇茬嚎({pump.RatedHz}hz)";
-            vm.RatedQ = pump.RatedQ.HasValue ? pump.RatedQ.Value : 0;
-            vm.RatedH = pump.RatedH.HasValue ? pump.RatedH.Value : 0;
-            vm.RatedP = pump.RatedP;
-            vm.RatedN = pump.RatedN.HasValue ? pump.RatedN.Value : 0;
-            vm.RatedHz = pump.RatedHz;
 
-            var curveqh = _hydroInfo.Curves?.Find(x => x.Code == pump.CurveQH);
-            if (curveqh != null)
-            {
-                var qh_pts = curveqh.CurveData?.Select(x => new Yw.Geometry.Point2d(x.X, x.Y)).ToList();
-                if (qh_pts != null && qh_pts.Count > 3)
-                {
-                    vm.CurveQH = new CubicSpline2d(qh_pts);
-                }
-            }
-
-            var curveqp = _hydroInfo.Curves?.Find(x => x.Code == pump.CurveQP);
-            if (curveqp != null)
-            {
-                var qp_pts = curveqp.CurveData?.Select(x => new Yw.Geometry.Point2d(x.X, x.Y)).ToList();
-                if (qp_pts != null && qp_pts.Count > 3)
-                {
-                    vm.CurveQP = new CubicSpline2d(qp_pts);
-                }
-            }
-
-            var curveqe = _hydroInfo.Curves?.Find(x => x.Code == pump.CurveQE);
-            if (curveqe != null)
-            {
-                var qepts = curveqe.CurveData?.Select(x => new Yw.Geometry.Point2d(x.X, x.Y)).ToList();
-                if (qepts != null && qepts.Count > 3)
-                {
-                    vm.CurveQE = new CubicSpline2d(qepts);
-                }
-            }
-
-            if (pump.LinkStatus == Yw.Hydro.PumpStatus.Open)
-            {
-                vm.Items = new List<PumpVariableSpeedViewItemViewModel>();
-                var vmItem = new PumpVariableSpeedViewItemViewModel();
-                vm.Items.Add(vmItem);
-                vmItem.Id = string.Empty;
-                vmItem.Name = "杩愯";
-                vmItem.Hz = Math.Round(pump.RatedHz * pump.SpeedRatio, 1);
-                if (pump.RatedN.HasValue)
-                {
-                    vmItem.N = Math.Round(pump.RatedN.Value * pump.SpeedRatio, 1);
-                }
-                var calcuResult = _allCalcuResultVisualDict?.GetValue(pump.Code) as HydroCalcuPumpResult;
-                if (calcuResult != null)
-                {
-                    vmItem.Q = calcuResult.CalcuQ ?? 0;
-                    vmItem.H = calcuResult.CalcuH ?? 0;
-                    vmItem.P = calcuResult.CalcuP;
-                    vmItem.E = calcuResult.CalcuE;
-                }
-                vmItem.CurveName = $"杩愯鏇茬嚎({vmItem.Hz}hz)";
-
-                if (vm.CurveQH != null)
-                {
-                    var qh_pts = vm.CurveQH.GetPointList(20);
-                    var qh_run_pts = qh_pts.GetQHPointListByN(vm.RatedHz, vmItem.Hz);
-                    vmItem.CurveQH = new CubicSpline2d(qh_run_pts);
-                }
-
-                if (vm.CurveQP != null)
-                {
-                    var qp_pts = vm.CurveQP.GetPointList(20);
-                    var qp_run_pts = qp_pts.GetQPPointListByN(vm.RatedHz, vmItem.Hz);
-                    vmItem.CurveQP = new CubicSpline2d(qp_run_pts);
-                }
-
-                if (vm.CurveQE != null)
-                {
-                    var qe_pts = vm.CurveQE.GetPointList(20);
-                    var qe_run_pts = qe_pts.GetQEPointListByN(vm.RatedHz, vmItem.Hz);
-                    vmItem.CurveQE = new CubicSpline2d(qe_run_pts);
-                }
-
-            }
-
-            return vm;
-        }
 
     }
 }

--
Gitblit v1.9.3