From f5a9617695a2509648a273561473874ab8a8373a Mon Sep 17 00:00:00 2001 From: moco Date: Wed, 18 Dec 2024 21:11:40 +0800 Subject: [PATCH 1/2] v0.1.7rc9 --- src/PBAnaly/MainForm.Designer.cs | 12 ++++++------ src/PBAnaly/Module/BioanalysisMannage.cs | 11 +++++++++++ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/src/PBAnaly/MainForm.Designer.cs b/src/PBAnaly/MainForm.Designer.cs index 8c5f79e..fa1076b 100644 --- a/src/PBAnaly/MainForm.Designer.cs +++ b/src/PBAnaly/MainForm.Designer.cs @@ -237,7 +237,7 @@ this.tableLayoutPanel1.Controls.Add(this.pl_right, 2, 1); this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; this.tableLayoutPanel1.Location = new System.Drawing.Point(3, 24); - this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(2); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; this.tableLayoutPanel1.RowCount = 3; this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 55F)); @@ -270,7 +270,7 @@ this.DataProcess_panel.EdgeColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(41)))), ((int)(((byte)(50))))); this.DataProcess_panel.Location = new System.Drawing.Point(3, 3); this.DataProcess_panel.Name = "DataProcess_panel"; - this.DataProcess_panel.Padding = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.DataProcess_panel.Padding = new System.Windows.Forms.Padding(5); this.tl_right_main_view.SetRowSpan(this.DataProcess_panel, 2); this.DataProcess_panel.Size = new System.Drawing.Size(553, 489); this.DataProcess_panel.SmoothingType = System.Drawing.Drawing2D.SmoothingMode.HighQuality; @@ -302,7 +302,7 @@ this.flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; this.flowLayoutPanel1.FlowDirection = System.Windows.Forms.FlowDirection.TopDown; this.flowLayoutPanel1.Location = new System.Drawing.Point(2, 88); - this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(2); this.flowLayoutPanel1.Name = "flowLayoutPanel1"; this.flowLayoutPanel1.Size = new System.Drawing.Size(206, 491); this.flowLayoutPanel1.TabIndex = 18; @@ -642,9 +642,9 @@ this.pl_right.Dock = System.Windows.Forms.DockStyle.Fill; this.pl_right.EdgeColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(41)))), ((int)(((byte)(50))))); this.pl_right.Location = new System.Drawing.Point(771, 57); - this.pl_right.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.pl_right.Margin = new System.Windows.Forms.Padding(2); this.pl_right.Name = "pl_right"; - this.pl_right.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.pl_right.Padding = new System.Windows.Forms.Padding(4); this.tableLayoutPanel1.SetRowSpan(this.pl_right, 2); this.pl_right.Size = new System.Drawing.Size(324, 522); this.pl_right.SmoothingType = System.Drawing.Drawing2D.SmoothingMode.HighQuality; @@ -659,7 +659,7 @@ this.thunderLabel1.Name = "thunderLabel1"; this.thunderLabel1.Size = new System.Drawing.Size(200, 16); this.thunderLabel1.TabIndex = 19; - this.thunderLabel1.Text = "PBAnaly v0.1.7rc8"; + this.thunderLabel1.Text = "PBAnaly v0.1.7rc9"; // // MainForm // diff --git a/src/PBAnaly/Module/BioanalysisMannage.cs b/src/PBAnaly/Module/BioanalysisMannage.cs index 6f190e7..47e3148 100644 --- a/src/PBAnaly/Module/BioanalysisMannage.cs +++ b/src/PBAnaly/Module/BioanalysisMannage.cs @@ -1707,6 +1707,17 @@ namespace PBAnaly.Module } 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; From 25ca36a35348d7d2ac7a6c285cd3a612bb9144a5 Mon Sep 17 00:00:00 2001 From: moco Date: Wed, 18 Dec 2024 21:55:05 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=9C=86=E5=BD=A2?= =?UTF-8?q?=E7=9A=84=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/PBAnaly/MainForm.Designer.cs | 2 +- src/PBAnaly/Module/BioanalysisMannage.cs | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/PBAnaly/MainForm.Designer.cs b/src/PBAnaly/MainForm.Designer.cs index fa1076b..2b0e65a 100644 --- a/src/PBAnaly/MainForm.Designer.cs +++ b/src/PBAnaly/MainForm.Designer.cs @@ -659,7 +659,7 @@ this.thunderLabel1.Name = "thunderLabel1"; this.thunderLabel1.Size = new System.Drawing.Size(200, 16); this.thunderLabel1.TabIndex = 19; - this.thunderLabel1.Text = "PBAnaly v0.1.7rc9"; + this.thunderLabel1.Text = "PBAnaly v0.1.7rc10"; // // MainForm // diff --git a/src/PBAnaly/Module/BioanalysisMannage.cs b/src/PBAnaly/Module/BioanalysisMannage.cs index 47e3148..feecc76 100644 --- a/src/PBAnaly/Module/BioanalysisMannage.cs +++ b/src/PBAnaly/Module/BioanalysisMannage.cs @@ -1776,8 +1776,9 @@ namespace PBAnaly.Module } } - CircleAndInfoList[cirDragStartIndex] = circeAndInfo; circeAndInfo.pdinfovc = curpdinfovc; + CircleAndInfoList[cirDragStartIndex] = circeAndInfo; + isCirDragging = false; cirDragStartIndex = -1; imagePanel.image_pl.Invalidate();