diff --git a/Rs.SkyLine/Recipe/TestFixtureTrayCheckHeight.Designer.cs b/Rs.SkyLine/Recipe/TestFixtureTrayCheckHeight.Designer.cs index eca50de..3bc1ff9 100644 --- a/Rs.SkyLine/Recipe/TestFixtureTrayCheckHeight.Designer.cs +++ b/Rs.SkyLine/Recipe/TestFixtureTrayCheckHeight.Designer.cs @@ -29,11 +29,11 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.moveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.panelEx2 = new Rs.Controls.PanelEx(); @@ -75,6 +75,7 @@ this.label4 = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label(); this.panelEx1 = new Rs.Controls.PanelEx(); + this.testHeightToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.contextMenuStrip1.SuspendLayout(); this.panelEx2.SuspendLayout(); this.panelEx5.SuspendLayout(); @@ -91,14 +92,15 @@ // contextMenuStrip1 // this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.moveToolStripMenuItem}); + this.moveToolStripMenuItem, + this.testHeightToolStripMenuItem}); this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.contextMenuStrip1.Size = new System.Drawing.Size(110, 26); + this.contextMenuStrip1.Size = new System.Drawing.Size(181, 70); // // moveToolStripMenuItem // this.moveToolStripMenuItem.Name = "moveToolStripMenuItem"; - this.moveToolStripMenuItem.Size = new System.Drawing.Size(109, 22); + this.moveToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.moveToolStripMenuItem.Text = "Move"; this.moveToolStripMenuItem.Click += new System.EventHandler(this.moveToolStripMenuItem_Click); // @@ -155,9 +157,9 @@ this.dgvRunPoints.AllowUserToDeleteRows = false; this.dgvRunPoints.AllowUserToResizeColumns = false; this.dgvRunPoints.AllowUserToResizeRows = false; - dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(56)))), ((int)(((byte)(56)))), ((int)(((byte)(56))))); - dataGridViewCellStyle1.ForeColor = System.Drawing.Color.White; - this.dgvRunPoints.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(56)))), ((int)(((byte)(56)))), ((int)(((byte)(56))))); + dataGridViewCellStyle6.ForeColor = System.Drawing.Color.White; + this.dgvRunPoints.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle6; this.dgvRunPoints.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; this.dgvRunPoints.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(11)))), ((int)(((byte)(16)))), ((int)(((byte)(36))))); this.dgvRunPoints.ColumnHeadersHeight = 30; @@ -173,14 +175,14 @@ this.dgvRunPoints.MultiSelect = false; this.dgvRunPoints.Name = "dgvRunPoints"; this.dgvRunPoints.ReadOnly = true; - dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(11)))), ((int)(((byte)(16)))), ((int)(((byte)(36))))); - dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle5.ForeColor = System.Drawing.Color.White; - dataGridViewCellStyle5.SelectionBackColor = System.Drawing.Color.White; - dataGridViewCellStyle5.SelectionForeColor = System.Drawing.Color.White; - dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dgvRunPoints.RowHeadersDefaultCellStyle = dataGridViewCellStyle5; + dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle10.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(11)))), ((int)(((byte)(16)))), ((int)(((byte)(36))))); + dataGridViewCellStyle10.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle10.ForeColor = System.Drawing.Color.White; + dataGridViewCellStyle10.SelectionBackColor = System.Drawing.Color.White; + dataGridViewCellStyle10.SelectionForeColor = System.Drawing.Color.White; + dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dgvRunPoints.RowHeadersDefaultCellStyle = dataGridViewCellStyle10; this.dgvRunPoints.RowHeadersVisible = false; this.dgvRunPoints.RowHeadersWidth = 30; this.dgvRunPoints.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; @@ -202,8 +204,8 @@ // dataGridViewTextBoxColumn2 // this.dataGridViewTextBoxColumn2.DataPropertyName = "X"; - dataGridViewCellStyle2.Format = "0.000"; - this.dataGridViewTextBoxColumn2.DefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle7.Format = "0.000"; + this.dataGridViewTextBoxColumn2.DefaultCellStyle = dataGridViewCellStyle7; this.dataGridViewTextBoxColumn2.FillWeight = 35F; this.dataGridViewTextBoxColumn2.HeaderText = "X"; this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2"; @@ -212,8 +214,8 @@ // dataGridViewTextBoxColumn3 // this.dataGridViewTextBoxColumn3.DataPropertyName = "Y"; - dataGridViewCellStyle3.Format = "0.000"; - this.dataGridViewTextBoxColumn3.DefaultCellStyle = dataGridViewCellStyle3; + dataGridViewCellStyle8.Format = "0.000"; + this.dataGridViewTextBoxColumn3.DefaultCellStyle = dataGridViewCellStyle8; this.dataGridViewTextBoxColumn3.FillWeight = 35F; this.dataGridViewTextBoxColumn3.HeaderText = "Y"; this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3"; @@ -222,10 +224,10 @@ // dataGridViewLinkColumn1 // this.dataGridViewLinkColumn1.ActiveLinkColor = System.Drawing.Color.White; - dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle4.BackColor = System.Drawing.Color.Silver; - dataGridViewCellStyle4.ForeColor = System.Drawing.Color.White; - this.dataGridViewLinkColumn1.DefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle9.BackColor = System.Drawing.Color.Silver; + dataGridViewCellStyle9.ForeColor = System.Drawing.Color.White; + this.dataGridViewLinkColumn1.DefaultCellStyle = dataGridViewCellStyle9; this.dataGridViewLinkColumn1.FillWeight = 20F; this.dataGridViewLinkColumn1.HeaderText = "Move"; this.dataGridViewLinkColumn1.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline; @@ -654,6 +656,13 @@ this.panelEx1.Size = new System.Drawing.Size(1030, 858); this.panelEx1.TabIndex = 4; // + // testHeightToolStripMenuItem + // + this.testHeightToolStripMenuItem.Name = "testHeightToolStripMenuItem"; + this.testHeightToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.testHeightToolStripMenuItem.Text = "TestHeight"; + this.testHeightToolStripMenuItem.Click += new System.EventHandler(this.testHeightToolStripMenuItem_Click); + // // TestFixtureTrayCheckHeight // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -724,5 +733,6 @@ private System.Windows.Forms.Label label7; private System.Windows.Forms.TextBox txtTestFixtureTrayTestHeightOffsetX; private System.Windows.Forms.Label label6; + private System.Windows.Forms.ToolStripMenuItem testHeightToolStripMenuItem; } } \ No newline at end of file diff --git a/Rs.SkyLine/Recipe/TestFixtureTrayCheckHeight.cs b/Rs.SkyLine/Recipe/TestFixtureTrayCheckHeight.cs index fe0e65e..3a86175 100644 --- a/Rs.SkyLine/Recipe/TestFixtureTrayCheckHeight.cs +++ b/Rs.SkyLine/Recipe/TestFixtureTrayCheckHeight.cs @@ -5,6 +5,7 @@ using Rs.Motion; using Rs.MotionPlat.AuxiliaryEquipment; using Rs.MotionPlat.Commom; using Rs.MotionPlat.Flow; +using Rs.MotionPlat.Flow.SubFlow; using System; using System.Collections.Generic; using System.ComponentModel; @@ -201,5 +202,21 @@ namespace Rs.MotionPlat.Recipe { UpdateSysParam(txtTestFixtureTrayTestHeightOffsetX); } + + private void testHeightToolStripMenuItem_Click(object sender, EventArgs e) + { + if (selectedSlot != null) + { + TestHeightResult thr = LaserFlow.Instance.HasProduct(ETrayType.Test, selectedSlot.Index); + if(thr!=null&&thr.HasProduct) + { + Msg.ShowInfo("has product"); + } + else + { + Msg.ShowInfo("hasn't product"); + } + } + } } } diff --git a/Rs.SkyLine/Recipe/TurnoverTrayCheckHeight.Designer.cs b/Rs.SkyLine/Recipe/TurnoverTrayCheckHeight.Designer.cs index d6d99b5..95d6782 100644 --- a/Rs.SkyLine/Recipe/TurnoverTrayCheckHeight.Designer.cs +++ b/Rs.SkyLine/Recipe/TurnoverTrayCheckHeight.Designer.cs @@ -70,6 +70,7 @@ this.label4 = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label(); this.panelEx1 = new Rs.Controls.PanelEx(); + this.testHeightToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.contextMenuStrip1.SuspendLayout(); this.panelEx2.SuspendLayout(); this.panelEx5.SuspendLayout(); @@ -87,14 +88,15 @@ // contextMenuStrip1 // this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.moveToolStripMenuItem}); + this.moveToolStripMenuItem, + this.testHeightToolStripMenuItem}); this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.contextMenuStrip1.Size = new System.Drawing.Size(110, 26); + this.contextMenuStrip1.Size = new System.Drawing.Size(181, 70); // // moveToolStripMenuItem // this.moveToolStripMenuItem.Name = "moveToolStripMenuItem"; - this.moveToolStripMenuItem.Size = new System.Drawing.Size(109, 22); + this.moveToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.moveToolStripMenuItem.Text = "Move"; this.moveToolStripMenuItem.Click += new System.EventHandler(this.moveToolStripMenuItem_Click); // @@ -576,6 +578,13 @@ this.panelEx1.Size = new System.Drawing.Size(1030, 843); this.panelEx1.TabIndex = 3; // + // testHeightToolStripMenuItem + // + this.testHeightToolStripMenuItem.Name = "testHeightToolStripMenuItem"; + this.testHeightToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.testHeightToolStripMenuItem.Text = "TestHeight"; + this.testHeightToolStripMenuItem.Click += new System.EventHandler(this.testHeightToolStripMenuItem_Click); + // // TurnoverTrayCheckHeight // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -642,5 +651,6 @@ private System.Windows.Forms.Label label5; private System.Windows.Forms.TextBox txtTurnoverTrayTestHeightOffsetX; private System.Windows.Forms.Label label1; + private System.Windows.Forms.ToolStripMenuItem testHeightToolStripMenuItem; } } \ No newline at end of file diff --git a/Rs.SkyLine/Recipe/TurnoverTrayCheckHeight.cs b/Rs.SkyLine/Recipe/TurnoverTrayCheckHeight.cs index b69a7b7..f26c623 100644 --- a/Rs.SkyLine/Recipe/TurnoverTrayCheckHeight.cs +++ b/Rs.SkyLine/Recipe/TurnoverTrayCheckHeight.cs @@ -171,5 +171,21 @@ namespace Rs.MotionPlat.Recipe { UpdateSysParam(txtTurnoverTrayTestHeightOffsetX); } + + private void testHeightToolStripMenuItem_Click(object sender, EventArgs e) + { + if (selectedSlot != null) + { + TestHeightResult thr = LaserFlow.Instance.HasProduct(ETrayType.Turnover, selectedSlot.Index); + if (thr != null && thr.HasProduct) + { + Msg.ShowInfo("has product"); + } + else + { + Msg.ShowInfo("hasn't product"); + } + } + } } }