From 2d4b5e95d346c61e4bbb17a06dca27ad3b806b30 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期二, 10 十二月 2024 12:15:40 +0800
Subject: [PATCH] 能耗分析再次优化
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/11-pump/04-working/SimulationPumpSingleWorkingChartCtrl.cs | 37 ++++
/dev/null | 136 -----------------
WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj.user | 2
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/11-pump/04-working/SimulationPumpSingleWorkingChartCtrl.resx | 28 +++
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/11-pump/04-working/SimulationPumpSingleWorkingChartCtrl.Designer.cs | 252 +++++++++++++++++++++++++++++++
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/09-energy/SimulationSingleWorkingEnergyCtrl.Designer.cs | 4
6 files changed, 317 insertions(+), 142 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 3f96ad6..1eacc5f 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
@@ -35,7 +35,7 @@
layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
hydroEnergyTotalHorizViewCtrl1 = new HydroEnergyTotalHorizViewCtrl();
layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
- simulationSingleWorkingPumpCtrl1 = new SimulationSingleWorkingPumpCtrl();
+ simulationSingleWorkingPumpCtrl1 = new SimulationPumpSingleWorkingChartCtrl();
((ISupportInitialize)layoutControl1).BeginInit();
layoutControl1.SuspendLayout();
((ISupportInitialize)panelControl1).BeginInit();
@@ -149,7 +149,7 @@
private PanelControl panelControl1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
private HydroEnergyTotalHorizViewCtrl hydroEnergyTotalHorizViewCtrl1;
- private SimulationSingleWorkingPumpCtrl simulationSingleWorkingPumpCtrl1;
+ private SimulationPumpSingleWorkingChartCtrl simulationSingleWorkingPumpCtrl1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
}
}
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/11-pump/04-working/SimulationPumpSingleWorkingChartCtrl.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/11-pump/04-working/SimulationPumpSingleWorkingChartCtrl.Designer.cs
new file mode 100644
index 0000000..58e7da6
--- /dev/null
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/11-pump/04-working/SimulationPumpSingleWorkingChartCtrl.Designer.cs
@@ -0,0 +1,252 @@
+锘縩amespace HStation.WinFrmUI
+{
+ partial class SimulationPumpSingleWorkingChartCtrl
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Component Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ components = new Container();
+ ComponentResourceManager resources = new ComponentResourceManager(typeof(SimulationPumpSingleWorkingChartCtrl));
+ barManager1 = new DevExpress.XtraBars.BarManager(components);
+ bar2 = new DevExpress.XtraBars.Bar();
+ barCkE = new DevExpress.XtraBars.BarCheckItem();
+ barBtnCoord = new DevExpress.XtraBars.BarButtonItem();
+ barTxtQ = new DevExpress.XtraBars.BarEditItem();
+ repositoryItemTextEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemTextEdit();
+ barTxtH = new DevExpress.XtraBars.BarEditItem();
+ repositoryItemTextEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemTextEdit();
+ barTxtP = new DevExpress.XtraBars.BarEditItem();
+ repositoryItemTextEdit3 = new DevExpress.XtraEditors.Repository.RepositoryItemTextEdit();
+ barTxtE = new DevExpress.XtraBars.BarEditItem();
+ repositoryItemTextEdit4 = new DevExpress.XtraEditors.Repository.RepositoryItemTextEdit();
+ barDockControlTop = new DevExpress.XtraBars.BarDockControl();
+ barDockControlBottom = new DevExpress.XtraBars.BarDockControl();
+ barDockControlLeft = new DevExpress.XtraBars.BarDockControl();
+ barDockControlRight = new DevExpress.XtraBars.BarDockControl();
+ pumpWorkingViewChart1 = new Yw.WinFrmUI.Phart.PumpWorkingViewChart();
+ ((ISupportInitialize)barManager1).BeginInit();
+ ((ISupportInitialize)repositoryItemTextEdit1).BeginInit();
+ ((ISupportInitialize)repositoryItemTextEdit2).BeginInit();
+ ((ISupportInitialize)repositoryItemTextEdit3).BeginInit();
+ ((ISupportInitialize)repositoryItemTextEdit4).BeginInit();
+ SuspendLayout();
+ //
+ // barManager1
+ //
+ barManager1.Bars.AddRange(new DevExpress.XtraBars.Bar[] { bar2 });
+ barManager1.DockControls.Add(barDockControlTop);
+ barManager1.DockControls.Add(barDockControlBottom);
+ barManager1.DockControls.Add(barDockControlLeft);
+ barManager1.DockControls.Add(barDockControlRight);
+ barManager1.Form = this;
+ barManager1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { barCkE, barBtnCoord, barTxtQ, barTxtH, barTxtP, barTxtE });
+ barManager1.MainMenu = bar2;
+ barManager1.MaxItemId = 6;
+ barManager1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { repositoryItemTextEdit1, repositoryItemTextEdit2, repositoryItemTextEdit3, repositoryItemTextEdit4 });
+ //
+ // bar2
+ //
+ bar2.BarName = "Main menu";
+ bar2.DockCol = 0;
+ bar2.DockRow = 0;
+ bar2.DockStyle = DevExpress.XtraBars.BarDockStyle.Top;
+ bar2.LinksPersistInfo.AddRange(new DevExpress.XtraBars.LinkPersistInfo[] { new DevExpress.XtraBars.LinkPersistInfo(barCkE), new DevExpress.XtraBars.LinkPersistInfo(barBtnCoord), new DevExpress.XtraBars.LinkPersistInfo(barTxtQ), new DevExpress.XtraBars.LinkPersistInfo(barTxtH), new DevExpress.XtraBars.LinkPersistInfo(barTxtP), new DevExpress.XtraBars.LinkPersistInfo(barTxtE) });
+ bar2.OptionsBar.AllowQuickCustomization = false;
+ bar2.OptionsBar.DrawBorder = false;
+ bar2.OptionsBar.DrawDragBorder = false;
+ bar2.OptionsBar.MultiLine = true;
+ bar2.OptionsBar.UseWholeRow = true;
+ bar2.Text = "Main menu";
+ //
+ // barCkE
+ //
+ barCkE.Caption = "鏁堢巼绾�";
+ barCkE.CheckBoxVisibility = DevExpress.XtraBars.CheckBoxVisibility.BeforeText;
+ barCkE.Id = 0;
+ barCkE.Name = "barCkE";
+ //
+ // barBtnCoord
+ //
+ barBtnCoord.Caption = "鍧愭爣";
+ barBtnCoord.Id = 1;
+ barBtnCoord.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnCoord.ImageOptions.SvgImage");
+ barBtnCoord.Name = "barBtnCoord";
+ barBtnCoord.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
+ //
+ // barTxtQ
+ //
+ barTxtQ.Alignment = DevExpress.XtraBars.BarItemLinkAlignment.Right;
+ barTxtQ.Caption = "娴侀噺:";
+ barTxtQ.Edit = repositoryItemTextEdit1;
+ barTxtQ.EditWidth = 80;
+ barTxtQ.Id = 2;
+ barTxtQ.Name = "barTxtQ";
+ barTxtQ.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
+ //
+ // repositoryItemTextEdit1
+ //
+ repositoryItemTextEdit1.AutoHeight = false;
+ repositoryItemTextEdit1.Name = "repositoryItemTextEdit1";
+ repositoryItemTextEdit1.ReadOnly = true;
+ repositoryItemTextEdit1.UseReadOnlyAppearance = false;
+ //
+ // barTxtH
+ //
+ barTxtH.Alignment = DevExpress.XtraBars.BarItemLinkAlignment.Right;
+ barTxtH.Caption = "鎵▼:";
+ barTxtH.Edit = repositoryItemTextEdit2;
+ barTxtH.EditWidth = 80;
+ barTxtH.Id = 3;
+ barTxtH.Name = "barTxtH";
+ barTxtH.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
+ //
+ // repositoryItemTextEdit2
+ //
+ repositoryItemTextEdit2.AutoHeight = false;
+ repositoryItemTextEdit2.Name = "repositoryItemTextEdit2";
+ repositoryItemTextEdit2.ReadOnly = true;
+ repositoryItemTextEdit2.UseReadOnlyAppearance = false;
+ //
+ // barTxtP
+ //
+ barTxtP.Alignment = DevExpress.XtraBars.BarItemLinkAlignment.Right;
+ barTxtP.Caption = "鍔熺巼:";
+ barTxtP.Edit = repositoryItemTextEdit3;
+ barTxtP.EditWidth = 80;
+ barTxtP.Id = 4;
+ barTxtP.Name = "barTxtP";
+ barTxtP.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
+ //
+ // repositoryItemTextEdit3
+ //
+ repositoryItemTextEdit3.AutoHeight = false;
+ repositoryItemTextEdit3.Name = "repositoryItemTextEdit3";
+ repositoryItemTextEdit3.ReadOnly = true;
+ repositoryItemTextEdit3.UseReadOnlyAppearance = false;
+ //
+ // barTxtE
+ //
+ barTxtE.Alignment = DevExpress.XtraBars.BarItemLinkAlignment.Right;
+ barTxtE.Caption = "鏁堢巼:";
+ barTxtE.Edit = repositoryItemTextEdit4;
+ barTxtE.EditWidth = 80;
+ barTxtE.Id = 5;
+ barTxtE.Name = "barTxtE";
+ barTxtE.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
+ //
+ // repositoryItemTextEdit4
+ //
+ repositoryItemTextEdit4.AutoHeight = false;
+ repositoryItemTextEdit4.Name = "repositoryItemTextEdit4";
+ repositoryItemTextEdit4.ReadOnly = true;
+ repositoryItemTextEdit4.UseReadOnlyAppearance = false;
+ //
+ // barDockControlTop
+ //
+ barDockControlTop.CausesValidation = false;
+ barDockControlTop.Dock = DockStyle.Top;
+ barDockControlTop.Location = new Point(0, 0);
+ barDockControlTop.Manager = barManager1;
+ barDockControlTop.Size = new Size(854, 24);
+ //
+ // barDockControlBottom
+ //
+ barDockControlBottom.CausesValidation = false;
+ barDockControlBottom.Dock = DockStyle.Bottom;
+ barDockControlBottom.Location = new Point(0, 436);
+ barDockControlBottom.Manager = barManager1;
+ barDockControlBottom.Size = new Size(854, 0);
+ //
+ // barDockControlLeft
+ //
+ barDockControlLeft.CausesValidation = false;
+ barDockControlLeft.Dock = DockStyle.Left;
+ barDockControlLeft.Location = new Point(0, 24);
+ barDockControlLeft.Manager = barManager1;
+ barDockControlLeft.Size = new Size(0, 412);
+ //
+ // barDockControlRight
+ //
+ barDockControlRight.CausesValidation = false;
+ barDockControlRight.Dock = DockStyle.Right;
+ barDockControlRight.Location = new Point(854, 24);
+ barDockControlRight.Manager = barManager1;
+ barDockControlRight.Size = new Size(0, 412);
+ //
+ // pumpWorkingViewChart1
+ //
+ pumpWorkingViewChart1.Dock = DockStyle.Fill;
+ pumpWorkingViewChart1.EquipVisible = true;
+ pumpWorkingViewChart1.Location = new Point(0, 24);
+ pumpWorkingViewChart1.Margin = new Padding(2, 2, 2, 2);
+ pumpWorkingViewChart1.Name = "pumpWorkingViewChart1";
+ pumpWorkingViewChart1.QEVisible = true;
+ pumpWorkingViewChart1.QPVisble = true;
+ pumpWorkingViewChart1.RunPointVisible = true;
+ pumpWorkingViewChart1.Size = new Size(854, 412);
+ pumpWorkingViewChart1.TabIndex = 4;
+ //
+ // SimulationPumpSingleWorkingCtrl
+ //
+ AutoScaleDimensions = new SizeF(7F, 14F);
+ AutoScaleMode = AutoScaleMode.Font;
+ Controls.Add(pumpWorkingViewChart1);
+ Controls.Add(barDockControlLeft);
+ Controls.Add(barDockControlRight);
+ Controls.Add(barDockControlBottom);
+ Controls.Add(barDockControlTop);
+ Name = "SimulationPumpSingleWorkingCtrl";
+ Size = new Size(854, 436);
+ ((ISupportInitialize)barManager1).EndInit();
+ ((ISupportInitialize)repositoryItemTextEdit1).EndInit();
+ ((ISupportInitialize)repositoryItemTextEdit2).EndInit();
+ ((ISupportInitialize)repositoryItemTextEdit3).EndInit();
+ ((ISupportInitialize)repositoryItemTextEdit4).EndInit();
+ ResumeLayout(false);
+ PerformLayout();
+ }
+
+ #endregion
+
+ private DevExpress.XtraBars.BarManager barManager1;
+ private DevExpress.XtraBars.Bar bar2;
+ private DevExpress.XtraBars.BarDockControl barDockControlTop;
+ private DevExpress.XtraBars.BarDockControl barDockControlBottom;
+ private DevExpress.XtraBars.BarDockControl barDockControlLeft;
+ private DevExpress.XtraBars.BarDockControl barDockControlRight;
+ private Yw.WinFrmUI.Phart.PumpWorkingViewChart pumpWorkingViewChart1;
+ private DevExpress.XtraBars.BarCheckItem barCkE;
+ private DevExpress.XtraBars.BarButtonItem barBtnCoord;
+ private DevExpress.XtraBars.BarEditItem barTxtQ;
+ private DevExpress.XtraEditors.Repository.RepositoryItemTextEdit repositoryItemTextEdit1;
+ private DevExpress.XtraBars.BarEditItem barTxtH;
+ private DevExpress.XtraEditors.Repository.RepositoryItemTextEdit repositoryItemTextEdit2;
+ private DevExpress.XtraBars.BarEditItem barTxtP;
+ private DevExpress.XtraEditors.Repository.RepositoryItemTextEdit repositoryItemTextEdit3;
+ private DevExpress.XtraBars.BarEditItem barTxtE;
+ private DevExpress.XtraEditors.Repository.RepositoryItemTextEdit repositoryItemTextEdit4;
+ }
+}
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/11-pump/04-working/SimulationSingleWorkingPumpCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/11-pump/04-working/SimulationPumpSingleWorkingChartCtrl.cs
similarity index 82%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/11-pump/04-working/SimulationSingleWorkingPumpCtrl.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/11-pump/04-working/SimulationPumpSingleWorkingChartCtrl.cs
index f6189bc..2783c7a 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/11-pump/04-working/SimulationSingleWorkingPumpCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/11-pump/04-working/SimulationPumpSingleWorkingChartCtrl.cs
@@ -15,11 +15,12 @@
namespace HStation.WinFrmUI
{
- public partial class SimulationSingleWorkingPumpCtrl : DevExpress.XtraEditors.XtraUserControl
+ public partial class SimulationPumpSingleWorkingChartCtrl : DevExpress.XtraEditors.XtraUserControl
{
- public SimulationSingleWorkingPumpCtrl()
+ public SimulationPumpSingleWorkingChartCtrl()
{
InitializeComponent();
+ this.pumpWorkingViewChart1.RunPointSelectedEvent += PumpWorkingViewChart1_RunPointSelectedEvent;
}
private HydroWorkingVmo _working = null;
@@ -40,8 +41,20 @@
_hydroInfo = hydroInfo;
_allCalcuResultVisualDict = allCalcuResultVisualDict;
var vm = CreateViewModel();
- this.pumpWorkingViewChart1.SetBindingData(vm);
+ SetBindingData(vm);
}
+
+ public void SetBindingData(PumpWorkingViewViewModel vm)
+ {
+ this.pumpWorkingViewChart1.SetBindingData(vm);
+ if (vm != null && vm.Items != null)
+ {
+ var item = vm.Items.FirstOrDefault();
+ SetCurrent(item);
+ }
+ }
+
+
//鍒涘缓
private PumpWorkingViewViewModel CreateViewModel()
@@ -135,6 +148,24 @@
return vm;
}
+ //璁剧疆褰撳墠
+ private void SetCurrent(PumpWorkingViewItemViewModel item)
+ {
+ if (item != null)
+ {
+ this.barTxtQ.EditValue = $"{Math.Round(item.Q, 1)}m鲁/h";
+ this.barTxtH.EditValue = $"{Math.Round(item.H, 2)}m";
+ this.barTxtP.EditValue = $"{Math.Round(item.P ?? 0, 1)}kW";
+ this.barTxtE.EditValue = $"{Math.Round(item.E ?? 0, 1)}%";
+ }
+ }
+
+ private void PumpWorkingViewChart1_RunPointSelectedEvent(PumpWorkingViewItemViewModel obj)
+ {
+ SetCurrent(obj);
+ }
+
+
}
}
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/11-pump/04-working/SimulationSingleWorkingPumpCtrl.resx b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/11-pump/04-working/SimulationPumpSingleWorkingChartCtrl.resx
similarity index 71%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/11-pump/04-working/SimulationSingleWorkingPumpCtrl.resx
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/11-pump/04-working/SimulationPumpSingleWorkingChartCtrl.resx
index ada806c..97ffacc 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/11-pump/04-working/SimulationSingleWorkingPumpCtrl.resx
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/11-pump/04-working/SimulationPumpSingleWorkingChartCtrl.resx
@@ -120,4 +120,32 @@
<metadata name="barManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
+ <assembly alias="DevExpress.Data.v23.2" name="DevExpress.Data.v23.2, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+ <data name="barBtnCoord.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
+ LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+ dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAJgEAAAC77u/
+ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+ IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+ MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+ Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
+ MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ
+ LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuQmx1ZXtmaWxsOiMxMTc3
+ RDc7fQoJLldoaXRle2ZpbGw6I0ZGRkZGRjt9CgkuR3JlZW57ZmlsbDojMDM5QzIzO30KCS5zdDB7b3Bh
+ Y2l0eTowLjc1O30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQoJLnN0M3tm
+ aWxsOiNGRkIxMTU7fQo8L3N0eWxlPg0KICA8ZyAvPg0KICA8ZyBpZD0iWS1BeGlzX1NldHRpbmdzIj4N
+ CiAgICA8cG9seWdvbiBwb2ludHM9IjYsMjYgNiwwIDQsMCA0LDQgMiw0IDIsNiA0LDYgNCwxMCAyLDEw
+ IDIsMTIgNCwxMiA0LDE2IDIsMTYgMiwxOCA0LDE4IDQsMjIgMiwyMiAyLDI0IDQsMjQgNCwyOCAgICAz
+ MCwyOCAzMCwyNiAgIiBjbGFzcz0iQmxhY2siIC8+DQogICAgPHBhdGggZD0iTTMwLDE0LjR2LTIuOGwt
+ My0wLjZjLTAuMy0wLjgtMC41LTEuOC0xLjEtMi41bDEuOC0yLjVsLTEuOS0xLjlMMjMuMyw2Yy0wLjct
+ MC40LTEuNi0wLjgtMi41LTFsLTAuNC0zaC0yLjggICBsLTAuNSwzYy0wLjgsMC4zLTEuOCwwLjUtMi41
+ LDFsLTIuNS0xLjhsLTEuOSwxLjlMMTIsOC42Yy0wLjQsMC43LTAuOCwxLjctMS4xLDIuNUw4LDExLjZ2
+ Mi44bDMsMC41YzAuMywwLjgsMC41LDEuOCwxLjEsMi41ICAgbC0xLjgsMi41bDEuOSwxLjlsMi41LTEu
+ OGMwLjcsMC40LDEuNiwwLjgsMi41LDFsMC40LDNoMi44bDAuNi0zYzAuOC0wLjMsMS44LTAuNiwyLjUt
+ MWwyLjUsMS44bDEuOS0xLjlMMjYsMTcuNCAgIGMwLjQtMC43LDAuOC0xLjYsMS4xLTIuNUwzMCwxNC40
+ eiBNMTksMTZjLTEuNywwLTMtMS4zLTMtM3MxLjMtMywzLTNzMywxLjMsMywzUzIwLjcsMTYsMTksMTZ6
+ IiBjbGFzcz0iQmx1ZSIgLz4NCiAgPC9nPg0KPC9zdmc+Cw==
+</value>
+ </data>
</root>
\ No newline at end of file
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/11-pump/04-working/SimulationSingleWorkingPumpCtrl.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/11-pump/04-working/SimulationSingleWorkingPumpCtrl.Designer.cs
deleted file mode 100644
index 9b72010..0000000
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/11-pump/04-working/SimulationSingleWorkingPumpCtrl.Designer.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-锘縩amespace HStation.WinFrmUI
-{
- partial class SimulationSingleWorkingPumpCtrl
- {
- /// <summary>
- /// Required designer variable.
- /// </summary>
- private System.ComponentModel.IContainer components = null;
-
- /// <summary>
- /// Clean up any resources being used.
- /// </summary>
- /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
- protected override void Dispose(bool disposing)
- {
- if (disposing && (components != null))
- {
- components.Dispose();
- }
- base.Dispose(disposing);
- }
-
- #region Component Designer generated code
-
- /// <summary>
- /// Required method for Designer support - do not modify
- /// the contents of this method with the code editor.
- /// </summary>
- private void InitializeComponent()
- {
- components = new Container();
- barManager1 = new DevExpress.XtraBars.BarManager(components);
- bar2 = new DevExpress.XtraBars.Bar();
- barDockControlTop = new DevExpress.XtraBars.BarDockControl();
- barDockControlBottom = new DevExpress.XtraBars.BarDockControl();
- barDockControlLeft = new DevExpress.XtraBars.BarDockControl();
- barDockControlRight = new DevExpress.XtraBars.BarDockControl();
- pumpWorkingViewChart1 = new Yw.WinFrmUI.Phart.PumpWorkingViewChart();
- ((ISupportInitialize)barManager1).BeginInit();
- SuspendLayout();
- //
- // barManager1
- //
- barManager1.Bars.AddRange(new DevExpress.XtraBars.Bar[] { bar2 });
- barManager1.DockControls.Add(barDockControlTop);
- barManager1.DockControls.Add(barDockControlBottom);
- barManager1.DockControls.Add(barDockControlLeft);
- barManager1.DockControls.Add(barDockControlRight);
- barManager1.Form = this;
- barManager1.MainMenu = bar2;
- //
- // bar2
- //
- bar2.BarName = "Main menu";
- bar2.DockCol = 0;
- bar2.DockRow = 0;
- bar2.DockStyle = DevExpress.XtraBars.BarDockStyle.Top;
- bar2.OptionsBar.AllowQuickCustomization = false;
- bar2.OptionsBar.DrawBorder = false;
- bar2.OptionsBar.DrawDragBorder = false;
- bar2.OptionsBar.MultiLine = true;
- bar2.OptionsBar.UseWholeRow = true;
- bar2.Text = "Main menu";
- //
- // barDockControlTop
- //
- barDockControlTop.CausesValidation = false;
- barDockControlTop.Dock = DockStyle.Top;
- barDockControlTop.Location = new Point(0, 0);
- barDockControlTop.Manager = barManager1;
- barDockControlTop.Size = new Size(854, 20);
- //
- // barDockControlBottom
- //
- barDockControlBottom.CausesValidation = false;
- barDockControlBottom.Dock = DockStyle.Bottom;
- barDockControlBottom.Location = new Point(0, 436);
- barDockControlBottom.Manager = barManager1;
- barDockControlBottom.Size = new Size(854, 0);
- //
- // barDockControlLeft
- //
- barDockControlLeft.CausesValidation = false;
- barDockControlLeft.Dock = DockStyle.Left;
- barDockControlLeft.Location = new Point(0, 20);
- barDockControlLeft.Manager = barManager1;
- barDockControlLeft.Size = new Size(0, 416);
- //
- // barDockControlRight
- //
- barDockControlRight.CausesValidation = false;
- barDockControlRight.Dock = DockStyle.Right;
- barDockControlRight.Location = new Point(854, 20);
- barDockControlRight.Manager = barManager1;
- barDockControlRight.Size = new Size(0, 416);
- //
- // pumpWorkingViewChart1
- //
- pumpWorkingViewChart1.Dock = DockStyle.Fill;
- pumpWorkingViewChart1.EquipVisible = true;
- pumpWorkingViewChart1.Location = new Point(0, 20);
- pumpWorkingViewChart1.Margin = new Padding(2, 2, 2, 2);
- pumpWorkingViewChart1.Name = "pumpWorkingViewChart1";
- pumpWorkingViewChart1.QEVisible = true;
- pumpWorkingViewChart1.QPVisble = true;
- pumpWorkingViewChart1.RunPointVisible = true;
- pumpWorkingViewChart1.Size = new Size(854, 416);
- pumpWorkingViewChart1.TabIndex = 4;
- //
- // SimulationSingleWorkingPumpCtrl
- //
- AutoScaleDimensions = new SizeF(7F, 14F);
- AutoScaleMode = AutoScaleMode.Font;
- Controls.Add(pumpWorkingViewChart1);
- Controls.Add(barDockControlLeft);
- Controls.Add(barDockControlRight);
- Controls.Add(barDockControlBottom);
- Controls.Add(barDockControlTop);
- Name = "SimulationSingleWorkingPumpCtrl";
- Size = new Size(854, 436);
- ((ISupportInitialize)barManager1).EndInit();
- ResumeLayout(false);
- PerformLayout();
- }
-
- #endregion
-
- private DevExpress.XtraBars.BarManager barManager1;
- private DevExpress.XtraBars.Bar bar2;
- private DevExpress.XtraBars.BarDockControl barDockControlTop;
- private DevExpress.XtraBars.BarDockControl barDockControlBottom;
- private DevExpress.XtraBars.BarDockControl barDockControlLeft;
- private DevExpress.XtraBars.BarDockControl barDockControlRight;
- private Yw.WinFrmUI.Phart.PumpWorkingViewChart pumpWorkingViewChart1;
- }
-}
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj.user b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj.user
index ca42f0b..931bb0a 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj.user
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj.user
@@ -277,7 +277,7 @@
<Compile Update="03-simulation\11-pump\03-analy\SimulationSingleWorkingPumpAnalyDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="03-simulation\11-pump\04-working\SimulationSingleWorkingPumpCtrl.cs">
+ <Compile Update="03-simulation\11-pump\04-working\SimulationPumpSingleWorkingChartCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Update="03-simulation\12-report\test.cs">
--
Gitblit v1.9.3