From 84820e6296602b263633ff9a960bfd15cf0618de Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期四, 05 十二月 2024 12:47:02 +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/09-Tank/TankSingleMatchingCtrl.Designer.cs | 105 +++++++++++++++++++++++++++++-----------------------
1 files changed, 58 insertions(+), 47 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/09-Tank/TankSingleMatchingCtrl.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/09-Tank/TankSingleMatchingCtrl.Designer.cs
index d05c0bc..a76f54f 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/09-Tank/TankSingleMatchingCtrl.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/09-Tank/TankSingleMatchingCtrl.Designer.cs
@@ -39,15 +39,11 @@
gridControl3 = new DevExpress.XtraGrid.GridControl();
TankSingleMatchingViewModelBindingSource = new BindingSource(components);
gridView3 = new DevExpress.XtraGrid.Views.Grid.GridView();
- colCaliber = new DevExpress.XtraGrid.Columns.GridColumn();
colCoefficient = new DevExpress.XtraGrid.Columns.GridColumn();
- colTankLift = new DevExpress.XtraGrid.Columns.GridColumn();
colName = new DevExpress.XtraGrid.Columns.GridColumn();
colKeyWord = new DevExpress.XtraGrid.Columns.GridColumn();
colTankSetting = new DevExpress.XtraGrid.Columns.GridColumn();
colDescription = new DevExpress.XtraGrid.Columns.GridColumn();
- colMaterial = new DevExpress.XtraGrid.Columns.GridColumn();
- colSeriesType = new DevExpress.XtraGrid.Columns.GridColumn();
gridControl1 = new DevExpress.XtraGrid.GridControl();
gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
ColShowChart = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -62,6 +58,11 @@
layoutControlGroup2 = new DevExpress.XtraLayout.LayoutControlGroup();
layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+ colDN = new DevExpress.XtraGrid.Columns.GridColumn();
+ colMaxLevel = new DevExpress.XtraGrid.Columns.GridColumn();
+ colMinLevel = new DevExpress.XtraGrid.Columns.GridColumn();
+ colMinVol = new DevExpress.XtraGrid.Columns.GridColumn();
+ colOverFlow = new DevExpress.XtraGrid.Columns.GridColumn();
((ISupportInitialize)layoutControl1).BeginInit();
layoutControl1.SuspendLayout();
((ISupportInitialize)gridControl3).BeginInit();
@@ -111,35 +112,18 @@
//
gridView3.Appearance.HeaderPanel.Options.UseTextOptions = true;
gridView3.Appearance.HeaderPanel.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
- gridView3.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colCaliber, colCoefficient, colTankLift, colName, colKeyWord, colTankSetting, colDescription, colMaterial, colSeriesType });
+ gridView3.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colCoefficient, colName, colKeyWord, colTankSetting, colDescription, colDN, colMaxLevel, colMinLevel, colMinVol, colOverFlow });
gridView3.GridControl = gridControl3;
gridView3.Name = "gridView3";
gridView3.OptionsView.ShowGroupPanel = false;
gridView3.FocusedRowChanged += gridView2_FocusedRowChanged;
- //
- // colCaliber
- //
- colCaliber.FieldName = "Caliber";
- colCaliber.Name = "colCaliber";
- colCaliber.Visible = true;
- colCaliber.VisibleIndex = 2;
- colCaliber.Width = 123;
//
// colCoefficient
//
colCoefficient.FieldName = "Coefficient";
colCoefficient.Name = "colCoefficient";
colCoefficient.Visible = true;
- colCoefficient.VisibleIndex = 3;
- colCoefficient.Width = 89;
- //
- // colTankLift
- //
- colTankLift.FieldName = "TankLift";
- colTankLift.Name = "colTankLift";
- colTankLift.Visible = true;
- colTankLift.VisibleIndex = 4;
- colTankLift.Width = 86;
+ colCoefficient.VisibleIndex = 2;
//
// colName
//
@@ -147,7 +131,7 @@
colName.Name = "colName";
colName.Visible = true;
colName.VisibleIndex = 0;
- colName.Width = 167;
+ colName.Width = 148;
//
// colKeyWord
//
@@ -155,39 +139,23 @@
colKeyWord.Name = "colKeyWord";
colKeyWord.Visible = true;
colKeyWord.VisibleIndex = 1;
- colKeyWord.Width = 85;
+ colKeyWord.Width = 72;
//
// colTankSetting
//
colTankSetting.FieldName = "TankSetting";
colTankSetting.Name = "colTankSetting";
colTankSetting.Visible = true;
- colTankSetting.VisibleIndex = 5;
- colTankSetting.Width = 84;
+ colTankSetting.VisibleIndex = 3;
+ colTankSetting.Width = 71;
//
// colDescription
//
colDescription.FieldName = "Description";
colDescription.Name = "colDescription";
colDescription.Visible = true;
- colDescription.VisibleIndex = 8;
- colDescription.Width = 194;
- //
- // colMaterial
- //
- colMaterial.FieldName = "Material";
- colMaterial.Name = "colMaterial";
- colMaterial.Visible = true;
- colMaterial.VisibleIndex = 6;
- colMaterial.Width = 66;
- //
- // colSeriesType
- //
- colSeriesType.FieldName = "SeriesType";
- colSeriesType.Name = "colSeriesType";
- colSeriesType.Visible = true;
- colSeriesType.VisibleIndex = 7;
- colSeriesType.Width = 112;
+ colDescription.VisibleIndex = 9;
+ colDescription.Width = 176;
//
// gridControl1
//
@@ -335,6 +303,46 @@
layoutControlItem5.TextSize = new Size(0, 0);
layoutControlItem5.TextVisible = false;
//
+ // colDN
+ //
+ colDN.FieldName = "DN";
+ colDN.Name = "colDN";
+ colDN.Visible = true;
+ colDN.VisibleIndex = 4;
+ colDN.Width = 63;
+ //
+ // colMaxLevel
+ //
+ colMaxLevel.FieldName = "MaxLevel";
+ colMaxLevel.Name = "colMaxLevel";
+ colMaxLevel.Visible = true;
+ colMaxLevel.VisibleIndex = 5;
+ colMaxLevel.Width = 63;
+ //
+ // colMinLevel
+ //
+ colMinLevel.FieldName = "MinLevel";
+ colMinLevel.Name = "colMinLevel";
+ colMinLevel.Visible = true;
+ colMinLevel.VisibleIndex = 6;
+ colMinLevel.Width = 63;
+ //
+ // colMinVol
+ //
+ colMinVol.FieldName = "MinVol";
+ colMinVol.Name = "colMinVol";
+ colMinVol.Visible = true;
+ colMinVol.VisibleIndex = 7;
+ colMinVol.Width = 63;
+ //
+ // colOverFlow
+ //
+ colOverFlow.FieldName = "OverFlow";
+ colOverFlow.Name = "colOverFlow";
+ colOverFlow.Visible = true;
+ colOverFlow.VisibleIndex = 8;
+ colOverFlow.Width = 63;
+ //
// TankSingleMatchingCtrl
//
AutoScaleDimensions = new SizeF(7F, 14F);
@@ -378,16 +386,19 @@
private DevExpress.XtraGrid.Views.Grid.GridView gridView3;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
private BindingSource TankSingleMatchingViewModelBindingSource;
- private DevExpress.XtraGrid.Columns.GridColumn colCaliber;
private DevExpress.XtraGrid.Columns.GridColumn colCoefficient;
private DevExpress.XtraGrid.Columns.GridColumn colTankLift;
private DevExpress.XtraGrid.Columns.GridColumn colName;
private DevExpress.XtraGrid.Columns.GridColumn colKeyWord;
private DevExpress.XtraGrid.Columns.GridColumn colTankSetting;
private DevExpress.XtraGrid.Columns.GridColumn colDescription;
- private DevExpress.XtraGrid.Columns.GridColumn colMaterial;
private DevExpress.XtraGrid.Columns.GridColumn colSeriesType;
private DevExpress.XtraGrid.Columns.GridColumn ColShowChart;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
+ private DevExpress.XtraGrid.Columns.GridColumn colDN;
+ private DevExpress.XtraGrid.Columns.GridColumn colMaxLevel;
+ private DevExpress.XtraGrid.Columns.GridColumn colMinLevel;
+ private DevExpress.XtraGrid.Columns.GridColumn colMinVol;
+ private DevExpress.XtraGrid.Columns.GridColumn colOverFlow;
}
}
--
Gitblit v1.9.3