Shuxia Ning
2024-12-23 187678cf0579c40066011ba392c15ca7f546c91f
Reprt Chart ViewModel
已删除1个文件
已修改3个文件
已添加6个文件
490 ■■■■ 文件已修改
Component/HStation.Report.SDK.Core/Class1.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Component/HStation.Report.SDK.Core/HStation.Report.SDK.Core.csproj 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Component/HStation.Report.SDK.Core/chart/PumpChartViewModel.cs 37 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Component/HStation.Report.SDK.Core/chart/curve/PumpCurveCoordinate.cs 93 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Component/HStation.Report.SDK.Core/chart/curve/PumpCurveEqualEffViewModel.cs 36 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Component/HStation.Report.SDK.Core/chart/curve/PumpCurveEqualPowerViewModel.cs 38 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Component/HStation.Report.SDK.Core/chart/curve/PumpCurveEquipViewModel.cs 43 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Component/HStation.Report.SDK.Core/chart/curve/PumpCurveViewModel.cs 53 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/Yw.WinFrmUI.Phart.Core/02-pump/03-import/03-point/PumpChartPointImportCtrl.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/Yw.WinFrmUI.Phart.Core/02-pump/03-import/03-point/PumpChartPointImportCtrl.designer.cs 178 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Component/HStation.Report.SDK.Core/Class1.cs
ÎļþÒÑɾ³ý
Component/HStation.Report.SDK.Core/HStation.Report.SDK.Core.csproj
@@ -6,4 +6,8 @@
    <Nullable>enable</Nullable>
  </PropertyGroup>
  <ItemGroup>
    <PackageReference Include="Yw.Pump.Core" Version="3.1.7" />
  </ItemGroup>
</Project>
Component/HStation.Report.SDK.Core/chart/PumpChartViewModel.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,37 @@
namespace HStation.Report
{
    public class PumpChartViewModel
    {
        /// <summary>
        /// é¢å®šæ›²çº¿
        /// </summary>
        public PumpCurveViewModel Rated { get; set; }
        /// <summary>
        /// è£…置线
        /// </summary>
        public PumpCurveEquipViewModel Equip { get; set; }
        /// <summary>
        /// å˜é€Ÿåˆ—表
        /// </summary>
        public List<PumpCurveViewModel> VariableSpeedList { get; set; }
        /// <summary>
        /// ç­‰æ•ˆçº¿åˆ—表
        /// </summary>
        public List<PumpCurveEqualEffViewModel> EqualEffList { get; set; }
        /// <summary>
        /// ç­‰åŠŸçŽ‡åˆ—è¡¨
        /// </summary>
        public List<PumpCurveEqualPowerViewModel> EqualPowerList { get; set; }
        /// <summary>
        /// åæ ‡
        /// </summary>
        public PumpCurveCoordinate Coordinate { get; set; }
    }
}
Component/HStation.Report.SDK.Core/chart/curve/PumpCurveCoordinate.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,93 @@
namespace HStation.Report
{
    /// <summary>
    /// æ³µæ›²çº¿åæ ‡å‚æ•°
    /// </summary>
    public class PumpCurveCoordinate
    {
        /// <summary>
        /// X坐标间隔数 åæ ‡çº¿æ¯”坐标间隔多1
        /// </summary>
        public int GridNumberX { get; set; }
        /// <summary>
        /// Y坐标间隔数 åæ ‡çº¿æ¯”坐标间隔多1
        /// </summary>
        public int GridNumberY { get; set; }
        /// <summary>
        /// æµé‡åæ ‡æœ€å°å€¼
        /// </summary>
        public double CoordMinQ { get; set; }
        /// <summary>
        /// æµé‡åæ ‡é—´éš”
        /// </summary>
        public double CoordSpaceQ { get; set; }
        /// <summary>
        /// æ‰¬ç¨‹åæ ‡æœ€å°å€¼
        /// </summary>
        public double CoordMinH { get; set; }
        /// <summary>
        /// æ‰¬ç¨‹åæ ‡é—´éš”
        /// </summary>
        public double CoordSpaceH { get; set; }
        /// <summary>
        /// æ‰¬ç¨‹å¼€å§‹çº¿å·
        /// </summary>
        public int StartLineNoH { get; set; }
        /// <summary>
        /// æ‰¬ç¨‹ç»“束线号
        /// </summary>
        public int EndLineNoH { get; set; }
        /// <summary>
        /// åŠŸçŽ‡åæ ‡æœ€å°å€¼
        /// </summary>
        public double CoordMinP { get; set; }
        /// <summary>
        /// åŠŸçŽ‡åæ ‡é—´éš”
        /// </summary>
        public double CoordSpaceP { get; set; }
        /// <summary>
        /// åŠŸçŽ‡å¼€å§‹çº¿å·
        /// </summary>
        public int StartLineNoP { get; set; }
        /// <summary>
        /// åŠŸçŽ‡ç»“æŸçº¿å·
        /// </summary>
        public int EndLineNoP { get; set; }
        /// <summary>
        /// æ•ˆçŽ‡åæ ‡æœ€å°å€¼
        /// </summary>
        public double CoordMinE { get; set; }
        /// <summary>
        /// æ•ˆçŽ‡åæ ‡é—´éš”
        /// </summary>
        public double CoordSpaceE { get; set; }
        /// <summary>
        /// æ•ˆçŽ‡å¼€å§‹çº¿å·
        /// </summary>
        public int StartLineNoE { get; set; }
        /// <summary>
        ///  æ•ˆçŽ‡ç»“æŸçº¿å·
        /// </summary>
        public int EndLineNoE { get; set; }
    }
}
Component/HStation.Report.SDK.Core/chart/curve/PumpCurveEqualEffViewModel.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,36 @@
using System.Drawing;
namespace HStation.Report
{
    /// <summary>
    ///
    /// </summary>
    public class PumpCurveEqualEffViewModel
    {
        /// <summary>
        /// æ ‡é¢˜
        /// </summary>
        public string Name { get; set; }
        /// <summary>
        /// é¢œè‰²
        /// </summary>
        public Color? Color { get; set; }
        /// <summary>
        /// ç­‰æ•ˆçº¿
        /// </summary>
        public List<Yw.Geometry.Point2d> CurveEqualEff { get; set; }
        /// <summary>
        /// å¼ åŠ›
        /// </summary>
        public double Tension { get; set; }
        /// <summary>
        /// æ˜¯å¦å°é—­
        /// </summary>
        public bool IsClosed { get; set; }
    }
}
Component/HStation.Report.SDK.Core/chart/curve/PumpCurveEqualPowerViewModel.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,38 @@
using System.Drawing;
namespace HStation.Report
{
    /// <summary>
    ///
    /// </summary>
    public class PumpCurveEqualPowerViewModel
    {
        /// <summary>
        /// æ ‡é¢˜
        /// </summary>
        public string Name { get; set; }
        /// <summary>
        /// é¢œè‰²
        /// </summary>
        public Color? Color { get; set; }
        /// <summary>
        /// ç­‰åŠŸçŽ‡çº¿
        /// </summary>
        public List<Yw.Geometry.Point2d> CurveEqualPower { get; set; }
        /// <summary>
        /// å¼ åŠ›
        /// </summary>
        public double Tension { get; set; }
        /// <summary>
        /// æ˜¯å¦å°é—­
        /// </summary>
        public bool IsClosed { get; set; }
    }
}
Component/HStation.Report.SDK.Core/chart/curve/PumpCurveEquipViewModel.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,43 @@
using System.Drawing;
namespace HStation.Report
{
    /// <summary>
    ///
    /// </summary>
    public class PumpCurveEquipViewModel
    {
        /// <summary>
        /// æ ‡é¢˜
        /// </summary>
        public string Name { get; set; }
        /// <summary>
        /// é¢œè‰²
        /// </summary>
        public Color? Color { get; set; }
        /// <summary>
        /// èµ·å§‹æ‰¬ç¨‹
        /// </summary>
        public double StartH { get; set; }
        /// <summary>
        /// æ€»ç®¡æµé‡
        /// </summary>
        public double PipeQ { get; set; }
        /// <summary>
        /// æ€»ç®¡æ‰¬ç¨‹
        /// </summary>
        public double PipeH { get; set; }
        /// <summary>
        /// è£…置线
        /// </summary>
        public List<Yw.Geometry.Point2d> CurveEquip { get; set; }
    }
}
Component/HStation.Report.SDK.Core/chart/curve/PumpCurveViewModel.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,53 @@
using System.Drawing;
namespace HStation.Report
{
    public class PumpCurveViewModel
    {
        /// <summary>
        /// æ ‡é¢˜
        /// </summary>
        public string Name { get; set; }
        /// <summary>
        /// é¢‘率
        /// </summary>
        public double Hz { get; set; }
        /// <summary>
        /// è½¬é€Ÿ
        /// </summary>
        public double N { get; set; }
        /// <summary>
        /// æ‰¬ç¨‹é¢œè‰²
        /// </summary>
        public Color? ColorQH { get; set; }
        /// <summary>
        /// æ•ˆçŽ‡é¢œè‰²
        /// </summary>
        public Color? ColorQE { get; set; }
        /// <summary>
        /// åŠŸçŽ‡é¢œè‰²
        /// </summary>
        public Color? ColorQP { get; set; }
        /// <summary>
        /// æµé‡æ‰¬ç¨‹æ›²çº¿
        /// </summary>
        public List<Yw.Geometry.Point2d> CurveQH { get; set; }
        /// <summary>
        /// æµé‡æ•ˆçŽ‡æ›²çº¿
        /// </summary>
        public List<Yw.Geometry.Point2d> CurveQE { get; set; }
        /// <summary>
        /// æµé‡åŠŸçŽ‡æ›²çº¿
        /// </summary>
        public List<Yw.Geometry.Point2d> CurveQP { get; set; }
    }
}
WinFrmUI/Yw.WinFrmUI.Phart.Core/02-pump/03-import/03-point/PumpChartPointImportCtrl.cs
@@ -12,6 +12,8 @@
        {
            InitializeComponent();
            this.comboBoxType.SelectedIndex = 0;
            this.sidePanel1.Visible = false;
            this.bar2.Visible = true;
        }
WinFrmUI/Yw.WinFrmUI.Phart.Core/02-pump/03-import/03-point/PumpChartPointImportCtrl.designer.cs
@@ -44,12 +44,6 @@
            txtNPSH = new DevExpress.XtraEditors.TextEdit();
            barManager1 = new DevExpress.XtraBars.BarManager(components);
            bar2 = new DevExpress.XtraBars.Bar();
            barImgCmbPumpType = new DevExpress.XtraBars.BarEditItem();
            repositoryItemImageComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemImageComboBox();
            barEditItem15 = new DevExpress.XtraBars.BarEditItem();
            repositoryItemButtonEdit3 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            barEditItem16 = new DevExpress.XtraBars.BarEditItem();
            repositoryItemButtonEdit4 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            barBtnCreate = new DevExpress.XtraBars.BarButtonItem();
            barEditItem1 = new DevExpress.XtraBars.BarEditItem();
            repositoryItemTextEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemTextEdit();
@@ -60,6 +54,13 @@
            barEditItem7 = new DevExpress.XtraBars.BarEditItem();
            repositoryItemSpinEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemSpinEdit();
            barCheckItem1 = new DevExpress.XtraBars.BarCheckItem();
            bar1 = new DevExpress.XtraBars.Bar();
            barImgCmbPumpType = new DevExpress.XtraBars.BarEditItem();
            repositoryItemImageComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemImageComboBox();
            barEditItem16 = new DevExpress.XtraBars.BarEditItem();
            repositoryItemButtonEdit4 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            barEditItem15 = new DevExpress.XtraBars.BarEditItem();
            repositoryItemButtonEdit3 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            barEditItem9 = new DevExpress.XtraBars.BarEditItem();
            repositoryItemTextEdit6 = new DevExpress.XtraEditors.Repository.RepositoryItemTextEdit();
            barEditItem10 = new DevExpress.XtraBars.BarEditItem();
@@ -116,13 +117,13 @@
            ((System.ComponentModel.ISupportInitialize)txtNS.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)txtNPSH.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)barManager1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)repositoryItemImageComboBox1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)repositoryItemButtonEdit3).BeginInit();
            ((System.ComponentModel.ISupportInitialize)repositoryItemButtonEdit4).BeginInit();
            ((System.ComponentModel.ISupportInitialize)repositoryItemTextEdit1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)repositoryItemTextEdit2).BeginInit();
            ((System.ComponentModel.ISupportInitialize)repositoryItemTextEdit3).BeginInit();
            ((System.ComponentModel.ISupportInitialize)repositoryItemSpinEdit1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)repositoryItemImageComboBox1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)repositoryItemButtonEdit4).BeginInit();
            ((System.ComponentModel.ISupportInitialize)repositoryItemButtonEdit3).BeginInit();
            ((System.ComponentModel.ISupportInitialize)repositoryItemTextEdit6).BeginInit();
            ((System.ComponentModel.ISupportInitialize)repositoryItemTextEdit7).BeginInit();
            ((System.ComponentModel.ISupportInitialize)repositoryItemTextEdit8).BeginInit();
@@ -173,7 +174,7 @@
            layoutControl1.Name = "layoutControl1";
            layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(934, 227, 975, 600);
            layoutControl1.Root = Root;
            layoutControl1.Size = new Size(364, 564);
            layoutControl1.Size = new Size(364, 539);
            layoutControl1.TabIndex = 39;
            layoutControl1.Text = "layoutControl1";
            // 
@@ -312,7 +313,7 @@
            // 
            // barManager1
            // 
            barManager1.Bars.AddRange(new DevExpress.XtraBars.Bar[] { bar2 });
            barManager1.Bars.AddRange(new DevExpress.XtraBars.Bar[] { bar2, bar1 });
            barManager1.DockControls.Add(barDockControlTop);
            barManager1.DockControls.Add(barDockControlBottom);
            barManager1.DockControls.Add(barDockControlLeft);
@@ -329,60 +330,11 @@
            bar2.DockCol = 0;
            bar2.DockRow = 0;
            bar2.DockStyle = DevExpress.XtraBars.BarDockStyle.Top;
            bar2.LinksPersistInfo.AddRange(new DevExpress.XtraBars.LinkPersistInfo[] { new DevExpress.XtraBars.LinkPersistInfo(barImgCmbPumpType), new DevExpress.XtraBars.LinkPersistInfo(barEditItem15), new DevExpress.XtraBars.LinkPersistInfo(barEditItem16), new DevExpress.XtraBars.LinkPersistInfo(DevExpress.XtraBars.BarLinkUserDefines.KeyTip, barBtnCreate, "", false, true, true, 0, null, DevExpress.XtraBars.BarItemPaintStyle.Standard, "计算", ""), new DevExpress.XtraBars.LinkPersistInfo(barEditItem1), new DevExpress.XtraBars.LinkPersistInfo(barEditItem2), new DevExpress.XtraBars.LinkPersistInfo(barEditItem3), new DevExpress.XtraBars.LinkPersistInfo(barEditItem7), new DevExpress.XtraBars.LinkPersistInfo(barCheckItem1), new DevExpress.XtraBars.LinkPersistInfo(barEditItem9), new DevExpress.XtraBars.LinkPersistInfo(barEditItem10), new DevExpress.XtraBars.LinkPersistInfo(barEditItem11), new DevExpress.XtraBars.LinkPersistInfo(barEditItem12) });
            bar2.LinksPersistInfo.AddRange(new DevExpress.XtraBars.LinkPersistInfo[] { new DevExpress.XtraBars.LinkPersistInfo(barEditItem1), new DevExpress.XtraBars.LinkPersistInfo(barEditItem2), new DevExpress.XtraBars.LinkPersistInfo(barEditItem3), new DevExpress.XtraBars.LinkPersistInfo(barEditItem7), new DevExpress.XtraBars.LinkPersistInfo(barCheckItem1), new DevExpress.XtraBars.LinkPersistInfo(barBtnCreate) });
            bar2.OptionsBar.DrawBorder = false;
            bar2.OptionsBar.DrawDragBorder = false;
            bar2.OptionsBar.MultiLine = true;
            bar2.OptionsBar.UseWholeRow = true;
            bar2.Text = "Main menu";
            //
            // barImgCmbPumpType
            //
            barImgCmbPumpType.Caption = "类型估算:";
            barImgCmbPumpType.Edit = repositoryItemImageComboBox1;
            barImgCmbPumpType.EditWidth = 140;
            barImgCmbPumpType.Id = 19;
            barImgCmbPumpType.Name = "barImgCmbPumpType";
            barImgCmbPumpType.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.Caption;
            barImgCmbPumpType.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
            //
            // repositoryItemImageComboBox1
            //
            repositoryItemImageComboBox1.AutoHeight = false;
            repositoryItemImageComboBox1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
            repositoryItemImageComboBox1.Name = "repositoryItemImageComboBox1";
            //
            // barEditItem15
            //
            barEditItem15.Caption = "效率:";
            barEditItem15.Edit = repositoryItemButtonEdit3;
            barEditItem15.EditWidth = 80;
            barEditItem15.Id = 17;
            barEditItem15.Name = "barEditItem15";
            barEditItem15.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.Caption;
            barEditItem15.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
            //
            // repositoryItemButtonEdit3
            //
            repositoryItemButtonEdit3.AutoHeight = false;
            repositoryItemButtonEdit3.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton() });
            repositoryItemButtonEdit3.Name = "repositoryItemButtonEdit3";
            //
            // barEditItem16
            //
            barEditItem16.Caption = "轴功率:";
            barEditItem16.Edit = repositoryItemButtonEdit4;
            barEditItem16.EditWidth = 80;
            barEditItem16.Id = 18;
            barEditItem16.Name = "barEditItem16";
            barEditItem16.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.Caption;
            barEditItem16.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
            //
            // repositoryItemButtonEdit4
            //
            repositoryItemButtonEdit4.AutoHeight = false;
            repositoryItemButtonEdit4.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton() });
            repositoryItemButtonEdit4.Name = "repositoryItemButtonEdit4";
            // 
            // barBtnCreate
            // 
@@ -396,13 +348,13 @@
            // 
            // barEditItem1
            // 
            barEditItem1.Alignment = DevExpress.XtraBars.BarItemLinkAlignment.Left;
            barEditItem1.Caption = "流量:";
            barEditItem1.Edit = repositoryItemTextEdit1;
            barEditItem1.EditWidth = 80;
            barEditItem1.Id = 1;
            barEditItem1.Name = "barEditItem1";
            barEditItem1.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.Caption;
            barEditItem1.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
            // 
            // repositoryItemTextEdit1
            // 
@@ -411,13 +363,13 @@
            // 
            // barEditItem2
            // 
            barEditItem2.Alignment = DevExpress.XtraBars.BarItemLinkAlignment.Left;
            barEditItem2.Caption = "扬程:";
            barEditItem2.Edit = repositoryItemTextEdit2;
            barEditItem2.EditWidth = 80;
            barEditItem2.Id = 2;
            barEditItem2.Name = "barEditItem2";
            barEditItem2.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.Caption;
            barEditItem2.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
            // 
            // repositoryItemTextEdit2
            // 
@@ -426,13 +378,13 @@
            // 
            // barEditItem3
            // 
            barEditItem3.Alignment = DevExpress.XtraBars.BarItemLinkAlignment.Left;
            barEditItem3.Caption = "转速:";
            barEditItem3.Edit = repositoryItemTextEdit3;
            barEditItem3.EditWidth = 80;
            barEditItem3.Id = 3;
            barEditItem3.Name = "barEditItem3";
            barEditItem3.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.Caption;
            barEditItem3.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
            // 
            // repositoryItemTextEdit3
            // 
@@ -441,13 +393,13 @@
            // 
            // barEditItem7
            // 
            barEditItem7.Alignment = DevExpress.XtraBars.BarItemLinkAlignment.Left;
            barEditItem7.Caption = "叶轮级数:";
            barEditItem7.Edit = repositoryItemSpinEdit1;
            barEditItem7.EditWidth = 50;
            barEditItem7.Id = 7;
            barEditItem7.Name = "barEditItem7";
            barEditItem7.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.Caption;
            barEditItem7.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
            // 
            // repositoryItemSpinEdit1
            // 
@@ -457,12 +409,71 @@
            // 
            // barCheckItem1
            // 
            barCheckItem1.Alignment = DevExpress.XtraBars.BarItemLinkAlignment.Left;
            barCheckItem1.Caption = "双吸泵";
            barCheckItem1.CausesValidation = true;
            barCheckItem1.CheckBoxVisibility = DevExpress.XtraBars.CheckBoxVisibility.BeforeText;
            barCheckItem1.Id = 9;
            barCheckItem1.Name = "barCheckItem1";
            barCheckItem1.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
            //
            // bar1
            //
            bar1.BarName = "Custom 2";
            bar1.DockCol = 0;
            bar1.DockRow = 1;
            bar1.DockStyle = DevExpress.XtraBars.BarDockStyle.Top;
            bar1.LinksPersistInfo.AddRange(new DevExpress.XtraBars.LinkPersistInfo[] { new DevExpress.XtraBars.LinkPersistInfo(barImgCmbPumpType), new DevExpress.XtraBars.LinkPersistInfo(barEditItem16), new DevExpress.XtraBars.LinkPersistInfo(barEditItem15), new DevExpress.XtraBars.LinkPersistInfo(barEditItem9), new DevExpress.XtraBars.LinkPersistInfo(barEditItem10), new DevExpress.XtraBars.LinkPersistInfo(barEditItem11), new DevExpress.XtraBars.LinkPersistInfo(barEditItem12) });
            bar1.OptionsBar.AllowQuickCustomization = false;
            bar1.OptionsBar.DrawBorder = false;
            bar1.OptionsBar.DrawDragBorder = false;
            bar1.OptionsBar.MultiLine = true;
            bar1.OptionsBar.RotateWhenVertical = false;
            bar1.Text = "Custom 2";
            //
            // barImgCmbPumpType
            //
            barImgCmbPumpType.Caption = "类型估算:";
            barImgCmbPumpType.Edit = repositoryItemImageComboBox1;
            barImgCmbPumpType.EditWidth = 140;
            barImgCmbPumpType.Id = 19;
            barImgCmbPumpType.Name = "barImgCmbPumpType";
            barImgCmbPumpType.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.Caption;
            //
            // repositoryItemImageComboBox1
            //
            repositoryItemImageComboBox1.AutoHeight = false;
            repositoryItemImageComboBox1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
            repositoryItemImageComboBox1.Name = "repositoryItemImageComboBox1";
            //
            // barEditItem16
            //
            barEditItem16.Caption = "轴功率:";
            barEditItem16.Edit = repositoryItemButtonEdit4;
            barEditItem16.EditWidth = 80;
            barEditItem16.Id = 18;
            barEditItem16.Name = "barEditItem16";
            barEditItem16.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.Caption;
            //
            // repositoryItemButtonEdit4
            //
            repositoryItemButtonEdit4.AutoHeight = false;
            repositoryItemButtonEdit4.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton() });
            repositoryItemButtonEdit4.Name = "repositoryItemButtonEdit4";
            //
            // barEditItem15
            //
            barEditItem15.Caption = "效率:";
            barEditItem15.Edit = repositoryItemButtonEdit3;
            barEditItem15.EditWidth = 80;
            barEditItem15.Id = 17;
            barEditItem15.Name = "barEditItem15";
            barEditItem15.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.Caption;
            //
            // repositoryItemButtonEdit3
            //
            repositoryItemButtonEdit3.AutoHeight = false;
            repositoryItemButtonEdit3.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton() });
            repositoryItemButtonEdit3.Name = "repositoryItemButtonEdit3";
            // 
            // barEditItem9
            // 
@@ -472,7 +483,6 @@
            barEditItem9.Id = 10;
            barEditItem9.Name = "barEditItem9";
            barEditItem9.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.Caption;
            barEditItem9.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
            // 
            // repositoryItemTextEdit6
            // 
@@ -487,7 +497,6 @@
            barEditItem10.Id = 11;
            barEditItem10.Name = "barEditItem10";
            barEditItem10.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.Caption;
            barEditItem10.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
            // 
            // repositoryItemTextEdit7
            // 
@@ -502,7 +511,6 @@
            barEditItem11.Id = 12;
            barEditItem11.Name = "barEditItem11";
            barEditItem11.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.Caption;
            barEditItem11.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
            // 
            // repositoryItemTextEdit8
            // 
@@ -517,7 +525,6 @@
            barEditItem12.Id = 13;
            barEditItem12.Name = "barEditItem12";
            barEditItem12.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.Caption;
            barEditItem12.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
            // 
            // repositoryItemTextEdit9
            // 
@@ -530,7 +537,7 @@
            barDockControlTop.Dock = DockStyle.Top;
            barDockControlTop.Location = new Point(0, 0);
            barDockControlTop.Manager = barManager1;
            barDockControlTop.Size = new Size(1000, 96);
            barDockControlTop.Size = new Size(1000, 121);
            // 
            // barDockControlBottom
            // 
@@ -544,17 +551,17 @@
            // 
            barDockControlLeft.CausesValidation = false;
            barDockControlLeft.Dock = DockStyle.Left;
            barDockControlLeft.Location = new Point(0, 96);
            barDockControlLeft.Location = new Point(0, 121);
            barDockControlLeft.Manager = barManager1;
            barDockControlLeft.Size = new Size(0, 564);
            barDockControlLeft.Size = new Size(0, 539);
            // 
            // barDockControlRight
            // 
            barDockControlRight.CausesValidation = false;
            barDockControlRight.Dock = DockStyle.Right;
            barDockControlRight.Location = new Point(1000, 96);
            barDockControlRight.Location = new Point(1000, 121);
            barDockControlRight.Manager = barManager1;
            barDockControlRight.Size = new Size(0, 564);
            barDockControlRight.Size = new Size(0, 539);
            // 
            // barEditItem4
            // 
@@ -619,7 +626,7 @@
            Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlGroup1, layoutControlGroup2 });
            Root.Name = "Root";
            Root.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
            Root.Size = new Size(364, 564);
            Root.Size = new Size(364, 539);
            Root.TextVisible = false;
            // 
            // layoutControlGroup1
@@ -684,7 +691,7 @@
            layoutControlGroup2.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem6, layoutControlItem7, layoutControlItem8, layoutControlItem10, layoutControlItem11, layoutControlItem12, labReckon, labCalcuE, labCalcuP, layoutControlItem9 });
            layoutControlGroup2.Location = new Point(0, 212);
            layoutControlGroup2.Name = "layoutControlGroup2";
            layoutControlGroup2.Size = new Size(364, 352);
            layoutControlGroup2.Size = new Size(364, 327);
            layoutControlGroup2.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
            layoutControlGroup2.Text = "其他参数(可空)";
            // 
@@ -738,7 +745,7 @@
            layoutControlItem12.Control = txtNS;
            layoutControlItem12.Location = new Point(0, 192);
            layoutControlItem12.Name = "layoutControlItem12";
            layoutControlItem12.Size = new Size(344, 107);
            layoutControlItem12.Size = new Size(344, 82);
            layoutControlItem12.Text = "比转速:";
            layoutControlItem12.TextSize = new Size(114, 22);
            // 
@@ -800,18 +807,18 @@
            // 
            sidePanel1.Controls.Add(layoutControl1);
            sidePanel1.Dock = DockStyle.Right;
            sidePanel1.Location = new Point(635, 96);
            sidePanel1.Location = new Point(635, 121);
            sidePanel1.Name = "sidePanel1";
            sidePanel1.Size = new Size(365, 564);
            sidePanel1.Size = new Size(365, 539);
            sidePanel1.TabIndex = 5;
            sidePanel1.Text = "sidePanel1";
            // 
            // pumpViewChart1
            // 
            pumpViewChart1.Dock = DockStyle.Fill;
            pumpViewChart1.Location = new Point(0, 96);
            pumpViewChart1.Location = new Point(0, 121);
            pumpViewChart1.Name = "pumpViewChart1";
            pumpViewChart1.Size = new Size(635, 564);
            pumpViewChart1.Size = new Size(635, 539);
            pumpViewChart1.TabIndex = 10;
            // 
            // PumpChartPointImportCtrl
@@ -842,13 +849,13 @@
            ((System.ComponentModel.ISupportInitialize)txtNS.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)txtNPSH.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)barManager1).EndInit();
            ((System.ComponentModel.ISupportInitialize)repositoryItemImageComboBox1).EndInit();
            ((System.ComponentModel.ISupportInitialize)repositoryItemButtonEdit3).EndInit();
            ((System.ComponentModel.ISupportInitialize)repositoryItemButtonEdit4).EndInit();
            ((System.ComponentModel.ISupportInitialize)repositoryItemTextEdit1).EndInit();
            ((System.ComponentModel.ISupportInitialize)repositoryItemTextEdit2).EndInit();
            ((System.ComponentModel.ISupportInitialize)repositoryItemTextEdit3).EndInit();
            ((System.ComponentModel.ISupportInitialize)repositoryItemSpinEdit1).EndInit();
            ((System.ComponentModel.ISupportInitialize)repositoryItemImageComboBox1).EndInit();
            ((System.ComponentModel.ISupportInitialize)repositoryItemButtonEdit4).EndInit();
            ((System.ComponentModel.ISupportInitialize)repositoryItemButtonEdit3).EndInit();
            ((System.ComponentModel.ISupportInitialize)repositoryItemTextEdit6).EndInit();
            ((System.ComponentModel.ISupportInitialize)repositoryItemTextEdit7).EndInit();
            ((System.ComponentModel.ISupportInitialize)repositoryItemTextEdit8).EndInit();
@@ -955,5 +962,6 @@
        private DevExpress.XtraEditors.Repository.RepositoryItemImageComboBox repositoryItemImageComboBox1;
        private DevExpress.XtraBars.BarEditItem barCmbPumpType;
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit2;
        private DevExpress.XtraBars.Bar bar1;
    }
}