From 8eb1a19c55846f70b3b6bf43e32c2e94333d52e7 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期六, 30 十一月 2024 13:07:34 +0800
Subject: [PATCH] epanet 计算完善
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/01-pumpsinglematching/PumpMatchingDlg.Designer.cs | 72 +++++++++++++++++------------------
1 files changed, 35 insertions(+), 37 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/01-pumpsinglematching/PumpMatchingDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/01-pumpsinglematching/PumpMatchingDlg.Designer.cs
index 7ade6e4..59c6945 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/01-pumpsinglematching/PumpMatchingDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/01-pumpsinglematching/PumpMatchingDlg.Designer.cs
@@ -45,7 +45,7 @@
barBtnOK = new DevExpress.XtraBars.BarButtonItem();
ribbonPage1 = new DevExpress.XtraBars.Ribbon.RibbonPage();
ribbonPageGroup1 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
- xtrPerform2dChart1 = new Yw.WinFrmUI.Phart.PumpPerformChart();
+ xtrPerform2dChart1 = new Yw.WinFrmUI.Phart.PumpViewChart();
sidePanel1 = new SidePanel();
sidePanel3 = new SidePanel();
layoutControl3 = new DevExpress.XtraLayout.LayoutControl();
@@ -99,7 +99,7 @@
ribbon.ItemPanelStyle = DevExpress.XtraBars.Ribbon.RibbonItemPanelStyle.Classic;
ribbon.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbon.ExpandCollapseItem, barEditSearch, barBtnOK });
ribbon.Location = new Point(0, 0);
- ribbon.Margin = new Padding(2, 2, 2, 2);
+ ribbon.Margin = new Padding(2);
ribbon.MaxItemId = 3;
ribbon.Name = "ribbon";
ribbon.OptionsMenuMinWidth = 231;
@@ -115,7 +115,7 @@
ribbon.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide;
ribbon.ShowQatLocationSelector = false;
ribbon.ShowToolbarCustomizeItem = false;
- ribbon.Size = new Size(1120, 57);
+ ribbon.Size = new Size(1244, 57);
ribbon.Toolbar.ShowCustomizeItem = false;
//
// barEditSearch
@@ -140,7 +140,7 @@
gridControlPumpMain.MainView = gridViewPumpMain;
gridControlPumpMain.Margin = new Padding(4, 5, 4, 5);
gridControlPumpMain.Name = "gridControlPumpMain";
- gridControlPumpMain.Size = new Size(630, 299);
+ gridControlPumpMain.Size = new Size(718, 299);
gridControlPumpMain.TabIndex = 3;
gridControlPumpMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridViewPumpMain });
//
@@ -164,7 +164,7 @@
colName.Name = "colName";
colName.Visible = true;
colName.VisibleIndex = 0;
- colName.Width = 401;
+ colName.Width = 407;
//
// colRatedFlow
//
@@ -174,7 +174,7 @@
colRatedFlow.Name = "colRatedFlow";
colRatedFlow.Visible = true;
colRatedFlow.VisibleIndex = 1;
- colRatedFlow.Width = 189;
+ colRatedFlow.Width = 107;
//
// colRatedHead
//
@@ -184,7 +184,7 @@
colRatedHead.Name = "colRatedHead";
colRatedHead.Visible = true;
colRatedHead.VisibleIndex = 2;
- colRatedHead.Width = 157;
+ colRatedHead.Width = 87;
//
// colD2
//
@@ -194,7 +194,7 @@
colD2.Name = "colD2";
colD2.Visible = true;
colD2.VisibleIndex = 3;
- colD2.Width = 179;
+ colD2.Width = 110;
//
// colErosion
//
@@ -204,7 +204,7 @@
colErosion.Name = "colErosion";
colErosion.Visible = true;
colErosion.VisibleIndex = 4;
- colErosion.Width = 103;
+ colErosion.Width = 62;
//
// colRatedEfficiency
//
@@ -214,7 +214,7 @@
colRatedEfficiency.Name = "colRatedEfficiency";
colRatedEfficiency.Visible = true;
colRatedEfficiency.VisibleIndex = 5;
- colRatedEfficiency.Width = 117;
+ colRatedEfficiency.Width = 72;
//
// colRatedPower
//
@@ -224,7 +224,7 @@
colRatedPower.Name = "colRatedPower";
colRatedPower.Visible = true;
colRatedPower.VisibleIndex = 6;
- colRatedPower.Width = 107;
+ colRatedPower.Width = 64;
//
// colRatedSpeed
//
@@ -234,7 +234,7 @@
colRatedSpeed.Name = "colRatedSpeed";
colRatedSpeed.Visible = true;
colRatedSpeed.VisibleIndex = 7;
- colRatedSpeed.Width = 113;
+ colRatedSpeed.Width = 97;
//
// barBtnOK
//
@@ -262,9 +262,9 @@
xtrPerform2dChart1.DefinePointVisible = false;
xtrPerform2dChart1.LineVisible = false;
xtrPerform2dChart1.Location = new Point(0, 22);
- xtrPerform2dChart1.Margin = new Padding(1, 1, 1, 1);
+ xtrPerform2dChart1.Margin = new Padding(1);
xtrPerform2dChart1.Name = "xtrPerform2dChart1";
- xtrPerform2dChart1.Size = new Size(490, 588);
+ xtrPerform2dChart1.Size = new Size(526, 636);
xtrPerform2dChart1.TabIndex = 3;
//
// sidePanel1
@@ -275,7 +275,7 @@
sidePanel1.Dock = DockStyle.Left;
sidePanel1.Location = new Point(0, 57);
sidePanel1.Name = "sidePanel1";
- sidePanel1.Size = new Size(630, 610);
+ sidePanel1.Size = new Size(718, 658);
sidePanel1.TabIndex = 4;
sidePanel1.Text = "sidePanel1";
//
@@ -286,7 +286,7 @@
sidePanel3.Dock = DockStyle.Fill;
sidePanel3.Location = new Point(0, 321);
sidePanel3.Name = "sidePanel3";
- sidePanel3.Size = new Size(630, 289);
+ sidePanel3.Size = new Size(718, 337);
sidePanel3.TabIndex = 6;
sidePanel3.Text = "sidePanel3";
//
@@ -298,7 +298,7 @@
layoutControl3.Name = "layoutControl3";
layoutControl3.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(1227, 608, 975, 600);
layoutControl3.Root = layoutControlGroup6;
- layoutControl3.Size = new Size(630, 289);
+ layoutControl3.Size = new Size(718, 337);
layoutControl3.TabIndex = 0;
layoutControl3.Text = "layoutControl3";
//
@@ -308,7 +308,7 @@
gridControlCurve.MainView = gridViewCurve;
gridControlCurve.Margin = new Padding(0);
gridControlCurve.Name = "gridControlCurve";
- gridControlCurve.Size = new Size(630, 267);
+ gridControlCurve.Size = new Size(718, 315);
gridControlCurve.TabIndex = 4;
gridControlCurve.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridViewCurve });
//
@@ -325,8 +325,6 @@
gridColumn3.Caption = "鎺掑簭鐮�";
gridColumn3.FieldName = "SortCode";
gridColumn3.Name = "gridColumn3";
- gridColumn3.Visible = true;
- gridColumn3.VisibleIndex = 2;
//
// gridColumn2
//
@@ -351,7 +349,7 @@
layoutControlGroup6.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlGroup7 });
layoutControlGroup6.Name = "Root";
layoutControlGroup6.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- layoutControlGroup6.Size = new Size(630, 289);
+ layoutControlGroup6.Size = new Size(718, 337);
layoutControlGroup6.TextVisible = false;
//
// layoutControlGroup7
@@ -361,7 +359,7 @@
layoutControlGroup7.Location = new Point(0, 0);
layoutControlGroup7.Name = "layoutControlGroup7";
layoutControlGroup7.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- layoutControlGroup7.Size = new Size(630, 289);
+ layoutControlGroup7.Size = new Size(718, 337);
layoutControlGroup7.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
layoutControlGroup7.Text = "娉靛瀷鍙锋洸绾�";
//
@@ -371,7 +369,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(630, 267);
+ layoutControlItem3.Size = new Size(718, 315);
layoutControlItem3.TextSize = new Size(0, 0);
layoutControlItem3.TextVisible = false;
//
@@ -383,7 +381,7 @@
sidePanel2.Location = new Point(0, 0);
sidePanel2.Margin = new Padding(4, 5, 4, 5);
sidePanel2.Name = "sidePanel2";
- sidePanel2.Size = new Size(630, 321);
+ sidePanel2.Size = new Size(718, 321);
sidePanel2.TabIndex = 5;
sidePanel2.Text = "sidePanel2";
//
@@ -396,7 +394,7 @@
layoutControl2.Name = "layoutControl2";
layoutControl2.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(760, 358, 975, 600);
layoutControl2.Root = layoutControlGroup4;
- layoutControl2.Size = new Size(630, 321);
+ layoutControl2.Size = new Size(718, 321);
layoutControl2.TabIndex = 0;
layoutControl2.Text = "layoutControl2";
//
@@ -407,7 +405,7 @@
layoutControlGroup4.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlGroup5 });
layoutControlGroup4.Name = "Root";
layoutControlGroup4.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- layoutControlGroup4.Size = new Size(630, 321);
+ layoutControlGroup4.Size = new Size(718, 321);
layoutControlGroup4.TextVisible = false;
//
// layoutControlGroup5
@@ -417,7 +415,7 @@
layoutControlGroup5.Location = new Point(0, 0);
layoutControlGroup5.Name = "layoutControlGroup5";
layoutControlGroup5.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- layoutControlGroup5.Size = new Size(630, 321);
+ layoutControlGroup5.Size = new Size(718, 321);
layoutControlGroup5.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
layoutControlGroup5.Text = "娉靛瀷鍙�";
//
@@ -427,7 +425,7 @@
layoutControlItem4.Location = new Point(0, 0);
layoutControlItem4.Name = "layoutControlItem4";
layoutControlItem4.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- layoutControlItem4.Size = new Size(630, 299);
+ layoutControlItem4.Size = new Size(718, 299);
layoutControlItem4.TextSize = new Size(0, 0);
layoutControlItem4.TextVisible = false;
//
@@ -435,12 +433,12 @@
//
layoutControl1.Controls.Add(xtrPerform2dChart1);
layoutControl1.Dock = DockStyle.Fill;
- layoutControl1.Location = new Point(630, 57);
- layoutControl1.Margin = new Padding(2, 2, 2, 2);
+ layoutControl1.Location = new Point(718, 57);
+ layoutControl1.Margin = new Padding(2);
layoutControl1.Name = "layoutControl1";
layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(1487, 656, 975, 600);
layoutControl1.Root = Root;
- layoutControl1.Size = new Size(490, 610);
+ layoutControl1.Size = new Size(526, 658);
layoutControl1.TabIndex = 6;
layoutControl1.Text = "layoutControl1";
//
@@ -451,7 +449,7 @@
Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlGroup1 });
Root.Name = "Root";
Root.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- Root.Size = new Size(490, 610);
+ Root.Size = new Size(526, 658);
Root.TextVisible = false;
//
// layoutControlGroup1
@@ -461,7 +459,7 @@
layoutControlGroup1.Location = new Point(0, 0);
layoutControlGroup1.Name = "layoutControlGroup1";
layoutControlGroup1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- layoutControlGroup1.Size = new Size(490, 610);
+ layoutControlGroup1.Size = new Size(526, 658);
layoutControlGroup1.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
layoutControlGroup1.Text = "鏇茬嚎瑙嗗浘";
//
@@ -471,7 +469,7 @@
layoutControlItem1.Location = new Point(0, 0);
layoutControlItem1.Name = "layoutControlItem1";
layoutControlItem1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- layoutControlItem1.Size = new Size(490, 588);
+ layoutControlItem1.Size = new Size(526, 636);
layoutControlItem1.TextSize = new Size(0, 0);
layoutControlItem1.TextVisible = false;
//
@@ -479,11 +477,11 @@
//
AutoScaleDimensions = new SizeF(7F, 14F);
AutoScaleMode = AutoScaleMode.Font;
- ClientSize = new Size(1120, 667);
+ ClientSize = new Size(1244, 715);
Controls.Add(layoutControl1);
Controls.Add(sidePanel1);
Controls.Add(ribbon);
- Margin = new Padding(2, 2, 2, 2);
+ Margin = new Padding(2);
Name = "PumpMatchingDlg";
Ribbon = ribbon;
StartPosition = FormStartPosition.CenterScreen;
@@ -523,7 +521,7 @@
private DevExpress.XtraEditors.Repository.RepositoryItemSearchControl repSearchCtrl;
private DevExpress.XtraBars.Ribbon.RibbonPage ribbonPage1;
private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup1;
- private Yw.WinFrmUI.Phart.PumpPerformChart xtrPerform2dChart1;
+ private Yw.WinFrmUI.Phart.PumpViewChart xtrPerform2dChart1;
private SidePanel sidePanel1;
private SidePanel sidePanel3;
private DevExpress.XtraLayout.LayoutControl layoutControl3;
--
Gitblit v1.9.3