From 1880449ad4f07906a22d984e2d4ad6520ccc2b01 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期二, 22 十月 2024 16:05:24 +0800
Subject: [PATCH] 曲线坐标

---
 WinFrmUI/Yw.WinFrmUI.Phart.Core/01-perform/99-models/01-coordinate/PumpCoordinate_Disp.cs |   26 ++++++++++++++++++++++----
 1 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/WinFrmUI/Yw.WinFrmUI.Phart.Core/01-perform/99-models/01-coordinate/PumpCoordinate_Disp.cs b/WinFrmUI/Yw.WinFrmUI.Phart.Core/01-perform/99-models/01-coordinate/PumpCoordinate_Disp.cs
index 245172b..f59a417 100644
--- a/WinFrmUI/Yw.WinFrmUI.Phart.Core/01-perform/99-models/01-coordinate/PumpCoordinate_Disp.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Phart.Core/01-perform/99-models/01-coordinate/PumpCoordinate_Disp.cs
@@ -1,4 +1,8 @@
-锘縩amespace Yw.WinFrmUI.Phart
+锘縰sing DevExpress.CodeParser;
+using DevExpress.DataAccess.Native.Json;
+using DevExpress.Diagram.Core.Shapes;
+
+namespace Yw.WinFrmUI.Phart
 {
     /// <summary>
     ///  
@@ -196,7 +200,7 @@
             var validGridNumH = 6;
             var coordinate_paras = new PumpCoordinate();
             coordinate_paras.GridNumberX = 10;//10
-            coordinate_paras.GridNumberY = 17;//18
+            coordinate_paras.GridNumberY = 18;//18
             CalcCoordinateQ(minQ, maxQ, ref coordinate_paras, coordinate_paras.GridNumberX);
             CalcCoordinateH(minH, maxH, validGridNumH, ref coordinate_paras, out double disMinH, out double disMaxH);
 
@@ -205,7 +209,7 @@
 
             if (maxE > minE + 0.01)
                 CalcCoordinateE(minE, maxE, ref coordinate_paras);
-
+             
             return coordinate_paras;
         }
 
@@ -370,6 +374,10 @@
                 stratLineNoP--;
             }
 
+           
+ 
+            
+
             coordinate_paras.CoordSpaceP = coordSpaceP;
             coordinate_paras.EndLineNoP = endLineNoP;
             coordinate_paras.StartLineNoP = stratLineNoP;
@@ -377,13 +385,23 @@
             //濡傛灉寮�濮嬪埢搴︿綆浜庢渶浣庣偣鍒诲害 閮藉線涓婂姞宸��
             if (coordinate_paras.StartLineNoP < downGridNum)
             {
-                int diff_num = downGridNum - coordinate_paras.StartLineNoP; 
+                int diff_num = downGridNum - coordinate_paras.StartLineNoP;
                 coordinate_paras.EndLineNoP += diff_num;
                 coordinate_paras.StartLineNoP += diff_num;
             }
+            
 
             coordinate_paras.CoordMinH = GetByPlacesLength(disMaxH - (double)coordinate_paras.EndLineNoH * coordinate_paras.CoordSpaceH, 3); 
             coordinate_paras.CoordMinP = GetByPlacesLength(disMaxP - (double)coordinate_paras.EndLineNoP * coordinate_paras.CoordSpaceP, 3);
+
+
+            if (minP > 0 && minP < 10)
+            {
+                coordinate_paras.StartLineNoP = 0;
+                coordinate_paras.EndLineNoP = endLineNoP;
+                coordinate_paras.CoordSpaceP = coordSpaceP;
+                coordinate_paras.CoordMinP = Math.Floor(minP);
+            }
         }
 
         /// <summary>

--
Gitblit v1.9.3