From 1f2fa3f54d4a7b5a2f601c4c947a06476342e3bd Mon Sep 17 00:00:00 2001
From: patrick.xu <patrick.xu@broconcentric.com>
Date: 星期五, 22 一月 2021 09:23:06 +0800
Subject: [PATCH] 1. gocator驱动将system.stop移到system.ReceiveData之后 2. 修改测量完成后状态切换逻辑，避免安全光线等干扰 3. 添加设备异常输出日志记录 4. 产品结果输出时做硬盘文件记录
---
src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardRunBase.Designer.cs | 48 ++++++++++++++++--------------------------------
1 files changed, 16 insertions(+), 32 deletions(-)
diff --git a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardRunBase.Designer.cs b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardRunBase.Designer.cs
index dc93c7a..fbf3a5e 100644
--- a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardRunBase.Designer.cs
+++ b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardRunBase.Designer.cs
@@ -29,60 +29,37 @@
private void InitializeComponent()
{
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
- this.groupBox2 = new System.Windows.Forms.GroupBox();
- this.listBoxMsg = new System.Windows.Forms.ListBox();
this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
this.buttonMotionCardOperation = new System.Windows.Forms.Button();
+ this.flowLayoutPanel2 = new System.Windows.Forms.FlowLayoutPanel();
this.tableLayoutPanel1.SuspendLayout();
- this.groupBox2.SuspendLayout();
this.SuspendLayout();
//
// tableLayoutPanel1
//
this.tableLayoutPanel1.ColumnCount = 1;
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
- this.tableLayoutPanel1.Controls.Add(this.groupBox2, 0, 3);
+ this.tableLayoutPanel1.Controls.Add(this.flowLayoutPanel2, 0, 2);
this.tableLayoutPanel1.Controls.Add(this.flowLayoutPanel1, 0, 1);
this.tableLayoutPanel1.Controls.Add(this.buttonMotionCardOperation, 0, 0);
this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0);
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
- this.tableLayoutPanel1.RowCount = 4;
+ this.tableLayoutPanel1.RowCount = 3;
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
- this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 110F));
+ this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
this.tableLayoutPanel1.Size = new System.Drawing.Size(615, 587);
this.tableLayoutPanel1.TabIndex = 5;
//
- // groupBox2
- //
- this.groupBox2.Controls.Add(this.listBoxMsg);
- this.groupBox2.Dock = System.Windows.Forms.DockStyle.Fill;
- this.groupBox2.Location = new System.Drawing.Point(3, 479);
- this.groupBox2.Name = "groupBox2";
- this.groupBox2.Size = new System.Drawing.Size(609, 105);
- this.groupBox2.TabIndex = 10;
- this.groupBox2.TabStop = false;
- this.groupBox2.Text = "娑堟伅妗�";
- //
- // listBoxMsg
- //
- this.listBoxMsg.Dock = System.Windows.Forms.DockStyle.Fill;
- this.listBoxMsg.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed;
- this.listBoxMsg.FormattingEnabled = true;
- this.listBoxMsg.ItemHeight = 15;
- this.listBoxMsg.Location = new System.Drawing.Point(3, 17);
- this.listBoxMsg.Name = "listBoxMsg";
- this.listBoxMsg.Size = new System.Drawing.Size(603, 85);
- this.listBoxMsg.TabIndex = 1;
- //
// flowLayoutPanel1
//
+ this.flowLayoutPanel1.AutoScroll = true;
this.flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.flowLayoutPanel1.Location = new System.Drawing.Point(3, 33);
this.flowLayoutPanel1.Name = "flowLayoutPanel1";
- this.flowLayoutPanel1.Size = new System.Drawing.Size(609, 217);
+ this.flowLayoutPanel1.Size = new System.Drawing.Size(609, 272);
this.flowLayoutPanel1.TabIndex = 11;
//
// buttonMotionCardOperation
@@ -95,6 +72,15 @@
this.buttonMotionCardOperation.UseVisualStyleBackColor = true;
this.buttonMotionCardOperation.Click += new System.EventHandler(this.buttonMotionCardOperation_Click);
//
+ // flowLayoutPanel2
+ //
+ this.flowLayoutPanel2.AutoScroll = true;
+ this.flowLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.flowLayoutPanel2.Location = new System.Drawing.Point(3, 311);
+ this.flowLayoutPanel2.Name = "flowLayoutPanel2";
+ this.flowLayoutPanel2.Size = new System.Drawing.Size(609, 273);
+ this.flowLayoutPanel2.TabIndex = 13;
+ //
// CtrlMotionCardRunBase
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -103,16 +89,14 @@
this.Name = "CtrlMotionCardRunBase";
this.Size = new System.Drawing.Size(615, 587);
this.tableLayoutPanel1.ResumeLayout(false);
- this.groupBox2.ResumeLayout(false);
this.ResumeLayout(false);
}
#endregion
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
- private System.Windows.Forms.GroupBox groupBox2;
- private System.Windows.Forms.ListBox listBoxMsg;
private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1;
private System.Windows.Forms.Button buttonMotionCardOperation;
+ private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel2;
}
}
--
Gitblit v1.8.0