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/02-ctrl/PumpEditChartCtrl.cs

ÎļþÃû´Ó WinFrmUI/Yw.WinFrmUI.Phart.Core/v2/02-pump/02-edit/PumpEditChartCtrl.cs ÐÞ¸Ä
@@ -12,8 +12,7 @@
            InitializeComponent();

            this.gridView1.SetNormalEditView();
            this.gridView1.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;

            this.gridView1.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder; 
            this.curveExpressEditChart.OnDefinePointChanged += FeatCurvesDispCtrl1_OnDefinePointChanged;
        }

@@ -22,7 +21,7 @@
        private List<Yw.Geometry.Point2d> _qe_pt_list = null;
        private List<Yw.Geometry.Point2d> _qp_pt_list = null;

        private List<Yw.Geometry.Point2d> _fitCurvePoints = null;
        private List<Yw.Geometry.Point2d> _fit_pt_list = null;


        Yw.Pump.eCurveType _editCurveType = Yw.Pump.eCurveType.QH;
@@ -37,8 +36,8 @@
            _qe_pt_list = null;
            _qp_pt_list = null;

            _fitCurvePoints = new List<Yw.Geometry.Point2d>();
            this.bindingSource1.DataSource = _fitCurvePoints;
            _fit_pt_list = new List<Yw.Geometry.Point2d>();
            this.bindingSource1.DataSource = _fit_pt_list;
        }


@@ -77,8 +76,8 @@
                    List<Yw.Geometry.Point2d> def_qp_pt_list)
        {

            _fitCurvePoints = new List<Yw.Geometry.Point2d>();
            this.bindingSource1.DataSource = _fitCurvePoints;
            _fit_pt_list = new List<Yw.Geometry.Point2d>();
            this.bindingSource1.DataSource = _fit_pt_list;

            _qh_pt_list = null;
            _qe_pt_list = null;
@@ -112,7 +111,7 @@
        //性能曲线点修改事件
        private void FeatCurvesDispCtrl1_OnDefinePointChanged(Yw.Pump.eCurveType type, List<Yw.Geometry.Point2d> points)
        {
            _fitCurvePoints.Clear();
            _fit_pt_list.Clear();
            switch (_editCurveType)
            {
                case Yw.Pump.eCurveType.QH:
@@ -122,7 +121,7 @@
                        {
                            var x = Math.Round(pt.X, 2);
                            var y = Math.Round(pt.Y, 2);
                            _fitCurvePoints.Add(new Yw.Geometry.Point2d(x, y));
                            _fit_pt_list.Add(new Yw.Geometry.Point2d(x, y));
                        }
                    }
                    break;
@@ -133,7 +132,7 @@
                        {
                            var x = Math.Round(pt.X, 2);
                            var y = Math.Round(pt.Y, 2);
                            _fitCurvePoints.Add(new Yw.Geometry.Point2d(x, y));
                            _fit_pt_list.Add(new Yw.Geometry.Point2d(x, y));
                        }
                    }
                    break;
@@ -144,7 +143,7 @@
                        {
                            var x = Math.Round(pt.X, 2);
                            var y = Math.Round(pt.Y, 2);
                            _fitCurvePoints.Add(new Yw.Geometry.Point2d(x, y));
                            _fit_pt_list.Add(new Yw.Geometry.Point2d(x, y));
                        }

                    }
@@ -178,7 +177,7 @@
        //单元格修改后触发
        private void gridView1_CellValueChanged(object sender, DevExpress.XtraGrid.Views.Base.CellValueChangedEventArgs e)
        {
            var points = _fitCurvePoints.Select(x => new Yw.Geometry.Point2d(x)).ToList();
            var points = _fit_pt_list.Select(x => new Yw.Geometry.Point2d(x)).ToList();
            switch (_editCurveType)
            {
                case Yw.Pump.eCurveType.QH:
@@ -221,7 +220,7 @@
        /// </summary>
        private void ReloadCurvePoints()
        {
            _fitCurvePoints.Clear();
            _fit_pt_list.Clear();
            switch (_editCurveType)
            {
                case Yw.Pump.eCurveType.QH:
@@ -230,7 +229,7 @@
                        {
                            var x = Math.Round(pt.X, 2);
                            var y = Math.Round(pt.Y, 2);
                            _fitCurvePoints.Add(new Yw.Geometry.Point2d(x, y));
                            _fit_pt_list.Add(new Yw.Geometry.Point2d(x, y));
                        }
                    }
                    break;
@@ -240,7 +239,7 @@
                        {
                            var x = Math.Round(pt.X, 2);
                            var y = Math.Round(pt.Y, 2);
                            _fitCurvePoints.Add(new Yw.Geometry.Point2d(x, y));
                            _fit_pt_list.Add(new Yw.Geometry.Point2d(x, y));
                        }
                    }
                    break;
@@ -250,12 +249,12 @@
                        {
                            var x = Math.Round(pt.X, 2);
                            var y = Math.Round(pt.Y, 2);
                            _fitCurvePoints.Add(new Yw.Geometry.Point2d(x, y));
                            _fit_pt_list.Add(new Yw.Geometry.Point2d(x, y));
                        }
                    }
                    break;
            }
            var list = _fitCurvePoints?.Select(x => new Yw.Geometry.Point2d(x.X, x.Y)).ToList();
            var list = _fit_pt_list?.Select(x => new Yw.Geometry.Point2d(x.X, x.Y)).ToList();
            this.curveExpressEditChart.UpdateCurve(_editCurveType, list);
            this.bindingSource1.ResetBindings(false);
        }
@@ -268,11 +267,11 @@
                return;
            if (XtraMessageBox.Show("是否删除此点？", "提示信息", MessageBoxButtons.YesNo, MessageBoxIcon.Information) != DialogResult.Yes)
                return;
            _fitCurvePoints.Remove(row);
            _fit_pt_list.Remove(row);
            this.bindingSource1.ResetBindings(false);

            var points = new List<Yw.Geometry.Point2d>();
            foreach (var curvePoint in _fitCurvePoints)
            foreach (var curvePoint in _fit_pt_list)
            {
                var x = curvePoint.X;
                var y = curvePoint.Y;
@@ -328,7 +327,7 @@
        //重新计算
        private void ReloadCalcu()
        {
            if (_fitCurvePoints == null)
            if (_fit_pt_list == null)
                return;
            bool isFromZero = false;
            if (_qh_pt_list.Last().X > 20)