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

lixiaojun

2024-07-30 f45bba0b5ecf73df67af6cb60e57ea956d82a8ab

 WinFrmUI/HStation.WinFrmUI.Phart.Core/XhsPumpCurveMainPanel.Designer.cs

@@ -41,10 +41,22 @@
            barButtonItem3 = new DevExpress.XtraBars.BarButtonItem();
            barButtonItem4 = new DevExpress.XtraBars.BarButtonItem();
            barBtnDelete = new DevExpress.XtraBars.BarButtonItem();
            barBtnAddText = new DevExpress.XtraBars.BarButtonItem();
            ribbonPage1 = new DevExpress.XtraBars.Ribbon.RibbonPage();
            ribbonPageGroup1 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
            cubicSpline2dChart1 = new Yw.WinFrmUI.Phart.Cubic.CubicSpline2dChart();
            cubicSpline2dChart1 = new CubicSpline2dChart();
            layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
            Root = new DevExpress.XtraLayout.LayoutControlGroup();
            tabbedControlGroup1 = new DevExpress.XtraLayout.TabbedControlGroup();
            layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
            layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
            ((System.ComponentModel.ISupportInitialize)ribbonControl1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControl1).BeginInit();
            layoutControl1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)Root).BeginInit();
            ((System.ComponentModel.ISupportInitialize)tabbedControlGroup1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlGroup1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem1).BeginInit();
            SuspendLayout();
            // 
            // ribbonControl1
@@ -53,10 +65,10 @@
            ribbonControl1.EmptyAreaImageOptions.ImagePadding = new Padding(43, 47, 43, 47);
            ribbonControl1.ExpandCollapseItem.Id = 0;
            ribbonControl1.ItemPanelStyle = DevExpress.XtraBars.Ribbon.RibbonItemPanelStyle.Classic;
            ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, BtnAdd, BtnEdit, BtnDelete, barBtnEditPumpCurve, BarBtnEidtPumpPart, barCheckItem1, barBtnImportByExcel, barBtnImportByImage, barButtonItem3, barButtonItem4, barBtnDelete });
            ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, BtnAdd, BtnEdit, BtnDelete, barBtnEditPumpCurve, BarBtnEidtPumpPart, barCheckItem1, barBtnImportByExcel, barBtnImportByImage, barButtonItem3, barButtonItem4, barBtnDelete, barBtnAddText });
            ribbonControl1.Location = new Point(0, 0);
            ribbonControl1.Margin = new Padding(4, 5, 4, 5);
            ribbonControl1.MaxItemId = 28;
            ribbonControl1.MaxItemId = 29;
            ribbonControl1.Name = "ribbonControl1";
            ribbonControl1.OptionsMenuMinWidth = 471;
            ribbonControl1.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { ribbonPage1 });
@@ -143,6 +155,13 @@
            barBtnDelete.Name = "barBtnDelete";
            barBtnDelete.ItemClick += barBtnDelete_ItemClick;
            // 
            // barBtnAddText
            // 
            barBtnAddText.Caption = "新增文字(测试)";
            barBtnAddText.Id = 28;
            barBtnAddText.Name = "barBtnAddText";
            barBtnAddText.ItemClick += barBtnAddText_ItemClick;
            // 
            // ribbonPage1
            // 
            ribbonPage1.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] { ribbonPageGroup1 });
@@ -151,7 +170,7 @@
            // 
            // ribbonPageGroup1
            // 
            ribbonPageGroup1.ItemLinks.Add(barBtnDelete);
            ribbonPageGroup1.ItemLinks.Add(barBtnDelete, true);
            ribbonPageGroup1.ItemLinks.Add(barBtnImportByExcel, true);
            ribbonPageGroup1.ItemLinks.Add(barBtnImportByImage);
            ribbonPageGroup1.Name = "ribbonPageGroup1";
@@ -160,12 +179,62 @@
            // cubicSpline2dChart1
            // 
            cubicSpline2dChart1.DefinePointVisible = false;
            cubicSpline2dChart1.Dock = DockStyle.Fill;
            cubicSpline2dChart1.LineVisible = false;
            cubicSpline2dChart1.Location = new Point(0, 113);
            cubicSpline2dChart1.Location = new Point(3, 39);
            cubicSpline2dChart1.Name = "cubicSpline2dChart1";
            cubicSpline2dChart1.Size = new Size(1060, 691);
            cubicSpline2dChart1.Size = new Size(1054, 649);
            cubicSpline2dChart1.TabIndex = 1;
            // 
            // layoutControl1
            // 
            layoutControl1.Controls.Add(cubicSpline2dChart1);
            layoutControl1.Dock = DockStyle.Fill;
            layoutControl1.Location = new Point(0, 113);
            layoutControl1.Name = "layoutControl1";
            layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(958, 80, 975, 600);
            layoutControl1.Root = Root;
            layoutControl1.Size = new Size(1060, 691);
            layoutControl1.TabIndex = 3;
            layoutControl1.Text = "layoutControl1";
            // 
            // Root
            // 
            Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
            Root.GroupBordersVisible = false;
            Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { tabbedControlGroup1 });
            Root.Name = "Root";
            Root.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
            Root.Size = new Size(1060, 691);
            Root.TextVisible = false;
            // 
            // tabbedControlGroup1
            // 
            tabbedControlGroup1.Location = new Point(0, 0);
            tabbedControlGroup1.Name = "tabbedControlGroup1";
            tabbedControlGroup1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
            tabbedControlGroup1.SelectedTabPage = layoutControlGroup1;
            tabbedControlGroup1.Size = new Size(1060, 691);
            tabbedControlGroup1.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
            tabbedControlGroup1.TabPages.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlGroup1 });
            // 
            // layoutControlGroup1
            // 
            layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1 });
            layoutControlGroup1.Location = new Point(0, 0);
            layoutControlGroup1.Name = "layoutControlGroup1";
            layoutControlGroup1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
            layoutControlGroup1.Size = new Size(1058, 653);
            layoutControlGroup1.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
            layoutControlGroup1.Text = "性能曲线";
            // 
            // layoutControlItem1
            // 
            layoutControlItem1.Control = cubicSpline2dChart1;
            layoutControlItem1.Location = new Point(0, 0);
            layoutControlItem1.Name = "layoutControlItem1";
            layoutControlItem1.Size = new Size(1058, 653);
            layoutControlItem1.TextSize = new Size(0, 0);
            layoutControlItem1.TextVisible = false;
            // 
            // XhsPumpCurveMainPanel
            // 
@@ -173,12 +242,18 @@
            Appearance.Options.UseBackColor = true;
            AutoScaleDimensions = new SizeF(10F, 22F);
            AutoScaleMode = AutoScaleMode.Font;
            Controls.Add(cubicSpline2dChart1);
            Controls.Add(layoutControl1);
            Controls.Add(ribbonControl1);
            Margin = new Padding(6, 8, 6, 8);
            Name = "XhsPumpCurveMainPanel";
            Size = new Size(1060, 804);
            ((System.ComponentModel.ISupportInitialize)ribbonControl1).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControl1).EndInit();
            layoutControl1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)Root).EndInit();
            ((System.ComponentModel.ISupportInitialize)tabbedControlGroup1).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlGroup1).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem1).EndInit();
            ResumeLayout(false);
            PerformLayout();
        }
@@ -199,6 +274,12 @@
        private DevExpress.XtraBars.BarButtonItem barButtonItem3;
        private DevExpress.XtraBars.BarButtonItem barButtonItem4;
        private DevExpress.XtraBars.BarButtonItem barBtnDelete;
        private Yw.WinFrmUI.Phart.Cubic.CubicSpline2dChart cubicSpline2dChart1;
        private HStation.WinFrmUI.Phart.CubicSpline2dChart cubicSpline2dChart1;
        private DevExpress.XtraLayout.LayoutControl layoutControl1;
        private DevExpress.XtraLayout.LayoutControlGroup Root;
        private DevExpress.XtraLayout.TabbedControlGroup tabbedControlGroup1;
        private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
        private DevExpress.XtraBars.BarButtonItem barBtnAddText;
    }
}