From 3930298eca3bf1466c98822518a7c0aaa254646f Mon Sep 17 00:00:00 2001 From: lhiven Date: Fri, 22 Dec 2023 17:20:53 +0900 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B5=8B=E9=AB=98=E7=9A=84bu?= =?UTF-8?q?g,=E6=94=B9=E4=B8=BA=E4=B8=A4=E7=82=B9=E6=B5=8B=E9=AB=98?= =?UTF-8?q?=E5=BA=A6=E5=B7=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs | 24 ++-- Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs | 12 +- Rs.SkyLine/Flow/SubFlow/LaserFlow.cs | 7 +- .../Flow/SubFlow/WarningSuckerNgFlow.cs | 27 ++-- Rs.SkyLine/Recipe/DownCameraLocationRecipe.cs | 11 +- .../TestFixtureTrayCheckHeight.Designer.cs | 130 +++++++----------- .../Recipe/TestFixtureTrayCheckHeight.cs | 17 +-- .../TurnoverTrayCheckHeight.Designer.cs | 130 +++++++----------- Rs.SkyLine/Recipe/TurnoverTrayCheckHeight.cs | 7 +- Rs.SkyLine/SysConfig/LookCamera.cs | 7 +- 10 files changed, 170 insertions(+), 202 deletions(-) diff --git a/Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs b/Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs index f4e61b7..531d3f4 100644 --- a/Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs +++ b/Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs @@ -928,17 +928,19 @@ namespace Rs.MotionPlat.Flow { //如果吸嘴是1，并且最后一列 downSlot = GlobalTray.MultiTray.GetSlot(ESlotStatus.NotHave); - if(curNozzle.NozzleIndex==1 && downSlot!= null && (downSlot.Column==0 || downSlot.Column==1)) - { - if(downSlot.Column==0) - { - downSlot = GlobalTray.MultiTray.GetSlot(downSlot.Index+2); - } - else if(downSlot.Column==1) - { - downSlot = GlobalTray.MultiTray.GetSlot(downSlot.Index+1); - } - } + #region 为了解决第一个吸嘴到不了最后两列的问题,新的料盘已经不存在这个问题 + //if(curNozzle.NozzleIndex==1 && downSlot!= null && (downSlot.Column==0 || downSlot.Column==1)) + //{ + // if(downSlot.Column==0) + // { + // downSlot = GlobalTray.MultiTray.GetSlot(downSlot.Index+2); + // } + // else if(downSlot.Column==1) + // { + // downSlot = GlobalTray.MultiTray.GetSlot(downSlot.Index+1); + // } + //} + #endregion if (downSlot != null) { curNozzle.ToIndex = downSlot.Index - 1; diff --git a/Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs b/Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs index c6ae899..0d0cbfd 100644 --- a/Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs +++ b/Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs @@ -268,7 +268,8 @@ namespace Rs.MotionPlat.Flow untestSlots = TurnoverTrayManager.Instance.GetSlots(ETurnoverTraySlotType.WaitTest, ETurnoverTraySlotStatus.Have); foreach (TurnoverTraySlot slot in untestSlots) { - if (!LaserFlow.Instance.HasProduct(ETrayType.Turnover, slot.Index)) + TestHeightResult heightResult = LaserFlow.Instance.HasProduct(ETrayType.Turnover, slot.Index); + if (!heightResult.HasProduct) { VacManager.TurnoverTrayVacSuction(EVacOperator.Close, slot.Index); slot.ClearProduct(); @@ -739,7 +740,8 @@ namespace Rs.MotionPlat.Flow break; case ETipButton.Skip: //镭射头过来复检，有产品则继续报警 - if (!LaserFlow.Instance.HasProduct(ETrayType.Test, nozzle.NozzleIndex)) + TestHeightResult heightReulst = LaserFlow.Instance.HasProduct(ETrayType.Test, nozzle.NozzleIndex); + if (!heightReulst.HasProduct) { VacManager.TestTrayVacSuction(EVacOperator.Close, nozzle.NozzleIndex); nozzle.Clear(); @@ -785,7 +787,8 @@ namespace Rs.MotionPlat.Flow break; case ETipButton.Skip: //镭射头过来复检，有产品则继续报警， - if (!LaserFlow.Instance.HasProduct(ETrayType.Test, nozzle.NozzleIndex)) + TestHeightResult heightResult = LaserFlow.Instance.HasProduct(ETrayType.Test, nozzle.NozzleIndex); + if (!heightResult.HasProduct) { nozzle.Clear(); exit = true; @@ -1104,7 +1107,8 @@ namespace Rs.MotionPlat.Flow testedSlots = testedSlots = TestTrayManager.Instance.GetSlots(ETestTraySlotStatus.Have); foreach (TestTraySlot slot in testedSlots) { - if (!LaserFlow.Instance.HasProduct(ETrayType.Test, slot.Index)) + TestHeightResult heightResult = LaserFlow.Instance.HasProduct(ETrayType.Test, slot.Index); + if (!heightResult.HasProduct) { logInfo = GetClassName() + $"镭射头检测{slot.Index}号穴位无产品"; MessageQueue.Instance.Insert(logInfo); diff --git a/Rs.SkyLine/Flow/SubFlow/LaserFlow.cs b/Rs.SkyLine/Flow/SubFlow/LaserFlow.cs index de68ac5..7798738 100644 --- a/Rs.SkyLine/Flow/SubFlow/LaserFlow.cs +++ b/Rs.SkyLine/Flow/SubFlow/LaserFlow.cs @@ -98,7 +98,7 @@ namespace Rs.MotionPlat.Flow.SubFlow } else if(trayType== ETrayType.Turnover) { - errCode = AxisControl.TurnoverX.MovePos(targetSlot.X - GlobalVar.TurnoverTrayTestHeightOffsetX, GlobalVar.WholeSpeed); + errCode = AxisControl.TurnoverX.MovePos(targetSlot.X +4, GlobalVar.WholeSpeed); } } if(errCode== ErrorCode.Ok || GlobalVar.VirtualAxis) @@ -165,6 +165,7 @@ namespace Rs.MotionPlat.Flow.SubFlow break; case ELaserFlowStep.测高完成: + testPoint = 1; result.CalcResult(trayType); logInfo= GetClassName()+ JsonConvert.SerializeObject(result); LogHelper.Debug(logInfo); @@ -208,11 +209,11 @@ namespace Rs.MotionPlat.Flow.SubFlow { if (trayType == ETrayType.Test) { - HasProduct = Math.Abs(TestHeight1 - TestHeight2) > GlobalVar.TestFixtureTrayOffsetHeight; + HasProduct = (Math.Abs(TestHeight1 - TestHeight2) - GlobalVar.TestFixtureTrayOffsetHeight)>0.6; } else if (trayType == ETrayType.Turnover) { - HasProduct = Math.Abs(TestHeight1 - TestHeight2) > GlobalVar.TestFixtureTrayOffsetHeight; + HasProduct = Math.Abs((Math.Abs(TestHeight1 - TestHeight2) - GlobalVar.TurnoverTrayOffsetHeight))>0.6; } } } diff --git a/Rs.SkyLine/Flow/SubFlow/WarningSuckerNgFlow.cs b/Rs.SkyLine/Flow/SubFlow/WarningSuckerNgFlow.cs index 7d5e244..7c960d1 100644 --- a/Rs.SkyLine/Flow/SubFlow/WarningSuckerNgFlow.cs +++ b/Rs.SkyLine/Flow/SubFlow/WarningSuckerNgFlow.cs @@ -60,6 +60,7 @@ namespace Rs.MotionPlat.Flow.NgFlow Stopwatch timeout= new Stopwatch(); string logInfo = string.Empty; string alarmInfo = string.Empty; + TestHeightResult heightResult=new TestHeightResult(); /// /// 报警轴列表 /// @@ -230,7 +231,8 @@ namespace Rs.MotionPlat.Flow.NgFlow } break; case EWarningSuckerNgFlowStep.镭射头检测: - if(LaserFlow.Instance.HasProduct(ETrayType.Turnover, exceptionSlotIndex)) + heightResult = LaserFlow.Instance.HasProduct(ETrayType.Turnover, exceptionSlotIndex); + if (heightResult.HasProduct) { retakeNum++; if(retakeNum<3) @@ -254,17 +256,20 @@ namespace Rs.MotionPlat.Flow.NgFlow } break; case EWarningSuckerNgFlowStep.手动处理后镭射头检测: - if (LaserFlow.Instance.HasProduct(ETrayType.Turnover, exceptionSlotIndex)) { - TransitModuleSafePosFlow.Instance.GoSafePostion( EExceptionSafePos.Socket); - alarmInfo = $"{exceptionTray}盘{exceptionSlotIndex}穴位产品未取出，请人工处理"; - msgBox = MsgBox.ShowDialog(AlarmConstID.TurnoverTakeFailAlarm, alarmInfo, ETipButton.Ok); - step = EWarningSuckerNgFlowStep.手动处理后镭射头检测; - } - else - { - MessageQueue.Instance.Insert("WarningSuckerNgFlow-镭射头检测OK"); - step = EWarningSuckerNgFlowStep.回安全位; + heightResult = LaserFlow.Instance.HasProduct(ETrayType.Turnover, exceptionSlotIndex); + if (heightResult.HasProduct) + { + TransitModuleSafePosFlow.Instance.GoSafePostion(EExceptionSafePos.Socket); + alarmInfo = $"{exceptionTray}盘{exceptionSlotIndex}穴位产品未取出，请人工处理"; + msgBox = MsgBox.ShowDialog(AlarmConstID.TurnoverTakeFailAlarm, alarmInfo, ETipButton.Ok); + step = EWarningSuckerNgFlowStep.手动处理后镭射头检测; + } + else + { + MessageQueue.Instance.Insert("WarningSuckerNgFlow-镭射头检测OK"); + step = EWarningSuckerNgFlowStep.回安全位; + } } break; case EWarningSuckerNgFlowStep.到放报警料穴位上方: diff --git a/Rs.SkyLine/Recipe/DownCameraLocationRecipe.cs b/Rs.SkyLine/Recipe/DownCameraLocationRecipe.cs index 9e1415c..94bf3eb 100644 --- a/Rs.SkyLine/Recipe/DownCameraLocationRecipe.cs +++ b/Rs.SkyLine/Recipe/DownCameraLocationRecipe.cs @@ -2,6 +2,7 @@ using Rs.Controls; using Rs.Framework; using Rs.MotionPlat.Commom; +using Rs.MotionPlat.Flow; using System; using System.Collections.Generic; using System.ComponentModel; @@ -21,9 +22,15 @@ namespace Rs.MotionPlat.Recipe public DownCameraLocationRecipe() { InitializeComponent(); - cameraTemplate1.SetFindShapeMode( EFindShapeMode.SelfDefine ); - cameraTemplate1.FindShapeEvent += CameraTemplate1_FindShapeEvent; + //cameraTemplate1.SetFindShapeMode( EFindShapeMode.SelfDefine ); + //cameraTemplate1.FindShapeEvent += CameraTemplate1_FindShapeEvent; cameraTemplate1.ItemName = "下定位相机"; + cameraTemplate1.CustomDefineGrabEvent += CameraTemplate1_CustomDefineGrabEvent; + } + + private void CameraTemplate1_CustomDefineGrabEvent() + { + AxisControl.LoadX.ComparePulse(1, false); } private void CameraTemplate1_FindShapeEvent(ChoiceTech.Halcon.Control.HWindow_Final arg1, HalconDotNet.HObject arg2) diff --git a/Rs.SkyLine/Recipe/TestFixtureTrayCheckHeight.Designer.cs b/Rs.SkyLine/Recipe/TestFixtureTrayCheckHeight.Designer.cs index 3b4e50a..eca50de 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 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(); + 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(); this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.moveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.panelEx2 = new Rs.Controls.PanelEx(); @@ -49,10 +49,10 @@ this.groupBox2 = new System.Windows.Forms.GroupBox(); this.rsTray1 = new Rs.Controls.RsTray(); this.groupBox4 = new System.Windows.Forms.GroupBox(); + this.txtTestFixtureTrayTestHeightOffsetX = new System.Windows.Forms.TextBox(); this.txtTestFixtureTrayOffsetHeight = new System.Windows.Forms.TextBox(); - this.lblSubValue = new System.Windows.Forms.Label(); - this.label8 = new System.Windows.Forms.Label(); this.lblTestValue = new System.Windows.Forms.Label(); + this.label6 = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); this.btnTestHeight = new System.Windows.Forms.Button(); @@ -75,8 +75,6 @@ this.label4 = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label(); this.panelEx1 = new Rs.Controls.PanelEx(); - this.label6 = new System.Windows.Forms.Label(); - this.txtTestFixtureTrayTestHeightOffsetX = new System.Windows.Forms.TextBox(); this.contextMenuStrip1.SuspendLayout(); this.panelEx2.SuspendLayout(); this.panelEx5.SuspendLayout(); @@ -157,9 +155,9 @@ this.dgvRunPoints.AllowUserToDeleteRows = false; this.dgvRunPoints.AllowUserToResizeColumns = false; this.dgvRunPoints.AllowUserToResizeRows = false; - 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; + 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; 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; @@ -175,14 +173,14 @@ this.dgvRunPoints.MultiSelect = false; this.dgvRunPoints.Name = "dgvRunPoints"; this.dgvRunPoints.ReadOnly = true; - 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; + 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; this.dgvRunPoints.RowHeadersVisible = false; this.dgvRunPoints.RowHeadersWidth = 30; this.dgvRunPoints.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; @@ -204,8 +202,8 @@ // dataGridViewTextBoxColumn2 // this.dataGridViewTextBoxColumn2.DataPropertyName = "X"; - dataGridViewCellStyle7.Format = "0.000"; - this.dataGridViewTextBoxColumn2.DefaultCellStyle = dataGridViewCellStyle7; + dataGridViewCellStyle2.Format = "0.000"; + this.dataGridViewTextBoxColumn2.DefaultCellStyle = dataGridViewCellStyle2; this.dataGridViewTextBoxColumn2.FillWeight = 35F; this.dataGridViewTextBoxColumn2.HeaderText = "X"; this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2"; @@ -214,8 +212,8 @@ // dataGridViewTextBoxColumn3 // this.dataGridViewTextBoxColumn3.DataPropertyName = "Y"; - dataGridViewCellStyle8.Format = "0.000"; - this.dataGridViewTextBoxColumn3.DefaultCellStyle = dataGridViewCellStyle8; + dataGridViewCellStyle3.Format = "0.000"; + this.dataGridViewTextBoxColumn3.DefaultCellStyle = dataGridViewCellStyle3; this.dataGridViewTextBoxColumn3.FillWeight = 35F; this.dataGridViewTextBoxColumn3.HeaderText = "Y"; this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3"; @@ -224,10 +222,10 @@ // dataGridViewLinkColumn1 // this.dataGridViewLinkColumn1.ActiveLinkColor = System.Drawing.Color.White; - dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle9.BackColor = System.Drawing.Color.Silver; - dataGridViewCellStyle9.ForeColor = System.Drawing.Color.White; - this.dataGridViewLinkColumn1.DefaultCellStyle = dataGridViewCellStyle9; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle4.BackColor = System.Drawing.Color.Silver; + dataGridViewCellStyle4.ForeColor = System.Drawing.Color.White; + this.dataGridViewLinkColumn1.DefaultCellStyle = dataGridViewCellStyle4; this.dataGridViewLinkColumn1.FillWeight = 20F; this.dataGridViewLinkColumn1.HeaderText = "Move"; this.dataGridViewLinkColumn1.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline; @@ -294,8 +292,6 @@ // this.groupBox4.Controls.Add(this.txtTestFixtureTrayTestHeightOffsetX); this.groupBox4.Controls.Add(this.txtTestFixtureTrayOffsetHeight); - this.groupBox4.Controls.Add(this.lblSubValue); - this.groupBox4.Controls.Add(this.label8); this.groupBox4.Controls.Add(this.lblTestValue); this.groupBox4.Controls.Add(this.label6); this.groupBox4.Controls.Add(this.label5); @@ -310,6 +306,22 @@ this.groupBox4.TabStop = false; this.groupBox4.Text = "测高"; // + // txtTestFixtureTrayTestHeightOffsetX + // + this.txtTestFixtureTrayTestHeightOffsetX.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.txtTestFixtureTrayTestHeightOffsetX.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(16)))), ((int)(((byte)(16)))), ((int)(((byte)(16))))); + this.txtTestFixtureTrayTestHeightOffsetX.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.txtTestFixtureTrayTestHeightOffsetX.Font = new System.Drawing.Font("宋体", 9F); + this.txtTestFixtureTrayTestHeightOffsetX.ForeColor = System.Drawing.Color.White; + this.txtTestFixtureTrayTestHeightOffsetX.Location = new System.Drawing.Point(85, 60); + this.txtTestFixtureTrayTestHeightOffsetX.Name = "txtTestFixtureTrayTestHeightOffsetX"; + this.txtTestFixtureTrayTestHeightOffsetX.Size = new System.Drawing.Size(85, 21); + this.txtTestFixtureTrayTestHeightOffsetX.TabIndex = 53; + this.txtTestFixtureTrayTestHeightOffsetX.Tag = "SysParam"; + this.txtTestFixtureTrayTestHeightOffsetX.Text = "0.01"; + this.txtTestFixtureTrayTestHeightOffsetX.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.txtTestFixtureTrayTestHeightOffsetX.KeyUp += new System.Windows.Forms.KeyEventHandler(this.txtTestFixtureTrayTestHeightOffsetX_KeyUp); + // // txtTestFixtureTrayOffsetHeight // this.txtTestFixtureTrayOffsetHeight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); @@ -326,26 +338,6 @@ this.txtTestFixtureTrayOffsetHeight.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.txtTestFixtureTrayOffsetHeight.KeyUp += new System.Windows.Forms.KeyEventHandler(this.txtTestFixtureCheckBaseHeight_KeyUp); // - // lblSubValue - // - this.lblSubValue.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.lblSubValue.AutoSize = true; - this.lblSubValue.Location = new System.Drawing.Point(124, 185); - this.lblSubValue.Name = "lblSubValue"; - this.lblSubValue.Size = new System.Drawing.Size(23, 12); - this.lblSubValue.TabIndex = 47; - this.lblSubValue.Text = "0.0"; - // - // label8 - // - this.label8.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(49, 185); - this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(35, 12); - this.label8.TabIndex = 47; - this.label8.Text = "差值:"; - // // lblTestValue // this.lblTestValue.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); @@ -356,6 +348,16 @@ this.lblTestValue.TabIndex = 47; this.lblTestValue.Text = "0.0"; // + // label6 + // + this.label6.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.label6.AutoSize = true; + this.label6.Location = new System.Drawing.Point(13, 62); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(59, 12); + this.label6.TabIndex = 47; + this.label6.Text = "测量偏移:"; + // // label5 // this.label5.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); @@ -652,32 +654,6 @@ this.panelEx1.Size = new System.Drawing.Size(1030, 858); this.panelEx1.TabIndex = 4; // - // label6 - // - this.label6.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(13, 62); - this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(59, 12); - this.label6.TabIndex = 47; - this.label6.Text = "测量偏移:"; - // - // txtTestFixtureTrayTestHeightOffsetX - // - this.txtTestFixtureTrayTestHeightOffsetX.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.txtTestFixtureTrayTestHeightOffsetX.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(16)))), ((int)(((byte)(16)))), ((int)(((byte)(16))))); - this.txtTestFixtureTrayTestHeightOffsetX.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.txtTestFixtureTrayTestHeightOffsetX.Font = new System.Drawing.Font("宋体", 9F); - this.txtTestFixtureTrayTestHeightOffsetX.ForeColor = System.Drawing.Color.White; - this.txtTestFixtureTrayTestHeightOffsetX.Location = new System.Drawing.Point(85, 60); - this.txtTestFixtureTrayTestHeightOffsetX.Name = "txtTestFixtureTrayTestHeightOffsetX"; - this.txtTestFixtureTrayTestHeightOffsetX.Size = new System.Drawing.Size(85, 21); - this.txtTestFixtureTrayTestHeightOffsetX.TabIndex = 53; - this.txtTestFixtureTrayTestHeightOffsetX.Tag = "SysParam"; - this.txtTestFixtureTrayTestHeightOffsetX.Text = "0.01"; - this.txtTestFixtureTrayTestHeightOffsetX.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.txtTestFixtureTrayTestHeightOffsetX.KeyUp += new System.Windows.Forms.KeyEventHandler(this.txtTestFixtureCheckBaseHeight_KeyUp); - // // TestFixtureTrayCheckHeight // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -746,8 +722,6 @@ private System.Windows.Forms.TextBox txtSlotOffsetDistX; private System.Windows.Forms.Label label2; private System.Windows.Forms.Label label7; - private System.Windows.Forms.Label lblSubValue; - private System.Windows.Forms.Label label8; private System.Windows.Forms.TextBox txtTestFixtureTrayTestHeightOffsetX; private System.Windows.Forms.Label label6; } diff --git a/Rs.SkyLine/Recipe/TestFixtureTrayCheckHeight.cs b/Rs.SkyLine/Recipe/TestFixtureTrayCheckHeight.cs index e81841a..fe0e65e 100644 --- a/Rs.SkyLine/Recipe/TestFixtureTrayCheckHeight.cs +++ b/Rs.SkyLine/Recipe/TestFixtureTrayCheckHeight.cs @@ -176,16 +176,6 @@ namespace Rs.MotionPlat.Recipe } } - - - private void btnGoTestFixtureCheckHeight_Click(object sender, EventArgs e) - { - ErrorCode errCode = AxisControl.TurnoverZ.MovePos(GlobalVar.TestFixtureCheckBaseHeight, GlobalVar.WholeSpeed); - if(errCode> ErrorCode.Ok) - { - Msg.ShowError($"{AxisAlias.TurnoverZ}轴运动失败,ret={errCode}"); - } - } private void txtTestFixtureCheckBaseHeight_KeyUp(object sender, KeyEventArgs e) { @@ -199,12 +189,17 @@ namespace Rs.MotionPlat.Recipe { lblTestValue.Text = DeviceFactory.checkHeightDev.Read().ToString("0.000"); - lblSubValue.Text = (double.Parse(lblTestValue.Text) - double.Parse(txtTestFixtureTrayOffsetHeight.Text)).ToString("0.000"); + //lblSubValue.Text = (double.Parse(lblTestValue.Text) - double.Parse(txtTestFixtureTrayOffsetHeight.Text)).ToString("0.000"); } else { Msg.ShowError("测高失败"); } } + + private void txtTestFixtureTrayTestHeightOffsetX_KeyUp(object sender, KeyEventArgs e) + { + UpdateSysParam(txtTestFixtureTrayTestHeightOffsetX); + } } } diff --git a/Rs.SkyLine/Recipe/TurnoverTrayCheckHeight.Designer.cs b/Rs.SkyLine/Recipe/TurnoverTrayCheckHeight.Designer.cs index 98d0bc4..d6d99b5 100644 --- a/Rs.SkyLine/Recipe/TurnoverTrayCheckHeight.Designer.cs +++ b/Rs.SkyLine/Recipe/TurnoverTrayCheckHeight.Designer.cs @@ -29,11 +29,11 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - 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(); + 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(); this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.moveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.panelEx2 = new Rs.Controls.PanelEx(); @@ -50,10 +50,10 @@ this.groupBox2 = new System.Windows.Forms.GroupBox(); this.rsTray1 = new Rs.Controls.RsTray(); this.groupBox4 = new System.Windows.Forms.GroupBox(); - this.lblSubValue = new System.Windows.Forms.Label(); - this.label8 = new System.Windows.Forms.Label(); this.lblTestValue = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label(); + this.txtTurnoverTrayTestHeightOffsetX = new System.Windows.Forms.TextBox(); + this.label1 = new System.Windows.Forms.Label(); this.txtTurnoverTrayOffsetHeight = new System.Windows.Forms.TextBox(); this.label2 = new System.Windows.Forms.Label(); this.button6 = new System.Windows.Forms.Button(); @@ -70,8 +70,6 @@ this.label4 = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label(); this.panelEx1 = new Rs.Controls.PanelEx(); - this.label1 = new System.Windows.Forms.Label(); - this.txtTurnoverTrayTestHeightOffsetX = new System.Windows.Forms.TextBox(); this.contextMenuStrip1.SuspendLayout(); this.panelEx2.SuspendLayout(); this.panelEx5.SuspendLayout(); @@ -165,9 +163,9 @@ this.dgvRunPoints.AllowUserToDeleteRows = false; this.dgvRunPoints.AllowUserToResizeColumns = false; this.dgvRunPoints.AllowUserToResizeRows = false; - 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; + 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; 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; @@ -183,14 +181,14 @@ this.dgvRunPoints.MultiSelect = false; this.dgvRunPoints.Name = "dgvRunPoints"; this.dgvRunPoints.ReadOnly = true; - 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; + 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; this.dgvRunPoints.RowHeadersVisible = false; this.dgvRunPoints.RowHeadersWidth = 30; this.dgvRunPoints.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; @@ -212,8 +210,8 @@ // dataGridViewTextBoxColumn2 // this.dataGridViewTextBoxColumn2.DataPropertyName = "X"; - dataGridViewCellStyle7.Format = "0.000"; - this.dataGridViewTextBoxColumn2.DefaultCellStyle = dataGridViewCellStyle7; + dataGridViewCellStyle2.Format = "0.000"; + this.dataGridViewTextBoxColumn2.DefaultCellStyle = dataGridViewCellStyle2; this.dataGridViewTextBoxColumn2.FillWeight = 35F; this.dataGridViewTextBoxColumn2.HeaderText = "X"; this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2"; @@ -222,8 +220,8 @@ // dataGridViewTextBoxColumn3 // this.dataGridViewTextBoxColumn3.DataPropertyName = "Y"; - dataGridViewCellStyle8.Format = "0.000"; - this.dataGridViewTextBoxColumn3.DefaultCellStyle = dataGridViewCellStyle8; + dataGridViewCellStyle3.Format = "0.000"; + this.dataGridViewTextBoxColumn3.DefaultCellStyle = dataGridViewCellStyle3; this.dataGridViewTextBoxColumn3.FillWeight = 35F; this.dataGridViewTextBoxColumn3.HeaderText = "Y"; this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3"; @@ -232,10 +230,10 @@ // dataGridViewLinkColumn1 // this.dataGridViewLinkColumn1.ActiveLinkColor = System.Drawing.Color.White; - dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle9.BackColor = System.Drawing.Color.Silver; - dataGridViewCellStyle9.ForeColor = System.Drawing.Color.White; - this.dataGridViewLinkColumn1.DefaultCellStyle = dataGridViewCellStyle9; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle4.BackColor = System.Drawing.Color.Silver; + dataGridViewCellStyle4.ForeColor = System.Drawing.Color.White; + this.dataGridViewLinkColumn1.DefaultCellStyle = dataGridViewCellStyle4; this.dataGridViewLinkColumn1.FillWeight = 20F; this.dataGridViewLinkColumn1.HeaderText = "Move"; this.dataGridViewLinkColumn1.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline; @@ -300,8 +298,6 @@ // // groupBox4 // - this.groupBox4.Controls.Add(this.lblSubValue); - this.groupBox4.Controls.Add(this.label8); this.groupBox4.Controls.Add(this.lblTestValue); this.groupBox4.Controls.Add(this.label5); this.groupBox4.Controls.Add(this.txtTurnoverTrayTestHeightOffsetX); @@ -318,26 +314,6 @@ this.groupBox4.TabStop = false; this.groupBox4.Text = "测高"; // - // lblSubValue - // - this.lblSubValue.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.lblSubValue.AutoSize = true; - this.lblSubValue.Location = new System.Drawing.Point(144, 174); - this.lblSubValue.Name = "lblSubValue"; - this.lblSubValue.Size = new System.Drawing.Size(23, 12); - this.lblSubValue.TabIndex = 54; - this.lblSubValue.Text = "0.0"; - // - // label8 - // - this.label8.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(69, 174); - this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(35, 12); - this.label8.TabIndex = 55; - this.label8.Text = "差值:"; - // // lblTestValue // this.lblTestValue.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); @@ -358,6 +334,32 @@ this.label5.TabIndex = 57; this.label5.Text = "测高结果:"; // + // txtTurnoverTrayTestHeightOffsetX + // + this.txtTurnoverTrayTestHeightOffsetX.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.txtTurnoverTrayTestHeightOffsetX.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(16)))), ((int)(((byte)(16)))), ((int)(((byte)(16))))); + this.txtTurnoverTrayTestHeightOffsetX.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.txtTurnoverTrayTestHeightOffsetX.Font = new System.Drawing.Font("宋体", 9F); + this.txtTurnoverTrayTestHeightOffsetX.ForeColor = System.Drawing.Color.White; + this.txtTurnoverTrayTestHeightOffsetX.Location = new System.Drawing.Point(87, 57); + this.txtTurnoverTrayTestHeightOffsetX.Name = "txtTurnoverTrayTestHeightOffsetX"; + this.txtTurnoverTrayTestHeightOffsetX.Size = new System.Drawing.Size(85, 21); + this.txtTurnoverTrayTestHeightOffsetX.TabIndex = 53; + this.txtTurnoverTrayTestHeightOffsetX.Tag = "SysParam"; + this.txtTurnoverTrayTestHeightOffsetX.Text = "0.01"; + this.txtTurnoverTrayTestHeightOffsetX.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.txtTurnoverTrayTestHeightOffsetX.KeyUp += new System.Windows.Forms.KeyEventHandler(this.txtTurnoverTrayTestHeightOffsetX_KeyUp); + // + // label1 + // + this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(15, 59); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(59, 12); + this.label1.TabIndex = 47; + this.label1.Text = "测高偏移:"; + // // txtTurnoverTrayOffsetHeight // this.txtTurnoverTrayOffsetHeight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); @@ -574,32 +576,6 @@ this.panelEx1.Size = new System.Drawing.Size(1030, 843); this.panelEx1.TabIndex = 3; // - // label1 - // - this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(15, 59); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(59, 12); - this.label1.TabIndex = 47; - this.label1.Text = "测高偏移:"; - // - // txtTurnoverTrayTestHeightOffsetX - // - this.txtTurnoverTrayTestHeightOffsetX.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.txtTurnoverTrayTestHeightOffsetX.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(16)))), ((int)(((byte)(16)))), ((int)(((byte)(16))))); - this.txtTurnoverTrayTestHeightOffsetX.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.txtTurnoverTrayTestHeightOffsetX.Font = new System.Drawing.Font("宋体", 9F); - this.txtTurnoverTrayTestHeightOffsetX.ForeColor = System.Drawing.Color.White; - this.txtTurnoverTrayTestHeightOffsetX.Location = new System.Drawing.Point(87, 57); - this.txtTurnoverTrayTestHeightOffsetX.Name = "txtTurnoverTrayTestHeightOffsetX"; - this.txtTurnoverTrayTestHeightOffsetX.Size = new System.Drawing.Size(85, 21); - this.txtTurnoverTrayTestHeightOffsetX.TabIndex = 53; - this.txtTurnoverTrayTestHeightOffsetX.Tag = "SysParam"; - this.txtTurnoverTrayTestHeightOffsetX.Text = "0.01"; - this.txtTurnoverTrayTestHeightOffsetX.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.txtTurnoverTrayTestHeightOffsetX.KeyUp += new System.Windows.Forms.KeyEventHandler(this.txtTurnoverCheckBaseHeight_KeyUp); - // // TurnoverTrayCheckHeight // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -662,8 +638,6 @@ private System.Windows.Forms.Label label2; private System.Windows.Forms.Button button6; private Controls.RsTray rsTray1; - private System.Windows.Forms.Label lblSubValue; - private System.Windows.Forms.Label label8; private System.Windows.Forms.Label lblTestValue; private System.Windows.Forms.Label label5; private System.Windows.Forms.TextBox txtTurnoverTrayTestHeightOffsetX; diff --git a/Rs.SkyLine/Recipe/TurnoverTrayCheckHeight.cs b/Rs.SkyLine/Recipe/TurnoverTrayCheckHeight.cs index 1dfcc43..b69a7b7 100644 --- a/Rs.SkyLine/Recipe/TurnoverTrayCheckHeight.cs +++ b/Rs.SkyLine/Recipe/TurnoverTrayCheckHeight.cs @@ -159,12 +159,17 @@ namespace Rs.MotionPlat.Recipe { lblTestValue.Text = DeviceFactory.checkHeightDev.Read().ToString("0.000"); - lblSubValue.Text = (double.Parse(lblTestValue.Text) - double.Parse(txtTurnoverTrayOffsetHeight.Text)).ToString("0.000"); + //lblSubValue.Text = (double.Parse(lblTestValue.Text) - double.Parse(txtTurnoverTrayOffsetHeight.Text)).ToString("0.000"); } else { Msg.ShowError("测高失败"); } } + + private void txtTurnoverTrayTestHeightOffsetX_KeyUp(object sender, KeyEventArgs e) + { + UpdateSysParam(txtTurnoverTrayTestHeightOffsetX); + } } } diff --git a/Rs.SkyLine/SysConfig/LookCamera.cs b/Rs.SkyLine/SysConfig/LookCamera.cs index 91d4b6d..fd0f170 100644 --- a/Rs.SkyLine/SysConfig/LookCamera.cs +++ b/Rs.SkyLine/SysConfig/LookCamera.cs @@ -47,7 +47,8 @@ namespace Rs.MotionPlat.SysConfig if (image != null && image.IsInitialized()) { HOperatorSet.RotateImage(image, out image, SysConfigParam.GetValue("UpCameraRotate"), "constant"); - himgNozzle8.Invoke(new Action(() => { + himgNozzle8.Invoke(new Action(() => + { himgNozzle8.HobjectToHimage(image); HOperatorSet.GetImageSize(image, out HTuple imgWidth, out HTuple imgHeight); @@ -78,8 +79,8 @@ namespace Rs.MotionPlat.SysConfig do { ImageProcess.ClearManualTrigger(); - HikCamera.Instance.SetExposure("locationCamera", GlobalVar.UpCameraExposureTime); - HikCamera.Instance.SetGain("locationCamera", GlobalVar.UpCameraGain); + HikCamera.Instance.SetExposure("locationCamera", GlobalVar.FlyGrabExposureTime); + HikCamera.Instance.SetGain("locationCamera", GlobalVar.FlyGrabGain); HikCamera.Instance.SetTrigger("locationCamera", ETriggerMode.Manual); AxisControl.LoadX.ComparePulse(1, false);