From a3b2b3aefc721034d63144a3cfc835d3c19c490d Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期五, 25 十月 2024 16:25:03 +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 |   42 +++++++++++++++++++++---------------------
 1 files changed, 21 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..7baf6c7 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();
+            colConnectionLength = 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();
             ((ISupportInitialize)layoutControl1).BeginInit();
             layoutControl1.SuspendLayout();
             ((ISupportInitialize)gridControl3).BeginInit();
@@ -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,23 @@
             colMinorLoss.Name = "colMinorLoss";
             colMinorLoss.Visible = true;
             colMinorLoss.VisibleIndex = 4;
-            colMinorLoss.Width = 165;
+            colMinorLoss.Width = 115;
+            // 
+            // colConnectionLength
+            // 
+            colConnectionLength.FieldName = "ConnectionLength";
+            colConnectionLength.Name = "colConnectionLength";
+            colConnectionLength.Visible = true;
+            colConnectionLength.VisibleIndex = 5;
+            colConnectionLength.Width = 252;
+            // 
+            // colAngle
+            // 
+            colAngle.FieldName = "Angle";
+            colAngle.Name = "colAngle";
+            colAngle.Visible = true;
+            colAngle.VisibleIndex = 3;
+            colAngle.Width = 103;
             // 
             // searchControl1
             // 
@@ -172,22 +188,6 @@
             layoutControlItem5.Size = new Size(769, 553);
             layoutControlItem5.TextSize = new Size(0, 0);
             layoutControlItem5.TextVisible = false;
-            // 
-            // colConnectionLength
-            // 
-            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;
             // 
             // ElbowSingleMatchingForm
             // 

--
Gitblit v1.9.3