HStation/XHS.V1.0.git

			@@ -28,8 +28,8 @@
			/// </summary>
			private void InitializeComponent()
			{
			components = new Container();
			layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
			generalOkAndCancelCtrl1 = new GeneralOkAndCancelCtrl();
			txtMaterial = new DevExpress.XtraEditors.TextEdit();
			txtMinorLoss = new DevExpress.XtraEditors.TextEdit();
			txtDiameter = new DevExpress.XtraEditors.TextEdit();
			@@ -39,8 +39,6 @@
			layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
			layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
			layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
			dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(components);
			generalOkAndCancelCtrl1 = new GeneralOkAndCancelCtrl();
			layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
			((ISupportInitialize)layoutControl1).BeginInit();
			layoutControl1.SuspendLayout();
			@@ -53,7 +51,6 @@
			((ISupportInitialize)layoutControlItem8).BeginInit();
			((ISupportInitialize)layoutControlItem4).BeginInit();
			((ISupportInitialize)layoutControlItem5).BeginInit();
			((ISupportInitialize)dxErrorProvider1).BeginInit();
			((ISupportInitialize)layoutControlItem1).BeginInit();
			SuspendLayout();
			//
			@@ -73,10 +70,22 @@
			layoutControl1.TabIndex = 1;
			layoutControl1.Text = "layoutControl1";
			//
			// generalOkAndCancelCtrl1
			//
			generalOkAndCancelCtrl1.ButtonCancelMaxSize = new Size(100, 26);
			generalOkAndCancelCtrl1.ButtonCancelMinSize = new Size(100, 26);
			generalOkAndCancelCtrl1.ButtonOkMaxSize = new Size(100, 26);
			generalOkAndCancelCtrl1.ButtonOkMinSize = new Size(100, 26);
			generalOkAndCancelCtrl1.Location = new Point(12, 60);
			generalOkAndCancelCtrl1.Name = "generalOkAndCancelCtrl1";
			generalOkAndCancelCtrl1.Size = new Size(433, 31);
			generalOkAndCancelCtrl1.TabIndex = 5;
			//
			// txtMaterial
			//
			txtMaterial.Location = new Point(294, 12);
			txtMaterial.Name = "txtMaterial";
			txtMaterial.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.True;
			txtMaterial.Size = new Size(151, 20);
			txtMaterial.StyleController = layoutControl1;
			txtMaterial.TabIndex = 2;
			@@ -85,7 +94,7 @@
			//
			txtMinorLoss.Location = new Point(294, 36);
			txtMinorLoss.Name = "txtMinorLoss";
			txtMinorLoss.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.False;
			txtMinorLoss.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.True;
			txtMinorLoss.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
			txtMinorLoss.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
			txtMinorLoss.Size = new Size(151, 20);
			@@ -96,7 +105,7 @@
			//
			txtDiameter.Location = new Point(76, 36);
			txtDiameter.Name = "txtDiameter";
			txtDiameter.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.False;
			txtDiameter.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.True;
			txtDiameter.Properties.DisplayFormat.FormatString = "{0}mm";
			txtDiameter.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.Custom;
			txtDiameter.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
			@@ -162,21 +171,6 @@
			layoutControlItem5.Text = "局阻系数:";
			layoutControlItem5.TextSize = new Size(52, 14);
			//
			// dxErrorProvider1
			//
			dxErrorProvider1.ContainerControl = this;
			//
			// generalOkAndCancelCtrl1
			//
			generalOkAndCancelCtrl1.ButtonCancelMaxSize = new Size(100, 26);
			generalOkAndCancelCtrl1.ButtonCancelMinSize = new Size(100, 26);
			generalOkAndCancelCtrl1.ButtonOkMaxSize = new Size(100, 26);
			generalOkAndCancelCtrl1.ButtonOkMinSize = new Size(100, 26);
			generalOkAndCancelCtrl1.Location = new Point(12, 60);
			generalOkAndCancelCtrl1.Name = "generalOkAndCancelCtrl1";
			generalOkAndCancelCtrl1.Size = new Size(433, 31);
			generalOkAndCancelCtrl1.TabIndex = 5;
			//
			// layoutControlItem1
			//
			layoutControlItem1.Control = generalOkAndCancelCtrl1;
			@@ -207,7 +201,6 @@
			((ISupportInitialize)layoutControlItem8).EndInit();
			((ISupportInitialize)layoutControlItem4).EndInit();
			((ISupportInitialize)layoutControlItem5).EndInit();
			((ISupportInitialize)dxErrorProvider1).EndInit();
			((ISupportInitialize)layoutControlItem1).EndInit();
			ResumeLayout(false);
			}
			@@ -216,7 +209,6 @@

			private DevExpress.XtraLayout.LayoutControl layoutControl1;
			private DevExpress.XtraLayout.LayoutControlGroup Root;
			private DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider dxErrorProvider1;
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
			private DevExpress.XtraEditors.ImageComboBoxEdit imgCmbLinkStatus;
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;