From 59f2c4c04e06d77de7f10ab96d1a5c73ccd01262 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期四, 05 十二月 2024 16:23:42 +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/15-translation/TranslationSingleMatchingCtrl.Designer.cs | 76 +++++++++++++++++++++++++++++---------
1 files changed, 58 insertions(+), 18 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/15-translation/TranslationSingleMatchingCtrl.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/15-translation/TranslationSingleMatchingCtrl.Designer.cs
index 75059a4..7431cef 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/15-translation/TranslationSingleMatchingCtrl.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/15-translation/TranslationSingleMatchingCtrl.Designer.cs
@@ -35,13 +35,17 @@
gridView3 = new DevExpress.XtraGrid.Views.Grid.GridView();
colModelType = new DevExpress.XtraGrid.Columns.GridColumn();
colMaterial = new DevExpress.XtraGrid.Columns.GridColumn();
- colCaliber = new DevExpress.XtraGrid.Columns.GridColumn();
colMinorLoss = 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();
+ colDiameter = new DevExpress.XtraGrid.Columns.GridColumn();
+ coleAlgorithmType = new DevExpress.XtraGrid.Columns.GridColumn();
+ colEndDiameter = new DevExpress.XtraGrid.Columns.GridColumn();
+ colRoughness = new DevExpress.XtraGrid.Columns.GridColumn();
+ colStartDiameter = new DevExpress.XtraGrid.Columns.GridColumn();
((ISupportInitialize)layoutControl1).BeginInit();
layoutControl1.SuspendLayout();
((ISupportInitialize)gridControl3).BeginInit();
@@ -85,7 +89,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 });
+ gridView3.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colModelType, colMaterial, colMinorLoss, colDiameter, coleAlgorithmType, colEndDiameter, colRoughness, colStartDiameter });
gridView3.GridControl = gridControl3;
gridView3.Name = "gridView3";
gridView3.OptionsView.ShowGroupPanel = false;
@@ -97,31 +101,23 @@
colModelType.Name = "colModelType";
colModelType.Visible = true;
colModelType.VisibleIndex = 0;
- colModelType.Width = 243;
+ colModelType.Width = 227;
//
// colMaterial
//
colMaterial.FieldName = "Material";
colMaterial.Name = "colMaterial";
colMaterial.Visible = true;
- colMaterial.VisibleIndex = 1;
- colMaterial.Width = 184;
- //
- // colCaliber
- //
- colCaliber.FieldName = "Caliber";
- colCaliber.Name = "colCaliber";
- colCaliber.Visible = true;
- colCaliber.VisibleIndex = 2;
- colCaliber.Width = 109;
+ colMaterial.VisibleIndex = 2;
+ colMaterial.Width = 103;
//
// colMinorLoss
//
colMinorLoss.FieldName = "MinorLoss";
colMinorLoss.Name = "colMinorLoss";
colMinorLoss.Visible = true;
- colMinorLoss.VisibleIndex = 3;
- colMinorLoss.Width = 115;
+ colMinorLoss.VisibleIndex = 7;
+ colMinorLoss.Width = 126;
//
// searchControl1
//
@@ -171,12 +167,52 @@
layoutControlItem5.TextSize = new Size(0, 0);
layoutControlItem5.TextVisible = false;
//
- // TranslationSingleMatchingForm
+ // colDiameter
+ //
+ colDiameter.FieldName = "Diameter";
+ colDiameter.Name = "colDiameter";
+ colDiameter.Visible = true;
+ colDiameter.VisibleIndex = 1;
+ colDiameter.Width = 85;
+ //
+ // coleAlgorithmType
+ //
+ coleAlgorithmType.FieldName = "eAlgorithmType";
+ coleAlgorithmType.Name = "coleAlgorithmType";
+ coleAlgorithmType.Visible = true;
+ coleAlgorithmType.VisibleIndex = 5;
+ coleAlgorithmType.Width = 79;
+ //
+ // colEndDiameter
+ //
+ colEndDiameter.FieldName = "EndDiameter";
+ colEndDiameter.Name = "colEndDiameter";
+ colEndDiameter.Visible = true;
+ colEndDiameter.VisibleIndex = 4;
+ colEndDiameter.Width = 79;
+ //
+ // colRoughness
+ //
+ colRoughness.FieldName = "Roughness";
+ colRoughness.Name = "colRoughness";
+ colRoughness.Visible = true;
+ colRoughness.VisibleIndex = 6;
+ colRoughness.Width = 79;
+ //
+ // colStartDiameter
+ //
+ colStartDiameter.FieldName = "StartDiameter";
+ colStartDiameter.Name = "colStartDiameter";
+ colStartDiameter.Visible = true;
+ colStartDiameter.VisibleIndex = 3;
+ colStartDiameter.Width = 79;
+ //
+ // TranslationSingleMatchingCtrl
//
AutoScaleDimensions = new SizeF(7F, 14F);
AutoScaleMode = AutoScaleMode.Font;
Controls.Add(layoutControl1);
- Name = "TranslationSingleMatchingForm";
+ Name = "TranslationSingleMatchingCtrl";
Size = new Size(769, 577);
((ISupportInitialize)layoutControl1).EndInit();
layoutControl1.ResumeLayout(false);
@@ -204,7 +240,11 @@
private BindingSource TranslationSingleMatchingViewModelBindingSource;
private DevExpress.XtraGrid.Columns.GridColumn colModelType;
private DevExpress.XtraGrid.Columns.GridColumn colMaterial;
- private DevExpress.XtraGrid.Columns.GridColumn colCaliber;
private DevExpress.XtraGrid.Columns.GridColumn colMinorLoss;
+ private DevExpress.XtraGrid.Columns.GridColumn colDiameter;
+ private DevExpress.XtraGrid.Columns.GridColumn coleAlgorithmType;
+ private DevExpress.XtraGrid.Columns.GridColumn colEndDiameter;
+ private DevExpress.XtraGrid.Columns.GridColumn colRoughness;
+ private DevExpress.XtraGrid.Columns.GridColumn colStartDiameter;
}
}
--
Gitblit v1.9.3