From a6c50c87d1ba3f5c8785dcc9e8ea640b5a43209f Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期四, 26 九月 2024 15:07:09 +0800
Subject: [PATCH] 修改报错
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-scheme/03-hydraulic-simulation/01-PumpMainCurveChoice/PumpMainChoicePage.Designer.cs | 133 ++++++++++++++++++++------------------------
1 files changed, 61 insertions(+), 72 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-scheme/03-hydraulic-simulation/01-PumpMainCurveChoice/PumpMainChoicePage.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-scheme/03-hydraulic-simulation/01-PumpMainCurveChoice/PumpMainChoicePage.Designer.cs
index 6f90da6..612251a 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-scheme/03-hydraulic-simulation/01-PumpMainCurveChoice/PumpMainChoicePage.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-scheme/03-hydraulic-simulation/01-PumpMainCurveChoice/PumpMainChoicePage.Designer.cs
@@ -36,7 +36,6 @@
popupContainerControl1 = new DevExpress.XtraEditors.PopupContainerControl();
treeList1 = new DevExpress.XtraTreeList.TreeList();
treeListColumn1 = new DevExpress.XtraTreeList.Columns.TreeListColumn();
- BtnAddPumpMain = new DevExpress.XtraEditors.SimpleButton();
TextPopupPumpChoice = new DevExpress.XtraEditors.PopupContainerEdit();
popupContainerControl2 = new DevExpress.XtraEditors.PopupContainerControl();
gridControl1 = new DevExpress.XtraGrid.GridControl();
@@ -56,10 +55,10 @@
emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
simpleLabelSearch = new DevExpress.XtraLayout.SimpleLabelItem();
simpleLabelItemVagueSearch = new DevExpress.XtraLayout.SimpleLabelItem();
- layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
- layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+ emptySpaceItem2 = new DevExpress.XtraLayout.EmptySpaceItem();
layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
simpleLabelItem1 = new DevExpress.XtraLayout.SimpleLabelItem();
simpleLabelItem2 = new DevExpress.XtraLayout.SimpleLabelItem();
@@ -84,10 +83,10 @@
((ISupportInitialize)emptySpaceItem1).BeginInit();
((ISupportInitialize)simpleLabelSearch).BeginInit();
((ISupportInitialize)simpleLabelItemVagueSearch).BeginInit();
- ((ISupportInitialize)layoutControlItem1).BeginInit();
((ISupportInitialize)layoutControlItem2).BeginInit();
((ISupportInitialize)layoutControlGroup1).BeginInit();
- ((ISupportInitialize)layoutControlItem6).BeginInit();
+ ((ISupportInitialize)layoutControlItem5).BeginInit();
+ ((ISupportInitialize)emptySpaceItem2).BeginInit();
((ISupportInitialize)layoutControlItem4).BeginInit();
((ISupportInitialize)simpleLabelItem1).BeginInit();
((ISupportInitialize)simpleLabelItem2).BeginInit();
@@ -101,12 +100,11 @@
//
// layoutControl1
//
+ layoutControl1.Controls.Add(popupContainerControl2);
layoutControl1.Controls.Add(xtrPerform2dChart1);
layoutControl1.Controls.Add(pumpMainCurveForm1);
layoutControl1.Controls.Add(popupContainerControl1);
- layoutControl1.Controls.Add(BtnAddPumpMain);
layoutControl1.Controls.Add(TextPopupPumpChoice);
- layoutControl1.Controls.Add(popupContainerControl2);
layoutControl1.Dock = DockStyle.Fill;
layoutControl1.Location = new Point(0, 0);
layoutControl1.Name = "layoutControl1";
@@ -120,26 +118,26 @@
//
xtrPerform2dChart1.DefinePointVisible = false;
xtrPerform2dChart1.LineVisible = false;
- xtrPerform2dChart1.Location = new Point(10, 210);
+ xtrPerform2dChart1.Location = new Point(12, 211);
xtrPerform2dChart1.Margin = new Padding(2, 2, 2, 2);
xtrPerform2dChart1.Name = "xtrPerform2dChart1";
- xtrPerform2dChart1.Size = new Size(940, 315);
- xtrPerform2dChart1.TabIndex = 8;
+ xtrPerform2dChart1.Size = new Size(936, 312);
+ xtrPerform2dChart1.TabIndex = 6;
//
// pumpMainCurveForm1
//
- pumpMainCurveForm1.Location = new Point(2, 30);
+ pumpMainCurveForm1.Location = new Point(2, 29);
pumpMainCurveForm1.Name = "pumpMainCurveForm1";
pumpMainCurveForm1.Size = new Size(956, 147);
- pumpMainCurveForm1.TabIndex = 7;
+ pumpMainCurveForm1.TabIndex = 3;
//
// popupContainerControl1
//
popupContainerControl1.Controls.Add(treeList1);
- popupContainerControl1.Location = new Point(655, 54);
+ popupContainerControl1.Location = new Point(501, 40);
popupContainerControl1.Name = "popupContainerControl1";
- popupContainerControl1.Size = new Size(200, 100);
- popupContainerControl1.TabIndex = 5;
+ popupContainerControl1.Size = new Size(307, 153);
+ popupContainerControl1.TabIndex = 1;
//
// treeList1
//
@@ -149,7 +147,7 @@
treeList1.Name = "treeList1";
treeList1.OptionsBehavior.Editable = false;
treeList1.OptionsView.ShowTreeLines = DevExpress.Utils.DefaultBoolean.True;
- treeList1.Size = new Size(200, 100);
+ treeList1.Size = new Size(307, 153);
treeList1.TabIndex = 0;
treeList1.SelectionChanged += treeList1_SelectionChanged;
//
@@ -161,37 +159,24 @@
treeListColumn1.Visible = true;
treeListColumn1.VisibleIndex = 0;
//
- // BtnAddPumpMain
- //
- BtnAddPumpMain.Appearance.FontSizeDelta = 1;
- BtnAddPumpMain.Appearance.Options.UseFont = true;
- BtnAddPumpMain.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("BtnAddPumpMain.ImageOptions.SvgImage");
- BtnAddPumpMain.ImageOptions.SvgImageSize = new Size(20, 20);
- BtnAddPumpMain.Location = new Point(424, 2);
- BtnAddPumpMain.Name = "BtnAddPumpMain";
- BtnAddPumpMain.Size = new Size(88, 24);
- BtnAddPumpMain.StyleController = layoutControl1;
- BtnAddPumpMain.TabIndex = 3;
- BtnAddPumpMain.Text = "鏂板鍨嬪彿";
- //
// TextPopupPumpChoice
//
- TextPopupPumpChoice.Location = new Point(78, 2);
+ TextPopupPumpChoice.Location = new Point(117, 2);
TextPopupPumpChoice.Name = "TextPopupPumpChoice";
TextPopupPumpChoice.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
TextPopupPumpChoice.Properties.NullText = "鍦ㄦ澶勮緭鍏ユ煡璇㈡车鍨嬪彿";
TextPopupPumpChoice.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard;
- TextPopupPumpChoice.Size = new Size(271, 20);
+ TextPopupPumpChoice.Size = new Size(232, 20);
TextPopupPumpChoice.StyleController = layoutControl1;
TextPopupPumpChoice.TabIndex = 0;
//
// popupContainerControl2
//
popupContainerControl2.Controls.Add(gridControl1);
- popupContainerControl2.Location = new Point(242, 252);
+ popupContainerControl2.Location = new Point(232, 178);
popupContainerControl2.Name = "popupContainerControl2";
- popupContainerControl2.Size = new Size(692, 99);
- popupContainerControl2.TabIndex = 6;
+ popupContainerControl2.Size = new Size(621, 218);
+ popupContainerControl2.TabIndex = 1;
//
// gridControl1
//
@@ -199,7 +184,7 @@
gridControl1.Location = new Point(0, 0);
gridControl1.MainView = gridView1;
gridControl1.Name = "gridControl1";
- gridControl1.Size = new Size(692, 99);
+ gridControl1.Size = new Size(621, 218);
gridControl1.TabIndex = 0;
gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridView1 });
//
@@ -209,6 +194,7 @@
gridView1.GridControl = gridControl1;
gridView1.Name = "gridView1";
gridView1.OptionsView.ShowGroupPanel = false;
+ gridView1.RowClick += gridView1_RowClick;
//
// colName
//
@@ -294,7 +280,7 @@
//
Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
Root.GroupBordersVisible = false;
- Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem3, emptySpaceItem1, simpleLabelSearch, simpleLabelItemVagueSearch, layoutControlItem1, layoutControlItem2, layoutControlGroup1 });
+ Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem3, emptySpaceItem1, simpleLabelSearch, simpleLabelItemVagueSearch, layoutControlItem2, layoutControlGroup1, emptySpaceItem2 });
Root.Name = "Root";
Root.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
Root.Size = new Size(960, 535);
@@ -304,18 +290,18 @@
//
layoutControlItem3.AllowHtmlStringInCaption = true;
layoutControlItem3.Control = TextPopupPumpChoice;
- layoutControlItem3.Location = new Point(0, 0);
+ layoutControlItem3.Location = new Point(39, 0);
layoutControlItem3.Name = "layoutControlItem3";
- layoutControlItem3.Size = new Size(351, 28);
+ layoutControlItem3.Size = new Size(312, 27);
layoutControlItem3.Text = "娉靛瀷鍙烽�夋嫨:";
layoutControlItem3.TextSize = new Size(64, 14);
//
// emptySpaceItem1
//
emptySpaceItem1.AllowHotTrack = false;
- emptySpaceItem1.Location = new Point(514, 0);
+ emptySpaceItem1.Location = new Point(422, 0);
emptySpaceItem1.Name = "emptySpaceItem1";
- emptySpaceItem1.Size = new Size(446, 28);
+ emptySpaceItem1.Size = new Size(538, 27);
emptySpaceItem1.TextSize = new Size(0, 0);
//
// simpleLabelSearch
@@ -325,7 +311,10 @@
simpleLabelSearch.ImageOptions.SvgImageSize = new Size(23, 23);
simpleLabelSearch.Location = new Point(351, 0);
simpleLabelSearch.Name = "simpleLabelSearch";
- simpleLabelSearch.Size = new Size(37, 28);
+ simpleLabelSearch.OptionsToolTip.IconToolTip = "妯＄硦鏌ヨ";
+ simpleLabelSearch.OptionsToolTip.ToolTip = "妯＄硦鏌ヨ";
+ simpleLabelSearch.OptionsToolTip.ToolTipTitle = "妯＄硦鏌ヨ";
+ simpleLabelSearch.Size = new Size(37, 27);
simpleLabelSearch.Text = " ";
simpleLabelSearch.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
simpleLabelSearch.TextSize = new Size(32, 23);
@@ -338,25 +327,19 @@
simpleLabelItemVagueSearch.ImageOptions.SvgImageSize = new Size(20, 20);
simpleLabelItemVagueSearch.Location = new Point(388, 0);
simpleLabelItemVagueSearch.Name = "simpleLabelItemVagueSearch";
- simpleLabelItemVagueSearch.Size = new Size(34, 28);
+ simpleLabelItemVagueSearch.OptionsToolTip.IconToolTip = "绮惧噯鏌ヨ";
+ simpleLabelItemVagueSearch.OptionsToolTip.ToolTip = "绮惧噯鏌ヨ";
+ simpleLabelItemVagueSearch.OptionsToolTip.ToolTipTitle = "绮惧噯鏌ヨ";
+ simpleLabelItemVagueSearch.Size = new Size(34, 27);
simpleLabelItemVagueSearch.Text = " ";
simpleLabelItemVagueSearch.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
simpleLabelItemVagueSearch.TextSize = new Size(29, 20);
simpleLabelItemVagueSearch.Click += simpleLabelItemVagueSearch_Click;
//
- // layoutControlItem1
- //
- layoutControlItem1.Control = BtnAddPumpMain;
- layoutControlItem1.Location = new Point(422, 0);
- layoutControlItem1.Name = "layoutControlItem1";
- layoutControlItem1.Size = new Size(92, 28);
- layoutControlItem1.TextSize = new Size(0, 0);
- layoutControlItem1.TextVisible = false;
- //
// layoutControlItem2
//
layoutControlItem2.Control = pumpMainCurveForm1;
- layoutControlItem2.Location = new Point(0, 28);
+ layoutControlItem2.Location = new Point(0, 27);
layoutControlItem2.Name = "layoutControlItem2";
layoutControlItem2.Size = new Size(960, 151);
layoutControlItem2.TextSize = new Size(0, 0);
@@ -364,22 +347,29 @@
//
// layoutControlGroup1
//
- layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem6 });
- layoutControlGroup1.Location = new Point(0, 179);
+ layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem5 });
+ layoutControlGroup1.Location = new Point(0, 178);
layoutControlGroup1.Name = "layoutControlGroup1";
layoutControlGroup1.Padding = new DevExpress.XtraLayout.Utils.Padding(7, 7, 7, 7);
- layoutControlGroup1.Size = new Size(960, 356);
+ layoutControlGroup1.Size = new Size(960, 357);
layoutControlGroup1.Text = "鏇茬嚎瑙嗗浘";
//
- // layoutControlItem6
+ // layoutControlItem5
//
- layoutControlItem6.Control = xtrPerform2dChart1;
- layoutControlItem6.Location = new Point(0, 0);
- layoutControlItem6.Name = "layoutControlItem6";
- layoutControlItem6.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- layoutControlItem6.Size = new Size(940, 315);
- layoutControlItem6.TextSize = new Size(0, 0);
- layoutControlItem6.TextVisible = false;
+ layoutControlItem5.Control = xtrPerform2dChart1;
+ layoutControlItem5.Location = new Point(0, 0);
+ layoutControlItem5.Name = "layoutControlItem5";
+ layoutControlItem5.Size = new Size(940, 316);
+ layoutControlItem5.TextSize = new Size(0, 0);
+ layoutControlItem5.TextVisible = false;
+ //
+ // emptySpaceItem2
+ //
+ emptySpaceItem2.AllowHotTrack = false;
+ emptySpaceItem2.Location = new Point(0, 0);
+ emptySpaceItem2.Name = "emptySpaceItem2";
+ emptySpaceItem2.Size = new Size(39, 27);
+ emptySpaceItem2.TextSize = new Size(0, 0);
//
// layoutControlItem4
//
@@ -475,10 +465,10 @@
((ISupportInitialize)emptySpaceItem1).EndInit();
((ISupportInitialize)simpleLabelSearch).EndInit();
((ISupportInitialize)simpleLabelItemVagueSearch).EndInit();
- ((ISupportInitialize)layoutControlItem1).EndInit();
((ISupportInitialize)layoutControlItem2).EndInit();
((ISupportInitialize)layoutControlGroup1).EndInit();
- ((ISupportInitialize)layoutControlItem6).EndInit();
+ ((ISupportInitialize)layoutControlItem5).EndInit();
+ ((ISupportInitialize)emptySpaceItem2).EndInit();
((ISupportInitialize)layoutControlItem4).EndInit();
((ISupportInitialize)simpleLabelItem1).EndInit();
((ISupportInitialize)simpleLabelItem2).EndInit();
@@ -507,8 +497,6 @@
private DevExpress.XtraLayout.SimpleLabelItem simpleLabelItem6;
private DevExpress.XtraLayout.SimpleLabelItem simpleLabelItem7;
private DevExpress.XtraLayout.SimpleLabelItem simpleLabelItem8;
- private DevExpress.XtraEditors.SimpleButton BtnAddPumpMain;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1;
private DevExpress.XtraLayout.SimpleLabelItem simpleLabelSearch;
private DevExpress.XtraLayout.SimpleLabelItem simpleLabelItemVagueSearch;
@@ -516,6 +504,11 @@
private DevExpress.XtraTreeList.TreeList treeList1;
private DevExpress.XtraTreeList.Columns.TreeListColumn treeListColumn1;
private DevExpress.XtraEditors.PopupContainerControl popupContainerControl2;
+ private PumpMainCurveForm pumpMainCurveForm1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
+ private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1;
+ private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem2;
+ private Yw.WinFrmUI.Phart.XtrPerform2dChart xtrPerform2dChart1;
private DevExpress.XtraGrid.GridControl gridControl1;
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
private DevExpress.XtraGrid.Columns.GridColumn colName;
@@ -528,10 +521,6 @@
private DevExpress.XtraGrid.Columns.GridColumn colRatedEfficiency;
private DevExpress.XtraGrid.Columns.GridColumn colRatedPower;
private DevExpress.XtraGrid.Columns.GridColumn colRatedSpeed;
- private Yw.WinFrmUI.Phart.XtrPerform2dChart xtrPerform2dChart1;
- private PumpMainCurveForm pumpMainCurveForm1;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
- private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
}
}
--
Gitblit v1.9.3