From 492fbc0052225864e97cceb66d86d3fdf9dee961 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期四, 05 十二月 2024 16:18:36 +0800
Subject: [PATCH] 修改匹配方法以及单独匹配

---
 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/01-pumpsinglematching/SimulationPumpSingleMatchingDlg.Designer.cs |  573 +++++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 474 insertions(+), 99 deletions(-)

diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/01-pumpsinglematching/SimulationPumpSingleMatchingDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/01-pumpsinglematching/SimulationPumpSingleMatchingDlg.Designer.cs
index e4b7fdd..7575fbd 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/01-pumpsinglematching/SimulationPumpSingleMatchingDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/01-pumpsinglematching/SimulationPumpSingleMatchingDlg.Designer.cs
@@ -1,5 +1,5 @@
-锘縩amespace HStation.WinFrmUI 
-{ 
+锘縩amespace HStation.WinFrmUI
+{
     partial class SimulationPumpSingleMatchingDlg
     {
         /// <summary>
@@ -28,123 +28,448 @@
         /// </summary>
         private void InitializeComponent()
         {
+            ComponentResourceManager resources = new ComponentResourceManager(typeof(SimulationPumpSingleMatchingDlg));
+            ribbon = new DevExpress.XtraBars.Ribbon.RibbonControl();
+            barEditSearch = new DevExpress.XtraBars.BarEditItem();
+            repSearchCtrl = new DevExpress.XtraEditors.Repository.RepositoryItemSearchControl();
+            gridControlPumpMain = new DevExpress.XtraGrid.GridControl();
+            gridViewPumpMain = 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();
+            barBtnOK = new DevExpress.XtraBars.BarButtonItem();
+            ribbonPage1 = new DevExpress.XtraBars.Ribbon.RibbonPage();
+            ribbonPageGroup1 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
+            xtrPerform2dChart1 = new Yw.WinFrmUI.Phart.PumpViewChart();
+            sidePanel1 = new SidePanel();
+            sidePanel3 = new SidePanel();
+            layoutControl3 = new DevExpress.XtraLayout.LayoutControl();
+            gridControlCurve = new DevExpress.XtraGrid.GridControl();
+            gridViewCurve = new DevExpress.XtraGrid.Views.Grid.GridView();
+            gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+            gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+            gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+            layoutControlGroup6 = new DevExpress.XtraLayout.LayoutControlGroup();
+            layoutControlGroup7 = new DevExpress.XtraLayout.LayoutControlGroup();
+            layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+            sidePanel2 = new SidePanel();
+            layoutControl2 = new DevExpress.XtraLayout.LayoutControl();
+            layoutControlGroup4 = new DevExpress.XtraLayout.LayoutControlGroup();
+            layoutControlGroup5 = new DevExpress.XtraLayout.LayoutControlGroup();
+            layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
             layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
-            pumpSingleMatchingCtrl = new PumpSingleMatchingCtrl();
-            btnComplete = new SimpleButton();
-            btnCancel = new SimpleButton();
             Root = new DevExpress.XtraLayout.LayoutControlGroup();
-            emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
-            itemForCancel = new DevExpress.XtraLayout.LayoutControlItem();
-            itemForComplete = new DevExpress.XtraLayout.LayoutControlItem();
+            layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
             layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+            ((ISupportInitialize)ribbon).BeginInit();
+            ((ISupportInitialize)repSearchCtrl).BeginInit();
+            ((ISupportInitialize)gridControlPumpMain).BeginInit();
+            ((ISupportInitialize)gridViewPumpMain).BeginInit();
+            sidePanel1.SuspendLayout();
+            sidePanel3.SuspendLayout();
+            ((ISupportInitialize)layoutControl3).BeginInit();
+            layoutControl3.SuspendLayout();
+            ((ISupportInitialize)gridControlCurve).BeginInit();
+            ((ISupportInitialize)gridViewCurve).BeginInit();
+            ((ISupportInitialize)layoutControlGroup6).BeginInit();
+            ((ISupportInitialize)layoutControlGroup7).BeginInit();
+            ((ISupportInitialize)layoutControlItem3).BeginInit();
+            sidePanel2.SuspendLayout();
+            ((ISupportInitialize)layoutControl2).BeginInit();
+            layoutControl2.SuspendLayout();
+            ((ISupportInitialize)layoutControlGroup4).BeginInit();
+            ((ISupportInitialize)layoutControlGroup5).BeginInit();
+            ((ISupportInitialize)layoutControlItem4).BeginInit();
             ((ISupportInitialize)layoutControl1).BeginInit();
             layoutControl1.SuspendLayout();
             ((ISupportInitialize)Root).BeginInit();
-            ((ISupportInitialize)emptySpaceItem1).BeginInit();
-            ((ISupportInitialize)itemForCancel).BeginInit();
-            ((ISupportInitialize)itemForComplete).BeginInit();
+            ((ISupportInitialize)layoutControlGroup1).BeginInit();
             ((ISupportInitialize)layoutControlItem1).BeginInit();
             SuspendLayout();
             // 
+            // ribbon
+            // 
+            ribbon.EmptyAreaImageOptions.ImagePadding = new Padding(21, 19, 21, 19);
+            ribbon.ExpandCollapseItem.Id = 0;
+            ribbon.ItemPanelStyle = DevExpress.XtraBars.Ribbon.RibbonItemPanelStyle.Classic;
+            ribbon.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbon.ExpandCollapseItem, barEditSearch, barBtnOK });
+            ribbon.Location = new Point(0, 0);
+            ribbon.Margin = new Padding(2);
+            ribbon.MaxItemId = 3;
+            ribbon.Name = "ribbon";
+            ribbon.OptionsMenuMinWidth = 231;
+            ribbon.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { ribbonPage1 });
+            ribbon.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { repSearchCtrl });
+            ribbon.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonControlStyle.TabletOffice;
+            ribbon.SearchItemPosition = DevExpress.XtraBars.Ribbon.SearchItemPosition.None;
+            ribbon.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.False;
+            ribbon.ShowDisplayOptionsMenuButton = DevExpress.Utils.DefaultBoolean.False;
+            ribbon.ShowExpandCollapseButton = DevExpress.Utils.DefaultBoolean.False;
+            ribbon.ShowMoreCommandsButton = DevExpress.Utils.DefaultBoolean.False;
+            ribbon.ShowPageHeadersInFormCaption = DevExpress.Utils.DefaultBoolean.False;
+            ribbon.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide;
+            ribbon.ShowQatLocationSelector = false;
+            ribbon.ShowToolbarCustomizeItem = false;
+            ribbon.Size = new Size(1244, 57);
+            ribbon.Toolbar.ShowCustomizeItem = false;
+            // 
+            // barEditSearch
+            // 
+            barEditSearch.Edit = repSearchCtrl;
+            barEditSearch.EditWidth = 200;
+            barEditSearch.Id = 1;
+            barEditSearch.Name = "barEditSearch";
+            // 
+            // repSearchCtrl
+            // 
+            repSearchCtrl.AutoHeight = false;
+            repSearchCtrl.Buttons.AddRange(new EditorButton[] { new DevExpress.XtraEditors.Repository.ClearButton(), new DevExpress.XtraEditors.Repository.SearchButton() });
+            repSearchCtrl.Client = gridControlPumpMain;
+            repSearchCtrl.Name = "repSearchCtrl";
+            repSearchCtrl.NullValuePrompt = "鍨嬪彿";
+            // 
+            // gridControlPumpMain
+            // 
+            gridControlPumpMain.EmbeddedNavigator.Margin = new Padding(4, 5, 4, 5);
+            gridControlPumpMain.Location = new Point(0, 22);
+            gridControlPumpMain.MainView = gridViewPumpMain;
+            gridControlPumpMain.Margin = new Padding(4, 5, 4, 5);
+            gridControlPumpMain.Name = "gridControlPumpMain";
+            gridControlPumpMain.Size = new Size(718, 299);
+            gridControlPumpMain.TabIndex = 3;
+            gridControlPumpMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridViewPumpMain });
+            // 
+            // gridViewPumpMain
+            // 
+            gridViewPumpMain.Appearance.HeaderPanel.Options.UseTextOptions = true;
+            gridViewPumpMain.Appearance.HeaderPanel.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
+            gridViewPumpMain.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colName, colRatedFlow, colRatedHead, colD2, colErosion, colRatedEfficiency, colRatedPower, colRatedSpeed });
+            gridViewPumpMain.DetailHeight = 550;
+            gridViewPumpMain.GridControl = gridControlPumpMain;
+            gridViewPumpMain.Name = "gridViewPumpMain";
+            gridViewPumpMain.OptionsEditForm.PopupEditFormWidth = 1143;
+            gridViewPumpMain.OptionsView.ShowGroupPanel = false;
+            gridViewPumpMain.FocusedRowChanged += gridViewPumpMain_FocusedRowChanged;
+            // 
+            // colName
+            // 
+            colName.Caption = "鍨嬪彿";
+            colName.FieldName = "Name";
+            colName.MinWidth = 29;
+            colName.Name = "colName";
+            colName.Visible = true;
+            colName.VisibleIndex = 0;
+            colName.Width = 407;
+            // 
+            // colRatedFlow
+            // 
+            colRatedFlow.Caption = "棰濆畾娴侀噺(m鲁/h)";
+            colRatedFlow.FieldName = "RatedFlow";
+            colRatedFlow.MinWidth = 29;
+            colRatedFlow.Name = "colRatedFlow";
+            colRatedFlow.Visible = true;
+            colRatedFlow.VisibleIndex = 1;
+            colRatedFlow.Width = 107;
+            // 
+            // colRatedHead
+            // 
+            colRatedHead.Caption = "棰濆畾鎵▼(m)";
+            colRatedHead.FieldName = "RatedHead";
+            colRatedHead.MinWidth = 29;
+            colRatedHead.Name = "colRatedHead";
+            colRatedHead.Visible = true;
+            colRatedHead.VisibleIndex = 2;
+            colRatedHead.Width = 87;
+            // 
+            // colD2
+            // 
+            colD2.Caption = "鍙惰疆澶栧緞(mm)";
+            colD2.FieldName = "D2";
+            colD2.MinWidth = 29;
+            colD2.Name = "colD2";
+            colD2.Visible = true;
+            colD2.VisibleIndex = 3;
+            colD2.Width = 110;
+            // 
+            // colErosion
+            // 
+            colErosion.Caption = "姘旇殌";
+            colErosion.FieldName = "Erosion";
+            colErosion.MinWidth = 29;
+            colErosion.Name = "colErosion";
+            colErosion.Visible = true;
+            colErosion.VisibleIndex = 4;
+            colErosion.Width = 62;
+            // 
+            // colRatedEfficiency
+            // 
+            colRatedEfficiency.Caption = "棰濆畾鏁堢巼";
+            colRatedEfficiency.FieldName = "RatedEfficiency";
+            colRatedEfficiency.MinWidth = 29;
+            colRatedEfficiency.Name = "colRatedEfficiency";
+            colRatedEfficiency.Visible = true;
+            colRatedEfficiency.VisibleIndex = 5;
+            colRatedEfficiency.Width = 72;
+            // 
+            // colRatedPower
+            // 
+            colRatedPower.Caption = "棰濆畾鍔熺巼";
+            colRatedPower.FieldName = "RatedPower";
+            colRatedPower.MinWidth = 29;
+            colRatedPower.Name = "colRatedPower";
+            colRatedPower.Visible = true;
+            colRatedPower.VisibleIndex = 6;
+            colRatedPower.Width = 64;
+            // 
+            // colRatedSpeed
+            // 
+            colRatedSpeed.Caption = "棰濆畾杞��";
+            colRatedSpeed.FieldName = "RatedSpeed";
+            colRatedSpeed.MinWidth = 29;
+            colRatedSpeed.Name = "colRatedSpeed";
+            colRatedSpeed.Visible = true;
+            colRatedSpeed.VisibleIndex = 7;
+            colRatedSpeed.Width = 97;
+            // 
+            // barBtnOK
+            // 
+            barBtnOK.Caption = "淇濆瓨";
+            barBtnOK.Id = 2;
+            barBtnOK.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnOK.ImageOptions.SvgImage");
+            barBtnOK.Name = "barBtnOK";
+            barBtnOK.ItemClick += barBtnOK_ItemClick;
+            // 
+            // ribbonPage1
+            // 
+            ribbonPage1.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] { ribbonPageGroup1 });
+            ribbonPage1.Name = "ribbonPage1";
+            ribbonPage1.Text = "ribbonPage1";
+            // 
+            // ribbonPageGroup1
+            // 
+            ribbonPageGroup1.ItemLinks.Add(barEditSearch);
+            ribbonPageGroup1.ItemLinks.Add(barBtnOK);
+            ribbonPageGroup1.Name = "ribbonPageGroup1";
+            ribbonPageGroup1.Text = "鎼滅储";
+            // 
+            // xtrPerform2dChart1
+            // 
+            xtrPerform2dChart1.DefinePointVisible = false;
+            xtrPerform2dChart1.LineVisible = false;
+            xtrPerform2dChart1.Location = new Point(0, 22);
+            xtrPerform2dChart1.Margin = new Padding(1);
+            xtrPerform2dChart1.Name = "xtrPerform2dChart1";
+            xtrPerform2dChart1.Size = new Size(526, 636);
+            xtrPerform2dChart1.TabIndex = 3;
+            // 
+            // sidePanel1
+            // 
+            sidePanel1.BorderThickness = 0;
+            sidePanel1.Controls.Add(sidePanel3);
+            sidePanel1.Controls.Add(sidePanel2);
+            sidePanel1.Dock = DockStyle.Left;
+            sidePanel1.Location = new Point(0, 57);
+            sidePanel1.Name = "sidePanel1";
+            sidePanel1.Size = new Size(718, 658);
+            sidePanel1.TabIndex = 4;
+            sidePanel1.Text = "sidePanel1";
+            // 
+            // sidePanel3
+            // 
+            sidePanel3.BorderThickness = 0;
+            sidePanel3.Controls.Add(layoutControl3);
+            sidePanel3.Dock = DockStyle.Fill;
+            sidePanel3.Location = new Point(0, 321);
+            sidePanel3.Name = "sidePanel3";
+            sidePanel3.Size = new Size(718, 337);
+            sidePanel3.TabIndex = 6;
+            sidePanel3.Text = "sidePanel3";
+            // 
+            // layoutControl3
+            // 
+            layoutControl3.Controls.Add(gridControlCurve);
+            layoutControl3.Dock = DockStyle.Fill;
+            layoutControl3.Location = new Point(0, 0);
+            layoutControl3.Name = "layoutControl3";
+            layoutControl3.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(1227, 608, 975, 600);
+            layoutControl3.Root = layoutControlGroup6;
+            layoutControl3.Size = new Size(718, 337);
+            layoutControl3.TabIndex = 0;
+            layoutControl3.Text = "layoutControl3";
+            // 
+            // gridControlCurve
+            // 
+            gridControlCurve.Location = new Point(0, 22);
+            gridControlCurve.MainView = gridViewCurve;
+            gridControlCurve.Margin = new Padding(0);
+            gridControlCurve.Name = "gridControlCurve";
+            gridControlCurve.Size = new Size(718, 315);
+            gridControlCurve.TabIndex = 4;
+            gridControlCurve.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridViewCurve });
+            // 
+            // gridViewCurve
+            // 
+            gridViewCurve.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { gridColumn3, gridColumn2, gridColumn1 });
+            gridViewCurve.GridControl = gridControlCurve;
+            gridViewCurve.Name = "gridViewCurve";
+            gridViewCurve.OptionsView.ShowGroupPanel = false;
+            gridViewCurve.FocusedRowChanged += gridViewCurve_FocusedRowChanged;
+            // 
+            // gridColumn3
+            // 
+            gridColumn3.Caption = "鎺掑簭鐮�";
+            gridColumn3.FieldName = "SortCode";
+            gridColumn3.Name = "gridColumn3";
+            // 
+            // gridColumn2
+            // 
+            gridColumn2.Caption = "閲嶈搴�";
+            gridColumn2.FieldName = "Importance";
+            gridColumn2.Name = "gridColumn2";
+            gridColumn2.Visible = true;
+            gridColumn2.VisibleIndex = 1;
+            // 
+            // gridColumn1
+            // 
+            gridColumn1.Caption = "鍚嶇О";
+            gridColumn1.FieldName = "OtherName";
+            gridColumn1.Name = "gridColumn1";
+            gridColumn1.Visible = true;
+            gridColumn1.VisibleIndex = 0;
+            // 
+            // layoutControlGroup6
+            // 
+            layoutControlGroup6.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+            layoutControlGroup6.GroupBordersVisible = false;
+            layoutControlGroup6.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlGroup7 });
+            layoutControlGroup6.Name = "Root";
+            layoutControlGroup6.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
+            layoutControlGroup6.Size = new Size(718, 337);
+            layoutControlGroup6.TextVisible = false;
+            // 
+            // layoutControlGroup7
+            // 
+            layoutControlGroup7.GroupStyle = DevExpress.Utils.GroupStyle.Title;
+            layoutControlGroup7.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem3 });
+            layoutControlGroup7.Location = new Point(0, 0);
+            layoutControlGroup7.Name = "layoutControlGroup7";
+            layoutControlGroup7.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
+            layoutControlGroup7.Size = new Size(718, 337);
+            layoutControlGroup7.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
+            layoutControlGroup7.Text = "娉靛瀷鍙锋洸绾�";
+            // 
+            // layoutControlItem3
+            // 
+            layoutControlItem3.Control = gridControlCurve;
+            layoutControlItem3.Location = new Point(0, 0);
+            layoutControlItem3.Name = "layoutControlItem3";
+            layoutControlItem3.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
+            layoutControlItem3.Size = new Size(718, 315);
+            layoutControlItem3.TextSize = new Size(0, 0);
+            layoutControlItem3.TextVisible = false;
+            // 
+            // sidePanel2
+            // 
+            sidePanel2.BorderThickness = 0;
+            sidePanel2.Controls.Add(layoutControl2);
+            sidePanel2.Dock = DockStyle.Top;
+            sidePanel2.Location = new Point(0, 0);
+            sidePanel2.Margin = new Padding(4, 5, 4, 5);
+            sidePanel2.Name = "sidePanel2";
+            sidePanel2.Size = new Size(718, 321);
+            sidePanel2.TabIndex = 5;
+            sidePanel2.Text = "sidePanel2";
+            // 
+            // layoutControl2
+            // 
+            layoutControl2.Controls.Add(gridControlPumpMain);
+            layoutControl2.Dock = DockStyle.Fill;
+            layoutControl2.Location = new Point(0, 0);
+            layoutControl2.Margin = new Padding(6, 8, 6, 8);
+            layoutControl2.Name = "layoutControl2";
+            layoutControl2.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(760, 358, 975, 600);
+            layoutControl2.Root = layoutControlGroup4;
+            layoutControl2.Size = new Size(718, 321);
+            layoutControl2.TabIndex = 0;
+            layoutControl2.Text = "layoutControl2";
+            // 
+            // layoutControlGroup4
+            // 
+            layoutControlGroup4.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+            layoutControlGroup4.GroupBordersVisible = false;
+            layoutControlGroup4.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlGroup5 });
+            layoutControlGroup4.Name = "Root";
+            layoutControlGroup4.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
+            layoutControlGroup4.Size = new Size(718, 321);
+            layoutControlGroup4.TextVisible = false;
+            // 
+            // layoutControlGroup5
+            // 
+            layoutControlGroup5.GroupStyle = DevExpress.Utils.GroupStyle.Title;
+            layoutControlGroup5.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem4 });
+            layoutControlGroup5.Location = new Point(0, 0);
+            layoutControlGroup5.Name = "layoutControlGroup5";
+            layoutControlGroup5.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
+            layoutControlGroup5.Size = new Size(718, 321);
+            layoutControlGroup5.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
+            layoutControlGroup5.Text = "娉靛瀷鍙�";
+            // 
+            // layoutControlItem4
+            // 
+            layoutControlItem4.Control = gridControlPumpMain;
+            layoutControlItem4.Location = new Point(0, 0);
+            layoutControlItem4.Name = "layoutControlItem4";
+            layoutControlItem4.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
+            layoutControlItem4.Size = new Size(718, 299);
+            layoutControlItem4.TextSize = new Size(0, 0);
+            layoutControlItem4.TextVisible = false;
+            // 
             // layoutControl1
             // 
-            layoutControl1.Controls.Add(pumpSingleMatchingCtrl);
-            layoutControl1.Controls.Add(btnComplete);
-            layoutControl1.Controls.Add(btnCancel);
+            layoutControl1.Controls.Add(xtrPerform2dChart1);
             layoutControl1.Dock = DockStyle.Fill;
-            layoutControl1.Location = new Point(0, 0);
+            layoutControl1.Location = new Point(718, 57);
+            layoutControl1.Margin = new Padding(2);
             layoutControl1.Name = "layoutControl1";
-            layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(1222, 300, 650, 400);
+            layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(1487, 656, 975, 600);
             layoutControl1.Root = Root;
-            layoutControl1.Size = new Size(1347, 703);
+            layoutControl1.Size = new Size(526, 658);
             layoutControl1.TabIndex = 6;
             layoutControl1.Text = "layoutControl1";
-            // 
-            // xtraUserControl11
-            // 
-            pumpSingleMatchingCtrl.Location = new Point(0, 0);
-            pumpSingleMatchingCtrl.Margin = new Padding(0);
-            pumpSingleMatchingCtrl.Name = "xtraUserControl11";
-            pumpSingleMatchingCtrl.Size = new Size(1347, 677);
-            pumpSingleMatchingCtrl.TabIndex = 7;
-            // 
-            // btnComplete
-            // 
-            btnComplete.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary;
-            btnComplete.Appearance.Options.UseBackColor = true;
-            btnComplete.Location = new Point(1133, 679);
-            btnComplete.MaximumSize = new Size(104, 0);
-            btnComplete.MinimumSize = new Size(104, 0);
-            btnComplete.Name = "btnComplete";
-            btnComplete.Size = new Size(104, 22);
-            btnComplete.StyleController = layoutControl1;
-            btnComplete.TabIndex = 6;
-            btnComplete.Text = "纭畾";
-            btnComplete.Click += btnComplete_Click;
-            // 
-            // btnCancel
-            // 
-            btnCancel.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Danger;
-            btnCancel.Appearance.Options.UseBackColor = true;
-            btnCancel.DialogResult = DialogResult.Cancel;
-            btnCancel.Location = new Point(1241, 679);
-            btnCancel.MaximumSize = new Size(104, 0);
-            btnCancel.MinimumSize = new Size(104, 0);
-            btnCancel.Name = "btnCancel";
-            btnCancel.Size = new Size(104, 22);
-            btnCancel.StyleController = layoutControl1;
-            btnCancel.TabIndex = 3;
-            btnCancel.Text = "鍙栨秷";
             // 
             // Root
             // 
             Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
             Root.GroupBordersVisible = false;
-            Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { emptySpaceItem1, itemForCancel, itemForComplete, layoutControlItem1 });
+            Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlGroup1 });
             Root.Name = "Root";
             Root.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
-            Root.Size = new Size(1347, 703);
+            Root.Size = new Size(526, 658);
             Root.TextVisible = false;
             // 
-            // emptySpaceItem1
+            // layoutControlGroup1
             // 
-            emptySpaceItem1.AllowHotTrack = false;
-            emptySpaceItem1.Location = new Point(0, 677);
-            emptySpaceItem1.Name = "emptySpaceItem1";
-            emptySpaceItem1.Size = new Size(1131, 26);
-            emptySpaceItem1.TextSize = new Size(0, 0);
-            // 
-            // itemForCancel
-            // 
-            itemForCancel.Control = btnCancel;
-            itemForCancel.Location = new Point(1239, 677);
-            itemForCancel.MaxSize = new Size(108, 26);
-            itemForCancel.MinSize = new Size(108, 26);
-            itemForCancel.Name = "itemForCancel";
-            itemForCancel.Size = new Size(108, 26);
-            itemForCancel.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            itemForCancel.TextSize = new Size(0, 0);
-            itemForCancel.TextVisible = false;
-            // 
-            // itemForComplete
-            // 
-            itemForComplete.Control = btnComplete;
-            itemForComplete.Location = new Point(1131, 677);
-            itemForComplete.MaxSize = new Size(108, 26);
-            itemForComplete.MinSize = new Size(108, 26);
-            itemForComplete.Name = "itemForComplete";
-            itemForComplete.Size = new Size(108, 26);
-            itemForComplete.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            itemForComplete.TextSize = new Size(0, 0);
-            itemForComplete.TextVisible = false;
+            layoutControlGroup1.GroupStyle = DevExpress.Utils.GroupStyle.Title;
+            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(526, 658);
+            layoutControlGroup1.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
+            layoutControlGroup1.Text = "鏇茬嚎瑙嗗浘";
             // 
             // layoutControlItem1
             // 
-            layoutControlItem1.Control = pumpSingleMatchingCtrl;
+            layoutControlItem1.Control = xtrPerform2dChart1;
             layoutControlItem1.Location = new Point(0, 0);
             layoutControlItem1.Name = "layoutControlItem1";
             layoutControlItem1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
-            layoutControlItem1.Size = new Size(1347, 677);
+            layoutControlItem1.Size = new Size(526, 636);
             layoutControlItem1.TextSize = new Size(0, 0);
             layoutControlItem1.TextVisible = false;
             // 
@@ -152,31 +477,81 @@
             // 
             AutoScaleDimensions = new SizeF(7F, 14F);
             AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(1347, 703);
+            ClientSize = new Size(1244, 715);
             Controls.Add(layoutControl1);
-            Name = "AssetsPumpMainCurveChoiceDlg";
+            Controls.Add(sidePanel1);
+            Controls.Add(ribbon);
+            Margin = new Padding(2);
+            Name = "PumpMatchingDlg";
+            Ribbon = ribbon;
             StartPosition = FormStartPosition.CenterScreen;
-            Text = "娉垫洸绾块�夋嫨";
+            Text = "閫夋嫨娉靛瀷鍙�";
+            ((ISupportInitialize)ribbon).EndInit();
+            ((ISupportInitialize)repSearchCtrl).EndInit();
+            ((ISupportInitialize)gridControlPumpMain).EndInit();
+            ((ISupportInitialize)gridViewPumpMain).EndInit();
+            sidePanel1.ResumeLayout(false);
+            sidePanel3.ResumeLayout(false);
+            ((ISupportInitialize)layoutControl3).EndInit();
+            layoutControl3.ResumeLayout(false);
+            ((ISupportInitialize)gridControlCurve).EndInit();
+            ((ISupportInitialize)gridViewCurve).EndInit();
+            ((ISupportInitialize)layoutControlGroup6).EndInit();
+            ((ISupportInitialize)layoutControlGroup7).EndInit();
+            ((ISupportInitialize)layoutControlItem3).EndInit();
+            sidePanel2.ResumeLayout(false);
+            ((ISupportInitialize)layoutControl2).EndInit();
+            layoutControl2.ResumeLayout(false);
+            ((ISupportInitialize)layoutControlGroup4).EndInit();
+            ((ISupportInitialize)layoutControlGroup5).EndInit();
+            ((ISupportInitialize)layoutControlItem4).EndInit();
             ((ISupportInitialize)layoutControl1).EndInit();
             layoutControl1.ResumeLayout(false);
             ((ISupportInitialize)Root).EndInit();
-            ((ISupportInitialize)emptySpaceItem1).EndInit();
-            ((ISupportInitialize)itemForCancel).EndInit();
-            ((ISupportInitialize)itemForComplete).EndInit();
+            ((ISupportInitialize)layoutControlGroup1).EndInit();
             ((ISupportInitialize)layoutControlItem1).EndInit();
             ResumeLayout(false);
+            PerformLayout();
         }
 
         #endregion
 
+        private DevExpress.XtraBars.Ribbon.RibbonControl ribbon;
+        private DevExpress.XtraBars.BarEditItem barEditSearch;
+        private DevExpress.XtraEditors.Repository.RepositoryItemSearchControl repSearchCtrl;
+        private DevExpress.XtraBars.Ribbon.RibbonPage ribbonPage1;
+        private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup1;
+        private Yw.WinFrmUI.Phart.PumpViewChart xtrPerform2dChart1;
+        private SidePanel sidePanel1;
+        private SidePanel sidePanel3;
+        private DevExpress.XtraLayout.LayoutControl layoutControl3;
+        private DevExpress.XtraGrid.GridControl gridControlCurve;
+        private DevExpress.XtraGrid.Views.Grid.GridView gridViewCurve;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+        private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup6;
+        private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup7;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
+        private SidePanel sidePanel2;
+        private DevExpress.XtraLayout.LayoutControl layoutControl2;
+        private DevExpress.XtraGrid.GridControl gridControlPumpMain;
+        private DevExpress.XtraGrid.Views.Grid.GridView gridViewPumpMain;
+        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.LayoutControlGroup layoutControlGroup4;
+        private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup5;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
+        private DevExpress.XtraBars.BarButtonItem barBtnOK;
         private DevExpress.XtraLayout.LayoutControl layoutControl1;
         private DevExpress.XtraLayout.LayoutControlGroup Root;
-        private DevExpress.XtraEditors.SimpleButton btnComplete;
-        private DevExpress.XtraEditors.SimpleButton btnCancel;
-        private DevExpress.XtraLayout.LayoutControlItem itemForComplete;
-        private DevExpress.XtraLayout.LayoutControlItem itemForCancel;
-        private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1;
-        private PumpSingleMatchingCtrl pumpSingleMatchingCtrl;
+        private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3