From 935a8a4996853c51188402c57f905ee9c9eac898 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期三, 04 十二月 2024 22:51:50 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/05-elbows/01-elbowsinglematching/ElbowSingleMatchingForm.Designer.cs | 41 ++++++++++++++++++++---------------------
1 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/05-elbows/01-elbowsinglematching/ElbowSingleMatchingForm.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/05-elbows/01-elbowsinglematching/ElbowSingleMatchingForm.Designer.cs
index e8c1423..35e220f 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/05-elbows/01-elbowsinglematching/ElbowSingleMatchingForm.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/05-elbows/01-elbowsinglematching/ElbowSingleMatchingForm.Designer.cs
@@ -37,13 +37,13 @@
colMaterial = new DevExpress.XtraGrid.Columns.GridColumn();
colCaliber = new DevExpress.XtraGrid.Columns.GridColumn();
colMinorLoss = new DevExpress.XtraGrid.Columns.GridColumn();
+ colAngle = new DevExpress.XtraGrid.Columns.GridColumn();
searchControl1 = new SearchControl();
Root = new DevExpress.XtraLayout.LayoutControlGroup();
simpleLabelItem1 = new DevExpress.XtraLayout.SimpleLabelItem();
layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
- colConnectionLength = new DevExpress.XtraGrid.Columns.GridColumn();
- colAngle = new DevExpress.XtraGrid.Columns.GridColumn();
+ colElbowLengthType = new DevExpress.XtraGrid.Columns.GridColumn();
((ISupportInitialize)layoutControl1).BeginInit();
layoutControl1.SuspendLayout();
((ISupportInitialize)gridControl3).BeginInit();
@@ -87,7 +87,7 @@
//
gridView3.Appearance.HeaderPanel.Options.UseTextOptions = true;
gridView3.Appearance.HeaderPanel.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
- gridView3.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colModelType, colMaterial, colCaliber, colMinorLoss, colConnectionLength, colAngle });
+ gridView3.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colModelType, colMaterial, colCaliber, colMinorLoss, colAngle, colElbowLengthType });
gridView3.GridControl = gridControl3;
gridView3.Name = "gridView3";
gridView3.OptionsView.ShowGroupPanel = false;
@@ -107,7 +107,7 @@
colMaterial.Name = "colMaterial";
colMaterial.Visible = true;
colMaterial.VisibleIndex = 1;
- colMaterial.Width = 154;
+ colMaterial.Width = 184;
//
// colCaliber
//
@@ -115,7 +115,7 @@
colCaliber.Name = "colCaliber";
colCaliber.Visible = true;
colCaliber.VisibleIndex = 2;
- colCaliber.Width = 141;
+ colCaliber.Width = 109;
//
// colMinorLoss
//
@@ -123,7 +123,15 @@
colMinorLoss.Name = "colMinorLoss";
colMinorLoss.Visible = true;
colMinorLoss.VisibleIndex = 4;
- colMinorLoss.Width = 165;
+ colMinorLoss.Width = 115;
+ //
+ // colAngle
+ //
+ colAngle.FieldName = "Angle";
+ colAngle.Name = "colAngle";
+ colAngle.Visible = true;
+ colAngle.VisibleIndex = 3;
+ colAngle.Width = 103;
//
// searchControl1
//
@@ -173,21 +181,12 @@
layoutControlItem5.TextSize = new Size(0, 0);
layoutControlItem5.TextVisible = false;
//
- // colConnectionLength
+ // colElbowLengthType
//
- colConnectionLength.FieldName = "ConnectionLength";
- colConnectionLength.Name = "colConnectionLength";
- colConnectionLength.Visible = true;
- colConnectionLength.VisibleIndex = 5;
- colConnectionLength.Width = 182;
- //
- // colAngle
- //
- colAngle.FieldName = "Angle";
- colAngle.Name = "colAngle";
- colAngle.Visible = true;
- colAngle.VisibleIndex = 3;
- colAngle.Width = 121;
+ colElbowLengthType.FieldName = "ElbowLengthType";
+ colElbowLengthType.Name = "colElbowLengthType";
+ colElbowLengthType.Visible = true;
+ colElbowLengthType.VisibleIndex = 5;
//
// ElbowSingleMatchingForm
//
@@ -224,7 +223,7 @@
private DevExpress.XtraGrid.Columns.GridColumn colMaterial;
private DevExpress.XtraGrid.Columns.GridColumn colCaliber;
private DevExpress.XtraGrid.Columns.GridColumn colMinorLoss;
- private DevExpress.XtraGrid.Columns.GridColumn colConnectionLength;
private DevExpress.XtraGrid.Columns.GridColumn colAngle;
+ private DevExpress.XtraGrid.Columns.GridColumn colElbowLengthType;
}
}
--
Gitblit v1.9.3