From f97b3ccbfd63b62ec875223fcc417633f6ce2989 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期一, 09 十二月 2024 17:38:26 +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/10-meter/MeterSingleMatchingCtrl.Designer.cs | 46 ++++++++++++++++++++++------------------------
1 files changed, 22 insertions(+), 24 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/10-meter/MeterSingleMatchingCtrl.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/10-meter/MeterSingleMatchingCtrl.Designer.cs
index 3a48aa2..b3ea044 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/10-meter/MeterSingleMatchingCtrl.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/10-meter/MeterSingleMatchingCtrl.Designer.cs
@@ -34,14 +34,14 @@
MeterSingleMatchingViewModelBindingSource = new BindingSource(components);
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();
+ colDescription = 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();
+ colKeyWord = new DevExpress.XtraGrid.Columns.GridColumn();
((ISupportInitialize)layoutControl1).BeginInit();
layoutControl1.SuspendLayout();
((ISupportInitialize)gridControl3).BeginInit();
@@ -85,7 +85,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, colMinorLoss, colDescription, colKeyWord });
gridView3.GridControl = gridControl3;
gridView3.Name = "gridView3";
gridView3.OptionsView.ShowGroupPanel = false;
@@ -99,29 +99,20 @@
colModelType.VisibleIndex = 0;
colModelType.Width = 243;
//
- // 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;
- //
// colMinorLoss
//
colMinorLoss.FieldName = "MinorLoss";
colMinorLoss.Name = "colMinorLoss";
colMinorLoss.Visible = true;
- colMinorLoss.VisibleIndex = 3;
+ colMinorLoss.VisibleIndex = 2;
colMinorLoss.Width = 115;
+ //
+ // colDescription
+ //
+ colDescription.FieldName = "Description";
+ colDescription.Name = "colDescription";
+ colDescription.Visible = true;
+ colDescription.VisibleIndex = 3;
//
// searchControl1
//
@@ -171,12 +162,19 @@
layoutControlItem5.TextSize = new Size(0, 0);
layoutControlItem5.TextVisible = false;
//
- // MeterSingleMatchingForm
+ // colKeyWord
+ //
+ colKeyWord.FieldName = "KeyWord";
+ colKeyWord.Name = "colKeyWord";
+ colKeyWord.Visible = true;
+ colKeyWord.VisibleIndex = 1;
+ //
+ // MeterSingleMatchingCtrl
//
AutoScaleDimensions = new SizeF(7F, 14F);
AutoScaleMode = AutoScaleMode.Font;
Controls.Add(layoutControl1);
- Name = "MeterSingleMatchingForm";
+ Name = "MeterSingleMatchingCtrl";
Size = new Size(769, 577);
((ISupportInitialize)layoutControl1).EndInit();
layoutControl1.ResumeLayout(false);
@@ -203,8 +201,8 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
private BindingSource MeterSingleMatchingViewModelBindingSource;
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 colDescription;
+ private DevExpress.XtraGrid.Columns.GridColumn colKeyWord;
}
}
--
Gitblit v1.9.3