From 687a3dfd095bc8c099b7fa6e65f0dc699fdc8f1d Mon Sep 17 00:00:00 2001 From: Shuxia Ning <NingShuxia0927@outlook.com> Date: 星期三, 08 一月 2025 13:57:33 +0800 Subject: [PATCH] 冲突 --- WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/03-factor/ViewAssetsElbowFactorDlg.Designer.cs | 64 +++++++++++++++++++++++-------- 1 files changed, 47 insertions(+), 17 deletions(-) diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/03-factor/ViewAssetsElbowFactorDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/03-factor/ViewAssetsElbowFactorDlg.Designer.cs index 69cb55f..07c650c 100644 --- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/03-factor/ViewAssetsElbowFactorDlg.Designer.cs +++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/03-factor/ViewAssetsElbowFactorDlg.Designer.cs @@ -37,9 +37,11 @@ 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(); + layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem(); + txtAngle = new DevExpress.XtraEditors.TextEdit(); + layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem(); ((ISupportInitialize)layoutControl1).BeginInit(); layoutControl1.SuspendLayout(); ((ISupportInitialize)txtDescription.Properties).BeginInit(); @@ -50,13 +52,16 @@ ((ISupportInitialize)Root).BeginInit(); ((ISupportInitialize)layoutControlItem1).BeginInit(); ((ISupportInitialize)layoutControlItem3).BeginInit(); - ((ISupportInitialize)layoutControlItem4).BeginInit(); ((ISupportInitialize)layoutControlItem2).BeginInit(); ((ISupportInitialize)layoutControlItem6).BeginInit(); + ((ISupportInitialize)layoutControlItem4).BeginInit(); + ((ISupportInitialize)txtAngle.Properties).BeginInit(); + ((ISupportInitialize)layoutControlItem5).BeginInit(); SuspendLayout(); // // layoutControl1 // + layoutControl1.Controls.Add(txtAngle); layoutControl1.Controls.Add(txtDescription); layoutControl1.Controls.Add(txtCoefficient); layoutControl1.Controls.Add(txtCaliber); @@ -73,11 +78,11 @@ // // txtDescription // - txtDescription.Location = new Point(76, 60); + txtDescription.Location = new Point(76, 84); txtDescription.Name = "txtDescription"; txtDescription.Properties.ReadOnly = true; txtDescription.Properties.UseReadOnlyAppearance = false; - txtDescription.Size = new Size(437, 244); + txtDescription.Size = new Size(437, 220); txtDescription.StyleController = layoutControl1; txtDescription.TabIndex = 7; // @@ -136,7 +141,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[] { layoutControlItem1, layoutControlItem3, layoutControlItem2, layoutControlItem6, layoutControlItem4 }); + Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, layoutControlItem3, layoutControlItem2, layoutControlItem6, layoutControlItem4, layoutControlItem5 }); Root.Name = "Root"; Root.Size = new Size(525, 316); Root.TextVisible = false; @@ -159,15 +164,6 @@ layoutControlItem3.Text = "鍙e緞:"; layoutControlItem3.TextSize = new Size(52, 14); // - // layoutControlItem4 - // - layoutControlItem4.Control = txtCoefficient; - layoutControlItem4.Location = new Point(252, 24); - layoutControlItem4.Name = "layoutControlItem4"; - layoutControlItem4.Size = new Size(253, 24); - layoutControlItem4.Text = "灞�闃荤郴鏁�:"; - layoutControlItem4.TextSize = new Size(52, 14); - // // layoutControlItem2 // layoutControlItem2.Control = txtMaterial; @@ -180,11 +176,41 @@ // layoutControlItem6 // layoutControlItem6.Control = txtDescription; - layoutControlItem6.Location = new Point(0, 48); + layoutControlItem6.Location = new Point(0, 72); layoutControlItem6.Name = "layoutControlItem6"; - layoutControlItem6.Size = new Size(505, 248); + layoutControlItem6.Size = new Size(505, 224); layoutControlItem6.Text = "璇存槑:"; layoutControlItem6.TextSize = new Size(52, 14); + // + // layoutControlItem4 + // + layoutControlItem4.Control = txtCoefficient; + layoutControlItem4.Location = new Point(252, 24); + layoutControlItem4.Name = "layoutControlItem4"; + layoutControlItem4.Size = new Size(253, 24); + layoutControlItem4.Text = "灞�闃荤郴鏁�:"; + layoutControlItem4.TextSize = new Size(52, 14); + // + // txtAngle + // + txtAngle.Location = new Point(76, 60); + txtAngle.Name = "txtAngle"; + txtAngle.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager)); + txtAngle.Properties.MaskSettings.Set("mask", "d"); + txtAngle.Properties.ReadOnly = true; + txtAngle.Properties.UseReadOnlyAppearance = false; + txtAngle.Size = new Size(437, 20); + txtAngle.StyleController = layoutControl1; + txtAngle.TabIndex = 7; + // + // 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(52, 14); // // ViewAssetsElbowFactorDlg // @@ -205,9 +231,11 @@ ((ISupportInitialize)Root).EndInit(); ((ISupportInitialize)layoutControlItem1).EndInit(); ((ISupportInitialize)layoutControlItem3).EndInit(); - ((ISupportInitialize)layoutControlItem4).EndInit(); ((ISupportInitialize)layoutControlItem2).EndInit(); ((ISupportInitialize)layoutControlItem6).EndInit(); + ((ISupportInitialize)layoutControlItem4).EndInit(); + ((ISupportInitialize)txtAngle.Properties).EndInit(); + ((ISupportInitialize)layoutControlItem5).EndInit(); ResumeLayout(false); } @@ -225,5 +253,7 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4; private DevExpress.XtraEditors.MemoEdit txtDescription; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6; + private DevExpress.XtraEditors.TextEdit txtAngle; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5; } } \ No newline at end of file -- Gitblit v1.9.3