From 9f2651ab770df701134b217bafe41f62a60a1ebe Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期三, 27 十一月 2024 16:36:43 +0800
Subject: [PATCH] 方案

---
 WinFrmUI/Yw.WinFrmUI.Phart.Core/01-perform/01-pump-chart/01-chart/04-variable-speed/PumpVariableSpeedChart.cs |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/WinFrmUI/Yw.WinFrmUI.Phart.Core/01-perform/01-pump-chart/01-chart/04-variable-speed/PumpVariableSpeedChart.cs b/WinFrmUI/Yw.WinFrmUI.Phart.Core/01-perform/01-pump-chart/01-chart/04-variable-speed/PumpVariableSpeedChart.cs
index aa1d9b1..97dae31 100644
--- a/WinFrmUI/Yw.WinFrmUI.Phart.Core/01-perform/01-pump-chart/01-chart/04-variable-speed/PumpVariableSpeedChart.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Phart.Core/01-perform/01-pump-chart/01-chart/04-variable-speed/PumpVariableSpeedChart.cs
@@ -180,13 +180,15 @@
         }
         #endregion
 
+        private double _temp_head = 0;
+
         #region Add Set  Curve
 
         /// <summary>
         /// 娣诲姞鏇茬嚎
         /// </summary>
         /// <param name="vm_list"></param>
-        public void Add(List<PumpVariableSpeedInfoViewModel> vm_list, Yw.Geometry.Point2d design_pt)
+        public void Add(List<PumpVariableSpeedInfoViewModel> vm_list, Yw.Geometry.Point2d design_pt,double temp_head)
         {
             if (vm_list == null || !vm_list.Any())
                 return;
@@ -194,6 +196,7 @@
             _design_pt = design_pt;
             _initialData = true;
             _vm_list.AddRange(vm_list);
+            _temp_head = temp_head;
             UpdateChart(true);
         }
 
@@ -781,6 +784,7 @@
             series_qh_view.LineStyle.Thickness = 2;
             series_qh_view.Color = vm.Color;
             series_qh_view.EnableAntialiasing = DefaultBoolean.True;
+            series_qh_view.LineTensionPercent = 50;
 
             series_qh.SeriesPointsSorting = SortingMode.None;
             series_qh.SeriesPointsSortingKey = SeriesPointKey.Value_1;
@@ -821,7 +825,8 @@
             txt_qh.RuntimeMoving = true;
             txt_qh.RuntimeResizing = false;
             txt_qh.RuntimeRotation = false;
-            txt_qh.Text = LineNameShowHz ? vm.CurrentHz.ToString() : vm.CurrentSpeed.ToString(); ;
+            //txt_qh.Text = LineNameShowHz ? vm.CurrentHz.ToString() : vm.CurrentSpeed.ToString();
+            txt_qh.Text = $"{vm.CurrentSpeed}rpm({vm.CurrentHz}hz)";
             txt_qh.TextColor = vm.Color;
             txt_qh.ShapePosition = position_qh;
             txt_qh.Visible = _line_name_visible;
@@ -844,6 +849,7 @@
                 series_qe_view.AxisY = _axis_y_qe;
                 series_qe_view.Pane = _pane_qe;
                 series_qe_view.EnableAntialiasing = DefaultBoolean.True;
+                series_qe_view.LineTensionPercent = 50;
 
                 series_qe.SeriesPointsSorting = SortingMode.None;
                 series_qe.SeriesPointsSortingKey = SeriesPointKey.Value_1;
@@ -875,6 +881,7 @@
                 series_qp_view.AxisY = _axis_y_qp;
                 series_qp_view.Pane = _pane_qp;
                 series_qp_view.EnableAntialiasing = DefaultBoolean.True;
+                series_qp_view.LineTensionPercent = 50;
 
                 series_qp.SeriesPointsSorting = SortingMode.None;
                 series_qp.SeriesPointsSortingKey = SeriesPointKey.Value_1;
@@ -910,7 +917,7 @@
                 return;
             }
 
-            var eq_paras = EquipCurveHelper.CalcEquipCurve(vm.QhCalc, design_pt, out Yw.Geometry.Point2d sect_pt);
+            var eq_paras = EquipCurveHelper.CalcEquipCurve(vm.QhCalc, design_pt, _temp_head, out Yw.Geometry.Point2d sect_pt);
             if (eq_paras == null)
             {
                 ClearEqSeries();
@@ -941,7 +948,7 @@
             series_eq_view.EnableAntialiasing = DefaultBoolean.True;
             series_eq_view.LineStyle.DashStyle = DashStyle.Dash;
             series_eq_view.LineStyle.Thickness = 2;
-
+            series_eq_view.LineTensionPercent = 50;
 
             _series_eq.View = series_eq_view;
             _series_eq.Visible = _cubic_spline_eq_visible;

--
Gitblit v1.9.3