From 651d1f87d2e0e26021c20f3667e1db7b1349b478 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期一, 23 九月 2024 10:27:44 +0800
Subject: [PATCH] 冲突缺少文件补充

---
 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-scheme/03-hydraulic-simulation/01-PumpMainCurveChoice/PumpMainForm.Designer.cs |  466 +++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 265 insertions(+), 201 deletions(-)

diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-scheme/03-hydraulic-simulation/01-PumpMainCurveChoice/PumpMainForm.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-scheme/03-hydraulic-simulation/01-PumpMainCurveChoice/PumpMainForm.Designer.cs
index 1b7e270..37801be 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-scheme/03-hydraulic-simulation/01-PumpMainCurveChoice/PumpMainForm.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-scheme/03-hydraulic-simulation/01-PumpMainCurveChoice/PumpMainForm.Designer.cs
@@ -1,6 +1,6 @@
-锘縩amespace HStation.WinFrmUI.Xhs
+锘縩amespace HStation.WinFrmUI.Xhs.Core
 {
-    partial class PumpMainCurveForm
+    partial class PumpMainForm
     {
         /// <summary> 
         /// Required designer variable.
@@ -29,263 +29,322 @@
         private void InitializeComponent()
         {
             layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
-            TextEditDescription = new DevExpress.XtraEditors.TextEdit();
-            TextEditD2 = new DevExpress.XtraEditors.TextEdit();
-            TextEditErosion = new DevExpress.XtraEditors.TextEdit();
-            TextEditRatedPower = new DevExpress.XtraEditors.TextEdit();
-            TextEditRatedSpeed = new DevExpress.XtraEditors.TextEdit();
-            TextEditName = new DevExpress.XtraEditors.TextEdit();
-            TextEditRatedFlow = new DevExpress.XtraEditors.TextEdit();
-            TextEditRatedHead = new DevExpress.XtraEditors.TextEdit();
-            comboBoxPumpCurve = new DevExpress.XtraEditors.ImageComboBoxEdit();
+            gridControl1 = new DevExpress.XtraGrid.GridControl();
+            gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+            gridControl2 = new DevExpress.XtraGrid.GridControl();
+            gridView2 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            colName = new DevExpress.XtraGrid.Columns.GridColumn();
+            colRatedFlow = new DevExpress.XtraGrid.Columns.GridColumn();
+            colRatedHead = new DevExpress.XtraGrid.Columns.GridColumn();
+            colD2 = new DevExpress.XtraGrid.Columns.GridColumn();
+            colErosion = new DevExpress.XtraGrid.Columns.GridColumn();
+            colRatedEfficiency = new DevExpress.XtraGrid.Columns.GridColumn();
+            colRatedPower = new DevExpress.XtraGrid.Columns.GridColumn();
+            colRatedSpeed = new DevExpress.XtraGrid.Columns.GridColumn();
+            xtrPerform2dChart1 = new Yw.WinFrmUI.Phart.XtrPerform2dChart();
+            searchControl1 = new SearchControl();
             Root = new DevExpress.XtraLayout.LayoutControlGroup();
-            layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+            layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
             layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
-            layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
-            layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+            simpleLabelItem1 = new DevExpress.XtraLayout.SimpleLabelItem();
+            layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+            layoutControlGroup2 = new DevExpress.XtraLayout.LayoutControlGroup();
             layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
-            layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
-            layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
-            layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
-            layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+            layoutControlGroup3 = new DevExpress.XtraLayout.LayoutControlGroup();
+            layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
             ((ISupportInitialize)layoutControl1).BeginInit();
             layoutControl1.SuspendLayout();
-            ((ISupportInitialize)TextEditDescription.Properties).BeginInit();
-            ((ISupportInitialize)TextEditD2.Properties).BeginInit();
-            ((ISupportInitialize)TextEditErosion.Properties).BeginInit();
-            ((ISupportInitialize)TextEditRatedPower.Properties).BeginInit();
-            ((ISupportInitialize)TextEditRatedSpeed.Properties).BeginInit();
-            ((ISupportInitialize)TextEditName.Properties).BeginInit();
-            ((ISupportInitialize)TextEditRatedFlow.Properties).BeginInit();
-            ((ISupportInitialize)TextEditRatedHead.Properties).BeginInit();
-            ((ISupportInitialize)comboBoxPumpCurve.Properties).BeginInit();
+            ((ISupportInitialize)gridControl1).BeginInit();
+            ((ISupportInitialize)gridView1).BeginInit();
+            ((ISupportInitialize)gridControl2).BeginInit();
+            ((ISupportInitialize)gridView2).BeginInit();
+            ((ISupportInitialize)searchControl1.Properties).BeginInit();
             ((ISupportInitialize)Root).BeginInit();
-            ((ISupportInitialize)layoutControlItem1).BeginInit();
+            ((ISupportInitialize)layoutControlGroup1).BeginInit();
             ((ISupportInitialize)layoutControlItem2).BeginInit();
-            ((ISupportInitialize)layoutControlItem4).BeginInit();
-            ((ISupportInitialize)layoutControlItem6).BeginInit();
+            ((ISupportInitialize)simpleLabelItem1).BeginInit();
+            ((ISupportInitialize)layoutControlItem1).BeginInit();
+            ((ISupportInitialize)layoutControlGroup2).BeginInit();
             ((ISupportInitialize)layoutControlItem3).BeginInit();
-            ((ISupportInitialize)layoutControlItem5).BeginInit();
-            ((ISupportInitialize)layoutControlItem7).BeginInit();
-            ((ISupportInitialize)layoutControlItem9).BeginInit();
-            ((ISupportInitialize)layoutControlItem8).BeginInit();
+            ((ISupportInitialize)layoutControlGroup3).BeginInit();
+            ((ISupportInitialize)layoutControlItem4).BeginInit();
             SuspendLayout();
             // 
             // layoutControl1
             // 
-            layoutControl1.Controls.Add(TextEditDescription);
-            layoutControl1.Controls.Add(TextEditD2);
-            layoutControl1.Controls.Add(TextEditErosion);
-            layoutControl1.Controls.Add(TextEditRatedPower);
-            layoutControl1.Controls.Add(TextEditRatedSpeed);
-            layoutControl1.Controls.Add(TextEditName);
-            layoutControl1.Controls.Add(TextEditRatedFlow);
-            layoutControl1.Controls.Add(TextEditRatedHead);
-            layoutControl1.Controls.Add(comboBoxPumpCurve);
+            layoutControl1.Controls.Add(gridControl1);
+            layoutControl1.Controls.Add(gridControl2);
+            layoutControl1.Controls.Add(xtrPerform2dChart1);
+            layoutControl1.Controls.Add(searchControl1);
             layoutControl1.Dock = DockStyle.Fill;
             layoutControl1.Location = new Point(0, 0);
             layoutControl1.Name = "layoutControl1";
+            layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(713, 300, 650, 400);
             layoutControl1.Root = Root;
-            layoutControl1.Size = new Size(689, 158);
+            layoutControl1.Size = new Size(1343, 607);
             layoutControl1.TabIndex = 0;
             layoutControl1.Text = "layoutControl1";
             // 
-            // TextEditDescription
+            // gridControl1
             // 
-            TextEditDescription.Location = new Point(114, 108);
-            TextEditDescription.Name = "TextEditDescription";
-            TextEditDescription.Size = new Size(563, 20);
-            TextEditDescription.StyleController = layoutControl1;
-            TextEditDescription.TabIndex = 9;
+            gridControl1.Location = new Point(12, 425);
+            gridControl1.MainView = gridView1;
+            gridControl1.Margin = new Padding(0);
+            gridControl1.Name = "gridControl1";
+            gridControl1.Size = new Size(739, 170);
+            gridControl1.TabIndex = 4;
+            gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridView1 });
             // 
-            // TextEditD2
+            // gridView1
             // 
-            TextEditD2.Location = new Point(438, 36);
-            TextEditD2.Name = "TextEditD2";
-            TextEditD2.Size = new Size(239, 20);
-            TextEditD2.StyleController = layoutControl1;
-            TextEditD2.TabIndex = 4;
+            gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { gridColumn1 });
+            gridView1.GridControl = gridControl1;
+            gridView1.Name = "gridView1";
+            gridView1.OptionsView.ShowGroupPanel = false;
+             gridView1.FocusedRowChanged += gridView1_FocusedRowChanged;
             // 
-            // TextEditErosion
+            // gridColumn1
             // 
-            TextEditErosion.Location = new Point(114, 60);
-            TextEditErosion.Name = "TextEditErosion";
-            TextEditErosion.Size = new Size(218, 20);
-            TextEditErosion.StyleController = layoutControl1;
-            TextEditErosion.TabIndex = 5;
+            gridColumn1.Caption = "鍚嶇О";
+            gridColumn1.FieldName = "OtherName";
+            gridColumn1.Name = "gridColumn1";
+            gridColumn1.Visible = true;
+            gridColumn1.VisibleIndex = 0;
             // 
-            // TextEditRatedPower
+            // gridControl2
             // 
-            TextEditRatedPower.Location = new Point(438, 60);
-            TextEditRatedPower.Name = "TextEditRatedPower";
-            TextEditRatedPower.Size = new Size(239, 20);
-            TextEditRatedPower.StyleController = layoutControl1;
-            TextEditRatedPower.TabIndex = 6;
+            gridControl2.Location = new Point(12, 58);
+            gridControl2.MainView = gridView2;
+            gridControl2.Name = "gridControl2";
+            gridControl2.Size = new Size(739, 341);
+            gridControl2.TabIndex = 3;
+            gridControl2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridView2 });
             // 
-            // TextEditRatedSpeed
+            // gridView2
             // 
-            TextEditRatedSpeed.Location = new Point(438, 84);
-            TextEditRatedSpeed.Name = "TextEditRatedSpeed";
-            TextEditRatedSpeed.Size = new Size(239, 20);
-            TextEditRatedSpeed.StyleController = layoutControl1;
-            TextEditRatedSpeed.TabIndex = 8;
+            gridView2.Appearance.HeaderPanel.Options.UseTextOptions = true;
+            gridView2.Appearance.HeaderPanel.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
+            gridView2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colName, colRatedFlow, colRatedHead, colD2, colErosion, colRatedEfficiency, colRatedPower, colRatedSpeed });
+            gridView2.GridControl = gridControl2;
+            gridView2.Name = "gridView2";
+            gridView2.OptionsView.ShowGroupPanel = false;
+            gridView2.FocusedRowChanged += gridView2_FocusedRowChanged;
             // 
-            // TextEditName
+            // colName
             // 
-            TextEditName.Location = new Point(114, 12);
-            TextEditName.Name = "TextEditName";
-            TextEditName.Size = new Size(218, 20);
-            TextEditName.StyleController = layoutControl1;
-            TextEditName.TabIndex = 0;
+            colName.Caption = "鍨嬪彿";
+            colName.FieldName = "Name";
+            colName.Name = "colName";
+            colName.Visible = true;
+            colName.VisibleIndex = 0;
+            colName.Width = 149;
             // 
-            // TextEditRatedFlow
+            // colRatedFlow
             // 
-            TextEditRatedFlow.Location = new Point(438, 12);
-            TextEditRatedFlow.Name = "TextEditRatedFlow";
-            TextEditRatedFlow.Size = new Size(239, 20);
-            TextEditRatedFlow.StyleController = layoutControl1;
-            TextEditRatedFlow.TabIndex = 2;
+            colRatedFlow.Caption = "棰濆畾娴侀噺(m鲁/h)";
+            colRatedFlow.FieldName = "RatedFlow";
+            colRatedFlow.Name = "colRatedFlow";
+            colRatedFlow.Visible = true;
+            colRatedFlow.VisibleIndex = 1;
+            colRatedFlow.Width = 185;
             // 
-            // TextEditRatedHead
+            // colRatedHead
             // 
-            TextEditRatedHead.Location = new Point(114, 36);
-            TextEditRatedHead.Name = "TextEditRatedHead";
-            TextEditRatedHead.Size = new Size(218, 20);
-            TextEditRatedHead.StyleController = layoutControl1;
-            TextEditRatedHead.TabIndex = 3;
+            colRatedHead.Caption = "棰濆畾鎵▼(m)";
+            colRatedHead.FieldName = "RatedHead";
+            colRatedHead.Name = "colRatedHead";
+            colRatedHead.Visible = true;
+            colRatedHead.VisibleIndex = 2;
+            colRatedHead.Width = 187;
             // 
-            // comboBoxPumpCurve
+            // colD2
             // 
-            comboBoxPumpCurve.Location = new Point(114, 84);
-            comboBoxPumpCurve.Name = "comboBoxPumpCurve";
-            comboBoxPumpCurve.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
-            comboBoxPumpCurve.Properties.NullText = "涓嬫媺閫夋嫨鏇茬嚎";
-            comboBoxPumpCurve.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
-            comboBoxPumpCurve.Size = new Size(218, 20);
-            comboBoxPumpCurve.StyleController = layoutControl1;
-            comboBoxPumpCurve.TabIndex = 7;
-            comboBoxPumpCurve.SelectedIndexChanged += comboBoxPumpCurve_SelectedIndexChanged;
+            colD2.Caption = "鍙惰疆澶栧緞(mm)";
+            colD2.FieldName = "D2";
+            colD2.Name = "colD2";
+            colD2.Visible = true;
+            colD2.VisibleIndex = 3;
+            colD2.Width = 179;
+            // 
+            // colErosion
+            // 
+            colErosion.Caption = "姘旇殌";
+            colErosion.FieldName = "Erosion";
+            colErosion.Name = "colErosion";
+            colErosion.Visible = true;
+            colErosion.VisibleIndex = 4;
+            colErosion.Width = 102;
+            // 
+            // colRatedEfficiency
+            // 
+            colRatedEfficiency.Caption = "棰濆畾鏁堢巼";
+            colRatedEfficiency.FieldName = "RatedEfficiency";
+            colRatedEfficiency.Name = "colRatedEfficiency";
+            colRatedEfficiency.Visible = true;
+            colRatedEfficiency.VisibleIndex = 5;
+            colRatedEfficiency.Width = 111;
+            // 
+            // colRatedPower
+            // 
+            colRatedPower.Caption = "棰濆畾鍔熺巼";
+            colRatedPower.FieldName = "RatedPower";
+            colRatedPower.Name = "colRatedPower";
+            colRatedPower.Visible = true;
+            colRatedPower.VisibleIndex = 6;
+            colRatedPower.Width = 111;
+            // 
+            // colRatedSpeed
+            // 
+            colRatedSpeed.Caption = "棰濆畾杞��";
+            colRatedSpeed.FieldName = "RatedSpeed";
+            colRatedSpeed.Name = "colRatedSpeed";
+            colRatedSpeed.Visible = true;
+            colRatedSpeed.VisibleIndex = 7;
+            colRatedSpeed.Width = 146;
+            // 
+            // xtrPerform2dChart1
+            // 
+            xtrPerform2dChart1.DefinePointVisible = false;
+            xtrPerform2dChart1.LineVisible = false;
+            xtrPerform2dChart1.Location = new Point(763, 42);
+            xtrPerform2dChart1.Margin = new Padding(2, 2, 2, 2);
+            xtrPerform2dChart1.Name = "xtrPerform2dChart1";
+            xtrPerform2dChart1.Size = new Size(560, 545);
+            xtrPerform2dChart1.TabIndex = 2;
+            // 
+            // searchControl1
+            // 
+            searchControl1.Client = gridControl2;
+            searchControl1.Location = new Point(69, 12);
+            searchControl1.Name = "searchControl1";
+            searchControl1.Properties.Buttons.AddRange(new EditorButton[] { new DevExpress.XtraEditors.Repository.ClearButton(), new DevExpress.XtraEditors.Repository.SearchButton() });
+            searchControl1.Properties.Client = gridControl2;
+            searchControl1.Size = new Size(380, 20);
+            searchControl1.StyleController = layoutControl1;
+            searchControl1.TabIndex = 0;
             // 
             // Root
             // 
-            Root.AppearanceItemCaption.Options.UseTextOptions = true;
-            Root.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far;
             Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
             Root.GroupBordersVisible = false;
-            Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, layoutControlItem2, layoutControlItem4, layoutControlItem6, layoutControlItem3, layoutControlItem5, layoutControlItem7, layoutControlItem9, layoutControlItem8 });
+            Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlGroup1, simpleLabelItem1, layoutControlItem1, layoutControlGroup2, layoutControlGroup3 });
             Root.Name = "Root";
-            Root.Size = new Size(689, 158);
+            Root.Size = new Size(1343, 607);
             Root.TextVisible = false;
             // 
-            // layoutControlItem1
+            // layoutControlGroup1
             // 
-            layoutControlItem1.Control = TextEditRatedHead;
-            layoutControlItem1.Location = new Point(0, 24);
-            layoutControlItem1.Name = "layoutControlItem1";
-            layoutControlItem1.Size = new Size(324, 24);
-            layoutControlItem1.Text = "棰濆畾鎵▼(m):";
-            layoutControlItem1.TextSize = new Size(90, 14);
+            layoutControlGroup1.AppearanceGroup.FontSizeDelta = 2;
+            layoutControlGroup1.AppearanceGroup.FontStyleDelta = FontStyle.Bold;
+            layoutControlGroup1.AppearanceGroup.Options.UseFont = true;
+            layoutControlGroup1.GroupStyle = DevExpress.Utils.GroupStyle.Title;
+            layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem2 });
+            layoutControlGroup1.Location = new Point(743, 0);
+            layoutControlGroup1.Name = "layoutControlGroup1";
+            layoutControlGroup1.Padding = new DevExpress.XtraLayout.Utils.Padding(8, 8, 8, 8);
+            layoutControlGroup1.Size = new Size(580, 587);
+            layoutControlGroup1.Text = "鏇茬嚎瑙嗗浘";
             // 
             // layoutControlItem2
             // 
-            layoutControlItem2.Control = TextEditName;
+            layoutControlItem2.Control = xtrPerform2dChart1;
             layoutControlItem2.Location = new Point(0, 0);
             layoutControlItem2.Name = "layoutControlItem2";
-            layoutControlItem2.Size = new Size(324, 24);
-            layoutControlItem2.Text = "鍨嬪彿:";
-            layoutControlItem2.TextSize = new Size(90, 14);
+            layoutControlItem2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
+            layoutControlItem2.Size = new Size(560, 545);
+            layoutControlItem2.TextSize = new Size(0, 0);
+            layoutControlItem2.TextVisible = false;
             // 
-            // layoutControlItem4
+            // simpleLabelItem1
             // 
-            layoutControlItem4.Control = TextEditErosion;
-            layoutControlItem4.Location = new Point(0, 48);
-            layoutControlItem4.Name = "layoutControlItem4";
-            layoutControlItem4.Size = new Size(324, 24);
-            layoutControlItem4.Text = "姘旇殌:";
-            layoutControlItem4.TextSize = new Size(90, 14);
+            simpleLabelItem1.AllowHotTrack = false;
+            simpleLabelItem1.Location = new Point(441, 0);
+            simpleLabelItem1.Name = "simpleLabelItem1";
+            simpleLabelItem1.Size = new Size(302, 24);
+            simpleLabelItem1.Text = " ";
+            simpleLabelItem1.TextSize = new Size(4, 14);
             // 
-            // layoutControlItem6
+            // layoutControlItem1
             // 
-            layoutControlItem6.Control = TextEditRatedSpeed;
-            layoutControlItem6.Location = new Point(324, 72);
-            layoutControlItem6.Name = "layoutControlItem6";
-            layoutControlItem6.Size = new Size(345, 24);
-            layoutControlItem6.Text = "棰濆畾杞��:";
-            layoutControlItem6.TextSize = new Size(90, 14);
+            layoutControlItem1.Control = searchControl1;
+            layoutControlItem1.Location = new Point(0, 0);
+            layoutControlItem1.Name = "layoutControlItem1";
+            layoutControlItem1.Size = new Size(441, 24);
+            layoutControlItem1.Text = "妯$硦鎼滅储:";
+            layoutControlItem1.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
+            layoutControlItem1.TextSize = new Size(52, 14);
+            layoutControlItem1.TextToControlDistance = 5;
+            // 
+            // layoutControlGroup2
+            // 
+            layoutControlGroup2.AppearanceGroup.FontSizeDelta = 2;
+            layoutControlGroup2.AppearanceGroup.FontStyleDelta = FontStyle.Bold;
+            layoutControlGroup2.AppearanceGroup.Options.UseFont = true;
+            layoutControlGroup2.GroupStyle = DevExpress.Utils.GroupStyle.Title;
+            layoutControlGroup2.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem3 });
+            layoutControlGroup2.Location = new Point(0, 391);
+            layoutControlGroup2.Name = "layoutControlGroup2";
+            layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
+            layoutControlGroup2.Size = new Size(743, 196);
+            layoutControlGroup2.Text = "鏇茬嚎鍒楄〃";
             // 
             // layoutControlItem3
             // 
-            layoutControlItem3.Control = TextEditRatedFlow;
-            layoutControlItem3.Location = new Point(324, 0);
+            layoutControlItem3.Control = gridControl1;
+            layoutControlItem3.Location = new Point(0, 0);
             layoutControlItem3.Name = "layoutControlItem3";
-            layoutControlItem3.Size = new Size(345, 24);
-            layoutControlItem3.Text = "棰濆畾娴侀噺(m鲁/h):";
-            layoutControlItem3.TextSize = new Size(90, 14);
+            layoutControlItem3.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
+            layoutControlItem3.Size = new Size(739, 170);
+            layoutControlItem3.TextSize = new Size(0, 0);
+            layoutControlItem3.TextVisible = false;
             // 
-            // layoutControlItem5
+            // layoutControlGroup3
             // 
-            layoutControlItem5.Control = TextEditD2;
-            layoutControlItem5.Location = new Point(324, 24);
-            layoutControlItem5.Name = "layoutControlItem5";
-            layoutControlItem5.Size = new Size(345, 24);
-            layoutControlItem5.Text = "鍙惰疆澶栧緞(mm):";
-            layoutControlItem5.TextSize = new Size(90, 14);
+            layoutControlGroup3.AppearanceGroup.FontSizeDelta = 2;
+            layoutControlGroup3.AppearanceGroup.FontStyleDelta = FontStyle.Bold;
+            layoutControlGroup3.AppearanceGroup.Options.UseFont = true;
+            layoutControlGroup3.GroupStyle = DevExpress.Utils.GroupStyle.Title;
+            layoutControlGroup3.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem4 });
+            layoutControlGroup3.Location = new Point(0, 24);
+            layoutControlGroup3.Name = "layoutControlGroup3";
+            layoutControlGroup3.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
+            layoutControlGroup3.Size = new Size(743, 367);
+            layoutControlGroup3.Text = "娉靛瀷鍙峰垪琛�";
             // 
-            // layoutControlItem7
+            // layoutControlItem4
             // 
-            layoutControlItem7.Control = TextEditRatedPower;
-            layoutControlItem7.Location = new Point(324, 48);
-            layoutControlItem7.Name = "layoutControlItem7";
-            layoutControlItem7.Size = new Size(345, 24);
-            layoutControlItem7.Text = "棰濆畾鍔熺巼:";
-            layoutControlItem7.TextSize = new Size(90, 14);
+            layoutControlItem4.Control = gridControl2;
+            layoutControlItem4.Location = new Point(0, 0);
+            layoutControlItem4.Name = "layoutControlItem4";
+            layoutControlItem4.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
+            layoutControlItem4.Size = new Size(739, 341);
+            layoutControlItem4.TextSize = new Size(0, 0);
+            layoutControlItem4.TextVisible = false;
             // 
-            // layoutControlItem9
-            // 
-            layoutControlItem9.Control = TextEditDescription;
-            layoutControlItem9.Location = new Point(0, 96);
-            layoutControlItem9.Name = "layoutControlItem9";
-            layoutControlItem9.Size = new Size(669, 42);
-            layoutControlItem9.Text = "璇存槑:";
-            layoutControlItem9.TextSize = new Size(90, 14);
-            // 
-            // layoutControlItem8
-            // 
-            layoutControlItem8.Control = comboBoxPumpCurve;
-            layoutControlItem8.Location = new Point(0, 72);
-            layoutControlItem8.Name = "layoutControlItem8";
-            layoutControlItem8.Size = new Size(324, 24);
-            layoutControlItem8.Text = "娉垫洸绾�:";
-            layoutControlItem8.TextSize = new Size(90, 14);
-            // 
-            // PumpMainCurveForm
+            // XtraUserControl1
             // 
             AutoScaleDimensions = new SizeF(7F, 14F);
             AutoScaleMode = AutoScaleMode.Font;
             Controls.Add(layoutControl1);
-            Name = "PumpMainCurveForm";
-            Size = new Size(689, 158);
+            Name = "XtraUserControl1";
+            Size = new Size(1343, 607);
             ((ISupportInitialize)layoutControl1).EndInit();
             layoutControl1.ResumeLayout(false);
-            ((ISupportInitialize)TextEditDescription.Properties).EndInit();
-            ((ISupportInitialize)TextEditD2.Properties).EndInit();
-            ((ISupportInitialize)TextEditErosion.Properties).EndInit();
-            ((ISupportInitialize)TextEditRatedPower.Properties).EndInit();
-            ((ISupportInitialize)TextEditRatedSpeed.Properties).EndInit();
-            ((ISupportInitialize)TextEditName.Properties).EndInit();
-            ((ISupportInitialize)TextEditRatedFlow.Properties).EndInit();
-            ((ISupportInitialize)TextEditRatedHead.Properties).EndInit();
-            ((ISupportInitialize)comboBoxPumpCurve.Properties).EndInit();
+            ((ISupportInitialize)gridControl1).EndInit();
+            ((ISupportInitialize)gridView1).EndInit();
+            ((ISupportInitialize)gridControl2).EndInit();
+            ((ISupportInitialize)gridView2).EndInit();
+            ((ISupportInitialize)searchControl1.Properties).EndInit();
             ((ISupportInitialize)Root).EndInit();
-            ((ISupportInitialize)layoutControlItem1).EndInit();
+            ((ISupportInitialize)layoutControlGroup1).EndInit();
             ((ISupportInitialize)layoutControlItem2).EndInit();
-            ((ISupportInitialize)layoutControlItem4).EndInit();
-            ((ISupportInitialize)layoutControlItem6).EndInit();
+            ((ISupportInitialize)simpleLabelItem1).EndInit();
+            ((ISupportInitialize)layoutControlItem1).EndInit();
+            ((ISupportInitialize)layoutControlGroup2).EndInit();
             ((ISupportInitialize)layoutControlItem3).EndInit();
-            ((ISupportInitialize)layoutControlItem5).EndInit();
-            ((ISupportInitialize)layoutControlItem7).EndInit();
-            ((ISupportInitialize)layoutControlItem9).EndInit();
-            ((ISupportInitialize)layoutControlItem8).EndInit();
+            ((ISupportInitialize)layoutControlGroup3).EndInit();
+            ((ISupportInitialize)layoutControlItem4).EndInit();
             ResumeLayout(false);
         }
 
@@ -293,23 +352,28 @@
 
         private DevExpress.XtraLayout.LayoutControl layoutControl1;
         private DevExpress.XtraLayout.LayoutControlGroup Root;
-        private DevExpress.XtraEditors.TextEdit TextEditDescription;
-        private DevExpress.XtraEditors.TextEdit TextEditD2;
-        private DevExpress.XtraEditors.TextEdit TextEditErosion;
-        private DevExpress.XtraEditors.TextEdit TextEditRatedPower;
-        private DevExpress.XtraEditors.TextEdit TextEditRatedSpeed;
-        private DevExpress.XtraEditors.TextEdit TextEditName;
-        private DevExpress.XtraEditors.TextEdit TextEditRatedFlow;
-        private DevExpress.XtraEditors.TextEdit TextEditRatedHead;
+        private DevExpress.XtraLayout.SimpleLabelItem simpleLabelItem1;
+        private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1;
+        private DevExpress.XtraEditors.SearchControl searchControl1;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
+        private Yw.WinFrmUI.Phart.XtrPerform2dChart xtrPerform2dChart1;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
+        private DevExpress.XtraGrid.GridControl gridControl2;
+        private DevExpress.XtraGrid.Views.Grid.GridView gridView2;
+        private DevExpress.XtraGrid.Columns.GridColumn colName;
+        private DevExpress.XtraGrid.Columns.GridColumn colRatedFlow;
+        private DevExpress.XtraGrid.Columns.GridColumn colRatedHead;
+        private DevExpress.XtraGrid.Columns.GridColumn colD2;
+        private DevExpress.XtraGrid.Columns.GridColumn colErosion;
+        private DevExpress.XtraGrid.Columns.GridColumn colRatedEfficiency;
+        private DevExpress.XtraGrid.Columns.GridColumn colRatedPower;
+        private DevExpress.XtraGrid.Columns.GridColumn colRatedSpeed;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
+        private DevExpress.XtraGrid.GridControl gridControl1;
+        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+        private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup2;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
-        private DevExpress.XtraEditors.ImageComboBoxEdit comboBoxPumpCurve;
+        private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup3;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
     }
 }

--
Gitblit v1.9.3