From 4607e20cecf567ee2e86f9a07158deaa1b74d622 Mon Sep 17 00:00:00 2001 From: lixiaojun <1287241240@qq.com> Date: 星期一, 09 十二月 2024 15:05:19 +0800 Subject: [PATCH] 方案修改 --- WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/09-energy/SimulationSingleWorkingEnergyCtrl.Designer.cs | 43 ++++++++++++++++++++++--------------------- 1 files changed, 22 insertions(+), 21 deletions(-) diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/09-energy/SimulationSingleWorkingEnergyCtrl.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/09-energy/SimulationSingleWorkingEnergyCtrl.Designer.cs index afc9477..e23b288 100644 --- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/09-energy/SimulationSingleWorkingEnergyCtrl.Designer.cs +++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/09-energy/SimulationSingleWorkingEnergyCtrl.Designer.cs @@ -30,12 +30,11 @@ { layoutControl1 = new DevExpress.XtraLayout.LayoutControl(); panelControl1 = new PanelControl(); - singlePumpCalcCtrl1 = new Xhs.SinglePumpCalcCtrl(); txtE = new TextEdit(); txtP = new TextEdit(); txtH = new TextEdit(); txtQ = new TextEdit(); - hydroPumpRunStatusListCtrl1 = new HydroPumpRunListViewCtrl(); + hydroPumpListStateViewCtrl1 = new HydroPumpListStateViewCtrl(); hydroEnergyTotalViewCtrl1 = new HydroEnergyTotalViewCtrl(); Root = new DevExpress.XtraLayout.LayoutControlGroup(); splitterItem1 = new DevExpress.XtraLayout.SplitterItem(); @@ -50,6 +49,7 @@ layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup(); layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem(); + pumpRunViewChart1 = new Yw.WinFrmUI.Phart.PumpRunViewChart(); ((ISupportInitialize)layoutControl1).BeginInit(); layoutControl1.SuspendLayout(); ((ISupportInitialize)panelControl1).BeginInit(); @@ -80,7 +80,7 @@ layoutControl1.Controls.Add(txtP); layoutControl1.Controls.Add(txtH); layoutControl1.Controls.Add(txtQ); - layoutControl1.Controls.Add(hydroPumpRunStatusListCtrl1); + layoutControl1.Controls.Add(hydroPumpListStateViewCtrl1); layoutControl1.Controls.Add(hydroEnergyTotalViewCtrl1); layoutControl1.Dock = DockStyle.Fill; layoutControl1.Location = new Point(0, 0); @@ -94,21 +94,12 @@ // panelControl1 // panelControl1.BorderStyle = BorderStyles.Simple; - panelControl1.Controls.Add(singlePumpCalcCtrl1); + panelControl1.Controls.Add(pumpRunViewChart1); panelControl1.Location = new Point(232, 71); panelControl1.Name = "panelControl1"; panelControl1.Padding = new Padding(1); panelControl1.Size = new Size(778, 530); panelControl1.TabIndex = 11; - // - // singlePumpCalcCtrl1 - // - singlePumpCalcCtrl1.Dock = DockStyle.Fill; - singlePumpCalcCtrl1.Location = new Point(3, 3); - singlePumpCalcCtrl1.Margin = new Padding(2, 2, 2, 2); - singlePumpCalcCtrl1.Name = "singlePumpCalcCtrl1"; - singlePumpCalcCtrl1.Size = new Size(772, 524); - singlePumpCalcCtrl1.TabIndex = 0; // // txtE // @@ -150,12 +141,12 @@ txtQ.StyleController = layoutControl1; txtQ.TabIndex = 2; // - // hydroPumpRunStatusListCtrl1 + // hydroPumpListStateViewCtrl1 // - hydroPumpRunStatusListCtrl1.Location = new Point(5, 148); - hydroPumpRunStatusListCtrl1.Name = "hydroPumpRunStatusListCtrl1"; - hydroPumpRunStatusListCtrl1.Size = new Size(210, 450); - hydroPumpRunStatusListCtrl1.TabIndex = 6; + hydroPumpListStateViewCtrl1.Location = new Point(5, 148); + hydroPumpListStateViewCtrl1.Name = "hydroPumpListStateViewCtrl1"; + hydroPumpListStateViewCtrl1.Size = new Size(210, 450); + hydroPumpListStateViewCtrl1.TabIndex = 6; // // hydroEnergyTotalViewCtrl1 // @@ -194,7 +185,7 @@ // // layoutControlItem2 // - layoutControlItem2.Control = hydroPumpRunStatusListCtrl1; + layoutControlItem2.Control = hydroPumpListStateViewCtrl1; layoutControlItem2.Location = new Point(0, 0); layoutControlItem2.Name = "layoutControlItem2"; layoutControlItem2.Size = new Size(214, 454); @@ -299,6 +290,15 @@ layoutControlItem3.TextSize = new Size(0, 0); layoutControlItem3.TextVisible = false; // + // pumpRunViewChart1 + // + pumpRunViewChart1.Dock = DockStyle.Fill; + pumpRunViewChart1.Location = new Point(3, 3); + pumpRunViewChart1.Margin = new Padding(2, 2, 2, 2); + pumpRunViewChart1.Name = "pumpRunViewChart1"; + pumpRunViewChart1.Size = new Size(772, 524); + pumpRunViewChart1.TabIndex = 0; + // // SimulationSingleWorkingEnergyCtrl // AutoScaleDimensions = new SizeF(7F, 14F); @@ -338,7 +338,7 @@ private TextEdit txtP; private TextEdit txtH; private TextEdit txtQ; - private HydroPumpRunListViewCtrl hydroPumpRunStatusListCtrl1; + private HydroPumpListStateViewCtrl hydroPumpListStateViewCtrl1; private HydroEnergyTotalViewCtrl hydroEnergyTotalViewCtrl1; private DevExpress.XtraLayout.SplitterItem splitterItem1; private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup2; @@ -350,9 +350,10 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7; private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1; private PanelControl panelControl1; - private Xhs.SinglePumpCalcCtrl singlePumpCalcCtrl1; + private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3; + private Yw.WinFrmUI.Phart.PumpRunViewChart pumpRunViewChart1; } } -- Gitblit v1.9.3