From eafdcc5ad6a55d3dfdec6c4787c3f3a9f32efc7f Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期二, 29 九月 2020 13:27:50 +0800
Subject: [PATCH] 1. M071B机台配置 2. GTS板卡添加回原点捕获模式和输入信号模式 3. CameraBase使用Dictionary类型做图片缓存 4. M071流程显式Copy，原来是为了避免内存泄漏，但目前来看不是这方面原因 5. Gocator驱动添加GoDataSet之类KObject资源显式回收，怀疑其中也有非托管对象资源，测试确实起到内存回收作用
---
src/Bro.M071.Process/UI/M071_MainForm.Designer.cs | 94 ++++++++++++++++++++++++++++++----------------
1 files changed, 61 insertions(+), 33 deletions(-)
diff --git a/src/Bro.M071.Process/UI/M071_MainForm.Designer.cs b/src/Bro.M071.Process/UI/M071_MainForm.Designer.cs
index 25f0b07..a702101 100644
--- a/src/Bro.M071.Process/UI/M071_MainForm.Designer.cs
+++ b/src/Bro.M071.Process/UI/M071_MainForm.Designer.cs
@@ -33,6 +33,9 @@
this.tsmiShowToolBar = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiShowStatusBar = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiShowEditor = new System.Windows.Forms.ToolStripMenuItem();
+ this.tsmiRefreshLabels = new System.Windows.Forms.ToolStripMenuItem();
+ this.btnReset = new System.Windows.Forms.Button();
+ this.btnStartMeasure = new System.Windows.Forms.Button();
this.lblCT = new System.Windows.Forms.Label();
this.txtBarcode = new System.Windows.Forms.TextBox();
this.lblProductionState = new System.Windows.Forms.Label();
@@ -44,9 +47,9 @@
this.btnCancelEdit = new System.Windows.Forms.Button();
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.lvMeasures = new System.Windows.Forms.ListView();
+ this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.propGridKeyIndicator = new System.Windows.Forms.PropertyGrid();
- this.btnStartMeasure = new System.Windows.Forms.Button();
- this.btnReset = new System.Windows.Forms.Button();
+ this.timer1 = new System.Windows.Forms.Timer(this.components);
this.contextMenuStrip1.SuspendLayout();
this.plImage.SuspendLayout();
this.tscEditLocation.ContentPanel.SuspendLayout();
@@ -63,9 +66,10 @@
this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.tsmiShowToolBar,
this.tsmiShowStatusBar,
- this.tsmiShowEditor});
+ this.tsmiShowEditor,
+ this.tsmiRefreshLabels});
this.contextMenuStrip1.Name = "contextMenuStrip1";
- this.contextMenuStrip1.Size = new System.Drawing.Size(149, 70);
+ this.contextMenuStrip1.Size = new System.Drawing.Size(149, 92);
//
// tsmiShowToolBar
//
@@ -90,6 +94,44 @@
this.tsmiShowEditor.Size = new System.Drawing.Size(148, 22);
this.tsmiShowEditor.Text = "缂栬緫鏄剧ず鐐逛綅";
this.tsmiShowEditor.CheckedChanged += new System.EventHandler(this.tsmiShowEditor_CheckedChanged);
+ //
+ // tsmiRefreshLabels
+ //
+ this.tsmiRefreshLabels.Name = "tsmiRefreshLabels";
+ this.tsmiRefreshLabels.Size = new System.Drawing.Size(148, 22);
+ this.tsmiRefreshLabels.Text = "鍒锋柊鏄剧ず鐐逛綅";
+ this.tsmiRefreshLabels.Click += new System.EventHandler(this.tsmiRefreshLabels_Click);
+ //
+ // btnReset
+ //
+ this.btnReset.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.btnReset.BackColor = System.Drawing.Color.Orange;
+ this.btnReset.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.btnReset.Font = new System.Drawing.Font("瀹嬩綋", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.World, ((byte)(134)));
+ this.btnReset.ForeColor = System.Drawing.Color.DarkGreen;
+ this.btnReset.Location = new System.Drawing.Point(531, 8);
+ this.btnReset.Name = "btnReset";
+ this.btnReset.Size = new System.Drawing.Size(141, 35);
+ this.btnReset.TabIndex = 5;
+ this.btnReset.Text = "澶嶄綅锛堥暱鎸�5s澶у浣嶏級";
+ this.btnReset.UseVisualStyleBackColor = false;
+ this.btnReset.MouseDown += new System.Windows.Forms.MouseEventHandler(this.btnReset_MouseDown);
+ this.btnReset.MouseUp += new System.Windows.Forms.MouseEventHandler(this.btnReset_MouseUp);
+ //
+ // btnStartMeasure
+ //
+ this.btnStartMeasure.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.btnStartMeasure.BackColor = System.Drawing.Color.Lime;
+ this.btnStartMeasure.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.btnStartMeasure.Font = new System.Drawing.Font("瀹嬩綋", 14F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.World, ((byte)(134)));
+ this.btnStartMeasure.ForeColor = System.Drawing.Color.DarkGreen;
+ this.btnStartMeasure.Location = new System.Drawing.Point(678, 8);
+ this.btnStartMeasure.Name = "btnStartMeasure";
+ this.btnStartMeasure.Size = new System.Drawing.Size(110, 35);
+ this.btnStartMeasure.TabIndex = 5;
+ this.btnStartMeasure.Text = "寮�濮嬫祴閲�";
+ this.btnStartMeasure.UseVisualStyleBackColor = false;
+ this.btnStartMeasure.Click += new System.EventHandler(this.btnStartMeasure_Click);
//
// lblCT
//
@@ -228,6 +270,9 @@
//
// lvMeasures
//
+ this.lvMeasures.BackColor = System.Drawing.SystemColors.Control;
+ this.lvMeasures.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
+ this.columnHeader1});
this.lvMeasures.Dock = System.Windows.Forms.DockStyle.Fill;
this.lvMeasures.Font = new System.Drawing.Font("Tahoma", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.World, ((byte)(134)));
this.lvMeasures.FullRowSelect = true;
@@ -240,6 +285,12 @@
this.lvMeasures.UseCompatibleStateImageBehavior = false;
this.lvMeasures.View = System.Windows.Forms.View.List;
this.lvMeasures.SelectedIndexChanged += new System.EventHandler(this.lvMeasures_SelectedIndexChanged);
+ this.lvMeasures.DoubleClick += new System.EventHandler(this.lvMeasures_DoubleClick);
+ //
+ // columnHeader1
+ //
+ this.columnHeader1.Text = "妫�娴嬫爣绛�";
+ this.columnHeader1.Width = 181;
//
// propGridKeyIndicator
//
@@ -250,36 +301,10 @@
this.propGridKeyIndicator.TabIndex = 0;
this.propGridKeyIndicator.ToolbarVisible = false;
//
- // btnStartMeasure
+ // timer1
//
- this.btnStartMeasure.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.btnStartMeasure.BackColor = System.Drawing.Color.Lime;
- this.btnStartMeasure.Cursor = System.Windows.Forms.Cursors.Hand;
- this.btnStartMeasure.Font = new System.Drawing.Font("瀹嬩綋", 14F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.World, ((byte)(134)));
- this.btnStartMeasure.ForeColor = System.Drawing.Color.DarkGreen;
- this.btnStartMeasure.Location = new System.Drawing.Point(678, 8);
- this.btnStartMeasure.Name = "btnStartMeasure";
- this.btnStartMeasure.Size = new System.Drawing.Size(110, 35);
- this.btnStartMeasure.TabIndex = 5;
- this.btnStartMeasure.Text = "寮�濮嬫祴閲�";
- this.btnStartMeasure.UseVisualStyleBackColor = false;
- this.btnStartMeasure.Click += new System.EventHandler(this.btnStartMeasure_Click);
- //
- // btnReset
- //
- this.btnReset.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.btnReset.BackColor = System.Drawing.Color.Orange;
- this.btnReset.Cursor = System.Windows.Forms.Cursors.Hand;
- this.btnReset.Font = new System.Drawing.Font("瀹嬩綋", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.World, ((byte)(134)));
- this.btnReset.ForeColor = System.Drawing.Color.DarkGreen;
- this.btnReset.Location = new System.Drawing.Point(531, 8);
- this.btnReset.Name = "btnReset";
- this.btnReset.Size = new System.Drawing.Size(141, 35);
- this.btnReset.TabIndex = 5;
- this.btnReset.Text = "澶嶄綅锛堥暱鎸�5s澶у浣嶏級";
- this.btnReset.UseVisualStyleBackColor = false;
- this.btnReset.MouseDown += new System.Windows.Forms.MouseEventHandler(this.btnReset_MouseDown);
- this.btnReset.MouseUp += new System.Windows.Forms.MouseEventHandler(this.btnReset_MouseUp);
+ this.timer1.Interval = 3000;
+ this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
//
// M071_MainForm
//
@@ -332,5 +357,8 @@
private System.Windows.Forms.Label lblCT;
private System.Windows.Forms.Button btnStartMeasure;
private System.Windows.Forms.Button btnReset;
+ private System.Windows.Forms.ColumnHeader columnHeader1;
+ private System.Windows.Forms.ToolStripMenuItem tsmiRefreshLabels;
+ private System.Windows.Forms.Timer timer1;
}
}
\ No newline at end of file
--
Gitblit v1.8.0