From 70ea76c4f89c9ee0e10139238767adc68eac8766 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=BF=E4=B8=9C=E4=BA=9A?= Date: Thu, 19 Dec 2024 19:53:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Droi=E5=92=8C=E5=9C=86?= =?UTF-8?q?=E5=BD=A2=E5=A4=8D=E5=88=B6=E7=B2=98=E8=B4=B4=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98=20=20=20=E5=87=8F=E5=B0=91?= =?UTF-8?q?=E9=87=8D=E5=A4=8D=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/PBAnaly/MainForm.cs | 3 + src/PBAnaly/Module/BioanalysisMannage.cs | 224 ++++++++---------- .../UI/BioanayImagePaletteForm.Designer.cs | 82 +++---- 3 files changed, 146 insertions(+), 163 deletions(-) diff --git a/src/PBAnaly/MainForm.cs b/src/PBAnaly/MainForm.cs index e278cee..0035da5 100644 --- a/src/PBAnaly/MainForm.cs +++ b/src/PBAnaly/MainForm.cs @@ -557,7 +557,10 @@ namespace PBAnaly int index = 0; foreach (var bname in bioanalyName) { + var item = bioanalysisMannages[bname]; + item.rectangles.Clear(); + item.CircleAndInfoList.Clear(); item.Arrangement = 1; if (index == bioanalysisMannages.Count - 1) { diff --git a/src/PBAnaly/Module/BioanalysisMannage.cs b/src/PBAnaly/Module/BioanalysisMannage.cs index feecc76..241d36a 100644 --- a/src/PBAnaly/Module/BioanalysisMannage.cs +++ b/src/PBAnaly/Module/BioanalysisMannage.cs @@ -49,7 +49,7 @@ namespace PBAnaly.Module public System.Drawing.Rectangle rect; public Pseudo_infoVC pdinfovc; } - private struct CirceAndInfo + public struct CirceAndInfo { public System.Drawing.Point center; public System.Drawing.Point Radius { get; set; } @@ -137,7 +137,7 @@ namespace PBAnaly.Module private bool isTextBoxRecDragging = false; private bool iswandON = false; private bool curIsCopy = false; // 是否需要拷贝 - private List rectangles = new List(); // 存储所有绘制完成的矩形 + public List rectangles = new List(); // 存储所有绘制完成的矩形 private RectAttribute oldCopyRect; //当前需要赋值的矩形 private System.Drawing.Rectangle? currentRectangle = null; // 当前正在绘制的矩形 private System.Drawing.Point leftTopPoint; // 矩形左上角的起始点 @@ -149,7 +149,7 @@ namespace PBAnaly.Module private bool drawCircle = false;//是否绘制圆 private bool isCirDragging = false; - private List CircleAndInfoList = new List(); + public List CircleAndInfoList = new List(); private CirceAndInfo oldCopyCircle; private System.Drawing.Point cirDragStart; private System.Drawing.Point circleCenter; @@ -860,6 +860,73 @@ namespace PBAnaly.Module return result; } + + + private unsafe CirceAndInfo UpdateCireInfo(float _max,float _min, CirceAndInfo rab,int radius,int _cirDragStartIndex=-1) + { + Pseudo_infoVC curpdinfovc = null; + unsafe + { + fixed (byte* pseu_16_byte_src = image_org_byte) + { + curpdinfovc = pbpvc.get_pseudo_info_circle_vc(pseu_16_byte_src, 16, + (ushort)image_org_L16.Width, (ushort)image_org_L16.Height, _max, _min, rab.center.X, rab.center.Y, radius); + + } + } + if (curpdinfovc != null) + rab.pdinfovc = curpdinfovc; + + if (CircleAndInfoList.Count > 0 && _cirDragStartIndex < CircleAndInfoList.Count && _cirDragStartIndex != -1) + { + + CircleAndInfoList[_cirDragStartIndex] = rab; + } + + + cirDragStartIndex = -1; + + drawCircle = false; + isCirDragging = false; + if (!isContinuous) + CircleOn = false; + imagePanel.image_pl.Invalidate(); + + return rab; + } + + + public unsafe RectAttribute UpdateRectInfo(float _max, float _min, RectAttribute rab, int _cirDragStartIndex = -1) + { + Pseudo_infoVC curpdinfovc = null; + unsafe + { + fixed (byte* pseu_16_byte_src = image_org_byte) + { + curpdinfovc = pbpvc.get_pseudo_info_rect_vc(pseu_16_byte_src, 16, (ushort)image_org_L16.Width, (ushort)image_org_L16.Height, + _max, _min, currentRectangle.Value.X, currentRectangle.Value.Y, currentRectangle.Value.Width, currentRectangle.Value.Height); + + } + } + if (curpdinfovc != null) + rab.pdinfovc = curpdinfovc; + + if (rectangles.Count > 0 && _cirDragStartIndex < rectangles.Count && _cirDragStartIndex != -1) + { + + rectangles[_cirDragStartIndex] = rab; + } + + + isRecDragging = false; + rectActiveCorner = Corner.None; + rectDragStartIndex = -1; + imagePanel.image_pl.Invalidate(); + currentRectangle = null; + drawRect = false; + imagePanel.image_pl.Invalidate(); + return rab; + } #endregion @@ -1521,44 +1588,24 @@ namespace PBAnaly.Module { foreach (var item in bioanalysisMannages) { - unsafe - { - fixed (byte* pseu_16_byte_src = item.Value.image_org_byte) - { - curpdinfovc = item.Value.pbpvc.get_pseudo_info_rect_vc(pseu_16_byte_src, 16, (ushort)image_org_L16.Width, (ushort)image_org_L16.Height, - _max, _min, currentRectangle.Value.X, currentRectangle.Value.Y, currentRectangle.Value.Width, currentRectangle.Value.Height); - - } - } - if (curpdinfovc != null) - rab.pdinfovc = curpdinfovc; + item.Value.currentRectangle = currentRectangle; + rab = item.Value.UpdateRectInfo(_max, _min, rab); item.Value.rectangles.Add(rab); - item.Value.currentRectangle = null; - item.Value.drawRect = false; - item.Value.imagePanel.image_pl.Invalidate(); + } } else { - unsafe - { - fixed (byte* pseu_16_byte_src = image_org_byte) - { - curpdinfovc = pbpvc.get_pseudo_info_rect_vc(pseu_16_byte_src, 16, (ushort)image_org_L16.Width, (ushort)image_org_L16.Height, - _max, _min, currentRectangle.Value.X, currentRectangle.Value.Y, currentRectangle.Value.Width, currentRectangle.Value.Height); + rab = UpdateRectInfo(_max,_min,rab); + - } - } - if (curpdinfovc != null) - rab.pdinfovc = curpdinfovc; rectangles.Add(rab); - currentRectangle = null; - drawRect = false; + } imagePaletteForm.SetInfo = "w:" + rab.rect.Width.ToString() + "h:" + rab.rect.Height.ToString(); - imagePanel.image_pl.Invalidate(); + } drawRect = false; @@ -1587,42 +1634,14 @@ namespace PBAnaly.Module { foreach (var item in bioanalysisMannages) { - - unsafe - { - fixed (byte* pseu_16_byte_src = item.Value.image_org_byte) - { - curpdinfovc = pbpvc.get_pseudo_info_circle_vc(pseu_16_byte_src, 16, - (ushort)image_org_L16.Width, (ushort)image_org_L16.Height, _max, _min, rab.center.X, rab.center.Y, radius); - - } - } - if (curpdinfovc != null) - rab.pdinfovc = curpdinfovc; + rab = item.Value.UpdateCireInfo(_max, _min, rab, radius, cirDragStartIndex); item.Value.CircleAndInfoList.Add(rab); - item.Value.drawCircle = false; - if (!item.Value.isContinuous) - item.Value.CircleOn = false; - item.Value.imagePanel.image_pl.Invalidate(); } } else { - unsafe - { - fixed (byte* pseu_16_byte_src = image_org_byte) - { - curpdinfovc = pbpvc.get_pseudo_info_circle_vc(pseu_16_byte_src, 16, - (ushort)image_org_L16.Width, (ushort)image_org_L16.Height, _max, _min, rab.center.X, rab.center.Y, radius); - - } - } - if (curpdinfovc != null) - rab.pdinfovc = curpdinfovc; + rab = UpdateCireInfo(_max, _min, rab, radius, cirDragStartIndex); CircleAndInfoList.Add(rab); - drawCircle = false; - if (!isContinuous) - CircleOn = false; } @@ -1677,6 +1696,7 @@ namespace PBAnaly.Module { RectAttribute rattb = new RectAttribute(); rattb.rect = recDragRect; + currentRectangle = recDragRect; // 计算光子数并展示出来 float _max = algAttribute.colorValue; float _min = algAttribute.colorMinValue; @@ -1687,47 +1707,22 @@ namespace PBAnaly.Module { foreach (var item in bioanalysisMannages) { - unsafe - { - fixed (byte* pseu_16_byte_src = item.Value.image_org_byte) - { - curpdinfovc = item.Value.pbpvc.get_pseudo_info_rect_vc(pseu_16_byte_src, 16, (ushort)image_org_L16.Width, (ushort)image_org_L16.Height, - _max, _min, recDragRect.X, recDragRect.Y, recDragRect.Width, recDragRect.Height); - - } - } - if (curpdinfovc != null) - rattb.pdinfovc = curpdinfovc; - item.Value.rectangles[rectDragStartIndex] = rattb; - item.Value.isRecDragging = false; - item.Value.rectActiveCorner = Corner.None; - item.Value.rectDragStartIndex = -1; - item.Value.imagePanel.image_pl.Invalidate(); + item.Value.currentRectangle = currentRectangle; + rattb = item.Value.UpdateRectInfo(_max, _min, rattb, rectDragStartIndex); + + } } else { - unsafe - { - fixed (byte* pseu_16_byte_src = image_org_byte) - { - curpdinfovc = pbpvc.get_pseudo_info_rect_vc(pseu_16_byte_src, 16, (ushort)image_org_L16.Width, (ushort)image_org_L16.Height, - _max, _min, recDragRect.X, recDragRect.Y, recDragRect.Width, recDragRect.Height); - - } - } - if (curpdinfovc != null) - rattb.pdinfovc = curpdinfovc; - rectangles[rectDragStartIndex] = rattb; - isRecDragging = false; - rectActiveCorner = Corner.None; - rectDragStartIndex = -1; + rattb = UpdateRectInfo(_max, _min, rattb, rectDragStartIndex); + } imagePaletteForm.SetInfo = "w:" + recDragRect.Width.ToString() + "h:" + recDragRect.Height.ToString(); - imagePanel.image_pl.Invalidate(); + } else if (isCirDragging) @@ -1747,40 +1742,14 @@ namespace PBAnaly.Module { foreach (var item in bioanalysisMannages) { - Pseudo_infoVC curpdinfovc = null; - unsafe - { - fixed (byte* pseu_16_byte_src = item.Value.image_org_byte) - { - curpdinfovc = item.Value.pbpvc.get_pseudo_info_circle_vc(pseu_16_byte_src, 16, - (ushort)image_org_L16.Width, (ushort)image_org_L16.Height, _max, _min, circeAndInfo.center.X, circeAndInfo.center.Y, radius); - - } - } - circeAndInfo.pdinfovc = curpdinfovc; - item.Value.CircleAndInfoList[cirDragStartIndex] = circeAndInfo; - item.Value.isCirDragging = false; - item.Value.cirDragStartIndex = -1; - item.Value.imagePanel.image_pl.Invalidate(); + item.Value.UpdateCireInfo(_max, _min, circeAndInfo, radius, cirDragStartIndex); + } } else { - Pseudo_infoVC curpdinfovc = null; - unsafe - { - fixed (byte* pseu_16_byte_src = image_org_byte) - { - curpdinfovc = pbpvc.get_pseudo_info_circle_vc(pseu_16_byte_src, 16, - (ushort)image_org_L16.Width, (ushort)image_org_L16.Height, _max, _min, circeAndInfo.center.X, circeAndInfo.center.Y, radius); - - } - } - circeAndInfo.pdinfovc = curpdinfovc; - CircleAndInfoList[cirDragStartIndex] = circeAndInfo; - - isCirDragging = false; - cirDragStartIndex = -1; + UpdateCireInfo(_max, _min, circeAndInfo, radius, cirDragStartIndex); + imagePanel.image_pl.Invalidate(); } @@ -2350,15 +2319,21 @@ namespace PBAnaly.Module case ShapeForm.Rect: System.Drawing.Rectangle rectangle = new System.Drawing.Rectangle(curShapePoint, new System.Drawing.Size(oldCopyRect.rect.Width,oldCopyRect.rect.Height)); oldCopyRect.rect = rectangle; + currentRectangle = rectangle; + float _max = algAttribute.colorValue; + float _min = algAttribute.colorMinValue; if (Arrangement == 2) { foreach (var item in bioanalysisMannages) { + item.Value.currentRectangle = currentRectangle; + oldCopyRect = item.Value.UpdateRectInfo(_max, _min, oldCopyRect, rectDragStartIndex); item.Value.rectangles.Add(oldCopyRect); } } else { + oldCopyRect = UpdateRectInfo(_max, _min, oldCopyRect, rectDragStartIndex); rectangles.Add(oldCopyRect); } @@ -2376,15 +2351,20 @@ namespace PBAnaly.Module point.Y += offsetY; oldCopyCircle.Radius = point; + float _max1 = algAttribute.colorValue; + float _min1 = algAttribute.colorMinValue; + int radius = (int)Math.Sqrt(Math.Pow(oldCopyCircle.center.X - oldCopyCircle.Radius.X, 2) + Math.Pow(oldCopyCircle.center.Y - oldCopyCircle.Radius.Y, 2)); if (Arrangement == 2) { foreach (var item in bioanalysisMannages) { + oldCopyCircle = item.Value.UpdateCireInfo(_max1, _min1, oldCopyCircle, radius); item.Value.CircleAndInfoList.Add(oldCopyCircle); } } else { + oldCopyCircle = UpdateCireInfo(_max1, _min1, oldCopyCircle, radius); CircleAndInfoList.Add(oldCopyCircle); } diff --git a/src/PBAnaly/UI/BioanayImagePaletteForm.Designer.cs b/src/PBAnaly/UI/BioanayImagePaletteForm.Designer.cs index be7e932..e6f3326 100644 --- a/src/PBAnaly/UI/BioanayImagePaletteForm.Designer.cs +++ b/src/PBAnaly/UI/BioanayImagePaletteForm.Designer.cs @@ -116,7 +116,7 @@ this.fb_fixSetting.Font = new System.Drawing.Font("Segoe UI", 10F); this.fb_fixSetting.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(78)))), ((int)(((byte)(90))))); this.fb_fixSetting.Location = new System.Drawing.Point(183, 39); - this.fb_fixSetting.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.fb_fixSetting.Margin = new System.Windows.Forms.Padding(4); this.fb_fixSetting.Name = "fb_fixSetting"; this.fb_fixSetting.OverColor = System.Drawing.Color.FromArgb(((int)(((byte)(242)))), ((int)(((byte)(242)))), ((int)(((byte)(242))))); this.fb_fixSetting.Size = new System.Drawing.Size(79, 39); @@ -129,7 +129,7 @@ this.foxLabel7.Font = new System.Drawing.Font("Segoe UI", 10F, System.Drawing.FontStyle.Bold); this.foxLabel7.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(76)))), ((int)(((byte)(88)))), ((int)(((byte)(100))))); this.foxLabel7.Location = new System.Drawing.Point(160, 6); - this.foxLabel7.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.foxLabel7.Margin = new System.Windows.Forms.Padding(4); this.foxLabel7.Name = "foxLabel7"; this.foxLabel7.Size = new System.Drawing.Size(35, 24); this.foxLabel7.TabIndex = 4; @@ -141,7 +141,7 @@ this.foxLabel5.Font = new System.Drawing.Font("Segoe UI", 10F, System.Drawing.FontStyle.Bold); this.foxLabel5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(76)))), ((int)(((byte)(88)))), ((int)(((byte)(100))))); this.foxLabel5.Location = new System.Drawing.Point(4, 39); - this.foxLabel5.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.foxLabel5.Margin = new System.Windows.Forms.Padding(4); this.foxLabel5.Name = "foxLabel5"; this.foxLabel5.Size = new System.Drawing.Size(35, 24); this.foxLabel5.TabIndex = 2; @@ -155,7 +155,7 @@ this.foxLabel8.Font = new System.Drawing.Font("宋体", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.foxLabel8.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(76)))), ((int)(((byte)(88)))), ((int)(((byte)(100))))); this.foxLabel8.Location = new System.Drawing.Point(4, 246); - this.foxLabel8.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.foxLabel8.Margin = new System.Windows.Forms.Padding(4); this.foxLabel8.Name = "foxLabel8"; this.foxLabel8.Size = new System.Drawing.Size(260, 22); this.foxLabel8.TabIndex = 34; @@ -169,7 +169,7 @@ this.flb_act_mm.Font = new System.Drawing.Font("宋体", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.flb_act_mm.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(76)))), ((int)(((byte)(88)))), ((int)(((byte)(100))))); this.flb_act_mm.Location = new System.Drawing.Point(125, 216); - this.flb_act_mm.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.flb_act_mm.Margin = new System.Windows.Forms.Padding(4); this.flb_act_mm.Name = "flb_act_mm"; this.flb_act_mm.Size = new System.Drawing.Size(218, 22); this.flb_act_mm.TabIndex = 30; @@ -182,7 +182,7 @@ this.foxLabel9.Font = new System.Drawing.Font("宋体", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.foxLabel9.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(76)))), ((int)(((byte)(88)))), ((int)(((byte)(100))))); this.foxLabel9.Location = new System.Drawing.Point(4, 143); - this.foxLabel9.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.foxLabel9.Margin = new System.Windows.Forms.Padding(4); this.foxLabel9.Name = "foxLabel9"; this.foxLabel9.Size = new System.Drawing.Size(59, 37); this.foxLabel9.TabIndex = 18; @@ -195,7 +195,7 @@ this.foxLabel6.Font = new System.Drawing.Font("宋体", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.foxLabel6.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(76)))), ((int)(((byte)(88)))), ((int)(((byte)(100))))); this.foxLabel6.Location = new System.Drawing.Point(4, 98); - this.foxLabel6.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.foxLabel6.Margin = new System.Windows.Forms.Padding(4); this.foxLabel6.Name = "foxLabel6"; this.foxLabel6.Size = new System.Drawing.Size(59, 37); this.foxLabel6.TabIndex = 13; @@ -208,7 +208,7 @@ this.foxLabel2.Font = new System.Drawing.Font("宋体", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.foxLabel2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(76)))), ((int)(((byte)(88)))), ((int)(((byte)(100))))); this.foxLabel2.Location = new System.Drawing.Point(4, 76); - this.foxLabel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.foxLabel2.Margin = new System.Windows.Forms.Padding(4); this.foxLabel2.Name = "foxLabel2"; this.foxLabel2.Size = new System.Drawing.Size(59, 14); this.foxLabel2.TabIndex = 10; @@ -221,7 +221,7 @@ this.foxLabel3.Font = new System.Drawing.Font("宋体", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.foxLabel3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(76)))), ((int)(((byte)(88)))), ((int)(((byte)(100))))); this.foxLabel3.Location = new System.Drawing.Point(4, 40); - this.foxLabel3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.foxLabel3.Margin = new System.Windows.Forms.Padding(4); this.foxLabel3.Name = "foxLabel3"; this.foxLabel3.Size = new System.Drawing.Size(59, 28); this.foxLabel3.TabIndex = 6; @@ -234,7 +234,7 @@ this.foxLabel1.Font = new System.Drawing.Font("宋体", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.foxLabel1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(76)))), ((int)(((byte)(88)))), ((int)(((byte)(100))))); this.foxLabel1.Location = new System.Drawing.Point(4, 4); - this.foxLabel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.foxLabel1.Margin = new System.Windows.Forms.Padding(4); this.foxLabel1.Name = "foxLabel1"; this.foxLabel1.Size = new System.Drawing.Size(59, 28); this.foxLabel1.TabIndex = 1; @@ -246,7 +246,7 @@ this.foxLabel4.Font = new System.Drawing.Font("Segoe UI", 10F, System.Drawing.FontStyle.Bold); this.foxLabel4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(76)))), ((int)(((byte)(88)))), ((int)(((byte)(100))))); this.foxLabel4.Location = new System.Drawing.Point(4, 4); - this.foxLabel4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.foxLabel4.Margin = new System.Windows.Forms.Padding(4); this.foxLabel4.Name = "foxLabel4"; this.foxLabel4.Size = new System.Drawing.Size(35, 24); this.foxLabel4.TabIndex = 0; @@ -284,7 +284,7 @@ this.hpb_wand.Image = global::PBAnaly.Properties.Resources.魔术棒_魔法_魔术_一键; this.hpb_wand.ImageFit = AntdUI.TFit.Contain; this.hpb_wand.Location = new System.Drawing.Point(139, 4); - this.hpb_wand.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.hpb_wand.Margin = new System.Windows.Forms.Padding(4); this.hpb_wand.Name = "hpb_wand"; this.hpb_wand.Size = new System.Drawing.Size(37, 34); this.hpb_wand.TabIndex = 14; @@ -297,7 +297,7 @@ this.hpb_xianduan.Image = global::PBAnaly.Properties.Resources.线段__1_; this.hpb_xianduan.ImageFit = AntdUI.TFit.Contain; this.hpb_xianduan.Location = new System.Drawing.Point(94, 4); - this.hpb_xianduan.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.hpb_xianduan.Margin = new System.Windows.Forms.Padding(4); this.hpb_xianduan.Name = "hpb_xianduan"; this.hpb_xianduan.Size = new System.Drawing.Size(37, 34); this.hpb_xianduan.TabIndex = 13; @@ -310,7 +310,7 @@ this.hpb_circe.Image = global::PBAnaly.Properties.Resources.圆形; this.hpb_circe.ImageFit = AntdUI.TFit.Contain; this.hpb_circe.Location = new System.Drawing.Point(49, 4); - this.hpb_circe.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.hpb_circe.Margin = new System.Windows.Forms.Padding(4); this.hpb_circe.Name = "hpb_circe"; this.hpb_circe.Size = new System.Drawing.Size(37, 34); this.hpb_circe.TabIndex = 0; @@ -323,7 +323,7 @@ this.hpb_rect.Image = global::PBAnaly.Properties.Resources._10矩形; this.hpb_rect.ImageFit = AntdUI.TFit.Contain; this.hpb_rect.Location = new System.Drawing.Point(4, 4); - this.hpb_rect.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.hpb_rect.Margin = new System.Windows.Forms.Padding(4); this.hpb_rect.Name = "hpb_rect"; this.hpb_rect.Size = new System.Drawing.Size(37, 34); this.hpb_rect.TabIndex = 0; @@ -344,7 +344,7 @@ this.panel2.Controls.Add(this.foxLabel4); this.panel2.Dock = System.Windows.Forms.DockStyle.Fill; this.panel2.Location = new System.Drawing.Point(4, 46); - this.panel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.panel2.Margin = new System.Windows.Forms.Padding(4); this.panel2.Name = "panel2"; this.panel2.Size = new System.Drawing.Size(349, 153); this.panel2.TabIndex = 14; @@ -362,7 +362,7 @@ this.dtb_th.ColorF = System.Drawing.Color.Black; this.dtb_th.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128))))); this.dtb_th.Location = new System.Drawing.Point(47, 92); - this.dtb_th.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.dtb_th.Margin = new System.Windows.Forms.Padding(4); this.dtb_th.Name = "dtb_th"; this.dtb_th.Size = new System.Drawing.Size(106, 25); this.dtb_th.TabIndex = 12; @@ -374,7 +374,7 @@ this.foxLabel10.Font = new System.Drawing.Font("Segoe UI", 10F, System.Drawing.FontStyle.Bold); this.foxLabel10.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(76)))), ((int)(((byte)(88)))), ((int)(((byte)(100))))); this.foxLabel10.Location = new System.Drawing.Point(4, 89); - this.foxLabel10.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.foxLabel10.Margin = new System.Windows.Forms.Padding(4); this.foxLabel10.Name = "foxLabel10"; this.foxLabel10.Size = new System.Drawing.Size(35, 24); this.foxLabel10.TabIndex = 11; @@ -392,7 +392,7 @@ this.dtb_r.ColorF = System.Drawing.Color.Black; this.dtb_r.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128))))); this.dtb_r.Location = new System.Drawing.Point(192, 6); - this.dtb_r.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.dtb_r.Margin = new System.Windows.Forms.Padding(4); this.dtb_r.Name = "dtb_r"; this.dtb_r.Size = new System.Drawing.Size(106, 25); this.dtb_r.TabIndex = 10; @@ -410,7 +410,7 @@ this.dtb_h.ColorF = System.Drawing.Color.Black; this.dtb_h.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128))))); this.dtb_h.Location = new System.Drawing.Point(47, 42); - this.dtb_h.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.dtb_h.Margin = new System.Windows.Forms.Padding(4); this.dtb_h.Name = "dtb_h"; this.dtb_h.Size = new System.Drawing.Size(106, 25); this.dtb_h.TabIndex = 9; @@ -428,7 +428,7 @@ this.dtb_w.ColorF = System.Drawing.Color.Black; this.dtb_w.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128))))); this.dtb_w.Location = new System.Drawing.Point(45, 6); - this.dtb_w.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.dtb_w.Margin = new System.Windows.Forms.Padding(4); this.dtb_w.Name = "dtb_w"; this.dtb_w.Size = new System.Drawing.Size(106, 25); this.dtb_w.TabIndex = 8; @@ -440,7 +440,7 @@ this.flb_info.Font = new System.Drawing.Font("Segoe UI", 10F, System.Drawing.FontStyle.Bold); this.flb_info.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(76)))), ((int)(((byte)(88)))), ((int)(((byte)(100))))); this.flb_info.Location = new System.Drawing.Point(1, 126); - this.flb_info.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.flb_info.Margin = new System.Windows.Forms.Padding(4); this.flb_info.Name = "flb_info"; this.flb_info.Size = new System.Drawing.Size(297, 24); this.flb_info.TabIndex = 7; @@ -450,7 +450,7 @@ this.panel3.Controls.Add(this.cb_continuous); this.panel3.Dock = System.Windows.Forms.DockStyle.Fill; this.panel3.Location = new System.Drawing.Point(184, 4); - this.panel3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.panel3.Margin = new System.Windows.Forms.Padding(4); this.panel3.Name = "panel3"; this.panel3.Size = new System.Drawing.Size(169, 34); this.panel3.TabIndex = 56; @@ -462,7 +462,7 @@ this.cb_continuous.Dock = System.Windows.Forms.DockStyle.Fill; this.cb_continuous.Font = new System.Drawing.Font("宋体", 7.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.cb_continuous.Location = new System.Drawing.Point(0, 0); - this.cb_continuous.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.cb_continuous.Margin = new System.Windows.Forms.Padding(4); this.cb_continuous.Name = "cb_continuous"; this.cb_continuous.Size = new System.Drawing.Size(169, 34); this.cb_continuous.TabIndex = 55; @@ -472,7 +472,7 @@ // this.collapseItem2.Controls.Add(this.tableLayoutPanel3); this.collapseItem2.Location = new System.Drawing.Point(-357, -228); - this.collapseItem2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.collapseItem2.Margin = new System.Windows.Forms.Padding(4); this.collapseItem2.Name = "collapseItem2"; this.collapseItem2.Size = new System.Drawing.Size(357, 228); this.collapseItem2.TabIndex = 1; @@ -494,7 +494,7 @@ "Pseudo", "Gray"}); this.cb_colortable.Location = new System.Drawing.Point(4, 276); - this.cb_colortable.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.cb_colortable.Margin = new System.Windows.Forms.Padding(4); this.cb_colortable.Name = "cb_colortable"; this.cb_colortable.Size = new System.Drawing.Size(113, 23); this.cb_colortable.TabIndex = 35; @@ -548,7 +548,7 @@ // this.nud_opacity.Dock = System.Windows.Forms.DockStyle.Fill; this.nud_opacity.Location = new System.Drawing.Point(272, 40); - this.nud_opacity.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.nud_opacity.Margin = new System.Windows.Forms.Padding(4); this.nud_opacity.Name = "nud_opacity"; this.nud_opacity.Size = new System.Drawing.Size(71, 25); this.nud_opacity.TabIndex = 45; @@ -557,7 +557,7 @@ // this.nud_brightness.Dock = System.Windows.Forms.DockStyle.Fill; this.nud_brightness.Location = new System.Drawing.Point(272, 4); - this.nud_brightness.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.nud_brightness.Margin = new System.Windows.Forms.Padding(4); this.nud_brightness.Name = "nud_brightness"; this.nud_brightness.Size = new System.Drawing.Size(71, 25); this.nud_brightness.TabIndex = 44; @@ -643,7 +643,7 @@ this.hpb_line.Dock = System.Windows.Forms.DockStyle.Fill; this.hpb_line.Image = global::PBAnaly.Properties.Resources.线段; this.hpb_line.Location = new System.Drawing.Point(4, 216); - this.hpb_line.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.hpb_line.Margin = new System.Windows.Forms.Padding(4); this.hpb_line.Name = "hpb_line"; this.hpb_line.PixelOffsetType = System.Drawing.Drawing2D.PixelOffsetMode.HighQuality; this.hpb_line.Size = new System.Drawing.Size(59, 22); @@ -704,7 +704,7 @@ // nud_colorMax // this.nud_colorMax.Location = new System.Drawing.Point(4, 4); - this.nud_colorMax.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.nud_colorMax.Margin = new System.Windows.Forms.Padding(4); this.nud_colorMax.Name = "nud_colorMax"; this.nud_colorMax.Size = new System.Drawing.Size(59, 25); this.nud_colorMax.TabIndex = 51; @@ -725,7 +725,7 @@ // nud_colorMin // this.nud_colorMin.Location = new System.Drawing.Point(4, 4); - this.nud_colorMin.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.nud_colorMin.Margin = new System.Windows.Forms.Padding(4); this.nud_colorMin.Name = "nud_colorMin"; this.nud_colorMin.Size = new System.Drawing.Size(59, 25); this.nud_colorMin.TabIndex = 50; @@ -736,7 +736,7 @@ this.tableLayoutPanel2.SetColumnSpan(this.cb_scientific, 4); this.cb_scientific.Dock = System.Windows.Forms.DockStyle.Fill; this.cb_scientific.Location = new System.Drawing.Point(4, 188); - this.cb_scientific.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.cb_scientific.Margin = new System.Windows.Forms.Padding(4); this.cb_scientific.Name = "cb_scientific"; this.cb_scientific.Size = new System.Drawing.Size(260, 20); this.cb_scientific.TabIndex = 54; @@ -747,7 +747,7 @@ this.panel1.Controls.Add(this.tableLayoutPanel2); this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; this.panel1.Location = new System.Drawing.Point(4, 4); - this.panel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.panel1.Margin = new System.Windows.Forms.Padding(4); this.panel1.Name = "panel1"; this.panel1.Size = new System.Drawing.Size(347, 340); this.panel1.TabIndex = 0; @@ -774,7 +774,7 @@ // this.collapseItem1.Controls.Add(this.tableLayoutPanel1); this.collapseItem1.Location = new System.Drawing.Point(-355, -378); - this.collapseItem1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.collapseItem1.Margin = new System.Windows.Forms.Padding(4); this.collapseItem1.Name = "collapseItem1"; this.collapseItem1.Size = new System.Drawing.Size(355, 378); this.collapseItem1.TabIndex = 0; @@ -789,7 +789,7 @@ this.cll_panel.Items.Add(this.collapseItem2); this.cll_panel.Items.Add(this.collapseItem3); this.cll_panel.Location = new System.Drawing.Point(0, 0); - this.cll_panel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.cll_panel.Margin = new System.Windows.Forms.Padding(4); this.cll_panel.Name = "cll_panel"; this.cll_panel.Size = new System.Drawing.Size(405, 619); this.cll_panel.TabIndex = 1; @@ -800,7 +800,7 @@ this.collapseItem3.Controls.Add(this.tableLayoutPanel4); this.collapseItem3.Expand = true; this.collapseItem3.Location = new System.Drawing.Point(24, 171); - this.collapseItem3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.collapseItem3.Margin = new System.Windows.Forms.Padding(4); this.collapseItem3.Name = "collapseItem3"; this.collapseItem3.Size = new System.Drawing.Size(357, 206); this.collapseItem3.TabIndex = 2; @@ -836,7 +836,7 @@ this.panel4.Controls.Add(this.foxLabel15); this.panel4.Dock = System.Windows.Forms.DockStyle.Fill; this.panel4.Location = new System.Drawing.Point(4, 46); - this.panel4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.panel4.Margin = new System.Windows.Forms.Padding(4); this.panel4.Name = "panel4"; this.panel4.Size = new System.Drawing.Size(349, 131); this.panel4.TabIndex = 15; @@ -854,7 +854,7 @@ this.dtb_textbox.ColorF = System.Drawing.Color.Black; this.dtb_textbox.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128))))); this.dtb_textbox.Location = new System.Drawing.Point(68, 4); - this.dtb_textbox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.dtb_textbox.Margin = new System.Windows.Forms.Padding(4); this.dtb_textbox.Name = "dtb_textbox"; this.dtb_textbox.Size = new System.Drawing.Size(106, 25); this.dtb_textbox.TabIndex = 8; @@ -866,7 +866,7 @@ this.foxLabel12.Font = new System.Drawing.Font("Segoe UI", 10F, System.Drawing.FontStyle.Bold); this.foxLabel12.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(76)))), ((int)(((byte)(88)))), ((int)(((byte)(100))))); this.foxLabel12.Location = new System.Drawing.Point(1, 126); - this.foxLabel12.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.foxLabel12.Margin = new System.Windows.Forms.Padding(4); this.foxLabel12.Name = "foxLabel12"; this.foxLabel12.Size = new System.Drawing.Size(297, 24); this.foxLabel12.TabIndex = 7; @@ -877,7 +877,7 @@ this.foxLabel15.Font = new System.Drawing.Font("Segoe UI", 10F, System.Drawing.FontStyle.Bold); this.foxLabel15.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(76)))), ((int)(((byte)(88)))), ((int)(((byte)(100))))); this.foxLabel15.Location = new System.Drawing.Point(4, 4); - this.foxLabel15.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.foxLabel15.Margin = new System.Windows.Forms.Padding(4); this.foxLabel15.Name = "foxLabel15"; this.foxLabel15.Size = new System.Drawing.Size(79, 24); this.foxLabel15.TabIndex = 0; @@ -890,7 +890,7 @@ this.ava_textbox.Image = global::PBAnaly.Properties.Resources.文本; this.ava_textbox.ImageFit = AntdUI.TFit.Contain; this.ava_textbox.Location = new System.Drawing.Point(4, 4); - this.ava_textbox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.ava_textbox.Margin = new System.Windows.Forms.Padding(4); this.ava_textbox.Name = "ava_textbox"; this.ava_textbox.Size = new System.Drawing.Size(37, 34); this.ava_textbox.TabIndex = 0;