From 0d9526152334f26c9110dab0652796f59a185820 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期二, 29 十月 2024 13:30:43 +0800
Subject: [PATCH] 冲突
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/01-pumpsinglematching/PumpMatchingDlg.Designer.cs | 116 +++++++++++++++++++++++++++------------------------------
1 files changed, 55 insertions(+), 61 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 a05d36e..7ade6e4 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
@@ -94,12 +94,15 @@
//
// ribbon
//
+ ribbon.EmptyAreaImageOptions.ImagePadding = new Padding(21, 19, 21, 19);
ribbon.ExpandCollapseItem.Id = 0;
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.MaxItemId = 3;
ribbon.Name = "ribbon";
+ ribbon.OptionsMenuMinWidth = 231;
ribbon.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { ribbonPage1 });
ribbon.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { repSearchCtrl });
ribbon.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonControlStyle.TabletOffice;
@@ -112,7 +115,7 @@
ribbon.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide;
ribbon.ShowQatLocationSelector = false;
ribbon.ShowToolbarCustomizeItem = false;
- ribbon.Size = new Size(1498, 85);
+ ribbon.Size = new Size(1120, 57);
ribbon.Toolbar.ShowCustomizeItem = false;
//
// barEditSearch
@@ -132,12 +135,12 @@
//
// gridControlPumpMain
//
- gridControlPumpMain.EmbeddedNavigator.Margin = new Padding(9, 13, 9, 13);
- gridControlPumpMain.Location = new Point(0, 33);
+ gridControlPumpMain.EmbeddedNavigator.Margin = new Padding(4, 5, 4, 5);
+ gridControlPumpMain.Location = new Point(0, 22);
gridControlPumpMain.MainView = gridViewPumpMain;
- gridControlPumpMain.Margin = new Padding(6, 8, 6, 8);
+ gridControlPumpMain.Margin = new Padding(4, 5, 4, 5);
gridControlPumpMain.Name = "gridControlPumpMain";
- gridControlPumpMain.Size = new Size(900, 471);
+ gridControlPumpMain.Size = new Size(630, 299);
gridControlPumpMain.TabIndex = 3;
gridControlPumpMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridViewPumpMain });
//
@@ -146,10 +149,10 @@
gridViewPumpMain.Appearance.HeaderPanel.Options.UseTextOptions = true;
gridViewPumpMain.Appearance.HeaderPanel.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
gridViewPumpMain.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colName, colRatedFlow, colRatedHead, colD2, colErosion, colRatedEfficiency, colRatedPower, colRatedSpeed });
- gridViewPumpMain.DetailHeight = 864;
+ gridViewPumpMain.DetailHeight = 550;
gridViewPumpMain.GridControl = gridControlPumpMain;
gridViewPumpMain.Name = "gridViewPumpMain";
- gridViewPumpMain.OptionsEditForm.PopupEditFormWidth = 1633;
+ gridViewPumpMain.OptionsEditForm.PopupEditFormWidth = 1143;
gridViewPumpMain.OptionsView.ShowGroupPanel = false;
gridViewPumpMain.FocusedRowChanged += gridViewPumpMain_FocusedRowChanged;
//
@@ -157,81 +160,81 @@
//
colName.Caption = "鍨嬪彿";
colName.FieldName = "Name";
- colName.MinWidth = 41;
+ colName.MinWidth = 29;
colName.Name = "colName";
colName.Visible = true;
colName.VisibleIndex = 0;
- colName.Width = 573;
+ colName.Width = 401;
//
// colRatedFlow
//
colRatedFlow.Caption = "棰濆畾娴侀噺(m鲁/h)";
colRatedFlow.FieldName = "RatedFlow";
- colRatedFlow.MinWidth = 41;
+ colRatedFlow.MinWidth = 29;
colRatedFlow.Name = "colRatedFlow";
colRatedFlow.Visible = true;
colRatedFlow.VisibleIndex = 1;
- colRatedFlow.Width = 270;
+ colRatedFlow.Width = 189;
//
// colRatedHead
//
colRatedHead.Caption = "棰濆畾鎵▼(m)";
colRatedHead.FieldName = "RatedHead";
- colRatedHead.MinWidth = 41;
+ colRatedHead.MinWidth = 29;
colRatedHead.Name = "colRatedHead";
colRatedHead.Visible = true;
colRatedHead.VisibleIndex = 2;
- colRatedHead.Width = 224;
+ colRatedHead.Width = 157;
//
// colD2
//
colD2.Caption = "鍙惰疆澶栧緞(mm)";
colD2.FieldName = "D2";
- colD2.MinWidth = 41;
+ colD2.MinWidth = 29;
colD2.Name = "colD2";
colD2.Visible = true;
colD2.VisibleIndex = 3;
- colD2.Width = 256;
+ colD2.Width = 179;
//
// colErosion
//
colErosion.Caption = "姘旇殌";
colErosion.FieldName = "Erosion";
- colErosion.MinWidth = 41;
+ colErosion.MinWidth = 29;
colErosion.Name = "colErosion";
colErosion.Visible = true;
colErosion.VisibleIndex = 4;
- colErosion.Width = 147;
+ colErosion.Width = 103;
//
// colRatedEfficiency
//
colRatedEfficiency.Caption = "棰濆畾鏁堢巼";
colRatedEfficiency.FieldName = "RatedEfficiency";
- colRatedEfficiency.MinWidth = 41;
+ colRatedEfficiency.MinWidth = 29;
colRatedEfficiency.Name = "colRatedEfficiency";
colRatedEfficiency.Visible = true;
colRatedEfficiency.VisibleIndex = 5;
- colRatedEfficiency.Width = 167;
+ colRatedEfficiency.Width = 117;
//
// colRatedPower
//
colRatedPower.Caption = "棰濆畾鍔熺巼";
colRatedPower.FieldName = "RatedPower";
- colRatedPower.MinWidth = 41;
+ colRatedPower.MinWidth = 29;
colRatedPower.Name = "colRatedPower";
colRatedPower.Visible = true;
colRatedPower.VisibleIndex = 6;
- colRatedPower.Width = 153;
+ colRatedPower.Width = 107;
//
// colRatedSpeed
//
colRatedSpeed.Caption = "棰濆畾杞��";
colRatedSpeed.FieldName = "RatedSpeed";
- colRatedSpeed.MinWidth = 41;
+ colRatedSpeed.MinWidth = 29;
colRatedSpeed.Name = "colRatedSpeed";
colRatedSpeed.Visible = true;
colRatedSpeed.VisibleIndex = 7;
- colRatedSpeed.Width = 161;
+ colRatedSpeed.Width = 113;
//
// barBtnOK
//
@@ -258,9 +261,10 @@
//
xtrPerform2dChart1.DefinePointVisible = false;
xtrPerform2dChart1.LineVisible = false;
- xtrPerform2dChart1.Location = new Point(0, 33);
+ xtrPerform2dChart1.Location = new Point(0, 22);
+ xtrPerform2dChart1.Margin = new Padding(1, 1, 1, 1);
xtrPerform2dChart1.Name = "xtrPerform2dChart1";
- xtrPerform2dChart1.Size = new Size(598, 923);
+ xtrPerform2dChart1.Size = new Size(490, 588);
xtrPerform2dChart1.TabIndex = 3;
//
// sidePanel1
@@ -269,10 +273,9 @@
sidePanel1.Controls.Add(sidePanel3);
sidePanel1.Controls.Add(sidePanel2);
sidePanel1.Dock = DockStyle.Left;
- sidePanel1.Location = new Point(0, 85);
- sidePanel1.Margin = new Padding(4, 5, 4, 5);
+ sidePanel1.Location = new Point(0, 57);
sidePanel1.Name = "sidePanel1";
- sidePanel1.Size = new Size(900, 956);
+ sidePanel1.Size = new Size(630, 610);
sidePanel1.TabIndex = 4;
sidePanel1.Text = "sidePanel1";
//
@@ -281,10 +284,9 @@
sidePanel3.BorderThickness = 0;
sidePanel3.Controls.Add(layoutControl3);
sidePanel3.Dock = DockStyle.Fill;
- sidePanel3.Location = new Point(0, 504);
- sidePanel3.Margin = new Padding(4, 5, 4, 5);
+ sidePanel3.Location = new Point(0, 321);
sidePanel3.Name = "sidePanel3";
- sidePanel3.Size = new Size(900, 452);
+ sidePanel3.Size = new Size(630, 289);
sidePanel3.TabIndex = 6;
sidePanel3.Text = "sidePanel3";
//
@@ -293,32 +295,28 @@
layoutControl3.Controls.Add(gridControlCurve);
layoutControl3.Dock = DockStyle.Fill;
layoutControl3.Location = new Point(0, 0);
- layoutControl3.Margin = new Padding(4, 5, 4, 5);
layoutControl3.Name = "layoutControl3";
layoutControl3.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(1227, 608, 975, 600);
layoutControl3.Root = layoutControlGroup6;
- layoutControl3.Size = new Size(900, 452);
+ layoutControl3.Size = new Size(630, 289);
layoutControl3.TabIndex = 0;
layoutControl3.Text = "layoutControl3";
//
// gridControlCurve
//
- gridControlCurve.EmbeddedNavigator.Margin = new Padding(6, 8, 6, 8);
- gridControlCurve.Location = new Point(0, 33);
+ gridControlCurve.Location = new Point(0, 22);
gridControlCurve.MainView = gridViewCurve;
gridControlCurve.Margin = new Padding(0);
gridControlCurve.Name = "gridControlCurve";
- gridControlCurve.Size = new Size(900, 419);
+ gridControlCurve.Size = new Size(630, 267);
gridControlCurve.TabIndex = 4;
gridControlCurve.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridViewCurve });
//
// gridViewCurve
//
gridViewCurve.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { gridColumn3, gridColumn2, gridColumn1 });
- gridViewCurve.DetailHeight = 550;
gridViewCurve.GridControl = gridControlCurve;
gridViewCurve.Name = "gridViewCurve";
- gridViewCurve.OptionsEditForm.PopupEditFormWidth = 1143;
gridViewCurve.OptionsView.ShowGroupPanel = false;
gridViewCurve.FocusedRowChanged += gridViewCurve_FocusedRowChanged;
//
@@ -326,31 +324,25 @@
//
gridColumn3.Caption = "鎺掑簭鐮�";
gridColumn3.FieldName = "SortCode";
- gridColumn3.MinWidth = 29;
gridColumn3.Name = "gridColumn3";
gridColumn3.Visible = true;
gridColumn3.VisibleIndex = 2;
- gridColumn3.Width = 107;
//
// gridColumn2
//
gridColumn2.Caption = "閲嶈搴�";
gridColumn2.FieldName = "Importance";
- gridColumn2.MinWidth = 29;
gridColumn2.Name = "gridColumn2";
gridColumn2.Visible = true;
gridColumn2.VisibleIndex = 1;
- gridColumn2.Width = 107;
//
// gridColumn1
//
gridColumn1.Caption = "鍚嶇О";
gridColumn1.FieldName = "OtherName";
- gridColumn1.MinWidth = 29;
gridColumn1.Name = "gridColumn1";
gridColumn1.Visible = true;
gridColumn1.VisibleIndex = 0;
- gridColumn1.Width = 107;
//
// layoutControlGroup6
//
@@ -359,7 +351,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(900, 452);
+ layoutControlGroup6.Size = new Size(630, 289);
layoutControlGroup6.TextVisible = false;
//
// layoutControlGroup7
@@ -369,7 +361,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(900, 452);
+ layoutControlGroup7.Size = new Size(630, 289);
layoutControlGroup7.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
layoutControlGroup7.Text = "娉靛瀷鍙锋洸绾�";
//
@@ -379,7 +371,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(900, 419);
+ layoutControlItem3.Size = new Size(630, 267);
layoutControlItem3.TextSize = new Size(0, 0);
layoutControlItem3.TextVisible = false;
//
@@ -389,9 +381,9 @@
sidePanel2.Controls.Add(layoutControl2);
sidePanel2.Dock = DockStyle.Top;
sidePanel2.Location = new Point(0, 0);
- sidePanel2.Margin = new Padding(6, 8, 6, 8);
+ sidePanel2.Margin = new Padding(4, 5, 4, 5);
sidePanel2.Name = "sidePanel2";
- sidePanel2.Size = new Size(900, 504);
+ sidePanel2.Size = new Size(630, 321);
sidePanel2.TabIndex = 5;
sidePanel2.Text = "sidePanel2";
//
@@ -400,11 +392,11 @@
layoutControl2.Controls.Add(gridControlPumpMain);
layoutControl2.Dock = DockStyle.Fill;
layoutControl2.Location = new Point(0, 0);
- layoutControl2.Margin = new Padding(9, 13, 9, 13);
+ layoutControl2.Margin = new Padding(6, 8, 6, 8);
layoutControl2.Name = "layoutControl2";
layoutControl2.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(760, 358, 975, 600);
layoutControl2.Root = layoutControlGroup4;
- layoutControl2.Size = new Size(900, 504);
+ layoutControl2.Size = new Size(630, 321);
layoutControl2.TabIndex = 0;
layoutControl2.Text = "layoutControl2";
//
@@ -415,7 +407,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(900, 504);
+ layoutControlGroup4.Size = new Size(630, 321);
layoutControlGroup4.TextVisible = false;
//
// layoutControlGroup5
@@ -425,7 +417,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(900, 504);
+ layoutControlGroup5.Size = new Size(630, 321);
layoutControlGroup5.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
layoutControlGroup5.Text = "娉靛瀷鍙�";
//
@@ -435,7 +427,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(900, 471);
+ layoutControlItem4.Size = new Size(630, 299);
layoutControlItem4.TextSize = new Size(0, 0);
layoutControlItem4.TextVisible = false;
//
@@ -443,11 +435,12 @@
//
layoutControl1.Controls.Add(xtrPerform2dChart1);
layoutControl1.Dock = DockStyle.Fill;
- layoutControl1.Location = new Point(900, 85);
+ layoutControl1.Location = new Point(630, 57);
+ layoutControl1.Margin = new Padding(2, 2, 2, 2);
layoutControl1.Name = "layoutControl1";
layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(1487, 656, 975, 600);
layoutControl1.Root = Root;
- layoutControl1.Size = new Size(598, 956);
+ layoutControl1.Size = new Size(490, 610);
layoutControl1.TabIndex = 6;
layoutControl1.Text = "layoutControl1";
//
@@ -458,7 +451,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(598, 956);
+ Root.Size = new Size(490, 610);
Root.TextVisible = false;
//
// layoutControlGroup1
@@ -468,7 +461,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(598, 956);
+ layoutControlGroup1.Size = new Size(490, 610);
layoutControlGroup1.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
layoutControlGroup1.Text = "鏇茬嚎瑙嗗浘";
//
@@ -478,18 +471,19 @@
layoutControlItem1.Location = new Point(0, 0);
layoutControlItem1.Name = "layoutControlItem1";
layoutControlItem1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- layoutControlItem1.Size = new Size(598, 923);
+ layoutControlItem1.Size = new Size(490, 588);
layoutControlItem1.TextSize = new Size(0, 0);
layoutControlItem1.TextVisible = false;
//
// PumpMatchingDlg
//
- AutoScaleDimensions = new SizeF(10F, 22F);
+ AutoScaleDimensions = new SizeF(7F, 14F);
AutoScaleMode = AutoScaleMode.Font;
- ClientSize = new Size(1498, 1041);
+ ClientSize = new Size(1120, 667);
Controls.Add(layoutControl1);
Controls.Add(sidePanel1);
Controls.Add(ribbon);
+ Margin = new Padding(2, 2, 2, 2);
Name = "PumpMatchingDlg";
Ribbon = ribbon;
StartPosition = FormStartPosition.CenterScreen;
--
Gitblit v1.9.3