diff --git a/src/PBAnaly/MainForm.cs b/src/PBAnaly/MainForm.cs index 1bb68be..b9f65e8 100644 --- a/src/PBAnaly/MainForm.cs +++ b/src/PBAnaly/MainForm.cs @@ -488,7 +488,7 @@ namespace PBAnaly #endregion if (selectedFilePath != "") { - + if (lanesMannages.TryGetValue(selectedFilePath, out var value)) { @@ -528,7 +528,7 @@ namespace PBAnaly //} //#endregion - //if (selectedFilePath != "") + //if (selectedFilePath != "") //{ // // Save Log Information // Read_Write_Log read_Write_Log = new Read_Write_Log(); diff --git a/src/PBAnaly/Module/LanesMannage.cs b/src/PBAnaly/Module/LanesMannage.cs index 14044c6..998c5b8 100644 --- a/src/PBAnaly/Module/LanesMannage.cs +++ b/src/PBAnaly/Module/LanesMannage.cs @@ -1,11 +1,14 @@ -using OpenCvSharp; +using Aspose.Pdf.AI; +using OpenCvSharp; using PBAnaly.UI; using PBBiologyVC; +using SharpDX.D3DCompiler; using SixLabors.ImageSharp; using SixLabors.ImageSharp.PixelFormats; using Sunny.UI; using System; using System.Collections.Generic; +using System.Drawing; using System.IO; using System.Linq; using System.Runtime.InteropServices; @@ -14,12 +17,14 @@ using System.Threading; using System.Threading.Tasks; using System.Windows.Forms; using static PBAnaly.Module.BioanalysisMannage; +using static PBAnaly.Module.LanesMannage; namespace PBAnaly.Module { public class LanesMannage { #region 构造函数 + private enum Corner { None, TopLeft, TopRight, BottomLeft, BottomRight, drawMouse } public struct band_infos { public float startX; // X作为筛选的必要条件 当鼠标进入x的范围就是进入某一个泳道,在根据y的范围判断是否在这个泳道里 @@ -32,6 +37,23 @@ namespace PBAnaly.Module public int thick; public _band_info _Info; } + + public struct Lanes_info + { + public bool isSelect;//是否被选中 + public int colorIndex; + public int x; + public int y; + public int width; + public int height; + public _band_info band_Info; + } + + public struct LanesAttribute + { + public bool showLanes; + public bool showbands; + } #endregion #region 参数 private string path { get; set; } @@ -40,7 +62,7 @@ namespace PBAnaly.Module PBBiology pbb = new PBBiology(); private Image image_L16; private byte[] image_byte; - private byte[] image_8bit_byte; + private byte[] image_8bit_rgb_byte; private Image image_rgb_24 = null; public bool IsActive { get; set; } // 当前窗口是否在活跃状态 用来判断是否需要操作 public int ImageIndex { get; set; }// 图片加载进来的序号 @@ -53,6 +75,10 @@ namespace PBAnaly.Module private bool isalgRun = false; private bool isUpdateAlg = false; private Queue queueAlgAttribute = new Queue(); + private List lanes_Infos = new List(); + + private List laneColorList = new List();// 泳道的颜色表 + private LanesAttribute lanesAttribute = new LanesAttribute(); #endregion public LanesMannage(string _path, ReaLTaiizor.Controls.Panel _pl_right, Dictionary lanesMannages) @@ -82,6 +108,7 @@ namespace PBAnaly.Module imagePaletteForm.BringToFront(); imagePaletteForm.Show(); + InitColorList(); Init(); RefreshImage();// 初始化图像 @@ -163,11 +190,38 @@ namespace PBAnaly.Module //} } + private void InitColorList() + { + laneColorList.Clear(); + + laneColorList.Add(System.Drawing.Color.Red); // 红色 + laneColorList.Add(System.Drawing.Color.Green); // 绿色 + laneColorList.Add(System.Drawing.Color.Blue); // 蓝色 + laneColorList.Add(System.Drawing.Color.Yellow); // 黄色 + laneColorList.Add(System.Drawing.Color.Purple); // 紫色 + laneColorList.Add(System.Drawing.Color.Orange); // 橙色 + laneColorList.Add(System.Drawing.Color.Pink); // 粉色 + laneColorList.Add(System.Drawing.Color.Brown); // 棕色 + laneColorList.Add(System.Drawing.Color.Gray); // 灰色 + laneColorList.Add(System.Drawing.Color.Cyan); // 青色 + laneColorList.Add(System.Drawing.Color.Magenta); // 品红 + laneColorList.Add(System.Drawing.Color.Lime); // 酸橙绿 + laneColorList.Add(System.Drawing.Color.Teal); // 水鸭色 + laneColorList.Add(System.Drawing.Color.Olive); // 橄榄色 + laneColorList.Add(System.Drawing.Color.Navy); // 海军蓝 + laneColorList.Add(System.Drawing.Color.Silver); // 银色 + laneColorList.Add(System.Drawing.Color.Gold); // 金色 + laneColorList.Add(System.Drawing.Color.Violet); // 紫罗兰色 + } /// /// 初始化控件 初始化配置 /// private void Init() { + lanesAttribute.showLanes = true; + lanesAttribute.showbands = true; + + imagePanel.image_pl.MouseDown += Image_pl_MouseDown; imagePanel.image_pl.DoubleClick += Image_pl_DoubleClick; imagePanel.image_pl.MouseMove += Image_pl_MouseMove; @@ -228,7 +282,7 @@ namespace PBAnaly.Module return false; } - image_8bit_byte = new byte[image_L16.Width * image_L16.Height * 3]; + image_8bit_rgb_byte = new byte[image_L16.Width * image_L16.Height * 3]; for (int i = 0; i < image_L16.Width * image_L16.Height; i++) { @@ -236,12 +290,12 @@ namespace PBAnaly.Module ushort pixel16bit = (ushort)(image_byte[i * 2] | (image_byte[i * 2 + 1] << 8)); byte gray = (byte)((pixel16bit / 65535.0) * 255) ; // 将R、G、B分量存储到RGB格式的数组中 - image_8bit_byte[i * 3] = gray; - image_8bit_byte[i * 3 + 1] = gray; - image_8bit_byte[i * 3 + 2] = gray; + image_8bit_rgb_byte[i * 3] = gray; + image_8bit_rgb_byte[i * 3 + 1] = gray; + image_8bit_rgb_byte[i * 3 + 2] = gray; } - image_rgb_24 = util.ConvertByteArrayToRgb24Image(image_8bit_byte, image_L16.Width, image_L16.Height,3); + image_rgb_24 = util.ConvertByteArrayToRgb24Image(image_8bit_rgb_byte, image_L16.Width, image_L16.Height,3); imagePanel.SetButtomLabel($"{image_L16.Width} x {image_L16.Height}"); if (path.Length > 0) { @@ -270,6 +324,33 @@ namespace PBAnaly.Module imagePanel.SetImage(image_rgb_24); } } + + + private bool IsPointInRectangles(System.Drawing.Point point, List _lanes, out Corner cner, out Lanes_info curRect, out int index) + { + curRect = new Lanes_info(); + cner = Corner.None; + index = 0; + foreach (var lanes in _lanes) + { + System.Drawing.Rectangle rect = new System.Drawing.Rectangle(lanes.x,lanes.y,lanes.width,lanes.height); + System.Drawing.Point topLeft = new System.Drawing.Point(rect.Left, rect.Top); + System.Drawing.Point topRight = new System.Drawing.Point(rect.Right, rect.Top); + System.Drawing.Point bottomLeft = new System.Drawing.Point(rect.Left, rect.Bottom); + System.Drawing.Point bottomRight = new System.Drawing.Point(rect.Right, rect.Bottom); + + if (rect.Contains(point)) + { + imagePanel.image_pl.Cursor = Cursors.Hand; + cner = Corner.drawMouse; + curRect = lanes; + return true; + } + index++; + + } + return false; + } #endregion @@ -278,7 +359,75 @@ namespace PBAnaly.Module private void Image_pl_Paint(object sender, PaintEventArgs e) { - + Graphics g = e.Graphics; + + int index = 0; + List colorUpdateIndex = new List(); + foreach (var rect in lanes_Infos) + { + if (index >= laneColorList.Count) + { + index = 0; + } + colorUpdateIndex.Add(index); + var color = laneColorList[index]; + System.Drawing.Rectangle p = new System.Drawing.Rectangle(rect.x, rect.y, rect.width, rect.height); + + var r = ImageProcess.ConvertRealRectangleToPictureBox(p, imagePanel.image_pl); + if (lanesAttribute.showLanes) + { + if (rect.isSelect) + { + e.Graphics.DrawRectangle(color, r, false, 6); + } + else + { + e.Graphics.DrawRectangle(color, r, false, 2); + } + } + + int centerX = (int)(p.X + (p.Right - p.X) / 2.0); + int centerY = 0; + foreach (var item in rect.band_Info.band_point) + { + if (item[0] == -1) continue; + // 绘制十字 + centerY = p.Y + item[0]; + var p1 = new System.Drawing.Point(centerX - 5, centerY); + var p2 = new System.Drawing.Point(centerX + 5, centerY); + p1 = ImageProcess.ConvertRealToPictureBox(p1, imagePanel.image_pl); + p2 = ImageProcess.ConvertRealToPictureBox(p2, imagePanel.image_pl); + + e.Graphics.DrawLine(Pens.Red, p1, p2); + p1 = new System.Drawing.Point(centerX, centerY - 5); + p2 = new System.Drawing.Point(centerX, centerY + 5); + p1 = ImageProcess.ConvertRealToPictureBox(p1, imagePanel.image_pl); + p2 = ImageProcess.ConvertRealToPictureBox(p2, imagePanel.image_pl); + e.Graphics.DrawLine(Pens.Red, p1, p2); + + // 显示条带 + if (lanesAttribute.showbands) + { + p1 = new System.Drawing.Point(p.X, p.Top + item[1]); + p2 = new System.Drawing.Point(p.Right, p.Top + item[2]); + p1 = ImageProcess.ConvertRealToPictureBox(p1, imagePanel.image_pl); + p2 = ImageProcess.ConvertRealToPictureBox(p2, imagePanel.image_pl); + + e.Graphics.DrawRectangle(Pens.Blue,p1.X,p1.Y,p2.X - p1.X,p2.Y - p1.Y); + } + + } + + + + index++; + } + for (int i = 0; i < colorUpdateIndex.Count; i++) + { + Lanes_info _Info = lanes_Infos[i]; + _Info.colorIndex = colorUpdateIndex[i]; + lanes_Infos[i] = _Info; + } } private void Image_pl_MouseUp(object sender, MouseEventArgs e) @@ -288,7 +437,13 @@ namespace PBAnaly.Module private void Image_pl_MouseMove(object sender, MouseEventArgs e) { - + System.Drawing.Point readLoction = ImageProcess.ConvertPictureBoxToReal(e.Location, imagePanel.image_pl); + imagePanel.image_pl.Cursor = Cursors.Default; + if (IsPointInRectangles(readLoction, lanes_Infos, out var cner, out var curRect, out int index)) + { + + } + } private void Image_pl_DoubleClick(object sender, EventArgs e) @@ -298,7 +453,20 @@ namespace PBAnaly.Module private void Image_pl_MouseDown(object sender, MouseEventArgs e) { + System.Drawing.Point readLoction = ImageProcess.ConvertPictureBoxToReal(e.Location, imagePanel.image_pl); Wdb_title_Click(null, null); + if (IsPointInRectangles(readLoction, lanes_Infos, out var cner, out var curRect, out int index)) + { + for (int i = 0; i < lanes_Infos.Count; i++) + { + Lanes_info lanes = lanes_Infos[i]; + lanes.isSelect = false; + lanes_Infos[i] = lanes; + } + curRect.isSelect = true; + lanes_Infos[index] = curRect; + imagePanel.image_pl.Invalidate(); + } } private void ImagePanel_FormClosed(object sender, FormClosedEventArgs e) { @@ -338,7 +506,52 @@ namespace PBAnaly.Module #region imagePalette private void Mb_findLanes_Click(object sender, EventArgs e) { - + byte[] gray = new byte[image_L16.Width * image_L16.Height]; + for (int i = 0; i < image_L16.Width * image_L16.Height; i++) + { + // 获取16位图像数据中的当前像素值 + ushort pixel16bit = (ushort)(image_byte[i * 2] | (image_byte[i * 2 + 1] << 8)); + byte grayValue = (byte)((pixel16bit / 65535.0) * 255); + gray[i] = grayValue; + } + unsafe + { + fixed (byte* data = gray) + { + // 寻找泳道 + var proteinRect = pbb.getProteinRectVC(data, (ushort)image_L16.Width, (ushort)image_L16.Height); + var band_info = new List<_band_info>(); + + // 根据泳道找条带 + fixed (byte* p = image_byte) + { + pbb.getProteinBandsVC(p, 16, (ushort)image_L16.Width, (ushort)image_L16.Height, proteinRect, ref band_info); + } + pbb.adjustBands(band_info, 5); + pbb.molecularWeightResult(ref proteinRect, ref band_info); + lanes_Infos.Clear(); + int index = 0; + foreach (var item in proteinRect) + { + + Lanes_info lanes_Info = new Lanes_info(); + if (index == 0) + { + lanes_Info.isSelect = true;// 认为查找后第一个就是被选中的状态 + } + lanes_Info.x = item.X; + lanes_Info.y = item.Y; + lanes_Info.height = item.Height; + lanes_Info.width = item.Width; + lanes_Info.band_Info = band_info[index]; + lanes_Infos.Add(lanes_Info); + index++; + } + + } + } + + imagePanel.image_pl.Invalidate(); } #endregion diff --git a/src/PBAnaly/PBAnaly.csproj b/src/PBAnaly/PBAnaly.csproj index 2221243..79d6bb5 100644 --- a/src/PBAnaly/PBAnaly.csproj +++ b/src/PBAnaly/PBAnaly.csproj @@ -150,6 +150,12 @@ AnalyzeDataForm.cs + + Form + + + LaneLineChartForm.cs + Form @@ -269,6 +275,9 @@ AnalyzeDataForm.cs + + LaneLineChartForm.cs + LanesImagePaletteForm.cs diff --git a/src/PBAnaly/UI/LaneLineChartForm.Designer.cs b/src/PBAnaly/UI/LaneLineChartForm.Designer.cs new file mode 100644 index 0000000..87e9722 --- /dev/null +++ b/src/PBAnaly/UI/LaneLineChartForm.Designer.cs @@ -0,0 +1,110 @@ +namespace PBAnaly.UI +{ + partial class LaneLineChartForm + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.menuStrip1 = new System.Windows.Forms.MenuStrip(); + this.文件ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.选项ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.单一泳道ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.显示多个泳道ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.显示所有泳道ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.menuStrip1.SuspendLayout(); + this.SuspendLayout(); + // + // menuStrip1 + // + this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.文件ToolStripMenuItem, + this.选项ToolStripMenuItem}); + this.menuStrip1.Location = new System.Drawing.Point(0, 0); + this.menuStrip1.Name = "menuStrip1"; + this.menuStrip1.Size = new System.Drawing.Size(728, 25); + this.menuStrip1.TabIndex = 0; + this.menuStrip1.Text = "menuStrip1"; + // + // 文件ToolStripMenuItem + // + this.文件ToolStripMenuItem.Name = "文件ToolStripMenuItem"; + this.文件ToolStripMenuItem.Size = new System.Drawing.Size(44, 21); + this.文件ToolStripMenuItem.Text = "文件"; + // + // 选项ToolStripMenuItem + // + this.选项ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.单一泳道ToolStripMenuItem, + this.显示多个泳道ToolStripMenuItem, + this.显示所有泳道ToolStripMenuItem}); + this.选项ToolStripMenuItem.Name = "选项ToolStripMenuItem"; + this.选项ToolStripMenuItem.Size = new System.Drawing.Size(44, 21); + this.选项ToolStripMenuItem.Text = "选项"; + // + // 单一泳道ToolStripMenuItem + // + this.单一泳道ToolStripMenuItem.Name = "单一泳道ToolStripMenuItem"; + this.单一泳道ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.单一泳道ToolStripMenuItem.Text = "显示单一泳道"; + // + // 显示多个泳道ToolStripMenuItem + // + this.显示多个泳道ToolStripMenuItem.Name = "显示多个泳道ToolStripMenuItem"; + this.显示多个泳道ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.显示多个泳道ToolStripMenuItem.Text = "显示多个泳道"; + // + // 显示所有泳道ToolStripMenuItem + // + this.显示所有泳道ToolStripMenuItem.Name = "显示所有泳道ToolStripMenuItem"; + this.显示所有泳道ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.显示所有泳道ToolStripMenuItem.Text = "显示所有泳道"; + // + // LaneLineChartForm + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(728, 394); + this.Controls.Add(this.menuStrip1); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.Name = "LaneLineChartForm"; + this.Text = "泳道轮廓"; + this.menuStrip1.ResumeLayout(false); + this.menuStrip1.PerformLayout(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.MenuStrip menuStrip1; + private System.Windows.Forms.ToolStripMenuItem 文件ToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem 选项ToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem 单一泳道ToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem 显示多个泳道ToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem 显示所有泳道ToolStripMenuItem; + } +} \ No newline at end of file diff --git a/src/PBAnaly/UI/LaneLineChartForm.cs b/src/PBAnaly/UI/LaneLineChartForm.cs new file mode 100644 index 0000000..abe9595 --- /dev/null +++ b/src/PBAnaly/UI/LaneLineChartForm.cs @@ -0,0 +1,24 @@ + +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace PBAnaly.UI +{ + public partial class LaneLineChartForm : Form + { + + public LaneLineChartForm() + { + InitializeComponent(); + + + } + } +} diff --git a/src/PBAnaly/UI/LaneLineChartForm.resx b/src/PBAnaly/UI/LaneLineChartForm.resx new file mode 100644 index 0000000..d5494e3 --- /dev/null +++ b/src/PBAnaly/UI/LaneLineChartForm.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 17, 17 + + \ No newline at end of file diff --git a/src/PBAnaly/UI/LanesImagePaletteForm.Designer.cs b/src/PBAnaly/UI/LanesImagePaletteForm.Designer.cs index 2e1f910..914f13a 100644 --- a/src/PBAnaly/UI/LanesImagePaletteForm.Designer.cs +++ b/src/PBAnaly/UI/LanesImagePaletteForm.Designer.cs @@ -43,6 +43,7 @@ this.materialCheckbox1 = new MaterialSkin.Controls.MaterialCheckbox(); this.clasi_strips = new AntdUI.CollapseItem(); this.clasi_conformity = new AntdUI.CollapseItem(); + this.checkbox2 = new AntdUI.Checkbox(); this.collapse1.SuspendLayout(); this.clasi_lanes.SuspendLayout(); this.tableLayoutPanel1.SuspendLayout(); @@ -65,7 +66,7 @@ this.collapse1.Items.Add(this.clasi_strips); this.collapse1.Items.Add(this.clasi_conformity); this.collapse1.Location = new System.Drawing.Point(0, 0); - this.collapse1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.collapse1.Margin = new System.Windows.Forms.Padding(2); this.collapse1.Name = "collapse1"; this.collapse1.Size = new System.Drawing.Size(304, 495); this.collapse1.TabIndex = 0; @@ -76,7 +77,7 @@ this.clasi_lanes.Controls.Add(this.tableLayoutPanel1); this.clasi_lanes.Expand = true; this.clasi_lanes.Location = new System.Drawing.Point(18, 58); - this.clasi_lanes.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.clasi_lanes.Margin = new System.Windows.Forms.Padding(2); this.clasi_lanes.Name = "clasi_lanes"; this.clasi_lanes.Size = new System.Drawing.Size(268, 175); this.clasi_lanes.TabIndex = 0; @@ -98,7 +99,7 @@ this.tableLayoutPanel1.Controls.Add(this.panel1, 1, 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(2, 2, 2, 2); + this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(2); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; this.tableLayoutPanel1.RowCount = 5; this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 36F)); @@ -192,12 +193,13 @@ // panel1 // this.tableLayoutPanel1.SetColumnSpan(this.panel1, 4); + this.panel1.Controls.Add(this.checkbox2); this.panel1.Controls.Add(this.label1); this.panel1.Controls.Add(this.numericUpDown1); this.panel1.Controls.Add(this.checkbox1); this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; this.panel1.Location = new System.Drawing.Point(84, 2); - this.panel1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.panel1.Margin = new System.Windows.Forms.Padding(2); this.panel1.Name = "panel1"; this.tableLayoutPanel1.SetRowSpan(this.panel1, 4); this.panel1.Size = new System.Drawing.Size(160, 140); @@ -208,7 +210,7 @@ // this.label1.Font = new System.Drawing.Font("宋体", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label1.Location = new System.Drawing.Point(2, 40); - this.label1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.label1.Margin = new System.Windows.Forms.Padding(2); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(114, 25); this.label1.TabIndex = 7; @@ -217,7 +219,7 @@ // numericUpDown1 // this.numericUpDown1.Location = new System.Drawing.Point(2, 69); - this.numericUpDown1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.numericUpDown1.Margin = new System.Windows.Forms.Padding(2); this.numericUpDown1.Name = "numericUpDown1"; this.numericUpDown1.Size = new System.Drawing.Size(57, 21); this.numericUpDown1.TabIndex = 6; @@ -226,7 +228,7 @@ // this.checkbox1.AutoCheck = true; this.checkbox1.Location = new System.Drawing.Point(2, 11); - this.checkbox1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.checkbox1.Margin = new System.Windows.Forms.Padding(2); this.checkbox1.Name = "checkbox1"; this.checkbox1.Size = new System.Drawing.Size(106, 18); this.checkbox1.TabIndex = 0; @@ -237,7 +239,7 @@ this.clasi_init.Controls.Add(this.materialCheckbox1); this.clasi_init.Expand = true; this.clasi_init.Location = new System.Drawing.Point(18, 305); - this.clasi_init.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.clasi_init.Margin = new System.Windows.Forms.Padding(2); this.clasi_init.Name = "clasi_init"; this.clasi_init.Size = new System.Drawing.Size(268, 162); this.clasi_init.TabIndex = 1; @@ -262,7 +264,7 @@ // clasi_strips // this.clasi_strips.Location = new System.Drawing.Point(-75, -48); - this.clasi_strips.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.clasi_strips.Margin = new System.Windows.Forms.Padding(2); this.clasi_strips.Name = "clasi_strips"; this.clasi_strips.Size = new System.Drawing.Size(75, 48); this.clasi_strips.TabIndex = 2; @@ -271,12 +273,22 @@ // clasi_conformity // this.clasi_conformity.Location = new System.Drawing.Point(-75, -48); - this.clasi_conformity.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.clasi_conformity.Margin = new System.Windows.Forms.Padding(2); this.clasi_conformity.Name = "clasi_conformity"; this.clasi_conformity.Size = new System.Drawing.Size(75, 48); this.clasi_conformity.TabIndex = 3; this.clasi_conformity.Text = "整合"; // + // checkbox2 + // + this.checkbox2.AutoCheck = true; + this.checkbox2.Location = new System.Drawing.Point(0, 111); + this.checkbox2.Margin = new System.Windows.Forms.Padding(2); + this.checkbox2.Name = "checkbox2"; + this.checkbox2.Size = new System.Drawing.Size(106, 18); + this.checkbox2.TabIndex = 8; + this.checkbox2.Text = "总是显示泳道"; + // // LanesImagePaletteForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -284,7 +296,7 @@ this.ClientSize = new System.Drawing.Size(304, 495); this.Controls.Add(this.collapse1); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; - this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.Margin = new System.Windows.Forms.Padding(2); this.Name = "LanesImagePaletteForm"; this.Text = "BioanayImagePaletteForm"; this.collapse1.ResumeLayout(false); @@ -316,5 +328,6 @@ private AntdUI.Checkbox checkbox1; private AntdUI.Label label1; public MaterialSkin.Controls.MaterialButton mb_findLanes; + private AntdUI.Checkbox checkbox2; } } \ No newline at end of file diff --git a/src/PBAnaly/UI/LanesImagePanel.Designer.cs b/src/PBAnaly/UI/LanesImagePanel.Designer.cs index 3c7f242..20b708f 100644 --- a/src/PBAnaly/UI/LanesImagePanel.Designer.cs +++ b/src/PBAnaly/UI/LanesImagePanel.Designer.cs @@ -32,6 +32,8 @@ this.wdb_title = new AntdUI.WindowBar(); this.panel1 = new AntdUI.Panel(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); + this.panel2 = new AntdUI.Panel(); + this.lb_imageIndex = new AntdUI.Label(); this.flowPanel1 = new AntdUI.FlowPanel(); this.ava_saveReport = new AntdUI.Avatar(); this.ava_save = new AntdUI.Avatar(); @@ -51,10 +53,9 @@ this.ctms_strop_copy = new System.Windows.Forms.ToolStripMenuItem(); this.ctms_strop_stickup = new System.Windows.Forms.ToolStripMenuItem(); this.ctms_strop_delete = new System.Windows.Forms.ToolStripMenuItem(); - this.lb_imageIndex = new AntdUI.Label(); - this.panel2 = new AntdUI.Panel(); this.panel1.SuspendLayout(); this.tableLayoutPanel1.SuspendLayout(); + this.panel2.SuspendLayout(); this.flowPanel1.SuspendLayout(); this.pl_bottom.SuspendLayout(); this.tlp_bottom_panel.SuspendLayout(); @@ -63,7 +64,6 @@ this.pl_bg_panel.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.image_pl)).BeginInit(); this.ctms_strop.SuspendLayout(); - this.panel2.SuspendLayout(); this.SuspendLayout(); // // wdb_title @@ -72,12 +72,11 @@ this.wdb_title.Dock = System.Windows.Forms.DockStyle.Top; this.wdb_title.ForeColor = System.Drawing.SystemColors.ButtonFace; this.wdb_title.IsMax = false; - this.wdb_title.Location = new System.Drawing.Point(4, 4); - this.wdb_title.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.wdb_title.Location = new System.Drawing.Point(3, 3); this.wdb_title.MinimizeBox = false; this.wdb_title.Name = "wdb_title"; this.wdb_title.ShowIcon = false; - this.wdb_title.Size = new System.Drawing.Size(469, 29); + this.wdb_title.Size = new System.Drawing.Size(352, 23); this.wdb_title.TabIndex = 0; this.wdb_title.Text = " "; this.wdb_title.UseSystemStyleColor = true; @@ -86,43 +85,67 @@ // this.panel1.Controls.Add(this.tableLayoutPanel1); this.panel1.Dock = System.Windows.Forms.DockStyle.Top; - this.panel1.Location = new System.Drawing.Point(4, 33); - this.panel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.panel1.Location = new System.Drawing.Point(3, 26); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(469, 29); + this.panel1.Size = new System.Drawing.Size(352, 23); this.panel1.TabIndex = 1; this.panel1.Text = "panel1"; // // tableLayoutPanel1 // this.tableLayoutPanel1.ColumnCount = 4; - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 175F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 92F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 131F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 34F)); 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, 167F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 149F)); this.tableLayoutPanel1.Controls.Add(this.panel2, 0, 0); this.tableLayoutPanel1.Controls.Add(this.flowPanel1, 3, 0); - this.tableLayoutPanel1.Controls.Add(this.ava_auto, 2, 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(4, 4, 4, 4); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; this.tableLayoutPanel1.RowCount = 1; this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(469, 29); + this.tableLayoutPanel1.Size = new System.Drawing.Size(352, 23); this.tableLayoutPanel1.TabIndex = 0; // + // panel2 + // + this.panel2.Back = System.Drawing.SystemColors.Control; + this.panel2.Controls.Add(this.lb_imageIndex); + this.panel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel2.Location = new System.Drawing.Point(0, 0); + this.panel2.Margin = new System.Windows.Forms.Padding(0); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(131, 23); + this.panel2.TabIndex = 0; + this.panel2.Text = "panel2"; + // + // lb_imageIndex + // + this.lb_imageIndex.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left))); + this.lb_imageIndex.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.lb_imageIndex.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(216)))), ((int)(((byte)(83)))), ((int)(((byte)(36))))); + this.lb_imageIndex.Location = new System.Drawing.Point(3, 0); + this.lb_imageIndex.Name = "lb_imageIndex"; + this.lb_imageIndex.Size = new System.Drawing.Size(27, 23); + this.lb_imageIndex.TabIndex = 0; + this.lb_imageIndex.Text = "0"; + this.lb_imageIndex.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // // flowPanel1 // - this.flowPanel1.Controls.Add(this.ava_saveReport); + this.flowPanel1.BadgeAlign = AntdUI.TAlignFrom.TL; this.flowPanel1.Controls.Add(this.ava_save); + this.flowPanel1.Controls.Add(this.ava_saveReport); + this.flowPanel1.Controls.Add(this.ava_auto); this.flowPanel1.Controls.Add(this.ava_zoom_out); this.flowPanel1.Controls.Add(this.ava__zoom_in); this.flowPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.flowPanel1.Location = new System.Drawing.Point(302, 0); + this.flowPanel1.Location = new System.Drawing.Point(203, 0); this.flowPanel1.Margin = new System.Windows.Forms.Padding(0); this.flowPanel1.Name = "flowPanel1"; - this.flowPanel1.Size = new System.Drawing.Size(167, 29); + this.flowPanel1.Size = new System.Drawing.Size(149, 23); this.flowPanel1.TabIndex = 2; this.flowPanel1.Text = "flowPanel1"; // @@ -131,10 +154,9 @@ this.ava_saveReport.Cursor = System.Windows.Forms.Cursors.Hand; this.ava_saveReport.Image = global::PBAnaly.Properties.Resources.数据报告__1_; this.ava_saveReport.ImageFit = AntdUI.TFit.Contain; - this.ava_saveReport.Location = new System.Drawing.Point(127, 4); - this.ava_saveReport.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.ava_saveReport.Location = new System.Drawing.Point(91, 3); this.ava_saveReport.Name = "ava_saveReport"; - this.ava_saveReport.Size = new System.Drawing.Size(28, 21); + this.ava_saveReport.Size = new System.Drawing.Size(21, 17); this.ava_saveReport.TabIndex = 7; this.ava_saveReport.Text = "a"; // @@ -143,10 +165,9 @@ this.ava_save.Cursor = System.Windows.Forms.Cursors.Hand; this.ava_save.Image = global::PBAnaly.Properties.Resources.保存图片; this.ava_save.ImageFit = AntdUI.TFit.Contain; - this.ava_save.Location = new System.Drawing.Point(86, 4); - this.ava_save.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.ava_save.Location = new System.Drawing.Point(118, 3); this.ava_save.Name = "ava_save"; - this.ava_save.Size = new System.Drawing.Size(33, 21); + this.ava_save.Size = new System.Drawing.Size(23, 17); this.ava_save.TabIndex = 6; this.ava_save.Text = "a"; this.ava_save.Click += new System.EventHandler(this.ava_save_Click); @@ -156,10 +177,9 @@ this.ava_zoom_out.Cursor = System.Windows.Forms.Cursors.Hand; this.ava_zoom_out.Image = global::PBAnaly.Properties.Resources.缩小; this.ava_zoom_out.ImageFit = AntdUI.TFit.Contain; - this.ava_zoom_out.Location = new System.Drawing.Point(45, 4); - this.ava_zoom_out.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.ava_zoom_out.Location = new System.Drawing.Point(34, 3); this.ava_zoom_out.Name = "ava_zoom_out"; - this.ava_zoom_out.Size = new System.Drawing.Size(33, 21); + this.ava_zoom_out.Size = new System.Drawing.Size(25, 17); this.ava_zoom_out.TabIndex = 5; this.ava_zoom_out.Text = "a"; this.ava_zoom_out.Click += new System.EventHandler(this.ava_zoom_out_Click); @@ -169,10 +189,9 @@ this.ava__zoom_in.Cursor = System.Windows.Forms.Cursors.Hand; this.ava__zoom_in.Image = global::PBAnaly.Properties.Resources.放大; this.ava__zoom_in.ImageFit = AntdUI.TFit.Contain; - this.ava__zoom_in.Location = new System.Drawing.Point(4, 4); - this.ava__zoom_in.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.ava__zoom_in.Location = new System.Drawing.Point(3, 3); this.ava__zoom_in.Name = "ava__zoom_in"; - this.ava__zoom_in.Size = new System.Drawing.Size(33, 21); + this.ava__zoom_in.Size = new System.Drawing.Size(25, 17); this.ava__zoom_in.TabIndex = 4; this.ava__zoom_in.Text = ""; this.ava__zoom_in.Click += new System.EventHandler(this.ava__zoom_in_Click); @@ -183,10 +202,9 @@ this.ava_auto.HandCursor = System.Windows.Forms.Cursors.IBeam; this.ava_auto.Image = global::PBAnaly.Properties.Resources.全屏; this.ava_auto.ImageFit = AntdUI.TFit.Contain; - this.ava_auto.Location = new System.Drawing.Point(271, 4); - this.ava_auto.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.ava_auto.Location = new System.Drawing.Point(65, 3); this.ava_auto.Name = "ava_auto"; - this.ava_auto.Size = new System.Drawing.Size(27, 21); + this.ava_auto.Size = new System.Drawing.Size(20, 17); this.ava_auto.TabIndex = 3; this.ava_auto.Text = "a"; this.ava_auto.Click += new System.EventHandler(this.ava_auto_Click); @@ -196,10 +214,9 @@ this.pl_bottom.BackColor = System.Drawing.SystemColors.ActiveCaptionText; this.pl_bottom.Controls.Add(this.tlp_bottom_panel); this.pl_bottom.Dock = System.Windows.Forms.DockStyle.Bottom; - this.pl_bottom.Location = new System.Drawing.Point(4, 365); - this.pl_bottom.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.pl_bottom.Location = new System.Drawing.Point(3, 292); this.pl_bottom.Name = "pl_bottom"; - this.pl_bottom.Size = new System.Drawing.Size(469, 16); + this.pl_bottom.Size = new System.Drawing.Size(352, 13); this.pl_bottom.TabIndex = 2; this.pl_bottom.Text = "panel3"; // @@ -215,11 +232,10 @@ this.tlp_bottom_panel.Controls.Add(this.lb_size, 4, 0); this.tlp_bottom_panel.Dock = System.Windows.Forms.DockStyle.Fill; this.tlp_bottom_panel.Location = new System.Drawing.Point(0, 0); - this.tlp_bottom_panel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tlp_bottom_panel.Name = "tlp_bottom_panel"; this.tlp_bottom_panel.RowCount = 1; this.tlp_bottom_panel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tlp_bottom_panel.Size = new System.Drawing.Size(469, 16); + this.tlp_bottom_panel.Size = new System.Drawing.Size(352, 13); this.tlp_bottom_panel.TabIndex = 1; // // lb_name @@ -230,7 +246,7 @@ this.lb_name.Location = new System.Drawing.Point(0, 0); this.lb_name.Margin = new System.Windows.Forms.Padding(0); this.lb_name.Name = "lb_name"; - this.lb_name.Size = new System.Drawing.Size(465, 16); + this.lb_name.Size = new System.Drawing.Size(348, 13); this.lb_name.TabIndex = 1; this.lb_name.Text = "800x600"; // @@ -239,10 +255,10 @@ this.lb_size.BackColor = System.Drawing.Color.Transparent; this.lb_size.Dock = System.Windows.Forms.DockStyle.Fill; this.lb_size.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(237)))), ((int)(((byte)(237)))), ((int)(((byte)(237))))); - this.lb_size.Location = new System.Drawing.Point(468, 0); + this.lb_size.Location = new System.Drawing.Point(351, 0); this.lb_size.Margin = new System.Windows.Forms.Padding(0); this.lb_size.Name = "lb_size"; - this.lb_size.Size = new System.Drawing.Size(1, 16); + this.lb_size.Size = new System.Drawing.Size(1, 13); this.lb_size.TabIndex = 0; this.lb_size.Text = "800x600"; this.lb_size.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -255,12 +271,11 @@ this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 2F)); this.tableLayoutPanel2.Controls.Add(this.pl_panel_image, 0, 0); this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel2.Location = new System.Drawing.Point(4, 62); - this.tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.tableLayoutPanel2.Location = new System.Drawing.Point(3, 49); this.tableLayoutPanel2.Name = "tableLayoutPanel2"; this.tableLayoutPanel2.RowCount = 1; this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel2.Size = new System.Drawing.Size(469, 303); + this.tableLayoutPanel2.Size = new System.Drawing.Size(352, 243); this.tableLayoutPanel2.TabIndex = 3; // // pl_panel_image @@ -275,11 +290,10 @@ this.pl_panel_image.BorderWidth = 5F; this.pl_panel_image.Controls.Add(this.pl_bg_panel); this.pl_panel_image.Dock = System.Windows.Forms.DockStyle.Fill; - this.pl_panel_image.Location = new System.Drawing.Point(4, 4); - this.pl_panel_image.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.pl_panel_image.Location = new System.Drawing.Point(3, 3); this.pl_panel_image.Name = "pl_panel_image"; - this.pl_panel_image.Padding = new System.Windows.Forms.Padding(7, 6, 7, 6); - this.pl_panel_image.Size = new System.Drawing.Size(459, 295); + this.pl_panel_image.Padding = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.pl_panel_image.Size = new System.Drawing.Size(344, 237); this.pl_panel_image.TabIndex = 0; this.pl_panel_image.Text = "panel4"; // @@ -287,9 +301,8 @@ // this.pl_bg_panel.Controls.Add(this.image_pl); this.pl_bg_panel.Location = new System.Drawing.Point(0, 0); - this.pl_bg_panel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.pl_bg_panel.Name = "pl_bg_panel"; - this.pl_bg_panel.Size = new System.Drawing.Size(297, 231); + this.pl_bg_panel.Size = new System.Drawing.Size(223, 185); this.pl_bg_panel.TabIndex = 0; this.pl_bg_panel.Text = "panel4"; // @@ -298,9 +311,8 @@ this.image_pl.ContextMenuStrip = this.ctms_strop; this.image_pl.Dock = System.Windows.Forms.DockStyle.Fill; this.image_pl.Location = new System.Drawing.Point(0, 0); - this.image_pl.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.image_pl.Name = "image_pl"; - this.image_pl.Size = new System.Drawing.Size(297, 231); + this.image_pl.Size = new System.Drawing.Size(223, 185); this.image_pl.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.image_pl.TabIndex = 0; this.image_pl.TabStop = false; @@ -314,75 +326,49 @@ this.ctms_strop_stickup, this.ctms_strop_delete}); this.ctms_strop.Name = "ctms_strop"; - this.ctms_strop.Size = new System.Drawing.Size(109, 82); + this.ctms_strop.Size = new System.Drawing.Size(101, 76); // // toolStripSeparator1 // this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(105, 6); + this.toolStripSeparator1.Size = new System.Drawing.Size(97, 6); // // ctms_strop_copy // this.ctms_strop_copy.Name = "ctms_strop_copy"; - this.ctms_strop_copy.Size = new System.Drawing.Size(108, 24); + this.ctms_strop_copy.Size = new System.Drawing.Size(100, 22); this.ctms_strop_copy.Text = "复制"; // // ctms_strop_stickup // this.ctms_strop_stickup.Name = "ctms_strop_stickup"; - this.ctms_strop_stickup.Size = new System.Drawing.Size(108, 24); + this.ctms_strop_stickup.Size = new System.Drawing.Size(100, 22); this.ctms_strop_stickup.Text = "粘贴"; // // ctms_strop_delete // this.ctms_strop_delete.Name = "ctms_strop_delete"; - this.ctms_strop_delete.Size = new System.Drawing.Size(108, 24); + this.ctms_strop_delete.Size = new System.Drawing.Size(100, 22); this.ctms_strop_delete.Text = "删除"; // - // lb_imageIndex - // - this.lb_imageIndex.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left))); - this.lb_imageIndex.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lb_imageIndex.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(216)))), ((int)(((byte)(83)))), ((int)(((byte)(36))))); - this.lb_imageIndex.Location = new System.Drawing.Point(4, 0); - this.lb_imageIndex.Margin = new System.Windows.Forms.Padding(4); - this.lb_imageIndex.Name = "lb_imageIndex"; - this.lb_imageIndex.Size = new System.Drawing.Size(36, 29); - this.lb_imageIndex.TabIndex = 0; - this.lb_imageIndex.Text = "0"; - this.lb_imageIndex.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // panel2 - // - this.panel2.Back = System.Drawing.SystemColors.Control; - this.panel2.Controls.Add(this.lb_imageIndex); - this.panel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel2.Location = new System.Drawing.Point(0, 0); - this.panel2.Margin = new System.Windows.Forms.Padding(0); - this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(175, 29); - this.panel2.TabIndex = 0; - this.panel2.Text = "panel2"; - // // LanesImagePanel // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(477, 385); + this.ClientSize = new System.Drawing.Size(358, 308); this.Controls.Add(this.tableLayoutPanel2); this.Controls.Add(this.pl_bottom); this.Controls.Add(this.panel1); this.Controls.Add(this.wdb_title); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; - this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.Name = "LanesImagePanel"; - this.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3); this.Text = "BioanalyImagePanel"; this.SizeChanged += new System.EventHandler(this.BioanalyImagePanel_SizeChanged); this.MouseEnter += new System.EventHandler(this.BioanalyImagePanel_MouseEnter); this.panel1.ResumeLayout(false); this.tableLayoutPanel1.ResumeLayout(false); + this.panel2.ResumeLayout(false); this.flowPanel1.ResumeLayout(false); this.pl_bottom.ResumeLayout(false); this.tlp_bottom_panel.ResumeLayout(false); @@ -391,7 +377,6 @@ this.pl_bg_panel.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.image_pl)).EndInit(); this.ctms_strop.ResumeLayout(false); - this.panel2.ResumeLayout(false); this.ResumeLayout(false); }