From a302d7d16e6bed80511cb49813d16829eb933560 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 18 十一月 2024 09:34:12 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/03-coefficient/SetFourlinkCoefficientDlg.Designer.cs | 96 +++++++++++++++++++++---------------------------
1 files changed, 42 insertions(+), 54 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/03-coefficient/SetFourlinkCoefficientDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/03-coefficient/SetFourlinkCoefficientDlg.Designer.cs
index bb6141a..dc29555 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/03-coefficient/SetFourlinkCoefficientDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/03-coefficient/SetFourlinkCoefficientDlg.Designer.cs
@@ -40,24 +40,23 @@
BtnOk = new DevExpress.XtraEditors.SimpleButton();
btnCancel = new DevExpress.XtraEditors.SimpleButton();
gridControl1 = new DevExpress.XtraGrid.GridControl();
- sysPropChoiceViewModelBindingSource = new BindingSource(components);
gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
ColDelete = new DevExpress.XtraGrid.Columns.GridColumn();
repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
- colCaliber = new DevExpress.XtraGrid.Columns.GridColumn();
- colMaterial = new DevExpress.XtraGrid.Columns.GridColumn();
- colMinorLoss = new DevExpress.XtraGrid.Columns.GridColumn();
- colName = new DevExpress.XtraGrid.Columns.GridColumn();
Root = new DevExpress.XtraLayout.LayoutControlGroup();
layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
emptySpaceItem2 = new DevExpress.XtraLayout.EmptySpaceItem();
+ fourlinkCoefficientViewModelBindingSource = new BindingSource(components);
+ colCaliber = new DevExpress.XtraGrid.Columns.GridColumn();
+ colMaterial = new DevExpress.XtraGrid.Columns.GridColumn();
+ colMinorLoss = new DevExpress.XtraGrid.Columns.GridColumn();
+ colName = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)layoutControl1).BeginInit();
layoutControl1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)gridControl1).BeginInit();
- ((System.ComponentModel.ISupportInitialize)sysPropChoiceViewModelBindingSource).BeginInit();
((System.ComponentModel.ISupportInitialize)gridView1).BeginInit();
((System.ComponentModel.ISupportInitialize)repositoryItemButtonEdit1).BeginInit();
((System.ComponentModel.ISupportInitialize)Root).BeginInit();
@@ -66,6 +65,7 @@
((System.ComponentModel.ISupportInitialize)layoutControlItem3).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem2).BeginInit();
((System.ComponentModel.ISupportInitialize)emptySpaceItem2).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)fourlinkCoefficientViewModelBindingSource).BeginInit();
SuspendLayout();
//
// layoutControl1
@@ -107,7 +107,7 @@
//
// gridControl1
//
- gridControl1.DataSource = sysPropChoiceViewModelBindingSource;
+ gridControl1.DataSource = fourlinkCoefficientViewModelBindingSource;
gridLevelNode1.RelationName = "Level1";
gridControl1.LevelTree.Nodes.AddRange(new DevExpress.XtraGrid.GridLevelNode[] { gridLevelNode1 });
gridControl1.Location = new Point(2, 2);
@@ -117,10 +117,6 @@
gridControl1.Size = new Size(658, 380);
gridControl1.TabIndex = 0;
gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridView1 });
- //
- // sysPropChoiceViewModelBindingSource
- //
- sysPropChoiceViewModelBindingSource.DataSource = typeof(ValveCoefficientViewModel);
//
// gridView1
//
@@ -159,46 +155,6 @@
repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default) });
repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
- //
- // colCaliber
- //
- colCaliber.AppearanceCell.Options.UseTextOptions = true;
- colCaliber.AppearanceCell.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
- colCaliber.FieldName = "Caliber";
- colCaliber.Name = "colCaliber";
- colCaliber.Visible = true;
- colCaliber.VisibleIndex = 1;
- colCaliber.Width = 134;
- //
- // colMaterial
- //
- colMaterial.AppearanceCell.Options.UseTextOptions = true;
- colMaterial.AppearanceCell.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
- colMaterial.FieldName = "Material";
- colMaterial.Name = "colMaterial";
- colMaterial.Visible = true;
- colMaterial.VisibleIndex = 2;
- colMaterial.Width = 134;
- //
- // colMinorLoss
- //
- colMinorLoss.AppearanceCell.Options.UseTextOptions = true;
- colMinorLoss.AppearanceCell.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
- colMinorLoss.FieldName = "MinorLoss";
- colMinorLoss.Name = "colMinorLoss";
- colMinorLoss.Visible = true;
- colMinorLoss.VisibleIndex = 3;
- colMinorLoss.Width = 134;
- //
- // colName
- //
- colName.AppearanceCell.Options.UseTextOptions = true;
- colName.AppearanceCell.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
- colName.FieldName = "Name";
- colName.Name = "colName";
- colName.Visible = true;
- colName.VisibleIndex = 0;
- colName.Width = 259;
//
// Root
//
@@ -253,6 +209,38 @@
emptySpaceItem2.Size = new Size(352, 26);
emptySpaceItem2.TextSize = new Size(0, 0);
//
+ // fourlinkCoefficientViewModelBindingSource
+ //
+ fourlinkCoefficientViewModelBindingSource.DataSource = typeof(FourlinkCoefficientViewModel);
+ //
+ // colCaliber
+ //
+ colCaliber.FieldName = "Caliber";
+ colCaliber.Name = "colCaliber";
+ colCaliber.Visible = true;
+ colCaliber.VisibleIndex = 1;
+ //
+ // colMaterial
+ //
+ colMaterial.FieldName = "Material";
+ colMaterial.Name = "colMaterial";
+ colMaterial.Visible = true;
+ colMaterial.VisibleIndex = 2;
+ //
+ // colMinorLoss
+ //
+ colMinorLoss.FieldName = "MinorLoss";
+ colMinorLoss.Name = "colMinorLoss";
+ colMinorLoss.Visible = true;
+ colMinorLoss.VisibleIndex = 3;
+ //
+ // colName
+ //
+ colName.FieldName = "Name";
+ colName.Name = "colName";
+ colName.Visible = true;
+ colName.VisibleIndex = 0;
+ //
// SetFourlinkCoefficientDlg
//
AutoScaleDimensions = new SizeF(7F, 14F);
@@ -265,7 +253,6 @@
((System.ComponentModel.ISupportInitialize)layoutControl1).EndInit();
layoutControl1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)gridControl1).EndInit();
- ((System.ComponentModel.ISupportInitialize)sysPropChoiceViewModelBindingSource).EndInit();
((System.ComponentModel.ISupportInitialize)gridView1).EndInit();
((System.ComponentModel.ISupportInitialize)repositoryItemButtonEdit1).EndInit();
((System.ComponentModel.ISupportInitialize)Root).EndInit();
@@ -274,6 +261,7 @@
((System.ComponentModel.ISupportInitialize)layoutControlItem3).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem2).EndInit();
((System.ComponentModel.ISupportInitialize)emptySpaceItem2).EndInit();
+ ((System.ComponentModel.ISupportInitialize)fourlinkCoefficientViewModelBindingSource).EndInit();
ResumeLayout(false);
}
@@ -290,14 +278,14 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem2;
- private BindingSource sysPropChoiceViewModelBindingSource;
private DevExpress.XtraGrid.Columns.GridColumn colChoice;
private DevExpress.XtraGrid.Columns.GridColumn colDescription;
- private DevExpress.XtraGrid.Columns.GridColumn colName;
private DevExpress.XtraGrid.Columns.GridColumn ColDelete;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
+ private BindingSource fourlinkCoefficientViewModelBindingSource;
private DevExpress.XtraGrid.Columns.GridColumn colCaliber;
private DevExpress.XtraGrid.Columns.GridColumn colMaterial;
private DevExpress.XtraGrid.Columns.GridColumn colMinorLoss;
+ private DevExpress.XtraGrid.Columns.GridColumn colName;
}
}
\ No newline at end of file
--
Gitblit v1.9.3