CPL/banboshi_V1
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

版本-v1.2.1 修复新建产品bug，新增张力补偿，新增缺陷分布启用

Browse Source
This commit is contained in:
CPL 2023-11-27 16:44:10 +08:00
parent 8e78cdd0ba
commit e6bd2d06ce
16 changed files with 5409 additions and 5322 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
halftoneproject-master.rar Normal file
View File

Binary file not shown.

11
halftoneproject-master/Code/Config.cs
View File

@ -25,7 +25,8 @@ namespace ProductionControl
public static bool SkipTension, SkipHeight, SkipLight, SkipScannerGL, SkipScannerCC, SkipSmallAxis;
//启用功能 2023-1023
public static bool OpenMarkErrorStop;
//启用缺陷分布功能
public static bool OpenFlawDistribution;
//DEV
public static int[] Axis_PulseOutMode=new int[4];
public static int[] Axis_MM2PulseNum = new int[4] { 5000, 5000, 5000, 1000};//1mm对应脉冲数
@ -41,6 +42,7 @@ namespace ProductionControl
public static LightDevNameEnum Light_Name= LightDevNameEnum.康仕达;
public static int Light_PortNum = 1;//COM端口号
public static int Tension_PortNum = 7;//COM端口号
public static double Tension_Offset = 0;//张力偏移值
public static string SmallAxis_ComName = "COM2";//COM端口号
public static string HeightDev_IP = "192.168.3.35";
public static int HeightDev_Port = 64000;
@ -195,6 +197,7 @@ namespace ProductionControl
SkipSmallAxis = Util.ReadIniValue(configPath, "SKIP", "SkipSmallAxis") == "1";
OpenMarkErrorStop = Util.ReadIniValue(configPath, "SKIP", "MarkErrorStop") == "1";
OpenFlawDistribution = Util.ReadIniValue(configPath, "SKIP", "OpenFlawDistribution") == "1";
//DEV
lsTmp = Util.ReadIniValue(configPath, "DEV", "Axis0_PulseOutMode");
if (Util.IsNumber(lsTmp)) Config.Axis_PulseOutMode[0] = Convert.ToInt32(lsTmp);
@ -241,6 +244,12 @@ namespace ProductionControl
if (Util.IsNumber(lsTmp)) Config.Tension_PortNum = Convert.ToInt32(lsTmp);
Config.SmallAxis_ComName = Util.ReadIniValue(configPath, "DEV", "SmallAxis_ComName");
lsTmp = Util.ReadIniValue(configPath, "DEV", "Tension_Offset");
if (string.IsNullOrEmpty(lsTmp))
Config.Tension_Offset = 0;
else
Config.Tension_Offset = double.Parse(lsTmp);
HeightDev_IP = Util.ReadIniValue(configPath, "DEV", "HeightDev_IP");
lsTmp = Util.ReadIniValue(configPath, "DEV", "HeightDev_Port");
if (Util.IsNumber(lsTmp)) Config.HeightDev_Port = Convert.ToInt32(lsTmp);

3
halftoneproject-master/Code/Device/DefectLib.cs
View File

@ -279,9 +279,12 @@ namespace ProductionControl.Device
task.Xmm, task.Ymm, out task.defectInfor2RestorationDesk);
liStep = 5;
if (Config.OpenFlawDistribution)
{
//大图缺陷坐标转换到图纸坐标
if (!string.IsNullOrWhiteSpace(task.drawingPagePath) && task.defectInfor2RestorationDesk != null && task.defectInfor2RestorationDesk.Count > 0)
task.defectInfor2RestorationDeskPage = yolo1.DefectDrawGerberImage(task.drawingPagePath, task.defectInfor2RestorationDesk);
}
stopwatch.Stop();
task.stopwatch[4] = stopwatch.ElapsedMilliseconds;

4
halftoneproject-master/Code/Device/SizeLib.cs
View File

@ -212,8 +212,12 @@ namespace ProductionControl.Device
//大图缺陷坐标转换到图纸坐标
step = 14;
if (Config.OpenFlawDistribution)
{
if (!string.IsNullOrWhiteSpace(task.drawingPagePath) && task.defectInfor2RestorationDesk != null && task.defectInfor2RestorationDesk.Count > 0)
task.defectInfor2RestorationDeskPage = yolo5.DefectDrawGerberImage(task.drawingPagePath, task.defectInfor2RestorationDesk);
}
}
break;
case 111:

25
halftoneproject-master/Code/FrmInput.Designer.cs generated
View File

@ -36,9 +36,10 @@
//
// btnOK
//
this.btnOK.Location = new System.Drawing.Point(358, 85);
this.btnOK.Location = new System.Drawing.Point(239, 57);
this.btnOK.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.btnOK.Name = "btnOK";
this.btnOK.Size = new System.Drawing.Size(80, 30);
this.btnOK.Size = new System.Drawing.Size(53, 20);
this.btnOK.TabIndex = 0;
this.btnOK.Text = "确认";
this.btnOK.UseVisualStyleBackColor = true;
@ -47,9 +48,10 @@
// btnCancel
//
this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.btnCancel.Location = new System.Drawing.Point(454, 85);
this.btnCancel.Location = new System.Drawing.Point(303, 57);
this.btnCancel.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.btnCancel.Name = "btnCancel";
this.btnCancel.Size = new System.Drawing.Size(80, 30);
this.btnCancel.Size = new System.Drawing.Size(53, 20);
this.btnCancel.TabIndex = 0;
this.btnCancel.Text = "取消";
this.btnCancel.UseVisualStyleBackColor = true;
@ -59,32 +61,35 @@
this.textBox1.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
this.textBox1.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.CustomSource;
this.textBox1.ImeMode = System.Windows.Forms.ImeMode.Disable;
this.textBox1.Location = new System.Drawing.Point(12, 22);
this.textBox1.Location = new System.Drawing.Point(8, 15);
this.textBox1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.textBox1.Name = "textBox1";
this.textBox1.Size = new System.Drawing.Size(524, 28);
this.textBox1.Size = new System.Drawing.Size(351, 21);
this.textBox1.TabIndex = 1;
//
// cobList
//
this.cobList.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
this.cobList.FormattingEnabled = true;
this.cobList.Location = new System.Drawing.Point(12, 22);
this.cobList.Location = new System.Drawing.Point(8, 15);
this.cobList.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.cobList.Name = "cobList";
this.cobList.Size = new System.Drawing.Size(522, 26);
this.cobList.Size = new System.Drawing.Size(349, 20);
this.cobList.TabIndex = 2;
//
// FrmInput
//
this.AcceptButton = this.btnOK;
this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.CancelButton = this.btnCancel;
this.ClientSize = new System.Drawing.Size(548, 123);
this.ClientSize = new System.Drawing.Size(365, 82);
this.Controls.Add(this.cobList);
this.Controls.Add(this.textBox1);
this.Controls.Add(this.btnCancel);
this.Controls.Add(this.btnOK);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "FrmInput";

18
halftoneproject-master/Code/FrmLogin.Designer.cs generated
View File

@ -44,7 +44,7 @@
// btnLogin
//
this.btnLogin.Location = new System.Drawing.Point(131, 181);
this.btnLogin.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.btnLogin.Margin = new System.Windows.Forms.Padding(2);
this.btnLogin.Name = "btnLogin";
this.btnLogin.Size = new System.Drawing.Size(75, 23);
this.btnLogin.TabIndex = 5;
@ -56,7 +56,7 @@
//
this.chkRememberPw.AutoSize = true;
this.chkRememberPw.Location = new System.Drawing.Point(203, 155);
this.chkRememberPw.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.chkRememberPw.Margin = new System.Windows.Forms.Padding(2);
this.chkRememberPw.Name = "chkRememberPw";
this.chkRememberPw.Size = new System.Drawing.Size(72, 16);
this.chkRememberPw.TabIndex = 3;
@ -68,7 +68,7 @@
//
this.chkRememberUserCode.AutoSize = true;
this.chkRememberUserCode.Location = new System.Drawing.Point(90, 155);
this.chkRememberUserCode.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.chkRememberUserCode.Margin = new System.Windows.Forms.Padding(2);
this.chkRememberUserCode.Name = "chkRememberUserCode";
this.chkRememberUserCode.Size = new System.Drawing.Size(84, 16);
this.chkRememberUserCode.TabIndex = 4;
@ -80,7 +80,7 @@
//
this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));
this.pictureBox1.Location = new System.Drawing.Point(0, 1);
this.pictureBox1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.pictureBox1.Margin = new System.Windows.Forms.Padding(2);
this.pictureBox1.Name = "pictureBox1";
this.pictureBox1.Size = new System.Drawing.Size(359, 95);
this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
@ -90,7 +90,7 @@
// txtUserPw
//
this.txtUserPw.Location = new System.Drawing.Point(90, 133);
this.txtUserPw.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.txtUserPw.Margin = new System.Windows.Forms.Padding(2);
this.txtUserPw.MaxLength = 16;
this.txtUserPw.Name = "txtUserPw";
this.txtUserPw.PasswordChar = '*';
@ -110,7 +110,7 @@
// txtUserCode
//
this.txtUserCode.Location = new System.Drawing.Point(90, 105);
this.txtUserCode.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.txtUserCode.Margin = new System.Windows.Forms.Padding(2);
this.txtUserCode.Name = "txtUserCode";
this.txtUserCode.Size = new System.Drawing.Size(185, 21);
this.txtUserCode.TabIndex = 1;
@ -128,7 +128,7 @@
// button2
//
this.button2.Location = new System.Drawing.Point(281, 181);
this.button2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.button2.Margin = new System.Windows.Forms.Padding(2);
this.button2.Name = "button2";
this.button2.Size = new System.Drawing.Size(56, 23);
this.button2.TabIndex = 9;
@ -153,13 +153,13 @@
this.Controls.Add(this.button2);
this.Controls.Add(this.btnLogin);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.Margin = new System.Windows.Forms.Padding(2);
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "FrmLogin";
this.ShowIcon = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "自动化视觉检测系统 - v1.2";
this.Text = "自动化视觉检测系统 - v1.2.1";
this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.FrmLogin_FormClosed);
this.Load += new System.EventHandler(this.FrmLogin_Load);
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();

136
halftoneproject-master/Code/FrmMain.Designer.cs generated
View File

@ -30,11 +30,11 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmMain));
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();
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();
this.menuStrip1 = new System.Windows.Forms.MenuStrip();
this.管理HToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.流程管理ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@ -700,7 +700,7 @@
this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
this.splitContainer1.Location = new System.Drawing.Point(0, 80);
this.splitContainer1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.splitContainer1.Margin = new System.Windows.Forms.Padding(2);
this.splitContainer1.Name = "splitContainer1";
//
// splitContainer1.Panel1
@ -730,9 +730,9 @@
this.gpbProcessList.BackColor = System.Drawing.SystemColors.ActiveCaption;
this.gpbProcessList.Controls.Add(this.dgvProcess);
this.gpbProcessList.Location = new System.Drawing.Point(2, 202);
this.gpbProcessList.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.gpbProcessList.Margin = new System.Windows.Forms.Padding(2);
this.gpbProcessList.Name = "gpbProcessList";
this.gpbProcessList.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.gpbProcessList.Padding = new System.Windows.Forms.Padding(2);
this.gpbProcessList.Size = new System.Drawing.Size(504, 159);
this.gpbProcessList.TabIndex = 3;
this.gpbProcessList.TabStop = false;
@ -742,37 +742,37 @@
//
this.dgvProcess.AllowUserToAddRows = false;
this.dgvProcess.AllowUserToDeleteRows = false;
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;
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;
this.dgvProcess.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dgvProcess.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.colCode,
this.colProcessName,
this.colValue});
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;
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;
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, 2, 2, 2);
this.dgvProcess.Margin = new System.Windows.Forms.Padding(2);
this.dgvProcess.MultiSelect = false;
this.dgvProcess.Name = "dgvProcess";
this.dgvProcess.ReadOnly = true;
this.dgvProcess.RowHeadersVisible = false;
this.dgvProcess.RowHeadersWidth = 62;
dataGridViewCellStyle15.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.dgvProcess.RowsDefaultCellStyle = dataGridViewCellStyle15;
dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.dgvProcess.RowsDefaultCellStyle = dataGridViewCellStyle5;
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";
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;
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;
this.colProcessName.HeaderText = "工序名称";
this.colProcessName.MinimumWidth = 8;
this.colProcessName.Name = "colProcessName";
@ -805,8 +805,8 @@
// colValue
//
this.colValue.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
dataGridViewCellStyle13.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Bold);
this.colValue.DefaultCellStyle = dataGridViewCellStyle13;
dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Bold);
this.colValue.DefaultCellStyle = dataGridViewCellStyle3;
this.colValue.HeaderText = "内容";
this.colValue.MinimumWidth = 8;
this.colValue.Name = "colValue";
@ -822,7 +822,7 @@
this.flpnlResultData.Controls.Add(this.kanban5);
this.flpnlResultData.Controls.Add(this.kanban6);
this.flpnlResultData.Location = new System.Drawing.Point(2, 102);
this.flpnlResultData.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.flpnlResultData.Margin = new System.Windows.Forms.Padding(2);
this.flpnlResultData.Name = "flpnlResultData";
this.flpnlResultData.Size = new System.Drawing.Size(335, 108);
this.flpnlResultData.TabIndex = 5;
@ -838,7 +838,7 @@
this.kanban1.Controls.Add(this.label4);
this.kanban1.Controls.Add(this.label6);
this.kanban1.Location = new System.Drawing.Point(2, 2);
this.kanban1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.kanban1.Margin = new System.Windows.Forms.Padding(2);
this.kanban1.Name = "kanban1";
this.kanban1.Size = new System.Drawing.Size(53, 94);
this.kanban1.TabIndex = 14;
@ -943,7 +943,7 @@
this.kanban2.Controls.Add(this.label7);
this.kanban2.Controls.Add(this.label12);
this.kanban2.Location = new System.Drawing.Point(59, 2);
this.kanban2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.kanban2.Margin = new System.Windows.Forms.Padding(2);
this.kanban2.Name = "kanban2";
this.kanban2.Size = new System.Drawing.Size(53, 94);
this.kanban2.TabIndex = 17;
@ -1048,7 +1048,7 @@
this.kanban3.Controls.Add(this.label9);
this.kanban3.Controls.Add(this.label15);
this.kanban3.Location = new System.Drawing.Point(116, 2);
this.kanban3.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.kanban3.Margin = new System.Windows.Forms.Padding(2);
this.kanban3.Name = "kanban3";
this.kanban3.Size = new System.Drawing.Size(53, 94);
this.kanban3.TabIndex = 16;
@ -1153,7 +1153,7 @@
this.kanban4.Controls.Add(this.lblPT);
this.kanban4.Controls.Add(this.label18);
this.kanban4.Location = new System.Drawing.Point(173, 2);
this.kanban4.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.kanban4.Margin = new System.Windows.Forms.Padding(2);
this.kanban4.Name = "kanban4";
this.kanban4.Size = new System.Drawing.Size(53, 94);
this.kanban4.TabIndex = 15;
@ -1256,7 +1256,7 @@
this.kanban5.Controls.Add(this.lblCompareResult);
this.kanban5.Controls.Add(this.label8);
this.kanban5.Location = new System.Drawing.Point(230, 2);
this.kanban5.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.kanban5.Margin = new System.Windows.Forms.Padding(2);
this.kanban5.Name = "kanban5";
this.kanban5.Size = new System.Drawing.Size(53, 94);
this.kanban5.TabIndex = 18;
@ -1335,7 +1335,7 @@
this.kanban6.Controls.Add(this.lblDefectResult);
this.kanban6.Controls.Add(this.label13);
this.kanban6.Location = new System.Drawing.Point(287, 2);
this.kanban6.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.kanban6.Margin = new System.Windows.Forms.Padding(2);
this.kanban6.Name = "kanban6";
this.kanban6.Size = new System.Drawing.Size(40, 94);
this.kanban6.TabIndex = 19;
@ -1392,9 +1392,9 @@
this.gpbLog.BackColor = System.Drawing.SystemColors.ActiveCaption;
this.gpbLog.Controls.Add(this.lstLog);
this.gpbLog.Location = new System.Drawing.Point(2, 365);
this.gpbLog.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.gpbLog.Margin = new System.Windows.Forms.Padding(2);
this.gpbLog.Name = "gpbLog";
this.gpbLog.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.gpbLog.Padding = new System.Windows.Forms.Padding(2);
this.gpbLog.Size = new System.Drawing.Size(502, 161);
this.gpbLog.TabIndex = 4;
this.gpbLog.TabStop = false;
@ -1421,9 +1421,9 @@
this.gpbProductInfo.Controls.Add(this.panel1);
this.gpbProductInfo.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.gpbProductInfo.Location = new System.Drawing.Point(2, 2);
this.gpbProductInfo.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.gpbProductInfo.Margin = new System.Windows.Forms.Padding(2);
this.gpbProductInfo.Name = "gpbProductInfo";
this.gpbProductInfo.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.gpbProductInfo.Padding = new System.Windows.Forms.Padding(2);
this.gpbProductInfo.Size = new System.Drawing.Size(504, 98);
this.gpbProductInfo.TabIndex = 2;
this.gpbProductInfo.TabStop = false;
@ -1442,7 +1442,7 @@
this.panel1.Controls.Add(this.label1);
this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel1.Location = new System.Drawing.Point(2, 16);
this.panel1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.panel1.Margin = new System.Windows.Forms.Padding(2);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(500, 80);
this.panel1.TabIndex = 0;
@ -1452,7 +1452,7 @@
this.txtBatchId.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.txtBatchId.Location = new System.Drawing.Point(216, 58);
this.txtBatchId.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.txtBatchId.Margin = new System.Windows.Forms.Padding(2);
this.txtBatchId.Name = "txtBatchId";
this.txtBatchId.ReadOnly = true;
this.txtBatchId.Size = new System.Drawing.Size(282, 21);
@ -1473,7 +1473,7 @@
this.txtProductCode.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.txtProductCode.Location = new System.Drawing.Point(55, 33);
this.txtProductCode.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.txtProductCode.Margin = new System.Windows.Forms.Padding(2);
this.txtProductCode.Name = "txtProductCode";
this.txtProductCode.ReadOnly = true;
this.txtProductCode.Size = new System.Drawing.Size(444, 21);
@ -1495,7 +1495,7 @@
this.txtProductSN.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.txtProductSN.Location = new System.Drawing.Point(55, 58);
this.txtProductSN.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.txtProductSN.Margin = new System.Windows.Forms.Padding(2);
this.txtProductSN.Name = "txtProductSN";
this.txtProductSN.ReadOnly = true;
this.txtProductSN.Size = new System.Drawing.Size(282, 21);
@ -1516,7 +1516,7 @@
this.txtProductName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.txtProductName.Location = new System.Drawing.Point(55, 9);
this.txtProductName.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.txtProductName.Margin = new System.Windows.Forms.Padding(2);
this.txtProductName.Name = "txtProductName";
this.txtProductName.ReadOnly = true;
this.txtProductName.Size = new System.Drawing.Size(444, 21);
@ -1540,7 +1540,7 @@
this.splitContainer2.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
this.splitContainer2.IsSplitterFixed = true;
this.splitContainer2.Location = new System.Drawing.Point(0, 0);
this.splitContainer2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.splitContainer2.Margin = new System.Windows.Forms.Padding(2);
this.splitContainer2.Name = "splitContainer2";
//
// splitContainer2.Panel1
@ -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 = 25;
this.splitContainer2.SplitterDistance = 26;
this.splitContainer2.SplitterWidth = 3;
this.splitContainer2.TabIndex = 10;
//
@ -1561,7 +1561,7 @@
this.splitContainer3.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitContainer3.IsSplitterFixed = true;
this.splitContainer3.Location = new System.Drawing.Point(0, 0);
this.splitContainer3.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.splitContainer3.Margin = new System.Windows.Forms.Padding(2);
this.splitContainer3.Name = "splitContainer3";
this.splitContainer3.Orientation = System.Windows.Forms.Orientation.Horizontal;
//
@ -1572,7 +1572,7 @@
// splitContainer3.Panel2
//
this.splitContainer3.Panel2.Controls.Add(this.picScanner2);
this.splitContainer3.Size = new System.Drawing.Size(25, 523);
this.splitContainer3.Size = new System.Drawing.Size(26, 523);
this.splitContainer3.SplitterDistance = 226;
this.splitContainer3.SplitterWidth = 3;
this.splitContainer3.TabIndex = 11;
@ -1584,9 +1584,9 @@
this.picScanner1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.picScanner1.Dock = System.Windows.Forms.DockStyle.Fill;
this.picScanner1.Location = new System.Drawing.Point(0, 0);
this.picScanner1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.picScanner1.Margin = new System.Windows.Forms.Padding(2);
this.picScanner1.Name = "picScanner1";
this.picScanner1.Size = new System.Drawing.Size(25, 226);
this.picScanner1.Size = new System.Drawing.Size(26, 226);
this.picScanner1.TabIndex = 7;
this.picScanner1.TabStop = false;
//
@ -1596,9 +1596,9 @@
this.picScanner2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.picScanner2.Dock = System.Windows.Forms.DockStyle.Fill;
this.picScanner2.Location = new System.Drawing.Point(0, 0);
this.picScanner2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.picScanner2.Margin = new System.Windows.Forms.Padding(2);
this.picScanner2.Name = "picScanner2";
this.picScanner2.Size = new System.Drawing.Size(25, 294);
this.picScanner2.Size = new System.Drawing.Size(26, 294);
this.picScanner2.TabIndex = 9;
this.picScanner2.TabStop = false;
//
@ -1609,10 +1609,10 @@
this.gboxDefectList.Controls.Add(this.pnlBmpList);
this.gboxDefectList.Dock = System.Windows.Forms.DockStyle.Fill;
this.gboxDefectList.Location = new System.Drawing.Point(0, 0);
this.gboxDefectList.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.gboxDefectList.Margin = new System.Windows.Forms.Padding(2);
this.gboxDefectList.Name = "gboxDefectList";
this.gboxDefectList.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.gboxDefectList.Size = new System.Drawing.Size(435, 523);
this.gboxDefectList.Padding = new System.Windows.Forms.Padding(2);
this.gboxDefectList.Size = new System.Drawing.Size(434, 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(284, 2);
this.lblDefectAddTag.Location = new System.Drawing.Point(283, 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);
@ -1637,16 +1637,16 @@
this.pnlBmpList.AutoSize = true;
this.pnlBmpList.Dock = System.Windows.Forms.DockStyle.Fill;
this.pnlBmpList.Location = new System.Drawing.Point(2, 16);
this.pnlBmpList.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.pnlBmpList.Margin = new System.Windows.Forms.Padding(2);
this.pnlBmpList.Name = "pnlBmpList";
this.pnlBmpList.Size = new System.Drawing.Size(431, 505);
this.pnlBmpList.Size = new System.Drawing.Size(430, 505);
this.pnlBmpList.TabIndex = 0;
//
// chkBuzzer
//
this.chkBuzzer.AutoSize = true;
this.chkBuzzer.Location = new System.Drawing.Point(677, 27);
this.chkBuzzer.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.chkBuzzer.Margin = new System.Windows.Forms.Padding(2);
this.chkBuzzer.Name = "chkBuzzer";
this.chkBuzzer.Size = new System.Drawing.Size(84, 16);
this.chkBuzzer.TabIndex = 13;
@ -1658,7 +1658,7 @@
//
this.chkDoorSensor.AutoSize = true;
this.chkDoorSensor.Location = new System.Drawing.Point(677, 47);
this.chkDoorSensor.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.chkDoorSensor.Margin = new System.Windows.Forms.Padding(2);
this.chkDoorSensor.Name = "chkDoorSensor";
this.chkDoorSensor.Size = new System.Drawing.Size(96, 16);
this.chkDoorSensor.TabIndex = 14;
@ -1673,7 +1673,7 @@
this.btnMakeTags.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnMakeTags.ForeColor = System.Drawing.Color.Blue;
this.btnMakeTags.Location = new System.Drawing.Point(881, 29);
this.btnMakeTags.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.btnMakeTags.Margin = new System.Windows.Forms.Padding(2);
this.btnMakeTags.Name = "btnMakeTags";
this.btnMakeTags.Size = new System.Drawing.Size(65, 34);
this.btnMakeTags.TabIndex = 15;
@ -1685,7 +1685,7 @@
//
this.chkHttpLog.AutoSize = true;
this.chkHttpLog.Location = new System.Drawing.Point(800, 27);
this.chkHttpLog.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.chkHttpLog.Margin = new System.Windows.Forms.Padding(2);
this.chkHttpLog.Name = "chkHttpLog";
this.chkHttpLog.Size = new System.Drawing.Size(96, 16);
this.chkHttpLog.TabIndex = 16;
@ -1724,10 +1724,10 @@
this.Controls.Add(this.menuStrip1);
this.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.MainMenuStrip = this.menuStrip1;
this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.Margin = new System.Windows.Forms.Padding(2);
this.Name = "FrmMain";
this.ShowIcon = false;
this.Text = "自动化视觉检测系统 - v1.2";
this.Text = "自动化视觉检测系统 - v1.2.1";
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);

2
halftoneproject-master/Code/FrmMain.cs
View File

@ -2466,7 +2466,7 @@ namespace ProductionControl
return;
}
devContainer.io_output(CMDName.张力读取);
double tensionValue = devContainer.devTension.getValue();
double tensionValue = devContainer.devTension.getValue() + Config.Tension_Offset;//加入张力偏差
tensionValue=Math.Round(tensionValue, 2);//保留2位小数
AddTextEvent("张力读取", $"张力值:{tensionValue}");
devContainer.io_output(CMDName.张力读取,false,true,500);

114
halftoneproject-master/Code/FrmMain.resx
View File

@ -642,21 +642,21 @@
<data name="toolStripButton3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
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
</value>
</data>
<data name="tsbtnDefectImage.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@ -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/7NUVv3Nlftz7dY
gdEmATUCBfzLUlb5Fiu/EeiA/1Ah/IAsB1gK/L/vwPX5pbvo3vfBUu1f4xXSfqcpN/7NUVv3Jlftz7dY
hf80d8AzB+H/rz3F/38Ilv7/LU4BrPdfrhoYjzpg1AGjDhh1wNB3wM9s1ee/UhSv0s0BT92k/l8uDfkP
LM89/tdrsUGlGP6HarG9CZAxA7YHJgMd8JMmDrgU7/Z/44o1/+es34NXwxMrfoOH5tz3qO6A9QdO/1+x
8yhBB4DAXWNB/vumvDMJOeBLrDyopoyFasMPSHEADDyyEPR4Ziv8BN0BH5LVvv3NUZ32PUZOEaqUMCDH
ATDwzkdS7l2glB/QwuRfmcrG/wrJaDdS4gCqgFEHjDpg3YFT9WAHrNtTDxUaBcMZMDAAAJbA3z1DE0Zi
ATDwzkdS7l2glB/QwuRfmcrG/wrJaDdS4gCqgFEHjDpg3YFT9WAHrNtTDxUaBcMZMDAAAIoH3zw7A9x2
AAAAAElFTkSuQmCC
</value>
</data>
@ -677,61 +677,61 @@
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALjSURBVFhH7ZbpS1RRHIZvTU0mQgRFEPSHBAUVbVhkm1pp
mWZm6jjjMs64t0JfIooyx9z3ZVxzGTUbTdOEchlnXx0N+tRXIRDezj3Mhekyls7cSYheeL6dw/Ne7uF3
mWZmOjrjMs64t0JfIooyx9z3ZVxzGTUbTdOEchlnXx0N+tRXIRDezj3Mhekyls7cSYheeL6dw/Ne7uF3
DvPPpGj6AAqn96Pg0z7kT+1B3tRu5E7ugvJjGJQToVBMhCBnfAeyx8QqzxbhQuQr65HLP4hJgW3wbBMm
G5VnjYqEK+CPPFO7VZgC/sozhCgg0e79sZZcMR7aVqxlwor1jFg+Ji7hy2XvtwRW4Hdy8uWrrNyzlGFL
ZGlF373lspEACvxBDoUmZCWylRF5ltMQ+VdvufQd418Bvnxk+Ynvfz62/alnCytX8uXpw34U4MuHlx9j
eOkRhpYe+jxw0lHRNyJ3+5JLhjZYgJz2VW/54NIDDLrvQ+O+B81iMaFwzdPuS542uIECfPmAuwgDRNi/
eOkRhpYe+jxw0lHRNyJ3+5KnDW2wADntq97ywaUHGHTfh8Z9D5rFYkLhmqfdl1wyuIECfPmAuwgDRNi/
WIB+Vz4hD32uXPQ5leuWp2rWWYAv71vMQy+R9boU6HXm4K1TTulxZBOy0G3PDJ68xyVHtzObkIluRwa6
HDJ02aXoZLGlo8MmQbs1jSK4vNMpQ6dDig67hEAk9lS021Kgtt2F2pqMNksyWi13KC3mJIpgcjWRqe0p
aLMRkTUJrdbblBZLIuEWms0JaDLFUxpZjPEByX+5z1tsRGRNRLM1Ac0WIrHEockch0bzDTSYrqPBGIt6
Qh2LIYbit5yNt7zRehMNFiIyxxJiUG++hjrTVSK7glpjNGoMUajRR6GaUKWPRNVCZGBydnxycm681pqi
iYyIjJdRzWK4RGQXUam/gMqF86gglOsiKAHJubAl+LO90hCBCv05SvnCWbzRnaGUEVTz4VDNhQsj58Le
XvzZXqY7DZXuFErnT6J07gReE0pmj1MElXNhS/Bne8ncMbyaPYqXLDNHKEGRc6GPCd5sfzFzGM+/HKIE
Vc6FPiZ4s/3Z54N/R84lY5LZKchsDyRsiU2Tc2FLbJqcSwp5bG6a/H+CF4b5CTYAGhE50nekAAAAAElF
HDJ02aXoZLGlo8OWhnarhCK4vNMpQ6dDig57GoFI7Klot6VAbbsLtTUZbZZktFruUFrMSRTB5GoiU9tT
0GYjImsSWq23KS2WRMItNJsT0GSKpzSyGOMDkv9yn7fYiMiaiGZrApotRGKJQ5M5Do3mG2gwXUeDMRb1
hDoWQwzFbzkbb3mj9SYaLERkjiXEoN58DXWmq0R2BbXGaNQYolCjj0I1oUofiaqFyMDk7Pjk5Nx4rTVF
ExkRGS+jmsVwicguolJ/AZUL51FBKNdFUAKSc2FL8Gd7pSECFfpzlPKFs3ijO0MpI6jmw6GaCxdGzoW9
vfizvUx3GirdKZTOn0Tp3Am8JpTMHqcIKufCluDP9pK5Y3g1exQvWWaOUIIi50IfE7zZ/mLmMJ5/OUQJ
qpwLfUzwZvuzzwf/jpxLxiSzU5DZHkjYEpsm58KW2DQ5lxTy2Nw0+f8ELwzzE/paGgzH1hR8AAAAAElF
TkSuQmCC
</value>
</data>
<data name="tsbtnSizeImage.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHLSURBVFhH7dY9SAJhGMBxJyEIWpuCIGiNLDOXBhssMmyw
ITAHLTTIqEEiB6ulqSkIguaoISUKItM+SE/OtK64vpTLMg/D8vSwAsF6sngbKjixNDDuP9299z4vv+Hg
TlASRYbY2mtDUoRuix/ZQpaf99BaShfD6IEURAcf4UbPQrD3Fg6UgWOXjBjBJFgZ2l7YVi34AtZNQhYA
IV0cvgIIJQVu2RHYmzzn6w2uWjRWuOxiDLxtpzkBzmYc1hqxlEOCd6FRznyKwDS65C4fwNveLakXsFZi
jlSFKtERnwoPJ2tC2viKXxEAtMTdzwDHgLdTqQs17QwbElPxsUw/O/48ETOlrZTxPhPqY6DoAKKLggt1
FMKGJDDmDLDjAHemNNDGB+ABPIAH8IDSB0QGH6M3+sTJnwFwxQnsjZ5B9iMiJ1UgRI8EpIoUHiopsVtG
zDibd9NFAaxrPLC85IF5m4NzYFuK19nr3ZcFB9h29mFxw50T8NamyFfhkOJzOQEaJuXvCKrRGHf5AD7C
ZIQ8+25EvgPYpyxg9kqXqEZbc/cTwEeUmq661jOd9+aMNjkJovDwS/7/jb8BFCQewAOsO17LO8DqsKAl
vv+cQPAK+g31RrDqJzoAAAAASUVORK5CYII=
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHLSURBVFhH7dY9SAJhGMBxpyAIWpuCIGiN7NOlwQaLDB1s
CKxBCw00bJCowWppagoCoTlqyIiCyLSE8uQs64qzD+uyzMPQPE/MQLCeNN6GCk4sDYz7T3fvvc/Lbzi4
E5REwZF43Z2WFaLb4ke2kxUXfbSKUocxejgBIV0S7jVxuOp/gCOZ73RfTIxirVg52l7Y1k34ItZLQgYA
fnUUvgIIGQVO8QlYW1wXm437dWiscFmbMXB3nuUE2Ntw2GjCErZWXI5GOTuU+mbRJXf5ALJ7d0RuwDoI
M6nwV6EjPhUwsLV+VXTNI/UBWuLuZ4BTwLuoxKWStge0sZnoeHooPvkyFTamLNf6SNo/yEDRAYScgktl
CAJaFpiJNMQnASLGFND6J+ABPIAH8IDSBwR1ydC9Jub9MwAu9cLe2DlkPiISUgFl6JGAVJBlxzKq2Skm
5uxtjlRRAJsDLlhZdsHCqo1zYFeE11sbnDcFB6w6DmBpy5kTkG1beFhpE+HmnIABJuHpvlKiMe7yAXyE
iQlJ5t0IfgewzxnA/K06VoO25u4ngI8oJV19p2F6HifSKnYahAHDa/7/jb8BFCQewAMsDrfpHWCxmdAS
339OIHgD1J71QoDsMyIAAAAASUVORK5CYII=
</value>
</data>
<data name="tsbtnLight.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAURSURBVFhH7VV7TNVlGH7JRjNbtS7L1uZWs7m12tzc2qpV
W6vW5qq15bTW1tZlNqgGQzAs5ICYXAK5CUPuxxBQQA4YCAIhKHfFEFDuCErCRDJIiXHO0/N2Php/0cGO
/eWzffvt9/u+93mf7739ZDlAlmywWyVy3irNc1a5BKtAn/qu33XfHHUvHAdknT3L4whyVgEH7wd+vAfI
9gCsK5zPbPln2bOlSM8b0/8OR5a8M523agZHXwAqXgOOv8XFZ/nzQOk6wPY0ULQGyHuYAigoUzCTKdNq
ZyhuHY7Mu7aggE5qNgGtAUBnBNAdCZzbCZz2AhreB2pfB6pfAY5tAI6sBXIeBNIZDS5Hhmw2VMsH9sv6
qYMP3EQVnXTQ8UgxMH4CmKgBLhUAAwlAVyCFfAI0bwFOvQtUvQqUPMs0PQKkCn5LlRvKYyiXh/k0z5Mo
fpHk/nRuA37vAWbHgT+GgakW4EoRMBwP9HzLyHwNtH8ONG1mNBgR23OsD0YiRTCfJPWG0nU4kuUNpJOg
lGQdDPl4ndO5Ym4SmO4CJo8DY9kUwf2+IOA8U3SWaWlkNCpZI4dZGymeQBJTsU82GmrXYI8XK1IpoGwj
8/0DBfzsvLk6nx0DZs4B1yhgPAcYjaWIPUxJKEVsB85sBereo3gWafZjQCI7I1HyDLVrmI2SCSSy1Y6+
ydBamIJCOmTYp7u56Pz6KeBqKdOQxXqI434URYQDvSzODh8W50fsEkYh5ykgTqB8hvrfgUhZjRhWcTwF
FL3EkH5F4iSGm0V4tYqhrzbOefvLyXQe41zDFNHPKHSyZppYmBVs19xnnDzkc8TJo8bF0nBEy1pEUUDc
vSRgMdV8APzCmw3so8MDwK90PKY3X+T84oKAMKaMtdD0GQUwfWqvPORTXuNiaSBc1nBR9UpOPBKUk6iJ
ee0KpohoOmPljzDs6nTxGqKA3l1MAQU0fOq0U/sYCiCfY7eLEUCweHYGyzz23A1kcAiVsA7qPmYt+LHI
WA8DnAlDFDKstzZL3/X7hRDnOT2vdmpPHuUz9K5hPlTaEcooJHHEHnqZo5f93fwlw/sdb/k9nfG26nRo
wbnent91X89VsRXVTu2VJ1TaDLVrcATLTlhoGMVWzFrPlnqbt2JYz7DAunnLXm07Ol1Y+q7fdV/P6Xm1
U3vy2C0SYqhdg2OHPDGzTaYRRBEJT/JHwxFbwSg0eHPYcPx2s9p72Hb9vH0fo3B+t/O77uu5XP4b1I72
417yp/IZateBQPkGOyggjL/f/SymQrZVFXPb7MuC5I0HM5h/q/N5gcOojSNZ9/VcCs+rHe3tgRJmKJcH
bJIVdn/JwXaKiHicBcXJZuOEa+bY7aPjUc6CsQo+S/jOtmxlC5ZxAKXznJ6nnT1AypXHUC4f2hH2bVKN
AP7noznVCvhnbGPIB+l0gpNxssP5HOJ7K0d2MQXsZeX7e8DuJ+UOX1lpqG4dSjLvI/UIYkHlfwi06Bzg
v+H6IHBjwvkcqXV+z2P+Q1bD7iOVbnG+AJI95J1og1/aMYTk1SO27CxyW0Zx6PRlpNf2ILKoCUHWKvgm
2/BFTD7gJfcZU/chJj4x1xUBltjkVGPiXmgE0k70orLrCi5OzWFylk1w7SYa+yeQe7IHUcUt2HW44e8I
GBP3wjvBZnElAluj8y3GxL24EwGFClgqAirAHL098EsttwQHhzuWiMDtu/1i7P2p3bJYQERh4//j+A7c
D5G/AFoWc7tnHzTjAAAAAElFTkSuQmCC
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAUQSURBVFhH7VV7TNVlGH7JRjNbtS7L1uZWs7m12tzc2qpV
W6vW5qq15bTW1tZlNqgGQzAs5IAYAoHchCH3YwgoIAcMBIEQlLtiCCh3BCVhIhmkxDjn6Xk7H42/6GDH
/vLZvv32+33f+7zP995+shwgSzbYrRI5b5XmOatcglWgT33X77pvjroXjgOyzp7lcQQ5q4CD9wM/3gNk
ewDWFc5ntvyz7NlSpOeN6X+HI0vemc5bNYOjLwAVrwHH3+Lis/x5oHQdYHsaKFoD5D1MARSUKZjJlGm1
MxS3DkfmXVtQQCc1m4DWAKAzAuiOBM7tBE57AQ3vA7WvA9WvAMc2AEfWAjkPAumMBpcjQzYbquUD+2X9
1MEHbqKKTjroeKQYGD8BTNQAlwqAgQSgK5BCPgGatwCn3gWqXgVKnmWaHgFSBb+lyg3lMZTLw3ya50kU
v0hyfzq3Ab/3ALPjwB/DwFQLcKUIGI4Her5lZL4G2j8HmjYzGoyI7TnWByORIphPknpD6TocyfIG0klQ
SrIOhny8zulcMTcJTHcBk8eBsWyK4H5fEHCeKTrLtDQyGpWskcOsjRRPIImp2CcbDbVrsMeLFakUULaR
+f6BAn523lydz44BM+eAaxQwngOMxlJEOFMSShHbgTNbgbr3KJ5Fmv0YkMjOSJQ8Q+0aZqNkAolstaNv
MrQWpqCQDhn26W4uOr9+CrhayjRksR7iuB9FEXuAXhZnhw+L8yN2CaOQ8xQQJ1A+Q/3vQKSsRgyrOJ4C
il5iSL8icRLDzSK8WsXQVxvnvP3lZDqPca5hiuhnFDpZM00szAq2a+4zTh7yOeLkUeNiaTiiZS2iKCDu
XhKwmGo+AH7hzQb20eEB4Fc6HtObL3J+cUFAGFPGWmj6jAKYPrVXHvIpr3GxNLBH1nBR9UpOPBKUk6iJ
ee0KpohoOmPljzDs6nTxGqKA3l1MAQU0fOq0U/sYCiCfY7eLEUCweHYGyzzC7wYyOIRKWAd1H7MW/Fhk
rIcBzoQhChnWW5ul7/r9QojznJ5XO7Unj/IZetcwHyrtCGUUkjhiD73M0cv+bv6S4f2Ot/yeznhbdTq0
4Fxvz++6r+eq2Ipqp/bKEypthto1OIJlJyw0jGIrZq1nS73NWzGsZ1hg3bxlr7YdnS4sfdfvuq/n9Lza
qT157BYJMdSuwbFDnpjZJtMIooiEJ/mj4YitYBQavDlsOH67We09bLt+3r6PUTi/2/ld9/VcLv8Nakf7
cS/5U/kMtetAoHyDHRQQxt/vfhZTIduqirlt9mVB8saDGcy/1fm8wGHUxpGs+3ouhefVjvb2QAkzlMsD
NskKu7/kYDtFRDzOguJks3HCNXPs9tHxKGfBWAWfJXxnW7ayBcs4gNJ5Ts/Tzh4g5cpjKJcP7Qj7NqlG
AP/z0ZxqBfwztjHkg3Q6wck42eF8DvG9lSO7mAL2svL9PWD3k3KHr6w0VLcOJZn3kXoEsaDyPwRadA7w
33B9ELgx4XyO1Dq/5zH/Iath95FKtzhfAMke8k60wS/tGELy6hFbdha5LaM4dPoy0mt7EFnUhCBrFXyT
bfgiJh/wkvuMqfsQE5+Y64oAS2xyqjFxLzQCaSd6Udl1BRen5jA5yya4dhON/RPIPdmDqOIW7Drc8HcE
jIl74Z1gs7gSga3R+RZj4l7ciYBCBSwVARVgjt4e+KWWW4KDwx1LROD23X4x9v7UblksIKKw8f9xfAfu
h8hfV8RzuqW13GsAAAAASUVORK5CYII=
</value>
</data>
<data name="tsbtnLog.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

60
halftoneproject-master/Code/FrmSysSetting.Designer.cs generated
View File

@ -102,6 +102,8 @@
this.label6 = new System.Windows.Forms.Label();
this.groupBox22 = new System.Windows.Forms.GroupBox();
this.panel22 = new System.Windows.Forms.Panel();
this.numOffset = new System.Windows.Forms.NumericUpDown();
this.label7 = new System.Windows.Forms.Label();
this.label61 = new System.Windows.Forms.Label();
this.tabPage1 = new System.Windows.Forms.TabPage();
this.groupBox14 = new System.Windows.Forms.GroupBox();
@ -235,6 +237,7 @@
this.numHttpPort = new System.Windows.Forms.NumericUpDown();
this.label49 = new System.Windows.Forms.Label();
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
this.cbOpenFlawDistribution = new System.Windows.Forms.CheckBox();
this.toolStrip1.SuspendLayout();
this.groupBox1.SuspendLayout();
this.panel1.SuspendLayout();
@ -263,6 +266,7 @@
this.panel23.SuspendLayout();
this.groupBox22.SuspendLayout();
this.panel22.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.numOffset)).BeginInit();
this.tabPage1.SuspendLayout();
this.groupBox14.SuspendLayout();
this.panel14.SuspendLayout();
@ -1210,6 +1214,8 @@
// panel22
//
this.panel22.BackColor = System.Drawing.Color.White;
this.panel22.Controls.Add(this.numOffset);
this.panel22.Controls.Add(this.label7);
this.panel22.Controls.Add(this.label61);
this.panel22.Controls.Add(this.cobTension_PortNum);
this.panel22.Dock = System.Windows.Forms.DockStyle.Fill;
@ -1219,10 +1225,44 @@
this.panel22.Size = new System.Drawing.Size(462, 37);
this.panel22.TabIndex = 0;
//
// numOffset
//
this.numOffset.DecimalPlaces = 2;
this.numOffset.Increment = new decimal(new int[] {
1,
0,
0,
131072});
this.numOffset.Location = new System.Drawing.Point(296, 9);
this.numOffset.Margin = new System.Windows.Forms.Padding(2);
this.numOffset.Maximum = new decimal(new int[] {
10,
0,
0,
0});
this.numOffset.Minimum = new decimal(new int[] {
10,
0,
0,
-2147483648});
this.numOffset.Name = "numOffset";
this.numOffset.Size = new System.Drawing.Size(120, 21);
this.numOffset.TabIndex = 13;
//
// label7
//
this.label7.AutoSize = true;
this.label7.Location = new System.Drawing.Point(234, 13);
this.label7.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(53, 12);
this.label7.TabIndex = 12;
this.label7.Text = "补偿值：";
//
// label61
//
this.label61.AutoSize = true;
this.label61.Location = new System.Drawing.Point(5, 12);
this.label61.Location = new System.Drawing.Point(5, 13);
this.label61.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label61.Name = "label61";
this.label61.Size = new System.Drawing.Size(41, 12);
@ -2687,6 +2727,7 @@
//
// tabPage9
//
this.tabPage9.Controls.Add(this.cbOpenFlawDistribution);
this.tabPage9.Controls.Add(this.ckSkipSizeFailed);
this.tabPage9.Controls.Add(this.chkSkipSmallAxis);
this.tabPage9.Controls.Add(this.chkSkipScannerCC);
@ -2703,7 +2744,7 @@
this.tabPage9.Name = "tabPage9";
this.tabPage9.Size = new System.Drawing.Size(482, 529);
this.tabPage9.TabIndex = 8;
this.tabPage9.Text = "传感器过滤";
this.tabPage9.Text = "功能过滤";
this.tabPage9.UseVisualStyleBackColor = true;
//
// ckSkipSizeFailed
@ -2923,6 +2964,17 @@
this.label49.TabIndex = 4;
this.label49.Text = "本机IP：";
//
// cbOpenFlawDistribution
//
this.cbOpenFlawDistribution.AutoSize = true;
this.cbOpenFlawDistribution.Location = new System.Drawing.Point(19, 304);
this.cbOpenFlawDistribution.Margin = new System.Windows.Forms.Padding(2);
this.cbOpenFlawDistribution.Name = "cbOpenFlawDistribution";
this.cbOpenFlawDistribution.Size = new System.Drawing.Size(96, 16);
this.cbOpenFlawDistribution.TabIndex = 12;
this.cbOpenFlawDistribution.Text = "启用缺陷分布";
this.cbOpenFlawDistribution.UseVisualStyleBackColor = true;
//
// FrmSysSetting
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@ -2980,6 +3032,7 @@
this.groupBox22.ResumeLayout(false);
this.panel22.ResumeLayout(false);
this.panel22.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.numOffset)).EndInit();
this.tabPage1.ResumeLayout(false);
this.groupBox14.ResumeLayout(false);
this.panel14.ResumeLayout(false);
@ -3271,5 +3324,8 @@
private System.Windows.Forms.Panel panel22;
private System.Windows.Forms.Label label61;
private System.Windows.Forms.CheckBox ckSkipSizeFailed;
private System.Windows.Forms.NumericUpDown numOffset;
private System.Windows.Forms.Label label7;
private System.Windows.Forms.CheckBox cbOpenFlawDistribution;
}
}

13
halftoneproject-master/Code/FrmSysSetting.cs
View File

@ -49,7 +49,7 @@ namespace ProductionControl
this.chkSkipSmallAxis.Checked = Util.ReadIniValue(configPath, "SKIP", "SkipSmallAxis") == "1";
this.ckSkipSizeFailed.Checked = Util.ReadIniValue(configPath, "SKIP", "MarkErrorStop") == "1";
this.cbOpenFlawDistribution.Checked = Util.ReadIniValue(configPath, "SKIP", "OpenFlawDistribution") == "1";
//DEV
lsTmp = Util.ReadIniValue(configPath, "DEV", "Axis0_PulseOutMode");
EnumUtil.BindToEnumName<AxisPulseOutMode>(this.cobAxis0PulseOutMode, typeof(AxisPulseOutMode), lsTmp == "" ? AxisPulseOutMode.O_CW_CCW : (AxisPulseOutMode)Convert.ToInt32(lsTmp));
@ -78,6 +78,11 @@ namespace ProductionControl
this.cobLight_Name.Text = ((LightDevNameEnum)Convert.ToInt32(lsTmp)).ToString();
this.cobLight_PortNum.Text = "COM" + Util.ReadIniValue(configPath, "DEV", "Light_PortNum");
this.cobTension_PortNum.Text = "COM" + Util.ReadIniValue(configPath, "DEV", "Tension_PortNum");
lsTmp = Util.ReadIniValue(configPath, "DEV", "Tension_Offset");
if (string.IsNullOrWhiteSpace(lsTmp))
this.numOffset.Value = 0;
else
this.numOffset.Value = (decimal)double.Parse(lsTmp);
this.cobSmallAxis_ComName.Text = Util.ReadIniValue(configPath, "DEV", "SmallAxis_ComName");
this.cobAxis0HomeDir.SelectedIndex = Convert.ToInt32(Util.ReadIniValue(configPath, "DEV", "Axis0_HomeDir"));
@ -214,6 +219,7 @@ namespace ProductionControl
LightDevNameEnum Light_Name = Utils.EnumUtil.Convert2Enum<LightDevNameEnum>(lsLight_Name);
string Light_PortNum = this.cobLight_PortNum.Text.Trim();
string Tension_PortNum = this.cobTension_PortNum.Text.Trim();
decimal Tension_Offset = this.numOffset.Value;
string SmallAxis_ComName = this.cobSmallAxis_ComName.Text.Trim();
if (Light_PortNum == "" || Tension_PortNum == "" || SmallAxis_ComName == "")
throw new Exception("请设置设备COM端口！");
@ -261,7 +267,7 @@ namespace ProductionControl
Util.WriteIniValue(configPath, "SKIP", "SkipSmallAxis", this.chkSkipSmallAxis.Checked ? "1" : "0");
Util.WriteIniValue(configPath, "SKIP", "MarkErrorStop", this.ckSkipSizeFailed.Checked ? "1" : "0");
Util.WriteIniValue(configPath, "SKIP", "OpenFlawDistribution", this.cbOpenFlawDistribution.Checked ? "1" : "0");
//DEV
Utils.Util.WriteIniValue(configPath, "DEV", "Axis0_PulseOutMode", ((int)EnumUtil.GetSelectedItemToEnum<AxisPulseOutMode>(this.cobAxis0PulseOutMode)).ToString());
Utils.Util.WriteIniValue(configPath, "DEV", "Axis1_PulseOutMode", ((int)EnumUtil.GetSelectedItemToEnum<AxisPulseOutMode>(this.cobAxis1PulseOutMode)).ToString());
@ -288,6 +294,8 @@ namespace ProductionControl
Utils.Util.WriteIniValue(configPath, "DEV", "Light_Name", ""+(int)Light_Name);
Utils.Util.WriteIniValue(configPath, "DEV", "Light_PortNum", Light_PortNum.Substring(3));
Utils.Util.WriteIniValue(configPath, "DEV", "Tension_PortNum", Tension_PortNum.Substring(3));
Utils.Util.WriteIniValue(configPath, "DEV", "Tension_Offset", Tension_Offset.ToString());
Utils.Util.WriteIniValue(configPath, "DEV", "SmallAxis_ComName", SmallAxis_ComName);
Utils.Util.WriteIniValue(configPath, "DEV", "HeightDev_IP", HeightDev_IP);
@ -343,6 +351,7 @@ namespace ProductionControl
//LOG
Utils.Util.WriteIniValue(configPath, "LOG", "LogPath", LogPath);
//
this.Hide();
MessageBox.Show("保存成功，生效需重启程序！");

23
halftoneproject-master/Code/FrmSysSetting.resx
View File

@ -124,16 +124,16 @@
<data name="tsbtnSave.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIeSURBVFhH7ZfLShxBFIaPCJKAQcgLhBh0I7hTSYi6CVEX
Lmchoq1dVd112rgQ3yC7oBslD+CNJBDIC7gTXXoBFy7dSdaRYELI5VRR09Pl1Mx09TQBwR8+eqaqzt//
VJ/umYF7OdQBUTJGTBaGywngyYDx81Cl0gUs3geBf0uB41vjnFMCh+pM2ueVcc8hLkfTQoaX9Al2QMS7
/shtCPFC+yzgFURRjzlDC0XJyzQAxy0zWkxcvku9hPxsRlsoG0DID2a0mITcrHlpv8DMNFE2AMOPZjS/
GC7SzkX6NccNK8AMfocweaLnGqqdACsrD6nuj65V4rieelUJ4yOa6dDzTrUTIAwfUd034ka/53It9bKQ
q3reKasHcM+M5lOSdMPU9G9dq2Q1ocUXPe+UHaDJwgbSt61pXoHvM141mu6sHUBt5wsz4yeGg1T7NeNV
wyOAQjXVOXFCD5jT1tA6jmcQBL9MfT2eAcrnbgYIgutCVO+KLF4BlImQU8DY40LEcR/5HFqefjtAjdWu
BCaWp+cl+EldvQwiGfGGxcPkN5l+LVe5m01YJp4BbugSzANf6tcNpY55Ueuj6DkweWx5/v8mlGh5eu+A
kHMgxDNYxF59vI0ad8HfPKV6+pGrH9E5A2R/lNqo7wQ/XA8hjfxkzuaQunWcRWXSLEAQPKBFB/VFJTE7
+4N2ecKcrYEqlU5aPE794P7bVRSBr3Vf3MsSwD8RV2WjuxFNUgAAAABJRU5ErkJggg==
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIfSURBVFhH7ZdPaxNBGMbfUBCFSsEvILa0l4K3KoptL9JE
es6hhLpmZ2Z33q09hH4Db6IXpR+gtUULBb+AN6lHW8GDR2/iWZEo4p93hslmp5kkO5ulEOgDPzaZmffZ
J7PvbhI4l0MViJIlolYYLqvAk3nj56F6/QKw+A0I/FcKHB8Z55wSuNBjMjp3jXsOcbmYFjL8TJ/gBYh4
zx+5CyF+0j4P8AtE0ZQ5wxBFyZ00AMcdM1pMXD5OvYQ8NKNDlA0g5EszWkxCPu96ab/AzAxQNgDDV2Y0
vxg2aeci/ZrjMyvAGv6AMLmq5/pqlACt1iWq+6trlTg+Tb06hPE7mqnoeadGCRCGl6nuG9HW77l8knpZ
yC0975TVA7hvRvMpSSahuvpH1ypZTWjxWs87ZQcYsLCP9G1rmlfgdsary8CdtQOo7bxtZvzE8DrVfs14
dfEIoFBN9ZE4pgfMyXBoHccPEAS/TX0vngHKZzwDBMH3QnTuiixeAZSJkPeAsSuFiONZ8jmyPP12gBpr
VAlMLE/PS/CLunoTRHLTGxbfIL9a+rXcYTybsEw8A7TpEtwHvjGnG0od86LWR9EtYPK95Xn2TSjR8vTe
ASHXQYgZaOK0Pp5GjbvgD69RPf3I1Y/onAGyP0pt1HeCH66HkEYemLM5pG4dZ1GZDAoQBBdp0dveopJo
NH7SLlfN2fqoXp+gxcvUD+6/XUURuKL74lyWAP4DwL5ll9fZEiMAAAAASUVORK5CYII=
</value>
</data>
<data name="tsbtnClose.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@ -257,9 +257,6 @@
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>166, 17</value>
</metadata>
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>166, 17</value>
</metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>56</value>
</metadata>

4
halftoneproject-master/Code/Properties/AssemblyInfo.cs
View File

@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.2.0.0")]
[assembly: AssemblyFileVersion("1.2.0.0")]
[assembly: AssemblyVersion("1.2.1.0")]
[assembly: AssemblyFileVersion("1.2.1.0")]

2
halftoneproject-master/Models/Order.cs
View File

@ -151,10 +151,12 @@ namespace Models
/// <summary>
/// 异常情况
/// </summary>
[SugarColumn(IsNullable = true)]
public string Abnormalities { get; set; }
/// <summary>
/// 修复人员
/// </summary>
[SugarColumn(IsNullable = true)]
public string RepairCode { get; set; }
}
[SugarIndex("index_{table}_pid", nameof(OrderHistory.Pid), OrderByType.Asc, isUnique: false)]

2
halftoneproject-master/Models/Product.cs
View File

@ -109,8 +109,10 @@ namespace Models
//mark尺寸
public double MarkSize { get; set; }
//抓点图像
[SugarColumn(IsNullable = true)]
public string MapPath { get; set; }
//抓取点位
[SugarColumn(IsNullable = true)]
public string GetPointList { get; set; }
}
/// <summary>