From ca1ccd0dd9f2d6936368f07d14a2b29b309fd151 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期三, 04 十二月 2024 15:59:25 +0800
Subject: [PATCH] 增加单独匹配界面
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/01-pumpsinglematching/PumpSingleMatchingCtrl.Designer.cs | 74 ++++++++++++------------------------
1 files changed, 25 insertions(+), 49 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/01-pumpsinglematching/PumpSingleMatchingCtrl.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/01-pumpsinglematching/PumpSingleMatchingCtrl.Designer.cs
index bdd45b5..f6a28c3 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/01-pumpsinglematching/PumpSingleMatchingCtrl.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/01-pumpsinglematching/PumpSingleMatchingCtrl.Designer.cs
@@ -31,6 +31,7 @@
components = new Container();
layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
gridControl1 = new DevExpress.XtraGrid.GridControl();
+ phartViewModelBindingSource = new BindingSource(components);
gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -40,12 +41,10 @@
colName = new DevExpress.XtraGrid.Columns.GridColumn();
colRatedFlow = new DevExpress.XtraGrid.Columns.GridColumn();
colRatedHead = new DevExpress.XtraGrid.Columns.GridColumn();
- colD2 = new DevExpress.XtraGrid.Columns.GridColumn();
- colErosion = new DevExpress.XtraGrid.Columns.GridColumn();
colRatedEfficiency = new DevExpress.XtraGrid.Columns.GridColumn();
colRatedPower = new DevExpress.XtraGrid.Columns.GridColumn();
colRatedSpeed = new DevExpress.XtraGrid.Columns.GridColumn();
- xtrPerform2dChart1 = new Yw.WinFrmUI.Phart.PumpPerformChart();
+ xtrPerform2dChart1 = new Yw.WinFrmUI.Phart.PumpViewChart();
searchControl1 = new SearchControl();
Root = new DevExpress.XtraLayout.LayoutControlGroup();
layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
@@ -56,10 +55,10 @@
layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlGroup3 = new DevExpress.XtraLayout.LayoutControlGroup();
layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
- phartViewModelBindingSource = new BindingSource(components);
((ISupportInitialize)layoutControl1).BeginInit();
layoutControl1.SuspendLayout();
((ISupportInitialize)gridControl1).BeginInit();
+ ((ISupportInitialize)phartViewModelBindingSource).BeginInit();
((ISupportInitialize)gridView1).BeginInit();
((ISupportInitialize)gridControl2).BeginInit();
((ISupportInitialize)gridView2).BeginInit();
@@ -73,7 +72,6 @@
((ISupportInitialize)layoutControlItem3).BeginInit();
((ISupportInitialize)layoutControlGroup3).BeginInit();
((ISupportInitialize)layoutControlItem4).BeginInit();
- ((ISupportInitialize)phartViewModelBindingSource).BeginInit();
SuspendLayout();
//
// layoutControl1
@@ -98,9 +96,13 @@
gridControl1.MainView = gridView1;
gridControl1.Margin = new Padding(0);
gridControl1.Name = "gridControl1";
- gridControl1.Size = new Size(739, 170);
+ gridControl1.Size = new Size(653, 170);
gridControl1.TabIndex = 4;
gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridView1 });
+ //
+ // phartViewModelBindingSource
+ //
+ phartViewModelBindingSource.DataSource = typeof(PhartViewModel);
//
// gridView1
//
@@ -115,8 +117,6 @@
gridColumn3.Caption = "鎺掑簭鐮�";
gridColumn3.FieldName = "SortCode";
gridColumn3.Name = "gridColumn3";
- gridColumn3.Visible = true;
- gridColumn3.VisibleIndex = 2;
//
// gridColumn2
//
@@ -139,7 +139,7 @@
gridControl2.Location = new Point(12, 58);
gridControl2.MainView = gridView2;
gridControl2.Name = "gridControl2";
- gridControl2.Size = new Size(739, 341);
+ gridControl2.Size = new Size(653, 341);
gridControl2.TabIndex = 3;
gridControl2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridView2 });
//
@@ -147,7 +147,7 @@
//
gridView2.Appearance.HeaderPanel.Options.UseTextOptions = true;
gridView2.Appearance.HeaderPanel.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
- gridView2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colName, colRatedFlow, colRatedHead, colD2, colErosion, colRatedEfficiency, colRatedPower, colRatedSpeed });
+ gridView2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colName, colRatedFlow, colRatedHead, colRatedEfficiency, colRatedPower, colRatedSpeed });
gridView2.GridControl = gridControl2;
gridView2.Name = "gridView2";
gridView2.OptionsView.ShowGroupPanel = false;
@@ -180,31 +180,13 @@
colRatedHead.VisibleIndex = 2;
colRatedHead.Width = 110;
//
- // colD2
- //
- colD2.Caption = "鍙惰疆澶栧緞(mm)";
- colD2.FieldName = "D2";
- colD2.Name = "colD2";
- colD2.Visible = true;
- colD2.VisibleIndex = 3;
- colD2.Width = 125;
- //
- // colErosion
- //
- colErosion.Caption = "姘旇殌";
- colErosion.FieldName = "Erosion";
- colErosion.Name = "colErosion";
- colErosion.Visible = true;
- colErosion.VisibleIndex = 4;
- colErosion.Width = 72;
- //
// colRatedEfficiency
//
colRatedEfficiency.Caption = "棰濆畾鏁堢巼";
colRatedEfficiency.FieldName = "RatedEfficiency";
colRatedEfficiency.Name = "colRatedEfficiency";
colRatedEfficiency.Visible = true;
- colRatedEfficiency.VisibleIndex = 5;
+ colRatedEfficiency.VisibleIndex = 3;
colRatedEfficiency.Width = 82;
//
// colRatedPower
@@ -213,7 +195,7 @@
colRatedPower.FieldName = "RatedPower";
colRatedPower.Name = "colRatedPower";
colRatedPower.Visible = true;
- colRatedPower.VisibleIndex = 6;
+ colRatedPower.VisibleIndex = 4;
//
// colRatedSpeed
//
@@ -221,17 +203,17 @@
colRatedSpeed.FieldName = "RatedSpeed";
colRatedSpeed.Name = "colRatedSpeed";
colRatedSpeed.Visible = true;
- colRatedSpeed.VisibleIndex = 7;
+ colRatedSpeed.VisibleIndex = 5;
colRatedSpeed.Width = 79;
//
// xtrPerform2dChart1
//
xtrPerform2dChart1.DefinePointVisible = false;
xtrPerform2dChart1.LineVisible = false;
- xtrPerform2dChart1.Location = new Point(763, 42);
+ xtrPerform2dChart1.Location = new Point(677, 42);
xtrPerform2dChart1.Margin = new Padding(2, 2, 2, 2);
xtrPerform2dChart1.Name = "xtrPerform2dChart1";
- xtrPerform2dChart1.Size = new Size(560, 545);
+ xtrPerform2dChart1.Size = new Size(646, 545);
xtrPerform2dChart1.TabIndex = 2;
//
// searchControl1
@@ -261,10 +243,10 @@
layoutControlGroup1.AppearanceGroup.Options.UseFont = true;
layoutControlGroup1.GroupStyle = DevExpress.Utils.GroupStyle.Title;
layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem2 });
- layoutControlGroup1.Location = new Point(743, 0);
+ layoutControlGroup1.Location = new Point(657, 0);
layoutControlGroup1.Name = "layoutControlGroup1";
layoutControlGroup1.Padding = new DevExpress.XtraLayout.Utils.Padding(8, 8, 8, 8);
- layoutControlGroup1.Size = new Size(580, 587);
+ layoutControlGroup1.Size = new Size(666, 587);
layoutControlGroup1.Text = "鏇茬嚎瑙嗗浘";
//
// layoutControlItem2
@@ -273,7 +255,7 @@
layoutControlItem2.Location = new Point(0, 0);
layoutControlItem2.Name = "layoutControlItem2";
layoutControlItem2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- layoutControlItem2.Size = new Size(560, 545);
+ layoutControlItem2.Size = new Size(646, 545);
layoutControlItem2.TextSize = new Size(0, 0);
layoutControlItem2.TextVisible = false;
//
@@ -282,7 +264,7 @@
simpleLabelItem1.AllowHotTrack = false;
simpleLabelItem1.Location = new Point(441, 0);
simpleLabelItem1.Name = "simpleLabelItem1";
- simpleLabelItem1.Size = new Size(302, 24);
+ simpleLabelItem1.Size = new Size(216, 24);
simpleLabelItem1.Text = " ";
simpleLabelItem1.TextSize = new Size(4, 14);
//
@@ -307,7 +289,7 @@
layoutControlGroup2.Location = new Point(0, 391);
layoutControlGroup2.Name = "layoutControlGroup2";
layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- layoutControlGroup2.Size = new Size(743, 196);
+ layoutControlGroup2.Size = new Size(657, 196);
layoutControlGroup2.Text = "鏇茬嚎鍒楄〃";
//
// layoutControlItem3
@@ -316,7 +298,7 @@
layoutControlItem3.Location = new Point(0, 0);
layoutControlItem3.Name = "layoutControlItem3";
layoutControlItem3.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- layoutControlItem3.Size = new Size(739, 170);
+ layoutControlItem3.Size = new Size(653, 170);
layoutControlItem3.TextSize = new Size(0, 0);
layoutControlItem3.TextVisible = false;
//
@@ -330,7 +312,7 @@
layoutControlGroup3.Location = new Point(0, 24);
layoutControlGroup3.Name = "layoutControlGroup3";
layoutControlGroup3.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- layoutControlGroup3.Size = new Size(743, 367);
+ layoutControlGroup3.Size = new Size(657, 367);
layoutControlGroup3.Text = "娉靛瀷鍙峰垪琛�";
//
// layoutControlItem4
@@ -339,13 +321,9 @@
layoutControlItem4.Location = new Point(0, 0);
layoutControlItem4.Name = "layoutControlItem4";
layoutControlItem4.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- layoutControlItem4.Size = new Size(739, 341);
+ layoutControlItem4.Size = new Size(653, 341);
layoutControlItem4.TextSize = new Size(0, 0);
layoutControlItem4.TextVisible = false;
- //
- // phartViewModelBindingSource
- //
- phartViewModelBindingSource.DataSource = typeof(PhartViewModel);
//
// PumpSingleMatchingCtrl
//
@@ -357,6 +335,7 @@
((ISupportInitialize)layoutControl1).EndInit();
layoutControl1.ResumeLayout(false);
((ISupportInitialize)gridControl1).EndInit();
+ ((ISupportInitialize)phartViewModelBindingSource).EndInit();
((ISupportInitialize)gridView1).EndInit();
((ISupportInitialize)gridControl2).EndInit();
((ISupportInitialize)gridView2).EndInit();
@@ -370,7 +349,6 @@
((ISupportInitialize)layoutControlItem3).EndInit();
((ISupportInitialize)layoutControlGroup3).EndInit();
((ISupportInitialize)layoutControlItem4).EndInit();
- ((ISupportInitialize)phartViewModelBindingSource).EndInit();
ResumeLayout(false);
}
@@ -382,15 +360,13 @@
private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1;
private DevExpress.XtraEditors.SearchControl searchControl1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
- private Yw.WinFrmUI.Phart.PumpPerformChart xtrPerform2dChart1;
+ private Yw.WinFrmUI.Phart.PumpViewChart xtrPerform2dChart1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
private DevExpress.XtraGrid.GridControl gridControl2;
private DevExpress.XtraGrid.Views.Grid.GridView gridView2;
private DevExpress.XtraGrid.Columns.GridColumn colName;
private DevExpress.XtraGrid.Columns.GridColumn colRatedFlow;
private DevExpress.XtraGrid.Columns.GridColumn colRatedHead;
- private DevExpress.XtraGrid.Columns.GridColumn colD2;
- private DevExpress.XtraGrid.Columns.GridColumn colErosion;
private DevExpress.XtraGrid.Columns.GridColumn colRatedEfficiency;
private DevExpress.XtraGrid.Columns.GridColumn colRatedPower;
private DevExpress.XtraGrid.Columns.GridColumn colRatedSpeed;
--
Gitblit v1.9.3