From 530dbe6d17bea0fd9dfcde66167eb9008b97d7ba Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期二, 22 十月 2024 16:31:23 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/Yw.WinFrmUI.Phart.Core/01-perform/99-models/01-coordinate/PumpCoordinate_Disp.cs | 31 ++++++++++++++++++++++++-------
1 files changed, 24 insertions(+), 7 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 cbde5dd..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>
///
@@ -195,8 +199,8 @@
var validGridNumH = 6;
var coordinate_paras = new PumpCoordinate();
- coordinate_paras.GridNumberX = 10;
- coordinate_paras.GridNumberY = 18;
+ coordinate_paras.GridNumberX = 10;//10
+ 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;
}
@@ -352,7 +356,7 @@
/// <param name="coordinate_paras">鍧愭爣Model</param>
public static void CalcCoordinateP(double minP, double maxP, double disMaxH, int downGridNum, ref PumpCoordinate coordinate_paras)
{
- int default_num = 5;
+ int default_num = 7;
int spaceNum = coordinate_paras.StartLineNoH - default_num - downGridNum;
if (spaceNum < 3)
spaceNum = 3;
@@ -370,6 +374,10 @@
stratLineNoP--;
}
+
+
+
+
coordinate_paras.CoordSpaceP = coordSpaceP;
coordinate_paras.EndLineNoP = endLineNoP;
coordinate_paras.StartLineNoP = stratLineNoP;
@@ -378,13 +386,22 @@
if (coordinate_paras.StartLineNoP < downGridNum)
{
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.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