From b0c978129ba55cf81e8470b6c9326745a5dbc7d1 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期四, 19 十二月 2024 15:26:30 +0800
Subject: [PATCH] 曲线修改

---
 WinFrmUI/Yw.WinFrmUI.Phart.Core/01-pump/05-import/02-picture/PumpImportByPictureCtrl.Designer.cs |  179 ++++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 103 insertions(+), 76 deletions(-)

diff --git a/WinFrmUI/Yw.WinFrmUI.Phart.Core/01-pump/05-import/02-picture/PumpImportByPictureCtrl.Designer.cs b/WinFrmUI/Yw.WinFrmUI.Phart.Core/01-pump/05-import/02-picture/PumpImportByPictureCtrl.Designer.cs
index cf688de..4b54036 100644
--- a/WinFrmUI/Yw.WinFrmUI.Phart.Core/01-pump/05-import/02-picture/PumpImportByPictureCtrl.Designer.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Phart.Core/01-pump/05-import/02-picture/PumpImportByPictureCtrl.Designer.cs
@@ -73,12 +73,6 @@
             layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
             layoutControlGroup5 = new DevExpress.XtraLayout.LayoutControlGroup();
             tabbedControlGroup1 = new DevExpress.XtraLayout.TabbedControlGroup();
-            layoutControlGroupQE = new DevExpress.XtraLayout.LayoutControlGroup();
-            layoutControlGroup10 = new DevExpress.XtraLayout.LayoutControlGroup();
-            layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
-            layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
-            layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
-            layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
             layoutControlGroupQH = new DevExpress.XtraLayout.LayoutControlGroup();
             layoutControlGroup3 = new DevExpress.XtraLayout.LayoutControlGroup();
             layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -87,7 +81,15 @@
             layoutControlGroup7 = new DevExpress.XtraLayout.LayoutControlGroup();
             layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
             layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+            layoutControlGroupQE = new DevExpress.XtraLayout.LayoutControlGroup();
+            layoutControlGroup10 = new DevExpress.XtraLayout.LayoutControlGroup();
+            layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+            layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+            layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
+            layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
             layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+            pumpPictureBoxCtrl1 = new PumpPictureBoxCtrl();
+            layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
             ((System.ComponentModel.ISupportInitialize)ribbonControl1).BeginInit();
             ((System.ComponentModel.ISupportInitialize)repimgCmbGetWay).BeginInit();
             ((System.ComponentModel.ISupportInitialize)repImgCmbUnitQ).BeginInit();
@@ -110,12 +112,6 @@
             ((System.ComponentModel.ISupportInitialize)layoutControlItem13).BeginInit();
             ((System.ComponentModel.ISupportInitialize)layoutControlGroup5).BeginInit();
             ((System.ComponentModel.ISupportInitialize)tabbedControlGroup1).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)layoutControlGroupQE).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)layoutControlGroup10).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)layoutControlItem11).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)layoutControlItem12).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)layoutControlGroup1).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)layoutControlItem2).BeginInit();
             ((System.ComponentModel.ISupportInitialize)layoutControlGroupQH).BeginInit();
             ((System.ComponentModel.ISupportInitialize)layoutControlGroup3).BeginInit();
             ((System.ComponentModel.ISupportInitialize)layoutControlItem5).BeginInit();
@@ -124,7 +120,14 @@
             ((System.ComponentModel.ISupportInitialize)layoutControlGroup7).BeginInit();
             ((System.ComponentModel.ISupportInitialize)layoutControlItem9).BeginInit();
             ((System.ComponentModel.ISupportInitialize)layoutControlItem8).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlGroupQE).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlGroup10).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem11).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem12).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlGroup1).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem2).BeginInit();
             ((System.ComponentModel.ISupportInitialize)layoutControlItem1).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem3).BeginInit();
             SuspendLayout();
             // 
             // ribbonControl1
@@ -334,6 +337,7 @@
             // 
             // layoutControl1
             // 
+            layoutControl1.Controls.Add(pumpPictureBoxCtrl1);
             layoutControl1.Controls.Add(txtMinH);
             layoutControl1.Controls.Add(txtMaxH);
             layoutControl1.Controls.Add(txtMinP);
@@ -432,7 +436,7 @@
             // 
             Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
             Root.GroupBordersVisible = false;
-            Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem13, layoutControlGroup5, layoutControlItem1 });
+            Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem13, layoutControlGroup5, layoutControlItem1, layoutControlItem3 });
             Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             Root.Name = "Root";
             columnDefinition1.SizeType = SizeType.Absolute;
@@ -481,61 +485,6 @@
             tabbedControlGroup1.TabPages.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlGroupQH, layoutControlGroupQP, layoutControlGroupQE });
             tabbedControlGroup1.SelectedPageChanged += tabbedControlGroup1_SelectedPageChanged;
             tabbedControlGroup1.SelectedPageChanging += tabbedControlGroup1_SelectedPageChanging;
-            // 
-            // layoutControlGroupQE
-            // 
-            layoutControlGroupQE.GroupBordersVisible = false;
-            layoutControlGroupQE.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlGroup10, layoutControlGroup1 });
-            layoutControlGroupQE.Location = new Point(0, 0);
-            layoutControlGroupQE.Name = "layoutControlGroupQE";
-            layoutControlGroupQE.Size = new Size(298, 895);
-            layoutControlGroupQE.Text = "娴侀噺鏁堢巼";
-            // 
-            // layoutControlGroup10
-            // 
-            layoutControlGroup10.GroupStyle = DevExpress.Utils.GroupStyle.Title;
-            layoutControlGroup10.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem11, layoutControlItem12 });
-            layoutControlGroup10.Location = new Point(0, 0);
-            layoutControlGroup10.Name = "layoutControlGroup10";
-            layoutControlGroup10.OptionsTableLayoutItem.ColumnIndex = 1;
-            layoutControlGroup10.Size = new Size(298, 121);
-            layoutControlGroup10.Text = "鏁堢巼";
-            // 
-            // layoutControlItem11
-            // 
-            layoutControlItem11.Control = txtMinE;
-            layoutControlItem11.Location = new Point(0, 0);
-            layoutControlItem11.Name = "layoutControlItem11";
-            layoutControlItem11.Size = new Size(274, 32);
-            layoutControlItem11.Text = "鏈�灏忓��:";
-            layoutControlItem11.TextSize = new Size(60, 22);
-            // 
-            // layoutControlItem12
-            // 
-            layoutControlItem12.Control = txtMaxE;
-            layoutControlItem12.Location = new Point(0, 32);
-            layoutControlItem12.Name = "layoutControlItem12";
-            layoutControlItem12.Size = new Size(274, 32);
-            layoutControlItem12.Text = "鏈�澶у��:";
-            layoutControlItem12.TextSize = new Size(60, 22);
-            // 
-            // layoutControlGroup1
-            // 
-            layoutControlGroup1.GroupStyle = DevExpress.Utils.GroupStyle.Title;
-            layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem2 });
-            layoutControlGroup1.Location = new Point(0, 121);
-            layoutControlGroup1.Name = "layoutControlGroup1";
-            layoutControlGroup1.Size = new Size(298, 774);
-            layoutControlGroup1.Text = "鎷撳睍";
-            // 
-            // layoutControlItem2
-            // 
-            layoutControlItem2.Control = cekCaputueEtaPtInEqupCurve;
-            layoutControlItem2.Location = new Point(0, 0);
-            layoutControlItem2.Name = "layoutControlItem2";
-            layoutControlItem2.Size = new Size(274, 717);
-            layoutControlItem2.TextSize = new Size(0, 0);
-            layoutControlItem2.TextVisible = false;
             // 
             // layoutControlGroupQH
             // 
@@ -611,6 +560,61 @@
             layoutControlItem8.Text = "鏈�灏忓��:";
             layoutControlItem8.TextSize = new Size(60, 22);
             // 
+            // layoutControlGroupQE
+            // 
+            layoutControlGroupQE.GroupBordersVisible = false;
+            layoutControlGroupQE.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlGroup10, layoutControlGroup1 });
+            layoutControlGroupQE.Location = new Point(0, 0);
+            layoutControlGroupQE.Name = "layoutControlGroupQE";
+            layoutControlGroupQE.Size = new Size(298, 895);
+            layoutControlGroupQE.Text = "娴侀噺鏁堢巼";
+            // 
+            // layoutControlGroup10
+            // 
+            layoutControlGroup10.GroupStyle = DevExpress.Utils.GroupStyle.Title;
+            layoutControlGroup10.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem11, layoutControlItem12 });
+            layoutControlGroup10.Location = new Point(0, 0);
+            layoutControlGroup10.Name = "layoutControlGroup10";
+            layoutControlGroup10.OptionsTableLayoutItem.ColumnIndex = 1;
+            layoutControlGroup10.Size = new Size(298, 121);
+            layoutControlGroup10.Text = "鏁堢巼";
+            // 
+            // layoutControlItem11
+            // 
+            layoutControlItem11.Control = txtMinE;
+            layoutControlItem11.Location = new Point(0, 0);
+            layoutControlItem11.Name = "layoutControlItem11";
+            layoutControlItem11.Size = new Size(274, 32);
+            layoutControlItem11.Text = "鏈�灏忓��:";
+            layoutControlItem11.TextSize = new Size(60, 22);
+            // 
+            // layoutControlItem12
+            // 
+            layoutControlItem12.Control = txtMaxE;
+            layoutControlItem12.Location = new Point(0, 32);
+            layoutControlItem12.Name = "layoutControlItem12";
+            layoutControlItem12.Size = new Size(274, 32);
+            layoutControlItem12.Text = "鏈�澶у��:";
+            layoutControlItem12.TextSize = new Size(60, 22);
+            // 
+            // layoutControlGroup1
+            // 
+            layoutControlGroup1.GroupStyle = DevExpress.Utils.GroupStyle.Title;
+            layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem2 });
+            layoutControlGroup1.Location = new Point(0, 121);
+            layoutControlGroup1.Name = "layoutControlGroup1";
+            layoutControlGroup1.Size = new Size(298, 774);
+            layoutControlGroup1.Text = "鎷撳睍";
+            // 
+            // layoutControlItem2
+            // 
+            layoutControlItem2.Control = cekCaputueEtaPtInEqupCurve;
+            layoutControlItem2.Location = new Point(0, 0);
+            layoutControlItem2.Name = "layoutControlItem2";
+            layoutControlItem2.Size = new Size(274, 717);
+            layoutControlItem2.TextSize = new Size(0, 0);
+            layoutControlItem2.TextVisible = false;
+            // 
             // layoutControlItem1
             // 
             layoutControlItem1.Location = new Point(300, 0);
@@ -620,6 +624,27 @@
             layoutControlItem1.Size = new Size(1098, 966);
             layoutControlItem1.TextSize = new Size(0, 0);
             layoutControlItem1.TextVisible = false;
+            // 
+            // pumpPictureBoxCtrl1
+            // 
+            pumpPictureBoxCtrl1.CurrentCaptureCruve = Ahart.eCurveType.QH;
+            pumpPictureBoxCtrl1.IsPickPoint = false;
+            pumpPictureBoxCtrl1.IsSelBoundary = false;
+            pumpPictureBoxCtrl1.Location = new Point(302, 2);
+            pumpPictureBoxCtrl1.Name = "pumpPictureBoxCtrl1";
+            pumpPictureBoxCtrl1.Size = new Size(1094, 962);
+            pumpPictureBoxCtrl1.TabIndex = 17;
+            pumpPictureBoxCtrl1.UnitQ = Unit.eUnitQ.M3H;
+            // 
+            // layoutControlItem3
+            // 
+            layoutControlItem3.Control = pumpPictureBoxCtrl1;
+            layoutControlItem3.Location = new Point(300, 0);
+            layoutControlItem3.Name = "layoutControlItem3";
+            layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
+            layoutControlItem3.Size = new Size(1098, 966);
+            layoutControlItem3.TextSize = new Size(0, 0);
+            layoutControlItem3.TextVisible = false;
             // 
             // PumpImportByPictureCtrl
             // 
@@ -652,12 +677,6 @@
             ((System.ComponentModel.ISupportInitialize)layoutControlItem13).EndInit();
             ((System.ComponentModel.ISupportInitialize)layoutControlGroup5).EndInit();
             ((System.ComponentModel.ISupportInitialize)tabbedControlGroup1).EndInit();
-            ((System.ComponentModel.ISupportInitialize)layoutControlGroupQE).EndInit();
-            ((System.ComponentModel.ISupportInitialize)layoutControlGroup10).EndInit();
-            ((System.ComponentModel.ISupportInitialize)layoutControlItem11).EndInit();
-            ((System.ComponentModel.ISupportInitialize)layoutControlItem12).EndInit();
-            ((System.ComponentModel.ISupportInitialize)layoutControlGroup1).EndInit();
-            ((System.ComponentModel.ISupportInitialize)layoutControlItem2).EndInit();
             ((System.ComponentModel.ISupportInitialize)layoutControlGroupQH).EndInit();
             ((System.ComponentModel.ISupportInitialize)layoutControlGroup3).EndInit();
             ((System.ComponentModel.ISupportInitialize)layoutControlItem5).EndInit();
@@ -666,7 +685,14 @@
             ((System.ComponentModel.ISupportInitialize)layoutControlGroup7).EndInit();
             ((System.ComponentModel.ISupportInitialize)layoutControlItem9).EndInit();
             ((System.ComponentModel.ISupportInitialize)layoutControlItem8).EndInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlGroupQE).EndInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlGroup10).EndInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem11).EndInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem12).EndInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlGroup1).EndInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem2).EndInit();
             ((System.ComponentModel.ISupportInitialize)layoutControlItem1).EndInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem3).EndInit();
             ResumeLayout(false);
             PerformLayout();
         }
@@ -723,8 +749,9 @@
         private DevExpress.XtraBars.BarEditItem barEditImgCmbSourceFrom;
         private DevExpress.XtraEditors.Repository.RepositoryItemImageComboBox repimgCmbSourceFrom;
         private DevExpress.XtraEditors.Repository.RepositoryItemTextEdit repositoryItemTextEdit1;
-        private DevExpress.XtraBars.BarStaticItem barStaticItem1;
-        private PumpPictureBoxCtrl curvePictureBoxCtrl1;
+        private DevExpress.XtraBars.BarStaticItem barStaticItem1; 
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
+        private PumpPictureBoxCtrl pumpPictureBoxCtrl1;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
     }
 }

--
Gitblit v1.9.3