曲线拟合Bug更新

Shuxia Ning

2025-01-15 f0944302320b4457ce67678e7be3c9404c54217d

曲线拟合Bug更新

 WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/01-pump/01-view/PumpChartViewCtrl.Designer.cs

@@ -32,6 +32,12 @@
            pumpViewChart1 = new Yw.WinFrmUI.Phart.PumpViewChart();
            barManager1 = new DevExpress.XtraBars.BarManager(components);
            bar1 = new DevExpress.XtraBars.Bar();
            barBtnAddVariableSpeedMenu = new DevExpress.XtraBars.BarSubItem();
            barBtnAddVariableSpeedByN = new DevExpress.XtraBars.BarButtonItem();
            barBtnAddVariableSpeedByHz = new DevExpress.XtraBars.BarButtonItem();
            barBtnAddVariableSpeedByPoint = new DevExpress.XtraBars.BarButtonItem();
            barBtnAddEqualEffMenu = new DevExpress.XtraBars.BarSubItem();
            barBtnAddEqualEffByEff = new DevExpress.XtraBars.BarButtonItem();
            barCekSplitPanel = new DevExpress.XtraBars.BarCheckItem();
            barCekEffVisible = new DevExpress.XtraBars.BarCheckItem();
            barCekPowerVisible = new DevExpress.XtraBars.BarCheckItem();
@@ -45,12 +51,6 @@
            barCekEqulEffVisible = new DevExpress.XtraBars.BarCheckItem();
            barCekEqVisible = new DevExpress.XtraBars.BarCheckItem();
            barBtnEqClear = new DevExpress.XtraBars.BarButtonItem();
            barBtnAddVariableSpeedMenu = new DevExpress.XtraBars.BarSubItem();
            barBtnAddVariableSpeedByN = new DevExpress.XtraBars.BarButtonItem();
            barBtnAddVariableSpeedByHz = new DevExpress.XtraBars.BarButtonItem();
            barBtnAddVariableSpeedByPoint = new DevExpress.XtraBars.BarButtonItem();
            barBtnAddEqualEffMenu = new DevExpress.XtraBars.BarSubItem();
            barBtnAddEqualEffByEff = new DevExpress.XtraBars.BarButtonItem();
            barDockControlTop = new DevExpress.XtraBars.BarDockControl();
            barDockControlBottom = new DevExpress.XtraBars.BarDockControl();
            barDockControlLeft = new DevExpress.XtraBars.BarDockControl();
@@ -65,9 +65,9 @@
            // 
            pumpViewChart1.Dock = DockStyle.Fill;
            pumpViewChart1.LineVisible = false;
            pumpViewChart1.Location = new Point(0, 68);
            pumpViewChart1.Location = new Point(0, 34);
            pumpViewChart1.Name = "pumpViewChart1";
            pumpViewChart1.Size = new Size(1369, 856);
            pumpViewChart1.Size = new Size(1369, 890);
            pumpViewChart1.SplitPanel = false;
            pumpViewChart1.TabIndex = 0;
            // 
@@ -89,12 +89,62 @@
            bar1.DockCol = 0;
            bar1.DockRow = 0;
            bar1.DockStyle = DevExpress.XtraBars.BarDockStyle.Top;
            bar1.LinksPersistInfo.AddRange(new DevExpress.XtraBars.LinkPersistInfo[] { new DevExpress.XtraBars.LinkPersistInfo(barBtnAddVariableSpeedMenu), new DevExpress.XtraBars.LinkPersistInfo(barBtnAddEqualEffMenu), new DevExpress.XtraBars.LinkPersistInfo(barCekSplitPanel), new DevExpress.XtraBars.LinkPersistInfo(barCekEffVisible), new DevExpress.XtraBars.LinkPersistInfo(barCekPowerVisible), new DevExpress.XtraBars.LinkPersistInfo(barTxtPipeQ), new DevExpress.XtraBars.LinkPersistInfo(barTxtPipeHead), new DevExpress.XtraBars.LinkPersistInfo(barTxtStartHead), new DevExpress.XtraBars.LinkPersistInfo(barBtnSetEqPt), new DevExpress.XtraBars.LinkPersistInfo(barCekEqulEffVisible), new DevExpress.XtraBars.LinkPersistInfo(barCekEqVisible), new DevExpress.XtraBars.LinkPersistInfo(barBtnEqClear) });
            bar1.LinksPersistInfo.AddRange(new DevExpress.XtraBars.LinkPersistInfo[] { new DevExpress.XtraBars.LinkPersistInfo(barBtnAddVariableSpeedMenu), new DevExpress.XtraBars.LinkPersistInfo(barBtnAddEqualEffMenu), new DevExpress.XtraBars.LinkPersistInfo(barCekSplitPanel), new DevExpress.XtraBars.LinkPersistInfo(barCekEffVisible), new DevExpress.XtraBars.LinkPersistInfo(barTxtPipeQ), new DevExpress.XtraBars.LinkPersistInfo(barTxtPipeHead), new DevExpress.XtraBars.LinkPersistInfo(barTxtStartHead), new DevExpress.XtraBars.LinkPersistInfo(barBtnSetEqPt), new DevExpress.XtraBars.LinkPersistInfo(barCekEqulEffVisible), new DevExpress.XtraBars.LinkPersistInfo(barBtnEqClear) });
            bar1.OptionsBar.AllowQuickCustomization = false;
            bar1.OptionsBar.DrawBorder = false;
            bar1.OptionsBar.MultiLine = true;
            bar1.OptionsBar.UseWholeRow = true;
            bar1.Text = "Tools";
            // 
            // barBtnAddVariableSpeedMenu
            // 
            barBtnAddVariableSpeedMenu.Caption = "变速曲线";
            barBtnAddVariableSpeedMenu.Id = 17;
            barBtnAddVariableSpeedMenu.ImageOptions.SvgImage = PhartRelation.Core.Properties.Resources.actions_add;
            barBtnAddVariableSpeedMenu.LinksPersistInfo.AddRange(new DevExpress.XtraBars.LinkPersistInfo[] { new DevExpress.XtraBars.LinkPersistInfo(barBtnAddVariableSpeedByN), new DevExpress.XtraBars.LinkPersistInfo(barBtnAddVariableSpeedByHz), new DevExpress.XtraBars.LinkPersistInfo(barBtnAddVariableSpeedByPoint) });
            barBtnAddVariableSpeedMenu.Name = "barBtnAddVariableSpeedMenu";
            barBtnAddVariableSpeedMenu.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
            // 
            // barBtnAddVariableSpeedByN
            // 
            barBtnAddVariableSpeedByN.Caption = "转速";
            barBtnAddVariableSpeedByN.Id = 18;
            barBtnAddVariableSpeedByN.ImageOptions.SvgImage = PhartRelation.Core.Properties.Resources.actions_addcircled;
            barBtnAddVariableSpeedByN.Name = "barBtnAddVariableSpeedByN";
            barBtnAddVariableSpeedByN.ItemClick += barBtnAddVariableSpeedByN_ItemClick;
            // 
            // barBtnAddVariableSpeedByHz
            // 
            barBtnAddVariableSpeedByHz.Caption = "频率";
            barBtnAddVariableSpeedByHz.Id = 19;
            barBtnAddVariableSpeedByHz.ImageOptions.SvgImage = PhartRelation.Core.Properties.Resources.actions_addcircled1;
            barBtnAddVariableSpeedByHz.Name = "barBtnAddVariableSpeedByHz";
            barBtnAddVariableSpeedByHz.ItemClick += barBtnAddVariableSpeedByHz_ItemClick;
            // 
            // barBtnAddVariableSpeedByPoint
            // 
            barBtnAddVariableSpeedByPoint.Caption = "设计点";
            barBtnAddVariableSpeedByPoint.Id = 20;
            barBtnAddVariableSpeedByPoint.ImageOptions.SvgImage = PhartRelation.Core.Properties.Resources.actions_addcircled2;
            barBtnAddVariableSpeedByPoint.Name = "barBtnAddVariableSpeedByPoint";
            barBtnAddVariableSpeedByPoint.ItemClick += barBtnAddVariableSpeedByPoint_ItemClick;
            // 
            // barBtnAddEqualEffMenu
            // 
            barBtnAddEqualEffMenu.Caption = "等效线";
            barBtnAddEqualEffMenu.Id = 23;
            barBtnAddEqualEffMenu.ImageOptions.SvgImage = PhartRelation.Core.Properties.Resources.actions_add1;
            barBtnAddEqualEffMenu.LinksPersistInfo.AddRange(new DevExpress.XtraBars.LinkPersistInfo[] { new DevExpress.XtraBars.LinkPersistInfo(barBtnAddEqualEffByEff) });
            barBtnAddEqualEffMenu.Name = "barBtnAddEqualEffMenu";
            barBtnAddEqualEffMenu.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
            // 
            // barBtnAddEqualEffByEff
            // 
            barBtnAddEqualEffByEff.Caption = "效率点";
            barBtnAddEqualEffByEff.Id = 24;
            barBtnAddEqualEffByEff.ImageOptions.SvgImage = PhartRelation.Core.Properties.Resources.actions_addcircled3;
            barBtnAddEqualEffByEff.Name = "barBtnAddEqualEffByEff";
            barBtnAddEqualEffByEff.ItemClick += barBtnAddEqualEffByEff_ItemClick;
            // 
            // barCekSplitPanel
            // 
@@ -215,63 +265,13 @@
            barBtnEqClear.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
            barBtnEqClear.ItemClick += barBtnEqClear_ItemClick;
            // 
            // barBtnAddVariableSpeedMenu
            // 
            barBtnAddVariableSpeedMenu.Caption = "变速曲线";
            barBtnAddVariableSpeedMenu.Id = 17;
            barBtnAddVariableSpeedMenu.ImageOptions.SvgImage = PhartRelation.Core.Properties.Resources.actions_add;
            barBtnAddVariableSpeedMenu.LinksPersistInfo.AddRange(new DevExpress.XtraBars.LinkPersistInfo[] { new DevExpress.XtraBars.LinkPersistInfo(barBtnAddVariableSpeedByN), new DevExpress.XtraBars.LinkPersistInfo(barBtnAddVariableSpeedByHz), new DevExpress.XtraBars.LinkPersistInfo(barBtnAddVariableSpeedByPoint) });
            barBtnAddVariableSpeedMenu.Name = "barBtnAddVariableSpeedMenu";
            barBtnAddVariableSpeedMenu.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
            // 
            // barBtnAddVariableSpeedByN
            // 
            barBtnAddVariableSpeedByN.Caption = "转速";
            barBtnAddVariableSpeedByN.Id = 18;
            barBtnAddVariableSpeedByN.ImageOptions.SvgImage = PhartRelation.Core.Properties.Resources.actions_addcircled;
            barBtnAddVariableSpeedByN.Name = "barBtnAddVariableSpeedByN";
            barBtnAddVariableSpeedByN.ItemClick += barBtnAddVariableSpeedByN_ItemClick;
            // 
            // barBtnAddVariableSpeedByHz
            // 
            barBtnAddVariableSpeedByHz.Caption = "频率";
            barBtnAddVariableSpeedByHz.Id = 19;
            barBtnAddVariableSpeedByHz.ImageOptions.SvgImage = PhartRelation.Core.Properties.Resources.actions_addcircled1;
            barBtnAddVariableSpeedByHz.Name = "barBtnAddVariableSpeedByHz";
            barBtnAddVariableSpeedByHz.ItemClick += barBtnAddVariableSpeedByHz_ItemClick;
            // 
            // barBtnAddVariableSpeedByPoint
            // 
            barBtnAddVariableSpeedByPoint.Caption = "设计点";
            barBtnAddVariableSpeedByPoint.Id = 20;
            barBtnAddVariableSpeedByPoint.ImageOptions.SvgImage = PhartRelation.Core.Properties.Resources.actions_addcircled2;
            barBtnAddVariableSpeedByPoint.Name = "barBtnAddVariableSpeedByPoint";
            barBtnAddVariableSpeedByPoint.ItemClick += barBtnAddVariableSpeedByPoint_ItemClick;
            // 
            // barBtnAddEqualEffMenu
            // 
            barBtnAddEqualEffMenu.Caption = "等效线";
            barBtnAddEqualEffMenu.Id = 23;
            barBtnAddEqualEffMenu.ImageOptions.SvgImage = PhartRelation.Core.Properties.Resources.actions_add1;
            barBtnAddEqualEffMenu.LinksPersistInfo.AddRange(new DevExpress.XtraBars.LinkPersistInfo[] { new DevExpress.XtraBars.LinkPersistInfo(barBtnAddEqualEffByEff) });
            barBtnAddEqualEffMenu.Name = "barBtnAddEqualEffMenu";
            barBtnAddEqualEffMenu.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
            // 
            // barBtnAddEqualEffByEff
            // 
            barBtnAddEqualEffByEff.Caption = "效率点";
            barBtnAddEqualEffByEff.Id = 24;
            barBtnAddEqualEffByEff.ImageOptions.SvgImage = PhartRelation.Core.Properties.Resources.actions_addcircled3;
            barBtnAddEqualEffByEff.Name = "barBtnAddEqualEffByEff";
            barBtnAddEqualEffByEff.ItemClick += barBtnAddEqualEffByEff_ItemClick;
            // 
            // barDockControlTop
            // 
            barDockControlTop.CausesValidation = false;
            barDockControlTop.Dock = DockStyle.Top;
            barDockControlTop.Location = new Point(0, 0);
            barDockControlTop.Manager = barManager1;
            barDockControlTop.Size = new Size(1369, 68);
            barDockControlTop.Size = new Size(1369, 34);
            // 
            // barDockControlBottom
            // 
@@ -285,17 +285,17 @@
            // 
            barDockControlLeft.CausesValidation = false;
            barDockControlLeft.Dock = DockStyle.Left;
            barDockControlLeft.Location = new Point(0, 68);
            barDockControlLeft.Location = new Point(0, 34);
            barDockControlLeft.Manager = barManager1;
            barDockControlLeft.Size = new Size(0, 856);
            barDockControlLeft.Size = new Size(0, 890);
            // 
            // barDockControlRight
            // 
            barDockControlRight.CausesValidation = false;
            barDockControlRight.Dock = DockStyle.Right;
            barDockControlRight.Location = new Point(1369, 68);
            barDockControlRight.Location = new Point(1369, 34);
            barDockControlRight.Manager = barManager1;
            barDockControlRight.Size = new Size(0, 856);
            barDockControlRight.Size = new Size(0, 890);
            // 
            // PumpChartViewCtrl
            // 

 WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/01-pump/01-view/PumpChartViewCtrl.cs

@@ -1,5 +1,4 @@
using DevExpress.Spreadsheet;
using Mapster;
using StackExchange.Profiling.Internal;
using Yw.Ahart;
using Yw.Geometry;
@@ -18,9 +17,9 @@
            this.barCekPowerVisible.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
            this.barCekEqVisible.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;

            this.barBtnAddVariableSpeedMenu.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
            this.barBtnAddEqualEffMenu.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
            this.barCekEqulEffVisible.Visibility = DevExpress.XtraBars.BarItemVisibility.Never; 
            //this.barBtnAddVariableSpeedMenu.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
            //this.barBtnAddEqualEffMenu.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
            //this.barCekEqulEffVisible.Visibility = DevExpress.XtraBars.BarItemVisibility.Never; 
        }



 WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/03-valve/03-import/01-excel/ValveChartExcelImportCtrl.cs

@@ -1,5 +1,4 @@
using HStation.PhartRelation;
using Yw.Ahart;
using Yw.Ahart;
using Yw.WinFrmUI.Phart;

namespace HStation.WinFrmUI

 WinFrmUI/Yw.WinFrmUI.Phart.Core/01-pump/04-special/04-variable-speed/SetPointDlg.cs

@@ -9,6 +9,7 @@
            InitializeComponent();
        }


        public event Func<double, double, bool> VerifyValueChanged;

        public void SetBindingData(double? x = null, double? y = null)

 WinFrmUI/Yw.WinFrmUI.Phart.Core/01-pump/04-special/04-variable-speed/SetPointDlg.designer.cs

@@ -65,7 +65,7 @@
            layoutControl1.Name = "layoutControl1";
            layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(924, 0, 975, 600);
            layoutControl1.Root = Root;
            layoutControl1.Size = new Size(319, 120);
            layoutControl1.Size = new Size(325, 124);
            layoutControl1.TabIndex = 2;
            layoutControl1.Text = "layoutControl1";
            // 
@@ -74,10 +74,10 @@
            btnCancel.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
            btnCancel.Appearance.Options.UseBackColor = true;
            btnCancel.DialogResult = DialogResult.Cancel;
            btnCancel.Location = new Point(235, 76);
            btnCancel.Location = new Point(239, 76);
            btnCancel.Margin = new Padding(4, 5, 4, 5);
            btnCancel.Name = "btnCancel";
            btnCancel.Size = new Size(72, 32);
            btnCancel.Size = new Size(74, 32);
            btnCancel.StyleController = layoutControl1;
            btnCancel.TabIndex = 10;
            btnCancel.Text = "取消";
@@ -86,10 +86,10 @@
            // 
            btnOk.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary;
            btnOk.Appearance.Options.UseBackColor = true;
            btnOk.Location = new Point(161, 76);
            btnOk.Location = new Point(164, 76);
            btnOk.Margin = new Padding(4, 5, 4, 5);
            btnOk.Name = "btnOk";
            btnOk.Size = new Size(70, 32);
            btnOk.Size = new Size(71, 32);
            btnOk.StyleController = layoutControl1;
            btnOk.TabIndex = 9;
            btnOk.Text = "确定";
@@ -99,7 +99,7 @@
            // 
            txtX.Location = new Point(78, 12);
            txtX.Name = "txtX";
            txtX.Size = new Size(229, 28);
            txtX.Size = new Size(235, 28);
            txtX.StyleController = layoutControl1;
            txtX.TabIndex = 4;
            // 
@@ -107,7 +107,7 @@
            // 
            txtY.Location = new Point(78, 44);
            txtY.Name = "txtY";
            txtY.Size = new Size(229, 28);
            txtY.Size = new Size(235, 28);
            txtY.StyleController = layoutControl1;
            txtY.TabIndex = 5;
            // 
@@ -117,7 +117,7 @@
            Root.GroupBordersVisible = false;
            Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, layoutControlItem2, layoutControlItem3, emptySpaceItem1, layoutControlItem4 });
            Root.Name = "Root";
            Root.Size = new Size(319, 120);
            Root.Size = new Size(325, 124);
            Root.TextVisible = false;
            // 
            // layoutControlItem1
@@ -125,7 +125,7 @@
            layoutControlItem1.Control = txtX;
            layoutControlItem1.Location = new Point(0, 0);
            layoutControlItem1.Name = "layoutControlItem1";
            layoutControlItem1.Size = new Size(299, 32);
            layoutControlItem1.Size = new Size(305, 32);
            layoutControlItem1.Text = "流量：";
            layoutControlItem1.TextSize = new Size(54, 22);
            // 
@@ -134,16 +134,16 @@
            layoutControlItem2.Control = txtY;
            layoutControlItem2.Location = new Point(0, 32);
            layoutControlItem2.Name = "layoutControlItem2";
            layoutControlItem2.Size = new Size(299, 32);
            layoutControlItem2.Size = new Size(305, 32);
            layoutControlItem2.Text = "扬程:";
            layoutControlItem2.TextSize = new Size(54, 22);
            // 
            // layoutControlItem3
            // 
            layoutControlItem3.Control = btnCancel;
            layoutControlItem3.Location = new Point(223, 64);
            layoutControlItem3.Location = new Point(227, 64);
            layoutControlItem3.Name = "layoutControlItem3";
            layoutControlItem3.Size = new Size(76, 36);
            layoutControlItem3.Size = new Size(78, 40);
            layoutControlItem3.TextSize = new Size(0, 0);
            layoutControlItem3.TextVisible = false;
            // 
@@ -152,15 +152,15 @@
            emptySpaceItem1.AllowHotTrack = false;
            emptySpaceItem1.Location = new Point(0, 64);
            emptySpaceItem1.Name = "emptySpaceItem1";
            emptySpaceItem1.Size = new Size(149, 36);
            emptySpaceItem1.Size = new Size(152, 40);
            emptySpaceItem1.TextSize = new Size(0, 0);
            // 
            // layoutControlItem4
            // 
            layoutControlItem4.Control = btnOk;
            layoutControlItem4.Location = new Point(149, 64);
            layoutControlItem4.Location = new Point(152, 64);
            layoutControlItem4.Name = "layoutControlItem4";
            layoutControlItem4.Size = new Size(74, 36);
            layoutControlItem4.Size = new Size(75, 40);
            layoutControlItem4.TextSize = new Size(0, 0);
            layoutControlItem4.TextVisible = false;
            // 
@@ -172,7 +172,7 @@
            // 
            AutoScaleDimensions = new SizeF(10F, 22F);
            AutoScaleMode = AutoScaleMode.Font;
            ClientSize = new Size(319, 120);
            ClientSize = new Size(325, 124);
            Controls.Add(layoutControl1);
            IconOptions.ShowIcon = false;
            Margin = new Padding(4, 5, 4, 5);

 WinFrmUI/Yw.WinFrmUI.Phart.Core/03-valve/02-edit/ValveChartExcelEditCtrl.cs

@@ -12,6 +12,7 @@

        

            this.repImgCmbFeatType.Items.Add("穿过点", Yw.Ahart.eFeatType.Through, -1);
            this.repImgCmbFeatType.Items.Add("二次拟合", Yw.Ahart.eFeatType.Quadratic, -1);
            this.repImgCmbFeatType.Items.Add("三次拟合", Yw.Ahart.eFeatType.Cubic, -1);
            this.repImgCmbFeatType.Items.Add("四次拟合", Yw.Ahart.eFeatType.Quartic, -1);
@@ -37,7 +38,7 @@
        /// </summary> 
        public void SetBindingData(List<ValveEditChartViewModel> vm_list)
        {
            if (vm_list == null || !vm_list.Any())
             if (vm_list == null || !vm_list.Any())
            {
                this.valveEditChart1.Clear();
                return;
@@ -310,7 +311,9 @@

        private void SetChart()
        {
            var vm = _vm_list?.Find(x => x.IsUpdate);
            if (_vm_list == null || !_vm_list.Any())
                return;
            var vm = _vm_list.Find(x => x.IsUpdate);
            if (vm == null)
            {
                this.valveEditChart1.Clear();

 WinFrmUI/Yw.WinFrmUI.Phart.Core/Yw.WinFrmUI.Phart.Core.csproj

@@ -86,7 +86,7 @@
  <ItemGroup>
    <PackageReference Include="DevExpress.Win.Design" Version="23.2.4" />
    <PackageReference Include="NPOI" Version="2.7.1" />
    <PackageReference Include="Yw.Pump.Core" Version="3.2.1" />
    <PackageReference Include="Yw.Pump.Core" Version="3.2.2" />
    <PackageReference Include="Yw.Service.Phart.Core" Version="3.2.9" />
  </ItemGroup>