diff --git a/halftoneproject-master/AssistClient/Config.cs b/halftoneproject-master/AssistClient/Config.cs
index fdc53ea..8e13834 100644
--- a/halftoneproject-master/AssistClient/Config.cs
+++ b/halftoneproject-master/AssistClient/Config.cs
@@ -246,7 +246,9 @@ namespace AssistClient
case "dc":
return "多出";
case "gsdl":
- return "钢丝断裂";
+ return "钢丝断裂";
+ case "gs":
+ return "格栅";
default:
return "未知";
diff --git a/halftoneproject-master/AssistClient/FrmLogin.Designer.cs b/halftoneproject-master/AssistClient/FrmLogin.Designer.cs
index 4500886..3621f58 100644
--- a/halftoneproject-master/AssistClient/FrmLogin.Designer.cs
+++ b/halftoneproject-master/AssistClient/FrmLogin.Designer.cs
@@ -161,7 +161,7 @@
this.Name = "FrmLogin";
this.ShowIcon = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
- this.Text = "修复控制台 - v1.2.2";
+ this.Text = "修复控制台 - v1.2.2A";
this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.FrmLogin_FormClosed);
this.Load += new System.EventHandler(this.FrmLogin_Load);
this.Shown += new System.EventHandler(this.FrmLogin_Shown);
diff --git a/halftoneproject-master/AssistClient/FrmMain.Designer.cs b/halftoneproject-master/AssistClient/FrmMain.Designer.cs
index 902fa23..80c63b0 100644
--- a/halftoneproject-master/AssistClient/FrmMain.Designer.cs
+++ b/halftoneproject-master/AssistClient/FrmMain.Designer.cs
@@ -421,7 +421,7 @@
this.gpbDefectList.Margin = new System.Windows.Forms.Padding(2);
this.gpbDefectList.Name = "gpbDefectList";
this.gpbDefectList.Padding = new System.Windows.Forms.Padding(2);
- this.gpbDefectList.Size = new System.Drawing.Size(437, 377);
+ this.gpbDefectList.Size = new System.Drawing.Size(440, 377);
this.gpbDefectList.TabIndex = 4;
this.gpbDefectList.TabStop = false;
this.gpbDefectList.Text = "缺陷明细";
@@ -469,7 +469,7 @@
this.dgvProcess.RowsDefaultCellStyle = dataGridViewCellStyle5;
this.dgvProcess.RowTemplate.Height = 30;
this.dgvProcess.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect;
- this.dgvProcess.Size = new System.Drawing.Size(433, 359);
+ this.dgvProcess.Size = new System.Drawing.Size(436, 359);
this.dgvProcess.TabIndex = 3;
this.dgvProcess.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvProcess_CellDoubleClick);
//
@@ -975,7 +975,7 @@
this.Name = "FrmMain";
this.ShowIcon = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
- this.Text = "修复控制台 - v1.2.2";
+ this.Text = "修复控制台 - v1.2.2A";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmMain_FormClosing);
this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.FrmMain_FormClosed);
diff --git a/halftoneproject-master/AssistClient/FrmMain.resx b/halftoneproject-master/AssistClient/FrmMain.resx
index b878b1f..e4b7538 100644
--- a/halftoneproject-master/AssistClient/FrmMain.resx
+++ b/halftoneproject-master/AssistClient/FrmMain.resx
@@ -458,31 +458,31 @@
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- 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
+ 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
AElFTkSuQmCC
diff --git a/halftoneproject-master/Code/Device/DefectLib.cs b/halftoneproject-master/Code/Device/DefectLib.cs
index 8c3d7de..82c0c7c 100644
--- a/halftoneproject-master/Code/Device/DefectLib.cs
+++ b/halftoneproject-master/Code/Device/DefectLib.cs
@@ -257,7 +257,10 @@ namespace ProductionControl.Device
stopwatch.Start();
IDisposableReadOnlyCollection[] results = yolo1.RunModlel(_onnxSession, task.tensors);
liStep = 1;
- task.informationList = yolo1.ScreeningResults_YD(results, task.bmps_resize, task.thresholds, task.thresholdsClass, task.recAreaThreshold);
+ if(task.ModelType == "pt")
+ task.informationList = yolo1.ScreeningResults_YD(results, task.bmps_resize, task.thresholds, task.thresholdsClass, task.recAreaThreshold);
+ else
+ task.informationList = yolo1.ScreeningResults_YD_RJ(results, task.bmps_resize, task.thresholds, task.thresholdsClass, task.recAreaThreshold);
liStep = 2;
//当前大图上缺陷个数
@@ -421,6 +424,8 @@ namespace ProductionControl.Device
public bool isSucceed;//转换是否成功
public string resultInfo = "";//成功或失败信息
public long[] stopwatch = new long[5];
+
+ public string ModelType = "";
}
public void add(DefectTask task)
diff --git a/halftoneproject-master/Code/Enums.cs b/halftoneproject-master/Code/Enums.cs
index b30b948..272b6bd 100644
--- a/halftoneproject-master/Code/Enums.cs
+++ b/halftoneproject-master/Code/Enums.cs
@@ -208,6 +208,7 @@ namespace ProductionControl
gsdl,//栅线 改为钢丝断裂
ds,//断栅
sx,
+ gs,//格栅
}
public enum DefectNameEnum
{
@@ -223,7 +224,8 @@ namespace ProductionControl
斜边,
钢丝断裂, //栅线,
断栅,
- 栅线
+ 栅线,
+ 格栅
}
public enum ValType
{
diff --git a/halftoneproject-master/Code/FrmLogin.Designer.cs b/halftoneproject-master/Code/FrmLogin.Designer.cs
index 095046d..fe048e2 100644
--- a/halftoneproject-master/Code/FrmLogin.Designer.cs
+++ b/halftoneproject-master/Code/FrmLogin.Designer.cs
@@ -159,7 +159,7 @@
this.Name = "FrmLogin";
this.ShowIcon = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
- this.Text = "自动化视觉检测系统 - v1.2.4";
+ this.Text = "自动化视觉检测系统 - v1.2.5";
this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.FrmLogin_FormClosed);
this.Load += new System.EventHandler(this.FrmLogin_Load);
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
diff --git a/halftoneproject-master/Code/FrmMain.Designer.cs b/halftoneproject-master/Code/FrmMain.Designer.cs
index 3511351..02d1049 100644
--- a/halftoneproject-master/Code/FrmMain.Designer.cs
+++ b/halftoneproject-master/Code/FrmMain.Designer.cs
@@ -1551,7 +1551,7 @@
this.splitContainer2.Panel2.Controls.Add(this.gboxDefectList);
this.splitContainer2.Panel2MinSize = 400;
this.splitContainer2.Size = new System.Drawing.Size(463, 523);
- this.splitContainer2.SplitterDistance = 32;
+ this.splitContainer2.SplitterDistance = 33;
this.splitContainer2.SplitterWidth = 3;
this.splitContainer2.TabIndex = 10;
//
@@ -1571,7 +1571,7 @@
// splitContainer3.Panel2
//
this.splitContainer3.Panel2.Controls.Add(this.picScanner2);
- this.splitContainer3.Size = new System.Drawing.Size(32, 523);
+ this.splitContainer3.Size = new System.Drawing.Size(33, 523);
this.splitContainer3.SplitterDistance = 226;
this.splitContainer3.SplitterWidth = 3;
this.splitContainer3.TabIndex = 11;
@@ -1585,7 +1585,7 @@
this.picScanner1.Location = new System.Drawing.Point(0, 0);
this.picScanner1.Margin = new System.Windows.Forms.Padding(2);
this.picScanner1.Name = "picScanner1";
- this.picScanner1.Size = new System.Drawing.Size(32, 226);
+ this.picScanner1.Size = new System.Drawing.Size(33, 226);
this.picScanner1.TabIndex = 7;
this.picScanner1.TabStop = false;
//
@@ -1597,7 +1597,7 @@
this.picScanner2.Location = new System.Drawing.Point(0, 0);
this.picScanner2.Margin = new System.Windows.Forms.Padding(2);
this.picScanner2.Name = "picScanner2";
- this.picScanner2.Size = new System.Drawing.Size(32, 294);
+ this.picScanner2.Size = new System.Drawing.Size(33, 294);
this.picScanner2.TabIndex = 9;
this.picScanner2.TabStop = false;
//
@@ -1611,7 +1611,7 @@
this.gboxDefectList.Margin = new System.Windows.Forms.Padding(2);
this.gboxDefectList.Name = "gboxDefectList";
this.gboxDefectList.Padding = new System.Windows.Forms.Padding(2);
- this.gboxDefectList.Size = new System.Drawing.Size(428, 523);
+ this.gboxDefectList.Size = new System.Drawing.Size(427, 523);
this.gboxDefectList.TabIndex = 3;
this.gboxDefectList.TabStop = false;
this.gboxDefectList.Tag = "0";
@@ -1623,7 +1623,7 @@
this.lblDefectAddTag.AutoSize = true;
this.lblDefectAddTag.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblDefectAddTag.ForeColor = System.Drawing.Color.Blue;
- this.lblDefectAddTag.Location = new System.Drawing.Point(277, 2);
+ this.lblDefectAddTag.Location = new System.Drawing.Point(276, 2);
this.lblDefectAddTag.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblDefectAddTag.Name = "lblDefectAddTag";
this.lblDefectAddTag.Size = new System.Drawing.Size(0, 12);
@@ -1638,7 +1638,7 @@
this.pnlBmpList.Location = new System.Drawing.Point(2, 16);
this.pnlBmpList.Margin = new System.Windows.Forms.Padding(2);
this.pnlBmpList.Name = "pnlBmpList";
- this.pnlBmpList.Size = new System.Drawing.Size(424, 505);
+ this.pnlBmpList.Size = new System.Drawing.Size(423, 505);
this.pnlBmpList.TabIndex = 0;
//
// chkBuzzer
@@ -1726,7 +1726,7 @@
this.Margin = new System.Windows.Forms.Padding(2);
this.Name = "FrmMain";
this.ShowIcon = false;
- this.Text = "自动化视觉检测系统 - v1.2.4";
+ this.Text = "自动化视觉检测系统 - v1.2.5";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmMian_FormClosing);
this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.FrmMian_FormClosed);
diff --git a/halftoneproject-master/Code/FrmMain.cs b/halftoneproject-master/Code/FrmMain.cs
index f5d2439..f71a32b 100644
--- a/halftoneproject-master/Code/FrmMain.cs
+++ b/halftoneproject-master/Code/FrmMain.cs
@@ -39,6 +39,7 @@ namespace ProductionControl
private DevContainer devContainer = new DevContainer();
private Service.ProductService svcProduct = new Service.ProductService();
private Service.OrderService svcOrder = new Service.OrderService();
+ Service.ClassesService svcClasses = new Service.ClassesService();
private bool bExitApp = false;
//禁用蜂鸣器，门磁
private bool disableBuzzer, disableDoorSensor;
@@ -1381,9 +1382,29 @@ namespace ProductionControl
if (!File.Exists(gbxBmpPath + attachmentFile.ExtendName)) gbxBmpPath = "";
}
AddTextEvent($"{stepIndex + 1}-{processName}", $"图纸路径:{gbxBmpPath}");
+
+ string modeltp = "pt";
+ Classes tClasses = svcClasses.GetById(model.ClassesId);
+ if (tClasses != null)
+ {
+ if (tClasses.Name == "乳剂")
+ modeltp = "rj";
+ else
+ modeltp = "pt";
+ }
+
+ string thr = "";
+ if (tClasses.Name == "乳剂")
+ thr = processParam.Value("ThresholdsClass").Split(',').Length == 11 ?
+ processParam.Value("ThresholdsClass") + ",0.3" : processParam.Value("ThresholdsClass");
+ else
+ thr = processParam.Value("ThresholdsClass").Split(',').Length == 11 ?
+ processParam.Value("ThresholdsClass") + ",0.3,0.3" : processParam.Value("ThresholdsClass").Split(',').Length == 12 ?
+ processParam.Value("ThresholdsClass") + ",0.3" : processParam.Value("ThresholdsClass");
devContainer.libDefect.add(new DefectTask()
{
- stepIndex= stepIndex,
+ ModelType = modeltp,
+ stepIndex = stepIndex,
processName= processName,
drawingPagePath= gbxBmpPath,
index = defectBmpNum++,
@@ -1393,8 +1414,7 @@ namespace ProductionControl
cut_size = new System.Drawing.Size(Convert.ToInt32(aarCut_size[0]), Convert.ToInt32(aarCut_size[1])),
resize = new System.Drawing.Size(Convert.ToInt32(aarResize[0]), Convert.ToInt32(aarResize[1])),
thresholds = processParam.Value("Thresholds"),
- thresholdsClass = processParam.Value("ThresholdsClass").Split(',').Length == 11?
- processParam.Value("ThresholdsClass") + ",0.3" : processParam.Value("ThresholdsClass"),
+ thresholdsClass = thr,
recAreaThreshold= getProductAreaThreshol(model), //qxName,面积; qxName,面积; qxName,面积;
finishEvent = (res) =>
{
diff --git a/halftoneproject-master/Code/FrmMain.resx b/halftoneproject-master/Code/FrmMain.resx
index 1bfc665..05c46be 100644
--- a/halftoneproject-master/Code/FrmMain.resx
+++ b/halftoneproject-master/Code/FrmMain.resx
@@ -643,20 +643,20 @@
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
- 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
+ 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
@@ -665,11 +665,11 @@
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAG9SURBVFhHYxgS4F+GuvqvFGVjKJf24KW9KM+nEJnk3+kq
x/7nqf//l632H+iA/1+i5f6/DpC89MJVpOiRhQwnVDl1wbH6wmUPAjT/fwyV+Q90wH90B7wLkPr/wlX0
/0MbgRv3THjVodqoBx6Y8f1/7iRC0AFPbAT/3zfl+nzflCcQqhUveOkm2gtl4gekOOChOf9/kPpHFgIz
- gdEmATUCBfzLUlb5Fiu/EeiA/1Ah/IAsB1gK/L/vwPX5pbvo3vfBUu1f4xXSfqcpN/7NUVv3LFftz7dY
+ gdEmATUCBfzLUlb5Fiu/EeiA/1Ah/IAsB1gK/L/vwPX5pbvo3vfBUu1f4xXSfqcpN/7NUVv3NFftz7dY
hf80d8AzB+H/rz3F/38Ilv7/LU4BrPdfrhoYjzpg1AGjDhh1wNB3wM9s1ee/UhSv0s0BT92k/l8uDfkP
LM89/tdrsUGlGP6HarG9CZAxA7YHJgMd8JMmDrgU7/Z/44o1/+es34NXwxMrfoOH5tz3qO6A9QdO/1+x
8yhBB4DAXWNB/vumvDMJOeBLrDyopoyFasMPSHEADDyyEPR4Ziv8BN0BH5LVvv3NUZ32PUZOEaqUMCDH
- ATDwzkdS7l2glB/QwuRfmcrG/wrJaDdS4gCqgFEHjDpg3YFT9WAHrNtTDxUaBcMZMDAAAD2x3zbKG7iV
+ ATDwzkdS7l2glB/QwuRfmcrG/wrJaDdS4gCqgFEHjDpg3YFT9WAHrNtTDxUaBcMZMDAAADD43zUflyTt
AAAAAElFTkSuQmCC
@@ -695,15 +695,15 @@
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHLSURBVFhH7dY9SAJhGMBxJyEIWpuCIGiNLCuXBhssMnSw
- ITAHLTSoqEGiBqulqSkIhOaoISMKIjsrKE/Ovi65zIzL/DiMSj0xA8F6uuJtqODE0sC4/3T33vu8/IaD
- O1FJFBlO1gZNrATdFj+qlSr39TB62nCHMwMpiA6mIWxMwlXvLZyo/J4DOTmKN+NlaHthW7cQi3g3BRwA
- AoYYfAWQKhqc8jOwN7l8mw0HtWiscNmlOLjbvTkBjhYCNhrxFNZMqNEob0dK/yy65C8fwNveHZkb8DbS
- SmkCleiIT4VG2JqAPrZ2rPQDWuLvZwAPEB106lLLOEKmxExsPNufnHyeujNnbN4hJhvoi0PRAaSahktt
- FEImFuITWUhOAtybM8AMPYIAEAACQACUPiAymI6GjYnzPwMQynPYH7sA7iOioDQgRo9ElIYSn6poqVNO
- zjladjNFAWzqXLCy7IKFVYx3YFdG1NnrndcFB6zuHcLSljMn4K1tyVEFJiOsOQG6eOq480qLxvjLB/AR
- LicV3LsR+Q5gnzjA/I0hUY225u4ngI9oLVMVNMa7HiayenYaJKGRl/z/G38DKEgCQADY9tyWd4ANs6Al
- of+cSPQKNSv1NawgHXgAAAAASUVORK5CYII=
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHKSURBVFhH7dY/SAJRHMBxJyEIWpuCIHCNLEuXBhsqMmyw
+ ITAHLTTQsCEiB6ulqSkIguaoISMKItMU0pMzrUvO/hiXaR5GpZ5YgWD90ngNFZxYGhT3ne7evd/jMxzc
+ 8f5EsdG0IKJjhOi28pHtZPXZAK2mNLcYPZKBuP4RrrVpuBi8gUN5KOCSEmNYG1aFtpe3TTO+jPWTkAdA
+ WJOAzwBCToFbegzWVs/ZdrNLgMbKl1WEgbfrpCjALsZhqwXL2NrwPjTKmk8WmkOX7JUCKOzdk3gB6yAW
+ SUW4Fh3xoaiRaQirExt+WQjQEnvfAwQA76Yy50raHtWlZhOTueH01PP07XjWEjTEcuGhJFQcQPRRcK6M
+ Q1THQNKUg/QUwN14FmjDA3AADsABOMDfB8T0j/FrbSr4awBcFoT9iVPIf0Q6SQXw0SMeqSD5R3JK5JYS
+ 83axI1sRwLbKA2urHlhat7EOOCR4o7XJfVl2wLrzAFZ23EUBhXaFvhqbBF8sClAlM/6eCyUaY68UwHuY
+ lOjMvxuxrwDmKQ9YuNKk6tHW4n0H8B6lpOsi2mTvvSmnZmZAGDW+lP7f+BNAWeIAHMDi9JrfABabGS1x
+ /ed4vFcbu/UzQvv+oQAAAABJRU5ErkJggg==
@@ -730,8 +730,8 @@
hSD+56M51fL5Z2xlyAfodJyTcaLd9RzkewtHdhEF7GHlB3rBESBlTn9ZbqhuHUoy5yd1CGFB5X0INOsc
4L/h+gBwY9z1HK5xfc9l/kNXwuEnFR5xPg+SPeSbaEdA2jGE5tYhtvQscppHcOj0ZaTXdCOysBEhtkr4
J9vxRUwe4CP3GVPPISY+MccdAdbY5FRj4lloBNJO9KCi8wouTs5iYoZNcO0mGvrGkXOyG1FFzdhxuP7v
- CBgTz8I3wW51JwKbo/OsxsSzuBMBhQpYLAIqwBy9PQhILbNaLKHORSJw+26/EHt+arMuFBBR0PD/OL4D
- z0PkL0nYc7TQrXDGAAAAAElFTkSuQmCC
+ CBgTz8I3wW51JwKbo/OsxsSzuBMBhQpYLAIqwBy9PQhILbNaLFbnIhG4fbdfiD0/tVkXCogoaPh/HN+B
+ 5yHyF0eGc7OhWfXwAAAAAElFTkSuQmCC
diff --git a/halftoneproject-master/Code/FrmProductInfo.Designer.cs b/halftoneproject-master/Code/FrmProductInfo.Designer.cs
index 5e6d6e2..7610908 100644
--- a/halftoneproject-master/Code/FrmProductInfo.Designer.cs
+++ b/halftoneproject-master/Code/FrmProductInfo.Designer.cs
@@ -721,7 +721,7 @@
this.tabControl1.Margin = new System.Windows.Forms.Padding(2);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
- this.tabControl1.Size = new System.Drawing.Size(424, 387);
+ this.tabControl1.Size = new System.Drawing.Size(424, 417);
this.tabControl1.TabIndex = 36;
//
// tabPage1
@@ -732,7 +732,7 @@
this.tabPage1.Margin = new System.Windows.Forms.Padding(2);
this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(2);
- this.tabPage1.Size = new System.Drawing.Size(416, 361);
+ this.tabPage1.Size = new System.Drawing.Size(416, 391);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "基础信息";
//
@@ -760,7 +760,7 @@
this.panel8.Location = new System.Drawing.Point(2, 2);
this.panel8.Margin = new System.Windows.Forms.Padding(2);
this.panel8.Name = "panel8";
- this.panel8.Size = new System.Drawing.Size(412, 357);
+ this.panel8.Size = new System.Drawing.Size(412, 387);
this.panel8.TabIndex = 1;
//
// cmbDefectModelFile
@@ -837,7 +837,7 @@
this.groupBox4.Margin = new System.Windows.Forms.Padding(2);
this.groupBox4.Name = "groupBox4";
this.groupBox4.Padding = new System.Windows.Forms.Padding(2);
- this.groupBox4.Size = new System.Drawing.Size(409, 251);
+ this.groupBox4.Size = new System.Drawing.Size(409, 278);
this.groupBox4.TabIndex = 32;
this.groupBox4.TabStop = false;
this.groupBox4.Text = "历史批次";
@@ -888,7 +888,7 @@
this.dgvBatchList.RowsDefaultCellStyle = dataGridViewCellStyle4;
this.dgvBatchList.RowTemplate.Height = 30;
this.dgvBatchList.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
- this.dgvBatchList.Size = new System.Drawing.Size(405, 233);
+ this.dgvBatchList.Size = new System.Drawing.Size(405, 260);
this.dgvBatchList.TabIndex = 6;
//
// colBatchId
@@ -1018,7 +1018,7 @@
this.tabPage3.Margin = new System.Windows.Forms.Padding(2);
this.tabPage3.Name = "tabPage3";
this.tabPage3.Padding = new System.Windows.Forms.Padding(2);
- this.tabPage3.Size = new System.Drawing.Size(416, 361);
+ this.tabPage3.Size = new System.Drawing.Size(416, 391);
this.tabPage3.TabIndex = 2;
this.tabPage3.Text = "图纸资料";
this.tabPage3.UseVisualStyleBackColor = true;
@@ -1222,7 +1222,7 @@
this.tabPage2.Margin = new System.Windows.Forms.Padding(2);
this.tabPage2.Name = "tabPage2";
this.tabPage2.Padding = new System.Windows.Forms.Padding(2);
- this.tabPage2.Size = new System.Drawing.Size(416, 361);
+ this.tabPage2.Size = new System.Drawing.Size(416, 391);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = "测量合格标准";
//
@@ -1232,7 +1232,7 @@
this.tabPage4.Location = new System.Drawing.Point(4, 22);
this.tabPage4.Margin = new System.Windows.Forms.Padding(2);
this.tabPage4.Name = "tabPage4";
- this.tabPage4.Size = new System.Drawing.Size(416, 361);
+ this.tabPage4.Size = new System.Drawing.Size(416, 391);
this.tabPage4.TabIndex = 3;
this.tabPage4.Text = "外观合格标准";
this.tabPage4.UseVisualStyleBackColor = true;
@@ -1244,7 +1244,7 @@
this.flpQualifiedPannel.Margin = new System.Windows.Forms.Padding(2);
this.flpQualifiedPannel.Name = "flpQualifiedPannel";
this.flpQualifiedPannel.Padding = new System.Windows.Forms.Padding(3);
- this.flpQualifiedPannel.Size = new System.Drawing.Size(416, 361);
+ this.flpQualifiedPannel.Size = new System.Drawing.Size(416, 391);
this.flpQualifiedPannel.TabIndex = 0;
//
// FrmProductInfo
@@ -1252,7 +1252,7 @@
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.SystemColors.ActiveCaption;
- this.ClientSize = new System.Drawing.Size(427, 449);
+ this.ClientSize = new System.Drawing.Size(427, 476);
this.Controls.Add(this.tabControl1);
this.Controls.Add(this.toolStrip1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
diff --git a/halftoneproject-master/Code/FrmProductInfo.resx b/halftoneproject-master/Code/FrmProductInfo.resx
index 1d55041..228df51 100644
--- a/halftoneproject-master/Code/FrmProductInfo.resx
+++ b/halftoneproject-master/Code/FrmProductInfo.resx
@@ -127,16 +127,16 @@
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIeSURBVFhH7ZfNShxBFIWvBIJCguALiIa4CbhTUfzZSBwf
- YBYiSceuqu66nWQhvoE7MZuEPECiooLgC2QXkqVJIAuX7iTriKiIP7eKmp6uTM1MV08TEDzw0TNVdU+f
- qb7dMwP3cqgLomSaqBSGyzngyTPj56Fq9SGw+AsIvCkFjqvGOacEjjSYdM6scc8hLqfSQoZH9Ak2QMSb
- /sjPEOKh9nmFxxBFveYMbRQlk2kAjp/MaDFxuZZ6CblnRtsoG0DIbTNaTEJ+qHtpv8DMtFA2AMMdM5pf
- DJdo5yL9muN7K8ACnkKY9Ou5puokwPJyD9Vd61olju9Srxph/J1muvS8U50ECMPHVPeXONPvuVxPvSzk
- ip53yuoB3DKj+ZQkj2C2cqVrlawmtNjX807ZAVosbCJ925rmFfgx41Wn5c7aAdR2TpgZPzEcpto/Ga86
- HgEUqql+Ez/oAfOzPbSO4y8IgktT34hngPK5mwGC4KQQtbsii1cAZSLkPDDWV4g4fko+3yxPvx2gxupU
- AhPL0/MSXFBXvwWRjHnD4lHyq6RfyzXuZhOWiWeAM7oEL4G/HtINpY55UeujaByYPLA8/38TSrQ8vXdA
- yBcgxBNYwkF9/Bc17oK/GaB6+pGrH9E5A2R/lNqo7wQ/XA8hjdw1Z3NI3TrOojJpFSAIumnR18aiklhc
- PKddnjNna6Jq9QEtnqF+cP/tKorA57ov7mUJ4BZH72WFNTVYxAAAAABJRU5ErkJggg==
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIfSURBVFhH7ZdPSxtBGMbfUJAWKoJfoLSlXgRvKpb+ObQ0
+ +gFyKKKrOzO7827bg/Qb9FbaS0s/QG1FhYJfwJvYY1Xw4NGbeFYkiqh9Z5hsdppJsrNZCoIP/NhkZt5n
+ n8y+u0ngRg5VIEqeEZOF4bIKPBk2fh6q1fqAxesg8KoUOH4wzjklcLTFpHdeGvcc4vJpWshwnz7BDxDx
+ T3/kIoS4p33m8ACiaMCcoYui5EkagON3M1pMXH5MvYT8ZUa7KBtAyGUzWkxCfm16ab/AzHRQNgDDFTOa
+ Xwznaeci/ZrjFyvAazyBMLmn59qqlwALC3eo7lLXKnH8nHo1COPfNFPR8071EiAM+6nuiKjr91x+Sr0s
+ 5Hs975TVA7hkRvMpSe7Ci+qFrlWymtBiTc87ZQfosLCN9G1rmlfgt4xXk447awdQ2/nYzPiJ4QjVHma8
+ mngEUKim2iW26AGz3R1ax3EHguDc1LfiGaB8rmeAIDguROOuyOIVQJkIOQWMDRYijh+Rz6bl6bcD1Fi9
+ SmBieXpegjPq6ncgknFvWDxGfpPp13KD69mEZeIZoE6XYBb4myHdUOqYF7U+iiaAyT+W5/9vQomWp/cO
+ CDkDQjyEeXygj/+ixl3wt/epnn7k6kd0zgDZH6U26jvBD9dDSCNXzdkcUreOs6hMOgUIgtu0aKO1qCSm
+ p09pl6vmbG1Uq92ixc+pH9x/u4oi8JXuixtZAvgLH6plf9csHs0AAAAASUVORK5CYII=
diff --git a/halftoneproject-master/Code/Properties/AssemblyInfo.cs b/halftoneproject-master/Code/Properties/AssemblyInfo.cs
index ce34e0f..a91cdba 100644
--- a/halftoneproject-master/Code/Properties/AssemblyInfo.cs
+++ b/halftoneproject-master/Code/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.4.0")]
-[assembly: AssemblyFileVersion("1.2.4.0")]
+[assembly: AssemblyVersion("1.2.5.0")]
+[assembly: AssemblyFileVersion("1.2.5.0")]