diff --git a/README.md b/README.md new file mode 100644 index 0000000..cdd4bd6 --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# banboshi_V1 + +版博士V1版本库 \ No newline at end of file diff --git a/halftoneproject-master/AssistClient/Config.cs b/halftoneproject-master/AssistClient/Config.cs index b380b18..fdc53ea 100644 --- a/halftoneproject-master/AssistClient/Config.cs +++ b/halftoneproject-master/AssistClient/Config.cs @@ -244,7 +244,9 @@ namespace AssistClient case "qs": return "缺失"; case "dc": - return "多出"; + return "多出"; + case "gsdl": + return "钢丝断裂"; default: return "未知"; diff --git a/halftoneproject-master/AssistClient/Properties/AssemblyInfo.cs b/halftoneproject-master/AssistClient/Properties/AssemblyInfo.cs index d841ef2..4a4e1e4 100644 --- a/halftoneproject-master/AssistClient/Properties/AssemblyInfo.cs +++ b/halftoneproject-master/AssistClient/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值 //通过使用 "*"，如下所示: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.2.2.0")] -[assembly: AssemblyFileVersion("1.2.2.0")] +[assembly: AssemblyVersion("1.2.2.1")] +[assembly: AssemblyFileVersion("1.2.2.1")] diff --git a/halftoneproject-master/Code/Config.cs b/halftoneproject-master/Code/Config.cs index 6a63cfd..da472f0 100644 --- a/halftoneproject-master/Code/Config.cs +++ b/halftoneproject-master/Code/Config.cs @@ -61,8 +61,9 @@ namespace ProductionControl //缺陷配置 public static Size Defect_CutSize, Defect_ReSize; public static float Defect_Thresholds; - public static string Defect_SavePath, Defect_Compress_SavePath, Defect_Small_SavePath; - public static double Defect_SavePath_AutoClear =-1,Defect_Compress_SavePath_AutoClear=-1,Defect_Small_SavePath_AutoClear=-1; + public static string Defect_SavePath, Defect_Compress_SavePath, Defect_Small_SavePath, Defect_SrcSmall_SavePath; + public static double Defect_SavePath_AutoClear =-1,Defect_Compress_SavePath_AutoClear=-1,Defect_Small_SavePath_AutoClear=-1, Defect_SrcSmall_SavePath_AutoClear = -1; + public static double Defect_SrcSmall_Thres; public static bool SaveAllDefectImg, MakeTag; public static double PT_Offset = 0;//PT偏移值 @@ -120,6 +121,9 @@ namespace ProductionControl if (Defect_Small_SavePath_AutoClear >= 0) DeleteFiles(Config.Defect_Small_SavePath, Defect_Small_SavePath_AutoClear, true); + if (Defect_SrcSmall_SavePath_AutoClear >= 0) + DeleteFiles(Config.Defect_SrcSmall_SavePath, Defect_SrcSmall_SavePath_AutoClear, true); + // if (SizeBmp_SavePath_AutoClear >= 0) DeleteFiles(Config.SizeBmp_SavePath, SizeBmp_SavePath_AutoClear, true); @@ -151,6 +155,9 @@ namespace ProductionControl if (Defect_Small_SavePath_AutoClear>=0) DeleteFiles(Config.Defect_Small_SavePath, Defect_Small_SavePath_AutoClear, true); + if (Defect_SrcSmall_SavePath_AutoClear >= 0) + DeleteFiles(Config.Defect_SrcSmall_SavePath, Defect_SrcSmall_SavePath_AutoClear, true); + // if (SizeBmp_SavePath_AutoClear >= 0) DeleteFiles(Config.SizeBmp_SavePath, SizeBmp_SavePath_AutoClear, true); @@ -282,7 +289,15 @@ namespace ProductionControl SaveAllDefectImg = (lsTmp == "1"); MakeTag = Util.ReadIniValue(configPath, "DEV", "MakeTag") == "1"; SizeEnginePath = Util.ReadIniValue(configPath, "DEV", "SizeEnginePath"); - + ////////////////////////////////////////////////////////////// + ///原始缺陷小图 + Defect_SrcSmall_SavePath = Util.ReadIniValue(configPath, "DEV", "Defect_SrcSmall_SavePath"); + lsTmp = Util.ReadIniValue(configPath, "DEV", "Defect_SrcSmall_SavePath_AutoClear"); + if (Util.IsDecimal(lsTmp)) Defect_SrcSmall_SavePath_AutoClear = Convert.ToDouble(lsTmp); + lsTmp = Util.ReadIniValue(configPath, "DEV", "Defect_SrcSmall_Thres"); + if (Util.IsDecimal(lsTmp)) Defect_SrcSmall_Thres = Convert.ToDouble(lsTmp); + + ////////////////////////////////////////////////////////////// SizeBmp_SavePath = Util.ReadIniValue(configPath, "DEV", "SizeBmp_SavePath"); lsTmp = Util.ReadIniValue(configPath, "DEV", "SizeBmp_SavePath_AutoClear"); if (Util.IsDecimal(lsTmp)) SizeBmp_SavePath_AutoClear = Convert.ToDouble(lsTmp); diff --git a/halftoneproject-master/Code/Enums.cs b/halftoneproject-master/Code/Enums.cs index 826e962..4d903c4 100644 --- a/halftoneproject-master/Code/Enums.cs +++ b/halftoneproject-master/Code/Enums.cs @@ -205,7 +205,7 @@ namespace ProductionControl hs,//划伤 yx,//压线 xb,//斜边 - sx,//栅线 + gsdl,//栅线 改为钢丝断裂 ds,//断栅 } public enum DefectNameEnum @@ -220,7 +220,7 @@ namespace ProductionControl 划伤, 压线, 斜边, - 栅线, + 钢丝断裂, //栅线, 断栅 } public enum ValType diff --git a/halftoneproject-master/Code/FrmMain.cs b/halftoneproject-master/Code/FrmMain.cs index 15fbf5c..23f7225 100644 --- a/halftoneproject-master/Code/FrmMain.cs +++ b/halftoneproject-master/Code/FrmMain.cs @@ -23,6 +23,7 @@ using System.Security.Cryptography; using System.Text; using System.Threading; using System.Threading.Tasks; +using System.Web.Routing; using System.Windows.Forms; using static ProductionControl.Device.AxisDev; using static ProductionControl.Device.DefectLib; @@ -1435,6 +1436,27 @@ namespace ProductionControl res.bmps_tag[i].Save(path + $"_i{i}.bmp", ImageFormat.Bmp); } + //保存原始小图 + if (Config.Defect_SrcSmall_SavePath != "" && Directory.Exists(Config.Defect_SrcSmall_SavePath)) + { + for (int i = 0; i < res.defectInfor2RestorationDesk.Count(); i++) + { + int indext = int.Parse(res.defectInfor2RestorationDesk[i][0]); + double thres = double.Parse(res.defectInfor2RestorationDesk[i][4]); + if (thres >= Config.Defect_SrcSmall_Thres) + { + path = Util.createSubDir(Config.Defect_SrcSmall_SavePath, + new List { order.CreateTime.ToString("yyyyMMdd"), + order.SN, + order.ProductInfo.MainGrid == 1?"主栅":order.ProductInfo.ClassesId == 7?"rj":"pi", + res.defectInfor2RestorationDesk[i][3]}); + path += $"Defect_SN{order.SN}_I{res.index}_X{res.Xmm}_Y{res.Ymm}_{model.StepInfo.Name}"; + res.bmps_cut[indext].ImWrite(path + $"_i{i}.bmp"); + } + } + + } + //保存压缩大图 -- 用于修复台调用 if (Config.Defect_Compress_SavePath != "" && Directory.Exists(Config.Defect_Compress_SavePath)) { @@ -2238,7 +2260,7 @@ namespace ProductionControl return order.YXCount; case DefectCodeEnum.xb: return order.XBCount; - case DefectCodeEnum.sx: + case DefectCodeEnum.gsdl: return order.SXCount; default: return 0; diff --git a/halftoneproject-master/Code/FrmProductInfo.Designer.cs b/halftoneproject-master/Code/FrmProductInfo.Designer.cs index c803048..5e6d6e2 100644 --- a/halftoneproject-master/Code/FrmProductInfo.Designer.cs +++ b/halftoneproject-master/Code/FrmProductInfo.Designer.cs @@ -105,6 +105,7 @@ this.tabPage3 = new System.Windows.Forms.TabPage(); this.groupBox7 = new System.Windows.Forms.GroupBox(); this.panel6 = new System.Windows.Forms.Panel(); + this.cbHavePad = new System.Windows.Forms.CheckBox(); this.label24 = new System.Windows.Forms.Label(); this.cbMainGrid = new System.Windows.Forms.CheckBox(); this.cbMarkDisturb = new System.Windows.Forms.CheckBox(); @@ -121,7 +122,6 @@ this.tabPage2 = new System.Windows.Forms.TabPage(); this.tabPage4 = new System.Windows.Forms.TabPage(); this.flpQualifiedPannel = new System.Windows.Forms.FlowLayoutPanel(); - this.cbHavePad = new System.Windows.Forms.CheckBox(); this.groupBox10.SuspendLayout(); this.panel10.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.numTensionDownFloatValue)).BeginInit(); @@ -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, 352); + this.tabControl1.Size = new System.Drawing.Size(424, 387); 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, 326); + this.tabPage1.Size = new System.Drawing.Size(416, 361); 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, 322); + this.panel8.Size = new System.Drawing.Size(412, 357); 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, 221); + this.groupBox4.Size = new System.Drawing.Size(409, 251); 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, 203); + this.dgvBatchList.Size = new System.Drawing.Size(405, 233); 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, 326); + this.tabPage3.Size = new System.Drawing.Size(416, 361); this.tabPage3.TabIndex = 2; this.tabPage3.Text = "图纸资料"; this.tabPage3.UseVisualStyleBackColor = true; @@ -1032,7 +1032,7 @@ this.groupBox7.Margin = new System.Windows.Forms.Padding(2); this.groupBox7.Name = "groupBox7"; this.groupBox7.Padding = new System.Windows.Forms.Padding(2); - this.groupBox7.Size = new System.Drawing.Size(409, 102); + this.groupBox7.Size = new System.Drawing.Size(409, 139); this.groupBox7.TabIndex = 34; this.groupBox7.TabStop = false; this.groupBox7.Text = "参数设置"; @@ -1048,9 +1048,19 @@ this.panel6.Location = new System.Drawing.Point(2, 16); this.panel6.Margin = new System.Windows.Forms.Padding(2); this.panel6.Name = "panel6"; - this.panel6.Size = new System.Drawing.Size(405, 84); + this.panel6.Size = new System.Drawing.Size(405, 121); this.panel6.TabIndex = 0; // + // cbHavePad + // + this.cbHavePad.AutoSize = true; + this.cbHavePad.Location = new System.Drawing.Point(236, 47); + this.cbHavePad.Name = "cbHavePad"; + this.cbHavePad.Size = new System.Drawing.Size(102, 16); + this.cbHavePad.TabIndex = 6; + this.cbHavePad.Text = "是否存在Pad点"; + this.cbHavePad.UseVisualStyleBackColor = true; + // // label24 // this.label24.AutoSize = true; @@ -1212,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, 326); + this.tabPage2.Size = new System.Drawing.Size(416, 361); this.tabPage2.TabIndex = 1; this.tabPage2.Text = "测量合格标准"; // @@ -1222,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, 326); + this.tabPage4.Size = new System.Drawing.Size(416, 361); this.tabPage4.TabIndex = 3; this.tabPage4.Text = "外观合格标准"; this.tabPage4.UseVisualStyleBackColor = true; @@ -1234,25 +1244,15 @@ 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, 326); + this.flpQualifiedPannel.Size = new System.Drawing.Size(416, 361); this.flpQualifiedPannel.TabIndex = 0; // - // cbHavePad - // - this.cbHavePad.AutoSize = true; - this.cbHavePad.Location = new System.Drawing.Point(236, 47); - this.cbHavePad.Name = "cbHavePad"; - this.cbHavePad.Size = new System.Drawing.Size(102, 16); - this.cbHavePad.TabIndex = 6; - this.cbHavePad.Text = "是否存在Pad点"; - this.cbHavePad.UseVisualStyleBackColor = true; - // // FrmProductInfo // 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, 412); + this.ClientSize = new System.Drawing.Size(427, 449); 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 d7dbf49..1d55041 100644 --- a/halftoneproject-master/Code/FrmProductInfo.resx +++ b/halftoneproject-master/Code/FrmProductInfo.resx @@ -127,16 +127,16 @@ iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIdSURBVFhH7ZdBS9xAFMefFMRCRegXkLbUi+CtFqXVS1v1 - A+xBRKOZmWReqgfxG3iT9tLSD9BWUUHwC3gTe6wt9ODRm3hWRKVUfTPMZjPu7G4mGwqCf/iR3Zl5//x3 - 8pLdhXs51AFRMkKMF4bLMeBJv/HzUKXSCSzeAYHXpcBx2TjnlMAXdSbt88a45xCXr9NChof0Cb6DiFf9 - kd8gxAPtM4tHEEU95gwtFCWv0gAcv5rRYuJyJfUScsuMtlA2gJDrZrSYhPxc89J+gZlpomwAhhtmNL8Y - ztHORfo1x09WgEk8gzDp1XMN1U6AxcWHVHela5U4fky9qoTxD5rp0PNOtRMgDLup7oQ41++5/JB6Wcgl - Pe+U1QO4ZkbzKUkewduJf7pWyWpCi20975QdoMnCBtK3rWlegV8yXjWa7qwdQG3nsJnxE8MBqj3OeNXw - CKBQTfWH2KcHzK/W0DqOvyEI/pr6ejwDlM/dDBAEp4Wo3hVZvAIoEyEngLHHhYjj5+SzZ3n67QA1VrsS - mFienpfgkrp6AUTy0hsWD5LfePq1XOVuNmGZeAY4p0swA/x9n24odcyLWh9FQ8DkT8vz/zehRMvTeweE - nAYhnsEcPtXH26hxF3z+CdXTj1z9iM4ZIPuj1EZ9J/jheghp5KY5m0Pq1nEWlUmzAEHQRYt264tKYmrq - gnZ5zJytgSqVB7R4lPrB/berKALf6b64lyWAG3A0ZYu/HkZSAAAAAElFTkSuQmCC + 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== diff --git a/halftoneproject-master/Code/FrmSysSetting.Designer.cs b/halftoneproject-master/Code/FrmSysSetting.Designer.cs index 75c1594..c7a989a 100644 --- a/halftoneproject-master/Code/FrmSysSetting.Designer.cs +++ b/halftoneproject-master/Code/FrmSysSetting.Designer.cs @@ -189,6 +189,12 @@ this.chkDefect_Small_Path_AutoClear = new System.Windows.Forms.CheckBox(); this.chkMakeTag = new System.Windows.Forms.CheckBox(); this.tabPage6 = new System.Windows.Forms.TabPage(); + this.groupBox24 = new System.Windows.Forms.GroupBox(); + this.panel24 = new System.Windows.Forms.Panel(); + this.label62 = new System.Windows.Forms.Label(); + this.numLineWidthoffset = new System.Windows.Forms.NumericUpDown(); + this.label60 = new System.Windows.Forms.Label(); + this.numPToffset = new System.Windows.Forms.NumericUpDown(); this.groupBox21 = new System.Windows.Forms.GroupBox(); this.panel21 = new System.Windows.Forms.Panel(); this.btnSizeBmp_Zoom_Image_SavePath = new System.Windows.Forms.PictureBox(); @@ -239,12 +245,16 @@ this.numHttpPort = new System.Windows.Forms.NumericUpDown(); this.label49 = new System.Windows.Forms.Label(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); - this.groupBox24 = new System.Windows.Forms.GroupBox(); - this.panel24 = new System.Windows.Forms.Panel(); - this.label60 = new System.Windows.Forms.Label(); - this.numPToffset = new System.Windows.Forms.NumericUpDown(); - this.label62 = new System.Windows.Forms.Label(); - this.numLineWidthoffset = new System.Windows.Forms.NumericUpDown(); + this.groupBox25 = new System.Windows.Forms.GroupBox(); + this.panel25 = new System.Windows.Forms.Panel(); + this.pictureBox1 = new System.Windows.Forms.PictureBox(); + this.label63 = new System.Windows.Forms.Label(); + this.txtDefect_SrcSmall_SavePath = new System.Windows.Forms.TextBox(); + this.numDefect_SrcSmall_Path_AutoClear = new System.Windows.Forms.NumericUpDown(); + this.label64 = new System.Windows.Forms.Label(); + this.chkDefect_SrcSmall_Path_AutoClear = new System.Windows.Forms.CheckBox(); + this.Defect_SrcSmall_Thres = new System.Windows.Forms.NumericUpDown(); + this.label65 = new System.Windows.Forms.Label(); this.toolStrip1.SuspendLayout(); this.groupBox1.SuspendLayout(); this.panel1.SuspendLayout(); @@ -320,6 +330,10 @@ ((System.ComponentModel.ISupportInitialize)(this.btnClearDefect_Small_Path)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.numDefect_Small_Path_AutoClear)).BeginInit(); this.tabPage6.SuspendLayout(); + this.groupBox24.SuspendLayout(); + this.panel24.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numLineWidthoffset)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numPToffset)).BeginInit(); this.groupBox21.SuspendLayout(); this.panel21.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.btnSizeBmp_Zoom_Image_SavePath)).BeginInit(); @@ -339,10 +353,11 @@ this.groupBox18.SuspendLayout(); this.panel18.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.numHttpPort)).BeginInit(); - this.groupBox24.SuspendLayout(); - this.panel24.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.numPToffset)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.numLineWidthoffset)).BeginInit(); + this.groupBox25.SuspendLayout(); + this.panel25.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numDefect_SrcSmall_Path_AutoClear)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.Defect_SrcSmall_Thres)).BeginInit(); this.SuspendLayout(); // // toolStrip1 @@ -2136,6 +2151,7 @@ // // tabPage5 // + this.tabPage5.Controls.Add(this.groupBox25); this.tabPage5.Controls.Add(this.groupBox19); this.tabPage5.Controls.Add(this.groupBox17); this.tabPage5.Controls.Add(this.chkMakeTag); @@ -2380,6 +2396,104 @@ this.tabPage6.Text = "尺寸图像"; this.tabPage6.UseVisualStyleBackColor = true; // + // groupBox24 + // + this.groupBox24.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.groupBox24.BackColor = System.Drawing.SystemColors.ActiveCaption; + this.groupBox24.Controls.Add(this.panel24); + this.groupBox24.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.groupBox24.Location = new System.Drawing.Point(2, 290); + this.groupBox24.Margin = new System.Windows.Forms.Padding(2); + this.groupBox24.Name = "groupBox24"; + this.groupBox24.Padding = new System.Windows.Forms.Padding(2); + this.groupBox24.Size = new System.Drawing.Size(476, 73); + this.groupBox24.TabIndex = 34; + this.groupBox24.TabStop = false; + this.groupBox24.Text = "尺寸补偿"; + // + // panel24 + // + this.panel24.BackColor = System.Drawing.Color.White; + this.panel24.Controls.Add(this.label62); + this.panel24.Controls.Add(this.numLineWidthoffset); + this.panel24.Controls.Add(this.label60); + this.panel24.Controls.Add(this.numPToffset); + this.panel24.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel24.Location = new System.Drawing.Point(2, 16); + this.panel24.Margin = new System.Windows.Forms.Padding(2); + this.panel24.Name = "panel24"; + this.panel24.Size = new System.Drawing.Size(472, 55); + this.panel24.TabIndex = 0; + // + // label62 + // + this.label62.AutoSize = true; + this.label62.Location = new System.Drawing.Point(231, 20); + this.label62.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label62.Name = "label62"; + this.label62.Size = new System.Drawing.Size(77, 12); + this.label62.TabIndex = 16; + this.label62.Text = "线宽补偿(um)"; + // + // numLineWidthoffset + // + this.numLineWidthoffset.DecimalPlaces = 2; + this.numLineWidthoffset.Increment = new decimal(new int[] { + 1, + 0, + 0, + 65536}); + this.numLineWidthoffset.Location = new System.Drawing.Point(312, 18); + this.numLineWidthoffset.Margin = new System.Windows.Forms.Padding(2); + this.numLineWidthoffset.Maximum = new decimal(new int[] { + 1000000000, + 0, + 0, + 0}); + this.numLineWidthoffset.Minimum = new decimal(new int[] { + 100000000, + 0, + 0, + -2147483648}); + this.numLineWidthoffset.Name = "numLineWidthoffset"; + this.numLineWidthoffset.Size = new System.Drawing.Size(117, 21); + this.numLineWidthoffset.TabIndex = 15; + // + // label60 + // + this.label60.AutoSize = true; + this.label60.Location = new System.Drawing.Point(10, 20); + this.label60.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label60.Name = "label60"; + this.label60.Size = new System.Drawing.Size(65, 12); + this.label60.TabIndex = 14; + this.label60.Text = "PT补偿(mm)"; + // + // numPToffset + // + this.numPToffset.DecimalPlaces = 4; + this.numPToffset.Increment = new decimal(new int[] { + 1, + 0, + 0, + 65536}); + this.numPToffset.Location = new System.Drawing.Point(79, 18); + this.numPToffset.Margin = new System.Windows.Forms.Padding(2); + this.numPToffset.Maximum = new decimal(new int[] { + 1000000000, + 0, + 0, + 0}); + this.numPToffset.Minimum = new decimal(new int[] { + 100000000, + 0, + 0, + -2147483648}); + this.numPToffset.Name = "numPToffset"; + this.numPToffset.Size = new System.Drawing.Size(117, 21); + this.numPToffset.TabIndex = 13; + // // groupBox21 // this.groupBox21.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) @@ -2999,103 +3113,142 @@ this.label49.TabIndex = 4; this.label49.Text = "本机IP："; // - // groupBox24 + // groupBox25 // - this.groupBox24.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + this.groupBox25.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.groupBox24.BackColor = System.Drawing.SystemColors.ActiveCaption; - this.groupBox24.Controls.Add(this.panel24); - this.groupBox24.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.groupBox24.Location = new System.Drawing.Point(2, 290); - this.groupBox24.Margin = new System.Windows.Forms.Padding(2); - this.groupBox24.Name = "groupBox24"; - this.groupBox24.Padding = new System.Windows.Forms.Padding(2); - this.groupBox24.Size = new System.Drawing.Size(476, 73); - this.groupBox24.TabIndex = 34; - this.groupBox24.TabStop = false; - this.groupBox24.Text = "尺寸补偿"; + this.groupBox25.BackColor = System.Drawing.SystemColors.ActiveCaption; + this.groupBox25.Controls.Add(this.panel25); + this.groupBox25.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.groupBox25.Location = new System.Drawing.Point(4, 275); + this.groupBox25.Margin = new System.Windows.Forms.Padding(2); + this.groupBox25.Name = "groupBox25"; + this.groupBox25.Padding = new System.Windows.Forms.Padding(2); + this.groupBox25.Size = new System.Drawing.Size(451, 117); + this.groupBox25.TabIndex = 31; + this.groupBox25.TabStop = false; + this.groupBox25.Text = "原始缺陷小图"; // - // panel24 + // panel25 // - this.panel24.BackColor = System.Drawing.Color.White; - this.panel24.Controls.Add(this.label62); - this.panel24.Controls.Add(this.numLineWidthoffset); - this.panel24.Controls.Add(this.label60); - this.panel24.Controls.Add(this.numPToffset); - this.panel24.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel24.Location = new System.Drawing.Point(2, 16); - this.panel24.Margin = new System.Windows.Forms.Padding(2); - this.panel24.Name = "panel24"; - this.panel24.Size = new System.Drawing.Size(472, 55); - this.panel24.TabIndex = 0; + this.panel25.BackColor = System.Drawing.Color.White; + this.panel25.Controls.Add(this.label65); + this.panel25.Controls.Add(this.Defect_SrcSmall_Thres); + this.panel25.Controls.Add(this.pictureBox1); + this.panel25.Controls.Add(this.label63); + this.panel25.Controls.Add(this.txtDefect_SrcSmall_SavePath); + this.panel25.Controls.Add(this.numDefect_SrcSmall_Path_AutoClear); + this.panel25.Controls.Add(this.label64); + this.panel25.Controls.Add(this.chkDefect_SrcSmall_Path_AutoClear); + this.panel25.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel25.Location = new System.Drawing.Point(2, 16); + this.panel25.Margin = new System.Windows.Forms.Padding(2); + this.panel25.Name = "panel25"; + this.panel25.Size = new System.Drawing.Size(447, 99); + this.panel25.TabIndex = 0; // - // label60 + // pictureBox1 // - this.label60.AutoSize = true; - this.label60.Location = new System.Drawing.Point(10, 20); - this.label60.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); - this.label60.Name = "label60"; - this.label60.Size = new System.Drawing.Size(65, 12); - this.label60.TabIndex = 14; - this.label60.Text = "PT补偿(mm)"; + this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); + this.pictureBox1.Location = new System.Drawing.Point(413, 9); + this.pictureBox1.Margin = new System.Windows.Forms.Padding(2); + this.pictureBox1.Name = "pictureBox1"; + this.pictureBox1.Size = new System.Drawing.Size(21, 19); + this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; + this.pictureBox1.TabIndex = 6; + this.pictureBox1.TabStop = false; + this.pictureBox1.Click += new System.EventHandler(this.btnClearDefect_SrcSmall_Path_Click); // - // numPToffset + // label63 // - this.numPToffset.DecimalPlaces = 4; - this.numPToffset.Increment = new decimal(new int[] { + this.label63.AutoSize = true; + this.label63.Location = new System.Drawing.Point(212, 39); + this.label63.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label63.Name = "label63"; + this.label63.Size = new System.Drawing.Size(17, 12); + this.label63.TabIndex = 14; + this.label63.Text = "天"; + // + // txtDefect_SrcSmall_SavePath + // + this.txtDefect_SrcSmall_SavePath.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.txtDefect_SrcSmall_SavePath.Location = new System.Drawing.Point(74, 9); + this.txtDefect_SrcSmall_SavePath.Margin = new System.Windows.Forms.Padding(2); + this.txtDefect_SrcSmall_SavePath.Name = "txtDefect_SrcSmall_SavePath"; + this.txtDefect_SrcSmall_SavePath.ReadOnly = true; + this.txtDefect_SrcSmall_SavePath.Size = new System.Drawing.Size(341, 21); + this.txtDefect_SrcSmall_SavePath.TabIndex = 5; + this.txtDefect_SrcSmall_SavePath.Text = "D:\\phtons\\"; + this.txtDefect_SrcSmall_SavePath.Click += new System.EventHandler(this.txtDefect_SrcSmall_SavePath_Click); + // + // numDefect_SrcSmall_Path_AutoClear + // + this.numDefect_SrcSmall_Path_AutoClear.DecimalPlaces = 1; + this.numDefect_SrcSmall_Path_AutoClear.Location = new System.Drawing.Point(165, 35); + this.numDefect_SrcSmall_Path_AutoClear.Margin = new System.Windows.Forms.Padding(2); + this.numDefect_SrcSmall_Path_AutoClear.Name = "numDefect_SrcSmall_Path_AutoClear"; + this.numDefect_SrcSmall_Path_AutoClear.Size = new System.Drawing.Size(43, 21); + this.numDefect_SrcSmall_Path_AutoClear.TabIndex = 13; + this.numDefect_SrcSmall_Path_AutoClear.Value = new decimal(new int[] { + 7, + 0, + 0, + 0}); + // + // label64 + // + this.label64.AutoSize = true; + this.label64.Location = new System.Drawing.Point(10, 11); + this.label64.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label64.Name = "label64"; + this.label64.Size = new System.Drawing.Size(65, 12); + this.label64.TabIndex = 4; + this.label64.Text = "保存路径："; + // + // chkDefect_SrcSmall_Path_AutoClear + // + this.chkDefect_SrcSmall_Path_AutoClear.AutoSize = true; + this.chkDefect_SrcSmall_Path_AutoClear.Location = new System.Drawing.Point(74, 39); + this.chkDefect_SrcSmall_Path_AutoClear.Margin = new System.Windows.Forms.Padding(2); + this.chkDefect_SrcSmall_Path_AutoClear.Name = "chkDefect_SrcSmall_Path_AutoClear"; + this.chkDefect_SrcSmall_Path_AutoClear.Size = new System.Drawing.Size(96, 16); + this.chkDefect_SrcSmall_Path_AutoClear.TabIndex = 12; + this.chkDefect_SrcSmall_Path_AutoClear.Text = "自动清除大于"; + this.chkDefect_SrcSmall_Path_AutoClear.UseVisualStyleBackColor = true; + // + // Defect_SrcSmall_Thres + // + this.Defect_SrcSmall_Thres.DecimalPlaces = 2; + this.Defect_SrcSmall_Thres.Increment = new decimal(new int[] { 1, 0, 0, 65536}); - this.numPToffset.Location = new System.Drawing.Point(79, 18); - this.numPToffset.Margin = new System.Windows.Forms.Padding(2); - this.numPToffset.Maximum = new decimal(new int[] { - 1000000000, - 0, - 0, - 0}); - this.numPToffset.Minimum = new decimal(new int[] { - 100000000, - 0, - 0, - -2147483648}); - this.numPToffset.Name = "numPToffset"; - this.numPToffset.Size = new System.Drawing.Size(117, 21); - this.numPToffset.TabIndex = 13; - // - // label62 - // - this.label62.AutoSize = true; - this.label62.Location = new System.Drawing.Point(231, 20); - this.label62.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); - this.label62.Name = "label62"; - this.label62.Size = new System.Drawing.Size(77, 12); - this.label62.TabIndex = 16; - this.label62.Text = "线宽补偿(um)"; - // - // numLineWidthoffset - // - this.numLineWidthoffset.DecimalPlaces = 2; - this.numLineWidthoffset.Increment = new decimal(new int[] { + this.Defect_SrcSmall_Thres.Location = new System.Drawing.Point(165, 67); + this.Defect_SrcSmall_Thres.Margin = new System.Windows.Forms.Padding(2); + this.Defect_SrcSmall_Thres.Maximum = new decimal(new int[] { 1, 0, 0, - 65536}); - this.numLineWidthoffset.Location = new System.Drawing.Point(312, 18); - this.numLineWidthoffset.Margin = new System.Windows.Forms.Padding(2); - this.numLineWidthoffset.Maximum = new decimal(new int[] { - 1000000000, - 0, - 0, 0}); - this.numLineWidthoffset.Minimum = new decimal(new int[] { - 100000000, + this.Defect_SrcSmall_Thres.Name = "Defect_SrcSmall_Thres"; + this.Defect_SrcSmall_Thres.Size = new System.Drawing.Size(45, 21); + this.Defect_SrcSmall_Thres.TabIndex = 15; + this.Defect_SrcSmall_Thres.Value = new decimal(new int[] { + 7, 0, 0, - -2147483648}); - this.numLineWidthoffset.Name = "numLineWidthoffset"; - this.numLineWidthoffset.Size = new System.Drawing.Size(117, 21); - this.numLineWidthoffset.TabIndex = 15; + 65536}); + // + // label65 + // + this.label65.AutoSize = true; + this.label65.Location = new System.Drawing.Point(95, 71); + this.label65.Name = "label65"; + this.label65.Size = new System.Drawing.Size(65, 12); + this.label65.TabIndex = 16; + this.label65.Text = "过滤置信度"; // // FrmSysSetting // @@ -3210,6 +3363,11 @@ ((System.ComponentModel.ISupportInitialize)(this.btnClearDefect_Small_Path)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.numDefect_Small_Path_AutoClear)).EndInit(); this.tabPage6.ResumeLayout(false); + this.groupBox24.ResumeLayout(false); + this.panel24.ResumeLayout(false); + this.panel24.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numLineWidthoffset)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numPToffset)).EndInit(); this.groupBox21.ResumeLayout(false); this.panel21.ResumeLayout(false); this.panel21.PerformLayout(); @@ -3235,11 +3393,12 @@ this.panel18.ResumeLayout(false); this.panel18.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.numHttpPort)).EndInit(); - this.groupBox24.ResumeLayout(false); - this.panel24.ResumeLayout(false); - this.panel24.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.numPToffset)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.numLineWidthoffset)).EndInit(); + this.groupBox25.ResumeLayout(false); + this.panel25.ResumeLayout(false); + this.panel25.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numDefect_SrcSmall_Path_AutoClear)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.Defect_SrcSmall_Thres)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -3461,5 +3620,15 @@ private System.Windows.Forms.NumericUpDown numLineWidthoffset; private System.Windows.Forms.Label label60; private System.Windows.Forms.NumericUpDown numPToffset; + private System.Windows.Forms.GroupBox groupBox25; + private System.Windows.Forms.Panel panel25; + private System.Windows.Forms.PictureBox pictureBox1; + private System.Windows.Forms.Label label63; + private System.Windows.Forms.TextBox txtDefect_SrcSmall_SavePath; + private System.Windows.Forms.NumericUpDown numDefect_SrcSmall_Path_AutoClear; + private System.Windows.Forms.Label label64; + private System.Windows.Forms.CheckBox chkDefect_SrcSmall_Path_AutoClear; + private System.Windows.Forms.Label label65; + private System.Windows.Forms.NumericUpDown Defect_SrcSmall_Thres; } } \ No newline at end of file diff --git a/halftoneproject-master/Code/FrmSysSetting.cs b/halftoneproject-master/Code/FrmSysSetting.cs index 4a5d613..b45505b 100644 --- a/halftoneproject-master/Code/FrmSysSetting.cs +++ b/halftoneproject-master/Code/FrmSysSetting.cs @@ -149,6 +149,8 @@ namespace ProductionControl this.txtDefect_Small_Path.Text = Util.ReadIniValue(configPath, "DEV", "Defect_Small_SavePath"); this.txtDefect_Compress_SavePath.Text = Util.ReadIniValue(configPath, "DEV", "Defect_Compress_SavePath"); + this.txtDefect_SrcSmall_SavePath.Text = Util.ReadIniValue(configPath, "DEV", "Defect_SrcSmall_SavePath"); + //int liTmp = -1; double ldTmp = -1; lsTmp = Util.ReadIniValue(configPath, "DEV", "Defect_SavePath_AutoClear"); @@ -168,6 +170,22 @@ namespace ProductionControl ldTmp = Convert.ToDouble(lsTmp); chkDefect_Small_Path_AutoClear.Checked = (ldTmp > -1); if (ldTmp > -1) numDefect_Small_Path_AutoClear.Value = (decimal)ldTmp; + /////////////////////////////////////// + /// + lsTmp = Util.ReadIniValue(configPath, "DEV", "Defect_SrcSmall_SavePath_AutoClear"); + //if (Util.IsNumber(lsTmp)) liTmp = Convert.ToInt32(lsTmp); + if (lsTmp == "") + lsTmp = "3"; + ldTmp = Convert.ToDouble(lsTmp); + chkDefect_SrcSmall_Path_AutoClear.Checked = (ldTmp > -1); + if (ldTmp > -1) numDefect_SrcSmall_Path_AutoClear.Value = (decimal)ldTmp; + + lsTmp = Util.ReadIniValue(configPath, "DEV", "Defect_SrcSmall_Thres"); + if (lsTmp == "") + lsTmp = "0.7"; + ldTmp = Convert.ToDouble(lsTmp); + if (ldTmp > -1) Defect_SrcSmall_Thres.Value = (decimal)ldTmp; + /////////////////////////////////////// this.chkSaveAllDefectImg.Checked= (Util.ReadIniValue(configPath, "DEV", "SaveAllDefectImg") == "1"); @@ -259,6 +277,10 @@ namespace ProductionControl //if (Defect_Small_SavePath == "") // throw new Exception("请设置缺陷小图保存路径 ！"); + string Defect_SrcSmall_SavePath = this.txtDefect_SrcSmall_SavePath.Text.Trim(); + if (Defect_SrcSmall_SavePath == "") + throw new Exception("请设置原始缺陷小图保存路径 ！"); + //DB string DBConStr = this.txtDBCon.Text.Trim(); if (DBConStr == "") @@ -349,7 +371,11 @@ namespace ProductionControl Utils.Util.WriteIniValue(configPath, "DEV", "Defect_Compress_SavePath_AutoClear", (chkDefect_Compress_SavePath_AutoClear.Checked ? (double)numDefect_Compress_SavePath_AutoClear.Value : -1) + ""); Utils.Util.WriteIniValue(configPath, "DEV", "Defect_Small_SavePath", Defect_Small_SavePath); Utils.Util.WriteIniValue(configPath, "DEV", "Defect_Small_SavePath_AutoClear", (chkDefect_Small_Path_AutoClear.Checked ? (double)numDefect_Small_Path_AutoClear.Value : -1) + ""); - + ////////////////// + Utils.Util.WriteIniValue(configPath, "DEV", "Defect_SrcSmall_SavePath", Defect_SrcSmall_SavePath); + Utils.Util.WriteIniValue(configPath, "DEV", "Defect_SrcSmall_Thres", Defect_SrcSmall_Thres.Value.ToString()); + Utils.Util.WriteIniValue(configPath, "DEV", "Defect_SrcSmall_SavePath_AutoClear", (chkDefect_SrcSmall_Path_AutoClear.Checked ? (double)numDefect_SrcSmall_Path_AutoClear.Value : -1) + ""); + ////////////////// Utils.Util.WriteIniValue(configPath, "DEV", "SaveAllDefectImg", this.chkSaveAllDefectImg.Checked ? "1" : "0"); Utils.Util.WriteIniValue(configPath, "DEV", "MakeTag", this.chkMakeTag.Checked ? "1" : "0"); Utils.Util.WriteIniValue(configPath, "DEV", "SizeEnginePath", this.txtSizeEnginePath.Text.Trim()); @@ -440,12 +466,23 @@ namespace ProductionControl if (!string.IsNullOrWhiteSpace(path)) this.txtDefect_Compress_SavePath.Text = path; } - + + private void txtDefect_SrcSmall_SavePath_Click(object sender, EventArgs e) + { + string path = FileUtil.selectFolder(Application.StartupPath); + if (!string.IsNullOrWhiteSpace(path)) + this.txtDefect_SrcSmall_SavePath.Text = path; + } + private void btnClearDefect_Small_Path_Click(object sender, EventArgs e) { this.txtDefect_Small_Path.Text = ""; } + private void btnClearDefect_SrcSmall_Path_Click(object sender, EventArgs e) + { + this.txtDefect_SrcSmall_SavePath.Text = ""; + } private void btnClearDefect_Path_Click(object sender, EventArgs e) { this.txtDefect_Path.Text = ""; diff --git a/halftoneproject-master/Code/FrmSysSetting.resx b/halftoneproject-master/Code/FrmSysSetting.resx index 1ffbc24..14f538f 100644 --- a/halftoneproject-master/Code/FrmSysSetting.resx +++ b/halftoneproject-master/Code/FrmSysSetting.resx @@ -124,16 +124,16 @@ iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIdSURBVFhH7ZdBS9xAFMefFMRCRegXkLbUi+CtFqXVS1v1 - A+xBRKOZmWReqgfxG3iT9tLSD9BWUUHwC3gTe6wt9ODRm3hWRKVUfTPMZjPu7G4mGwqCf/iR3Zl5//x3 - 8pLdhXs51AFRMkKMF4bLMeBJv/HzUKXSCSzeAYHXpcBx2TjnlMAXdSbt88a45xCXr9NChof0Cb6DiFf9 - kd8gxAPtM4tHEEU95gwtFCWv0gAcv5rRYuJyJfUScsuMtlA2gJDrZrSYhPxc89J+gZlpomwAhhtmNL8Y - ztHORfo1x09WgEk8gzDp1XMN1U6AxcWHVHela5U4fky9qoTxD5rp0PNOtRMgDLup7oQ41++5/JB6Wcgl - Pe+U1QO4ZkbzKUkewduJf7pWyWpCi20975QdoMnCBtK3rWlegV8yXjWa7qwdQG3nsJnxE8MBqj3OeNXw - CKBQTfWH2KcHzK/W0DqOvyEI/pr6ejwDlM/dDBAEp4Wo3hVZvAIoEyEngLHHhYjj5+SzZ3n67QA1VrsS - mFienpfgkrp6AUTy0hsWD5LfePq1XOVuNmGZeAY4p0swA/x9n24odcyLWh9FQ8DkT8vz/zehRMvTeweE - nAYhnsEcPtXH26hxF3z+CdXTj1z9iM4ZIPuj1EZ9J/jheghp5KY5m0Pq1nEWlUmzAEHQRYt264tKYmrq - gnZ5zJytgSqVB7R4lPrB/berKALf6b64lyWAG3A0ZYu/HkZSAAAAAElFTkSuQmCC + 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== @@ -167,6 +167,23 @@ wJD1qXOM2Dq0xMNAVu/TF71fnBwyoSEFtfd230T2OtJM0fcFhb/lw3Mr4pqYvJ6Gf8unHkxqflIprgl6 XWmm6CDGEOGrF8h3F+f0k3AjNqFe3luyZB0jEcqD41wfIN8u/uDhVDzDw+m8z+v2vgCLN08Z7ifCRgAA AABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL + DAAACwwBP0AiyAAAAB90RVh0U29mdHdhcmUATWFjcm9tZWRpYSBGaXJld29ya3MgOLVo0ngAAAJRSURB + VFhHxZfNTsMwEISBtyoXKM3TwIUDTa9U4h8BT8CDAiphd+J118nENlCEpU9q7dmZrZ2mzZ6Mg38mfdN1 + XUTGfpjfBfsDbx06HwVY+Fgujjbt4vR9uTgcCH8DvN+Wi9mmbc4k49h5Q4DuPtvmpVs1nfG5aq530ATC + 4ZV6v5r3gb6QT3zsBU54o+tBzAImsTp4EG/JnIuuF8q2nzORYjvxnSZcePLJPZop2rgDMyYy5HiwE2HQ + UEcfrjXEy9BM1WpBfw1kulU2q+a2ogmEQ0s8DNtVHUnh1HkZ8qnuVBeKffB221VDag1k9PUYY4PCTsj6 + qAlXWwofXk/bBmxCF2ULSztxH0wwEK5zRGvAc1sT83w4UFEwzJ9j2zw67SPTGPAK2kFe8iYSjctbeqmw + NQMePFwZTURqm8hRCFfoZCQ2UThfBmry4QqdTIhNrPLn7IG2HK7QyRGuiex5K9DUhSt0coRrYM1CPdDs + sgEX/swCGdDWNUEnIz8JNyqboJPAhSd/VL4DavNN0MnqcPmqrRW2ZhSaGE1sw9vmiRkafovxmmgMeAXt + IC95g4lgmL+3h3AbVU2Ee0MYMS+G62IwemAGhqyPttTV5o9MvdPa2IAZZG+5LNyw+Yomkp9yLba/ZFes + wJD1qXOM2Dq0xMNAVu/TF71fnBwyoSEFtfd230T2OtJM0fcFhb/lw3Mr4pqYvJ6Gf8unHkxqflIprgl6 + XWmm6CDGEOGrF8h3F+f0k3AjNqFe3luyZB0jEcqD41wfIN8u/uDhVDzDw+m8z+v2vgCLN08Z7ifCRgAA + AABJRU5ErkJggg== diff --git a/新建 文本文档.txt b/新建 文本文档.txt new file mode 100644 index 0000000..e69de29 diff --git a/更新日志.txt b/更新日志.txt index a2251ef..e4734a8 100644 --- a/更新日志.txt +++ b/更新日志.txt @@ -30,4 +30,7 @@ V1.2.4： 1.修复自动删除图片，设置天数存在小数点之后不起效问题1 2.加入pad点检测 V1.2.4: - 新增比对缺陷：wtg未通过 qs缺失 dc多出 按顺序展示在修复台 \ No newline at end of file + 新增比对缺陷：wtg未通过 qs缺失 dc多出 按顺序展示在修复台 + +V1.2.4: 良品更新 + 缺陷修改：栅线sx改为钢丝断裂gsdl，加入原始小图保存，修复台缺陷名称同步 \ No newline at end of file