From 6428fad15dbe79e30a48ffc9aabe31e03a45426c Mon Sep 17 00:00:00 2001
From: patrick <patrick.xu@broconcentric.com>
Date: 星期四, 05 十二月 2019 12:50:13 +0800
Subject: [PATCH] 1. 添加部分log信息 2. 修改部分机器人动作流程 3. 开放OperationConfig的InputData参数
---
src/A032.Config/ConfigFrm.designer.cs | 81 ++++++++++++++++++++++++++++++++--------
1 files changed, 65 insertions(+), 16 deletions(-)
diff --git a/src/A032.Config/ConfigFrm.designer.cs b/src/A032.Config/ConfigFrm.designer.cs
index 7af435f..5b9fb52 100644
--- a/src/A032.Config/ConfigFrm.designer.cs
+++ b/src/A032.Config/ConfigFrm.designer.cs
@@ -51,6 +51,7 @@
this.cboTestMethod = new System.Windows.Forms.ComboBox();
this.tbLog = new System.Windows.Forms.TabPage();
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
+ this.chkHardwareTrigger = new System.Windows.Forms.CheckBox();
this.lblFrameRate = new System.Windows.Forms.Label();
this.chkContinueMode = new System.Windows.Forms.CheckBox();
this.btnSnap = new System.Windows.Forms.Button();
@@ -74,7 +75,10 @@
this.cboProductionCode = new System.Windows.Forms.ComboBox();
this.statusStrip1 = new System.Windows.Forms.StatusStrip();
this.tsslLoginStatus = new System.Windows.Forms.ToolStripStatusLabel();
- this.chkHardwareTrigger = new System.Windows.Forms.CheckBox();
+ this.cboDevices = new System.Windows.Forms.ComboBox();
+ this.label5 = new System.Windows.Forms.Label();
+ this.label6 = new System.Windows.Forms.Label();
+ this.cboCalibDevices = new System.Windows.Forms.ComboBox();
this.tabControl1.SuspendLayout();
this.tbConfig.SuspendLayout();
this.tbCalibration.SuspendLayout();
@@ -162,6 +166,8 @@
//
// tbCalibration
//
+ this.tbCalibration.Controls.Add(this.label6);
+ this.tbCalibration.Controls.Add(this.cboCalibDevices);
this.tbCalibration.Controls.Add(this.label1);
this.tbCalibration.Controls.Add(this.propCalibrationConfig);
this.tbCalibration.Controls.Add(this.btnStartCalibration);
@@ -177,7 +183,7 @@
// label1
//
this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(22, 20);
+ this.label1.Location = new System.Drawing.Point(262, 12);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(53, 12);
this.label1.TabIndex = 7;
@@ -211,7 +217,7 @@
| System.Windows.Forms.AnchorStyles.Right)));
this.cboCalibrationMethod.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cboCalibrationMethod.FormattingEnabled = true;
- this.cboCalibrationMethod.Location = new System.Drawing.Point(12, 41);
+ this.cboCalibrationMethod.Location = new System.Drawing.Point(252, 33);
this.cboCalibrationMethod.Name = "cboCalibrationMethod";
this.cboCalibrationMethod.Size = new System.Drawing.Size(185, 20);
this.cboCalibrationMethod.TabIndex = 4;
@@ -220,8 +226,10 @@
//
this.tbTest.Controls.Add(this.label3);
this.tbTest.Controls.Add(this.txtInvokeTimes);
+ this.tbTest.Controls.Add(this.label5);
this.tbTest.Controls.Add(this.label2);
this.tbTest.Controls.Add(this.propGridTestMethod);
+ this.tbTest.Controls.Add(this.cboDevices);
this.tbTest.Controls.Add(this.btnTrigger);
this.tbTest.Controls.Add(this.cboTestMethod);
this.tbTest.Location = new System.Drawing.Point(4, 22);
@@ -254,7 +262,7 @@
// label2
//
this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(21, 13);
+ this.label2.Location = new System.Drawing.Point(262, 12);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(53, 12);
this.label2.TabIndex = 11;
@@ -288,7 +296,7 @@
| System.Windows.Forms.AnchorStyles.Right)));
this.cboTestMethod.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cboTestMethod.FormattingEnabled = true;
- this.cboTestMethod.Location = new System.Drawing.Point(11, 34);
+ this.cboTestMethod.Location = new System.Drawing.Point(252, 33);
this.cboTestMethod.Name = "cboTestMethod";
this.cboTestMethod.Size = new System.Drawing.Size(185, 20);
this.cboTestMethod.TabIndex = 9;
@@ -330,6 +338,17 @@
this.splitContainer1.Size = new System.Drawing.Size(570, 639);
this.splitContainer1.SplitterDistance = 497;
this.splitContainer1.TabIndex = 2;
+ //
+ // chkHardwareTrigger
+ //
+ this.chkHardwareTrigger.AutoSize = true;
+ this.chkHardwareTrigger.Location = new System.Drawing.Point(220, 12);
+ this.chkHardwareTrigger.Name = "chkHardwareTrigger";
+ this.chkHardwareTrigger.Size = new System.Drawing.Size(60, 16);
+ this.chkHardwareTrigger.TabIndex = 6;
+ this.chkHardwareTrigger.Text = "纭Е鍙�";
+ this.chkHardwareTrigger.UseVisualStyleBackColor = true;
+ this.chkHardwareTrigger.CheckedChanged += new System.EventHandler(this.chkHardwareTrigger_CheckedChanged);
//
// lblFrameRate
//
@@ -451,7 +470,7 @@
this.button1.TabIndex = 1;
this.button1.Text = "Test";
this.button1.UseVisualStyleBackColor = true;
- this.button1.Visible = false;
+ this.button1.Click += new System.EventHandler(this.button1_Click);
//
// btnLoadWarningFromFile
//
@@ -595,16 +614,42 @@
this.tsslLoginStatus.Text = "鏈櫥褰�";
this.tsslLoginStatus.Click += new System.EventHandler(this.tsslLoginStatus_Click);
//
- // chkHardwareTrigger
+ // cboDevices
//
- this.chkHardwareTrigger.AutoSize = true;
- this.chkHardwareTrigger.Location = new System.Drawing.Point(220, 12);
- this.chkHardwareTrigger.Name = "chkHardwareTrigger";
- this.chkHardwareTrigger.Size = new System.Drawing.Size(60, 16);
- this.chkHardwareTrigger.TabIndex = 6;
- this.chkHardwareTrigger.Text = "纭Е鍙�";
- this.chkHardwareTrigger.UseVisualStyleBackColor = true;
- this.chkHardwareTrigger.CheckedChanged += new System.EventHandler(this.chkHardwareTrigger_CheckedChanged);
+ this.cboDevices.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.cboDevices.FormattingEnabled = true;
+ this.cboDevices.Location = new System.Drawing.Point(21, 33);
+ this.cboDevices.Name = "cboDevices";
+ this.cboDevices.Size = new System.Drawing.Size(185, 20);
+ this.cboDevices.TabIndex = 9;
+ this.cboDevices.SelectedIndexChanged += new System.EventHandler(this.cboTestMethod_SelectedIndexChanged);
+ //
+ // label5
+ //
+ this.label5.AutoSize = true;
+ this.label5.Location = new System.Drawing.Point(31, 12);
+ this.label5.Name = "label5";
+ this.label5.Size = new System.Drawing.Size(53, 12);
+ this.label5.TabIndex = 11;
+ this.label5.Text = "閫夋嫨璁惧";
+ //
+ // label6
+ //
+ this.label6.AutoSize = true;
+ this.label6.Location = new System.Drawing.Point(31, 12);
+ this.label6.Name = "label6";
+ this.label6.Size = new System.Drawing.Size(53, 12);
+ this.label6.TabIndex = 13;
+ this.label6.Text = "閫夋嫨璁惧";
+ //
+ // cboCalibDevices
+ //
+ this.cboCalibDevices.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.cboCalibDevices.FormattingEnabled = true;
+ this.cboCalibDevices.Location = new System.Drawing.Point(21, 33);
+ this.cboCalibDevices.Name = "cboCalibDevices";
+ this.cboCalibDevices.Size = new System.Drawing.Size(185, 20);
+ this.cboCalibDevices.TabIndex = 12;
//
// ConfigFrm
//
@@ -614,8 +659,8 @@
this.Controls.Add(this.statusStrip1);
this.Controls.Add(this.cboProductionCode);
this.Controls.Add(this.tabControl1);
- this.Controls.Add(this.plAdvanced);
this.Controls.Add(this.plBasic);
+ this.Controls.Add(this.plAdvanced);
this.Name = "ConfigFrm";
this.Text = "閰嶇疆鐣岄潰";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.ConfigFrm_FormClosing);
@@ -688,6 +733,10 @@
private System.Windows.Forms.StatusStrip statusStrip1;
private System.Windows.Forms.ToolStripStatusLabel tsslLoginStatus;
private System.Windows.Forms.CheckBox chkHardwareTrigger;
+ private System.Windows.Forms.Label label5;
+ private System.Windows.Forms.ComboBox cboDevices;
+ private System.Windows.Forms.Label label6;
+ private System.Windows.Forms.ComboBox cboCalibDevices;
}
}
--
Gitblit v1.8.0