Commit cbf0aa24 LN

历史记录查询修改

1 个父辈 9475593b
5S1 2 3
6C1D1 2 5
6D551 2 7
7H5S1 2 3
...@@ -30,14 +30,9 @@ ...@@ -30,14 +30,9 @@
{ {
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmAnalyze)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmAnalyze));
this.groupBox1 = new System.Windows.Forms.GroupBox(); this.groupBox1 = new System.Windows.Forms.GroupBox();
this.btnExport = new System.Windows.Forms.Button();
this.panel2 = new System.Windows.Forms.Panel(); this.panel2 = new System.Windows.Forms.Panel();
this.dataGridView1 = new System.Windows.Forms.DataGridView(); this.dataGridView1 = new System.Windows.Forms.DataGridView();
this.Column_Num = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column_Code = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column_Width = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column_Height = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column_Count = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column_ImageName = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.txtCode = new System.Windows.Forms.TextBox(); this.txtCode = new System.Windows.Forms.TextBox();
this.label1 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label();
this.btnBack = new System.Windows.Forms.Button(); this.btnBack = new System.Windows.Forms.Button();
...@@ -46,8 +41,14 @@ ...@@ -46,8 +41,14 @@
this.label3 = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label();
this.dtpStartTime = new System.Windows.Forms.DateTimePicker(); this.dtpStartTime = new System.Windows.Forms.DateTimePicker();
this.label2 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label();
this.btnExport = new System.Windows.Forms.Button();
this.saveFileDialog1 = new System.Windows.Forms.SaveFileDialog(); this.saveFileDialog1 = new System.Windows.Forms.SaveFileDialog();
this.Column_Num = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column_Code = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column_Data = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column_Count = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column_Width = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column_Height = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column_ImageName = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.groupBox1.SuspendLayout(); this.groupBox1.SuspendLayout();
this.panel2.SuspendLayout(); this.panel2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
...@@ -71,84 +72,59 @@ ...@@ -71,84 +72,59 @@
this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox1.Location = new System.Drawing.Point(5, 6); this.groupBox1.Location = new System.Drawing.Point(5, 6);
this.groupBox1.Name = "groupBox1"; this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(1164, 586); this.groupBox1.Size = new System.Drawing.Size(1266, 586);
this.groupBox1.TabIndex = 1; this.groupBox1.TabIndex = 1;
this.groupBox1.TabStop = false; this.groupBox1.TabStop = false;
this.groupBox1.Text = "查看点料记录"; this.groupBox1.Text = "查看点料记录";
// //
// btnExport
//
this.btnExport.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnExport.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnExport.Location = new System.Drawing.Point(970, 29);
this.btnExport.Name = "btnExport";
this.btnExport.Size = new System.Drawing.Size(114, 35);
this.btnExport.TabIndex = 19;
this.btnExport.Text = "导出列表数据";
this.btnExport.UseVisualStyleBackColor = true;
this.btnExport.Click += new System.EventHandler(this.btnExport_Click);
//
// panel2 // panel2
// //
this.panel2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.panel2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left))); | System.Windows.Forms.AnchorStyles.Left)));
this.panel2.Controls.Add(this.dataGridView1); this.panel2.Controls.Add(this.dataGridView1);
this.panel2.Location = new System.Drawing.Point(8, 31); this.panel2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.panel2.Location = new System.Drawing.Point(8, 87);
this.panel2.Name = "panel2"; this.panel2.Name = "panel2";
this.panel2.Size = new System.Drawing.Size(864, 548); this.panel2.Size = new System.Drawing.Size(1248, 492);
this.panel2.TabIndex = 18; this.panel2.TabIndex = 18;
// //
// dataGridView1 // dataGridView1
// //
this.dataGridView1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.Column_Num, this.Column_Num,
this.Column_Code, this.Column_Code,
this.Column_Data,
this.Column_Count,
this.Column_Width, this.Column_Width,
this.Column_Height, this.Column_Height,
this.Column_Count,
this.Column_ImageName}); this.Column_ImageName});
this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Fill;
this.dataGridView1.Location = new System.Drawing.Point(0, 0); this.dataGridView1.Location = new System.Drawing.Point(0, 0);
this.dataGridView1.Name = "dataGridView1"; this.dataGridView1.Name = "dataGridView1";
this.dataGridView1.ReadOnly = true; this.dataGridView1.ReadOnly = true;
this.dataGridView1.RowTemplate.Height = 23; this.dataGridView1.RowTemplate.Height = 23;
this.dataGridView1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; this.dataGridView1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
this.dataGridView1.Size = new System.Drawing.Size(864, 548); this.dataGridView1.Size = new System.Drawing.Size(1248, 492);
this.dataGridView1.TabIndex = 0; this.dataGridView1.TabIndex = 0;
// //
// Column_Num
//
this.Column_Num.HeaderText = "编号";
this.Column_Num.Name = "Column_Num";
this.Column_Num.ReadOnly = true;
this.Column_Num.Width = 80;
//
// Column_Code
//
this.Column_Code.HeaderText = "条码";
this.Column_Code.Name = "Column_Code";
this.Column_Code.ReadOnly = true;
this.Column_Code.Width = 200;
//
// Column_Width
//
this.Column_Width.HeaderText = "宽度";
this.Column_Width.Name = "Column_Width";
this.Column_Width.ReadOnly = true;
this.Column_Width.Width = 80;
//
// Column_Height
//
this.Column_Height.HeaderText = "高度";
this.Column_Height.Name = "Column_Height";
this.Column_Height.ReadOnly = true;
this.Column_Height.Width = 80;
//
// Column_Count
//
this.Column_Count.HeaderText = "数量";
this.Column_Count.Name = "Column_Count";
this.Column_Count.ReadOnly = true;
//
// Column_ImageName
//
this.Column_ImageName.HeaderText = "图片名称";
this.Column_ImageName.Name = "Column_ImageName";
this.Column_ImageName.ReadOnly = true;
this.Column_ImageName.Width = 250;
//
// txtCode // txtCode
// //
this.txtCode.Location = new System.Drawing.Point(963, 140); this.txtCode.Location = new System.Drawing.Point(623, 33);
this.txtCode.Name = "txtCode"; this.txtCode.Name = "txtCode";
this.txtCode.Size = new System.Drawing.Size(172, 26); this.txtCode.Size = new System.Drawing.Size(172, 26);
this.txtCode.TabIndex = 17; this.txtCode.TabIndex = 17;
...@@ -156,7 +132,7 @@ ...@@ -156,7 +132,7 @@
// label1 // label1
// //
this.label1.AutoSize = true; this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(913, 143); this.label1.Location = new System.Drawing.Point(573, 36);
this.label1.Name = "label1"; this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(40, 20); this.label1.Size = new System.Drawing.Size(40, 20);
this.label1.TabIndex = 16; this.label1.TabIndex = 16;
...@@ -164,8 +140,9 @@ ...@@ -164,8 +140,9 @@
// //
// btnBack // btnBack
// //
this.btnBack.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnBack.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnBack.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnBack.Location = new System.Drawing.Point(981, 304); this.btnBack.Location = new System.Drawing.Point(1089, 29);
this.btnBack.Name = "btnBack"; this.btnBack.Name = "btnBack";
this.btnBack.Size = new System.Drawing.Size(114, 35); this.btnBack.Size = new System.Drawing.Size(114, 35);
this.btnBack.TabIndex = 15; this.btnBack.TabIndex = 15;
...@@ -175,8 +152,9 @@ ...@@ -175,8 +152,9 @@
// //
// btnSearch // btnSearch
// //
this.btnSearch.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnSearch.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnSearch.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSearch.Location = new System.Drawing.Point(981, 198); this.btnSearch.Location = new System.Drawing.Point(850, 29);
this.btnSearch.Name = "btnSearch"; this.btnSearch.Name = "btnSearch";
this.btnSearch.Size = new System.Drawing.Size(114, 35); this.btnSearch.Size = new System.Drawing.Size(114, 35);
this.btnSearch.TabIndex = 7; this.btnSearch.TabIndex = 7;
...@@ -188,7 +166,7 @@ ...@@ -188,7 +166,7 @@
// //
this.dtpEndTime.CustomFormat = "yyyy-MM-dd HH:mm:ss"; this.dtpEndTime.CustomFormat = "yyyy-MM-dd HH:mm:ss";
this.dtpEndTime.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dtpEndTime.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
this.dtpEndTime.Location = new System.Drawing.Point(963, 89); this.dtpEndTime.Location = new System.Drawing.Point(376, 33);
this.dtpEndTime.Name = "dtpEndTime"; this.dtpEndTime.Name = "dtpEndTime";
this.dtpEndTime.Size = new System.Drawing.Size(172, 26); this.dtpEndTime.Size = new System.Drawing.Size(172, 26);
this.dtpEndTime.TabIndex = 5; this.dtpEndTime.TabIndex = 5;
...@@ -196,7 +174,7 @@ ...@@ -196,7 +174,7 @@
// label3 // label3
// //
this.label3.AutoSize = true; this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(885, 92); this.label3.Location = new System.Drawing.Point(298, 36);
this.label3.Name = "label3"; this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(68, 20); this.label3.Size = new System.Drawing.Size(68, 20);
this.label3.TabIndex = 4; this.label3.TabIndex = 4;
...@@ -206,7 +184,7 @@ ...@@ -206,7 +184,7 @@
// //
this.dtpStartTime.CustomFormat = "yyyy-MM-dd HH:mm:ss"; this.dtpStartTime.CustomFormat = "yyyy-MM-dd HH:mm:ss";
this.dtpStartTime.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dtpStartTime.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
this.dtpStartTime.Location = new System.Drawing.Point(963, 38); this.dtpStartTime.Location = new System.Drawing.Point(92, 33);
this.dtpStartTime.Name = "dtpStartTime"; this.dtpStartTime.Name = "dtpStartTime";
this.dtpStartTime.Size = new System.Drawing.Size(172, 26); this.dtpStartTime.Size = new System.Drawing.Size(172, 26);
this.dtpStartTime.TabIndex = 3; this.dtpStartTime.TabIndex = 3;
...@@ -214,27 +192,65 @@ ...@@ -214,27 +192,65 @@
// label2 // label2
// //
this.label2.AutoSize = true; this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(885, 41); this.label2.Location = new System.Drawing.Point(14, 36);
this.label2.Name = "label2"; this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(68, 20); this.label2.Size = new System.Drawing.Size(68, 20);
this.label2.TabIndex = 1; this.label2.TabIndex = 1;
this.label2.Text = "开始时间:"; this.label2.Text = "开始时间:";
// //
// btnExport // Column_Num
// //
this.btnExport.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Column_Num.HeaderText = "编号";
this.btnExport.Location = new System.Drawing.Point(981, 250); this.Column_Num.Name = "Column_Num";
this.btnExport.Name = "btnExport"; this.Column_Num.ReadOnly = true;
this.btnExport.Size = new System.Drawing.Size(114, 35); this.Column_Num.Width = 60;
this.btnExport.TabIndex = 19; //
this.btnExport.Text = "导出列表数据"; // Column_Code
this.btnExport.UseVisualStyleBackColor = true; //
this.btnExport.Click += new System.EventHandler(this.btnExport_Click); this.Column_Code.HeaderText = "条码";
this.Column_Code.Name = "Column_Code";
this.Column_Code.ReadOnly = true;
this.Column_Code.Width = 260;
//
// Column_Data
//
this.Column_Data.HeaderText = "时间";
this.Column_Data.Name = "Column_Data";
this.Column_Data.ReadOnly = true;
this.Column_Data.Width = 130;
//
// Column_Count
//
this.Column_Count.HeaderText = "数量";
this.Column_Count.Name = "Column_Count";
this.Column_Count.ReadOnly = true;
this.Column_Count.Width = 80;
//
// Column_Width
//
this.Column_Width.HeaderText = "宽度";
this.Column_Width.Name = "Column_Width";
this.Column_Width.ReadOnly = true;
this.Column_Width.Width = 60;
//
// Column_Height
//
this.Column_Height.HeaderText = "高度";
this.Column_Height.Name = "Column_Height";
this.Column_Height.ReadOnly = true;
this.Column_Height.Width = 60;
//
// Column_ImageName
//
this.Column_ImageName.HeaderText = "图片名称";
this.Column_ImageName.Name = "Column_ImageName";
this.Column_ImageName.ReadOnly = true;
this.Column_ImageName.Width = 530;
// //
// FrmAnalyze // FrmAnalyze
// //
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.ClientSize = new System.Drawing.Size(1175, 598); this.ClientSize = new System.Drawing.Size(1277, 598);
this.Controls.Add(this.groupBox1); this.Controls.Add(this.groupBox1);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "FrmAnalyze"; this.Name = "FrmAnalyze";
...@@ -262,13 +278,14 @@ ...@@ -262,13 +278,14 @@
private System.Windows.Forms.TextBox txtCode; private System.Windows.Forms.TextBox txtCode;
private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label1;
private System.Windows.Forms.DataGridView dataGridView1; private System.Windows.Forms.DataGridView dataGridView1;
private System.Windows.Forms.Button btnExport;
private System.Windows.Forms.SaveFileDialog saveFileDialog1;
private System.Windows.Forms.DataGridViewTextBoxColumn Column_Num; private System.Windows.Forms.DataGridViewTextBoxColumn Column_Num;
private System.Windows.Forms.DataGridViewTextBoxColumn Column_Code; private System.Windows.Forms.DataGridViewTextBoxColumn Column_Code;
private System.Windows.Forms.DataGridViewTextBoxColumn Column_Data;
private System.Windows.Forms.DataGridViewTextBoxColumn Column_Count;
private System.Windows.Forms.DataGridViewTextBoxColumn Column_Width; private System.Windows.Forms.DataGridViewTextBoxColumn Column_Width;
private System.Windows.Forms.DataGridViewTextBoxColumn Column_Height; private System.Windows.Forms.DataGridViewTextBoxColumn Column_Height;
private System.Windows.Forms.DataGridViewTextBoxColumn Column_Count;
private System.Windows.Forms.DataGridViewTextBoxColumn Column_ImageName; private System.Windows.Forms.DataGridViewTextBoxColumn Column_ImageName;
private System.Windows.Forms.Button btnExport;
private System.Windows.Forms.SaveFileDialog saveFileDialog1;
} }
} }
\ No newline at end of file \ No newline at end of file
...@@ -31,8 +31,9 @@ namespace OnlineStore.AutoCountClient ...@@ -31,8 +31,9 @@ namespace OnlineStore.AutoCountClient
} }
else else
{ {
DateTime time1 = DateTime.Now.AddDays(-4); DateTime time1 = DateTime.Now.AddHours(-6);
dtpStartTime.Value = new DateTime(time1.Year, time1.Month, time1.Day, 0, 0, 0); //dtpStartTime.Value = new DateTime(time1.Year, time1.Month, time1.Day, 0, 0, 0);
dtpStartTime.Value = time1;
DateTime time = DateTime.Now.AddDays(-1); DateTime time = DateTime.Now.AddDays(-1);
dtpEndTime.Value = new DateTime(time.Year, time.Month, time.Day, 23, 59, 59); dtpEndTime.Value = new DateTime(time.Year, time.Month, time.Day, 23, 59, 59);
dtpEndTime.Value = DateTime.Now; dtpEndTime.Value = DateTime.Now;
...@@ -66,41 +67,47 @@ namespace OnlineStore.AutoCountClient ...@@ -66,41 +67,47 @@ namespace OnlineStore.AutoCountClient
PreStartTime = startTime; PreStartTime = startTime;
PreEndTime = endTime; PreEndTime = endTime;
string code = txtCode.Text.Trim(); string code = txtCode.Text.Trim();
lastList = new List<XRayHistory>();
string[][] array = null;
bool result = RobotManager.robot.sQLite.Select(code, startTime.ToString(), endTime.ToString(), out array);
LogUtil.error("查数据【" + code + "】【" + startTime.ToString() + "】【" + endTime.ToString() + "】结果:" + result + "," + RobotManager.robot.sQLite.ErrInfo);
if (array != null && array.Length > 0)
{
LogUtil.info("共查询到【" + array.Length + "】行数据");
this.dataGridView1.Rows.Clear(); try
int index = 1; {
foreach (string[] a in array) lastList = new List<XRayHistory>();
string[][] array = null;
string str = "yyyy-MM-dd HH:mm:ss";
string startStr = startTime.ToString(str);
string endStr = endTime.ToString(str);
bool result = RobotManager.robot.sQLite.Select(code, startStr,endStr, out array);
LogUtil.error("查数据【" + code + "】【" + startStr + "】【" + endStr + "】结果:" + result + "," + RobotManager.robot.sQLite.ErrInfo);
if (array != null && array.Length > 0)
{ {
DataGridViewRow view = new DataGridViewRow(); LogUtil.info("共查询到【" + array.Length + "】行数据");
view.CreateCells(dataGridView1);
view.Cells[0].Value = index;
lastList.Add(new XRayHistory(index, a[0], a[1], a[2], a[3], a[4])); this.dataGridView1.Rows.Clear();
for (int i = 1; i < a.Length; i++) int index = 1;
foreach (string[] a in array)
{ {
view.Cells[i].Value = a[i]; DataGridViewRow view = new DataGridViewRow();
view.CreateCells(dataGridView1);
view.Cells[0].Value = index;
if (a.Length >= 6)
{
XRayHistory his = new XRayHistory(index, a[0], a[1], a[2], a[3], a[4], a[5]);
lastList.Add(his);
view.Cells[Column_Code.Index] .Value= his.Code;
view.Cells[Column_Count.Index].Value = his.Count;
view.Cells[Column_Data.Index].Value = his.DataStr;
view.Cells[Column_Height.Index].Value = his.Height;
view.Cells[Column_Width.Index].Value = his.Width;
view.Cells[Column_ImageName.Index].Value = his.FileName;
}
dataGridView1.Rows.Add(view);
index++;
} }
//view.Cells[0].Value = point.pointNum.ToString();
//view.Cells[1].Value = point.PartNum.ToString();
//view.Cells[2].Value = point.pointName;
//view.Cells[3].Value = point.PositionX.ToString();
//view.Cells[4].Value = point.PositionY.ToString();
//view.Cells[5].Value = point.NodePositionX.ToString();
//view.Cells[6].Value = point.NodePositionY.ToString();
//view.Cells[7].Value = point.PositionNum.ToString();
//view.Cells[8].Value = point.NeedSoldering;
//view.Cells[9].Value = point.WeldTemp;
dataGridView1.Rows.Add(view);
index++;
} }
}catch(Exception ex)
{
LogUtil.error("查询数据出错:" + ex.ToString());
} }
} }
private void btnBack_Click(object sender, EventArgs e) private void btnBack_Click(object sender, EventArgs e)
...@@ -129,7 +136,7 @@ namespace OnlineStore.AutoCountClient ...@@ -129,7 +136,7 @@ namespace OnlineStore.AutoCountClient
} }
List<string> list = new List<string>(); List<string> list = new List<string>();
list.Add("编号,条码,高度,宽度,数量,图片文件名"); list.Add("编号,条码,高度,宽度,数量,图片文件名,时间");
foreach(XRayHistory obj in lastList) foreach(XRayHistory obj in lastList)
{ {
list.Add(obj.ToCSVStr()); list.Add(obj.ToCSVStr());
...@@ -150,13 +157,14 @@ namespace OnlineStore.AutoCountClient ...@@ -150,13 +157,14 @@ namespace OnlineStore.AutoCountClient
public class XRayHistory public class XRayHistory
{ {
public XRayHistory(int num,string code, string h, string w, string c, string fname) public XRayHistory(int num,string code, string h, string w, string c, string fname,string dataStr)
{ {
this.Code = code; this.Code = code;
this.Height = h; this.Height = h;
this.Width = w; this.Width = w;
this.Count = c; this.Count = c;
this.FileName = fname; this.FileName = fname;
this.DataStr = dataStr;
} }
public int Num = 0; public int Num = 0;
...@@ -169,10 +177,11 @@ namespace OnlineStore.AutoCountClient ...@@ -169,10 +177,11 @@ namespace OnlineStore.AutoCountClient
public string Count = ""; public string Count = "";
public string FileName = ""; public string FileName = "";
public string DataStr = "";
public string ToCSVStr() public string ToCSVStr()
{ {
return Num+","+ Code + "," + Height + "," + Width + "," + Count + "," + FileName + ","; return Num+","+ Code + "," + Height + "," + Width + "," + Count + "," + FileName + ","+DataStr;
} }
} }
} }
...@@ -123,33 +123,18 @@ ...@@ -123,33 +123,18 @@
<metadata name="Column_Code.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="Column_Code.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
<metadata name="Column_Width.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="Column_Data.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column_Height.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
<metadata name="Column_Count.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="Column_Count.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
<metadata name="Column_ImageName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column_Num.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column_Code.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column_Width.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="Column_Width.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
<metadata name="Column_Height.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="Column_Height.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
<metadata name="Column_Count.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column_ImageName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="Column_ImageName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
......
...@@ -26,69 +26,76 @@ ...@@ -26,69 +26,76 @@
this.btnStart = new System.Windows.Forms.Button(); this.btnStart = new System.Windows.Forms.Button();
this.btnStop = new System.Windows.Forms.Button(); this.btnStop = new System.Windows.Forms.Button();
this.tabPage1 = new System.Windows.Forms.TabPage(); this.tabPage1 = new System.Windows.Forms.TabPage();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.cmbWriteIO = new System.Windows.Forms.ComboBox();
this.txtSlaveId = new System.Windows.Forms.TextBox();
this.label5 = new System.Windows.Forms.Label();
this.txtWriteTime = new System.Windows.Forms.TextBox();
this.btnWriteSingleDO = new System.Windows.Forms.Button();
this.btnOpenDo = new System.Windows.Forms.Button();
this.label14 = new System.Windows.Forms.Label();
this.label17 = new System.Windows.Forms.Label();
this.txtDoName = new System.Windows.Forms.TextBox();
this.txtDOIndex = new System.Windows.Forms.TextBox();
this.groupBox5 = new System.Windows.Forms.GroupBox();
this.X_InDoor_Up = new System.Windows.Forms.Button();
this.X_InLine_Run = new System.Windows.Forms.Button();
this.X_MLine_Run = new System.Windows.Forms.Button();
this.btnCloseAll = new System.Windows.Forms.Button();
this.X_InDoor_Down = new System.Windows.Forms.Button();
this.X_OutDoor_Up = new System.Windows.Forms.Button();
this.X_OutDoor_Down = new System.Windows.Forms.Button();
this.X_StopCylinder_Up = new System.Windows.Forms.Button();
this.X_StopCylinder_Down = new System.Windows.Forms.Button();
this.X_Lock_On = new System.Windows.Forms.Button();
this.groupBox4 = new System.Windows.Forms.GroupBox();
this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
this.groupBox3 = new System.Windows.Forms.GroupBox(); this.groupBox3 = new System.Windows.Forms.GroupBox();
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
this.groupBox4 = new System.Windows.Forms.GroupBox();
this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
this.groupBox5 = new System.Windows.Forms.GroupBox();
this.X_Lock_On = new System.Windows.Forms.Button();
this.X_StopCylinder_Down = new System.Windows.Forms.Button();
this.X_StopCylinder_Up = new System.Windows.Forms.Button();
this.X_OutDoor_Down = new System.Windows.Forms.Button();
this.X_OutDoor_Up = new System.Windows.Forms.Button();
this.X_InDoor_Down = new System.Windows.Forms.Button();
this.btnCloseAll = new System.Windows.Forms.Button();
this.X_MLine_Run = new System.Windows.Forms.Button();
this.X_InLine_Run = new System.Windows.Forms.Button();
this.X_InDoor_Up = new System.Windows.Forms.Button();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.txtDOIndex = new System.Windows.Forms.TextBox();
this.txtDoName = new System.Windows.Forms.TextBox();
this.label17 = new System.Windows.Forms.Label();
this.label14 = new System.Windows.Forms.Label();
this.btnOpenDo = new System.Windows.Forms.Button();
this.btnWriteSingleDO = new System.Windows.Forms.Button();
this.txtWriteTime = new System.Windows.Forms.TextBox();
this.label5 = new System.Windows.Forms.Label();
this.txtSlaveId = new System.Windows.Forms.TextBox();
this.cmbWriteIO = new System.Windows.Forms.ComboBox();
this.tabPage3 = new System.Windows.Forms.TabPage(); this.tabPage3 = new System.Windows.Forms.TabPage();
this.groupBox6 = new System.Windows.Forms.GroupBox(); this.groupBox6 = new System.Windows.Forms.GroupBox();
this.lblThisSta = new System.Windows.Forms.Label();
this.lblMoveInfo = new System.Windows.Forms.Label();
this.lblInoutInfo = new System.Windows.Forms.Label();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.lblDianl = new System.Windows.Forms.Label();
this.lblDiany = new System.Windows.Forms.Label();
this.lblCom = new System.Windows.Forms.Label();
this.lblData = new System.Windows.Forms.Label();
this.lblLastS = new System.Windows.Forms.Label();
this.lblXrOpen = new System.Windows.Forms.Label();
this.groupBox7 = new System.Windows.Forms.GroupBox();
this.btnXStop = new System.Windows.Forms.Button();
this.btnXStart = new System.Windows.Forms.Button();
this.btnImage = new System.Windows.Forms.Button();
this.groupBox8 = new System.Windows.Forms.GroupBox(); this.groupBox8 = new System.Windows.Forms.GroupBox();
this.btnWorkTest = new System.Windows.Forms.Button(); this.btnSelImage = new System.Windows.Forms.Button();
this.label1 = new System.Windows.Forms.Label(); this.txtImage = new System.Windows.Forms.TextBox();
this.label2 = new System.Windows.Forms.Label(); this.numWSize = new System.Windows.Forms.NumericUpDown();
this.txtResult = new System.Windows.Forms.TextBox(); this.label3 = new System.Windows.Forms.Label();
this.btnSaveTh = new System.Windows.Forms.Button();
this.numTh = new System.Windows.Forms.NumericUpDown(); this.numTh = new System.Windows.Forms.NumericUpDown();
this.btnSaveTh = new System.Windows.Forms.Button();
this.txtResult = new System.Windows.Forms.TextBox();
this.label2 = new System.Windows.Forms.Label();
this.label1 = new System.Windows.Forms.Label();
this.btnWorkTest = new System.Windows.Forms.Button();
this.groupBox7 = new System.Windows.Forms.GroupBox();
this.btnImage = new System.Windows.Forms.Button();
this.btnXStart = new System.Windows.Forms.Button();
this.btnXStop = new System.Windows.Forms.Button();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.lblXrOpen = new System.Windows.Forms.Label();
this.lblLastS = new System.Windows.Forms.Label();
this.lblData = new System.Windows.Forms.Label();
this.lblCom = new System.Windows.Forms.Label();
this.lblDiany = new System.Windows.Forms.Label();
this.lblDianl = new System.Windows.Forms.Label();
this.lblInoutInfo = new System.Windows.Forms.Label();
this.lblMoveInfo = new System.Windows.Forms.Label();
this.lblThisSta = new System.Windows.Forms.Label();
this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabControl1 = new System.Windows.Forms.TabControl();
this.fileSystemWatcher1 = new System.IO.FileSystemWatcher();
this.panel1.SuspendLayout(); this.panel1.SuspendLayout();
this.tabPage1.SuspendLayout(); this.tabPage1.SuspendLayout();
this.groupBox1.SuspendLayout();
this.groupBox5.SuspendLayout();
this.groupBox4.SuspendLayout();
this.groupBox3.SuspendLayout(); this.groupBox3.SuspendLayout();
this.groupBox4.SuspendLayout();
this.groupBox5.SuspendLayout();
this.groupBox1.SuspendLayout();
this.tabPage3.SuspendLayout(); this.tabPage3.SuspendLayout();
this.groupBox6.SuspendLayout(); this.groupBox6.SuspendLayout();
this.groupBox2.SuspendLayout();
this.groupBox7.SuspendLayout();
this.groupBox8.SuspendLayout(); this.groupBox8.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.numWSize)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.numTh)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.numTh)).BeginInit();
this.groupBox7.SuspendLayout();
this.groupBox2.SuspendLayout();
this.tabControl1.SuspendLayout(); this.tabControl1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.fileSystemWatcher1)).BeginInit();
this.SuspendLayout(); this.SuspendLayout();
// //
// timer1 // timer1
...@@ -200,180 +207,186 @@ ...@@ -200,180 +207,186 @@
this.tabPage1.Text = " IO列表 "; this.tabPage1.Text = " IO列表 ";
this.tabPage1.UseVisualStyleBackColor = true; this.tabPage1.UseVisualStyleBackColor = true;
// //
// groupBox1 // groupBox3
// //
this.groupBox1.Controls.Add(this.txtDOIndex); this.groupBox3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
this.groupBox1.Controls.Add(this.txtDoName); | System.Windows.Forms.AnchorStyles.Left)));
this.groupBox1.Controls.Add(this.label17); this.groupBox3.Controls.Add(this.tableLayoutPanel1);
this.groupBox1.Controls.Add(this.label14); this.groupBox3.Location = new System.Drawing.Point(6, 6);
this.groupBox1.Controls.Add(this.btnOpenDo); this.groupBox3.Name = "groupBox3";
this.groupBox1.Controls.Add(this.btnWriteSingleDO); this.groupBox3.Size = new System.Drawing.Size(240, 474);
this.groupBox1.Controls.Add(this.txtWriteTime); this.groupBox3.TabIndex = 103;
this.groupBox1.Controls.Add(this.label5); this.groupBox3.TabStop = false;
this.groupBox1.Controls.Add(this.txtSlaveId); this.groupBox3.Text = "DI列表";
this.groupBox1.Controls.Add(this.cmbWriteIO);
this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox1.Location = new System.Drawing.Point(497, 383);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(812, 97);
this.groupBox1.TabIndex = 105;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "DO写入";
// //
// cmbWriteIO // tableLayoutPanel1
// //
this.cmbWriteIO.DisplayMember = "ProName"; this.tableLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
this.cmbWriteIO.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawVariable; | System.Windows.Forms.AnchorStyles.Left)
this.cmbWriteIO.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; | System.Windows.Forms.AnchorStyles.Right)));
this.cmbWriteIO.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.tableLayoutPanel1.AutoScroll = true;
this.cmbWriteIO.FormattingEnabled = true; this.tableLayoutPanel1.ColumnCount = 1;
this.cmbWriteIO.ItemHeight = 22; this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.cmbWriteIO.Location = new System.Drawing.Point(10, 19); this.tableLayoutPanel1.Location = new System.Drawing.Point(6, 14);
this.cmbWriteIO.Name = "cmbWriteIO"; this.tableLayoutPanel1.Name = "tableLayoutPanel1";
this.cmbWriteIO.Size = new System.Drawing.Size(358, 28); this.tableLayoutPanel1.RowCount = 2;
this.cmbWriteIO.TabIndex = 234; this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.cmbWriteIO.ValueMember = "ProName"; this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.cmbWriteIO.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.cmbWriteIO_DrawItem); this.tableLayoutPanel1.Size = new System.Drawing.Size(229, 454);
this.cmbWriteIO.SelectedIndexChanged += new System.EventHandler(this.cmbWriteIO_SelectedIndexChanged); this.tableLayoutPanel1.TabIndex = 102;
// //
// txtSlaveId // groupBox4
// //
this.txtSlaveId.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.groupBox4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
this.txtSlaveId.Location = new System.Drawing.Point(375, 24); | System.Windows.Forms.AnchorStyles.Left)));
this.txtSlaveId.MaxLength = 10; this.groupBox4.Controls.Add(this.tableLayoutPanel2);
this.txtSlaveId.Name = "txtSlaveId"; this.groupBox4.Location = new System.Drawing.Point(251, 6);
this.txtSlaveId.Size = new System.Drawing.Size(12, 23); this.groupBox4.Name = "groupBox4";
this.txtSlaveId.TabIndex = 255; this.groupBox4.Size = new System.Drawing.Size(240, 474);
this.txtSlaveId.Text = "0"; this.groupBox4.TabIndex = 104;
this.txtSlaveId.Visible = false; this.groupBox4.TabStop = false;
this.groupBox4.Text = "DO列表";
// //
// label5 // tableLayoutPanel2
// //
this.label5.AutoSize = true; this.tableLayoutPanel2.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
this.label5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); | System.Windows.Forms.AnchorStyles.Left)
this.label5.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; | System.Windows.Forms.AnchorStyles.Right)));
this.label5.Location = new System.Drawing.Point(394, 25); this.tableLayoutPanel2.AutoScroll = true;
this.label5.Name = "label5"; this.tableLayoutPanel2.ColumnCount = 1;
this.label5.Size = new System.Drawing.Size(60, 17); this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.label5.TabIndex = 270; this.tableLayoutPanel2.Location = new System.Drawing.Point(5, 14);
this.label5.Text = "定时(ms):"; this.tableLayoutPanel2.Name = "tableLayoutPanel2";
this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.tableLayoutPanel2.RowCount = 2;
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel2.Size = new System.Drawing.Size(229, 454);
this.tableLayoutPanel2.TabIndex = 103;
// //
// txtWriteTime // groupBox5
// //
this.txtWriteTime.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.groupBox5.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
this.txtWriteTime.Location = new System.Drawing.Point(461, 22); | System.Windows.Forms.AnchorStyles.Right)));
this.txtWriteTime.MaxLength = 10; this.groupBox5.Controls.Add(this.X_Lock_On);
this.txtWriteTime.Name = "txtWriteTime"; this.groupBox5.Controls.Add(this.X_StopCylinder_Down);
this.txtWriteTime.Size = new System.Drawing.Size(66, 23); this.groupBox5.Controls.Add(this.X_StopCylinder_Up);
this.txtWriteTime.TabIndex = 271; this.groupBox5.Controls.Add(this.X_OutDoor_Down);
this.txtWriteTime.Text = "0"; this.groupBox5.Controls.Add(this.X_OutDoor_Up);
this.groupBox5.Controls.Add(this.X_InDoor_Down);
this.groupBox5.Controls.Add(this.btnCloseAll);
this.groupBox5.Controls.Add(this.X_MLine_Run);
this.groupBox5.Controls.Add(this.X_InLine_Run);
this.groupBox5.Controls.Add(this.X_InDoor_Up);
this.groupBox5.Location = new System.Drawing.Point(497, 6);
this.groupBox5.Name = "groupBox5";
this.groupBox5.Size = new System.Drawing.Size(812, 371);
this.groupBox5.TabIndex = 255;
this.groupBox5.TabStop = false;
this.groupBox5.Text = "IO操作测试";
// //
// btnWriteSingleDO // X_Lock_On
// //
this.btnWriteSingleDO.BackColor = System.Drawing.Color.White; this.X_Lock_On.BackColor = System.Drawing.Color.White;
this.btnWriteSingleDO.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.X_Lock_On.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnWriteSingleDO.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.X_Lock_On.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnWriteSingleDO.Location = new System.Drawing.Point(436, 51); this.X_Lock_On.Location = new System.Drawing.Point(386, 27);
this.btnWriteSingleDO.Name = "btnWriteSingleDO"; this.X_Lock_On.Name = "X_Lock_On";
this.btnWriteSingleDO.Size = new System.Drawing.Size(140, 34); this.X_Lock_On.Size = new System.Drawing.Size(164, 35);
this.btnWriteSingleDO.TabIndex = 269; this.X_Lock_On.TabIndex = 265;
this.btnWriteSingleDO.Text = "关闭"; this.X_Lock_On.Text = "Y97_X光机互锁信号ON";
this.btnWriteSingleDO.UseVisualStyleBackColor = false; this.X_Lock_On.UseVisualStyleBackColor = false;
this.btnWriteSingleDO.Click += new System.EventHandler(this.btnWriteSingleDO_Click); this.X_Lock_On.Click += new System.EventHandler(this.X_Lock_On_Click);
// //
// btnOpenDo // X_StopCylinder_Down
// //
this.btnOpenDo.BackColor = System.Drawing.Color.White; this.X_StopCylinder_Down.BackColor = System.Drawing.Color.White;
this.btnOpenDo.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.X_StopCylinder_Down.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOpenDo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.X_StopCylinder_Down.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOpenDo.Location = new System.Drawing.Point(288, 51); this.X_StopCylinder_Down.Location = new System.Drawing.Point(386, 121);
this.btnOpenDo.Name = "btnOpenDo"; this.X_StopCylinder_Down.Name = "X_StopCylinder_Down";
this.btnOpenDo.Size = new System.Drawing.Size(140, 34); this.X_StopCylinder_Down.Size = new System.Drawing.Size(164, 35);
this.btnOpenDo.TabIndex = 272; this.X_StopCylinder_Down.TabIndex = 264;
this.btnOpenDo.Text = "打开"; this.X_StopCylinder_Down.Text = "阻挡气缸下降/挡停 ↓";
this.btnOpenDo.UseVisualStyleBackColor = false; this.X_StopCylinder_Down.UseVisualStyleBackColor = false;
this.btnOpenDo.Click += new System.EventHandler(this.btnOpenDo_Click); this.X_StopCylinder_Down.Click += new System.EventHandler(this.btnStopCylinder_Down_Click);
// //
// label14 // X_StopCylinder_Up
// //
this.label14.AutoSize = true; this.X_StopCylinder_Up.BackColor = System.Drawing.Color.White;
this.label14.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.X_StopCylinder_Up.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.label14.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.X_StopCylinder_Up.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label14.Location = new System.Drawing.Point(190, 60); this.X_StopCylinder_Up.Location = new System.Drawing.Point(386, 82);
this.label14.Name = "label14"; this.X_StopCylinder_Up.Name = "X_StopCylinder_Up";
this.label14.Size = new System.Drawing.Size(35, 17); this.X_StopCylinder_Up.Size = new System.Drawing.Size(164, 35);
this.label14.TabIndex = 273; this.X_StopCylinder_Up.TabIndex = 263;
this.label14.Text = "地址:"; this.X_StopCylinder_Up.Text = "阻挡气缸上升/放行 ↑";
this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.X_StopCylinder_Up.UseVisualStyleBackColor = false;
this.X_StopCylinder_Up.Click += new System.EventHandler(this.btnStopCylinder_Up_Click);
// //
// label17 // X_OutDoor_Down
// //
this.label17.AutoSize = true; this.X_OutDoor_Down.BackColor = System.Drawing.Color.White;
this.label17.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.X_OutDoor_Down.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.label17.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.X_OutDoor_Down.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label17.Location = new System.Drawing.Point(12, 60); this.X_OutDoor_Down.Location = new System.Drawing.Point(204, 121);
this.label17.Name = "label17"; this.X_OutDoor_Down.Name = "X_OutDoor_Down";
this.label17.Size = new System.Drawing.Size(46, 17); this.X_OutDoor_Down.Size = new System.Drawing.Size(164, 35);
this.label17.TabIndex = 274; this.X_OutDoor_Down.TabIndex = 262;
this.label17.Text = "设备IP:"; this.X_OutDoor_Down.Text = "出口防护门下降/打开 ↓";
this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.X_OutDoor_Down.UseVisualStyleBackColor = false;
this.X_OutDoor_Down.Click += new System.EventHandler(this.btnOutDoor_Down_Click);
// //
// txtDoName // X_OutDoor_Up
// //
this.txtDoName.Enabled = false; this.X_OutDoor_Up.BackColor = System.Drawing.Color.White;
this.txtDoName.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.X_OutDoor_Up.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.txtDoName.Location = new System.Drawing.Point(66, 57); this.X_OutDoor_Up.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtDoName.MaxLength = 10; this.X_OutDoor_Up.Location = new System.Drawing.Point(204, 82);
this.txtDoName.Name = "txtDoName"; this.X_OutDoor_Up.Name = "X_OutDoor_Up";
this.txtDoName.Size = new System.Drawing.Size(116, 23); this.X_OutDoor_Up.Size = new System.Drawing.Size(164, 35);
this.txtDoName.TabIndex = 275; this.X_OutDoor_Up.TabIndex = 261;
this.txtDoName.Text = "0"; this.X_OutDoor_Up.Text = "出口防护门上升/关闭 ↑";
this.X_OutDoor_Up.UseVisualStyleBackColor = false;
this.X_OutDoor_Up.Click += new System.EventHandler(this.btnOutDoor_Up_Click);
// //
// txtDOIndex // X_InDoor_Down
// //
this.txtDOIndex.Enabled = false; this.X_InDoor_Down.BackColor = System.Drawing.Color.White;
this.txtDOIndex.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.X_InDoor_Down.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.txtDOIndex.Location = new System.Drawing.Point(233, 57); this.X_InDoor_Down.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtDOIndex.MaxLength = 10; this.X_InDoor_Down.Location = new System.Drawing.Point(23, 121);
this.txtDOIndex.Name = "txtDOIndex"; this.X_InDoor_Down.Name = "X_InDoor_Down";
this.txtDOIndex.Size = new System.Drawing.Size(47, 23); this.X_InDoor_Down.Size = new System.Drawing.Size(164, 35);
this.txtDOIndex.TabIndex = 276; this.X_InDoor_Down.TabIndex = 260;
this.txtDOIndex.Text = "0"; this.X_InDoor_Down.Text = "入口防护门下降/打开 ↓";
this.X_InDoor_Down.UseVisualStyleBackColor = false;
this.X_InDoor_Down.Click += new System.EventHandler(this.btnInDoor_Down_Click);
// //
// groupBox5 // btnCloseAll
// //
this.groupBox5.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) this.btnCloseAll.BackColor = System.Drawing.Color.White;
| System.Windows.Forms.AnchorStyles.Right))); this.btnCloseAll.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.groupBox5.Controls.Add(this.X_Lock_On); this.btnCloseAll.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox5.Controls.Add(this.X_StopCylinder_Down); this.btnCloseAll.Location = new System.Drawing.Point(23, 199);
this.groupBox5.Controls.Add(this.X_StopCylinder_Up); this.btnCloseAll.Name = "btnCloseAll";
this.groupBox5.Controls.Add(this.X_OutDoor_Down); this.btnCloseAll.Size = new System.Drawing.Size(164, 51);
this.groupBox5.Controls.Add(this.X_OutDoor_Up); this.btnCloseAll.TabIndex = 259;
this.groupBox5.Controls.Add(this.X_InDoor_Down); this.btnCloseAll.Text = "关闭所有DO";
this.groupBox5.Controls.Add(this.btnCloseAll); this.btnCloseAll.UseVisualStyleBackColor = false;
this.groupBox5.Controls.Add(this.X_MLine_Run); this.btnCloseAll.Click += new System.EventHandler(this.btnCloseAll_Click);
this.groupBox5.Controls.Add(this.X_InLine_Run);
this.groupBox5.Controls.Add(this.X_InDoor_Up);
this.groupBox5.Location = new System.Drawing.Point(497, 6);
this.groupBox5.Name = "groupBox5";
this.groupBox5.Size = new System.Drawing.Size(812, 371);
this.groupBox5.TabIndex = 255;
this.groupBox5.TabStop = false;
this.groupBox5.Text = "IO操作测试";
// //
// X_InDoor_Up // X_MLine_Run
// //
this.X_InDoor_Up.BackColor = System.Drawing.Color.White; this.X_MLine_Run.BackColor = System.Drawing.Color.White;
this.X_InDoor_Up.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.X_MLine_Run.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.X_InDoor_Up.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.X_MLine_Run.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.X_InDoor_Up.Location = new System.Drawing.Point(23, 82); this.X_MLine_Run.Location = new System.Drawing.Point(204, 27);
this.X_InDoor_Up.Name = "X_InDoor_Up"; this.X_MLine_Run.Name = "X_MLine_Run";
this.X_InDoor_Up.Size = new System.Drawing.Size(164, 35); this.X_MLine_Run.Size = new System.Drawing.Size(164, 35);
this.X_InDoor_Up.TabIndex = 246; this.X_MLine_Run.TabIndex = 258;
this.X_InDoor_Up.Text = "入口防护门上升/关闭 ↑"; this.X_MLine_Run.Text = "Y96_中间皮带线正转";
this.X_InDoor_Up.UseVisualStyleBackColor = false; this.X_MLine_Run.UseVisualStyleBackColor = false;
this.X_InDoor_Up.Click += new System.EventHandler(this.btnInDoorUp_Click); this.X_MLine_Run.Click += new System.EventHandler(this.X_Lock_On_Click);
// //
// X_InLine_Run // X_InLine_Run
// //
...@@ -388,165 +401,159 @@ ...@@ -388,165 +401,159 @@
this.X_InLine_Run.UseVisualStyleBackColor = false; this.X_InLine_Run.UseVisualStyleBackColor = false;
this.X_InLine_Run.Click += new System.EventHandler(this.X_Lock_On_Click); this.X_InLine_Run.Click += new System.EventHandler(this.X_Lock_On_Click);
// //
// X_MLine_Run // X_InDoor_Up
//
this.X_MLine_Run.BackColor = System.Drawing.Color.White;
this.X_MLine_Run.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.X_MLine_Run.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.X_MLine_Run.Location = new System.Drawing.Point(204, 27);
this.X_MLine_Run.Name = "X_MLine_Run";
this.X_MLine_Run.Size = new System.Drawing.Size(164, 35);
this.X_MLine_Run.TabIndex = 258;
this.X_MLine_Run.Text = "Y96_中间皮带线正转";
this.X_MLine_Run.UseVisualStyleBackColor = false;
this.X_MLine_Run.Click += new System.EventHandler(this.X_Lock_On_Click);
// //
// btnCloseAll this.X_InDoor_Up.BackColor = System.Drawing.Color.White;
this.X_InDoor_Up.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.X_InDoor_Up.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.X_InDoor_Up.Location = new System.Drawing.Point(23, 82);
this.X_InDoor_Up.Name = "X_InDoor_Up";
this.X_InDoor_Up.Size = new System.Drawing.Size(164, 35);
this.X_InDoor_Up.TabIndex = 246;
this.X_InDoor_Up.Text = "入口防护门上升/关闭 ↑";
this.X_InDoor_Up.UseVisualStyleBackColor = false;
this.X_InDoor_Up.Click += new System.EventHandler(this.btnInDoorUp_Click);
// //
this.btnCloseAll.BackColor = System.Drawing.Color.White; // groupBox1
this.btnCloseAll.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCloseAll.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCloseAll.Location = new System.Drawing.Point(23, 199);
this.btnCloseAll.Name = "btnCloseAll";
this.btnCloseAll.Size = new System.Drawing.Size(164, 51);
this.btnCloseAll.TabIndex = 259;
this.btnCloseAll.Text = "关闭所有DO";
this.btnCloseAll.UseVisualStyleBackColor = false;
this.btnCloseAll.Click += new System.EventHandler(this.btnCloseAll_Click);
// //
// X_InDoor_Down this.groupBox1.Controls.Add(this.txtDOIndex);
this.groupBox1.Controls.Add(this.txtDoName);
this.groupBox1.Controls.Add(this.label17);
this.groupBox1.Controls.Add(this.label14);
this.groupBox1.Controls.Add(this.btnOpenDo);
this.groupBox1.Controls.Add(this.btnWriteSingleDO);
this.groupBox1.Controls.Add(this.txtWriteTime);
this.groupBox1.Controls.Add(this.label5);
this.groupBox1.Controls.Add(this.txtSlaveId);
this.groupBox1.Controls.Add(this.cmbWriteIO);
this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox1.Location = new System.Drawing.Point(497, 383);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(812, 97);
this.groupBox1.TabIndex = 105;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "DO写入";
// //
this.X_InDoor_Down.BackColor = System.Drawing.Color.White; // txtDOIndex
this.X_InDoor_Down.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.X_InDoor_Down.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.X_InDoor_Down.Location = new System.Drawing.Point(23, 121);
this.X_InDoor_Down.Name = "X_InDoor_Down";
this.X_InDoor_Down.Size = new System.Drawing.Size(164, 35);
this.X_InDoor_Down.TabIndex = 260;
this.X_InDoor_Down.Text = "入口防护门下降/打开 ↓";
this.X_InDoor_Down.UseVisualStyleBackColor = false;
this.X_InDoor_Down.Click += new System.EventHandler(this.btnInDoor_Down_Click);
// //
// X_OutDoor_Up this.txtDOIndex.Enabled = false;
this.txtDOIndex.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtDOIndex.Location = new System.Drawing.Point(233, 57);
this.txtDOIndex.MaxLength = 10;
this.txtDOIndex.Name = "txtDOIndex";
this.txtDOIndex.Size = new System.Drawing.Size(47, 23);
this.txtDOIndex.TabIndex = 276;
this.txtDOIndex.Text = "0";
// //
this.X_OutDoor_Up.BackColor = System.Drawing.Color.White; // txtDoName
this.X_OutDoor_Up.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.X_OutDoor_Up.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.X_OutDoor_Up.Location = new System.Drawing.Point(204, 82);
this.X_OutDoor_Up.Name = "X_OutDoor_Up";
this.X_OutDoor_Up.Size = new System.Drawing.Size(164, 35);
this.X_OutDoor_Up.TabIndex = 261;
this.X_OutDoor_Up.Text = "出口防护门上升/关闭 ↑";
this.X_OutDoor_Up.UseVisualStyleBackColor = false;
this.X_OutDoor_Up.Click += new System.EventHandler(this.btnOutDoor_Up_Click);
// //
// X_OutDoor_Down this.txtDoName.Enabled = false;
this.txtDoName.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtDoName.Location = new System.Drawing.Point(66, 57);
this.txtDoName.MaxLength = 10;
this.txtDoName.Name = "txtDoName";
this.txtDoName.Size = new System.Drawing.Size(116, 23);
this.txtDoName.TabIndex = 275;
this.txtDoName.Text = "0";
// //
this.X_OutDoor_Down.BackColor = System.Drawing.Color.White; // label17
this.X_OutDoor_Down.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.X_OutDoor_Down.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.X_OutDoor_Down.Location = new System.Drawing.Point(204, 121);
this.X_OutDoor_Down.Name = "X_OutDoor_Down";
this.X_OutDoor_Down.Size = new System.Drawing.Size(164, 35);
this.X_OutDoor_Down.TabIndex = 262;
this.X_OutDoor_Down.Text = "出口防护门下降/打开 ↓";
this.X_OutDoor_Down.UseVisualStyleBackColor = false;
this.X_OutDoor_Down.Click += new System.EventHandler(this.btnOutDoor_Down_Click);
// //
// X_StopCylinder_Up this.label17.AutoSize = true;
this.label17.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label17.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label17.Location = new System.Drawing.Point(12, 60);
this.label17.Name = "label17";
this.label17.Size = new System.Drawing.Size(46, 17);
this.label17.TabIndex = 274;
this.label17.Text = "设备IP:";
this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
// //
this.X_StopCylinder_Up.BackColor = System.Drawing.Color.White; // label14
this.X_StopCylinder_Up.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.X_StopCylinder_Up.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.X_StopCylinder_Up.Location = new System.Drawing.Point(386, 82);
this.X_StopCylinder_Up.Name = "X_StopCylinder_Up";
this.X_StopCylinder_Up.Size = new System.Drawing.Size(164, 35);
this.X_StopCylinder_Up.TabIndex = 263;
this.X_StopCylinder_Up.Text = "阻挡气缸上升/放行 ↑";
this.X_StopCylinder_Up.UseVisualStyleBackColor = false;
this.X_StopCylinder_Up.Click += new System.EventHandler(this.btnStopCylinder_Up_Click);
// //
// X_StopCylinder_Down this.label14.AutoSize = true;
this.label14.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label14.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label14.Location = new System.Drawing.Point(190, 60);
this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(35, 17);
this.label14.TabIndex = 273;
this.label14.Text = "地址:";
this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
// //
this.X_StopCylinder_Down.BackColor = System.Drawing.Color.White; // btnOpenDo
this.X_StopCylinder_Down.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.X_StopCylinder_Down.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.X_StopCylinder_Down.Location = new System.Drawing.Point(386, 121);
this.X_StopCylinder_Down.Name = "X_StopCylinder_Down";
this.X_StopCylinder_Down.Size = new System.Drawing.Size(164, 35);
this.X_StopCylinder_Down.TabIndex = 264;
this.X_StopCylinder_Down.Text = "阻挡气缸下降/挡停 ↓";
this.X_StopCylinder_Down.UseVisualStyleBackColor = false;
this.X_StopCylinder_Down.Click += new System.EventHandler(this.btnStopCylinder_Down_Click);
// //
// X_Lock_On this.btnOpenDo.BackColor = System.Drawing.Color.White;
this.btnOpenDo.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOpenDo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOpenDo.Location = new System.Drawing.Point(288, 51);
this.btnOpenDo.Name = "btnOpenDo";
this.btnOpenDo.Size = new System.Drawing.Size(140, 34);
this.btnOpenDo.TabIndex = 272;
this.btnOpenDo.Text = "打开";
this.btnOpenDo.UseVisualStyleBackColor = false;
this.btnOpenDo.Click += new System.EventHandler(this.btnOpenDo_Click);
// //
this.X_Lock_On.BackColor = System.Drawing.Color.White; // btnWriteSingleDO
this.X_Lock_On.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.X_Lock_On.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.X_Lock_On.Location = new System.Drawing.Point(386, 27);
this.X_Lock_On.Name = "X_Lock_On";
this.X_Lock_On.Size = new System.Drawing.Size(164, 35);
this.X_Lock_On.TabIndex = 265;
this.X_Lock_On.Text = "Y97_X光机互锁信号ON";
this.X_Lock_On.UseVisualStyleBackColor = false;
this.X_Lock_On.Click += new System.EventHandler(this.X_Lock_On_Click);
// //
// groupBox4 this.btnWriteSingleDO.BackColor = System.Drawing.Color.White;
this.btnWriteSingleDO.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnWriteSingleDO.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnWriteSingleDO.Location = new System.Drawing.Point(436, 51);
this.btnWriteSingleDO.Name = "btnWriteSingleDO";
this.btnWriteSingleDO.Size = new System.Drawing.Size(140, 34);
this.btnWriteSingleDO.TabIndex = 269;
this.btnWriteSingleDO.Text = "关闭";
this.btnWriteSingleDO.UseVisualStyleBackColor = false;
this.btnWriteSingleDO.Click += new System.EventHandler(this.btnWriteSingleDO_Click);
// //
this.groupBox4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) // txtWriteTime
| System.Windows.Forms.AnchorStyles.Left)));
this.groupBox4.Controls.Add(this.tableLayoutPanel2);
this.groupBox4.Location = new System.Drawing.Point(251, 6);
this.groupBox4.Name = "groupBox4";
this.groupBox4.Size = new System.Drawing.Size(240, 474);
this.groupBox4.TabIndex = 104;
this.groupBox4.TabStop = false;
this.groupBox4.Text = "DO列表";
// //
// tableLayoutPanel2 this.txtWriteTime.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtWriteTime.Location = new System.Drawing.Point(461, 22);
this.txtWriteTime.MaxLength = 10;
this.txtWriteTime.Name = "txtWriteTime";
this.txtWriteTime.Size = new System.Drawing.Size(66, 23);
this.txtWriteTime.TabIndex = 271;
this.txtWriteTime.Text = "0";
// //
this.tableLayoutPanel2.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) // label5
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.tableLayoutPanel2.AutoScroll = true;
this.tableLayoutPanel2.ColumnCount = 1;
this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel2.Location = new System.Drawing.Point(5, 14);
this.tableLayoutPanel2.Name = "tableLayoutPanel2";
this.tableLayoutPanel2.RowCount = 2;
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel2.Size = new System.Drawing.Size(229, 454);
this.tableLayoutPanel2.TabIndex = 103;
// //
// groupBox3 this.label5.AutoSize = true;
this.label5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label5.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label5.Location = new System.Drawing.Point(394, 25);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(60, 17);
this.label5.TabIndex = 270;
this.label5.Text = "定时(ms):";
this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
// //
this.groupBox3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) // txtSlaveId
| System.Windows.Forms.AnchorStyles.Left)));
this.groupBox3.Controls.Add(this.tableLayoutPanel1);
this.groupBox3.Location = new System.Drawing.Point(6, 6);
this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(240, 474);
this.groupBox3.TabIndex = 103;
this.groupBox3.TabStop = false;
this.groupBox3.Text = "DI列表";
// //
// tableLayoutPanel1 this.txtSlaveId.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtSlaveId.Location = new System.Drawing.Point(375, 24);
this.txtSlaveId.MaxLength = 10;
this.txtSlaveId.Name = "txtSlaveId";
this.txtSlaveId.Size = new System.Drawing.Size(12, 23);
this.txtSlaveId.TabIndex = 255;
this.txtSlaveId.Text = "0";
this.txtSlaveId.Visible = false;
// //
this.tableLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) // cmbWriteIO
| System.Windows.Forms.AnchorStyles.Left) //
| System.Windows.Forms.AnchorStyles.Right))); this.cmbWriteIO.DisplayMember = "ProName";
this.tableLayoutPanel1.AutoScroll = true; this.cmbWriteIO.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawVariable;
this.tableLayoutPanel1.ColumnCount = 1; this.cmbWriteIO.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.cmbWriteIO.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.tableLayoutPanel1.Location = new System.Drawing.Point(6, 14); this.cmbWriteIO.FormattingEnabled = true;
this.tableLayoutPanel1.Name = "tableLayoutPanel1"; this.cmbWriteIO.ItemHeight = 22;
this.tableLayoutPanel1.RowCount = 2; this.cmbWriteIO.Location = new System.Drawing.Point(10, 19);
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F)); this.cmbWriteIO.Name = "cmbWriteIO";
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F)); this.cmbWriteIO.Size = new System.Drawing.Size(358, 28);
this.tableLayoutPanel1.Size = new System.Drawing.Size(229, 454); this.cmbWriteIO.TabIndex = 234;
this.tableLayoutPanel1.TabIndex = 102; this.cmbWriteIO.ValueMember = "ProName";
this.cmbWriteIO.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.cmbWriteIO_DrawItem);
this.cmbWriteIO.SelectedIndexChanged += new System.EventHandler(this.cmbWriteIO_SelectedIndexChanged);
// //
// tabPage3 // tabPage3
// //
...@@ -576,115 +583,137 @@ ...@@ -576,115 +583,137 @@
this.groupBox6.TabStop = false; this.groupBox6.TabStop = false;
this.groupBox6.Text = "消息"; this.groupBox6.Text = "消息";
// //
// lblThisSta // groupBox8
//
this.lblThisSta.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.lblThisSta.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblThisSta.ForeColor = System.Drawing.Color.Red;
this.lblThisSta.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblThisSta.Location = new System.Drawing.Point(327, 41);
this.lblThisSta.Name = "lblThisSta";
this.lblThisSta.Size = new System.Drawing.Size(975, 149);
this.lblThisSta.TabIndex = 246;
this.lblThisSta.Text = "等待启动";
this.lblThisSta.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// lblMoveInfo
//
this.lblMoveInfo.AutoSize = true;
this.lblMoveInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblMoveInfo.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblMoveInfo.Location = new System.Drawing.Point(24, 21);
this.lblMoveInfo.Name = "lblMoveInfo";
this.lblMoveInfo.Size = new System.Drawing.Size(68, 17);
this.lblMoveInfo.TabIndex = 280;
this.lblMoveInfo.Text = "运动信息:";
// //
// lblInoutInfo this.groupBox8.Controls.Add(this.btnSelImage);
this.groupBox8.Controls.Add(this.txtImage);
this.groupBox8.Controls.Add(this.numWSize);
this.groupBox8.Controls.Add(this.label3);
this.groupBox8.Controls.Add(this.numTh);
this.groupBox8.Controls.Add(this.btnSaveTh);
this.groupBox8.Controls.Add(this.txtResult);
this.groupBox8.Controls.Add(this.label2);
this.groupBox8.Controls.Add(this.label1);
this.groupBox8.Controls.Add(this.btnWorkTest);
this.groupBox8.Location = new System.Drawing.Point(600, 306);
this.groupBox8.Name = "groupBox8";
this.groupBox8.Size = new System.Drawing.Size(660, 168);
this.groupBox8.TabIndex = 288;
this.groupBox8.TabStop = false;
this.groupBox8.Text = "点料测试";
// //
this.lblInoutInfo.ForeColor = System.Drawing.Color.Green; // btnSelImage
this.lblInoutInfo.Location = new System.Drawing.Point(331, 16); //
this.lblInoutInfo.Name = "lblInoutInfo"; this.btnSelImage.BackColor = System.Drawing.Color.White;
this.lblInoutInfo.Size = new System.Drawing.Size(962, 22); this.btnSelImage.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.lblInoutInfo.TabIndex = 281; this.btnSelImage.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblInoutInfo.Text = "当前点料信息:"; this.btnSelImage.Location = new System.Drawing.Point(6, 22);
this.btnSelImage.Name = "btnSelImage";
this.btnSelImage.Size = new System.Drawing.Size(76, 25);
this.btnSelImage.TabIndex = 296;
this.btnSelImage.Text = "选择图片";
this.btnSelImage.UseVisualStyleBackColor = false;
this.btnSelImage.Click += new System.EventHandler(this.btnSelImage_Click);
//
// txtImage
//
this.txtImage.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtImage.Location = new System.Drawing.Point(88, 23);
this.txtImage.Name = "txtImage";
this.txtImage.Size = new System.Drawing.Size(566, 23);
this.txtImage.TabIndex = 295;
//
// numWSize
//
this.numWSize.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.numWSize.Location = new System.Drawing.Point(88, 115);
this.numWSize.Maximum = new decimal(new int[] {
1000,
0,
0,
0});
this.numWSize.Name = "numWSize";
this.numWSize.Size = new System.Drawing.Size(82, 26);
this.numWSize.TabIndex = 293;
this.numWSize.Value = new decimal(new int[] {
3,
0,
0,
0});
// //
// groupBox2 // label3
// //
this.groupBox2.Controls.Add(this.lblXrOpen); this.label3.AutoSize = true;
this.groupBox2.Controls.Add(this.lblLastS); this.label3.Location = new System.Drawing.Point(14, 120);
this.groupBox2.Controls.Add(this.lblData); this.label3.Name = "label3";
this.groupBox2.Controls.Add(this.lblCom); this.label3.Size = new System.Drawing.Size(68, 17);
this.groupBox2.Controls.Add(this.lblDiany); this.label3.TabIndex = 292;
this.groupBox2.Controls.Add(this.lblDianl); this.label3.Text = "窗口大小:";
this.groupBox2.Location = new System.Drawing.Point(12, 306);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(276, 168);
this.groupBox2.TabIndex = 282;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "X光参数/状态信息";
this.groupBox2.Enter += new System.EventHandler(this.groupBox2_Enter);
// //
// lblDianl // numTh
// //
this.lblDianl.AutoSize = true; this.numTh.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblDianl.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.numTh.Location = new System.Drawing.Point(88, 67);
this.lblDianl.Location = new System.Drawing.Point(12, 48); this.numTh.Name = "numTh";
this.lblDianl.Name = "lblDianl"; this.numTh.Size = new System.Drawing.Size(82, 26);
this.lblDianl.Size = new System.Drawing.Size(68, 17); this.numTh.TabIndex = 291;
this.lblDianl.TabIndex = 0; this.numTh.Value = new decimal(new int[] {
this.lblDianl.Text = "电流信息:"; 30,
0,
0,
0});
// //
// lblDiany // btnSaveTh
// //
this.lblDiany.AutoSize = true; this.btnSaveTh.BackColor = System.Drawing.Color.White;
this.lblDiany.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnSaveTh.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.lblDiany.Location = new System.Drawing.Point(12, 72); this.btnSaveTh.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblDiany.Name = "lblDiany"; this.btnSaveTh.Location = new System.Drawing.Point(201, 63);
this.lblDiany.Size = new System.Drawing.Size(68, 17); this.btnSaveTh.Name = "btnSaveTh";
this.lblDiany.TabIndex = 1; this.btnSaveTh.Size = new System.Drawing.Size(130, 35);
this.lblDiany.Text = "电压信息:"; this.btnSaveTh.TabIndex = 290;
this.btnSaveTh.Text = "保存为默认阈值";
this.btnSaveTh.UseVisualStyleBackColor = false;
this.btnSaveTh.Click += new System.EventHandler(this.btnSaveTh_Click);
// //
// lblCom // txtResult
// //
this.lblCom.AutoSize = true; this.txtResult.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblCom.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtResult.Location = new System.Drawing.Point(399, 115);
this.lblCom.Location = new System.Drawing.Point(12, 24); this.txtResult.Name = "txtResult";
this.lblCom.Name = "lblCom"; this.txtResult.Size = new System.Drawing.Size(82, 26);
this.lblCom.Size = new System.Drawing.Size(56, 17); this.txtResult.TabIndex = 289;
this.lblCom.TabIndex = 2;
this.lblCom.Text = "端口号:";
// //
// lblData // label2
// //
this.lblData.AutoSize = true; this.label2.AutoSize = true;
this.lblData.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label2.Location = new System.Drawing.Point(349, 120);
this.lblData.Location = new System.Drawing.Point(12, 96); this.label2.Name = "label2";
this.lblData.Name = "lblData"; this.label2.Size = new System.Drawing.Size(44, 17);
this.lblData.Size = new System.Drawing.Size(92, 17); this.label2.TabIndex = 288;
this.lblData.TabIndex = 3; this.label2.Text = "结果:";
this.lblData.Text = "最后使用时间:";
// //
// lblLastS // label1
// //
this.lblLastS.AutoSize = true; this.label1.AutoSize = true;
this.lblLastS.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label1.Location = new System.Drawing.Point(38, 72);
this.lblLastS.Location = new System.Drawing.Point(12, 120); this.label1.Name = "label1";
this.lblLastS.Name = "lblLastS"; this.label1.Size = new System.Drawing.Size(44, 17);
this.lblLastS.Size = new System.Drawing.Size(68, 17); this.label1.TabIndex = 286;
this.lblLastS.TabIndex = 4; this.label1.Text = "阈值:";
this.lblLastS.Text = "点料机状态";
// //
// lblXrOpen // btnWorkTest
// //
this.lblXrOpen.AutoSize = true; this.btnWorkTest.BackColor = System.Drawing.Color.White;
this.lblXrOpen.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnWorkTest.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.lblXrOpen.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.btnWorkTest.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblXrOpen.Location = new System.Drawing.Point(12, 144); this.btnWorkTest.Location = new System.Drawing.Point(201, 111);
this.lblXrOpen.Name = "lblXrOpen"; this.btnWorkTest.Name = "btnWorkTest";
this.lblXrOpen.Size = new System.Drawing.Size(0, 17); this.btnWorkTest.Size = new System.Drawing.Size(130, 35);
this.lblXrOpen.TabIndex = 5; this.btnWorkTest.TabIndex = 285;
this.btnWorkTest.Text = "点料测试";
this.btnWorkTest.UseVisualStyleBackColor = false;
this.btnWorkTest.Click += new System.EventHandler(this.btnWorkTest_Click);
// //
// groupBox7 // groupBox7
// //
...@@ -693,23 +722,23 @@ ...@@ -693,23 +722,23 @@
this.groupBox7.Controls.Add(this.btnXStop); this.groupBox7.Controls.Add(this.btnXStop);
this.groupBox7.Location = new System.Drawing.Point(294, 306); this.groupBox7.Location = new System.Drawing.Point(294, 306);
this.groupBox7.Name = "groupBox7"; this.groupBox7.Name = "groupBox7";
this.groupBox7.Size = new System.Drawing.Size(337, 168); this.groupBox7.Size = new System.Drawing.Size(300, 168);
this.groupBox7.TabIndex = 283; this.groupBox7.TabIndex = 283;
this.groupBox7.TabStop = false; this.groupBox7.TabStop = false;
this.groupBox7.Text = "X光测试"; this.groupBox7.Text = "X光测试";
// //
// btnXStop // btnImage
// //
this.btnXStop.BackColor = System.Drawing.Color.White; this.btnImage.BackColor = System.Drawing.Color.White;
this.btnXStop.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnImage.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnXStop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnImage.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnXStop.Location = new System.Drawing.Point(22, 96); this.btnImage.Location = new System.Drawing.Point(158, 63);
this.btnXStop.Name = "btnXStop"; this.btnImage.Name = "btnImage";
this.btnXStop.Size = new System.Drawing.Size(130, 35); this.btnImage.Size = new System.Drawing.Size(130, 35);
this.btnXStop.TabIndex = 285; this.btnImage.TabIndex = 287;
this.btnXStop.Text = "关闭X光"; this.btnImage.Text = "拍照片";
this.btnXStop.UseVisualStyleBackColor = false; this.btnImage.UseVisualStyleBackColor = false;
this.btnXStop.Click += new System.EventHandler(this.btnXStop_Click); this.btnImage.Click += new System.EventHandler(this.btnImage_Click);
// //
// btnXStart // btnXStart
// //
...@@ -724,98 +753,128 @@ ...@@ -724,98 +753,128 @@
this.btnXStart.UseVisualStyleBackColor = false; this.btnXStart.UseVisualStyleBackColor = false;
this.btnXStart.Click += new System.EventHandler(this.btnXStart_Click); this.btnXStart.Click += new System.EventHandler(this.btnXStart_Click);
// //
// btnImage // btnXStop
// //
this.btnImage.BackColor = System.Drawing.Color.White; this.btnXStop.BackColor = System.Drawing.Color.White;
this.btnImage.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnXStop.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnImage.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnXStop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnImage.Location = new System.Drawing.Point(158, 63); this.btnXStop.Location = new System.Drawing.Point(22, 96);
this.btnImage.Name = "btnImage"; this.btnXStop.Name = "btnXStop";
this.btnImage.Size = new System.Drawing.Size(130, 35); this.btnXStop.Size = new System.Drawing.Size(130, 35);
this.btnImage.TabIndex = 287; this.btnXStop.TabIndex = 285;
this.btnImage.Text = "拍照片"; this.btnXStop.Text = "关闭X光";
this.btnImage.UseVisualStyleBackColor = false; this.btnXStop.UseVisualStyleBackColor = false;
this.btnImage.Click += new System.EventHandler(this.btnImage_Click); this.btnXStop.Click += new System.EventHandler(this.btnXStop_Click);
// //
// groupBox8 // groupBox2
// //
this.groupBox8.Controls.Add(this.numTh); this.groupBox2.Controls.Add(this.lblXrOpen);
this.groupBox8.Controls.Add(this.btnSaveTh); this.groupBox2.Controls.Add(this.lblLastS);
this.groupBox8.Controls.Add(this.txtResult); this.groupBox2.Controls.Add(this.lblData);
this.groupBox8.Controls.Add(this.label2); this.groupBox2.Controls.Add(this.lblCom);
this.groupBox8.Controls.Add(this.label1); this.groupBox2.Controls.Add(this.lblDiany);
this.groupBox8.Controls.Add(this.btnWorkTest); this.groupBox2.Controls.Add(this.lblDianl);
this.groupBox8.Location = new System.Drawing.Point(637, 306); this.groupBox2.Location = new System.Drawing.Point(12, 306);
this.groupBox8.Name = "groupBox8"; this.groupBox2.Name = "groupBox2";
this.groupBox8.Size = new System.Drawing.Size(337, 168); this.groupBox2.Size = new System.Drawing.Size(276, 168);
this.groupBox8.TabIndex = 288; this.groupBox2.TabIndex = 282;
this.groupBox8.TabStop = false; this.groupBox2.TabStop = false;
this.groupBox8.Text = "点料测试"; this.groupBox2.Text = "X光参数/状态信息";
this.groupBox2.Enter += new System.EventHandler(this.groupBox2_Enter);
// //
// btnWorkTest // lblXrOpen
// //
this.btnWorkTest.BackColor = System.Drawing.Color.White; this.lblXrOpen.AutoSize = true;
this.btnWorkTest.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.lblXrOpen.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnWorkTest.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblXrOpen.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
this.btnWorkTest.Location = new System.Drawing.Point(154, 87); this.lblXrOpen.Location = new System.Drawing.Point(12, 144);
this.btnWorkTest.Name = "btnWorkTest"; this.lblXrOpen.Name = "lblXrOpen";
this.btnWorkTest.Size = new System.Drawing.Size(130, 35); this.lblXrOpen.Size = new System.Drawing.Size(0, 17);
this.btnWorkTest.TabIndex = 285; this.lblXrOpen.TabIndex = 5;
this.btnWorkTest.Text = "点料测试";
this.btnWorkTest.UseVisualStyleBackColor = false;
this.btnWorkTest.Click += new System.EventHandler(this.btnWorkTest_Click);
// //
// label1 // lblLastS
// //
this.label1.AutoSize = true; this.lblLastS.AutoSize = true;
this.label1.Location = new System.Drawing.Point(14, 42); this.lblLastS.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label1.Name = "label1"; this.lblLastS.Location = new System.Drawing.Point(12, 120);
this.label1.Size = new System.Drawing.Size(44, 17); this.lblLastS.Name = "lblLastS";
this.label1.TabIndex = 286; this.lblLastS.Size = new System.Drawing.Size(68, 17);
this.label1.Text = "阈值:"; this.lblLastS.TabIndex = 4;
this.lblLastS.Text = "点料机状态";
// //
// label2 // lblData
// //
this.label2.AutoSize = true; this.lblData.AutoSize = true;
this.label2.Location = new System.Drawing.Point(14, 96); this.lblData.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label2.Name = "label2"; this.lblData.Location = new System.Drawing.Point(12, 96);
this.label2.Size = new System.Drawing.Size(44, 17); this.lblData.Name = "lblData";
this.label2.TabIndex = 288; this.lblData.Size = new System.Drawing.Size(92, 17);
this.label2.Text = "结果:"; this.lblData.TabIndex = 3;
this.lblData.Text = "最后使用时间:";
// //
// txtResult // lblCom
// //
this.txtResult.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblCom.AutoSize = true;
this.txtResult.Location = new System.Drawing.Point(60, 91); this.lblCom.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtResult.Name = "txtResult"; this.lblCom.Location = new System.Drawing.Point(12, 24);
this.txtResult.Size = new System.Drawing.Size(82, 26); this.lblCom.Name = "lblCom";
this.txtResult.TabIndex = 289; this.lblCom.Size = new System.Drawing.Size(56, 17);
this.lblCom.TabIndex = 2;
this.lblCom.Text = "端口号:";
// //
// btnSaveTh // lblDiany
// //
this.btnSaveTh.BackColor = System.Drawing.Color.White; this.lblDiany.AutoSize = true;
this.btnSaveTh.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.lblDiany.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSaveTh.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblDiany.Location = new System.Drawing.Point(12, 72);
this.btnSaveTh.Location = new System.Drawing.Point(154, 33); this.lblDiany.Name = "lblDiany";
this.btnSaveTh.Name = "btnSaveTh"; this.lblDiany.Size = new System.Drawing.Size(68, 17);
this.btnSaveTh.Size = new System.Drawing.Size(130, 35); this.lblDiany.TabIndex = 1;
this.btnSaveTh.TabIndex = 290; this.lblDiany.Text = "电压信息:";
this.btnSaveTh.Text = "保存为默认阈值";
this.btnSaveTh.UseVisualStyleBackColor = false;
this.btnSaveTh.Click += new System.EventHandler(this.btnSaveTh_Click);
// //
// numTh // lblDianl
// //
this.numTh.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblDianl.AutoSize = true;
this.numTh.Location = new System.Drawing.Point(60, 37); this.lblDianl.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.numTh.Name = "numTh"; this.lblDianl.Location = new System.Drawing.Point(12, 48);
this.numTh.Size = new System.Drawing.Size(82, 26); this.lblDianl.Name = "lblDianl";
this.numTh.TabIndex = 291; this.lblDianl.Size = new System.Drawing.Size(68, 17);
this.numTh.Value = new decimal(new int[] { this.lblDianl.TabIndex = 0;
30, this.lblDianl.Text = "电流信息:";
0, //
0, // lblInoutInfo
0}); //
this.lblInoutInfo.ForeColor = System.Drawing.Color.Green;
this.lblInoutInfo.Location = new System.Drawing.Point(331, 16);
this.lblInoutInfo.Name = "lblInoutInfo";
this.lblInoutInfo.Size = new System.Drawing.Size(962, 22);
this.lblInoutInfo.TabIndex = 281;
this.lblInoutInfo.Text = "当前点料信息:";
//
// lblMoveInfo
//
this.lblMoveInfo.AutoSize = true;
this.lblMoveInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblMoveInfo.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblMoveInfo.Location = new System.Drawing.Point(24, 21);
this.lblMoveInfo.Name = "lblMoveInfo";
this.lblMoveInfo.Size = new System.Drawing.Size(68, 17);
this.lblMoveInfo.TabIndex = 280;
this.lblMoveInfo.Text = "运动信息:";
//
// lblThisSta
//
this.lblThisSta.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.lblThisSta.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblThisSta.ForeColor = System.Drawing.Color.Red;
this.lblThisSta.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblThisSta.Location = new System.Drawing.Point(327, 41);
this.lblThisSta.Name = "lblThisSta";
this.lblThisSta.Size = new System.Drawing.Size(975, 149);
this.lblThisSta.TabIndex = 246;
this.lblThisSta.Text = "等待启动";
this.lblThisSta.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
// //
// tabControl1 // tabControl1
// //
...@@ -830,6 +889,11 @@ ...@@ -830,6 +889,11 @@
this.tabControl1.Size = new System.Drawing.Size(1323, 516); this.tabControl1.Size = new System.Drawing.Size(1323, 516);
this.tabControl1.TabIndex = 257; this.tabControl1.TabIndex = 257;
// //
// fileSystemWatcher1
//
this.fileSystemWatcher1.EnableRaisingEvents = true;
this.fileSystemWatcher1.SynchronizingObject = this;
//
// FrmXRay // FrmXRay
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
...@@ -848,21 +912,23 @@ ...@@ -848,21 +912,23 @@
this.panel1.ResumeLayout(false); this.panel1.ResumeLayout(false);
this.panel1.PerformLayout(); this.panel1.PerformLayout();
this.tabPage1.ResumeLayout(false); this.tabPage1.ResumeLayout(false);
this.groupBox3.ResumeLayout(false);
this.groupBox4.ResumeLayout(false);
this.groupBox5.ResumeLayout(false);
this.groupBox1.ResumeLayout(false); this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout(); this.groupBox1.PerformLayout();
this.groupBox5.ResumeLayout(false);
this.groupBox4.ResumeLayout(false);
this.groupBox3.ResumeLayout(false);
this.tabPage3.ResumeLayout(false); this.tabPage3.ResumeLayout(false);
this.groupBox6.ResumeLayout(false); this.groupBox6.ResumeLayout(false);
this.groupBox6.PerformLayout(); this.groupBox6.PerformLayout();
this.groupBox2.ResumeLayout(false);
this.groupBox2.PerformLayout();
this.groupBox7.ResumeLayout(false);
this.groupBox8.ResumeLayout(false); this.groupBox8.ResumeLayout(false);
this.groupBox8.PerformLayout(); this.groupBox8.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.numWSize)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.numTh)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.numTh)).EndInit();
this.groupBox7.ResumeLayout(false);
this.groupBox2.ResumeLayout(false);
this.groupBox2.PerformLayout();
this.tabControl1.ResumeLayout(false); this.tabControl1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.fileSystemWatcher1)).EndInit();
this.ResumeLayout(false); this.ResumeLayout(false);
} }
...@@ -928,6 +994,11 @@ ...@@ -928,6 +994,11 @@
private System.Windows.Forms.Label lblMoveInfo; private System.Windows.Forms.Label lblMoveInfo;
private System.Windows.Forms.Label lblThisSta; private System.Windows.Forms.Label lblThisSta;
private System.Windows.Forms.TabControl tabControl1; private System.Windows.Forms.TabControl tabControl1;
private System.Windows.Forms.NumericUpDown numWSize;
private System.Windows.Forms.Label label3;
private System.Windows.Forms.TextBox txtImage;
private System.Windows.Forms.Button btnSelImage;
private System.IO.FileSystemWatcher fileSystemWatcher1;
} }
} }
...@@ -424,15 +424,22 @@ namespace OnlineStore.AutoCountClient ...@@ -424,15 +424,22 @@ namespace OnlineStore.AutoCountClient
btnWorkTest.Enabled = false; btnWorkTest.Enabled = false;
try try
{ {
string filePath = txtImage.Text.Trim();
if (!File.Exists(filePath))
{
MessageBox.Show("请先选择正确的图片");
return;
}
txtResult.Text = "点料中..."; txtResult.Text = "点料中...";
int th = (int)numTh.Value; int th = (int)numTh.Value;
int wsize = (int)numWSize.Value;
int outCount = 0; int outCount = 0;
// equipBean.countImage.GetCount(th, out outCount); // equipBean.countImage.GetCount(th, out outCount);
int n = equipBean.carerayImage.GetCount(2, 3, out outCount, out Asa.API.EyemImage tpDstImg); int n = equipBean.carerayImage.GetLocalCount(filePath, th, wsize, out outCount, out Asa.API.EyemImage tpDstImg);
txtResult.Text = outCount.ToString(); txtResult.Text = outCount.ToString();
LogUtil.info(equipBean.Name + "用户点击 点料测试 结果[" + n + "]:" + outCount); LogUtil.info(equipBean.Name + "用户点击 点料测试【" + filePath + "】【" + th + "】【" + wsize + "】 结果[" + n + "]:" + outCount);
} }
catch (Exception ex) catch (Exception ex)
{ {
...@@ -450,6 +457,21 @@ namespace OnlineStore.AutoCountClient ...@@ -450,6 +457,21 @@ namespace OnlineStore.AutoCountClient
MessageBox.Show("保存阈值[" + th + "]成功!"); MessageBox.Show("保存阈值[" + th + "]成功!");
LogUtil.info("用户点击:保存阈值[" + th + "]成功!"); LogUtil.info("用户点击:保存阈值[" + th + "]成功!");
} }
private void btnSelImage_Click(object sender, EventArgs e)
{
System.Windows.Forms.OpenFileDialog openDialog = new System.Windows.Forms.OpenFileDialog();
openDialog.Title = "请选择要点料的图片";
openDialog.Filter = "(*.png)|*.png";
openDialog.DefaultExt = "png";
openDialog.InitialDirectory = Application.StartupPath + @"\XRAY\tif";
System.Windows.Forms.DialogResult result = openDialog.ShowDialog();
if (result == System.Windows.Forms.DialogResult.Cancel)
{
return;
}
txtImage.Text = openDialog.FileName;
}
} }
} }
......
...@@ -120,6 +120,9 @@ ...@@ -120,6 +120,9 @@
<metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 11</value> <value>17, 11</value>
</metadata> </metadata>
<metadata name="fileSystemWatcher1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>107, 11</value>
</metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>25</value> <value>25</value>
</metadata> </metadata>
......
类型,阈值,面积 类型,阈值,窗口大小
6J.42001.181,45,16 6D5S1,2,3
TY.7H230.00M,45, 6C1D1,2,5
6H.12160.0RH,45,11 6D551,2,7
8C.R2003.H81,45,35 7H5S1,2,3
8C.2R006.A8H,45,
8C.1R004.D8H,45,
...@@ -25,7 +25,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -25,7 +25,7 @@ namespace OnlineStore.DeviceLibrary
public XRay xRay = null; public XRay xRay = null;
// public CountImage countImage = null; // public CountImage countImage = null;
public CarerayImage carerayImage = null; public CarerayImage carerayImage = null;
public bool xRayCanStart = false; public bool xRayCanStart = false;
...@@ -39,7 +39,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -39,7 +39,7 @@ namespace OnlineStore.DeviceLibrary
// private string path2_png = Application.StartupPath + @"\XRAY\png"; // private string path2_png = Application.StartupPath + @"\XRAY\png";
private string path2_out = Application.StartupPath + @"\XRAY\out\"; private string path2_out = Application.StartupPath + @"\XRAY\out\";
private string path3_area = Application.StartupPath + @"\XRAY\area.txt"; private string path3_area = Application.StartupPath + @"\XRAY\area.txt";
private string configPath = Application.StartupPath + ConfigAppSettings.GetValue(Setting_Init.CounParamConfig);
private Dictionary<string, CountParam> countParamMap = new Dictionary<string, CountParam>(); private Dictionary<string, CountParam> countParamMap = new Dictionary<string, CountParam>();
public X_RAY_Equip(string cid, XRay_Config config) public X_RAY_Equip(string cid, XRay_Config config)
...@@ -65,7 +65,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -65,7 +65,7 @@ namespace OnlineStore.DeviceLibrary
private void XRayLoad() private void XRayLoad()
{ {
try try
{ {
//countImage = new CountImage("Count"); //countImage = new CountImage("Count");
//countImage.SetDirectory(path1_tif, path2_out, path3_area); //countImage.SetDirectory(path1_tif, path2_out, path3_area);
//LogUtil.info(Name + "CountImage path1【" + path1_tif + "】"); //LogUtil.info(Name + "CountImage path1【" + path1_tif + "】");
...@@ -74,7 +74,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -74,7 +74,7 @@ namespace OnlineStore.DeviceLibrary
//LogUtil.info(Name + "CountImage SetDirectory: 完成"); //LogUtil.info(Name + "CountImage SetDirectory: 完成");
carerayImage = new CarerayImage("XRay"); carerayImage = new CarerayImage("XRay");
bool cResult = carerayImage.Open(); bool cResult = carerayImage.Open();
LogUtil.info(Name + "carerayImage.Open()=" + cResult); LogUtil.info(Name + "carerayImage.Open()=" + cResult);
xRay = new XRay("XRay"); xRay = new XRay("XRay");
...@@ -103,40 +103,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -103,40 +103,7 @@ namespace OnlineStore.DeviceLibrary
{ {
System.IO.Directory.CreateDirectory(path2_out); System.IO.Directory.CreateDirectory(path2_out);
} }
countParamMap = new Dictionary<string, CountParam>(); LoadParamMap();
if (File.Exists(configPath))
{
try
{
string[] lines = File.ReadAllLines(configPath);
int index = -1;
foreach (string line in lines)
{
index++;
if (index.Equals(0))
{
continue;
}
CountParam param = CountParam.NewParam(line);
if (param != null)
{
if (!countParamMap.ContainsKey(param.PN))
{
countParamMap.Add(param.PN, param);
}
}
}
}
catch (Exception ex)
{
LogUtil.error("解析点料配置文件【" + configPath + "】出错:" + ex.ToString());
}
LogUtil.info("加载点料参数共【"+countParamMap.Count+"】条有效数据" + configPath);
}
else
{
LogUtil.error("未找到点料参数文件:" + configPath);
}
} }
catch (Exception ex) catch (Exception ex)
{ {
...@@ -329,7 +296,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -329,7 +296,7 @@ namespace OnlineStore.DeviceLibrary
} }
} }
LockOnProcess(); LockOnProcess();
} }
#endregion #endregion
...@@ -397,6 +364,46 @@ namespace OnlineStore.DeviceLibrary ...@@ -397,6 +364,46 @@ namespace OnlineStore.DeviceLibrary
return msg; return msg;
} }
private void LoadParamMap()
{
countParamMap = new Dictionary<string, CountParam>();
string configPath = Application.StartupPath + ConfigAppSettings.GetValue(Setting_Init.CounParamConfig);
if (File.Exists(configPath))
{
try
{
string[] lines = File.ReadAllLines(configPath);
int index = -1;
foreach (string line in lines)
{
index++;
if (index.Equals(0))
{
continue;
}
CountParam param = CountParam.NewParam(line);
if (param != null)
{
if (!countParamMap.ContainsKey(param.PN))
{
countParamMap.Add(param.PN, param);
}
}
}
}
catch (Exception ex)
{
LogUtil.error("解析点料配置文件【" + configPath + "】出错:" + ex.ToString());
}
LogUtil.info("加载点料参数共【" + countParamMap.Count + "】条有效数据" + configPath);
}
else
{
LogUtil.error("未找到点料参数文件:" + configPath);
}
}
} }
public class CountParam public class CountParam
...@@ -407,8 +414,15 @@ namespace OnlineStore.DeviceLibrary ...@@ -407,8 +414,15 @@ namespace OnlineStore.DeviceLibrary
this.Threshold = th; this.Threshold = th;
this.AreaValue = area; this.AreaValue = area;
} }
public CountParam(string pn, int th, int size)
{
this.PN = pn;
this.Threshold = th;
this.WindowSize = size;
}
public string PN = ""; public string PN = "";
public int Threshold = 0; public int Threshold = 0;
public int WindowSize = 0;
public string AreaValue = ""; public string AreaValue = "";
internal static CountParam NewParam(string line) internal static CountParam NewParam(string line)
...@@ -420,9 +434,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -420,9 +434,9 @@ namespace OnlineStore.DeviceLibrary
{ {
string pn = array[0].Trim(); string pn = array[0].Trim();
int th = Convert.ToInt32(array[1].Trim()); int th = Convert.ToInt32(array[1].Trim());
string a = array[2].Trim(); int size = Convert.ToInt32(array[2].Trim());
return new CountParam(pn, th, a); return new CountParam(pn, th, size);
} }
} }
catch (Exception ex) catch (Exception ex)
...@@ -431,6 +445,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -431,6 +445,8 @@ namespace OnlineStore.DeviceLibrary
return null; return null;
} }
} }
} }
...@@ -326,7 +326,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -326,7 +326,7 @@ namespace OnlineStore.DeviceLibrary
private string lastFileName = ""; private string lastFileName = "";
private int lastTh = 0; private int lastTh = 0;
private int lastWSize = 0;
private void XW15_GetResult() private void XW15_GetResult()
{ {
if (IOValue(IO_Type.X_Lock_On).Equals(IO_VALUE.LOW)) if (IOValue(IO_Type.X_Lock_On).Equals(IO_VALUE.LOW))
...@@ -346,8 +346,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -346,8 +346,9 @@ namespace OnlineStore.DeviceLibrary
//WorkLog("点料:获取点料结果[" + lastTh + "]=【" + count + "】,result=" + result + ",保存并上传结果"); //WorkLog("点料:获取点料结果[" + lastTh + "]=【" + count + "】,result=" + result + ",保存并上传结果");
WorkLog("点料:开始调用 countImage.GetCount "); WorkLog("点料:开始调用 countImage.GetCount ");
int n = carerayImage.GetCount(2, 3, out count, out Asa.API.EyemImage tpDstImg); string fileP = path1_tif + @"\" + lastFileName;
WorkLog("点料:获取点料结果 【" + count + "】,n =" + n + ",保存并上传结果"); int n = carerayImage.GetLocalCount(fileP, lastTh, lastWSize, out count, out Asa.API.EyemImage tpDstImg);
WorkLog("点料:获取点料结果 【" + count + "】【"+lastTh+"】【"+lastWSize+"】,n =" + n + ",保存并上传结果");
if (Work_ReelInfo.WareCount <= 0) if (Work_ReelInfo.WareCount <= 0)
{ {
...@@ -475,20 +476,28 @@ namespace OnlineStore.DeviceLibrary ...@@ -475,20 +476,28 @@ namespace OnlineStore.DeviceLibrary
private void UpdateArea(string codeStr) private void UpdateArea(string codeStr)
{ {
lastTh = ThresholdValue; lastTh = ThresholdValue;
lastWSize = 3;
string[] codeArray = codeStr.Split(';'); string[] codeArray = codeStr.Split(';');
string fileValue = ""; string fileValue = "";
string area = ""; string area = "";
if (codeArray.Length.Equals(2)) if (codeArray.Length.Equals(2))
{ {
string pn = codeArray[0]; string pn = codeArray[0];
string type = pn.Substring(0, 2) + pn.Substring(pn.Length - 3, 3);
if (countParamMap.ContainsKey(pn)) if (countParamMap.ContainsKey(pn))
{ {
area = countParamMap[pn].AreaValue; area = countParamMap[pn].AreaValue;
fileValue = lastFileName + " " + area; fileValue = lastFileName + " " + area;
lastTh = countParamMap[pn].Threshold; lastTh = countParamMap[pn].Threshold;
}else if (countParamMap.ContainsKey(type))
{
lastTh = countParamMap[type].Threshold;
lastWSize = countParamMap[type].WindowSize;
} }
} }
LogUtil.info("【" + codeStr + "】使用参数【" + lastTh + "】【" + area + "】,文件名【" + lastFileName + "】内容【" + fileValue + "】"); LogUtil.info("【" + codeStr + "】使用参数【" + lastTh + "】【" + lastWSize + "】 ");
//LogUtil.info("【" + codeStr + "】使用参数【" + lastTh + "】【" + area + "】,文件名【" + lastFileName + "】内容【" + fileValue + "】");
File.WriteAllText(path3_area, fileValue); File.WriteAllText(path3_area, fileValue);
} }
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!