diff --git a/src/PBAnaly/MainForm.Designer.cs b/src/PBAnaly/MainForm.Designer.cs index df661f2..3c80e40 100644 --- a/src/PBAnaly/MainForm.Designer.cs +++ b/src/PBAnaly/MainForm.Designer.cs @@ -81,17 +81,17 @@ this.metroPanel_RightTop.Dock = System.Windows.Forms.DockStyle.Fill; this.metroPanel_RightTop.HorizontalScrollbarBarColor = true; this.metroPanel_RightTop.HorizontalScrollbarHighlightOnWheel = false; - this.metroPanel_RightTop.HorizontalScrollbarSize = 7; - this.metroPanel_RightTop.Location = new System.Drawing.Point(210, 0); + this.metroPanel_RightTop.HorizontalScrollbarSize = 9; + this.metroPanel_RightTop.Location = new System.Drawing.Point(280, 0); this.metroPanel_RightTop.Margin = new System.Windows.Forms.Padding(0); this.metroPanel_RightTop.Name = "metroPanel_RightTop"; - this.metroPanel_RightTop.Size = new System.Drawing.Size(559, 55); + this.metroPanel_RightTop.Size = new System.Drawing.Size(746, 69); this.metroPanel_RightTop.TabIndex = 12; this.metroPanel_RightTop.Theme = MetroFramework.MetroThemeStyle.Dark; this.metroPanel_RightTop.UseCustomBackColor = true; this.metroPanel_RightTop.VerticalScrollbarBarColor = true; this.metroPanel_RightTop.VerticalScrollbarHighlightOnWheel = false; - this.metroPanel_RightTop.VerticalScrollbarSize = 7; + this.metroPanel_RightTop.VerticalScrollbarSize = 9; // // materialButton_log // @@ -102,11 +102,11 @@ this.materialButton_log.HighEmphasis = true; this.materialButton_log.Icon = ((System.Drawing.Image)(resources.GetObject("materialButton_log.Icon"))); this.materialButton_log.Location = new System.Drawing.Point(581, 0); - this.materialButton_log.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.materialButton_log.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.materialButton_log.MouseState = MaterialSkin.MouseState.HOVER; this.materialButton_log.Name = "materialButton_log"; this.materialButton_log.NoAccentTextColor = System.Drawing.Color.Empty; - this.materialButton_log.Size = new System.Drawing.Size(113, 55); + this.materialButton_log.Size = new System.Drawing.Size(113, 69); this.materialButton_log.TabIndex = 19; this.materialButton_log.Text = "操作日志"; this.materialButton_log.Type = MaterialSkin.Controls.MaterialButton.MaterialButtonType.Contained; @@ -123,11 +123,11 @@ this.materialButton_setting.HighEmphasis = true; this.materialButton_setting.Icon = ((System.Drawing.Image)(resources.GetObject("materialButton_setting.Icon"))); this.materialButton_setting.Location = new System.Drawing.Point(468, 0); - this.materialButton_setting.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.materialButton_setting.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.materialButton_setting.MouseState = MaterialSkin.MouseState.HOVER; this.materialButton_setting.Name = "materialButton_setting"; this.materialButton_setting.NoAccentTextColor = System.Drawing.Color.Empty; - this.materialButton_setting.Size = new System.Drawing.Size(113, 55); + this.materialButton_setting.Size = new System.Drawing.Size(113, 69); this.materialButton_setting.TabIndex = 18; this.materialButton_setting.Text = "系统设置"; this.materialButton_setting.Type = MaterialSkin.Controls.MaterialButton.MaterialButtonType.Contained; @@ -145,11 +145,11 @@ this.materialButton_curveimage.HighEmphasis = true; this.materialButton_curveimage.Icon = ((System.Drawing.Image)(resources.GetObject("materialButton_curveimage.Icon"))); this.materialButton_curveimage.Location = new System.Drawing.Point(339, 0); - this.materialButton_curveimage.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.materialButton_curveimage.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.materialButton_curveimage.MouseState = MaterialSkin.MouseState.HOVER; this.materialButton_curveimage.Name = "materialButton_curveimage"; this.materialButton_curveimage.NoAccentTextColor = System.Drawing.Color.Empty; - this.materialButton_curveimage.Size = new System.Drawing.Size(129, 55); + this.materialButton_curveimage.Size = new System.Drawing.Size(129, 69); this.materialButton_curveimage.TabIndex = 17; this.materialButton_curveimage.Text = "泳道波形图"; this.materialButton_curveimage.Type = MaterialSkin.Controls.MaterialButton.MaterialButtonType.Contained; @@ -167,11 +167,11 @@ this.materialButton_analyzedata.HighEmphasis = true; this.materialButton_analyzedata.Icon = ((System.Drawing.Image)(resources.GetObject("materialButton_analyzedata.Icon"))); this.materialButton_analyzedata.Location = new System.Drawing.Point(226, 0); - this.materialButton_analyzedata.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.materialButton_analyzedata.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.materialButton_analyzedata.MouseState = MaterialSkin.MouseState.HOVER; this.materialButton_analyzedata.Name = "materialButton_analyzedata"; this.materialButton_analyzedata.NoAccentTextColor = System.Drawing.Color.Empty; - this.materialButton_analyzedata.Size = new System.Drawing.Size(113, 55); + this.materialButton_analyzedata.Size = new System.Drawing.Size(113, 69); this.materialButton_analyzedata.TabIndex = 16; this.materialButton_analyzedata.Text = "分析数据"; this.materialButton_analyzedata.Type = MaterialSkin.Controls.MaterialButton.MaterialButtonType.Contained; @@ -189,11 +189,11 @@ this.materialButton_outimage.HighEmphasis = true; this.materialButton_outimage.Icon = ((System.Drawing.Image)(resources.GetObject("materialButton_outimage.Icon"))); this.materialButton_outimage.Location = new System.Drawing.Point(113, 0); - this.materialButton_outimage.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.materialButton_outimage.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.materialButton_outimage.MouseState = MaterialSkin.MouseState.HOVER; this.materialButton_outimage.Name = "materialButton_outimage"; this.materialButton_outimage.NoAccentTextColor = System.Drawing.Color.Empty; - this.materialButton_outimage.Size = new System.Drawing.Size(113, 55); + this.materialButton_outimage.Size = new System.Drawing.Size(113, 69); this.materialButton_outimage.TabIndex = 15; this.materialButton_outimage.Text = "导出图像"; this.materialButton_outimage.Type = MaterialSkin.Controls.MaterialButton.MaterialButtonType.Contained; @@ -211,11 +211,11 @@ this.materialButton_LoadData.HighEmphasis = true; this.materialButton_LoadData.Icon = ((System.Drawing.Image)(resources.GetObject("materialButton_LoadData.Icon"))); this.materialButton_LoadData.Location = new System.Drawing.Point(0, 0); - this.materialButton_LoadData.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.materialButton_LoadData.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.materialButton_LoadData.MouseState = MaterialSkin.MouseState.HOVER; this.materialButton_LoadData.Name = "materialButton_LoadData"; this.materialButton_LoadData.NoAccentTextColor = System.Drawing.Color.Empty; - this.materialButton_LoadData.Size = new System.Drawing.Size(113, 55); + this.materialButton_LoadData.Size = new System.Drawing.Size(113, 69); this.materialButton_LoadData.TabIndex = 14; this.materialButton_LoadData.Text = "加载数据"; this.materialButton_LoadData.Type = MaterialSkin.Controls.MaterialButton.MaterialButtonType.Contained; @@ -226,9 +226,9 @@ // tableLayoutPanel1 // this.tableLayoutPanel1.ColumnCount = 3; - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 210F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 280F)); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 328F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 437F)); this.tableLayoutPanel1.Controls.Add(this.tl_right_main_view, 1, 2); this.tableLayoutPanel1.Controls.Add(this.metroPanel_RightTop, 1, 0); this.tableLayoutPanel1.Controls.Add(this.CompanyIcon_pictureBox, 0, 0); @@ -236,30 +236,30 @@ this.tableLayoutPanel1.Controls.Add(this.flowLayoutPanel2, 1, 1); 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.Location = new System.Drawing.Point(4, 30); + this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; this.tableLayoutPanel1.RowCount = 3; - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 55F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 31F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 69F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 39F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(1097, 581); + this.tableLayoutPanel1.Size = new System.Drawing.Size(1463, 726); this.tableLayoutPanel1.TabIndex = 18; // // tl_right_main_view // this.tl_right_main_view.ColumnCount = 2; this.tl_right_main_view.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tl_right_main_view.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 324F)); + this.tl_right_main_view.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 432F)); this.tl_right_main_view.Controls.Add(this.DataProcess_panel, 0, 0); this.tl_right_main_view.Dock = System.Windows.Forms.DockStyle.Fill; - this.tl_right_main_view.Location = new System.Drawing.Point(210, 86); + this.tl_right_main_view.Location = new System.Drawing.Point(280, 108); this.tl_right_main_view.Margin = new System.Windows.Forms.Padding(0); this.tl_right_main_view.Name = "tl_right_main_view"; this.tl_right_main_view.RowCount = 2; this.tl_right_main_view.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); this.tl_right_main_view.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tl_right_main_view.Size = new System.Drawing.Size(559, 495); + this.tl_right_main_view.Size = new System.Drawing.Size(746, 618); this.tl_right_main_view.TabIndex = 0; // // DataProcess_panel @@ -268,11 +268,12 @@ this.tl_right_main_view.SetColumnSpan(this.DataProcess_panel, 2); this.DataProcess_panel.Dock = System.Windows.Forms.DockStyle.Fill; 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.Location = new System.Drawing.Point(4, 4); + this.DataProcess_panel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); 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(7, 6, 7, 6); this.tl_right_main_view.SetRowSpan(this.DataProcess_panel, 2); - this.DataProcess_panel.Size = new System.Drawing.Size(553, 489); + this.DataProcess_panel.Size = new System.Drawing.Size(738, 610); this.DataProcess_panel.SmoothingType = System.Drawing.Drawing2D.SmoothingMode.HighQuality; this.DataProcess_panel.TabIndex = 19; this.DataProcess_panel.Text = "panel1"; @@ -283,10 +284,11 @@ this.CompanyIcon_pictureBox.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.CompanyIcon_pictureBox.Dock = System.Windows.Forms.DockStyle.Fill; this.CompanyIcon_pictureBox.Image = global::PBAnaly.Properties.Resources.京仪科技定稿_画板_1_副本2; - this.CompanyIcon_pictureBox.Location = new System.Drawing.Point(3, 3); + this.CompanyIcon_pictureBox.Location = new System.Drawing.Point(4, 4); + this.CompanyIcon_pictureBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.CompanyIcon_pictureBox.Name = "CompanyIcon_pictureBox"; this.tableLayoutPanel1.SetRowSpan(this.CompanyIcon_pictureBox, 2); - this.CompanyIcon_pictureBox.Size = new System.Drawing.Size(204, 80); + this.CompanyIcon_pictureBox.Size = new System.Drawing.Size(272, 100); this.CompanyIcon_pictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; this.CompanyIcon_pictureBox.TabIndex = 16; this.CompanyIcon_pictureBox.TabStop = false; @@ -301,10 +303,10 @@ this.flowLayoutPanel1.Controls.Add(this.materialButton_correction); 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.Location = new System.Drawing.Point(3, 110); + this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.flowLayoutPanel1.Name = "flowLayoutPanel1"; - this.flowLayoutPanel1.Size = new System.Drawing.Size(206, 491); + this.flowLayoutPanel1.Size = new System.Drawing.Size(274, 614); this.flowLayoutPanel1.TabIndex = 18; // // materialButton_imageProcess @@ -317,12 +319,12 @@ this.materialButton_imageProcess.Font = new System.Drawing.Font("宋体", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.materialButton_imageProcess.HighEmphasis = true; this.materialButton_imageProcess.Icon = ((System.Drawing.Image)(resources.GetObject("materialButton_imageProcess.Icon"))); - this.materialButton_imageProcess.Location = new System.Drawing.Point(4, 6); - this.materialButton_imageProcess.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6); + this.materialButton_imageProcess.Location = new System.Drawing.Point(5, 8); + this.materialButton_imageProcess.Margin = new System.Windows.Forms.Padding(5, 8, 5, 8); this.materialButton_imageProcess.MouseState = MaterialSkin.MouseState.HOVER; this.materialButton_imageProcess.Name = "materialButton_imageProcess"; this.materialButton_imageProcess.NoAccentTextColor = System.Drawing.Color.Empty; - this.materialButton_imageProcess.Size = new System.Drawing.Size(200, 48); + this.materialButton_imageProcess.Size = new System.Drawing.Size(267, 60); this.materialButton_imageProcess.TabIndex = 4; this.materialButton_imageProcess.Text = "图像处理"; this.materialButton_imageProcess.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -339,12 +341,12 @@ this.materialButton_acidAnalyze.Depth = 0; this.materialButton_acidAnalyze.HighEmphasis = true; this.materialButton_acidAnalyze.Icon = ((System.Drawing.Image)(resources.GetObject("materialButton_acidAnalyze.Icon"))); - this.materialButton_acidAnalyze.Location = new System.Drawing.Point(4, 66); - this.materialButton_acidAnalyze.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6); + this.materialButton_acidAnalyze.Location = new System.Drawing.Point(5, 84); + this.materialButton_acidAnalyze.Margin = new System.Windows.Forms.Padding(5, 8, 5, 8); this.materialButton_acidAnalyze.MouseState = MaterialSkin.MouseState.HOVER; this.materialButton_acidAnalyze.Name = "materialButton_acidAnalyze"; this.materialButton_acidAnalyze.NoAccentTextColor = System.Drawing.Color.Empty; - this.materialButton_acidAnalyze.Size = new System.Drawing.Size(200, 48); + this.materialButton_acidAnalyze.Size = new System.Drawing.Size(267, 60); this.materialButton_acidAnalyze.TabIndex = 5; this.materialButton_acidAnalyze.Text = "泳道分析"; this.materialButton_acidAnalyze.Type = MaterialSkin.Controls.MaterialButton.MaterialButtonType.Contained; @@ -360,12 +362,12 @@ this.materialButton_roiAnalyze.Depth = 0; this.materialButton_roiAnalyze.HighEmphasis = true; this.materialButton_roiAnalyze.Icon = ((System.Drawing.Image)(resources.GetObject("materialButton_roiAnalyze.Icon"))); - this.materialButton_roiAnalyze.Location = new System.Drawing.Point(4, 126); - this.materialButton_roiAnalyze.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6); + this.materialButton_roiAnalyze.Location = new System.Drawing.Point(5, 160); + this.materialButton_roiAnalyze.Margin = new System.Windows.Forms.Padding(5, 8, 5, 8); this.materialButton_roiAnalyze.MouseState = MaterialSkin.MouseState.HOVER; this.materialButton_roiAnalyze.Name = "materialButton_roiAnalyze"; this.materialButton_roiAnalyze.NoAccentTextColor = System.Drawing.Color.Empty; - this.materialButton_roiAnalyze.Size = new System.Drawing.Size(200, 48); + this.materialButton_roiAnalyze.Size = new System.Drawing.Size(267, 60); this.materialButton_roiAnalyze.TabIndex = 6; this.materialButton_roiAnalyze.Text = "ROIs分析"; this.materialButton_roiAnalyze.Type = MaterialSkin.Controls.MaterialButton.MaterialButtonType.Contained; @@ -380,12 +382,12 @@ this.materialButton_miniAnalyze.Depth = 0; this.materialButton_miniAnalyze.HighEmphasis = true; this.materialButton_miniAnalyze.Icon = ((System.Drawing.Image)(resources.GetObject("materialButton_miniAnalyze.Icon"))); - this.materialButton_miniAnalyze.Location = new System.Drawing.Point(4, 186); - this.materialButton_miniAnalyze.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6); + this.materialButton_miniAnalyze.Location = new System.Drawing.Point(5, 236); + this.materialButton_miniAnalyze.Margin = new System.Windows.Forms.Padding(5, 8, 5, 8); this.materialButton_miniAnalyze.MouseState = MaterialSkin.MouseState.HOVER; this.materialButton_miniAnalyze.Name = "materialButton_miniAnalyze"; this.materialButton_miniAnalyze.NoAccentTextColor = System.Drawing.Color.Empty; - this.materialButton_miniAnalyze.Size = new System.Drawing.Size(200, 48); + this.materialButton_miniAnalyze.Size = new System.Drawing.Size(267, 60); this.materialButton_miniAnalyze.TabIndex = 7; this.materialButton_miniAnalyze.Text = "微孔版分析"; this.materialButton_miniAnalyze.Type = MaterialSkin.Controls.MaterialButton.MaterialButtonType.Contained; @@ -400,12 +402,12 @@ this.materialButton_dotcounts.Depth = 0; this.materialButton_dotcounts.HighEmphasis = true; this.materialButton_dotcounts.Icon = ((System.Drawing.Image)(resources.GetObject("materialButton_dotcounts.Icon"))); - this.materialButton_dotcounts.Location = new System.Drawing.Point(4, 246); - this.materialButton_dotcounts.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6); + this.materialButton_dotcounts.Location = new System.Drawing.Point(5, 312); + this.materialButton_dotcounts.Margin = new System.Windows.Forms.Padding(5, 8, 5, 8); this.materialButton_dotcounts.MouseState = MaterialSkin.MouseState.HOVER; this.materialButton_dotcounts.Name = "materialButton_dotcounts"; this.materialButton_dotcounts.NoAccentTextColor = System.Drawing.Color.Empty; - this.materialButton_dotcounts.Size = new System.Drawing.Size(200, 48); + this.materialButton_dotcounts.Size = new System.Drawing.Size(267, 60); this.materialButton_dotcounts.TabIndex = 8; this.materialButton_dotcounts.Text = "菌落计数"; this.materialButton_dotcounts.Type = MaterialSkin.Controls.MaterialButton.MaterialButtonType.Contained; @@ -420,12 +422,12 @@ this.materialButton_correction.Depth = 0; this.materialButton_correction.HighEmphasis = true; this.materialButton_correction.Icon = ((System.Drawing.Image)(resources.GetObject("materialButton_correction.Icon"))); - this.materialButton_correction.Location = new System.Drawing.Point(4, 306); - this.materialButton_correction.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6); + this.materialButton_correction.Location = new System.Drawing.Point(5, 388); + this.materialButton_correction.Margin = new System.Windows.Forms.Padding(5, 8, 5, 8); this.materialButton_correction.MouseState = MaterialSkin.MouseState.HOVER; this.materialButton_correction.Name = "materialButton_correction"; this.materialButton_correction.NoAccentTextColor = System.Drawing.Color.Empty; - this.materialButton_correction.Size = new System.Drawing.Size(200, 48); + this.materialButton_correction.Size = new System.Drawing.Size(267, 60); this.materialButton_correction.TabIndex = 9; this.materialButton_correction.Text = "蛋白归一化"; this.materialButton_correction.Type = MaterialSkin.Controls.MaterialButton.MaterialButtonType.Contained; @@ -445,10 +447,10 @@ this.flowLayoutPanel2.Controls.Add(this.materialButton_forward); this.flowLayoutPanel2.Controls.Add(this.materialButton_return); this.flowLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.flowLayoutPanel2.Location = new System.Drawing.Point(210, 55); + this.flowLayoutPanel2.Location = new System.Drawing.Point(280, 69); this.flowLayoutPanel2.Margin = new System.Windows.Forms.Padding(0); this.flowLayoutPanel2.Name = "flowLayoutPanel2"; - this.flowLayoutPanel2.Size = new System.Drawing.Size(559, 31); + this.flowLayoutPanel2.Size = new System.Drawing.Size(746, 39); this.flowLayoutPanel2.TabIndex = 19; // // materialButton_changeFormSize @@ -623,7 +625,7 @@ this.materialButton_return.Depth = 0; this.materialButton_return.HighEmphasis = true; this.materialButton_return.Icon = ((System.Drawing.Image)(resources.GetObject("materialButton_return.Icon"))); - this.materialButton_return.Location = new System.Drawing.Point(0, 36); + this.materialButton_return.Location = new System.Drawing.Point(512, 0); this.materialButton_return.Margin = new System.Windows.Forms.Padding(0); this.materialButton_return.MouseState = MaterialSkin.MouseState.HOVER; this.materialButton_return.Name = "materialButton_return"; @@ -641,12 +643,12 @@ this.pl_right.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(39)))), ((int)(((byte)(51)))), ((int)(((byte)(63))))); 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.Location = new System.Drawing.Point(1029, 71); + this.pl_right.Margin = new System.Windows.Forms.Padding(3, 2, 3, 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(5, 5, 5, 5); this.tableLayoutPanel1.SetRowSpan(this.pl_right, 2); - this.pl_right.Size = new System.Drawing.Size(324, 522); + this.pl_right.Size = new System.Drawing.Size(431, 653); this.pl_right.SmoothingType = System.Drawing.Drawing2D.SmoothingMode.HighQuality; this.pl_right.TabIndex = 20; this.pl_right.Text = "panel1"; @@ -655,26 +657,28 @@ // this.thunderLabel1.BackColor = System.Drawing.Color.Transparent; this.thunderLabel1.ForeColor = System.Drawing.Color.WhiteSmoke; - this.thunderLabel1.Location = new System.Drawing.Point(9, 5); + this.thunderLabel1.Location = new System.Drawing.Point(12, 6); + this.thunderLabel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.thunderLabel1.Name = "thunderLabel1"; - this.thunderLabel1.Size = new System.Drawing.Size(200, 16); + this.thunderLabel1.Size = new System.Drawing.Size(267, 20); this.thunderLabel1.TabIndex = 19; - this.thunderLabel1.Text = "PBAnaly v0.1.7rc6"; + this.thunderLabel1.Text = "PBAnaly v0.1.7rc7"; // // MainForm // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; this.AutoValidate = System.Windows.Forms.AutoValidate.EnablePreventFocusChange; - this.ClientSize = new System.Drawing.Size(1103, 608); + this.ClientSize = new System.Drawing.Size(1471, 760); this.Controls.Add(this.thunderLabel1); this.Controls.Add(this.tableLayoutPanel1); this.DrawerAutoShow = true; this.FormStyle = MaterialSkin.Controls.MaterialForm.FormStyles.ActionBar_None; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.Name = "MainForm"; - this.Padding = new System.Windows.Forms.Padding(3, 24, 3, 3); + this.Padding = new System.Windows.Forms.Padding(4, 30, 4, 4); this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "MainForm"; this.WindowState = System.Windows.Forms.FormWindowState.Maximized; diff --git a/src/PBAnaly/Module/BioanalysisMannage.cs b/src/PBAnaly/Module/BioanalysisMannage.cs index b93fbb1..c505e6c 100644 --- a/src/PBAnaly/Module/BioanalysisMannage.cs +++ b/src/PBAnaly/Module/BioanalysisMannage.cs @@ -107,7 +107,7 @@ namespace PBAnaly.Module private ReaLTaiizor.Controls.Panel pl_right; private BioanalyImagePanel imagePanel = null; private BioanayImagePaletteForm imagePaletteForm = null; - PBBiologyVC.PBImageProcessVC pbpvc = new PBBiologyVC.PBImageProcessVC(); + public PBBiologyVC.PBImageProcessVC pbpvc = new PBBiologyVC.PBImageProcessVC(); private Thread algThread; private bool isalgRun = false; @@ -376,10 +376,7 @@ namespace PBAnaly.Module isUpdateAlg = false; this.pl_right = _pl_right; - imagePanel = new BioanalyImagePanel(); - imagePanel.TopLevel = false; - imagePanel.Show(); - imagePanel.BringToFront(); + imagePaletteForm = new BioanayImagePaletteForm(); imagePaletteForm.TopLevel = false; @@ -1415,33 +1412,50 @@ namespace PBAnaly.Module float _max = algAttribute.colorValue; float _min = algAttribute.colorMinValue; 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; - imagePaletteForm.SetInfo = "w:" + rab.rect.Width.ToString() + "h:" + rab.rect.Height.ToString(); + + // 完成绘制并保存矩形 if (Arrangement == 2) { 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.rectangles.Add(rab); + item.Value.currentRectangle = null; + item.Value.drawRect = false; + item.Value.imagePanel.image_pl.Invalidate(); + } } else { - rectangles.Add(rab); - } + 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); - currentRectangle = null; - drawRect = false; + } + } + 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(); } @@ -1465,34 +1479,52 @@ namespace PBAnaly.Module imagePaletteForm.SetInfo = "radio:" + radius.ToString(); 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 (Arrangement == 2) { foreach (var item in bioanalysisMannages) { - item.Value.CircleAndInfoList.Add(rab); + + 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; + + 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; CircleAndInfoList.Add(rab); + drawCircle = false; + if (!isContinuous) + CircleOn = false; } - drawCircle = false; - if (!isContinuous) - CircleOn = false; + imagePanel.image_pl.Invalidate(); @@ -1540,33 +1572,40 @@ namespace PBAnaly.Module float _max = algAttribute.colorValue; float _min = algAttribute.colorMinValue; 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, recDragRect.X, recDragRect.Y, recDragRect.Width, recDragRect.Height); - - } - } - if (curpdinfovc != null) - rattb.pdinfovc = curpdinfovc; + + if (Arrangement == 2) { 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(); } } else { rectangles[rectDragStartIndex] = rattb; + isRecDragging = false; + rectActiveCorner = Corner.None; + rectDragStartIndex = -1; } imagePaletteForm.SetInfo = "w:" + recDragRect.Width.ToString() + "h:" + recDragRect.Height.ToString(); - isRecDragging = false; - rectActiveCorner = Corner.None; - rectDragStartIndex = -1; + imagePanel.image_pl.Invalidate(); @@ -1581,32 +1620,49 @@ namespace PBAnaly.Module float _max = algAttribute.colorValue; float _min = algAttribute.colorMinValue; int radius = (int)Math.Sqrt(Math.Pow(circeAndInfo.center.X - circeAndInfo.Radius.X, 2) + Math.Pow(circeAndInfo.center.Y - circeAndInfo.Radius.Y, 2)); - 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; + + imagePaletteForm.SetInfo = "radio:" + radius.ToString(); if (Arrangement == 2) { foreach (var item in bioanalysisMannages) { + 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; item.Value.CircleAndInfoList[cirDragStartIndex] = circeAndInfo; + item.Value.isCirDragging = false; + item.Value.cirDragStartIndex = -1; + item.Value.imagePanel.image_pl.Invalidate(); } } else { - CircleAndInfoList[cirDragStartIndex] = circeAndInfo; - } + 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); - isCirDragging = false; - cirDragStartIndex = -1; + } + } + CircleAndInfoList[cirDragStartIndex] = circeAndInfo; + circeAndInfo.pdinfovc = curpdinfovc; + isCirDragging = false; + cirDragStartIndex = -1; + } + + imagePanel.image_pl.Invalidate(); } } diff --git a/src/PBAnaly/UI/BioanayImagePaletteForm.Designer.cs b/src/PBAnaly/UI/BioanayImagePaletteForm.Designer.cs index b630e2c..be7e932 100644 --- a/src/PBAnaly/UI/BioanayImagePaletteForm.Designer.cs +++ b/src/PBAnaly/UI/BioanayImagePaletteForm.Designer.cs @@ -40,6 +40,10 @@ this.foxLabel1 = new ReaLTaiizor.Controls.FoxLabel(); this.foxLabel4 = new ReaLTaiizor.Controls.FoxLabel(); this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel(); + this.hpb_wand = new AntdUI.Avatar(); + this.hpb_xianduan = new AntdUI.Avatar(); + this.hpb_circe = new AntdUI.Avatar(); + this.hpb_rect = new AntdUI.Avatar(); this.panel2 = new AntdUI.Panel(); this.dtb_th = new ReaLTaiizor.Controls.DreamTextBox(); this.foxLabel10 = new ReaLTaiizor.Controls.FoxLabel(); @@ -57,6 +61,8 @@ this.dtb_colorMax = new ReaLTaiizor.Controls.DungeonTrackBar(); this.dtb_colorMin = new ReaLTaiizor.Controls.DungeonTrackBar(); this.dtb_opacity = new ReaLTaiizor.Controls.DungeonTrackBar(); + this.hpb_line = new ReaLTaiizor.Controls.HopePictureBox(); + this.pb_bgimage = new System.Windows.Forms.PictureBox(); this.dtb_brightness = new ReaLTaiizor.Controls.DungeonTrackBar(); this.pl_max = new AntdUI.Panel(); this.nud_colorMax = new System.Windows.Forms.NumericUpDown(); @@ -69,17 +75,11 @@ this.cll_panel = new AntdUI.Collapse(); this.collapseItem3 = new AntdUI.CollapseItem(); this.tableLayoutPanel4 = new System.Windows.Forms.TableLayoutPanel(); - this.hpb_line = new ReaLTaiizor.Controls.HopePictureBox(); - this.pb_bgimage = new System.Windows.Forms.PictureBox(); - this.hpb_wand = new AntdUI.Avatar(); - this.hpb_xianduan = new AntdUI.Avatar(); - this.hpb_circe = new AntdUI.Avatar(); - this.hpb_rect = new AntdUI.Avatar(); - this.ava_textbox = new AntdUI.Avatar(); this.panel4 = new AntdUI.Panel(); this.dtb_textbox = new ReaLTaiizor.Controls.DreamTextBox(); this.foxLabel12 = new ReaLTaiizor.Controls.FoxLabel(); this.foxLabel15 = new ReaLTaiizor.Controls.FoxLabel(); + this.ava_textbox = new AntdUI.Avatar(); this.tableLayoutPanel3.SuspendLayout(); this.panel2.SuspendLayout(); this.panel3.SuspendLayout(); @@ -87,6 +87,8 @@ this.tableLayoutPanel2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.nud_opacity)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.nud_brightness)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.hpb_line)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pb_bgimage)).BeginInit(); this.pl_max.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.nud_colorMax)).BeginInit(); this.pl_min.SuspendLayout(); @@ -97,8 +99,6 @@ this.cll_panel.SuspendLayout(); this.collapseItem3.SuspendLayout(); this.tableLayoutPanel4.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.hpb_line)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pb_bgimage)).BeginInit(); this.panel4.SuspendLayout(); this.SuspendLayout(); // @@ -115,10 +115,11 @@ this.fb_fixSetting.EnabledCalc = true; 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(137, 31); + 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.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(59, 31); + this.fb_fixSetting.Size = new System.Drawing.Size(79, 39); this.fb_fixSetting.TabIndex = 6; this.fb_fixSetting.Text = "修改"; // @@ -127,9 +128,10 @@ this.foxLabel7.BackColor = System.Drawing.Color.Transparent; 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(120, 5); + this.foxLabel7.Location = new System.Drawing.Point(160, 6); + this.foxLabel7.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.foxLabel7.Name = "foxLabel7"; - this.foxLabel7.Size = new System.Drawing.Size(26, 19); + this.foxLabel7.Size = new System.Drawing.Size(35, 24); this.foxLabel7.TabIndex = 4; this.foxLabel7.Text = "r="; // @@ -138,9 +140,10 @@ this.foxLabel5.BackColor = System.Drawing.Color.Transparent; 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(3, 31); + this.foxLabel5.Location = new System.Drawing.Point(4, 39); + this.foxLabel5.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.foxLabel5.Name = "foxLabel5"; - this.foxLabel5.Size = new System.Drawing.Size(26, 19); + this.foxLabel5.Size = new System.Drawing.Size(35, 24); this.foxLabel5.TabIndex = 2; this.foxLabel5.Text = "h="; // @@ -151,9 +154,10 @@ this.foxLabel8.Dock = System.Windows.Forms.DockStyle.Fill; 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(3, 197); + this.foxLabel8.Location = new System.Drawing.Point(4, 246); + this.foxLabel8.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.foxLabel8.Name = "foxLabel8"; - this.foxLabel8.Size = new System.Drawing.Size(195, 18); + this.foxLabel8.Size = new System.Drawing.Size(260, 22); this.foxLabel8.TabIndex = 34; this.foxLabel8.Text = "Color Rable"; // @@ -164,9 +168,10 @@ this.flb_act_mm.Dock = System.Windows.Forms.DockStyle.Fill; 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(93, 173); + 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.Name = "flb_act_mm"; - this.flb_act_mm.Size = new System.Drawing.Size(164, 18); + this.flb_act_mm.Size = new System.Drawing.Size(218, 22); this.flb_act_mm.TabIndex = 30; this.flb_act_mm.Text = "0 mm"; // @@ -176,9 +181,10 @@ this.foxLabel9.Dock = System.Windows.Forms.DockStyle.Fill; 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(3, 115); + this.foxLabel9.Location = new System.Drawing.Point(4, 143); + this.foxLabel9.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.foxLabel9.Name = "foxLabel9"; - this.foxLabel9.Size = new System.Drawing.Size(44, 30); + this.foxLabel9.Size = new System.Drawing.Size(59, 37); this.foxLabel9.TabIndex = 18; this.foxLabel9.Text = "Max"; // @@ -188,9 +194,10 @@ this.foxLabel6.Dock = System.Windows.Forms.DockStyle.Fill; 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(3, 79); + this.foxLabel6.Location = new System.Drawing.Point(4, 98); + this.foxLabel6.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.foxLabel6.Name = "foxLabel6"; - this.foxLabel6.Size = new System.Drawing.Size(44, 30); + this.foxLabel6.Size = new System.Drawing.Size(59, 37); this.foxLabel6.TabIndex = 13; this.foxLabel6.Text = "Min"; // @@ -200,9 +207,10 @@ this.foxLabel2.Dock = System.Windows.Forms.DockStyle.Fill; 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(3, 61); + this.foxLabel2.Location = new System.Drawing.Point(4, 76); + this.foxLabel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.foxLabel2.Name = "foxLabel2"; - this.foxLabel2.Size = new System.Drawing.Size(44, 12); + this.foxLabel2.Size = new System.Drawing.Size(59, 14); this.foxLabel2.TabIndex = 10; this.foxLabel2.Text = "色阶"; // @@ -212,9 +220,10 @@ this.foxLabel3.Dock = System.Windows.Forms.DockStyle.Fill; 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(3, 32); + this.foxLabel3.Location = new System.Drawing.Point(4, 40); + this.foxLabel3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.foxLabel3.Name = "foxLabel3"; - this.foxLabel3.Size = new System.Drawing.Size(44, 23); + this.foxLabel3.Size = new System.Drawing.Size(59, 28); this.foxLabel3.TabIndex = 6; this.foxLabel3.Text = "透明度::"; // @@ -224,9 +233,10 @@ this.foxLabel1.Dock = System.Windows.Forms.DockStyle.Fill; 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(3, 3); + this.foxLabel1.Location = new System.Drawing.Point(4, 4); + this.foxLabel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.foxLabel1.Name = "foxLabel1"; - this.foxLabel1.Size = new System.Drawing.Size(44, 23); + this.foxLabel1.Size = new System.Drawing.Size(59, 28); this.foxLabel1.TabIndex = 1; this.foxLabel1.Text = "亮度:"; // @@ -235,19 +245,20 @@ this.foxLabel4.BackColor = System.Drawing.Color.Transparent; 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(3, 3); + this.foxLabel4.Location = new System.Drawing.Point(4, 4); + this.foxLabel4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.foxLabel4.Name = "foxLabel4"; - this.foxLabel4.Size = new System.Drawing.Size(26, 19); + this.foxLabel4.Size = new System.Drawing.Size(35, 24); this.foxLabel4.TabIndex = 0; this.foxLabel4.Text = "w="; // // tableLayoutPanel3 // this.tableLayoutPanel3.ColumnCount = 5; - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 34F)); - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 34F)); - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 34F)); - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 34F)); + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 45F)); + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 45F)); + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 45F)); + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 45F)); this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tableLayoutPanel3.Controls.Add(this.hpb_wand, 3, 0); this.tableLayoutPanel3.Controls.Add(this.hpb_xianduan, 2, 0); @@ -260,13 +271,64 @@ this.tableLayoutPanel3.Margin = new System.Windows.Forms.Padding(0); this.tableLayoutPanel3.Name = "tableLayoutPanel3"; this.tableLayoutPanel3.RowCount = 3; - this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 34F)); + this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 42F)); this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel3.Size = new System.Drawing.Size(266, 182); + this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F)); + this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F)); + this.tableLayoutPanel3.Size = new System.Drawing.Size(357, 228); this.tableLayoutPanel3.TabIndex = 0; // + // hpb_wand + // + this.hpb_wand.Dock = System.Windows.Forms.DockStyle.Fill; + 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.Name = "hpb_wand"; + this.hpb_wand.Size = new System.Drawing.Size(37, 34); + this.hpb_wand.TabIndex = 14; + this.hpb_wand.Text = "a"; + // + // hpb_xianduan + // + this.hpb_xianduan.Cursor = System.Windows.Forms.Cursors.Hand; + this.hpb_xianduan.Dock = System.Windows.Forms.DockStyle.Fill; + 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.Name = "hpb_xianduan"; + this.hpb_xianduan.Size = new System.Drawing.Size(37, 34); + this.hpb_xianduan.TabIndex = 13; + this.hpb_xianduan.Text = "a"; + // + // hpb_circe + // + this.hpb_circe.Cursor = System.Windows.Forms.Cursors.Hand; + this.hpb_circe.Dock = System.Windows.Forms.DockStyle.Fill; + 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.Name = "hpb_circe"; + this.hpb_circe.Size = new System.Drawing.Size(37, 34); + this.hpb_circe.TabIndex = 0; + this.hpb_circe.Text = "a"; + // + // hpb_rect + // + this.hpb_rect.Cursor = System.Windows.Forms.Cursors.Hand; + this.hpb_rect.Dock = System.Windows.Forms.DockStyle.Fill; + 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.Name = "hpb_rect"; + this.hpb_rect.Size = new System.Drawing.Size(37, 34); + this.hpb_rect.TabIndex = 0; + this.hpb_rect.Text = "a"; + // // panel2 // this.tableLayoutPanel3.SetColumnSpan(this.panel2, 5); @@ -281,9 +343,10 @@ this.panel2.Controls.Add(this.foxLabel5); this.panel2.Controls.Add(this.foxLabel4); this.panel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel2.Location = new System.Drawing.Point(3, 37); + this.panel2.Location = new System.Drawing.Point(4, 46); + this.panel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(260, 122); + this.panel2.Size = new System.Drawing.Size(349, 153); this.panel2.TabIndex = 14; this.panel2.Text = "panel2"; // @@ -298,9 +361,10 @@ this.dtb_th.ColorE = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); 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(35, 74); + 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.Name = "dtb_th"; - this.dtb_th.Size = new System.Drawing.Size(80, 21); + this.dtb_th.Size = new System.Drawing.Size(106, 25); this.dtb_th.TabIndex = 12; this.dtb_th.Text = "100"; // @@ -309,9 +373,10 @@ this.foxLabel10.BackColor = System.Drawing.Color.Transparent; 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(3, 71); + this.foxLabel10.Location = new System.Drawing.Point(4, 89); + this.foxLabel10.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.foxLabel10.Name = "foxLabel10"; - this.foxLabel10.Size = new System.Drawing.Size(26, 19); + this.foxLabel10.Size = new System.Drawing.Size(35, 24); this.foxLabel10.TabIndex = 11; this.foxLabel10.Text = "th="; // @@ -326,9 +391,10 @@ this.dtb_r.ColorE = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); 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(144, 5); + 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.Name = "dtb_r"; - this.dtb_r.Size = new System.Drawing.Size(80, 21); + this.dtb_r.Size = new System.Drawing.Size(106, 25); this.dtb_r.TabIndex = 10; this.dtb_r.Text = "10"; // @@ -343,9 +409,10 @@ this.dtb_h.ColorE = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); 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(35, 34); + 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.Name = "dtb_h"; - this.dtb_h.Size = new System.Drawing.Size(80, 21); + this.dtb_h.Size = new System.Drawing.Size(106, 25); this.dtb_h.TabIndex = 9; this.dtb_h.Text = "10"; // @@ -360,9 +427,10 @@ this.dtb_w.ColorE = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); 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(34, 5); + 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.Name = "dtb_w"; - this.dtb_w.Size = new System.Drawing.Size(80, 21); + this.dtb_w.Size = new System.Drawing.Size(106, 25); this.dtb_w.TabIndex = 8; this.dtb_w.Text = "10"; // @@ -371,18 +439,20 @@ this.flb_info.BackColor = System.Drawing.Color.Transparent; 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, 101); + 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.Name = "flb_info"; - this.flb_info.Size = new System.Drawing.Size(223, 19); + this.flb_info.Size = new System.Drawing.Size(297, 24); this.flb_info.TabIndex = 7; // // panel3 // this.panel3.Controls.Add(this.cb_continuous); this.panel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel3.Location = new System.Drawing.Point(139, 3); + this.panel3.Location = new System.Drawing.Point(184, 4); + this.panel3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(124, 28); + this.panel3.Size = new System.Drawing.Size(169, 34); this.panel3.TabIndex = 56; this.panel3.Text = "panel3"; // @@ -392,18 +462,19 @@ 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.Name = "cb_continuous"; - this.cb_continuous.Size = new System.Drawing.Size(124, 28); + this.cb_continuous.Size = new System.Drawing.Size(169, 34); this.cb_continuous.TabIndex = 55; this.cb_continuous.Text = "连续绘制"; // // collapseItem2 // this.collapseItem2.Controls.Add(this.tableLayoutPanel3); - this.collapseItem2.Expand = true; - this.collapseItem2.Location = new System.Drawing.Point(19, 99); + this.collapseItem2.Location = new System.Drawing.Point(-357, -228); + this.collapseItem2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.collapseItem2.Name = "collapseItem2"; - this.collapseItem2.Size = new System.Drawing.Size(266, 182); + this.collapseItem2.Size = new System.Drawing.Size(357, 228); this.collapseItem2.TabIndex = 1; this.collapseItem2.Text = "ROI工具"; // @@ -422,19 +493,20 @@ "RGB", "Pseudo", "Gray"}); - this.cb_colortable.Location = new System.Drawing.Point(3, 221); + 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.Name = "cb_colortable"; - this.cb_colortable.Size = new System.Drawing.Size(84, 20); + this.cb_colortable.Size = new System.Drawing.Size(113, 23); this.cb_colortable.TabIndex = 35; // // tableLayoutPanel2 // this.tableLayoutPanel2.ColumnCount = 5; - this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 50F)); - this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 67F)); + this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 27F)); + this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 27F)); this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 59F)); + this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 79F)); this.tableLayoutPanel2.Controls.Add(this.nud_opacity, 4, 1); this.tableLayoutPanel2.Controls.Add(this.nud_brightness, 4, 0); this.tableLayoutPanel2.Controls.Add(this.dtb_colorMax, 1, 4); @@ -459,33 +531,35 @@ this.tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(0); this.tableLayoutPanel2.Name = "tableLayoutPanel2"; this.tableLayoutPanel2.RowCount = 10; - this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 29F)); - this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 29F)); - this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 18F)); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 36F)); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 36F)); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 22F)); - this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 24F)); - this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 24F)); - this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 29F)); + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 45F)); + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 45F)); + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 28F)); + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F)); + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F)); + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 36F)); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel2.Size = new System.Drawing.Size(260, 272); + this.tableLayoutPanel2.Size = new System.Drawing.Size(347, 340); this.tableLayoutPanel2.TabIndex = 0; // // nud_opacity // this.nud_opacity.Dock = System.Windows.Forms.DockStyle.Fill; - this.nud_opacity.Location = new System.Drawing.Point(204, 32); + 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.Name = "nud_opacity"; - this.nud_opacity.Size = new System.Drawing.Size(53, 21); + this.nud_opacity.Size = new System.Drawing.Size(71, 25); this.nud_opacity.TabIndex = 45; // // nud_brightness // this.nud_brightness.Dock = System.Windows.Forms.DockStyle.Fill; - this.nud_brightness.Location = new System.Drawing.Point(204, 3); + 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.Name = "nud_brightness"; - this.nud_brightness.Size = new System.Drawing.Size(53, 21); + this.nud_brightness.Size = new System.Drawing.Size(71, 25); this.nud_brightness.TabIndex = 44; // // dtb_colorMax @@ -498,13 +572,13 @@ this.dtb_colorMax.EmptyBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(221)))), ((int)(((byte)(221)))), ((int)(((byte)(221))))); this.dtb_colorMax.FillBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(217)))), ((int)(((byte)(99)))), ((int)(((byte)(50))))); this.dtb_colorMax.JumpToMouse = false; - this.dtb_colorMax.Location = new System.Drawing.Point(52, 114); - this.dtb_colorMax.Margin = new System.Windows.Forms.Padding(2); + this.dtb_colorMax.Location = new System.Drawing.Point(70, 141); + this.dtb_colorMax.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.dtb_colorMax.Maximum = 100; this.dtb_colorMax.Minimum = 0; - this.dtb_colorMax.MinimumSize = new System.Drawing.Size(35, 18); + this.dtb_colorMax.MinimumSize = new System.Drawing.Size(47, 22); this.dtb_colorMax.Name = "dtb_colorMax"; - this.dtb_colorMax.Size = new System.Drawing.Size(147, 22); + this.dtb_colorMax.Size = new System.Drawing.Size(195, 22); this.dtb_colorMax.TabIndex = 40; this.dtb_colorMax.Text = "dungeonTrackBar5"; this.dtb_colorMax.ThumbBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(244)))), ((int)(((byte)(244)))), ((int)(((byte)(244))))); @@ -523,13 +597,13 @@ this.dtb_colorMin.EmptyBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(221)))), ((int)(((byte)(221)))), ((int)(((byte)(221))))); this.dtb_colorMin.FillBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(217)))), ((int)(((byte)(99)))), ((int)(((byte)(50))))); this.dtb_colorMin.JumpToMouse = false; - this.dtb_colorMin.Location = new System.Drawing.Point(52, 78); - this.dtb_colorMin.Margin = new System.Windows.Forms.Padding(2); + this.dtb_colorMin.Location = new System.Drawing.Point(70, 96); + this.dtb_colorMin.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.dtb_colorMin.Maximum = 100; this.dtb_colorMin.Minimum = 0; - this.dtb_colorMin.MinimumSize = new System.Drawing.Size(35, 18); + this.dtb_colorMin.MinimumSize = new System.Drawing.Size(47, 22); this.dtb_colorMin.Name = "dtb_colorMin"; - this.dtb_colorMin.Size = new System.Drawing.Size(147, 22); + this.dtb_colorMin.Size = new System.Drawing.Size(195, 22); this.dtb_colorMin.TabIndex = 39; this.dtb_colorMin.Text = "dungeonTrackBar4"; this.dtb_colorMin.ThumbBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(244)))), ((int)(((byte)(244)))), ((int)(((byte)(244))))); @@ -548,13 +622,13 @@ this.dtb_opacity.EmptyBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(221)))), ((int)(((byte)(221)))), ((int)(((byte)(221))))); this.dtb_opacity.FillBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(217)))), ((int)(((byte)(99)))), ((int)(((byte)(50))))); this.dtb_opacity.JumpToMouse = false; - this.dtb_opacity.Location = new System.Drawing.Point(52, 31); - this.dtb_opacity.Margin = new System.Windows.Forms.Padding(2); + this.dtb_opacity.Location = new System.Drawing.Point(70, 38); + this.dtb_opacity.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.dtb_opacity.Maximum = 100; this.dtb_opacity.Minimum = 0; - this.dtb_opacity.MinimumSize = new System.Drawing.Size(35, 18); + this.dtb_opacity.MinimumSize = new System.Drawing.Size(47, 22); this.dtb_opacity.Name = "dtb_opacity"; - this.dtb_opacity.Size = new System.Drawing.Size(147, 22); + this.dtb_opacity.Size = new System.Drawing.Size(195, 22); this.dtb_opacity.TabIndex = 37; this.dtb_opacity.Text = "dungeonTrackBar2"; this.dtb_opacity.ThumbBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(244)))), ((int)(((byte)(244)))), ((int)(((byte)(244))))); @@ -563,6 +637,32 @@ this.dtb_opacity.ValueDivison = ReaLTaiizor.Controls.DungeonTrackBar.ValueDivisor.By1; this.dtb_opacity.ValueToSet = 0F; // + // hpb_line + // + this.hpb_line.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(196)))), ((int)(((byte)(204))))); + 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.Name = "hpb_line"; + this.hpb_line.PixelOffsetType = System.Drawing.Drawing2D.PixelOffsetMode.HighQuality; + this.hpb_line.Size = new System.Drawing.Size(59, 22); + this.hpb_line.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; + this.hpb_line.SmoothingType = System.Drawing.Drawing2D.SmoothingMode.HighQuality; + this.hpb_line.TabIndex = 9; + this.hpb_line.TabStop = false; + this.hpb_line.TextRenderingType = System.Drawing.Text.TextRenderingHint.ClearTypeGridFit; + // + // pb_bgimage + // + this.pb_bgimage.Dock = System.Windows.Forms.DockStyle.Fill; + this.pb_bgimage.Location = new System.Drawing.Point(121, 272); + this.pb_bgimage.Margin = new System.Windows.Forms.Padding(0); + this.pb_bgimage.Name = "pb_bgimage"; + this.pb_bgimage.Size = new System.Drawing.Size(147, 36); + this.pb_bgimage.TabIndex = 36; + this.pb_bgimage.TabStop = false; + // // dtb_brightness // this.dtb_brightness.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); @@ -573,13 +673,13 @@ this.dtb_brightness.EmptyBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(221)))), ((int)(((byte)(221)))), ((int)(((byte)(221))))); this.dtb_brightness.FillBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(217)))), ((int)(((byte)(99)))), ((int)(((byte)(50))))); this.dtb_brightness.JumpToMouse = false; - this.dtb_brightness.Location = new System.Drawing.Point(52, 2); - this.dtb_brightness.Margin = new System.Windows.Forms.Padding(2); + this.dtb_brightness.Location = new System.Drawing.Point(70, 2); + this.dtb_brightness.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.dtb_brightness.Maximum = 100; this.dtb_brightness.Minimum = 0; - this.dtb_brightness.MinimumSize = new System.Drawing.Size(35, 18); + this.dtb_brightness.MinimumSize = new System.Drawing.Size(47, 22); this.dtb_brightness.Name = "dtb_brightness"; - this.dtb_brightness.Size = new System.Drawing.Size(147, 22); + this.dtb_brightness.Size = new System.Drawing.Size(195, 22); this.dtb_brightness.TabIndex = 2; this.dtb_brightness.Text = "dungeonTrackBar1"; this.dtb_brightness.ThumbBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(244)))), ((int)(((byte)(244)))), ((int)(((byte)(244))))); @@ -594,18 +694,19 @@ this.pl_max.BackColor = System.Drawing.Color.Transparent; this.pl_max.Controls.Add(this.nud_colorMax); this.pl_max.Dock = System.Windows.Forms.DockStyle.Fill; - this.pl_max.Location = new System.Drawing.Point(201, 112); + this.pl_max.Location = new System.Drawing.Point(268, 139); this.pl_max.Margin = new System.Windows.Forms.Padding(0); this.pl_max.Name = "pl_max"; - this.pl_max.Size = new System.Drawing.Size(59, 36); + this.pl_max.Size = new System.Drawing.Size(79, 45); this.pl_max.TabIndex = 52; this.pl_max.Text = "panel3"; // // nud_colorMax // - this.nud_colorMax.Location = new System.Drawing.Point(3, 3); + 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.Name = "nud_colorMax"; - this.nud_colorMax.Size = new System.Drawing.Size(44, 21); + this.nud_colorMax.Size = new System.Drawing.Size(59, 25); this.nud_colorMax.TabIndex = 51; // // pl_min @@ -614,18 +715,19 @@ this.pl_min.BackColor = System.Drawing.Color.Transparent; this.pl_min.Controls.Add(this.nud_colorMin); this.pl_min.Dock = System.Windows.Forms.DockStyle.Fill; - this.pl_min.Location = new System.Drawing.Point(201, 76); + this.pl_min.Location = new System.Drawing.Point(268, 94); this.pl_min.Margin = new System.Windows.Forms.Padding(0); this.pl_min.Name = "pl_min"; - this.pl_min.Size = new System.Drawing.Size(59, 36); + this.pl_min.Size = new System.Drawing.Size(79, 45); this.pl_min.TabIndex = 53; this.pl_min.Text = "panel3"; // // nud_colorMin // - this.nud_colorMin.Location = new System.Drawing.Point(3, 3); + 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.Name = "nud_colorMin"; - this.nud_colorMin.Size = new System.Drawing.Size(44, 21); + this.nud_colorMin.Size = new System.Drawing.Size(59, 25); this.nud_colorMin.TabIndex = 50; // // cb_scientific @@ -633,9 +735,10 @@ this.cb_scientific.AutoCheck = true; this.tableLayoutPanel2.SetColumnSpan(this.cb_scientific, 4); this.cb_scientific.Dock = System.Windows.Forms.DockStyle.Fill; - this.cb_scientific.Location = new System.Drawing.Point(3, 151); + 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.Name = "cb_scientific"; - this.cb_scientific.Size = new System.Drawing.Size(195, 16); + this.cb_scientific.Size = new System.Drawing.Size(260, 20); this.cb_scientific.TabIndex = 54; this.cb_scientific.Text = "光子量"; // @@ -643,9 +746,10 @@ // this.panel1.Controls.Add(this.tableLayoutPanel2); this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel1.Location = new System.Drawing.Point(3, 3); + this.panel1.Location = new System.Drawing.Point(4, 4); + this.panel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(260, 272); + this.panel1.Size = new System.Drawing.Size(347, 340); this.panel1.TabIndex = 0; this.panel1.Text = "panel1"; // @@ -653,25 +757,26 @@ // this.tableLayoutPanel1.ColumnCount = 1; this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 27F)); this.tableLayoutPanel1.Controls.Add(this.panel1, 0, 0); this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0); this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(0); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; this.tableLayoutPanel1.RowCount = 3; - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 278F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 348F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 6F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(266, 302); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 8F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(355, 378); this.tableLayoutPanel1.TabIndex = 0; // // collapseItem1 // this.collapseItem1.Controls.Add(this.tableLayoutPanel1); - this.collapseItem1.Location = new System.Drawing.Point(-266, -302); + this.collapseItem1.Location = new System.Drawing.Point(-355, -378); + this.collapseItem1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.collapseItem1.Name = "collapseItem1"; - this.collapseItem1.Size = new System.Drawing.Size(266, 302); + this.collapseItem1.Size = new System.Drawing.Size(355, 378); this.collapseItem1.TabIndex = 0; this.collapseItem1.Text = "图像调整"; // @@ -684,8 +789,9 @@ 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.Name = "cll_panel"; - this.cll_panel.Size = new System.Drawing.Size(304, 495); + this.cll_panel.Size = new System.Drawing.Size(405, 619); this.cll_panel.TabIndex = 1; this.cll_panel.Text = "fed"; // @@ -693,19 +799,20 @@ // this.collapseItem3.Controls.Add(this.tableLayoutPanel4); this.collapseItem3.Expand = true; - this.collapseItem3.Location = new System.Drawing.Point(19, 353); + this.collapseItem3.Location = new System.Drawing.Point(24, 171); + this.collapseItem3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.collapseItem3.Name = "collapseItem3"; - this.collapseItem3.Size = new System.Drawing.Size(266, 165); + this.collapseItem3.Size = new System.Drawing.Size(357, 206); this.collapseItem3.TabIndex = 2; this.collapseItem3.Text = "标签工具"; // // tableLayoutPanel4 // this.tableLayoutPanel4.ColumnCount = 5; - this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 34F)); - this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 34F)); - this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 34F)); - this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 34F)); + this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 45F)); + this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 45F)); + this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 45F)); + this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 45F)); this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tableLayoutPanel4.Controls.Add(this.panel4, 0, 1); this.tableLayoutPanel4.Controls.Add(this.ava_textbox, 0, 0); @@ -714,97 +821,13 @@ this.tableLayoutPanel4.Margin = new System.Windows.Forms.Padding(0); this.tableLayoutPanel4.Name = "tableLayoutPanel4"; this.tableLayoutPanel4.RowCount = 3; - this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 34F)); + this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 42F)); this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel4.Size = new System.Drawing.Size(266, 165); + this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F)); + this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F)); + this.tableLayoutPanel4.Size = new System.Drawing.Size(357, 206); this.tableLayoutPanel4.TabIndex = 1; // - // hpb_line - // - this.hpb_line.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(196)))), ((int)(((byte)(204))))); - 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(3, 173); - this.hpb_line.Name = "hpb_line"; - this.hpb_line.PixelOffsetType = System.Drawing.Drawing2D.PixelOffsetMode.HighQuality; - this.hpb_line.Size = new System.Drawing.Size(44, 18); - this.hpb_line.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; - this.hpb_line.SmoothingType = System.Drawing.Drawing2D.SmoothingMode.HighQuality; - this.hpb_line.TabIndex = 9; - this.hpb_line.TabStop = false; - this.hpb_line.TextRenderingType = System.Drawing.Text.TextRenderingHint.ClearTypeGridFit; - // - // pb_bgimage - // - this.pb_bgimage.Dock = System.Windows.Forms.DockStyle.Fill; - this.pb_bgimage.Location = new System.Drawing.Point(90, 218); - this.pb_bgimage.Margin = new System.Windows.Forms.Padding(0); - this.pb_bgimage.Name = "pb_bgimage"; - this.pb_bgimage.Size = new System.Drawing.Size(111, 29); - this.pb_bgimage.TabIndex = 36; - this.pb_bgimage.TabStop = false; - // - // hpb_wand - // - this.hpb_wand.Dock = System.Windows.Forms.DockStyle.Fill; - this.hpb_wand.Image = global::PBAnaly.Properties.Resources.魔术棒_魔法_魔术_一键; - this.hpb_wand.ImageFit = AntdUI.TFit.Contain; - this.hpb_wand.Location = new System.Drawing.Point(105, 3); - this.hpb_wand.Name = "hpb_wand"; - this.hpb_wand.Size = new System.Drawing.Size(28, 28); - this.hpb_wand.TabIndex = 14; - this.hpb_wand.Text = "a"; - // - // hpb_xianduan - // - this.hpb_xianduan.Cursor = System.Windows.Forms.Cursors.Hand; - this.hpb_xianduan.Dock = System.Windows.Forms.DockStyle.Fill; - this.hpb_xianduan.Image = global::PBAnaly.Properties.Resources.线段__1_; - this.hpb_xianduan.ImageFit = AntdUI.TFit.Contain; - this.hpb_xianduan.Location = new System.Drawing.Point(71, 3); - this.hpb_xianduan.Name = "hpb_xianduan"; - this.hpb_xianduan.Size = new System.Drawing.Size(28, 28); - this.hpb_xianduan.TabIndex = 13; - this.hpb_xianduan.Text = "a"; - // - // hpb_circe - // - this.hpb_circe.Cursor = System.Windows.Forms.Cursors.Hand; - this.hpb_circe.Dock = System.Windows.Forms.DockStyle.Fill; - this.hpb_circe.Image = global::PBAnaly.Properties.Resources.圆形; - this.hpb_circe.ImageFit = AntdUI.TFit.Contain; - this.hpb_circe.Location = new System.Drawing.Point(37, 3); - this.hpb_circe.Name = "hpb_circe"; - this.hpb_circe.Size = new System.Drawing.Size(28, 28); - this.hpb_circe.TabIndex = 0; - this.hpb_circe.Text = "a"; - // - // hpb_rect - // - this.hpb_rect.Cursor = System.Windows.Forms.Cursors.Hand; - this.hpb_rect.Dock = System.Windows.Forms.DockStyle.Fill; - this.hpb_rect.Image = global::PBAnaly.Properties.Resources._10矩形; - this.hpb_rect.ImageFit = AntdUI.TFit.Contain; - this.hpb_rect.Location = new System.Drawing.Point(3, 3); - this.hpb_rect.Name = "hpb_rect"; - this.hpb_rect.Size = new System.Drawing.Size(28, 28); - this.hpb_rect.TabIndex = 0; - this.hpb_rect.Text = "a"; - // - // ava_textbox - // - this.ava_textbox.Cursor = System.Windows.Forms.Cursors.Hand; - this.ava_textbox.Dock = System.Windows.Forms.DockStyle.Fill; - this.ava_textbox.Image = global::PBAnaly.Properties.Resources.文本; - this.ava_textbox.ImageFit = AntdUI.TFit.Contain; - this.ava_textbox.Location = new System.Drawing.Point(3, 3); - this.ava_textbox.Name = "ava_textbox"; - this.ava_textbox.Size = new System.Drawing.Size(28, 28); - this.ava_textbox.TabIndex = 0; - this.ava_textbox.Text = "a"; - // // panel4 // this.tableLayoutPanel4.SetColumnSpan(this.panel4, 5); @@ -812,9 +835,10 @@ this.panel4.Controls.Add(this.foxLabel12); this.panel4.Controls.Add(this.foxLabel15); this.panel4.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel4.Location = new System.Drawing.Point(3, 37); + this.panel4.Location = new System.Drawing.Point(4, 46); + this.panel4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.panel4.Name = "panel4"; - this.panel4.Size = new System.Drawing.Size(260, 105); + this.panel4.Size = new System.Drawing.Size(349, 131); this.panel4.TabIndex = 15; this.panel4.Text = "panel4"; // @@ -829,9 +853,10 @@ this.dtb_textbox.ColorE = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); 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(51, 3); + 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.Name = "dtb_textbox"; - this.dtb_textbox.Size = new System.Drawing.Size(80, 21); + this.dtb_textbox.Size = new System.Drawing.Size(106, 25); this.dtb_textbox.TabIndex = 8; this.dtb_textbox.Text = "10"; // @@ -840,9 +865,10 @@ this.foxLabel12.BackColor = System.Drawing.Color.Transparent; 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, 101); + this.foxLabel12.Location = new System.Drawing.Point(1, 126); + this.foxLabel12.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.foxLabel12.Name = "foxLabel12"; - this.foxLabel12.Size = new System.Drawing.Size(223, 19); + this.foxLabel12.Size = new System.Drawing.Size(297, 24); this.foxLabel12.TabIndex = 7; // // foxLabel15 @@ -850,20 +876,34 @@ this.foxLabel15.BackColor = System.Drawing.Color.Transparent; 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(3, 3); + this.foxLabel15.Location = new System.Drawing.Point(4, 4); + this.foxLabel15.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.foxLabel15.Name = "foxLabel15"; - this.foxLabel15.Size = new System.Drawing.Size(59, 19); + this.foxLabel15.Size = new System.Drawing.Size(79, 24); this.foxLabel15.TabIndex = 0; this.foxLabel15.Text = "value="; // + // ava_textbox + // + this.ava_textbox.Cursor = System.Windows.Forms.Cursors.Hand; + this.ava_textbox.Dock = System.Windows.Forms.DockStyle.Fill; + 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.Name = "ava_textbox"; + this.ava_textbox.Size = new System.Drawing.Size(37, 34); + this.ava_textbox.TabIndex = 0; + this.ava_textbox.Text = "a"; + // // BioanayImagePaletteForm // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(304, 495); + this.ClientSize = new System.Drawing.Size(405, 619); this.Controls.Add(this.cll_panel); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; - this.Margin = new System.Windows.Forms.Padding(2); + this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.Name = "BioanayImagePaletteForm"; this.Text = "BioanayImagePaletteForm"; this.tableLayoutPanel3.ResumeLayout(false); @@ -874,6 +914,8 @@ this.tableLayoutPanel2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.nud_opacity)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.nud_brightness)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.hpb_line)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pb_bgimage)).EndInit(); this.pl_max.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.nud_colorMax)).EndInit(); this.pl_min.ResumeLayout(false); @@ -884,8 +926,6 @@ this.cll_panel.ResumeLayout(false); this.collapseItem3.ResumeLayout(false); this.tableLayoutPanel4.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.hpb_line)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pb_bgimage)).EndInit(); this.panel4.ResumeLayout(false); this.panel4.PerformLayout(); this.ResumeLayout(false);