From 571fb22bfd7ca4b0ca49328be3a3e91c0e3fed0d Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期五, 08 十一月 2024 14:37:24 +0800
Subject: [PATCH] 优化构件查询,并移到底层

---
 WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/99-common/PumpPerform2dViewDlg.cs |   28 +++++++++-------------------
 1 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/99-common/PumpPerform2dViewDlg.cs b/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/99-common/PumpPerform2dViewDlg.cs
index a2bbaa2..39144a6 100644
--- a/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/99-common/PumpPerform2dViewDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/99-common/PumpPerform2dViewDlg.cs
@@ -9,11 +9,10 @@
 
         /// <summary>
         /// 鍒濆鍖栨暟鎹�
-        /// </summary> 
-        public async void SetBindingData(long pump_main_id, long phart_diagram_id, double rpm_ratio , double? action_spot_q = null)
+        /// </summary>
+        public async void SetBindingData(long pump_main_id, long phart_diagram_id, double rpm_ratio, double? action_spot_q = null)
         {
-
-            var pump_main = await new BLL.PumpMain().GetByID(pump_main_id);
+            var pump_main = await new BLL.AssetsPumpMain().GetByID(pump_main_id);
             if (pump_main == null)
                 return;
             var phart_diagram = await new Yw.BLL.PhartDiagram().GetByID(phart_diagram_id);
@@ -37,35 +36,32 @@
 
             points_qh = PhartPerformCurveHelper.GetFeatPointList((HStation.PhartRelation.eGraphType)graph_qh.GraphType, graph_qh.GeometryInfo, 12, null);
             cubic_spline_qh = new Yw.Geometry.CubicSpline2d(points_qh);
-            cubic_spline_qh = Yw.WinFrmUI.Phart.PumpPerform2dCalcHelper.CalculateSimilarQH(cubic_spline_qh, 50, rpm_ratio*50);
+            cubic_spline_qh = Yw.WinFrmUI.Phart.PumpCalcHelper.CalculateSimilarQH(cubic_spline_qh, 50, rpm_ratio * 50);
             if (graph_qe != null)
             {
                 points_qe = PhartPerformCurveHelper.GetFeatPointList((HStation.PhartRelation.eGraphType)graph_qe.GraphType, graph_qe.GeometryInfo, 12, null);
                 cubic_spline_qe = new Yw.Geometry.CubicSpline2d(points_qe);
-                cubic_spline_qe = Yw.WinFrmUI.Phart.PumpPerform2dCalcHelper.CalculateSimilarQE(cubic_spline_qe, 50, rpm_ratio * 50);
-
+                cubic_spline_qe = Yw.WinFrmUI.Phart.PumpCalcHelper.CalculateSimilarQE(cubic_spline_qe, 50, rpm_ratio * 50);
             }
             if (graph_qp != null)
             {
                 points_qp = PhartPerformCurveHelper.GetFeatPointList((HStation.PhartRelation.eGraphType)graph_qp.GraphType, graph_qp.GeometryInfo, 12, null);
                 cubic_spline_qp = new Yw.Geometry.CubicSpline2d(points_qp);
-                cubic_spline_qp = Yw.WinFrmUI.Phart.PumpPerform2dCalcHelper.CalculateSimilarQP(cubic_spline_qp, 50, rpm_ratio * 50);
+                cubic_spline_qp = Yw.WinFrmUI.Phart.PumpCalcHelper.CalculateSimilarQP(cubic_spline_qp, 50, rpm_ratio * 50);
             }
-
 
             var disp_paras = phart_diagram.DispParas;
             var is_calc_disp_paras = string.IsNullOrWhiteSpace(disp_paras);
             this.xtrPerform2dChart1.SetBindingData(cubic_spline_qh, cubic_spline_qe, cubic_spline_qp, disp_paras, is_calc_disp_paras);
             if (action_spot_q.HasValue)
             {
-                this.xtrPerform2dChart1.CalcActionSpotByQ(action_spot_q.Value);
+                this.xtrPerform2dChart1.CalcDesignPointByQ(action_spot_q.Value);
             }
-
         }
 
         /// <summary>
         /// 鍒濆鍖栨暟鎹�
-        /// </summary> 
+        /// </summary>
         public void SetBindingData(
                                     Yw.Pump.CurveQH qh,
                                     Yw.Pump.CurveQE qe,
@@ -86,20 +82,14 @@
             this.xtrPerform2dChart1.SetBindingData(cubic_spline_qh, cubic_spline_qe, cubic_spline_qp);
         }
 
-
         /// <summary>
         /// 鍒濆鍖栨暟鎹�
-        /// </summary> 
+        /// </summary>
         public void SetBindingData(Yw.Geometry.CubicSpline2d cubic_spline_qh,
                                    Yw.Geometry.CubicSpline2d cubic_spline_qe,
                                    Yw.Geometry.CubicSpline2d cubic_spline_qp)
         {
-
             this.xtrPerform2dChart1.SetBindingData(cubic_spline_qh, cubic_spline_qe, cubic_spline_qp);
-
         }
-
-
-
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3