循环水项目
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
lixiaojun
2024-12-02 dbcef6befb123066754141adef6dc3ef6653b6ce 
 WinFrmUI/Yw.WinFrmUI.Phart.Core/v2/02-pump/01-chart/PumpWorkChart.cs


ÎļþÃû´Ó WinFrmUI/Yw.WinFrmUI.Phart.Core/v2/02-pump/01-view/PumpWorkChart.cs ÐÞ¸Ä


@@ -79,7 +79,7 @@




        public event Action<PumpCoordinate> OnCurveCoordinateChanged;




        public event Action<string, PumpGroupPt> OnCalcQueryPoint = null;


        public event Action<string, PumpQueryPointViewModel> OnCalcQueryPoint = null;




        #endregion




@@ -146,7 +146,7 @@


            {


                var dis_min_h = _coordinate.DispMinH();


                var equip_paras = EquipCurveHelper.CalcEquipCurve(_vm.QhCalc, _vm.WorkPoint, dis_min_h, out Yw.Geometry.Point2d sect_pt);


                if (equip_paras != null && equip_paras.EquipCurve.IsValid())


                if (equip_paras != null && equip_paras.IsValid())


                {


                    using Pen pen = new(Color.Black, 2);


                    pen.DashStyle = System.Drawing.Drawing2D.DashStyle.DashDotDot;


@@ -167,7 +167,7 @@


                    }




                    // åˆ›å»ºGraphicsPath对象，并添加样条线


                    var pts = equip_paras.EquipCurve.GetPointList().Select(x => new PointF((float)x.X, (float)x.Y)).ToArray();


                    var pts = equip_paras.GetPointList().Select(x => new PointF((float)x.X, (float)x.Y)).ToArray();


                    using var path = new System.Drawing.Drawing2D.GraphicsPath();


                    var g_pts = new List<PointF>();


                    foreach (var pt in pts)


@@ -552,7 +552,7 @@


            }




            _anno_txt_query_info.Visible = true;


            var work_pt = new PumpGroupPt(0, 0, 0, 0, 0);


            var work_pt = new PumpQueryPointViewModel();


            work_pt.Q = work_flow.Value;


            work_pt.H = qh.GetPointY(work_flow.Value);




@@ -564,18 +564,18 @@


                if (qp != null)


                {


                    work_pt.P = qp.GetPointY(work_pt.Q);


                    work_pt.E = PumpCalcHelper.CalculateE(work_pt.Q, work_pt.H, work_pt.P);


                    work_pt.E = PumpCalcHelper.CalculateE(work_pt.Q, work_pt.H, work_pt.P.Value);


                }


                else


                {


                    work_pt.E = qe.GetPointY(work_pt.Q);


                }


                work_info_str_builder.AppendLine($"效率:{work_pt.E.ToString("N2")} ");


                work_info_str_builder.AppendLine($"效率:{work_pt.E.Value.ToString("N2")} ");


            }


            if (qp != null)


            {


                work_pt.P = qp.GetPointY(work_pt.Q);


                work_info_str_builder.Append($"功率:{work_pt.P.ToString("N1")} ");


                work_info_str_builder.Append($"功率:{work_pt.P.Value.ToString("N1")} ");


            }




            _anno_txt_query_info.Text = work_info_str_builder.ToString();