diff --git a/halftoneproject-master/Code/Config.cs b/halftoneproject-master/Code/Config.cs
index f29e5ae..6a63cfd 100644
--- a/halftoneproject-master/Code/Config.cs
+++ b/halftoneproject-master/Code/Config.cs
@@ -269,14 +269,14 @@ namespace ProductionControl
Defect_SavePath = Util.ReadIniValue(configPath, "DEV", "Defect_SavePath");
lsTmp = Util.ReadIniValue(configPath, "DEV", "Defect_SavePath_AutoClear");
- if (Util.IsNumber(lsTmp)) Defect_SavePath_AutoClear = Convert.ToDouble(lsTmp);
+ if (Util.IsDecimal(lsTmp)) Defect_SavePath_AutoClear = Convert.ToDouble(lsTmp);
Defect_Compress_SavePath = Util.ReadIniValue(configPath, "DEV", "Defect_Compress_SavePath");
lsTmp = Util.ReadIniValue(configPath, "DEV", "Defect_Compress_SavePath_AutoClear");
- if (Util.IsNumber(lsTmp)) Defect_Compress_SavePath_AutoClear = Convert.ToDouble(lsTmp);
+ if (Util.IsDecimal(lsTmp)) Defect_Compress_SavePath_AutoClear = Convert.ToDouble(lsTmp);
Defect_Small_SavePath = Util.ReadIniValue(configPath, "DEV", "Defect_Small_SavePath");
lsTmp = Util.ReadIniValue(configPath, "DEV", "Defect_Small_SavePath_AutoClear");
- if (Util.IsNumber(lsTmp)) Defect_Small_SavePath_AutoClear = Convert.ToDouble(lsTmp);
+ if (Util.IsDecimal(lsTmp)) Defect_Small_SavePath_AutoClear = Convert.ToDouble(lsTmp);
lsTmp = Util.ReadIniValue(configPath, "DEV", "SaveAllDefectImg");
SaveAllDefectImg = (lsTmp == "1");
@@ -285,15 +285,15 @@ namespace ProductionControl
SizeBmp_SavePath = Util.ReadIniValue(configPath, "DEV", "SizeBmp_SavePath");
lsTmp = Util.ReadIniValue(configPath, "DEV", "SizeBmp_SavePath_AutoClear");
- if (Util.IsNumber(lsTmp)) SizeBmp_SavePath_AutoClear = Convert.ToDouble(lsTmp);
+ if (Util.IsDecimal(lsTmp)) SizeBmp_SavePath_AutoClear = Convert.ToDouble(lsTmp);
SizeBmp_Compare_SavePath = Util.ReadIniValue(configPath, "DEV", "SizeBmp_Compare_SavePath");
lsTmp = Util.ReadIniValue(configPath, "DEV", "SizeBmp_Compare_SavePath_AutoClear");
- if (Util.IsNumber(lsTmp)) SizeBmp_Compare_SavePath_AutoClear = Convert.ToDouble(lsTmp);
+ if (Util.IsDecimal(lsTmp)) SizeBmp_Compare_SavePath_AutoClear = Convert.ToDouble(lsTmp);
SizeBmp_Zoom_Image_SavePath = Util.ReadIniValue(configPath, "DEV", "SizeBmp_Zoom_Image_SavePath");
lsTmp = Util.ReadIniValue(configPath, "DEV", "SizeBmp_Zoom_Image_SavePath_AutoClear");
- if (Util.IsNumber(lsTmp)) SizeBmp_Zoom_Image_SavePath_AutoClear = Convert.ToDouble(lsTmp);
+ if (Util.IsDecimal(lsTmp)) SizeBmp_Zoom_Image_SavePath_AutoClear = Convert.ToDouble(lsTmp);
lsTmp = Util.ReadIniValue(configPath, "DEV", "PT_Offset");
if (string.IsNullOrEmpty(lsTmp))
diff --git a/halftoneproject-master/Code/FrmLogin.Designer.cs b/halftoneproject-master/Code/FrmLogin.Designer.cs
index 647de32..095046d 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.3";
+ this.Text = "自动化视觉检测系统 - v1.2.4";
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 9fae6bc..e42ec36 100644
--- a/halftoneproject-master/Code/FrmMain.Designer.cs
+++ b/halftoneproject-master/Code/FrmMain.Designer.cs
@@ -30,11 +30,11 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmMain));
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
this.menuStrip1 = new System.Windows.Forms.MenuStrip();
this.管理HToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.流程管理ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -742,27 +742,27 @@
//
this.dgvProcess.AllowUserToAddRows = false;
this.dgvProcess.AllowUserToDeleteRows = false;
- dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
- dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
- dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
- dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.dgvProcess.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
+ dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+ dataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control;
+ dataGridViewCellStyle11.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ dataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText;
+ dataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.dgvProcess.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle11;
this.dgvProcess.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dgvProcess.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.colCode,
this.colProcessName,
this.colValue});
- dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
- dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window;
- dataGridViewCellStyle4.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText;
- dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
- this.dgvProcess.DefaultCellStyle = dataGridViewCellStyle4;
+ dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+ dataGridViewCellStyle14.BackColor = System.Drawing.SystemColors.Window;
+ dataGridViewCellStyle14.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ dataGridViewCellStyle14.ForeColor = System.Drawing.SystemColors.ControlText;
+ dataGridViewCellStyle14.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle14.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+ this.dgvProcess.DefaultCellStyle = dataGridViewCellStyle14;
this.dgvProcess.Dock = System.Windows.Forms.DockStyle.Fill;
this.dgvProcess.Location = new System.Drawing.Point(2, 16);
this.dgvProcess.Margin = new System.Windows.Forms.Padding(2);
@@ -771,8 +771,8 @@
this.dgvProcess.ReadOnly = true;
this.dgvProcess.RowHeadersVisible = false;
this.dgvProcess.RowHeadersWidth = 62;
- dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.dgvProcess.RowsDefaultCellStyle = dataGridViewCellStyle5;
+ dataGridViewCellStyle15.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.dgvProcess.RowsDefaultCellStyle = dataGridViewCellStyle15;
this.dgvProcess.RowTemplate.Height = 30;
this.dgvProcess.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
this.dgvProcess.Size = new System.Drawing.Size(500, 141);
@@ -792,9 +792,9 @@
// colProcessName
//
this.colProcessName.DataPropertyName = "ProcessName";
- dataGridViewCellStyle2.BackColor = System.Drawing.Color.White;
- dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.colProcessName.DefaultCellStyle = dataGridViewCellStyle2;
+ dataGridViewCellStyle12.BackColor = System.Drawing.Color.White;
+ dataGridViewCellStyle12.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.colProcessName.DefaultCellStyle = dataGridViewCellStyle12;
this.colProcessName.HeaderText = "工序名称";
this.colProcessName.MinimumWidth = 8;
this.colProcessName.Name = "colProcessName";
@@ -805,8 +805,8 @@
// colValue
//
this.colValue.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
- dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Bold);
- this.colValue.DefaultCellStyle = dataGridViewCellStyle3;
+ dataGridViewCellStyle13.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Bold);
+ this.colValue.DefaultCellStyle = dataGridViewCellStyle13;
this.colValue.HeaderText = "内容";
this.colValue.MinimumWidth = 8;
this.colValue.Name = "colValue";
@@ -1552,7 +1552,7 @@
this.splitContainer2.Panel2.Controls.Add(this.gboxDefectList);
this.splitContainer2.Panel2MinSize = 400;
this.splitContainer2.Size = new System.Drawing.Size(463, 523);
- this.splitContainer2.SplitterDistance = 28;
+ this.splitContainer2.SplitterDistance = 29;
this.splitContainer2.SplitterWidth = 3;
this.splitContainer2.TabIndex = 10;
//
@@ -1572,7 +1572,7 @@
// splitContainer3.Panel2
//
this.splitContainer3.Panel2.Controls.Add(this.picScanner2);
- this.splitContainer3.Size = new System.Drawing.Size(28, 523);
+ this.splitContainer3.Size = new System.Drawing.Size(29, 523);
this.splitContainer3.SplitterDistance = 226;
this.splitContainer3.SplitterWidth = 3;
this.splitContainer3.TabIndex = 11;
@@ -1586,7 +1586,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(28, 226);
+ this.picScanner1.Size = new System.Drawing.Size(29, 226);
this.picScanner1.TabIndex = 7;
this.picScanner1.TabStop = false;
//
@@ -1598,7 +1598,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(28, 294);
+ this.picScanner2.Size = new System.Drawing.Size(29, 294);
this.picScanner2.TabIndex = 9;
this.picScanner2.TabStop = false;
//
@@ -1612,7 +1612,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(432, 523);
+ this.gboxDefectList.Size = new System.Drawing.Size(431, 523);
this.gboxDefectList.TabIndex = 3;
this.gboxDefectList.TabStop = false;
this.gboxDefectList.Tag = "0";
@@ -1624,7 +1624,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(281, 2);
+ this.lblDefectAddTag.Location = new System.Drawing.Point(280, 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);
@@ -1639,7 +1639,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(428, 505);
+ this.pnlBmpList.Size = new System.Drawing.Size(427, 505);
this.pnlBmpList.TabIndex = 0;
//
// chkBuzzer
@@ -1727,7 +1727,7 @@
this.Margin = new System.Windows.Forms.Padding(2);
this.Name = "FrmMain";
this.ShowIcon = false;
- this.Text = "自动化视觉检测系统 - v1.2.3";
+ this.Text = "自动化视觉检测系统 - v1.2.4";
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.resx b/halftoneproject-master/Code/FrmMain.resx
index e8713cf..bfe81b9 100644
--- a/halftoneproject-master/Code/FrmMain.resx
+++ b/halftoneproject-master/Code/FrmMain.resx
@@ -642,21 +642,21 @@
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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/7NUVv3Klftz7dY
+ gdEmATUCBfzLUlb5Fiu/EeiA/1Ah/IAsB1gK/L/vwPX5pbvo3vfBUu1f4xXSfqcpN/7NUVv3Mlftz7dY
hf80d8AzB+H/rz3F/38Ilv7/LU4BrPdfrhoYjzpg1AGjDhh1wNB3wM9s1ee/UhSv0s0BT92k/l8uDfkP
LM89/tdrsUGlGP6HarG9CZAxA7YHJgMd8JMmDrgU7/Z/44o1/+es34NXwxMrfoOH5tz3qO6A9QdO/1+x
8yhBB4DAXWNB/vumvDMJOeBLrDyopoyFasMPSHEADDyyEPR4Ziv8BN0BH5LVvv3NUZ32PUZOEaqUMCDH
- ATDwzkdS7l2glB/QwuRfmcrG/wrJaDdS4gCqgFEHjDpg3YFT9WAHrNtTDxUaBcMZMDAAAHCV3zql/rK2
+ ATDwzkdS7l2glB/QwuRfmcrG/wrJaDdS4gCqgFEHjDpg3YFT9WAHrNtTDxUaBcMZMDAAAGPc3znAtA5i
AAAAAElFTkSuQmCC
@@ -695,43 +695,43 @@
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHLSURBVFhH7dY9SAJhGMBxpyAIWpuCIGiN7EuXBhssMmyw
- IbAGLTSwqEEiB6ulqSkIguaoISUKIjszKE/Osq44yw8u0zzsSz2xAuHqyeJtqODE0qC4/3T33vu8/IaD
- O9GfKDqcqgnrWTG6LX5UC1Xm62E0tPYGZwbTEDM8wKUuBcHeKzhUBk72ZOQo3oyXou2Fbc1MLOLdFGQB
- ENLG4TOAVNLglB2Drcnl26jfq0FjhcvWiIO77TQnwC4hYL0BT2PNRBca5e1AEZhBl/zlA3jduy11A95K
- zlOqUAU64kOREbY6pImvehQBQEv8fQ9wAkQ7nfarGXtEn5yOj3MDqYmnyRtjxhIYuuZC/QkoOoDsosGv
- jkFEz0LCxEFqAuDWmAFm6B4EgAAQAALg7wOihofYpS7p/TUAofDC7tgZZD8ickoFJeiRiFJRJUdKutEp
- I2ftEkemKICNPhesLLtgwYrxDjikRK2tznlecIB1Zx+WNp05Aa9tiQ/KMSkxnxPQl0h7OoJqNMZfPoD3
- cBkpz74b0a8A9jELmLvQJqvQ1tx9B/AerWYqw7pE552J07BTII6MPOf/3/gTQEESAALAsuM2vwEsmBkt
- Cf3nRKIXmuv1PdX+ZZIAAAAASUVORK5CYII=
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHKSURBVFhH7dYxSAJRGMBxJyEIWpuCIGiNLDOXBhssMmyw
+ IbAGLTTIqCGiBqulqSkIguaoISMKItMUypMzrSvOSuOyzEOx1DusQLC+LJ5DBSeaBsb9p7t373v8hoM7
+ QVkUGmXr7/SMCN2WPrKNrLzqozWUNorRw0kIjzzDvY6F6/4InCj950cyYhyTYBVoe3HbNuKrWC8JGQAE
+ tDH4DiCUFDhkZ2BucV7tNh3Vo7HiZRZj4Oq4yAmwtuKw04wlLRK8B41y5lb4F9Ald/kAPvYeSF2AtRPL
+ pCpQjY74UnCMqQtoYlsehR/QEneFAc4B76SSPjVtDeoT87Gp9BA78zobnUiZfIZIOjAYh5IDiB4KfOow
+ BPUMxKfTwM4APEykgDY8AQ/gATyAB5Q/IDTyHL7XJbx/BsAVXjicvITMR0ROqkCIHglIFSk8VVJih4xY
+ tLbaUiUB7A44YWPdCSubFs4BmxRvMDc6booO2LQfw9qeIyfgo32Ru8oixZdzAgbiSU/XtRqNcZcPIBsm
+ I+SZdyP0E8C8ZABLt9pELdqau0IA2Sg1XXOni3c/Tqc1zByIgmNv+f83/gZQlHgADzDZXcZPgMliREt8
+ /zmB4B2Be/U7rEZs4wAAAABJRU5ErkJggg==
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAUQSURBVFhH7VV7TNVlGH7JRjNbtS7L1uZWs7m12tzc2qpV
- W6vW5qq15bTW1tZlNqgGQzAs5ICQAoHchCH3YwgoIAcMBIEQlLtiCCh3BCVhIhmkxDjn6Xk7H42/6GDH
- /vLZvv32+33f+7zP995+shwgSzbYrRI5b5XmOatcglWgT33X77pvjroXjgOyzp7lcQQ5q4CD9wM/3gNk
- ewDWFc5ntvyz7NlSpOeN6X+HI0vemc5bNYOjLwAVrwHH3+Lis/x5oHQdYHsaKFoD5D1MARSUKZjJlGm1
- MxS3DkfmXVtQQCc1m4DWAKAzAuiOBM7tBE57AQ3vA7WvA9WvAMc2AEfWAjkPAumMBpcjQzYbquUD+2X9
- 1MEHbqKKTjroeKQYGD8BTNQAlwqAgQSgK5BCPgGatwCn3gWqXgVKnmWaHgFSBb+lyg3lMZTLw3ya50kU
- v0hyfzq3Ab/3ALPjwB/DwFQLcKUIGI4Her5lZL4G2j8HmjYzGoyI7TnWByORIphPknpD6TocyfIG0klQ
- SrIOhny8zulcMTcJTHcBk8eBsWyK4H5fEHCeKTrLtDQyGpWskcOsjRRPIImp2CcbDbVrsMeLFakUULaR
- +f6BAn523lydz44BM+eAaxQwngOMxlLEbqYklCK2A2e2AnXvUTyLNPsxIJGdkSh5hto1zEbJBBLZakff
- ZGgtTEEhHTLs091cdH79FHC1lGnIYj3EcT+KIvYAvSzODh8W50fsEkYh5ykgTqB8hvrfgUhZjRhWcTwF
- FL3EkH5F4iSGm0V4tYqhrzbOefvLyXQe41zDFNHPKHSyZppYmBVs19xnnDzkc8TJo8bF0nBEy1pEUUDc
- vSRgMdV8APzCmw3so8MDwK90PKY3X+T84oKAMKaMtdD0GQUwfWqvPORTXuNiaWCPrOGi6pWceCQoJ1ET
- 89oVTBHRdMbKH2HY1eniNUQBvbuYAgpo+NRpp/YxFEA+R7iLEUCweHYGyzx23w1kcAiVsA7qPmYt+LHI
- WA8DnAlDFDKstzZL3/X7hRDnOT2vdmpPHuUz9K5hPlTaEcooJHHEHnqZo5f93fwlw/sdb/k9nfG26nRo
- wbnent91X89VsRXVTu2VJ1TaDLVrcATLTlhoGMVWzFrPlnqbt2JYz7DAunnLXm07Ol1Y+q7fdV/P6Xm1
- U3vy2C0SYqhdg2OHPDGzTaYRRBEJT/JHwxFbwSg0eHPYcPx2s9p72Hb9vH0fo3A+3Pld9/VcLv8Nakf7
- cS/5U/kMtetAoHyDHRQQxt/vfhZTIduqirlt9mVB8saDGcy/1fm8wGHUxpGs+3ouhefVjvb2QAkzlMsD
- NskKu7/kYDtFRDzOguJks3HCNXPs9tHxKGfBWAWfJXxnW7ayBcs4gNJ5Ts/Tzh4g5cpjKJcP7Qj7NqlG
- AP/z0ZxqBfwztjHkg3Q6wck42eF8DvG9lSO7mAL2svL9PWD3k3KHr6w0VLcOJZn3kXoEsaDyPwRadA7w
- 33B9ELgx4XyO1Dq/5zH/Iath95FKtzhfAMke8k60wS/tGELy6hFbdha5LaM4dPoy0mt7EFnUhCBrFXyT
- bfgiJh/wkvuMqfsQE5+Y64oAS2xyqjFxLzQCaSd6Udl1BRen5jA5yya4dhON/RPIPdmDqOIW7Drc8HcE
- jIl74Z1gs7gSga3R+RZj4l7ciYBCBSwVARVgjt4e+KWWW4KDwx1LROD23X4x9v7UblksIKKw8f9xfAfu
- h8hfUyBzuFLSYqkAAAAASUVORK5CYII=
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAURSURBVFhH7VVtTJVlGL7JRjNbtT6Wrc2tZnNrtbm5tVWr
+ tlatzVVry2mtra2P2aAaDMGw8BwQUyCQL2EICBxDQAE5YCAIhKB8K4aA8o2gJEwkg5QY51xdd+eh8YsO
+ duyX1/bs3fs+z33d13N/vbIUIFPWOWwSOWeTplmbXIJNoE991++6b456Fs4DssaR6XUE2SuAg/cDP94D
+ ZHkBtmWuZ5b8sxxZUqjnjel/hzNT3pnKXTGNoy8A5a8Bx9/i4rPseaBkDWB/GihcBeQ+TAEUlCGYzpAp
+ tTMUtw5nxl2bkE8n1RuAliCgIwLoigTObQdO+wD17wM1rwNVrwDH1gFHVgPZDwLpjAaXc79sNFRLB/bJ
+ 2smDD9xEJZ200/FwETB2AhivBi7lA/0JQGcwhXwCNG0CTr0LVL4KFD/LND0CpAp+S5UbymMol4a5NO+T
+ KHqR5IF0bgd+7wZmxoA/hoDJZuBKITAUD3R/y8h8DbR9DjRuZDQYEftzrA9GIkUwlyR1htJ9OJPlDaST
+ oIRk7Qz5WK3LuWJ2ApjqBCaOA6NZFMH93hDgPFN0lmlpYDQqWCOHWRsp3kASU7FX1htq9+CIFxtSKaB0
+ PfP9AwX87Lq5Op8ZBabPAdcoYCwbGImliF1MSRhFbAXObAZq36N4FmnWY0AiOyNRcg21e5iJknEkstWO
+ vsnQWpmCAjpk2Ke6uOj8+ingagnTkMl6iON+FEXsBnpYnO1+LM6P2CWMQvZTQJxA+Qz1vwORshIxrOJ4
+ Cih8iSH9isRJDDeL8GolQ19lnPP2l5PpPMa1hiiij1HoYM00sjDL2a45z7h4yOeMk0eNi8XhjJbViKKA
+ uHtJwGKq/gD4hTfr30uHB4Bf6XhUb77A+cV5AeFMGWuh8TMKYPrUXnnIp7zGxeLAblnFRdXLOfFIUEai
+ Rua100IR0XTGyh9m2NXpwjVIAT07mAIKqP/UZaf2MRRAPudONyMAi3h3WGQOu+4G9nMIFbMOaj9mLQSw
+ yFgP/ZwJgxQypLc2S9/1+4VQ1zk9r3ZqTx7lM/TuYS5M2hDGKCRxxB56maOX/d30JcP7HW/5PZ3xtup0
+ cN653p7fdV/PVbIV1U7tlSdMWg21e3BaZDusNIxiK2auZUu9zVsxrGdYYF28ZY+2HZ3OL33X77qv5/S8
+ 2qk9eRxWCTXU7sG5TZ6Y3iJTCKGIhCf5o+GILWcU6n05bDh+u1jt3Wy7Pt6+l1E4v9P1Xff1XA7/DWpH
+ +zEf+VP5DLX7QLB8g20UEM7f7z4WUwHbqpK5bfJnQfLGA/uZf5vreYHDqJUjWff1XArPqx3tHcESbiiX
+ BmyQZY5AycZWioh4nAXFyWbnhGvi2O2l4xHOgtFyPov5zrZsYQuWcgCl85yep50jSMqUx1AuHdoRji1S
+ hSD+56M51fL5Z2xlyAfodJyTcaLd9RzkewtHdhEF7GHlB3rBESBlTn9ZbqhuHUoy5yd1CGFB5X0INOsc
+ 4L/h+gBwY9z1HK5xfc9l/kNXwuEnFR5xPg+SPeSbaEdA2jGE5tYhtvQscppHcOj0ZaTXdCOysBEhtkr4
+ J9vxRUwe4CP3GVPPISY+MccdAdbY5FRj4lloBNJO9KCi8wouTs5iYoZNcO0mGvrGkXOyG1FFzdhxuP7v
+ CBgTz8I3wW51JwKbo/OsxsSzuBMBhQpYLAIqwBy9PQhILbNaLOHORSJw+26/EHt+arMuFBBR0PD/OL4D
+ z0PkL1DOc7dzBt5pAAAAAElFTkSuQmCC
diff --git a/halftoneproject-master/Code/Properties/AssemblyInfo.cs b/halftoneproject-master/Code/Properties/AssemblyInfo.cs
index 0568ee6..ce34e0f 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.3.0")]
-[assembly: AssemblyFileVersion("1.2.3.0")]
+[assembly: AssemblyVersion("1.2.4.0")]
+[assembly: AssemblyFileVersion("1.2.4.0")]
diff --git a/更新日志.txt b/更新日志.txt
index 3a4d5cf..baf4b8a 100644
--- a/更新日志.txt
+++ b/更新日志.txt
@@ -25,4 +25,6 @@ V1.2.3：
1.修复开启比对，但比对失败当成无比对bug
2.修复查询显示的时候没有使用缺陷结果，显示结果ok等bug
3.更新上传图纸Mark点选项
- 4.增加pt和线宽补偿
\ No newline at end of file
+ 4.增加pt和线宽补偿
+V1.2.4：
+ 1.修复自动删除图片，设置天数存在小数点之后不起效问题
\ No newline at end of file