From b8b4a64639871398247fe43c84ddd0ba058a14dc Mon Sep 17 00:00:00 2001
From: cloudflight <cloudflight@126.com>
Date: 星期六, 30 十一月 2024 14:46:56 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/14-pipe/HydroPipeListCtrl.Designer.cs | 50 ++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 40 insertions(+), 10 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/14-pipe/HydroPipeListCtrl.Designer.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/14-pipe/HydroPipeListCtrl.Designer.cs
index 5fbae5c..9c98ce1 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/14-pipe/HydroPipeListCtrl.Designer.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/14-pipe/HydroPipeListCtrl.Designer.cs
@@ -30,11 +30,11 @@
{
components = new Container();
ComponentResourceManager resources = new ComponentResourceManager(typeof(HydroPipeListCtrl));
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
gridControl1 = new DevExpress.XtraGrid.GridControl();
hydroPipeViewModelBindingSource = new BindingSource(components);
gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -67,6 +67,8 @@
layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+ colCalcuMinorLoss = new DevExpress.XtraGrid.Columns.GridColumn();
+ colCalcuFrictionLoss = new DevExpress.XtraGrid.Columns.GridColumn();
((ISupportInitialize)gridControl1).BeginInit();
((ISupportInitialize)hydroPipeViewModelBindingSource).BeginInit();
((ISupportInitialize)gridView1).BeginInit();
@@ -102,7 +104,7 @@
//
// gridView1
//
- gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colDbLocked, colName, colCode, colModelType, colMaterial, colDiameter, colLength, colRoughness, colMinorLoss, colHasDb, colFlags, colDescription, colCalcuFlow, colCalcuVelocity, colCalcuHeadLoss, colSet });
+ gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colDbLocked, colName, colCode, colModelType, colMaterial, colDiameter, colLength, colRoughness, colMinorLoss, colHasDb, colFlags, colDescription, colCalcuFlow, colCalcuVelocity, colCalcuHeadLoss, colCalcuMinorLoss, colCalcuFrictionLoss, colSet });
gridView1.GridControl = gridControl1;
gridView1.Name = "gridView1";
gridView1.RowCellClick += gridView1_RowCellClick;
@@ -275,15 +277,15 @@
colSet.MinWidth = 60;
colSet.Name = "colSet";
colSet.Visible = true;
- colSet.VisibleIndex = 15;
+ colSet.VisibleIndex = 17;
colSet.Width = 60;
//
// repositoryItemButtonEdit1
//
repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions1.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("editorButtonImageOptions1.SvgImage");
- editorButtonImageOptions1.SvgImageSize = new Size(20, 20);
- 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) });
+ editorButtonImageOptions2.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("editorButtonImageOptions2.SvgImage");
+ editorButtonImageOptions2.SvgImageSize = new Size(20, 20);
+ repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default) });
repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
//
@@ -415,6 +417,32 @@
layoutControlItem9.TextSize = new Size(0, 0);
layoutControlItem9.TextVisible = false;
//
+ // colCalcuMinorLoss
+ //
+ colCalcuMinorLoss.FieldName = "CalcuMinorLoss";
+ colCalcuMinorLoss.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Right;
+ colCalcuMinorLoss.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("colCalcuMinorLoss.ImageOptions.SvgImage");
+ colCalcuMinorLoss.ImageOptions.SvgImageSize = new Size(16, 16);
+ colCalcuMinorLoss.MaxWidth = 100;
+ colCalcuMinorLoss.MinWidth = 100;
+ colCalcuMinorLoss.Name = "colCalcuMinorLoss";
+ colCalcuMinorLoss.Visible = true;
+ colCalcuMinorLoss.VisibleIndex = 15;
+ colCalcuMinorLoss.Width = 100;
+ //
+ // colCalcuFrictionLoss
+ //
+ colCalcuFrictionLoss.FieldName = "CalcuFrictionLoss";
+ colCalcuFrictionLoss.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Right;
+ colCalcuFrictionLoss.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("colCalcuFrictionLoss.ImageOptions.SvgImage");
+ colCalcuFrictionLoss.ImageOptions.SvgImageSize = new Size(16, 16);
+ colCalcuFrictionLoss.MaxWidth = 100;
+ colCalcuFrictionLoss.MinWidth = 100;
+ colCalcuFrictionLoss.Name = "colCalcuFrictionLoss";
+ colCalcuFrictionLoss.Visible = true;
+ colCalcuFrictionLoss.VisibleIndex = 16;
+ colCalcuFrictionLoss.Width = 100;
+ //
// HydroPipeListCtrl
//
AutoScaleDimensions = new SizeF(7F, 14F);
@@ -475,5 +503,7 @@
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
private GeneralSearchAndSetCtrl generalSearchAndSetCtrl1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
+ private DevExpress.XtraGrid.Columns.GridColumn colCalcuMinorLoss;
+ private DevExpress.XtraGrid.Columns.GridColumn colCalcuFrictionLoss;
}
}
--
Gitblit v1.9.3