Commit 38889d63 SK

merge

2 个父辈 c2c05934 933d1e47
...@@ -13,6 +13,7 @@ namespace Acc.Img ...@@ -13,6 +13,7 @@ namespace Acc.Img
{ {
public static bool selectB = false; public static bool selectB = false;
public static bool pngB = false;
/// <summary> /// <summary>
/// 读取图片,,支持格式*.raw,*.bmp;*.gif;*.jpg;*.png /// 读取图片,,支持格式*.raw,*.bmp;*.gif;*.jpg;*.png
/// </summary> /// </summary>
...@@ -25,6 +26,7 @@ namespace Acc.Img ...@@ -25,6 +26,7 @@ namespace Acc.Img
{ {
if (imagePath.ToLower().EndsWith(".raw")) if (imagePath.ToLower().EndsWith(".raw"))
{ {
pngB = false;
Bitmap[] images = ReadRaw(imagePath); Bitmap[] images = ReadRaw(imagePath);
if (images != null) if (images != null)
{ {
...@@ -33,7 +35,8 @@ namespace Acc.Img ...@@ -33,7 +35,8 @@ namespace Acc.Img
} }
else else
{ {
image = Image.FromFile(imagePath); pngB = true;
image = Image.FromFile(imagePath);
} }
}catch(Exception) }catch(Exception)
{ {
...@@ -146,7 +149,6 @@ namespace Acc.Img ...@@ -146,7 +149,6 @@ namespace Acc.Img
} }
} }
} }
//srcBlob.Area += (int)(srcBlob.Area * 0.2);
for (int i = 0; i < blobList.Count; i++) for (int i = 0; i < blobList.Count; i++)
{ {
if (srcBlob.Area < blobList[i].Area) if (srcBlob.Area < blobList[i].Area)
...@@ -211,15 +213,22 @@ namespace Acc.Img ...@@ -211,15 +213,22 @@ namespace Acc.Img
Mat imageMat = BitmapConverter.ToMat(new Bitmap(image)); Mat imageMat = BitmapConverter.ToMat(new Bitmap(image));
Mat grayMat = BitmapConverter.ToMat(new Bitmap(image)); Mat grayMat = BitmapConverter.ToMat(new Bitmap(image));
Cv2.CvtColor(grayMat, grayMat, ColorConversionCodes.RGBA2RGB); Cv2.CvtColor(grayMat, grayMat, ColorConversionCodes.RGBA2RGB);
Cv2.Threshold(imageMat, imageMat, 0, 255, ThresholdTypes.Binary); if (pngB)
{
Cv2.Threshold(imageMat, imageMat, 70, 255, ThresholdTypes.Binary);
}
else
{
Cv2.Threshold(imageMat, imageMat, 0, 255, ThresholdTypes.Binary);
}
List<CvBlob> blobList = GetBlobs(imageMat, thresh, inv); List<CvBlob> blobList = GetBlobs(imageMat, thresh, inv);
int itemArea = (itemFeature + 23) * 3 /5; int itemArea = (itemFeature + 23) * 3 /5;
if(itemArea <= 0) if(itemArea <= 0)
{ {
itemArea = 3; itemArea = 3;
} }
int totalCount = CountBlobs(blobList, itemArea, ref grayMat); int totalCount = CountBlobs(blobList, itemArea, ref imageMat);
image = BitmapConverter.ToBitmap(grayMat); image = BitmapConverter.ToBitmap(imageMat);
return totalCount; return totalCount;
} }
...@@ -510,18 +519,43 @@ namespace Acc.Img ...@@ -510,18 +519,43 @@ namespace Acc.Img
else else
{ {
//全局二值化 //全局二值化
Cv2.Threshold(dst, dst, 0, 255, ThresholdTypes.Binary); if (pngB)
{
Cv2.Threshold(dst, dst, 70, 255, ThresholdTypes.Binary);
}
else
{
Cv2.Threshold(dst, dst, 0, 255, ThresholdTypes.Binary);
}
} }
if (inv) if (inv)
{ {
Cv2.Threshold(dst, dst, 0, 150, ThresholdTypes.BinaryInv); if (pngB)
{
Cv2.Threshold(dst, dst, 70, 150, ThresholdTypes.BinaryInv);
}
else
{
Cv2.Threshold(dst, dst, 0, 150, ThresholdTypes.BinaryInv);
}
} }
} }
else else
{ {
Cv2.Threshold(dst, dst, 0, 255, ThresholdTypes.Binary); if (pngB)
Cv2.Threshold(dst, dst, 0, 150, ThresholdTypes.BinaryInv); {
Cv2.Threshold(dst, dst, 70, 255, ThresholdTypes.Binary);
Cv2.Threshold(dst, dst, 70, 150, ThresholdTypes.BinaryInv);
}
else
{
Cv2.Threshold(dst, dst, 0, 255, ThresholdTypes.Binary);
Cv2.Threshold(dst, dst, 0, 150, ThresholdTypes.BinaryInv);
}
} }
//if (thresh == -1) //if (thresh == -1)
//{ //{
...@@ -551,10 +585,9 @@ namespace Acc.Img ...@@ -551,10 +585,9 @@ namespace Acc.Img
{ {
Cv2.CvtColor(imageMat, imageMat, ColorConversionCodes.RGBA2BGR); Cv2.CvtColor(imageMat, imageMat, ColorConversionCodes.RGBA2BGR);
//Cv2.CvtColor(imageMat, imageMat, ColorConversionCodes.RGB2GRAY); //Cv2.CvtColor(imageMat, imageMat, ColorConversionCodes.RGB2GRAY);
Mat dst = Threshhold(imageMat, thresh, inv); Mat dst = Threshhold(imageMat, thresh, inv);
Mat k1 = Mat.Ones(new OpenCvSharp.Size(1, 1), MatType.CV_8UC1); Mat k1 = Mat.Ones(new OpenCvSharp.Size(1, 1), MatType.CV_8UC1);
Cv2.MorphologyEx(dst, dst, MorphTypes.Open, k1); Cv2.MorphologyEx(dst, dst, MorphTypes.Open, k1);
CvBlobs blobs = new CvBlobs(); CvBlobs blobs = new CvBlobs();
blobs.Label(dst); blobs.Label(dst);
List<CvBlob> blobList = blobs.Values.Where(b => b.Area > 0).ToList(); List<CvBlob> blobList = blobs.Values.Where(b => b.Area > 0).ToList();
......
...@@ -63,48 +63,49 @@ ...@@ -63,48 +63,49 @@
this.计数ToolStripMenuItem, this.计数ToolStripMenuItem,
this.保存当前图片ToolStripMenuItem}); this.保存当前图片ToolStripMenuItem});
this.contextMenuStrip.Name = "contextMenuStrip"; this.contextMenuStrip.Name = "contextMenuStrip";
this.contextMenuStrip.Size = new System.Drawing.Size(149, 114); this.contextMenuStrip.Size = new System.Drawing.Size(169, 124);
// //
// 打开图片ToolStripMenuItem // 打开图片ToolStripMenuItem
// //
this.打开图片ToolStripMenuItem.Name = "打开图片ToolStripMenuItem"; this.打开图片ToolStripMenuItem.Name = "打开图片ToolStripMenuItem";
this.打开图片ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.打开图片ToolStripMenuItem.Size = new System.Drawing.Size(168, 24);
this.打开图片ToolStripMenuItem.Text = "打开图片"; this.打开图片ToolStripMenuItem.Text = "打开图片";
this.打开图片ToolStripMenuItem.Click += new System.EventHandler(this.打开图片ToolStripMenuItem_Click); this.打开图片ToolStripMenuItem.Click += new System.EventHandler(this.打开图片ToolStripMenuItem_Click);
// //
// 原图ToolStripMenuItem // 原图ToolStripMenuItem
// //
this.原图ToolStripMenuItem.Name = "原图ToolStripMenuItem"; this.原图ToolStripMenuItem.Name = "原图ToolStripMenuItem";
this.原图ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.原图ToolStripMenuItem.Size = new System.Drawing.Size(168, 24);
this.原图ToolStripMenuItem.Text = "重新加载"; this.原图ToolStripMenuItem.Text = "重新加载";
this.原图ToolStripMenuItem.Click += new System.EventHandler(this.原图ToolStripMenuItem_Click); this.原图ToolStripMenuItem.Click += new System.EventHandler(this.原图ToolStripMenuItem_Click);
// //
// 元件特征ToolStripMenuItem // 元件特征ToolStripMenuItem
// //
this.元件特征ToolStripMenuItem.Name = "元件特征ToolStripMenuItem"; this.元件特征ToolStripMenuItem.Name = "元件特征ToolStripMenuItem";
this.元件特征ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.元件特征ToolStripMenuItem.Size = new System.Drawing.Size(168, 24);
this.元件特征ToolStripMenuItem.Text = "获取元件特征"; this.元件特征ToolStripMenuItem.Text = "获取元件特征";
this.元件特征ToolStripMenuItem.Click += new System.EventHandler(this.元件特征ToolStripMenuItem_Click); this.元件特征ToolStripMenuItem.Click += new System.EventHandler(this.元件特征ToolStripMenuItem_Click);
// //
// 计数ToolStripMenuItem // 计数ToolStripMenuItem
// //
this.计数ToolStripMenuItem.Name = "计数ToolStripMenuItem"; this.计数ToolStripMenuItem.Name = "计数ToolStripMenuItem";
this.计数ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.计数ToolStripMenuItem.Size = new System.Drawing.Size(168, 24);
this.计数ToolStripMenuItem.Text = "计数"; this.计数ToolStripMenuItem.Text = "计数";
this.计数ToolStripMenuItem.Click += new System.EventHandler(this.计数ToolStripMenuItem_Click); this.计数ToolStripMenuItem.Click += new System.EventHandler(this.计数ToolStripMenuItem_Click);
// //
// 保存当前图片ToolStripMenuItem // 保存当前图片ToolStripMenuItem
// //
this.保存当前图片ToolStripMenuItem.Name = "保存当前图片ToolStripMenuItem"; this.保存当前图片ToolStripMenuItem.Name = "保存当前图片ToolStripMenuItem";
this.保存当前图片ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.保存当前图片ToolStripMenuItem.Size = new System.Drawing.Size(168, 24);
this.保存当前图片ToolStripMenuItem.Text = "保存当前图片"; this.保存当前图片ToolStripMenuItem.Text = "保存当前图片";
this.保存当前图片ToolStripMenuItem.Click += new System.EventHandler(this.保存当前图片ToolStripMenuItem_Click); this.保存当前图片ToolStripMenuItem.Click += new System.EventHandler(this.保存当前图片ToolStripMenuItem_Click);
// //
// buttonOpen // buttonOpen
// //
this.buttonOpen.Location = new System.Drawing.Point(13, 9); this.buttonOpen.Location = new System.Drawing.Point(17, 11);
this.buttonOpen.Margin = new System.Windows.Forms.Padding(4);
this.buttonOpen.Name = "buttonOpen"; this.buttonOpen.Name = "buttonOpen";
this.buttonOpen.Size = new System.Drawing.Size(75, 23); this.buttonOpen.Size = new System.Drawing.Size(100, 29);
this.buttonOpen.TabIndex = 1; this.buttonOpen.TabIndex = 1;
this.buttonOpen.Text = "打开"; this.buttonOpen.Text = "打开";
this.buttonOpen.UseVisualStyleBackColor = true; this.buttonOpen.UseVisualStyleBackColor = true;
...@@ -112,9 +113,10 @@ ...@@ -112,9 +113,10 @@
// //
// buttonCount // buttonCount
// //
this.buttonCount.Location = new System.Drawing.Point(105, 9); this.buttonCount.Location = new System.Drawing.Point(140, 11);
this.buttonCount.Margin = new System.Windows.Forms.Padding(4);
this.buttonCount.Name = "buttonCount"; this.buttonCount.Name = "buttonCount";
this.buttonCount.Size = new System.Drawing.Size(75, 23); this.buttonCount.Size = new System.Drawing.Size(100, 29);
this.buttonCount.TabIndex = 2; this.buttonCount.TabIndex = 2;
this.buttonCount.Text = "计数"; this.buttonCount.Text = "计数";
this.buttonCount.UseVisualStyleBackColor = true; this.buttonCount.UseVisualStyleBackColor = true;
...@@ -122,9 +124,10 @@ ...@@ -122,9 +124,10 @@
// //
// buttonThesh // buttonThesh
// //
this.buttonThesh.Location = new System.Drawing.Point(375, 13); this.buttonThesh.Location = new System.Drawing.Point(500, 16);
this.buttonThesh.Margin = new System.Windows.Forms.Padding(4);
this.buttonThesh.Name = "buttonThesh"; this.buttonThesh.Name = "buttonThesh";
this.buttonThesh.Size = new System.Drawing.Size(75, 23); this.buttonThesh.Size = new System.Drawing.Size(100, 29);
this.buttonThesh.TabIndex = 3; this.buttonThesh.TabIndex = 3;
this.buttonThesh.Text = "二值化"; this.buttonThesh.Text = "二值化";
this.buttonThesh.UseVisualStyleBackColor = true; this.buttonThesh.UseVisualStyleBackColor = true;
...@@ -133,19 +136,21 @@ ...@@ -133,19 +136,21 @@
// //
// textBoxThesh // textBoxThesh
// //
this.textBoxThesh.Location = new System.Drawing.Point(269, 13); this.textBoxThesh.Location = new System.Drawing.Point(359, 16);
this.textBoxThesh.Margin = new System.Windows.Forms.Padding(4);
this.textBoxThesh.Name = "textBoxThesh"; this.textBoxThesh.Name = "textBoxThesh";
this.textBoxThesh.Size = new System.Drawing.Size(46, 21); this.textBoxThesh.Size = new System.Drawing.Size(60, 25);
this.textBoxThesh.TabIndex = 4; this.textBoxThesh.TabIndex = 4;
this.textBoxThesh.Text = "30"; this.textBoxThesh.Text = "70";
this.textBoxThesh.Visible = false; this.textBoxThesh.Visible = false;
// //
// checkBoxAutoThresh // checkBoxAutoThresh
// //
this.checkBoxAutoThresh.AutoSize = true; this.checkBoxAutoThresh.AutoSize = true;
this.checkBoxAutoThresh.Location = new System.Drawing.Point(321, 17); this.checkBoxAutoThresh.Location = new System.Drawing.Point(428, 21);
this.checkBoxAutoThresh.Margin = new System.Windows.Forms.Padding(4);
this.checkBoxAutoThresh.Name = "checkBoxAutoThresh"; this.checkBoxAutoThresh.Name = "checkBoxAutoThresh";
this.checkBoxAutoThresh.Size = new System.Drawing.Size(48, 16); this.checkBoxAutoThresh.Size = new System.Drawing.Size(59, 19);
this.checkBoxAutoThresh.TabIndex = 5; this.checkBoxAutoThresh.TabIndex = 5;
this.checkBoxAutoThresh.Text = "自动"; this.checkBoxAutoThresh.Text = "自动";
this.checkBoxAutoThresh.UseVisualStyleBackColor = true; this.checkBoxAutoThresh.UseVisualStyleBackColor = true;
...@@ -161,18 +166,20 @@ ...@@ -161,18 +166,20 @@
this.panel1.Controls.Add(this.labelImageName); this.panel1.Controls.Add(this.labelImageName);
this.panel1.Controls.Add(this.labelCount); this.panel1.Controls.Add(this.labelCount);
this.panel1.Controls.Add(this.labelTime); this.panel1.Controls.Add(this.labelTime);
this.panel1.Location = new System.Drawing.Point(-1, 411); this.panel1.Location = new System.Drawing.Point(-1, 514);
this.panel1.Margin = new System.Windows.Forms.Padding(4);
this.panel1.Name = "panel1"; this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(640, 23); this.panel1.Size = new System.Drawing.Size(853, 28);
this.panel1.TabIndex = 7; this.panel1.TabIndex = 7;
// //
// labelFeature // labelFeature
// //
this.labelFeature.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.labelFeature.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.labelFeature.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; this.labelFeature.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
this.labelFeature.Location = new System.Drawing.Point(105, 1); this.labelFeature.Location = new System.Drawing.Point(140, 1);
this.labelFeature.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.labelFeature.Name = "labelFeature"; this.labelFeature.Name = "labelFeature";
this.labelFeature.Size = new System.Drawing.Size(119, 22); this.labelFeature.Size = new System.Drawing.Size(159, 28);
this.labelFeature.TabIndex = 3; this.labelFeature.TabIndex = 3;
this.labelFeature.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.labelFeature.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
// //
...@@ -181,9 +188,10 @@ ...@@ -181,9 +188,10 @@
this.labelImageName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) this.labelImageName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.labelImageName.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; this.labelImageName.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
this.labelImageName.Location = new System.Drawing.Point(223, 1); this.labelImageName.Location = new System.Drawing.Point(297, 1);
this.labelImageName.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.labelImageName.Name = "labelImageName"; this.labelImageName.Name = "labelImageName";
this.labelImageName.Size = new System.Drawing.Size(317, 22); this.labelImageName.Size = new System.Drawing.Size(423, 28);
this.labelImageName.TabIndex = 2; this.labelImageName.TabIndex = 2;
this.labelImageName.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.labelImageName.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
// //
...@@ -192,8 +200,9 @@ ...@@ -192,8 +200,9 @@
this.labelCount.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.labelCount.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.labelCount.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; this.labelCount.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
this.labelCount.Location = new System.Drawing.Point(0, 1); this.labelCount.Location = new System.Drawing.Point(0, 1);
this.labelCount.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.labelCount.Name = "labelCount"; this.labelCount.Name = "labelCount";
this.labelCount.Size = new System.Drawing.Size(108, 22); this.labelCount.Size = new System.Drawing.Size(144, 28);
this.labelCount.TabIndex = 1; this.labelCount.TabIndex = 1;
this.labelCount.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.labelCount.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
// //
...@@ -201,27 +210,30 @@ ...@@ -201,27 +210,30 @@
// //
this.labelTime.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.labelTime.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.labelTime.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; this.labelTime.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
this.labelTime.Location = new System.Drawing.Point(540, 1); this.labelTime.Location = new System.Drawing.Point(720, 1);
this.labelTime.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.labelTime.Name = "labelTime"; this.labelTime.Name = "labelTime";
this.labelTime.Size = new System.Drawing.Size(97, 22); this.labelTime.Size = new System.Drawing.Size(129, 28);
this.labelTime.TabIndex = 0; this.labelTime.TabIndex = 0;
this.labelTime.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.labelTime.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
// //
// textBoxFeature // textBoxFeature
// //
this.textBoxFeature.Location = new System.Drawing.Point(556, 16); this.textBoxFeature.Location = new System.Drawing.Point(741, 20);
this.textBoxFeature.Margin = new System.Windows.Forms.Padding(4);
this.textBoxFeature.Name = "textBoxFeature"; this.textBoxFeature.Name = "textBoxFeature";
this.textBoxFeature.Size = new System.Drawing.Size(46, 21); this.textBoxFeature.Size = new System.Drawing.Size(60, 25);
this.textBoxFeature.TabIndex = 8; this.textBoxFeature.TabIndex = 8;
this.textBoxFeature.Text = "180"; this.textBoxFeature.Text = "200";
this.textBoxFeature.Visible = false; this.textBoxFeature.Visible = false;
// //
// label1 // label1
// //
this.label1.AutoSize = true; this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(473, 19); this.label1.Location = new System.Drawing.Point(631, 24);
this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label1.Name = "label1"; this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(65, 12); this.label1.Size = new System.Drawing.Size(82, 15);
this.label1.TabIndex = 9; this.label1.TabIndex = 9;
this.label1.Text = "元件特征:"; this.label1.Text = "元件特征:";
this.label1.Visible = false; this.label1.Visible = false;
...@@ -232,17 +244,18 @@ ...@@ -232,17 +244,18 @@
this.imageBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.imageBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.imageBox.Location = new System.Drawing.Point(12, 42); this.imageBox.Location = new System.Drawing.Point(16, 52);
this.imageBox.Margin = new System.Windows.Forms.Padding(4);
this.imageBox.Name = "imageBox"; this.imageBox.Name = "imageBox";
this.imageBox.Size = new System.Drawing.Size(614, 367); this.imageBox.Size = new System.Drawing.Size(817, 458);
this.imageBox.TabIndex = 0; this.imageBox.TabIndex = 0;
this.imageBox.MouseDown += new System.Windows.Forms.MouseEventHandler(this.imageBox_MouseDown); this.imageBox.MouseDown += new System.Windows.Forms.MouseEventHandler(this.imageBox_MouseDown);
// //
// MainForm // 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.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(638, 435); this.ClientSize = new System.Drawing.Size(851, 544);
this.Controls.Add(this.label1); this.Controls.Add(this.label1);
this.Controls.Add(this.textBoxFeature); this.Controls.Add(this.textBoxFeature);
this.Controls.Add(this.panel1); this.Controls.Add(this.panel1);
...@@ -253,8 +266,9 @@ ...@@ -253,8 +266,9 @@
this.Controls.Add(this.buttonOpen); this.Controls.Add(this.buttonOpen);
this.Controls.Add(this.imageBox); this.Controls.Add(this.imageBox);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Margin = new System.Windows.Forms.Padding(4);
this.Name = "MainForm"; this.Name = "MainForm";
this.Text = "上海锐驰点料系统 V2.3.1"; this.Text = "上海锐驰点料系统";
this.contextMenuStrip.ResumeLayout(false); this.contextMenuStrip.ResumeLayout(false);
this.panel1.ResumeLayout(false); this.panel1.ResumeLayout(false);
this.ResumeLayout(false); this.ResumeLayout(false);
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!