冲突

duheng

2024-12-11 2e8e85f65748ee5a5adf0dcda864aa4167cbf2ef

 WinFrmUI/Yw.WinFrmUI.Phart.Core/01-pump/01-single/09-edit/PumpEditChartCtrl.cs

@@ -24,7 +24,7 @@
        private List<Yw.Geometry.Point2d> _fit_pt_list = null;


        Yw.Pump.eCurveType _editCurveType = Yw.Pump.eCurveType.QH;
        Yw.Ahart.eCurveType _editCurveType = Yw.Ahart.eCurveType.QH;


        /// <summary>
@@ -109,12 +109,12 @@
        }

        //性能曲线点修改事件
        private void FeatCurvesDispCtrl1_OnDefinePointChanged(Yw.Pump.eCurveType type, List<Yw.Geometry.Point2d> points)
        private void FeatCurvesDispCtrl1_OnDefinePointChanged(Yw.Ahart.eCurveType type, List<Yw.Geometry.Point2d> points)
        {
            _fit_pt_list.Clear();
            switch (_editCurveType)
            {
                case Yw.Pump.eCurveType.QH:
                case Yw.Ahart.eCurveType.QH:
                    {
                        _qh_pt_list = points;
                        foreach (Yw.Geometry.Point2d pt in _qh_pt_list)
@@ -125,7 +125,7 @@
                        }
                    }
                    break;
                case Yw.Pump.eCurveType.QE:
                case Yw.Ahart.eCurveType.QE:
                    {
                        _qe_pt_list = points;
                        foreach (Yw.Geometry.Point2d pt in _qe_pt_list)
@@ -136,7 +136,7 @@
                        }
                    }
                    break;
                case Yw.Pump.eCurveType.QP:
                case Yw.Ahart.eCurveType.QP:
                    {
                        _qp_pt_list = points;
                        foreach (Yw.Geometry.Point2d pt in _qp_pt_list)
@@ -160,16 +160,16 @@
            if (string.Equals("流量扬程曲线", curve_type))
            {

                _editCurveType = Yw.Pump.eCurveType.QH;
                _editCurveType = Yw.Ahart.eCurveType.QH;
            }
            else if (string.Equals("流量效率曲线", curve_type))
            {
                _editCurveType = Yw.Pump.eCurveType.QE;
                _editCurveType = Yw.Ahart.eCurveType.QE;

            }
            else if (string.Equals("流量功率曲线", curve_type))
            {
                _editCurveType = Yw.Pump.eCurveType.QP;
                _editCurveType = Yw.Ahart.eCurveType.QP;
            }
            ReloadCurvePoints();
        }
@@ -180,18 +180,18 @@
            var points = _fit_pt_list.Select(x => new Yw.Geometry.Point2d(x)).ToList();
            switch (_editCurveType)
            {
                case Yw.Pump.eCurveType.QH:
                case Yw.Ahart.eCurveType.QH:
                    {
                        _qh_pt_list = points;
                    }
                    break;
                case Yw.Pump.eCurveType.QE:
                case Yw.Ahart.eCurveType.QE:
                    {

                        _qe_pt_list = points;
                    }
                    break;
                case Yw.Pump.eCurveType.QP:
                case Yw.Ahart.eCurveType.QP:
                    {
                        _qp_pt_list = points;
                    }
@@ -223,7 +223,7 @@
            _fit_pt_list.Clear();
            switch (_editCurveType)
            {
                case Yw.Pump.eCurveType.QH:
                case Yw.Ahart.eCurveType.QH:
                    {
                        foreach (Yw.Geometry.Point2d pt in _qh_pt_list)
                        {
@@ -233,7 +233,7 @@
                        }
                    }
                    break;
                case Yw.Pump.eCurveType.QE:
                case Yw.Ahart.eCurveType.QE:
                    {
                        foreach (Yw.Geometry.Point2d pt in _qe_pt_list)
                        {
@@ -243,7 +243,7 @@
                        }
                    }
                    break;
                case Yw.Pump.eCurveType.QP:
                case Yw.Ahart.eCurveType.QP:
                    {
                        foreach (Yw.Geometry.Point2d pt in _qp_pt_list)
                        {
@@ -279,9 +279,9 @@
            }
            switch (_editCurveType)
            {
                case Yw.Pump.eCurveType.QH: _qh_pt_list = points.ToList(); break;
                case Yw.Pump.eCurveType.QE: _qe_pt_list = points.ToList(); break;
                case Yw.Pump.eCurveType.QP: _qp_pt_list = points.ToList(); break;
                case Yw.Ahart.eCurveType.QH: _qh_pt_list = points.ToList(); break;
                case Yw.Ahart.eCurveType.QE: _qe_pt_list = points.ToList(); break;
                case Yw.Ahart.eCurveType.QP: _qp_pt_list = points.ToList(); break;
            }

            this.curveExpressEditChart.UpdateCurve(_editCurveType, points);
@@ -295,21 +295,21 @@
            List<Yw.Geometry.Point2d> points = null;
            switch (_editCurveType)
            {
                case Yw.Pump.eCurveType.QH:
                case Yw.Ahart.eCurveType.QH:
                    {
                        dlg.SetLabelX("Q");
                        dlg.SetLabelY("H");
                        points = _qh_pt_list;
                    }
                    break;
                case Yw.Pump.eCurveType.QE:
                case Yw.Ahart.eCurveType.QE:
                    {
                        dlg.SetLabelX("Q");
                        dlg.SetLabelY("E");
                        points = _qe_pt_list;
                    }
                    break;
                case Yw.Pump.eCurveType.QP:
                case Yw.Ahart.eCurveType.QP:
                    {
                        dlg.SetLabelX("Q");
                        dlg.SetLabelY("P");
@@ -340,11 +340,11 @@
                if (_qh_pt_list.First().X < 0.3)
                    isFromZero = true;
            }
            if (_editCurveType == Yw.Pump.eCurveType.QE)
            if (_editCurveType == Yw.Ahart.eCurveType.QE)
            {
                _qe_pt_list = PumpCalcHelper.CalculateELineByP(_qh_pt_list, _qp_pt_list, isFromZero);
            }
            else if (_editCurveType == Yw.Pump.eCurveType.QP)
            else if (_editCurveType == Yw.Ahart.eCurveType.QP)
            {

                double ref_zero_power = -1;