HStation/XHS.V1.0.git

			@@ -72,6 +72,8 @@
			layoutControlGroup4 = new DevExpress.XtraLayout.LayoutControlGroup();
			layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
			toolTipController1 = new DevExpress.Utils.ToolTipController(components);
			selectFlagsPopupCtrl1 = new SelectFlagsPopupCtrl();
			layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
			((System.ComponentModel.ISupportInitialize)layoutControl1).BeginInit();
			layoutControl1.SuspendLayout();
			((System.ComponentModel.ISupportInitialize)popupContainerControl1).BeginInit();
			@@ -108,10 +110,12 @@
			((System.ComponentModel.ISupportInitialize)layoutControlGroup3).BeginInit();
			((System.ComponentModel.ISupportInitialize)layoutControlGroup4).BeginInit();
			((System.ComponentModel.ISupportInitialize)layoutControlItem27).BeginInit();
			((System.ComponentModel.ISupportInitialize)layoutControlItem10).BeginInit();
			SuspendLayout();
			//
			// layoutControl1
			//
			layoutControl1.Controls.Add(selectFlagsPopupCtrl1);
			layoutControl1.Controls.Add(popupContainerControl1);
			layoutControl1.Controls.Add(BtnOk);
			layoutControl1.Controls.Add(simpleButton1);
			@@ -233,7 +237,7 @@
			textEditBranchThroughCoefficient.Name = "textEditBranchThroughCoefficient";
			textEditBranchThroughCoefficient.Size = new Size(219, 20);
			textEditBranchThroughCoefficient.StyleController = layoutControl1;
			textEditBranchThroughCoefficient.TabIndex = 0;
			textEditBranchThroughCoefficient.TabIndex = 6;
			//
			// textEditRunThroughCoefficient
			//
			@@ -241,7 +245,7 @@
			textEditRunThroughCoefficient.Name = "textEditRunThroughCoefficient";
			textEditRunThroughCoefficient.Size = new Size(218, 20);
			textEditRunThroughCoefficient.StyleController = layoutControl1;
			textEditRunThroughCoefficient.TabIndex = 0;
			textEditRunThroughCoefficient.TabIndex = 5;
			//
			// TextEditName
			//
			@@ -257,7 +261,7 @@
			DescriptionTextEdit.Name = "DescriptionTextEdit";
			DescriptionTextEdit.Size = new Size(641, 299);
			DescriptionTextEdit.StyleController = layoutControl1;
			DescriptionTextEdit.TabIndex = 8;
			DescriptionTextEdit.TabIndex = 9;
			//
			// TextEditCaliber
			//
			@@ -293,9 +297,10 @@
			TextEditCoefficient.Name = "TextEditCoefficient";
			TextEditCoefficient.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
			TextEditCoefficient.Properties.PopupControl = popupContainerControl1;
			TextEditCoefficient.Size = new Size(553, 20);
			TextEditCoefficient.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard;
			TextEditCoefficient.Size = new Size(218, 20);
			TextEditCoefficient.StyleController = layoutControl1;
			TextEditCoefficient.TabIndex = 2;
			TextEditCoefficient.TabIndex = 7;
			//
			// Root
			//
			@@ -303,7 +308,7 @@
			Root.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far;
			Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
			Root.GroupBordersVisible = false;
			Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem4, emptySpaceItem1, layoutControlItem8, layoutControlItem1, layoutControlItem12, layoutControlGroup5, layoutControlItem9, layoutControlItem2, layoutControlItem3, layoutControlItem6, layoutControlItem7 });
			Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem4, emptySpaceItem1, layoutControlItem8, layoutControlItem1, layoutControlItem12, layoutControlGroup5, layoutControlItem9, layoutControlItem2, layoutControlItem3, layoutControlItem6, layoutControlItem7, layoutControlItem10 });
			Root.Name = "Root";
			Root.Padding = new DevExpress.XtraLayout.Utils.Padding(6, 6, 6, 6);
			Root.Size = new Size(681, 482);
			@@ -399,7 +404,7 @@
			layoutControlItem3.Control = TextEditCoefficient;
			layoutControlItem3.Location = new Point(0, 72);
			layoutControlItem3.Name = "layoutControlItem3";
			layoutControlItem3.Size = new Size(669, 24);
			layoutControlItem3.Size = new Size(334, 24);
			layoutControlItem3.Text = "损失系数:";
			layoutControlItem3.TextSize = new Size(100, 14);
			//
			@@ -491,6 +496,22 @@
			layoutControlItem27.Text = "说明:";
			layoutControlItem27.TextSize = new Size(59, 14);
			//
			// selectFlagsPopupCtrl1
			//
			selectFlagsPopupCtrl1.Location = new Point(454, 80);
			selectFlagsPopupCtrl1.Name = "selectFlagsPopupCtrl1";
			selectFlagsPopupCtrl1.Size = new Size(219, 20);
			selectFlagsPopupCtrl1.TabIndex = 8;
			//
			// layoutControlItem10
			//
			layoutControlItem10.Control = selectFlagsPopupCtrl1;
			layoutControlItem10.Location = new Point(334, 72);
			layoutControlItem10.Name = "layoutControlItem10";
			layoutControlItem10.Size = new Size(335, 24);
			layoutControlItem10.Text = "标签列表:";
			layoutControlItem10.TextSize = new Size(100, 14);
			//
			// AddAssetsThreelinkMainDlg
			//
			AutoScaleDimensions = new SizeF(7F, 14F);
			@@ -536,6 +557,7 @@
			((System.ComponentModel.ISupportInitialize)layoutControlGroup3).EndInit();
			((System.ComponentModel.ISupportInitialize)layoutControlGroup4).EndInit();
			((System.ComponentModel.ISupportInitialize)layoutControlItem27).EndInit();
			((System.ComponentModel.ISupportInitialize)layoutControlItem10).EndInit();
			ResumeLayout(false);
			}

			@@ -588,5 +610,7 @@
			private DevExpress.XtraTreeList.Columns.TreeListColumn colBranchThroughMinorLoss;
			private BindingSource threelinkCoefficientViewModelBindingSource;
			private DevExpress.XtraEditors.PopupContainerEdit TextEditCoefficient;
			private SelectFlagsPopupCtrl selectFlagsPopupCtrl1;
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
			}
			}