HStation/XHS.V1.0.git

			@@ -29,47 +29,50 @@
			private void InitializeComponent()
			{
			layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
			btnComplete = new DevExpress.XtraEditors.SimpleButton();
			navigationFrame1 = new DevExpress.XtraBars.Navigation.NavigationFrame();
			navigationPage1 = new DevExpress.XtraBars.Navigation.NavigationPage();
			pumpMainCurveChoicePage1 = new PumpMainCurveChoicePage();
			btnCancel = new DevExpress.XtraEditors.SimpleButton();
			xtraUserControl11 = new Core.PumpMainForm();
			btnComplete = new SimpleButton();
			btnCancel = new SimpleButton();
			Root = new DevExpress.XtraLayout.LayoutControlGroup();
			layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
			emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
			itemForComplete = new DevExpress.XtraLayout.LayoutControlItem();
			itemForCancel = new DevExpress.XtraLayout.LayoutControlItem();
			itemForComplete = new DevExpress.XtraLayout.LayoutControlItem();
			layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
			((ISupportInitialize)layoutControl1).BeginInit();
			layoutControl1.SuspendLayout();
			((ISupportInitialize)navigationFrame1).BeginInit();
			navigationFrame1.SuspendLayout();
			navigationPage1.SuspendLayout();
			((ISupportInitialize)Root).BeginInit();
			((ISupportInitialize)layoutControlItem2).BeginInit();
			((ISupportInitialize)emptySpaceItem1).BeginInit();
			((ISupportInitialize)itemForComplete).BeginInit();
			((ISupportInitialize)itemForCancel).BeginInit();
			((ISupportInitialize)itemForComplete).BeginInit();
			((ISupportInitialize)layoutControlItem1).BeginInit();
			SuspendLayout();
			//
			// layoutControl1
			//
			layoutControl1.Controls.Add(xtraUserControl11);
			layoutControl1.Controls.Add(btnComplete);
			layoutControl1.Controls.Add(navigationFrame1);
			layoutControl1.Controls.Add(btnCancel);
			layoutControl1.Dock = DockStyle.Fill;
			layoutControl1.Location = new Point(0, 0);
			layoutControl1.Name = "layoutControl1";
			layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(1222, 300, 650, 400);
			layoutControl1.Root = Root;
			layoutControl1.Size = new Size(1012, 553);
			layoutControl1.Size = new Size(1347, 703);
			layoutControl1.TabIndex = 6;
			layoutControl1.Text = "layoutControl1";
			//
			// xtraUserControl11
			//
			xtraUserControl11.Location = new Point(0, 0);
			xtraUserControl11.Margin = new Padding(0);
			xtraUserControl11.Name = "xtraUserControl11";
			xtraUserControl11.Size = new Size(1347, 677);
			xtraUserControl11.TabIndex = 7;
			//
			// btnComplete
			//
			btnComplete.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary;
			btnComplete.Appearance.Options.UseBackColor = true;
			btnComplete.Location = new Point(788, 519);
			btnComplete.Location = new Point(1133, 679);
			btnComplete.MaximumSize = new Size(104, 0);
			btnComplete.MinimumSize = new Size(104, 0);
			btnComplete.Name = "btnComplete";
			@@ -79,38 +82,12 @@
			btnComplete.Text = "确定";
			btnComplete.Click += btnComplete_Click;
			//
			// navigationFrame1
			//
			navigationFrame1.Controls.Add(navigationPage1);
			navigationFrame1.Location = new Point(12, 12);
			navigationFrame1.Name = "navigationFrame1";
			navigationFrame1.Pages.AddRange(new DevExpress.XtraBars.Navigation.NavigationPageBase[] { navigationPage1 });
			navigationFrame1.SelectedPage = navigationPage1;
			navigationFrame1.Size = new Size(988, 503);
			navigationFrame1.TabIndex = 2;
			navigationFrame1.Text = "navigationFrame1";
			//
			// navigationPage1
			//
			navigationPage1.Caption = "navigationPage1";
			navigationPage1.Controls.Add(pumpMainCurveChoicePage1);
			navigationPage1.Name = "navigationPage1";
			navigationPage1.Size = new Size(988, 503);
			//
			// pumpMainCurveChoicePage1
			//
			pumpMainCurveChoicePage1.Dock = DockStyle.Fill;
			pumpMainCurveChoicePage1.Location = new Point(0, 0);
			pumpMainCurveChoicePage1.Name = "pumpMainCurveChoicePage1";
			pumpMainCurveChoicePage1.Size = new Size(988, 503);
			pumpMainCurveChoicePage1.TabIndex = 0;
			//
			// btnCancel
			//
			btnCancel.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Danger;
			btnCancel.Appearance.Options.UseBackColor = true;
			btnCancel.DialogResult = DialogResult.Cancel;
			btnCancel.Location = new Point(896, 519);
			btnCancel.Location = new Point(1241, 679);
			btnCancel.MaximumSize = new Size(104, 0);
			btnCancel.MinimumSize = new Size(104, 0);
			btnCancel.Name = "btnCancel";
			@@ -123,44 +100,24 @@
			//
			Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
			Root.GroupBordersVisible = false;
			Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem2, emptySpaceItem1, itemForCancel, itemForComplete });
			Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { emptySpaceItem1, itemForCancel, itemForComplete, layoutControlItem1 });
			Root.Name = "Root";
			Root.Size = new Size(1012, 553);
			Root.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
			Root.Size = new Size(1347, 703);
			Root.TextVisible = false;
			//
			// layoutControlItem2
			//
			layoutControlItem2.Control = navigationFrame1;
			layoutControlItem2.Location = new Point(0, 0);
			layoutControlItem2.Name = "layoutControlItem2";
			layoutControlItem2.Size = new Size(992, 507);
			layoutControlItem2.TextSize = new Size(0, 0);
			layoutControlItem2.TextVisible = false;
			//
			// emptySpaceItem1
			//
			emptySpaceItem1.AllowHotTrack = false;
			emptySpaceItem1.Location = new Point(0, 507);
			emptySpaceItem1.Location = new Point(0, 677);
			emptySpaceItem1.Name = "emptySpaceItem1";
			emptySpaceItem1.Size = new Size(776, 26);
			emptySpaceItem1.Size = new Size(1131, 26);
			emptySpaceItem1.TextSize = new Size(0, 0);
			//
			// itemForComplete
			//
			itemForComplete.Control = btnComplete;
			itemForComplete.Location = new Point(776, 507);
			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;
			//
			// itemForCancel
			//
			itemForCancel.Control = btnCancel;
			itemForCancel.Location = new Point(884, 507);
			itemForCancel.Location = new Point(1239, 677);
			itemForCancel.MaxSize = new Size(108, 26);
			itemForCancel.MinSize = new Size(108, 26);
			itemForCancel.Name = "itemForCancel";
			@@ -169,25 +126,44 @@
			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;
			//
			// layoutControlItem1
			//
			layoutControlItem1.Control = xtraUserControl11;
			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.TextSize = new Size(0, 0);
			layoutControlItem1.TextVisible = false;
			//
			// PumpMainCurveChoiceDlg
			//
			AutoScaleDimensions = new SizeF(7F, 14F);
			AutoScaleMode = AutoScaleMode.Font;
			ClientSize = new Size(1012, 553);
			ClientSize = new Size(1347, 703);
			Controls.Add(layoutControl1);
			Name = "PumpMainCurveChoiceDlg";
			StartPosition = FormStartPosition.CenterScreen;
			Text = "泵型号选择";
			Text = "泵曲线选择";
			((ISupportInitialize)layoutControl1).EndInit();
			layoutControl1.ResumeLayout(false);
			((ISupportInitialize)navigationFrame1).EndInit();
			navigationFrame1.ResumeLayout(false);
			navigationPage1.ResumeLayout(false);
			((ISupportInitialize)Root).EndInit();
			((ISupportInitialize)layoutControlItem2).EndInit();
			((ISupportInitialize)emptySpaceItem1).EndInit();
			((ISupportInitialize)itemForComplete).EndInit();
			((ISupportInitialize)itemForCancel).EndInit();
			((ISupportInitialize)itemForComplete).EndInit();
			((ISupportInitialize)layoutControlItem1).EndInit();
			ResumeLayout(false);
			}

			@@ -195,14 +171,12 @@

			private DevExpress.XtraLayout.LayoutControl layoutControl1;
			private DevExpress.XtraLayout.LayoutControlGroup Root;
			private DevExpress.XtraBars.Navigation.NavigationFrame navigationFrame1;
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
			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 DevExpress.XtraBars.Navigation.NavigationPage navigationPage1;
			private PumpMainCurveChoicePage pumpMainCurveChoicePage1;
			private Core.PumpMainForm xtraUserControl11;
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
			}
			}