From 5043208b24f45b3e3c630a596b9e83373096a78a Mon Sep 17 00:00:00 2001 From: lixiaojun <1287241240@qq.com> Date: 星期五, 18 十月 2024 12:47:49 +0800 Subject: [PATCH] 优化计算前提,计算逻辑还需要继续优化 --- WinFrmUI/Yw.WinFrmUI.Hydro.Core/11-prefix/00-core/SetHydroCalcuPrefixCtrl.Designer.cs | 95 ++++++----------------------------------------- 1 files changed, 13 insertions(+), 82 deletions(-) diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/11-prefix/00-core/SetHydroCalcuPrefixCtrl.Designer.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/11-prefix/00-core/SetHydroCalcuPrefixCtrl.Designer.cs index 0e1b752..c082c28 100644 --- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/11-prefix/00-core/SetHydroCalcuPrefixCtrl.Designer.cs +++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/11-prefix/00-core/SetHydroCalcuPrefixCtrl.Designer.cs @@ -29,13 +29,7 @@ private void InitializeComponent() { ComponentResourceManager resources = new ComponentResourceManager(typeof(SetHydroCalcuPrefixCtrl)); - navigationFrame1 = new DevExpress.XtraBars.Navigation.NavigationFrame(); - navigationPage1 = new DevExpress.XtraBars.Navigation.NavigationPage(); - setWaterboxCalcuPrefixListCtrl1 = new SetWaterboxCalcuPrefixListCtrl(); - navigationPage2 = new DevExpress.XtraBars.Navigation.NavigationPage(); - setPumpCalcuPrefixListCtrl1 = new SetPumpCalcuPrefixListCtrl(); - navigationPage3 = new DevExpress.XtraBars.Navigation.NavigationPage(); - setNozzleCalcuPrefixListCtrl1 = new SetNozzleCalcuPrefixListCtrl(); + navigationFrame = new DevExpress.XtraBars.Navigation.NavigationFrame(); layoutControl1 = new DevExpress.XtraLayout.LayoutControl(); btnCalcu = new DevExpress.XtraEditors.SimpleButton(); btnPre = new DevExpress.XtraEditors.SimpleButton(); @@ -46,11 +40,7 @@ itemForPrev = new DevExpress.XtraLayout.LayoutControlItem(); itemForCalcu = new DevExpress.XtraLayout.LayoutControlItem(); emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem(); - ((ISupportInitialize)navigationFrame1).BeginInit(); - navigationFrame1.SuspendLayout(); - navigationPage1.SuspendLayout(); - navigationPage2.SuspendLayout(); - navigationPage3.SuspendLayout(); + ((ISupportInitialize)navigationFrame).BeginInit(); ((ISupportInitialize)layoutControl1).BeginInit(); layoutControl1.SuspendLayout(); ((ISupportInitialize)Root).BeginInit(); @@ -61,70 +51,21 @@ ((ISupportInitialize)emptySpaceItem1).BeginInit(); SuspendLayout(); // - // navigationFrame1 + // navigationFrame // - navigationFrame1.Controls.Add(navigationPage1); - navigationFrame1.Controls.Add(navigationPage2); - navigationFrame1.Controls.Add(navigationPage3); - navigationFrame1.Location = new Point(2, 2); - navigationFrame1.Name = "navigationFrame1"; - navigationFrame1.Pages.AddRange(new DevExpress.XtraBars.Navigation.NavigationPageBase[] { navigationPage1, navigationPage2, navigationPage3 }); - navigationFrame1.SelectedPage = navigationPage1; - navigationFrame1.Size = new Size(313, 688); - navigationFrame1.TabIndex = 0; - navigationFrame1.Text = "navigationFrame1"; - // - // navigationPage1 - // - navigationPage1.Caption = "navigationPage1"; - navigationPage1.Controls.Add(setWaterboxCalcuPrefixListCtrl1); - navigationPage1.Name = "navigationPage1"; - navigationPage1.Size = new Size(313, 688); - // - // setWaterboxCalcuPrefixListCtrl1 - // - setWaterboxCalcuPrefixListCtrl1.Dock = DockStyle.Fill; - setWaterboxCalcuPrefixListCtrl1.Location = new Point(0, 0); - setWaterboxCalcuPrefixListCtrl1.Name = "setWaterboxCalcuPrefixListCtrl1"; - setWaterboxCalcuPrefixListCtrl1.Size = new Size(313, 688); - setWaterboxCalcuPrefixListCtrl1.TabIndex = 0; - // - // navigationPage2 - // - navigationPage2.Caption = "navigationPage2"; - navigationPage2.Controls.Add(setPumpCalcuPrefixListCtrl1); - navigationPage2.Name = "navigationPage2"; - navigationPage2.Size = new Size(313, 688); - // - // setPumpCalcuPrefixListCtrl1 - // - setPumpCalcuPrefixListCtrl1.Dock = DockStyle.Fill; - setPumpCalcuPrefixListCtrl1.Location = new Point(0, 0); - setPumpCalcuPrefixListCtrl1.Name = "setPumpCalcuPrefixListCtrl1"; - setPumpCalcuPrefixListCtrl1.Size = new Size(313, 688); - setPumpCalcuPrefixListCtrl1.TabIndex = 0; - // - // navigationPage3 - // - navigationPage3.Caption = "navigationPage3"; - navigationPage3.Controls.Add(setNozzleCalcuPrefixListCtrl1); - navigationPage3.Name = "navigationPage3"; - navigationPage3.Size = new Size(313, 688); - // - // setNozzleCalcuPrefixListCtrl1 - // - setNozzleCalcuPrefixListCtrl1.Dock = DockStyle.Fill; - setNozzleCalcuPrefixListCtrl1.Location = new Point(0, 0); - setNozzleCalcuPrefixListCtrl1.Name = "setNozzleCalcuPrefixListCtrl1"; - setNozzleCalcuPrefixListCtrl1.Size = new Size(313, 688); - setNozzleCalcuPrefixListCtrl1.TabIndex = 0; + navigationFrame.Location = new Point(2, 2); + navigationFrame.Name = "navigationFrame"; + navigationFrame.SelectedPage = null; + navigationFrame.Size = new Size(313, 688); + navigationFrame.TabIndex = 0; + navigationFrame.Text = "navigationFrame1"; // // layoutControl1 // layoutControl1.Controls.Add(btnCalcu); layoutControl1.Controls.Add(btnPre); layoutControl1.Controls.Add(btnNext); - layoutControl1.Controls.Add(navigationFrame1); + layoutControl1.Controls.Add(navigationFrame); layoutControl1.Dock = DockStyle.Fill; layoutControl1.Location = new Point(0, 0); layoutControl1.Name = "layoutControl1"; @@ -200,7 +141,7 @@ // // layoutControlItem1 // - layoutControlItem1.Control = navigationFrame1; + layoutControlItem1.Control = navigationFrame; layoutControlItem1.Location = new Point(0, 0); layoutControlItem1.Name = "layoutControlItem1"; layoutControlItem1.Size = new Size(317, 692); @@ -260,11 +201,7 @@ Controls.Add(layoutControl1); Name = "SetHydroCalcuPrefixCtrl"; Size = new Size(317, 718); - ((ISupportInitialize)navigationFrame1).EndInit(); - navigationFrame1.ResumeLayout(false); - navigationPage1.ResumeLayout(false); - navigationPage2.ResumeLayout(false); - navigationPage3.ResumeLayout(false); + ((ISupportInitialize)navigationFrame).EndInit(); ((ISupportInitialize)layoutControl1).EndInit(); layoutControl1.ResumeLayout(false); ((ISupportInitialize)Root).EndInit(); @@ -278,13 +215,7 @@ #endregion - private DevExpress.XtraBars.Navigation.NavigationFrame navigationFrame1; - private DevExpress.XtraBars.Navigation.NavigationPage navigationPage1; - private DevExpress.XtraBars.Navigation.NavigationPage navigationPage2; - private SetWaterboxCalcuPrefixListCtrl setWaterboxCalcuPrefixListCtrl1; - private SetPumpCalcuPrefixListCtrl setPumpCalcuPrefixListCtrl1; - private DevExpress.XtraBars.Navigation.NavigationPage navigationPage3; - private SetNozzleCalcuPrefixListCtrl setNozzleCalcuPrefixListCtrl1; + private DevExpress.XtraBars.Navigation.NavigationFrame navigationFrame; private DevExpress.XtraLayout.LayoutControl layoutControl1; private DevExpress.XtraEditors.SimpleButton btnCalcu; private DevExpress.XtraEditors.SimpleButton btnPre; -- Gitblit v1.9.3