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 | 167 +++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 153 insertions(+), 14 deletions(-)
diff --git a/src/Bro.M071.Process/UI/M071_MainForm.Designer.cs b/src/Bro.M071.Process/UI/M071_MainForm.Designer.cs
index 996ca15..a702101 100644
--- a/src/Bro.M071.Process/UI/M071_MainForm.Designer.cs
+++ b/src/Bro.M071.Process/UI/M071_MainForm.Designer.cs
@@ -33,14 +33,25 @@
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();
+ this.lblMachineState = new System.Windows.Forms.Label();
+ this.plImage = new System.Windows.Forms.Panel();
this.tscEditLocation = new System.Windows.Forms.ToolStripContainer();
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
this.btnConfirmEdit = new System.Windows.Forms.Button();
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.timer1 = new System.Windows.Forms.Timer(this.components);
this.contextMenuStrip1.SuspendLayout();
+ this.plImage.SuspendLayout();
this.tscEditLocation.ContentPanel.SuspendLayout();
this.tscEditLocation.SuspendLayout();
this.tableLayoutPanel1.SuspendLayout();
@@ -55,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
//
@@ -83,17 +95,111 @@
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
+ //
+ this.lblCT.AutoSize = true;
+ this.lblCT.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.World, ((byte)(134)));
+ this.lblCT.Location = new System.Drawing.Point(464, 19);
+ this.lblCT.Name = "lblCT";
+ this.lblCT.Size = new System.Drawing.Size(35, 14);
+ this.lblCT.TabIndex = 4;
+ this.lblCT.Text = "XXXX";
+ //
+ // txtBarcode
+ //
+ this.txtBarcode.Font = new System.Drawing.Font("Tahoma", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.World, ((byte)(134)));
+ this.txtBarcode.Location = new System.Drawing.Point(138, 13);
+ this.txtBarcode.Name = "txtBarcode";
+ this.txtBarcode.Size = new System.Drawing.Size(261, 24);
+ this.txtBarcode.TabIndex = 3;
+ this.txtBarcode.Text = "BARCODE";
+ this.txtBarcode.TextChanged += new System.EventHandler(this.txtBarcode_TextChanged);
+ //
+ // lblProductionState
+ //
+ this.lblProductionState.AutoSize = true;
+ this.lblProductionState.BackColor = System.Drawing.Color.Lime;
+ this.lblProductionState.Font = new System.Drawing.Font("Tahoma", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.World, ((byte)(134)));
+ this.lblProductionState.ForeColor = System.Drawing.Color.DarkGreen;
+ this.lblProductionState.Location = new System.Drawing.Point(405, 13);
+ this.lblProductionState.Name = "lblProductionState";
+ this.lblProductionState.Size = new System.Drawing.Size(39, 24);
+ this.lblProductionState.TabIndex = 2;
+ this.lblProductionState.Text = "OK";
+ //
+ // lblMachineState
+ //
+ this.lblMachineState.AutoSize = true;
+ this.lblMachineState.BackColor = System.Drawing.Color.Lime;
+ this.lblMachineState.Font = new System.Drawing.Font("Tahoma", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.World, ((byte)(134)));
+ this.lblMachineState.ForeColor = System.Drawing.Color.DarkGreen;
+ this.lblMachineState.Location = new System.Drawing.Point(22, 12);
+ this.lblMachineState.Name = "lblMachineState";
+ this.lblMachineState.Size = new System.Drawing.Size(79, 24);
+ this.lblMachineState.TabIndex = 2;
+ this.lblMachineState.Text = "READY";
+ //
+ // plImage
+ //
+ this.plImage.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.plImage.ContextMenuStrip = this.contextMenuStrip1;
+ this.plImage.Controls.Add(this.tscEditLocation);
+ this.plImage.Location = new System.Drawing.Point(1, 47);
+ this.plImage.Name = "plImage";
+ this.plImage.Size = new System.Drawing.Size(796, 304);
+ this.plImage.TabIndex = 1;
+ //
// tscEditLocation
//
//
// tscEditLocation.ContentPanel
//
this.tscEditLocation.ContentPanel.Controls.Add(this.tableLayoutPanel1);
- this.tscEditLocation.ContentPanel.Size = new System.Drawing.Size(209, 326);
+ this.tscEditLocation.ContentPanel.Size = new System.Drawing.Size(209, 279);
this.tscEditLocation.Dock = System.Windows.Forms.DockStyle.Right;
- this.tscEditLocation.Location = new System.Drawing.Point(591, 0);
+ this.tscEditLocation.Location = new System.Drawing.Point(587, 0);
this.tscEditLocation.Name = "tscEditLocation";
- this.tscEditLocation.Size = new System.Drawing.Size(209, 351);
+ this.tscEditLocation.Size = new System.Drawing.Size(209, 304);
this.tscEditLocation.TabIndex = 0;
this.tscEditLocation.Text = "toolStripContainer1";
this.tscEditLocation.Visible = false;
@@ -112,7 +218,7 @@
this.tableLayoutPanel1.RowCount = 2;
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
- this.tableLayoutPanel1.Size = new System.Drawing.Size(209, 326);
+ this.tableLayoutPanel1.Size = new System.Drawing.Size(209, 279);
this.tableLayoutPanel1.TabIndex = 0;
//
// btnConfirmEdit
@@ -121,7 +227,7 @@
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.btnConfirmEdit.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btnConfirmEdit.Location = new System.Drawing.Point(3, 293);
+ this.btnConfirmEdit.Location = new System.Drawing.Point(3, 246);
this.btnConfirmEdit.Name = "btnConfirmEdit";
this.btnConfirmEdit.Size = new System.Drawing.Size(98, 30);
this.btnConfirmEdit.TabIndex = 0;
@@ -135,7 +241,7 @@
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.btnCancelEdit.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btnCancelEdit.Location = new System.Drawing.Point(107, 293);
+ this.btnCancelEdit.Location = new System.Drawing.Point(107, 246);
this.btnCancelEdit.Name = "btnCancelEdit";
this.btnCancelEdit.Size = new System.Drawing.Size(99, 30);
this.btnCancelEdit.TabIndex = 0;
@@ -158,12 +264,15 @@
// splitContainer1.Panel2
//
this.splitContainer1.Panel2.Controls.Add(this.propGridKeyIndicator);
- this.splitContainer1.Size = new System.Drawing.Size(203, 284);
- this.splitContainer1.SplitterDistance = 164;
+ this.splitContainer1.Size = new System.Drawing.Size(203, 237);
+ this.splitContainer1.SplitterDistance = 136;
this.splitContainer1.TabIndex = 1;
//
// 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;
@@ -171,31 +280,50 @@
this.lvMeasures.Location = new System.Drawing.Point(0, 0);
this.lvMeasures.MultiSelect = false;
this.lvMeasures.Name = "lvMeasures";
- this.lvMeasures.Size = new System.Drawing.Size(203, 164);
+ this.lvMeasures.Size = new System.Drawing.Size(203, 136);
this.lvMeasures.TabIndex = 0;
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
//
this.propGridKeyIndicator.Dock = System.Windows.Forms.DockStyle.Fill;
this.propGridKeyIndicator.Location = new System.Drawing.Point(0, 0);
this.propGridKeyIndicator.Name = "propGridKeyIndicator";
- this.propGridKeyIndicator.Size = new System.Drawing.Size(203, 116);
+ this.propGridKeyIndicator.Size = new System.Drawing.Size(203, 97);
this.propGridKeyIndicator.TabIndex = 0;
this.propGridKeyIndicator.ToolbarVisible = false;
+ //
+ // timer1
+ //
+ this.timer1.Interval = 3000;
+ this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
//
// M071_MainForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(800, 351);
- this.ContextMenuStrip = this.contextMenuStrip1;
- this.Controls.Add(this.tscEditLocation);
+ this.Controls.Add(this.btnReset);
+ this.Controls.Add(this.btnStartMeasure);
+ this.Controls.Add(this.lblCT);
+ this.Controls.Add(this.txtBarcode);
+ this.Controls.Add(this.lblProductionState);
+ this.Controls.Add(this.lblMachineState);
+ this.Controls.Add(this.plImage);
+ this.KeyPreview = true;
this.Name = "M071_MainForm";
this.Text = "M071_MainForm";
+ this.KeyUp += new System.Windows.Forms.KeyEventHandler(this.M071_MainForm_KeyUp);
this.contextMenuStrip1.ResumeLayout(false);
+ this.plImage.ResumeLayout(false);
this.tscEditLocation.ContentPanel.ResumeLayout(false);
this.tscEditLocation.ResumeLayout(false);
this.tscEditLocation.PerformLayout();
@@ -205,6 +333,7 @@
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
this.splitContainer1.ResumeLayout(false);
this.ResumeLayout(false);
+ this.PerformLayout();
}
@@ -221,5 +350,15 @@
private System.Windows.Forms.ListView lvMeasures;
private System.Windows.Forms.ToolStripMenuItem tsmiShowToolBar;
private System.Windows.Forms.ToolStripMenuItem tsmiShowStatusBar;
+ private System.Windows.Forms.Panel plImage;
+ private System.Windows.Forms.Label lblMachineState;
+ private System.Windows.Forms.Label lblProductionState;
+ private System.Windows.Forms.TextBox txtBarcode;
+ 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