HStation/XHS.V1.0.git

			@@ -36,13 +36,15 @@
			txtCaliber = new DevExpress.XtraEditors.TextEdit();
			txtMaterial = new DevExpress.XtraEditors.TextEdit();
			txtName = new DevExpress.XtraEditors.TextEdit();
			txtAngle = new DevExpress.XtraEditors.TextEdit();
			Root = new DevExpress.XtraLayout.LayoutControlGroup();
			layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
			layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
			layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
			layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
			layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
			layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
			layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
			layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
			dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(components);
			((ISupportInitialize)layoutControl1).BeginInit();
			layoutControl1.SuspendLayout();
			@@ -51,13 +53,15 @@
			((ISupportInitialize)txtCaliber.Properties).BeginInit();
			((ISupportInitialize)txtMaterial.Properties).BeginInit();
			((ISupportInitialize)txtName.Properties).BeginInit();
			((ISupportInitialize)txtAngle.Properties).BeginInit();
			((ISupportInitialize)Root).BeginInit();
			((ISupportInitialize)layoutControlItem1).BeginInit();
			((ISupportInitialize)layoutControlItem3).BeginInit();
			((ISupportInitialize)layoutControlItem4).BeginInit();
			((ISupportInitialize)layoutControlItem2).BeginInit();
			((ISupportInitialize)layoutControlItem6).BeginInit();
			((ISupportInitialize)layoutControlItem7).BeginInit();
			((ISupportInitialize)layoutControlItem4).BeginInit();
			((ISupportInitialize)layoutControlItem5).BeginInit();
			((ISupportInitialize)dxErrorProvider1).BeginInit();
			SuspendLayout();
			//
			@@ -69,6 +73,7 @@
			layoutControl1.Controls.Add(txtCaliber);
			layoutControl1.Controls.Add(txtMaterial);
			layoutControl1.Controls.Add(txtName);
			layoutControl1.Controls.Add(txtAngle);
			layoutControl1.Dock = DockStyle.Fill;
			layoutControl1.Location = new Point(0, 0);
			layoutControl1.Name = "layoutControl1";
			@@ -84,18 +89,18 @@
			generalOkAndCancelCtrl1.ButtonCancelMinSize = new Size(100, 26);
			generalOkAndCancelCtrl1.ButtonOkMaxSize = new Size(100, 26);
			generalOkAndCancelCtrl1.ButtonOkMinSize = new Size(100, 26);
			generalOkAndCancelCtrl1.Location = new Point(12, 278);
			generalOkAndCancelCtrl1.Location = new Point(12, 276);
			generalOkAndCancelCtrl1.Name = "generalOkAndCancelCtrl1";
			generalOkAndCancelCtrl1.Size = new Size(501, 26);
			generalOkAndCancelCtrl1.TabIndex = 6;
			generalOkAndCancelCtrl1.Size = new Size(501, 28);
			generalOkAndCancelCtrl1.TabIndex = 7;
			//
			// txtDescription
			//
			txtDescription.Location = new Point(83, 60);
			txtDescription.Location = new Point(83, 84);
			txtDescription.Name = "txtDescription";
			txtDescription.Size = new Size(430, 214);
			txtDescription.Size = new Size(430, 188);
			txtDescription.StyleController = layoutControl1;
			txtDescription.TabIndex = 5;
			txtDescription.TabIndex = 6;
			//
			// txtCoefficient
			//
			@@ -120,7 +125,7 @@
			txtCaliber.StyleController = layoutControl1;
			txtCaliber.TabIndex = 2;
			//
			// txtMaterial
			// txtDN
			//
			txtMaterial.Location = new Point(83, 36);
			txtMaterial.Name = "txtMaterial";
			@@ -138,13 +143,23 @@
			txtName.StyleController = layoutControl1;
			txtName.TabIndex = 0;
			//
			// txtAngle
			//
			txtAngle.Location = new Point(83, 60);
			txtAngle.Name = "textEditAngle";
			txtAngle.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
			txtAngle.Properties.MaskSettings.Set("mask", "d");
			txtAngle.Size = new Size(430, 20);
			txtAngle.StyleController = layoutControl1;
			txtAngle.TabIndex = 5;
			//
			// 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, layoutControlItem3, layoutControlItem2, layoutControlItem6, layoutControlItem7, layoutControlItem4 });
			Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, layoutControlItem3, layoutControlItem2, layoutControlItem6, layoutControlItem7, layoutControlItem4, layoutControlItem5 });
			Root.Name = "Root";
			Root.Size = new Size(525, 316);
			Root.TextVisible = false;
			@@ -168,16 +183,6 @@
			layoutControlItem3.Text = "口径:";
			layoutControlItem3.TextSize = new Size(59, 14);
			//
			// layoutControlItem4
			//
			layoutControlItem4.AllowHtmlStringInCaption = true;
			layoutControlItem4.Control = txtCoefficient;
			layoutControlItem4.Location = new Point(252, 24);
			layoutControlItem4.Name = "layoutControlItem4";
			layoutControlItem4.Size = new Size(253, 24);
			layoutControlItem4.Text = "<color=red>*</color>局阻系数:";
			layoutControlItem4.TextSize = new Size(59, 14);
			//
			// layoutControlItem2
			//
			layoutControlItem2.AllowHtmlStringInCaption = true;
			@@ -191,20 +196,39 @@
			// layoutControlItem6
			//
			layoutControlItem6.Control = txtDescription;
			layoutControlItem6.Location = new Point(0, 48);
			layoutControlItem6.Location = new Point(0, 72);
			layoutControlItem6.Name = "layoutControlItem6";
			layoutControlItem6.Size = new Size(505, 218);
			layoutControlItem6.Size = new Size(505, 192);
			layoutControlItem6.Text = "说明:";
			layoutControlItem6.TextSize = new Size(59, 14);
			//
			// layoutControlItem7
			//
			layoutControlItem7.Control = generalOkAndCancelCtrl1;
			layoutControlItem7.Location = new Point(0, 266);
			layoutControlItem7.Location = new Point(0, 264);
			layoutControlItem7.Name = "layoutControlItem7";
			layoutControlItem7.Size = new Size(505, 30);
			layoutControlItem7.Size = new Size(505, 32);
			layoutControlItem7.TextSize = new Size(0, 0);
			layoutControlItem7.TextVisible = false;
			//
			// layoutControlItem4
			//
			layoutControlItem4.AllowHtmlStringInCaption = true;
			layoutControlItem4.Control = txtCoefficient;
			layoutControlItem4.Location = new Point(252, 24);
			layoutControlItem4.Name = "layoutControlItem4";
			layoutControlItem4.Size = new Size(253, 24);
			layoutControlItem4.Text = "<color=red>*</color>局阻系数:";
			layoutControlItem4.TextSize = new Size(59, 14);
			//
			// layoutControlItem5
			//
			layoutControlItem5.Control = txtAngle;
			layoutControlItem5.Location = new Point(0, 48);
			layoutControlItem5.Name = "layoutControlItem5";
			layoutControlItem5.Size = new Size(505, 24);
			layoutControlItem5.Text = "角度:";
			layoutControlItem5.TextSize = new Size(59, 14);
			//
			// dxErrorProvider1
			//
			@@ -226,13 +250,15 @@
			((ISupportInitialize)txtCaliber.Properties).EndInit();
			((ISupportInitialize)txtMaterial.Properties).EndInit();
			((ISupportInitialize)txtName.Properties).EndInit();
			((ISupportInitialize)txtAngle.Properties).EndInit();
			((ISupportInitialize)Root).EndInit();
			((ISupportInitialize)layoutControlItem1).EndInit();
			((ISupportInitialize)layoutControlItem3).EndInit();
			((ISupportInitialize)layoutControlItem4).EndInit();
			((ISupportInitialize)layoutControlItem2).EndInit();
			((ISupportInitialize)layoutControlItem6).EndInit();
			((ISupportInitialize)layoutControlItem7).EndInit();
			((ISupportInitialize)layoutControlItem4).EndInit();
			((ISupportInitialize)layoutControlItem5).EndInit();
			((ISupportInitialize)dxErrorProvider1).EndInit();
			ResumeLayout(false);
			}
			@@ -254,5 +280,7 @@
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
			private DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider dxErrorProvider1;
			private DevExpress.XtraEditors.TextEdit txtAngle;
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
			}
			}