From f1fac249aec3a5390152fa2a9a13e8da98283c3b Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期五, 20 十二月 2024 18:19:21 +0800
Subject: [PATCH] 水池修改
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/EditAssetsTankMainDlg.Designer.cs | 741 ++++++++++++++++++++------------------------------------
1 files changed, 266 insertions(+), 475 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/EditAssetsTankMainDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/EditAssetsTankMainDlg.Designer.cs
index f58f14f..8226085 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/EditAssetsTankMainDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/EditAssetsTankMainDlg.Designer.cs
@@ -1,6 +1,6 @@
-锘縩amespace HStation.WinFrmUI.Assets
+锘縩amespace HStation.WinFrmUI
{
- partial class EditAssetsTankMainDlg
+ partial class EditAssetsTankMainDlg
{
/// <summary>
/// Required designer variable.
@@ -28,252 +28,131 @@
/// </summary>
private void InitializeComponent()
{
- components = new System.ComponentModel.Container();
+ components = new Container();
layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
- textEditMaxLevel = new DevExpress.XtraEditors.TextEdit();
- textEditDN = new DevExpress.XtraEditors.TextEdit();
- textEditMinLevel = new DevExpress.XtraEditors.TextEdit();
- textEditMinVol = new DevExpress.XtraEditors.TextEdit();
- textEditVoerFlow = new DevExpress.XtraEditors.CheckEdit();
- selectFlagsPopupCtrl1 = new SelectFlagsPopupCtrl();
- 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();
- TankCoefficientViewModelBindingSource = 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();
+ txtKeyWord = new DevExpress.XtraEditors.TextEdit();
+ txtTagName = new DevExpress.XtraEditors.TextEdit();
+ setFlagsEditCtrl1 = new SetFlagsEditCtrl();
+ generalOkAndCancelCtrl1 = new GeneralOkAndCancelCtrl();
+ txtDescription = new DevExpress.XtraEditors.MemoEdit();
+ 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();
- layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(components);
+ textEditVoerFlow = new DevExpress.XtraEditors.CheckEdit();
+ txtMinLevel = new DevExpress.XtraEditors.TextEdit();
+ txtDN = new DevExpress.XtraEditors.TextEdit();
+ txtMaxLevel = new DevExpress.XtraEditors.TextEdit();
+ txtMinVol = new DevExpress.XtraEditors.TextEdit();
+ layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
- imageComboBoxEdit1 = new DevExpress.XtraEditors.ImageComboBoxEdit();
+ layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
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);
- layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
- ((System.ComponentModel.ISupportInitialize)layoutControl1).BeginInit();
+ ((ISupportInitialize)layoutControl1).BeginInit();
layoutControl1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)textEditMaxLevel.Properties).BeginInit();
- ((System.ComponentModel.ISupportInitialize)textEditDN.Properties).BeginInit();
- ((System.ComponentModel.ISupportInitialize)textEditMinLevel.Properties).BeginInit();
- ((System.ComponentModel.ISupportInitialize)textEditMinVol.Properties).BeginInit();
- ((System.ComponentModel.ISupportInitialize)textEditVoerFlow.Properties).BeginInit();
- ((System.ComponentModel.ISupportInitialize)TankCoefficientViewModelBindingSource).BeginInit();
- ((System.ComponentModel.ISupportInitialize)TextEditName.Properties).BeginInit();
- ((System.ComponentModel.ISupportInitialize)DescriptionTextEdit.Properties).BeginInit();
- ((System.ComponentModel.ISupportInitialize)TextEditKeyWord.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)layoutControlItem7).BeginInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem6).BeginInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem16).BeginInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem17).BeginInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem18).BeginInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem10).BeginInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem14).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();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem2).BeginInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem3).BeginInit();
+ ((ISupportInitialize)txtKeyWord.Properties).BeginInit();
+ ((ISupportInitialize)txtTagName.Properties).BeginInit();
+ ((ISupportInitialize)txtDescription.Properties).BeginInit();
+ ((ISupportInitialize)txtName.Properties).BeginInit();
+ ((ISupportInitialize)Root).BeginInit();
+ ((ISupportInitialize)layoutControlItem1).BeginInit();
+ ((ISupportInitialize)layoutControlItem6).BeginInit();
+ ((ISupportInitialize)layoutControlItem7).BeginInit();
+ ((ISupportInitialize)layoutControlItem8).BeginInit();
+ ((ISupportInitialize)layoutControlItem9).BeginInit();
+ ((ISupportInitialize)layoutControlItem10).BeginInit();
+ ((ISupportInitialize)dxErrorProvider1).BeginInit();
+ ((ISupportInitialize)textEditVoerFlow.Properties).BeginInit();
+ ((ISupportInitialize)txtMinLevel.Properties).BeginInit();
+ ((ISupportInitialize)txtDN.Properties).BeginInit();
+ ((ISupportInitialize)txtMaxLevel.Properties).BeginInit();
+ ((ISupportInitialize)txtMinVol.Properties).BeginInit();
+ ((ISupportInitialize)layoutControlItem11).BeginInit();
+ ((ISupportInitialize)layoutControlItem12).BeginInit();
+ ((ISupportInitialize)layoutControlItem13).BeginInit();
+ ((ISupportInitialize)layoutControlItem14).BeginInit();
+ ((ISupportInitialize)layoutControlItem15).BeginInit();
SuspendLayout();
//
// layoutControl1
//
- layoutControl1.Controls.Add(textEditMaxLevel);
- layoutControl1.Controls.Add(textEditDN);
- layoutControl1.Controls.Add(textEditMinLevel);
- layoutControl1.Controls.Add(textEditMinVol);
layoutControl1.Controls.Add(textEditVoerFlow);
- layoutControl1.Controls.Add(selectFlagsPopupCtrl1);
- layoutControl1.Controls.Add(BtnOk);
- layoutControl1.Controls.Add(simpleButton1);
- layoutControl1.Controls.Add(TextEditName);
- layoutControl1.Controls.Add(DescriptionTextEdit);
- layoutControl1.Controls.Add(TextEditKeyWord);
+ layoutControl1.Controls.Add(txtMinLevel);
+ layoutControl1.Controls.Add(txtDN);
+ layoutControl1.Controls.Add(txtMaxLevel);
+ layoutControl1.Controls.Add(txtMinVol);
+ layoutControl1.Controls.Add(txtKeyWord);
+ layoutControl1.Controls.Add(txtTagName);
+ layoutControl1.Controls.Add(setFlagsEditCtrl1);
+ layoutControl1.Controls.Add(generalOkAndCancelCtrl1);
+ layoutControl1.Controls.Add(txtDescription);
+ 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(681, 482);
- layoutControl1.TabIndex = 0;
+ layoutControl1.Size = new Size(665, 381);
+ layoutControl1.TabIndex = 1;
layoutControl1.Text = "layoutControl1";
//
- // textEditMaxLevel
+ // txtKeyWord
//
- textEditMaxLevel.Location = new Point(406, 56);
- textEditMaxLevel.Name = "textEditMaxLevel";
- textEditMaxLevel.Size = new Size(267, 20);
- textEditMaxLevel.StyleController = layoutControl1;
- textEditMaxLevel.TabIndex = 6;
+ txtKeyWord.Location = new Point(398, 12);
+ txtKeyWord.Name = "txtKeyWord";
+ txtKeyWord.Properties.NullValuePrompt = ",鍒嗛殧锛屼緥濡� A,B";
+ txtKeyWord.Size = new Size(255, 20);
+ txtKeyWord.StyleController = layoutControl1;
+ txtKeyWord.TabIndex = 2;
//
- // textEditDN
+ // txtTagName
//
- textEditDN.Location = new Point(72, 32);
- textEditDN.Name = "textEditDN";
- textEditDN.Size = new Size(266, 20);
- textEditDN.StyleController = layoutControl1;
- textEditDN.TabIndex = 3;
+ txtTagName.Location = new Point(76, 84);
+ txtTagName.Name = "txtTagName";
+ txtTagName.Size = new Size(254, 20);
+ txtTagName.StyleController = layoutControl1;
+ txtTagName.TabIndex = 7;
//
- // textEditMinLevel
+ // setFlagsEditCtrl1
//
- textEditMinLevel.Location = new Point(406, 32);
- textEditMinLevel.Name = "textEditMinLevel";
- textEditMinLevel.Size = new Size(267, 20);
- textEditMinLevel.StyleController = layoutControl1;
- textEditMinLevel.TabIndex = 4;
+ setFlagsEditCtrl1.Location = new Point(398, 36);
+ setFlagsEditCtrl1.Name = "setFlagsEditCtrl1";
+ setFlagsEditCtrl1.Size = new Size(255, 20);
+ setFlagsEditCtrl1.TabIndex = 4;
//
- // textEditMinVol
+ // generalOkAndCancelCtrl1
//
- textEditMinVol.Location = new Point(72, 80);
- textEditMinVol.Name = "textEditMinVol";
- textEditMinVol.Size = new Size(266, 20);
- textEditMinVol.StyleController = layoutControl1;
- textEditMinVol.TabIndex = 7;
+ 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, 343);
+ generalOkAndCancelCtrl1.Name = "generalOkAndCancelCtrl1";
+ generalOkAndCancelCtrl1.Size = new Size(641, 26);
+ generalOkAndCancelCtrl1.TabIndex = 11;
//
- // textEditVoerFlow
+ // txtDescription
//
- textEditVoerFlow.EditValue = null;
- textEditVoerFlow.Location = new Point(342, 80);
- textEditVoerFlow.Name = "textEditVoerFlow";
- textEditVoerFlow.Properties.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.Default;
- textEditVoerFlow.Properties.Caption = "鏄惁鍏佽婧㈡祦";
- textEditVoerFlow.Size = new Size(331, 20);
- textEditVoerFlow.StyleController = layoutControl1;
- textEditVoerFlow.TabIndex = 8;
+ txtDescription.Location = new Point(76, 132);
+ txtDescription.Name = "txtDescription";
+ txtDescription.Size = new Size(577, 207);
+ txtDescription.StyleController = layoutControl1;
+ txtDescription.TabIndex = 10;
//
- // selectFlagsPopupCtrl1
+ // txtName
//
- selectFlagsPopupCtrl1.Location = new Point(72, 56);
- selectFlagsPopupCtrl1.Name = "selectFlagsPopupCtrl1";
- selectFlagsPopupCtrl1.Size = new Size(266, 20);
- selectFlagsPopupCtrl1.TabIndex = 5;
- //
- // colName
- //
- colName.Caption = "鍚嶇О";
- colName.FieldName = "Name";
- colName.Name = "colName";
- colName.Visible = true;
- colName.VisibleIndex = 0;
- //
- // colCaliber
- //
- colCaliber.Caption = "鍙ｅ緞";
- colCaliber.FieldName = "Caliber";
- colCaliber.Name = "colCaliber";
- colCaliber.Visible = true;
- colCaliber.VisibleIndex = 1;
- //
- // colMaterial
- //
- colMaterial.Caption = "鏉愭枡";
- colMaterial.FieldName = "Material";
- colMaterial.Name = "colMaterial";
- colMaterial.Visible = true;
- colMaterial.VisibleIndex = 2;
- //
- // colMinorLoss
- //
- 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;
- //
- // TankCoefficientViewModelBindingSource
- //
- TankCoefficientViewModelBindingSource.DataSource = typeof(TankCoefficientViewModel);
- //
- // BtnOk
- //
- BtnOk.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary;
- BtnOk.Appearance.Options.UseBackColor = true;
- BtnOk.Location = new Point(531, 452);
- BtnOk.Name = "BtnOk";
- BtnOk.Size = new Size(67, 22);
- BtnOk.StyleController = layoutControl1;
- BtnOk.TabIndex = 10;
- 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(602, 452);
- simpleButton1.Name = "simpleButton1";
- simpleButton1.Size = new Size(71, 22);
- simpleButton1.StyleController = layoutControl1;
- simpleButton1.TabIndex = 11;
- simpleButton1.Text = "鍙栨秷";
- //
- // TextEditName
- //
- TextEditName.Location = new Point(72, 8);
- TextEditName.Name = "TextEditName";
- TextEditName.Size = new Size(266, 20);
- TextEditName.StyleController = layoutControl1;
- TextEditName.TabIndex = 0;
- //
- // DescriptionTextEdit
- //
- DescriptionTextEdit.Location = new Point(20, 137);
- DescriptionTextEdit.Name = "DescriptionTextEdit";
- DescriptionTextEdit.Size = new Size(641, 299);
- DescriptionTextEdit.StyleController = layoutControl1;
- DescriptionTextEdit.TabIndex = 9;
- //
- // TextEditKeyWord
- //
- TextEditKeyWord.Location = new Point(406, 8);
- TextEditKeyWord.Name = "TextEditKeyWord";
- TextEditKeyWord.Size = new Size(267, 20);
- TextEditKeyWord.StyleController = layoutControl1;
- TextEditKeyWord.TabIndex = 2;
+ txtName.Location = new Point(76, 12);
+ txtName.Name = "txtName";
+ txtName.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.False;
+ txtName.Size = new Size(254, 20);
+ txtName.StyleController = layoutControl1;
+ txtName.TabIndex = 0;
//
// Root
//
@@ -281,318 +160,230 @@
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, layoutControlItem7, layoutControlItem6, layoutControlItem17, layoutControlItem18, layoutControlItem14, layoutControlItem16, layoutControlItem10 });
+ Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, layoutControlItem6, layoutControlItem7, layoutControlItem10, layoutControlItem15, layoutControlItem13, layoutControlItem11, layoutControlItem12, layoutControlItem9, layoutControlItem8, layoutControlItem14 });
Root.Name = "Root";
- Root.Padding = new DevExpress.XtraLayout.Utils.Padding(6, 6, 6, 6);
- Root.Size = new Size(681, 482);
+ Root.Size = new Size(665, 381);
Root.TextVisible = false;
- //
- // layoutControlItem4
- //
- layoutControlItem4.Control = BtnOk;
- layoutControlItem4.Location = new Point(523, 444);
- layoutControlItem4.Name = "layoutControlItem4";
- layoutControlItem4.Size = new Size(71, 26);
- layoutControlItem4.TextSize = new Size(0, 0);
- layoutControlItem4.TextVisible = false;
- //
- // emptySpaceItem1
- //
- emptySpaceItem1.AllowHotTrack = false;
- emptySpaceItem1.Location = new Point(0, 444);
- emptySpaceItem1.Name = "emptySpaceItem1";
- emptySpaceItem1.Size = new Size(523, 26);
- emptySpaceItem1.TextSize = new Size(0, 0);
- //
- // layoutControlItem8
- //
- layoutControlItem8.Control = simpleButton1;
- layoutControlItem8.Location = new Point(594, 444);
- layoutControlItem8.Name = "layoutControlItem8";
- layoutControlItem8.Size = new Size(75, 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(334, 24);
- layoutControlItem1.Text = "<color=red>*</color>鍨嬪彿:";
+ layoutControlItem1.Size = new Size(322, 24);
+ layoutControlItem1.Text = "<color=red>*</color>鍚嶇О:";
layoutControlItem1.TextSize = new Size(52, 14);
- //
- // layoutControlGroup5
- //
- layoutControlGroup5.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem5 });
- layoutControlGroup5.Location = new Point(0, 96);
- layoutControlGroup5.Name = "layoutControlGroup5";
- layoutControlGroup5.Size = new Size(669, 348);
- layoutControlGroup5.Text = "璇存槑";
- //
- // layoutControlItem5
- //
- layoutControlItem5.Control = DescriptionTextEdit;
- layoutControlItem5.Location = new Point(0, 0);
- layoutControlItem5.Name = "layoutControlItem5";
- layoutControlItem5.Size = new Size(645, 303);
- layoutControlItem5.Text = "璇存槑:";
- layoutControlItem5.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.CustomSize;
- layoutControlItem5.TextSize = new Size(0, 0);
- layoutControlItem5.TextToControlDistance = 0;
- layoutControlItem5.TextVisible = false;
- //
- // layoutControlItem7
- //
- layoutControlItem7.Control = TextEditKeyWord;
- layoutControlItem7.Location = new Point(334, 0);
- layoutControlItem7.Name = "layoutControlItem7";
- layoutControlItem7.Size = new Size(335, 24);
- layoutControlItem7.Text = "鍏抽敭瀛�:";
- layoutControlItem7.TextSize = new Size(52, 14);
//
// layoutControlItem6
//
- layoutControlItem6.Control = selectFlagsPopupCtrl1;
- layoutControlItem6.Location = new Point(0, 48);
+ layoutControlItem6.Control = txtDescription;
+ layoutControlItem6.Location = new Point(0, 120);
layoutControlItem6.Name = "layoutControlItem6";
- layoutControlItem6.Size = new Size(334, 24);
- layoutControlItem6.Text = "鏍囩鍒楄〃:";
+ layoutControlItem6.Size = new Size(645, 211);
+ layoutControlItem6.Text = "璇存槑:";
layoutControlItem6.TextSize = new Size(52, 14);
//
- // layoutControlItem16
+ // layoutControlItem7
//
- layoutControlItem16.Control = textEditMinLevel;
- layoutControlItem16.Location = new Point(334, 24);
- layoutControlItem16.Name = "layoutControlItem16";
- layoutControlItem16.Size = new Size(335, 24);
- layoutControlItem16.Text = "鏈�浣庢按浣�:";
- layoutControlItem16.TextSize = new Size(52, 14);
+ layoutControlItem7.Control = generalOkAndCancelCtrl1;
+ layoutControlItem7.Location = new Point(0, 331);
+ layoutControlItem7.Name = "layoutControlItem7";
+ layoutControlItem7.Size = new Size(645, 30);
+ layoutControlItem7.TextSize = new Size(0, 0);
+ layoutControlItem7.TextVisible = false;
//
- // layoutControlItem17
+ // layoutControlItem8
//
- layoutControlItem17.Control = textEditDN;
- layoutControlItem17.Location = new Point(0, 24);
- layoutControlItem17.Name = "layoutControlItem17";
- layoutControlItem17.Size = new Size(334, 24);
- layoutControlItem17.Text = "鍏О鐩村緞:";
- layoutControlItem17.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(52, 14);
//
- // layoutControlItem18
+ // layoutControlItem9
//
- layoutControlItem18.Control = textEditMaxLevel;
- layoutControlItem18.Location = new Point(334, 48);
- layoutControlItem18.Name = "layoutControlItem18";
- layoutControlItem18.Size = new Size(335, 24);
- layoutControlItem18.Text = "鏈�澶ф按浣�:";
- layoutControlItem18.TextSize = new Size(52, 14);
+ layoutControlItem9.Control = txtTagName;
+ layoutControlItem9.Location = new Point(0, 72);
+ layoutControlItem9.Name = "layoutControlItem9";
+ layoutControlItem9.Size = new Size(322, 24);
+ layoutControlItem9.Text = "鏍囧織:";
+ layoutControlItem9.TextSize = new Size(52, 14);
//
// layoutControlItem10
//
- layoutControlItem10.Control = textEditVoerFlow;
- layoutControlItem10.Location = new Point(334, 72);
+ layoutControlItem10.Control = txtKeyWord;
+ layoutControlItem10.Location = new Point(322, 0);
layoutControlItem10.Name = "layoutControlItem10";
- layoutControlItem10.Size = new Size(335, 24);
- layoutControlItem10.TextSize = new Size(0, 0);
- layoutControlItem10.TextVisible = false;
- //
- // layoutControlItem14
- //
- layoutControlItem14.Control = textEditMinVol;
- layoutControlItem14.Location = new Point(0, 72);
- layoutControlItem14.Name = "layoutControlItem14";
- layoutControlItem14.Size = new Size(334, 24);
- layoutControlItem14.Text = "鏈�灏忓绉�:";
- layoutControlItem14.TextSize = new Size(52, 14);
+ layoutControlItem10.Size = new Size(323, 24);
+ layoutControlItem10.Text = "鍏抽敭瀛�:";
+ layoutControlItem10.TextSize = new Size(52, 14);
//
// dxErrorProvider1
//
dxErrorProvider1.ContainerControl = this;
//
+ // textEditVoerFlow
+ //
+ textEditVoerFlow.EditValue = null;
+ textEditVoerFlow.Location = new Point(12, 108);
+ textEditVoerFlow.Name = "textEditVoerFlow";
+ textEditVoerFlow.Properties.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.Default;
+ textEditVoerFlow.Properties.Caption = "鏄惁鍏佽婧㈡祦";
+ textEditVoerFlow.Size = new Size(641, 20);
+ textEditVoerFlow.StyleController = layoutControl1;
+ textEditVoerFlow.TabIndex = 9;
+ //
+ // txtMinLevel
+ //
+ txtMinLevel.Location = new Point(76, 60);
+ txtMinLevel.Name = "txtMinLevel";
+ txtMinLevel.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.False;
+ txtMinLevel.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
+ txtMinLevel.Size = new Size(254, 20);
+ txtMinLevel.StyleController = layoutControl1;
+ txtMinLevel.TabIndex = 5;
+ //
+ // txtDN
+ //
+ txtDN.Location = new Point(76, 36);
+ txtDN.Name = "txtDN";
+ txtDN.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.True;
+ txtDN.Properties.DisplayFormat.FormatString = "{0}mm";
+ txtDN.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.Custom;
+ txtDN.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
+ txtDN.Properties.NullValuePrompt = "mm";
+ txtDN.Size = new Size(254, 20);
+ txtDN.StyleController = layoutControl1;
+ txtDN.TabIndex = 3;
+ //
+ // txtMaxLevel
+ //
+ txtMaxLevel.Location = new Point(398, 60);
+ txtMaxLevel.Name = "txtMaxLevel";
+ txtMaxLevel.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.False;
+ txtMaxLevel.Size = new Size(255, 20);
+ txtMaxLevel.StyleController = layoutControl1;
+ txtMaxLevel.TabIndex = 6;
+ //
+ // txtMinVol
+ //
+ txtMinVol.Location = new Point(398, 84);
+ txtMinVol.Name = "txtMinVol";
+ txtMinVol.Size = new Size(255, 20);
+ txtMinVol.StyleController = layoutControl1;
+ txtMinVol.TabIndex = 8;
+ //
+ // layoutControlItem11
+ //
+ layoutControlItem11.Control = txtDN;
+ layoutControlItem11.Location = new Point(0, 24);
+ layoutControlItem11.Name = "layoutControlItem11";
+ layoutControlItem11.Size = new Size(322, 24);
+ layoutControlItem11.Text = "鍏О鐩村緞:";
+ layoutControlItem11.TextSize = new Size(52, 14);
+ //
+ // layoutControlItem12
+ //
+ layoutControlItem12.Control = txtMinVol;
+ layoutControlItem12.Location = new Point(322, 72);
+ layoutControlItem12.Name = "layoutControlItem12";
+ layoutControlItem12.Size = new Size(323, 24);
+ layoutControlItem12.Text = "鏈�浣庡绉�:";
+ layoutControlItem12.TextSize = new Size(52, 14);
+ //
// layoutControlItem13
//
- layoutControlItem13.Control = imageComboBoxEdit1;
- layoutControlItem13.Location = new Point(0, 72);
- layoutControlItem13.Name = "layoutControlItem8";
- layoutControlItem13.Size = new Size(499, 24);
- layoutControlItem13.Text = "閫夋嫨鍒嗙被";
+ layoutControlItem13.Control = txtMaxLevel;
+ layoutControlItem13.Location = new Point(322, 48);
+ layoutControlItem13.Name = "layoutControlItem13";
+ layoutControlItem13.Size = new Size(323, 24);
+ layoutControlItem13.Text = "鏈�楂樻按浣�:";
layoutControlItem13.TextSize = new Size(52, 14);
//
- // imageComboBoxEdit1
+ // layoutControlItem14
//
- imageComboBoxEdit1.Location = new Point(0, 0);
- imageComboBoxEdit1.Name = "imageComboBoxEdit1";
- imageComboBoxEdit1.Size = new Size(100, 20);
- imageComboBoxEdit1.TabIndex = 0;
+ layoutControlItem14.Control = txtMinLevel;
+ layoutControlItem14.Location = new Point(0, 48);
+ layoutControlItem14.Name = "layoutControlItem14";
+ layoutControlItem14.Size = new Size(322, 24);
+ layoutControlItem14.Text = "鏈�浣庢按浣�:";
+ layoutControlItem14.TextSize = new Size(52, 14);
//
// 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, 42);
- layoutControlGroup4.Text = "璇存槑";
- //
- // layoutControlItem27
- //
- layoutControlItem27.Control = DescriptionTextEdit;
- layoutControlItem27.Location = new Point(0, 0);
- layoutControlItem27.Name = "layoutControlItem5";
- layoutControlItem27.Size = new Size(645, 42);
- layoutControlItem27.Text = "璇存槑:";
- layoutControlItem27.TextSize = new Size(59, 14);
- //
- // layoutControlItem2
- //
- layoutControlItem2.Location = new Point(334, 0);
- layoutControlItem2.Name = "layoutControlItem2";
- layoutControlItem2.Size = new Size(335, 24);
- layoutControlItem2.Text = "鍏抽敭瀛�:";
- layoutControlItem2.TextSize = new Size(49, 14);
- //
- // layoutControlItem3
- //
- layoutControlItem3.Location = new Point(0, 48);
- layoutControlItem3.Name = "layoutControlItem3";
- layoutControlItem3.Size = new Size(669, 24);
- layoutControlItem3.Text = "鎹熷け绯绘暟:";
- layoutControlItem3.TextSize = new Size(52, 14);
+ layoutControlItem15.Control = textEditVoerFlow;
+ layoutControlItem15.Location = new Point(0, 96);
+ layoutControlItem15.Name = "layoutControlItem15";
+ layoutControlItem15.Size = new Size(645, 24);
+ layoutControlItem15.TextSize = new Size(0, 0);
+ layoutControlItem15.TextVisible = false;
//
// EditAssetsTankMainDlg
//
AutoScaleDimensions = new SizeF(7F, 14F);
AutoScaleMode = AutoScaleMode.Font;
- ClientSize = new Size(681, 482);
+ ClientSize = new Size(665, 381);
Controls.Add(layoutControl1);
Name = "EditAssetsTankMainDlg";
- StartPosition = FormStartPosition.CenterScreen;
- Text = "缂栬緫姘存睜";
- ((System.ComponentModel.ISupportInitialize)layoutControl1).EndInit();
+ StartPosition = FormStartPosition.CenterParent;
+ Text = "缂栬緫";
+ ((ISupportInitialize)layoutControl1).EndInit();
layoutControl1.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)textEditMaxLevel.Properties).EndInit();
- ((System.ComponentModel.ISupportInitialize)textEditDN.Properties).EndInit();
- ((System.ComponentModel.ISupportInitialize)textEditMinLevel.Properties).EndInit();
- ((System.ComponentModel.ISupportInitialize)textEditMinVol.Properties).EndInit();
- ((System.ComponentModel.ISupportInitialize)textEditVoerFlow.Properties).EndInit();
- ((System.ComponentModel.ISupportInitialize)TankCoefficientViewModelBindingSource).EndInit();
- ((System.ComponentModel.ISupportInitialize)TextEditName.Properties).EndInit();
- ((System.ComponentModel.ISupportInitialize)DescriptionTextEdit.Properties).EndInit();
- ((System.ComponentModel.ISupportInitialize)TextEditKeyWord.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)layoutControlItem7).EndInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem6).EndInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem16).EndInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem17).EndInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem18).EndInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem10).EndInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem14).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();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem2).EndInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem3).EndInit();
+ ((ISupportInitialize)txtKeyWord.Properties).EndInit();
+ ((ISupportInitialize)txtTagName.Properties).EndInit();
+ ((ISupportInitialize)txtDescription.Properties).EndInit();
+ ((ISupportInitialize)txtName.Properties).EndInit();
+ ((ISupportInitialize)Root).EndInit();
+ ((ISupportInitialize)layoutControlItem1).EndInit();
+ ((ISupportInitialize)layoutControlItem6).EndInit();
+ ((ISupportInitialize)layoutControlItem7).EndInit();
+ ((ISupportInitialize)layoutControlItem8).EndInit();
+ ((ISupportInitialize)layoutControlItem9).EndInit();
+ ((ISupportInitialize)layoutControlItem10).EndInit();
+ ((ISupportInitialize)dxErrorProvider1).EndInit();
+ ((ISupportInitialize)textEditVoerFlow.Properties).EndInit();
+ ((ISupportInitialize)txtMinLevel.Properties).EndInit();
+ ((ISupportInitialize)txtDN.Properties).EndInit();
+ ((ISupportInitialize)txtMaxLevel.Properties).EndInit();
+ ((ISupportInitialize)txtMinVol.Properties).EndInit();
+ ((ISupportInitialize)layoutControlItem11).EndInit();
+ ((ISupportInitialize)layoutControlItem12).EndInit();
+ ((ISupportInitialize)layoutControlItem13).EndInit();
+ ((ISupportInitialize)layoutControlItem14).EndInit();
+ ((ISupportInitialize)layoutControlItem15).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 txtLowerLimit;
+ 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 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.XtraLayout.LayoutControlGroup layoutControlGroup5;
- private DevExpress.Utils.ToolTipController toolTipController1;
- private DevExpress.XtraEditors.TextEdit TextEditKeyWord;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
- 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 TankCoefficientViewModelBindingSource;
- private DevExpress.XtraEditors.PopupContainerEdit TextEditMinorLoss;
- private SelectFlagsPopupCtrl selectFlagsPopupCtrl1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
- private DevExpress.XtraEditors.TextEdit textEditDN;
- private DevExpress.XtraEditors.TextEdit textEditMinLevel;
- private DevExpress.XtraEditors.TextEdit textEditMinVol;
- private DevExpress.XtraEditors.CheckEdit textEditVoerFlow;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
+ 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;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
- private DevExpress.XtraEditors.TextEdit textEditMaxLevel;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
+ private DevExpress.XtraEditors.CheckEdit textEditVoerFlow;
+ private DevExpress.XtraEditors.TextEdit txtMinLevel;
+ private DevExpress.XtraEditors.TextEdit txtDN;
+ private DevExpress.XtraEditors.TextEdit txtMaxLevel;
+ private DevExpress.XtraEditors.TextEdit txtMinVol;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
}
}
\ No newline at end of file
--
Gitblit v1.9.3