From 02c14c9c57dbde72d9c771bd8b0fab1cd023047d Mon Sep 17 00:00:00 2001
From: cloudflight <cloudflight@126.com>
Date: 星期一, 13 一月 2025 09:09:22 +0800
Subject: [PATCH] 上下游纵断面分析

---
 WinFrmUI/HStation.WinFrmUI.Assets.Core/18-pressmeter/02-main/AddAssetsPressmeterMainDlg.Designer.cs |  567 +++++++++++++++++---------------------------------------
 1 files changed, 170 insertions(+), 397 deletions(-)

diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/18-pressmeter/02-main/AddAssetsPressmeterMainDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/18-pressmeter/02-main/AddAssetsPressmeterMainDlg.Designer.cs
index da75181..742d194 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/18-pressmeter/02-main/AddAssetsPressmeterMainDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/18-pressmeter/02-main/AddAssetsPressmeterMainDlg.Designer.cs
@@ -1,4 +1,4 @@
-锘縩amespace HStation.WinFrmUI.Assets
+锘縩amespace HStation.WinFrmUI
 {
     partial class AddAssetsPressmeterMainDlg
     {
@@ -28,221 +28,121 @@
         /// </summary>
         private void InitializeComponent()
         {
-            components = new System.ComponentModel.Container();
+            components = new Container();
             layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
-            selectFlagsPopupCtrl1 = new SelectFlagsPopupCtrl();
-            popupContainerControl1 = new DevExpress.XtraEditors.PopupContainerControl();
-            treeList1 = new DevExpress.XtraTreeList.TreeList();
-            colName = new DevExpress.XtraTreeList.Columns.TreeListColumn();
-            colCaliber = new DevExpress.XtraTreeList.Columns.TreeListColumn();
-            colMaterial = new DevExpress.XtraTreeList.Columns.TreeListColumn();
-            colMinorLoss = new DevExpress.XtraTreeList.Columns.TreeListColumn();
-            colFlowMinorLoss = new DevExpress.XtraTreeList.Columns.TreeListColumn();
-            PressmeterCoefficientViewModelBindingSource = new BindingSource(components);
-            BtnOk = new DevExpress.XtraEditors.SimpleButton();
-            simpleButton1 = new DevExpress.XtraEditors.SimpleButton();
-            TextEditName = new DevExpress.XtraEditors.TextEdit();
-            DescriptionTextEdit = new DevExpress.XtraEditors.MemoEdit();
-            TextEditKeyWord = new DevExpress.XtraEditors.TextEdit();
-            TextEditMinorLoss = new DevExpress.XtraEditors.PopupContainerEdit();
+            txtKeyWord = new DevExpress.XtraEditors.TextEdit();
+            txtTagName = new DevExpress.XtraEditors.TextEdit();
+            setFlagsEditCtrl1 = new SetFlagsEditCtrl();
+            generalOkAndCancelCtrl1 = new GeneralOkAndCancelCtrl();
+            txtDescription = new DevExpress.XtraEditors.MemoEdit();
+            txtMinorLoss = new DevExpress.XtraEditors.TextEdit();
+            txtName = new DevExpress.XtraEditors.TextEdit();
             Root = new DevExpress.XtraLayout.LayoutControlGroup();
-            layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
-            emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
-            layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
             layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
-            layoutControlGroup5 = new DevExpress.XtraLayout.LayoutControlGroup();
-            layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
-            layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+            layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+            layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
             layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
-            layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+            layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+            layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+            layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
             dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(components);
-            layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
-            imageComboBoxEdit1 = new DevExpress.XtraEditors.ImageComboBoxEdit();
-            layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
-            imageComboBoxEdit2 = new DevExpress.XtraEditors.ImageComboBoxEdit();
-            tabbedControlGroup2 = new DevExpress.XtraLayout.TabbedControlGroup();
-            layoutControlGroup3 = new DevExpress.XtraLayout.LayoutControlGroup();
-            layoutControlGroup4 = new DevExpress.XtraLayout.LayoutControlGroup();
-            layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
-            toolTipController1 = new DevExpress.Utils.ToolTipController(components);
-            ((System.ComponentModel.ISupportInitialize)layoutControl1).BeginInit();
+            ((ISupportInitialize)layoutControl1).BeginInit();
             layoutControl1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)popupContainerControl1).BeginInit();
-            popupContainerControl1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)treeList1).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)PressmeterCoefficientViewModelBindingSource).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)TextEditName.Properties).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)DescriptionTextEdit.Properties).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)TextEditKeyWord.Properties).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)TextEditMinorLoss.Properties).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)Root).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)layoutControlItem4).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)emptySpaceItem1).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)layoutControlItem8).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)layoutControlItem1).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)layoutControlGroup5).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)layoutControlItem5).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)layoutControlItem2).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)layoutControlItem7).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)layoutControlItem3).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)dxErrorProvider1).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)layoutControlItem13).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)imageComboBoxEdit1.Properties).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)layoutControlItem15).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)imageComboBoxEdit2.Properties).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)tabbedControlGroup2).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)layoutControlGroup3).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)layoutControlGroup4).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)layoutControlItem27).BeginInit();
+            ((ISupportInitialize)txtKeyWord.Properties).BeginInit();
+            ((ISupportInitialize)txtTagName.Properties).BeginInit();
+            ((ISupportInitialize)txtDescription.Properties).BeginInit();
+            ((ISupportInitialize)txtMinorLoss.Properties).BeginInit();
+            ((ISupportInitialize)txtName.Properties).BeginInit();
+            ((ISupportInitialize)Root).BeginInit();
+            ((ISupportInitialize)layoutControlItem1).BeginInit();
+            ((ISupportInitialize)layoutControlItem4).BeginInit();
+            ((ISupportInitialize)layoutControlItem6).BeginInit();
+            ((ISupportInitialize)layoutControlItem7).BeginInit();
+            ((ISupportInitialize)layoutControlItem8).BeginInit();
+            ((ISupportInitialize)layoutControlItem9).BeginInit();
+            ((ISupportInitialize)layoutControlItem10).BeginInit();
+            ((ISupportInitialize)dxErrorProvider1).BeginInit();
             SuspendLayout();
             // 
             // layoutControl1
             // 
-            layoutControl1.Controls.Add(selectFlagsPopupCtrl1);
-            layoutControl1.Controls.Add(popupContainerControl1);
-            layoutControl1.Controls.Add(BtnOk);
-            layoutControl1.Controls.Add(simpleButton1);
-            layoutControl1.Controls.Add(TextEditName);
-            layoutControl1.Controls.Add(DescriptionTextEdit);
-            layoutControl1.Controls.Add(TextEditKeyWord);
-            layoutControl1.Controls.Add(TextEditMinorLoss);
+            layoutControl1.Controls.Add(txtKeyWord);
+            layoutControl1.Controls.Add(txtTagName);
+            layoutControl1.Controls.Add(setFlagsEditCtrl1);
+            layoutControl1.Controls.Add(generalOkAndCancelCtrl1);
+            layoutControl1.Controls.Add(txtDescription);
+            layoutControl1.Controls.Add(txtMinorLoss);
+            layoutControl1.Controls.Add(txtName);
             layoutControl1.Dock = DockStyle.Fill;
             layoutControl1.Location = new Point(0, 0);
             layoutControl1.Name = "layoutControl1";
-            layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(971, 225, 650, 400);
+            layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(826, 220, 650, 400);
             layoutControl1.Root = Root;
-            layoutControl1.Size = new Size(677, 488);
-            layoutControl1.TabIndex = 0;
+            layoutControl1.Size = new Size(665, 381);
+            layoutControl1.TabIndex = 1;
             layoutControl1.Text = "layoutControl1";
             // 
-            // selectFlagsPopupCtrl1
+            // txtKeyWord
             // 
-            selectFlagsPopupCtrl1.Location = new Point(404, 32);
-            selectFlagsPopupCtrl1.Name = "selectFlagsPopupCtrl1";
-            selectFlagsPopupCtrl1.Size = new Size(265, 20);
-            selectFlagsPopupCtrl1.TabIndex = 4;
+            txtKeyWord.Location = new Point(405, 12);
+            txtKeyWord.Name = "txtKeyWord";
+            txtKeyWord.Properties.NullValuePrompt = ",鍒嗛殧 渚嬪 A,B";
+            txtKeyWord.Size = new Size(248, 20);
+            txtKeyWord.StyleController = layoutControl1;
+            txtKeyWord.TabIndex = 2;
             // 
-            // popupContainerControl1
+            // txtTagName
             // 
-            popupContainerControl1.Controls.Add(treeList1);
-            popupContainerControl1.Location = new Point(112, 184);
-            popupContainerControl1.Name = "popupContainerControl1";
-            popupContainerControl1.Size = new Size(215, 124);
-            popupContainerControl1.TabIndex = 1;
+            txtTagName.Location = new Point(83, 60);
+            txtTagName.Name = "txtTagName";
+            txtTagName.Size = new Size(570, 20);
+            txtTagName.StyleController = layoutControl1;
+            txtTagName.TabIndex = 8;
             // 
-            // treeList1
+            // setFlagsEditCtrl1
             // 
-            treeList1.Columns.AddRange(new DevExpress.XtraTreeList.Columns.TreeListColumn[] { colName, colCaliber, colMaterial, colMinorLoss, colFlowMinorLoss });
-            treeList1.DataSource = PressmeterCoefficientViewModelBindingSource;
-            treeList1.Dock = DockStyle.Fill;
-            treeList1.Location = new Point(0, 0);
-            treeList1.Name = "treeList1";
-            treeList1.Size = new Size(215, 124);
-            treeList1.TabIndex = 0;
-            treeList1.FocusedNodeChanged += treeList1_FocusedNodeChanged;
+            setFlagsEditCtrl1.Location = new Point(405, 36);
+            setFlagsEditCtrl1.Name = "setFlagsEditCtrl1";
+            setFlagsEditCtrl1.Size = new Size(248, 20);
+            setFlagsEditCtrl1.TabIndex = 7;
             // 
-            // colName
+            // generalOkAndCancelCtrl1
             // 
-            colName.Caption = "鍚嶇О";
-            colName.FieldName = "Name";
-            colName.Name = "colName";
-            colName.Visible = true;
-            colName.VisibleIndex = 0;
+            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, 322);
+            generalOkAndCancelCtrl1.Name = "generalOkAndCancelCtrl1";
+            generalOkAndCancelCtrl1.Size = new Size(641, 47);
+            generalOkAndCancelCtrl1.TabIndex = 10;
             // 
-            // colCaliber
+            // txtDescription
             // 
-            colCaliber.Caption = "鍙e緞";
-            colCaliber.FieldName = "Caliber";
-            colCaliber.Name = "colCaliber";
-            colCaliber.Visible = true;
-            colCaliber.VisibleIndex = 1;
+            txtDescription.Location = new Point(83, 84);
+            txtDescription.Name = "txtDescription";
+            txtDescription.Size = new Size(570, 234);
+            txtDescription.StyleController = layoutControl1;
+            txtDescription.TabIndex = 9;
             // 
-            // colMaterial
+            // txtMinorLoss
             // 
-            colMaterial.Caption = "鏉愭枡";
-            colMaterial.FieldName = "Material";
-            colMaterial.Name = "colMaterial";
-            colMaterial.Visible = true;
-            colMaterial.VisibleIndex = 2;
+            txtMinorLoss.Location = new Point(83, 36);
+            txtMinorLoss.Name = "txtMinorLoss";
+            txtMinorLoss.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.False;
+            txtMinorLoss.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
+            txtMinorLoss.Size = new Size(247, 20);
+            txtMinorLoss.StyleController = layoutControl1;
+            txtMinorLoss.TabIndex = 5;
             // 
-            // colMinorLoss
+            // txtName
             // 
-            colMinorLoss.Caption = "鍠峰皠绯绘暟";
-            colMinorLoss.FieldName = "MinorLoss";
-            colMinorLoss.Name = "colMinorLoss";
-            colMinorLoss.Visible = true;
-            colMinorLoss.VisibleIndex = 3;
-            // 
-            // colFlowMinorLoss
-            // 
-            colFlowMinorLoss.Caption = "娴侀噺绯绘暟";
-            colFlowMinorLoss.FieldName = "FlowMinorLoss";
-            colFlowMinorLoss.Name = "colFlowMinorLoss";
-            colFlowMinorLoss.Visible = true;
-            colFlowMinorLoss.VisibleIndex = 4;
-            // 
-            // PressmeterCoefficientViewModelBindingSource
-            // 
-            PressmeterCoefficientViewModelBindingSource.DataSource = typeof(PressmeterCoefficientViewModel);
-            // 
-            // BtnOk
-            // 
-            BtnOk.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary;
-            BtnOk.Appearance.Options.UseBackColor = true;
-            BtnOk.Location = new Point(492, 458);
-            BtnOk.Name = "BtnOk";
-            BtnOk.Size = new Size(88, 22);
-            BtnOk.StyleController = layoutControl1;
-            BtnOk.TabIndex = 6;
-            BtnOk.Text = "纭畾";
-            BtnOk.Click += BtnOk_ClickAsync;
-            // 
-            // simpleButton1
-            // 
-            simpleButton1.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
-            simpleButton1.Appearance.Options.UseBackColor = true;
-            simpleButton1.DialogResult = DialogResult.Cancel;
-            simpleButton1.Location = new Point(584, 458);
-            simpleButton1.Name = "simpleButton1";
-            simpleButton1.Size = new Size(85, 22);
-            simpleButton1.StyleController = layoutControl1;
-            simpleButton1.TabIndex = 7;
-            simpleButton1.Text = "鍙栨秷";
-            // 
-            // TextEditName
-            // 
-            TextEditName.Location = new Point(72, 8);
-            TextEditName.Name = "TextEditName";
-            TextEditName.Size = new Size(264, 20);
-            TextEditName.StyleController = layoutControl1;
-            TextEditName.TabIndex = 0;
-            // 
-            // DescriptionTextEdit
-            // 
-            DescriptionTextEdit.Location = new Point(20, 89);
-            DescriptionTextEdit.Name = "DescriptionTextEdit";
-            DescriptionTextEdit.Size = new Size(637, 353);
-            DescriptionTextEdit.StyleController = layoutControl1;
-            DescriptionTextEdit.TabIndex = 5;
-            // 
-            // TextEditKeyWord
-            // 
-            TextEditKeyWord.Location = new Point(404, 8);
-            TextEditKeyWord.Name = "TextEditKeyWord";
-            TextEditKeyWord.Size = new Size(265, 20);
-            TextEditKeyWord.StyleController = layoutControl1;
-            TextEditKeyWord.TabIndex = 2;
-            // 
-            // TextEditMinorLoss
-            // 
-            TextEditMinorLoss.Location = new Point(72, 32);
-            TextEditMinorLoss.Name = "TextEditMinorLoss";
-            TextEditMinorLoss.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
-            TextEditMinorLoss.Properties.PopupControl = popupContainerControl1;
-            TextEditMinorLoss.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard;
-            TextEditMinorLoss.Size = new Size(264, 20);
-            TextEditMinorLoss.StyleController = layoutControl1;
-            TextEditMinorLoss.TabIndex = 3;
+            txtName.Location = new Point(83, 12);
+            txtName.Name = "txtName";
+            txtName.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.False;
+            txtName.Size = new Size(247, 20);
+            txtName.StyleController = layoutControl1;
+            txtName.TabIndex = 0;
             // 
             // Root
             // 
@@ -250,256 +150,129 @@
             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, layoutControlGroup5, layoutControlItem2, layoutControlItem7, layoutControlItem3 });
+            Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, layoutControlItem4, layoutControlItem6, layoutControlItem7, layoutControlItem10, layoutControlItem9, layoutControlItem8 });
             Root.Name = "Root";
-            Root.Padding = new DevExpress.XtraLayout.Utils.Padding(6, 6, 6, 6);
-            Root.Size = new Size(677, 488);
+            Root.Size = new Size(665, 381);
             Root.TextVisible = false;
-            // 
-            // layoutControlItem4
-            // 
-            layoutControlItem4.Control = BtnOk;
-            layoutControlItem4.Location = new Point(484, 450);
-            layoutControlItem4.Name = "layoutControlItem4";
-            layoutControlItem4.Size = new Size(92, 26);
-            layoutControlItem4.TextSize = new Size(0, 0);
-            layoutControlItem4.TextVisible = false;
-            // 
-            // emptySpaceItem1
-            // 
-            emptySpaceItem1.AllowHotTrack = false;
-            emptySpaceItem1.Location = new Point(0, 450);
-            emptySpaceItem1.Name = "emptySpaceItem1";
-            emptySpaceItem1.Size = new Size(484, 26);
-            emptySpaceItem1.TextSize = new Size(0, 0);
-            // 
-            // layoutControlItem8
-            // 
-            layoutControlItem8.Control = simpleButton1;
-            layoutControlItem8.Location = new Point(576, 450);
-            layoutControlItem8.Name = "layoutControlItem8";
-            layoutControlItem8.Size = new Size(89, 26);
-            layoutControlItem8.TextSize = new Size(0, 0);
-            layoutControlItem8.TextVisible = false;
             // 
             // layoutControlItem1
             // 
             layoutControlItem1.AllowHtmlStringInCaption = true;
-            layoutControlItem1.Control = TextEditName;
+            layoutControlItem1.Control = txtName;
             layoutControlItem1.Location = new Point(0, 0);
             layoutControlItem1.Name = "layoutControlItem1";
-            layoutControlItem1.Size = new Size(332, 24);
-            layoutControlItem1.Text = "<color=red>*</color>鍨嬪彿:";
-            layoutControlItem1.TextSize = new Size(52, 14);
+            layoutControlItem1.Size = new Size(322, 24);
+            layoutControlItem1.Text = "<color=red>*</color>鍚嶇О:";
+            layoutControlItem1.TextSize = new Size(59, 14);
             // 
-            // layoutControlGroup5
+            // layoutControlItem4
             // 
-            layoutControlGroup5.AppearanceGroup.FontSizeDelta = 1;
-            layoutControlGroup5.AppearanceGroup.Options.UseFont = true;
-            layoutControlGroup5.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem5 });
-            layoutControlGroup5.Location = new Point(0, 48);
-            layoutControlGroup5.Name = "layoutControlGroup5";
-            layoutControlGroup5.Size = new Size(665, 402);
-            layoutControlGroup5.Text = "璇存槑";
+            layoutControlItem4.AllowHtmlStringInCaption = true;
+            layoutControlItem4.Control = txtMinorLoss;
+            layoutControlItem4.Location = new Point(0, 24);
+            layoutControlItem4.Name = "layoutControlItem4";
+            layoutControlItem4.Size = new Size(322, 24);
+            layoutControlItem4.Text = "<color=red>*</color>灞�闃荤郴鏁�:";
+            layoutControlItem4.TextSize = new Size(59, 14);
             // 
-            // layoutControlItem5
+            // layoutControlItem6
             // 
-            layoutControlItem5.Control = DescriptionTextEdit;
-            layoutControlItem5.Location = new Point(0, 0);
-            layoutControlItem5.Name = "layoutControlItem5";
-            layoutControlItem5.Size = new Size(641, 357);
-            layoutControlItem5.Text = "璇存槑:";
-            layoutControlItem5.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.CustomSize;
-            layoutControlItem5.TextSize = new Size(0, 0);
-            layoutControlItem5.TextToControlDistance = 0;
-            layoutControlItem5.TextVisible = false;
-            // 
-            // layoutControlItem2
-            // 
-            layoutControlItem2.Control = TextEditKeyWord;
-            layoutControlItem2.Location = new Point(332, 0);
-            layoutControlItem2.Name = "layoutControlItem2";
-            layoutControlItem2.Size = new Size(333, 24);
-            layoutControlItem2.Text = "鍏抽敭瀛�:";
-            layoutControlItem2.TextSize = new Size(52, 14);
+            layoutControlItem6.Control = txtDescription;
+            layoutControlItem6.Location = new Point(0, 72);
+            layoutControlItem6.Name = "layoutControlItem6";
+            layoutControlItem6.Size = new Size(645, 238);
+            layoutControlItem6.Text = "璇存槑:";
+            layoutControlItem6.TextSize = new Size(59, 14);
             // 
             // layoutControlItem7
             // 
-            layoutControlItem7.Control = TextEditMinorLoss;
-            layoutControlItem7.Location = new Point(0, 24);
+            layoutControlItem7.Control = generalOkAndCancelCtrl1;
+            layoutControlItem7.Location = new Point(0, 310);
             layoutControlItem7.Name = "layoutControlItem7";
-            layoutControlItem7.Size = new Size(332, 24);
-            layoutControlItem7.Text = "灞�闃荤郴鏁�:";
-            layoutControlItem7.TextSize = new Size(52, 14);
+            layoutControlItem7.Size = new Size(645, 51);
+            layoutControlItem7.TextSize = new Size(0, 0);
+            layoutControlItem7.TextVisible = false;
             // 
-            // layoutControlItem3
+            // layoutControlItem8
             // 
-            layoutControlItem3.Control = selectFlagsPopupCtrl1;
-            layoutControlItem3.Location = new Point(332, 24);
-            layoutControlItem3.Name = "layoutControlItem3";
-            layoutControlItem3.Size = new Size(333, 24);
-            layoutControlItem3.Text = "鏍囩鍒楄〃:";
-            layoutControlItem3.TextSize = new Size(52, 14);
+            layoutControlItem8.Control = setFlagsEditCtrl1;
+            layoutControlItem8.Location = new Point(322, 24);
+            layoutControlItem8.Name = "layoutControlItem8";
+            layoutControlItem8.Size = new Size(323, 24);
+            layoutControlItem8.Text = "鏍囩:";
+            layoutControlItem8.TextSize = new Size(59, 14);
+            // 
+            // layoutControlItem9
+            // 
+            layoutControlItem9.Control = txtTagName;
+            layoutControlItem9.Location = new Point(0, 48);
+            layoutControlItem9.Name = "layoutControlItem9";
+            layoutControlItem9.Size = new Size(645, 24);
+            layoutControlItem9.Text = "鏍囧織:";
+            layoutControlItem9.TextSize = new Size(59, 14);
+            // 
+            // layoutControlItem10
+            // 
+            layoutControlItem10.Control = txtKeyWord;
+            layoutControlItem10.Location = new Point(322, 0);
+            layoutControlItem10.Name = "layoutControlItem10";
+            layoutControlItem10.Size = new Size(323, 24);
+            layoutControlItem10.Text = "鍏抽敭瀛�:";
+            layoutControlItem10.TextSize = new Size(59, 14);
             // 
             // dxErrorProvider1
             // 
             dxErrorProvider1.ContainerControl = this;
             // 
-            // layoutControlItem13
-            // 
-            layoutControlItem13.Control = imageComboBoxEdit1;
-            layoutControlItem13.Location = new Point(0, 72);
-            layoutControlItem13.Name = "layoutControlItem8";
-            layoutControlItem13.Size = new Size(499, 24);
-            layoutControlItem13.Text = "閫夋嫨鍒嗙被";
-            layoutControlItem13.TextSize = new Size(52, 14);
-            // 
-            // imageComboBoxEdit1
-            // 
-            imageComboBoxEdit1.Location = new Point(0, 0);
-            imageComboBoxEdit1.Name = "imageComboBoxEdit1";
-            imageComboBoxEdit1.Size = new Size(100, 20);
-            imageComboBoxEdit1.TabIndex = 0;
-            // 
-            // layoutControlItem15
-            // 
-            layoutControlItem15.Control = imageComboBoxEdit2;
-            layoutControlItem15.Location = new Point(0, 72);
-            layoutControlItem15.Name = "layoutControlItem8";
-            layoutControlItem15.Size = new Size(499, 24);
-            layoutControlItem15.Text = "閫夋嫨鍒嗙被";
-            layoutControlItem15.TextSize = new Size(52, 14);
-            // 
-            // imageComboBoxEdit2
-            // 
-            imageComboBoxEdit2.Location = new Point(0, 0);
-            imageComboBoxEdit2.Name = "imageComboBoxEdit2";
-            imageComboBoxEdit2.Size = new Size(100, 20);
-            imageComboBoxEdit2.TabIndex = 0;
-            // 
-            // tabbedControlGroup2
-            // 
-            tabbedControlGroup2.Location = new Point(0, 354);
-            tabbedControlGroup2.Name = "tabbedControlGroup1";
-            tabbedControlGroup2.SelectedTabPage = layoutControlGroup3;
-            tabbedControlGroup2.Size = new Size(669, 90);
-            tabbedControlGroup2.TabPages.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlGroup4, layoutControlGroup3 });
-            tabbedControlGroup2.Text = "璇存槑";
-            // 
-            // layoutControlGroup3
-            // 
-            layoutControlGroup3.Location = new Point(0, 0);
-            layoutControlGroup3.Name = "layoutControlGroup2";
-            layoutControlGroup3.Size = new Size(645, 56);
-            layoutControlGroup3.Text = "灞炴��";
-            layoutControlGroup3.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
-            // 
-            // layoutControlGroup4
-            // 
-            layoutControlGroup4.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem27 });
-            layoutControlGroup4.Location = new Point(0, 0);
-            layoutControlGroup4.Name = "layoutControlGroup1";
-            layoutControlGroup4.Size = new Size(645, 52);
-            layoutControlGroup4.Text = "璇存槑";
-            // 
-            // layoutControlItem27
-            // 
-            layoutControlItem27.Control = DescriptionTextEdit;
-            layoutControlItem27.Location = new Point(0, 0);
-            layoutControlItem27.Name = "layoutControlItem5";
-            layoutControlItem27.Size = new Size(637, 26);
-            layoutControlItem27.Text = "璇存槑:";
-            layoutControlItem27.TextSize = new Size(59, 14);
-            // 
             // AddAssetsPressmeterMainDlg
             // 
             AutoScaleDimensions = new SizeF(7F, 14F);
             AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(677, 488);
+            ClientSize = new Size(665, 381);
             Controls.Add(layoutControl1);
             Name = "AddAssetsPressmeterMainDlg";
-            StartPosition = FormStartPosition.CenterScreen;
-            Text = "娣诲姞鍘嬪姏琛�";
-            ((System.ComponentModel.ISupportInitialize)layoutControl1).EndInit();
+            StartPosition = FormStartPosition.CenterParent;
+            Text = "娣诲姞";
+            ((ISupportInitialize)layoutControl1).EndInit();
             layoutControl1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)popupContainerControl1).EndInit();
-            popupContainerControl1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)treeList1).EndInit();
-            ((System.ComponentModel.ISupportInitialize)PressmeterCoefficientViewModelBindingSource).EndInit();
-            ((System.ComponentModel.ISupportInitialize)TextEditName.Properties).EndInit();
-            ((System.ComponentModel.ISupportInitialize)DescriptionTextEdit.Properties).EndInit();
-            ((System.ComponentModel.ISupportInitialize)TextEditKeyWord.Properties).EndInit();
-            ((System.ComponentModel.ISupportInitialize)TextEditMinorLoss.Properties).EndInit();
-            ((System.ComponentModel.ISupportInitialize)Root).EndInit();
-            ((System.ComponentModel.ISupportInitialize)layoutControlItem4).EndInit();
-            ((System.ComponentModel.ISupportInitialize)emptySpaceItem1).EndInit();
-            ((System.ComponentModel.ISupportInitialize)layoutControlItem8).EndInit();
-            ((System.ComponentModel.ISupportInitialize)layoutControlItem1).EndInit();
-            ((System.ComponentModel.ISupportInitialize)layoutControlGroup5).EndInit();
-            ((System.ComponentModel.ISupportInitialize)layoutControlItem5).EndInit();
-            ((System.ComponentModel.ISupportInitialize)layoutControlItem2).EndInit();
-            ((System.ComponentModel.ISupportInitialize)layoutControlItem7).EndInit();
-            ((System.ComponentModel.ISupportInitialize)layoutControlItem3).EndInit();
-            ((System.ComponentModel.ISupportInitialize)dxErrorProvider1).EndInit();
-            ((System.ComponentModel.ISupportInitialize)layoutControlItem13).EndInit();
-            ((System.ComponentModel.ISupportInitialize)imageComboBoxEdit1.Properties).EndInit();
-            ((System.ComponentModel.ISupportInitialize)layoutControlItem15).EndInit();
-            ((System.ComponentModel.ISupportInitialize)imageComboBoxEdit2.Properties).EndInit();
-            ((System.ComponentModel.ISupportInitialize)tabbedControlGroup2).EndInit();
-            ((System.ComponentModel.ISupportInitialize)layoutControlGroup3).EndInit();
-            ((System.ComponentModel.ISupportInitialize)layoutControlGroup4).EndInit();
-            ((System.ComponentModel.ISupportInitialize)layoutControlItem27).EndInit();
+            ((ISupportInitialize)txtKeyWord.Properties).EndInit();
+            ((ISupportInitialize)txtTagName.Properties).EndInit();
+            ((ISupportInitialize)txtDescription.Properties).EndInit();
+            ((ISupportInitialize)txtMinorLoss.Properties).EndInit();
+            ((ISupportInitialize)txtName.Properties).EndInit();
+            ((ISupportInitialize)Root).EndInit();
+            ((ISupportInitialize)layoutControlItem1).EndInit();
+            ((ISupportInitialize)layoutControlItem4).EndInit();
+            ((ISupportInitialize)layoutControlItem6).EndInit();
+            ((ISupportInitialize)layoutControlItem7).EndInit();
+            ((ISupportInitialize)layoutControlItem8).EndInit();
+            ((ISupportInitialize)layoutControlItem9).EndInit();
+            ((ISupportInitialize)layoutControlItem10).EndInit();
+            ((ISupportInitialize)dxErrorProvider1).EndInit();
             ResumeLayout(false);
         }
 
         #endregion
 
         private DevExpress.XtraLayout.LayoutControl layoutControl1;
-        private DevExpress.XtraEditors.TextEdit TextEditName;
+        private GeneralOkAndCancelCtrl generalOkAndCancelCtrl1;
+        private DevExpress.XtraEditors.MemoEdit txtDescription;
+        private DevExpress.XtraEditors.TextEdit txtMinorLoss;
+        private DevExpress.XtraEditors.TextEdit txtName;
         private DevExpress.XtraLayout.LayoutControlGroup Root;
-        private DevExpress.XtraEditors.MemoEdit DescriptionTextEdit;
-        private DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider dxErrorProvider1;
-        private DevExpress.XtraEditors.SimpleButton BtnOk;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
-        private DevExpress.XtraEditors.SimpleButton simpleButton1;
-        private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
-        private DevExpress.XtraEditors.SimpleButton btnCancel;
-        private DevExpress.XtraEditors.TextEdit MotorFrequencyTextEdit;
-        private DevExpress.XtraEditors.TextEdit TagNameTextEdit;
-        private DevExpress.XtraEditors.TextEdit NameTextEdit;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
-        private DevExpress.XtraEditors.ImageComboBoxEdit imageComboBoxEdit1;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
-        private DevExpress.XtraEditors.ImageComboBoxEdit imageComboBoxEdit2;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
-        private DevExpress.XtraLayout.TabbedControlGroup tabbedControlGroup2;
-        private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup3;
-        private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup4;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27;
-        private DevExpress.XtraEditors.ImageComboBoxEdit TextEditCaliber;
-        private DevExpress.XtraEditors.ImageComboBoxEdit TextEditMaterial;
-        private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup5;
-        private DevExpress.Utils.ToolTipController toolTipController1;
-        private DevExpress.XtraEditors.TextEdit TextEditKeyWord;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
-        private DevExpress.XtraEditors.TextEdit TextEditCoefficient;
-        private DevExpress.XtraEditors.TextEdit TextEditAngle;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
-        private DevExpress.XtraEditors.PopupContainerControl popupContainerControl1;
-        private DevExpress.XtraTreeList.TreeList treeList1;
-        private DevExpress.XtraTreeList.Columns.TreeListColumn colName;
-        private DevExpress.XtraTreeList.Columns.TreeListColumn colCaliber;
-        private DevExpress.XtraTreeList.Columns.TreeListColumn colMaterial;
-        private DevExpress.XtraTreeList.Columns.TreeListColumn colMinorLoss;
-        private DevExpress.XtraTreeList.Columns.TreeListColumn colFlowMinorLoss;
-        private BindingSource PressmeterCoefficientViewModelBindingSource;
-        private DevExpress.XtraEditors.PopupContainerEdit TextEditMinorLoss;
-        private SelectFlagsPopupCtrl selectFlagsPopupCtrl1;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
+        private DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider dxErrorProvider1;
+        private SetFlagsEditCtrl setFlagsEditCtrl1;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
+        private DevExpress.XtraEditors.TextEdit txtKeyWord;
+        private DevExpress.XtraEditors.TextEdit txtTagName;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3