Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

lixiaojun

2024-12-02 dbcef6befb123066754141adef6dc3ef6653b6ce

 WinFrmUI/Yw.WinFrmUI.Phart.Core/v2/02-pump/05-import/03-one-point/PumpImportByOnePointCtrl.cs

ÎļþÃû´Ó WinFrmUI/Yw.WinFrmUI.Phart.Core/v1/01-perform/01-pump-chart/05-import/03-one-point/ImportPumpPerform2dByOnePointCtrl.cs ÐÞ¸Ä
@@ -1,17 +1,16 @@
using DevExpress.XtraEditors;
using NPOI.Util;


 
namespace Yw.WinFrmUI.Phart
{
    /// <summary>
    /// (待修改)
    /// </summary>
    public partial class ImportPumpPerform2dByOnePointCtrl : XtraUserControl
    public partial class PumpImportByOnePointCtrl : XtraUserControl
    {

        //构造函数
        public ImportPumpPerform2dByOnePointCtrl()
        public PumpImportByOnePointCtrl()
        {
            InitializeComponent();
            this.comboBoxType.SelectedIndex = 0;
@@ -21,7 +20,7 @@
        }

        double _ratedn = -1;
        PumpGroupPt _work_point = null;
        PumpQueryPointViewModel _work_point = null;
        List<Yw.Geometry.Point2d> _qh_pt_list = null;
        List<Yw.Geometry.Point2d> _qe_pt_list = null;
        List<Yw.Geometry.Point2d> _qp_pt_list = null;
@@ -86,7 +85,7 @@
                return false;
            }

            _work_point = new PumpGroupPt();
            _work_point = new PumpQueryPointViewModel();
            _work_point.Q = double.Parse(this.txtQ.Text);
            _work_point.H = double.Parse(this.txtH.Text);
            if (_work_point.H < 1 || _work_point.Q < 1)
@@ -112,10 +111,10 @@
                MessageBox.Show("效率有这么大吗?");
                return false;
            }
            _work_point.P = PumpCalcHelper.CalculateP(_work_point.Q, _work_point.H, _work_point.E);
            _work_point.P = PumpCalcHelper.CalculateP(_work_point.Q, _work_point.H, _work_point.E.Value);
            if (string.IsNullOrWhiteSpace(this.txtP.Text))
            {
                this.txtP.EditValue = Math.Round(_work_point.P, 1);
                this.txtP.EditValue = Math.Round(_work_point.P.Value, 1);
            }
            //汽蚀
            double NPSHr = 0;
@@ -125,7 +124,7 @@
                NPSHr = Math.Round(NPSHr, 1);
                this.txtNPSH.EditValue = NPSHr;
            }
            _work_point.NPSH = NPSHr;
            //_work_point.NPSH = NPSHr;

            //得到点位置