diff --git a/src/PBAnaly/MainForm.cs b/src/PBAnaly/MainForm.cs index f260d3d..7077f90 100644 --- a/src/PBAnaly/MainForm.cs +++ b/src/PBAnaly/MainForm.cs @@ -525,7 +525,8 @@ namespace PBAnaly data_tab.ResumeLayout(); int row = 0; int col = 0; - + data_tab.Dock = DockStyle.Fill; + DataProcess_panel.Controls.Add(data_tab); int index = 0; foreach (var bname in bioanalyName) { @@ -547,7 +548,8 @@ namespace PBAnaly index++; item.GetPanel.Dock = DockStyle.Fill; data_tab.Controls.Add(item.GetPanel, col, row); - item.GetImagePanel.CenterPictureBox(); + item.GetImagePanel.image_pl.SizeMode = PictureBoxSizeMode.Zoom; + item.GetImagePanel.ava_auto_Click(null, null); if (col < data_tab.ColumnCount - 2) { col++; @@ -560,9 +562,6 @@ namespace PBAnaly } - - data_tab.Dock = DockStyle.Fill; - DataProcess_panel.Controls.Add(data_tab); } else { diff --git a/src/PBAnaly/Module/BioanalysisMannage.cs b/src/PBAnaly/Module/BioanalysisMannage.cs index d97c152..530aa48 100644 --- a/src/PBAnaly/Module/BioanalysisMannage.cs +++ b/src/PBAnaly/Module/BioanalysisMannage.cs @@ -129,8 +129,8 @@ namespace PBAnaly.Module private System.Drawing.Point curStartPolygonPoint = new System.Drawing.Point(0, 0); private System.Drawing.Point curPolygonPoint = new System.Drawing.Point(0, 0); - private System.Drawing.Point startPoint = new System.Drawing.Point(-10, 0); - private System.Drawing.Point endPoint = new System.Drawing.Point(-10, 0); + private System.Drawing.Point startPoint = new System.Drawing.Point(-100, 0); + private System.Drawing.Point endPoint = new System.Drawing.Point(-100, 0); private bool isStartCircleDragged, isEndCircleDragged; @@ -1892,6 +1892,7 @@ namespace PBAnaly.Module public void Rifresh() { imagePanel.pl_panel_image.Dock = DockStyle.Fill; + imagePanel.image_pl.SizeMode = PictureBoxSizeMode.StretchImage; imagePanel.tableLayoutPanel2.Controls.Add(imagePanel.pl_panel_image, 0, 0); imagePanel.tableLayoutPanel2.Controls.Add(imagePanel.tlp_right_panel, 1, 0); imagePanel.tlp_right_panel.Controls.Add(imagePanel.image_pr, 0, 0); diff --git a/src/PBAnaly/UI/BioanalyImagePanel.Designer.cs b/src/PBAnaly/UI/BioanalyImagePanel.Designer.cs index e2097db..5696266 100644 --- a/src/PBAnaly/UI/BioanalyImagePanel.Designer.cs +++ b/src/PBAnaly/UI/BioanalyImagePanel.Designer.cs @@ -32,6 +32,7 @@ this.panel1 = new AntdUI.Panel(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.panel2 = new AntdUI.Panel(); + this.label2 = new AntdUI.Label(); this.cbb_mode = new System.Windows.Forms.ComboBox(); this.lb_imageIndex = new AntdUI.Label(); this.cb_scientific = new AntdUI.Checkbox(); @@ -50,7 +51,6 @@ this.tlp_right_panel = new System.Windows.Forms.TableLayoutPanel(); this.lb_wh = new AntdUI.Label(); this.image_pr = new AntdUI.Image3D(); - this.label2 = new AntdUI.Label(); this.panel1.SuspendLayout(); this.tableLayoutPanel1.SuspendLayout(); this.panel2.SuspendLayout(); @@ -120,6 +120,16 @@ this.panel2.TabIndex = 0; this.panel2.Text = "panel2"; // + // label2 + // + this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left))); + this.label2.Location = new System.Drawing.Point(36, 0); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(36, 23); + this.label2.TabIndex = 1; + this.label2.Text = "模式:"; + // // cbb_mode // this.cbb_mode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; @@ -338,16 +348,6 @@ this.image_pr.TabIndex = 1; this.image_pr.Text = "image3D1"; // - // label2 - // - this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left))); - this.label2.Location = new System.Drawing.Point(36, 0); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(36, 23); - this.label2.TabIndex = 1; - this.label2.Text = "模式:"; - // // BioanalyImagePanel // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);