From ff18fa3c007656bd37cad91fac9a9cb03f4070b8 Mon Sep 17 00:00:00 2001 From: patrick <patrick.xu@broconcentric.com> Date: 星期日, 20 十月 2019 14:13:16 +0800 Subject: [PATCH] 1. 修改SeerAGV驱动通信代码 2. 修改机器人通信部分代码 3. 取消原有流程任务队列模式,使用即时方法调用。 --- src/A032.Config/ConfigFrm.designer.cs | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/A032.Config/ConfigFrm.designer.cs b/src/A032.Config/ConfigFrm.designer.cs index 7af435f..5c1f834 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,6 @@ 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.tabControl1.SuspendLayout(); this.tbConfig.SuspendLayout(); this.tbCalibration.SuspendLayout(); @@ -331,6 +331,17 @@ 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 // this.lblFrameRate.AutoSize = true; @@ -451,7 +462,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,17 +606,6 @@ this.tsslLoginStatus.Text = "鏈櫥褰�"; this.tsslLoginStatus.Click += new System.EventHandler(this.tsslLoginStatus_Click); // - // 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); - // // ConfigFrm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -614,8 +614,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); -- Gitblit v1.8.0