From 441af1b1ba6f0bc5e94e678029918f354838e9a5 Mon Sep 17 00:00:00 2001
From: wells.liu <wells.liu@broconcentric.com>
Date: 星期六, 04 七月 2020 18:05:55 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071
---
src/Bro.M071.Process/UI/M071_MainForm.Designer.cs | 65 ++++++++++++++++++++++++++------
1 files changed, 52 insertions(+), 13 deletions(-)
diff --git a/src/Bro.M071.Process/UI/M071_MainForm.Designer.cs b/src/Bro.M071.Process/UI/M071_MainForm.Designer.cs
index b83b97d..25f0b07 100644
--- a/src/Bro.M071.Process/UI/M071_MainForm.Designer.cs
+++ b/src/Bro.M071.Process/UI/M071_MainForm.Designer.cs
@@ -45,7 +45,10 @@
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.lvMeasures = new System.Windows.Forms.ListView();
this.propGridKeyIndicator = new System.Windows.Forms.PropertyGrid();
+ this.btnStartMeasure = new System.Windows.Forms.Button();
+ this.btnReset = new System.Windows.Forms.Button();
this.contextMenuStrip1.SuspendLayout();
+ this.plImage.SuspendLayout();
this.tscEditLocation.ContentPanel.SuspendLayout();
this.tscEditLocation.SuspendLayout();
this.tableLayoutPanel1.SuspendLayout();
@@ -113,7 +116,7 @@
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.White;
+ 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);
@@ -125,7 +128,7 @@
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.White;
+ 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);
@@ -138,6 +141,7 @@
| 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);
@@ -149,11 +153,11 @@
// 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;
@@ -172,7 +176,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
@@ -181,7 +185,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;
@@ -195,7 +199,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;
@@ -218,8 +222,8 @@
// splitContainer1.Panel2
//
this.splitContainer1.Panel2.Controls.Add(this.propGridKeyIndicator);
- this.splitContainer1.Size = new System.Drawing.Size(203, 284);
- this.splitContainer1.SplitterDistance = 163;
+ this.splitContainer1.Size = new System.Drawing.Size(203, 237);
+ this.splitContainer1.SplitterDistance = 136;
this.splitContainer1.TabIndex = 1;
//
// lvMeasures
@@ -231,7 +235,7 @@
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, 163);
+ 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;
@@ -242,26 +246,59 @@
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, 117);
+ this.propGridKeyIndicator.Size = new System.Drawing.Size(203, 97);
this.propGridKeyIndicator.TabIndex = 0;
this.propGridKeyIndicator.ToolbarVisible = false;
+ //
+ // 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);
+ //
+ // 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);
//
// 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.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.Controls.Add(this.tscEditLocation);
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();
@@ -293,5 +330,7 @@
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;
}
}
\ No newline at end of file
--
Gitblit v1.8.0