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

duheng

2024-10-09 f4bf35513c50f86556d5e3c75a037052f53c971d

 WinFrmUI/Yw.WinFrmUI.Phart.Core/01-perform/01-pump-chart/05-import/03-one-point/ImportPumpPerform2dByOnePointCtrl.cs

@@ -21,7 +21,7 @@
        }

        double _ratedn = -1;
        PumpPerformGroupPoint _work_point = null;
        PumpGroupPt _work_point = null;
        List<Yw.Geometry.Point2d> _pt_qh_list = null;
        List<Yw.Geometry.Point2d> _pt_qe_list = null;
        List<Yw.Geometry.Point2d> _pt_qp_list = null; 
@@ -44,11 +44,11 @@
            double ns = 0;
            if (this.checkEditSXB.Checked)
            {
                ns = PumpPerform2dCalcHelper.CalculateNs(Q / 2, H / YLJS, N);
                ns = PumpCalcHelper.CalculateNs(Q / 2, H / YLJS, N);
            }
            else
            {
                ns = PumpPerform2dCalcHelper.CalculateNs(Q, H / YLJS, N);
                ns = PumpCalcHelper.CalculateNs(Q, H / YLJS, N);
            }

            this.txtNS.EditValue = Math.Round(ns, 2);
@@ -86,7 +86,7 @@
                return false;
            }

            _work_point = new PumpPerformGroupPoint();
            _work_point = new PumpGroupPt();
            _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)
@@ -97,8 +97,8 @@

            if (string.IsNullOrWhiteSpace(this.txtE.Text))
            {
                double ns = PumpPerform2dCalcHelper.CalculateNs(_work_point.Q, _work_point.H, _ratedn);
                double eff = PumpPerform2dCalcHelper.CalculateEByPumpType(_work_point.Q, _work_point.H, _ratedn, comboBoxType.SelectedIndex + 1);
                double ns = PumpCalcHelper.CalculateNs(_work_point.Q, _work_point.H, _ratedn);
                double eff = PumpCalcHelper.CalculateEByPumpType(_work_point.Q, _work_point.H, _ratedn, comboBoxType.SelectedIndex + 1);

                _work_point.E = eff;
                this.txtE.EditValue = Math.Round(eff, 1);
@@ -112,7 +112,7 @@
                MessageBox.Show("效率有这么大吗?");
                return false;
            }
            _work_point.P = PumpPerform2dCalcHelper.CalculateP(_work_point.Q, _work_point.H, _work_point.E);
            _work_point.P = PumpCalcHelper.CalculateP(_work_point.Q, _work_point.H, _work_point.E);
            if (string.IsNullOrWhiteSpace(this.txtP.Text))
            {
                this.txtP.EditValue = Math.Round(_work_point.P, 1);
@@ -121,7 +121,7 @@
            double NPSHr = 0;
            if (!double.TryParse(this.txtNPSH.Text, out NPSHr))
            {
                NPSHr = PumpPerform2dCalcHelper.CalculateNPSHrByPumpType(_work_point.Q, _work_point.H, _ratedn, comboBoxType.SelectedIndex + 1);//双吸离心泵
                NPSHr = PumpCalcHelper.CalculateNPSHrByPumpType(_work_point.Q, _work_point.H, _ratedn, comboBoxType.SelectedIndex + 1);//双吸离心泵
                NPSHr = Math.Round(NPSHr, 1);
                this.txtNPSH.EditValue = NPSHr;
            }
@@ -289,7 +289,7 @@
                    MessageBox.Show("转速有这么小吗?");
                    return;
                }
                _work_point = new PumpPerformGroupPoint();
                _work_point = new  ();
                _work_point.Q = double.Parse(txtQ.Text);
                _work_point.H = double.Parse(txtH.Text);
                if (_work_point.H < 1 || _work_point.Q < 1)
@@ -306,11 +306,11 @@
            }
             

            double eff = PumpPerform2dCalcHelper.CalculateEByPumpType(_work_point.Q, _work_point.H, _ratedn, comboBoxType.SelectedIndex + 1);
            double eff = PumpCalcHelper.CalculateEByPumpType(_work_point.Q, _work_point.H, _ratedn, comboBoxType.SelectedIndex + 1);
            txtE.Text = string.Format("{0:0.0}", eff);
            _work_point.E = eff;

            double NPSHr = PumpPerform2dCalcHelper.CalculateNPSHrByPumpType(_work_point.Q, _work_point.H, _ratedn, comboBoxType.SelectedIndex + 1);//双吸离心泵
            double NPSHr = PumpCalcHelper.CalculateNPSHrByPumpType(_work_point.Q, _work_point.H, _ratedn, comboBoxType.SelectedIndex + 1);//双吸离心泵

            NPSHr = Math.Round(NPSHr, 1);
            txtNPSH.Text = NPSHr.ToString();
@@ -343,7 +343,7 @@
            }
            #endregion

            double E = PumpPerform2dCalcHelper.CalculateE(Q, H, P);
            double E = PumpCalcHelper.CalculateE(Q, H, P);
            txtE.Text = string.Format("{0:0.0}", E);

            if (E > 99)
@@ -380,7 +380,7 @@
            }
            #endregion

            double P = PumpPerform2dCalcHelper.CalculateP(Q, H, E);
            double P = PumpCalcHelper.CalculateP(Q, H, E);
            if (P < 1)
            {
                txtP.Text = string.Format("{0:0.000}", P);
@@ -480,7 +480,7 @@
                    if (H < 0.1 || E < 0.5)
                        continue;

                    P = PumpPerform2dCalcHelper.CalculateP(Q, H, E, midu);
                    P = PumpCalcHelper.CalculateP(Q, H, E, midu);
                    if (P < 2)
                    {
                        P = Math.Round(P, 3);
@@ -555,7 +555,7 @@
                    if (H < 0.1 || E < 0.5)
                        continue;

                    P = PumpPerform2dCalcHelper.CalculateP(Q, H, E, midu);
                    P = PumpCalcHelper.CalculateP(Q, H, E, midu);
                    if (P < 2)
                    {
                        P = Math.Round(P, 3);