Shuxia Ning
2025-01-14 0f99d4d12f2eae29bbe343f4b3131f2faeccda5d
WinFrmUI/Yw.WinFrmUI.Phart.Core/01-pump/00-core/01-coordinate/PumpCoordinate_Disp.cs
@@ -207,12 +207,12 @@
            if (min_head > max_head - 0.01)
                return null;
            var validGridNumH = 6;
            var valid_grid_num_h = 6;
            var coordinate_paras = new PumpCoordinate();
            coordinate_paras.GridNumberX = 10;//10
            coordinate_paras.GridNumberY = 18;//18
            CalcCoordinateQ(min_flow, max_flow, ref coordinate_paras, coordinate_paras.GridNumberX);
            CalcCoordinateH(min_head, max_head, validGridNumH, ref coordinate_paras, out double disMinH, out double disMaxH);
            CalcCoordinateH(min_head, max_head, valid_grid_num_h, ref coordinate_paras, out double disMinH, out double disMaxH);
            if (max_power > min_power + 0.01)
                CalcCoordinateP(min_power, max_power, disMaxH, 0, ref coordinate_paras);
@@ -269,11 +269,11 @@
        /// </summary>
        /// <param name="min_head">最小扬程</param>
        /// <param name="max_head">最大扬程</param>
        /// <param name="validGridNumH">有效扬程刻度数</param>
        /// <param name="valid_grid_num_h">有效扬程刻度数</param>
        /// <param name="coordinate_paras">坐标Model</param>
        /// <param name="disMinH">最小显示扬程</param>
        /// <param name="disMaxH">最大显示扬程</param>
        public static void CalcCoordinateH_Filter(double min_head, double max_head, int validGridNumH, ref PumpCoordinate coordinate_paras, out double disMinH, out double disMaxH)
        public static void CalcCoordinateH_Filter(double min_head, double max_head, int valid_grid_num_h, ref PumpCoordinate coordinate_paras, out double disMinH, out double disMaxH)
        {
            if (max_head < 1.0)
            {
@@ -322,7 +322,7 @@
            }
            else
            {
                CalcCoordinateH(min_head, max_head, validGridNumH, ref coordinate_paras, out disMinH, out disMaxH);
                CalcCoordinateH(min_head, max_head, valid_grid_num_h, ref coordinate_paras, out disMinH, out disMaxH);
            }
        }
@@ -331,13 +331,13 @@
        /// </summary>
        /// <param name="min_head">最小扬程</param>
        /// <param name="max_head">最大扬程</param>
        /// <param name="validGridNumH">有效扬程刻度数</param>
        /// <param name="valid_grid_num_h">有效扬程刻度数</param>
        /// <param name="coordinate_paras">坐标Model</param>
        /// <param name="disMinH">最小显示扬程</param>
        /// <param name="disMaxH">最大显示扬程</param>
        public static void CalcCoordinateH(double min_head, double max_head, int validGridNumH, ref PumpCoordinate coordinate_paras, out double disMinH, out double disMaxH)
        public static void CalcCoordinateH(double min_head, double max_head, int valid_grid_num_h, ref PumpCoordinate coordinate_paras, out double disMinH, out double disMaxH)
        {
            var coordSpaceH = PhartCoordinateHelper.GetOptimalSpaceMax(min_head, max_head, validGridNumH, out disMinH, out disMaxH);
            var coordSpaceH = PhartCoordinateHelper.GetOptimalSpaceMax(min_head, max_head, valid_grid_num_h, out disMinH, out disMaxH);
            int endLineNoH = coordinate_paras.GridNumberY;
            int stratLineNoH = endLineNoH;
@@ -396,13 +396,7 @@
                coordinate_paras.StartLineNoP += diff_num;
            }
            //确认刻度在有效刻度内 nsx
            var diff_line = coordinate_paras.EndLineNoP - coordinate_paras.StartLineNoP;
            if (diff_line < spaceNum)
            {
                coordinate_paras.StartLineNoP -= spaceNum - diff_line;
            }
            coordinate_paras.CoordMinH = PhartCoordinateHelper.GetByPlacesLength(disMaxH - coordinate_paras.EndLineNoH * coordinate_paras.CoordSpaceH, 3);
            coordinate_paras.CoordMinP = PhartCoordinateHelper.GetByPlacesLength(disMaxP - coordinate_paras.EndLineNoP * coordinate_paras.CoordSpaceP, 3);