From dfedc0bdb45137078144cbcdf2089f6a427e517a Mon Sep 17 00:00:00 2001 From: lhiven Date: Fri, 2 Aug 2024 08:27:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=96=99=E4=BB=93=E6=94=BE?= =?UTF-8?q?=E6=96=99=E5=89=8D=E6=98=AF=E5=90=A6=E6=8B=8D=E7=85=A7=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SysConfig/CommonConfig.Designer.cs | 10 +++ Rs.DeweyTester/SysConfig/CommonConfig.resx | 66 ++++++++++++++----- 2 files changed, 58 insertions(+), 18 deletions(-) diff --git a/Rs.DeweyTester/SysConfig/CommonConfig.Designer.cs b/Rs.DeweyTester/SysConfig/CommonConfig.Designer.cs index 39d4a3d..babee78 100644 --- a/Rs.DeweyTester/SysConfig/CommonConfig.Designer.cs +++ b/Rs.DeweyTester/SysConfig/CommonConfig.Designer.cs @@ -108,6 +108,7 @@ this.txtControlCenterPort = new System.Windows.Forms.TextBox(); this.cboxEnableExceptionHandlingNozzle = new System.Windows.Forms.CheckBox(); this.cboxEnableScanBarCodeByDownCamera = new System.Windows.Forms.CheckBox(); + this.cboxEnableBeforePlaceProductGrab = new System.Windows.Forms.CheckBox(); this.tableLayoutPanel1.SuspendLayout(); this.groupBox8.SuspendLayout(); this.groupBox3.SuspendLayout(); @@ -323,6 +324,7 @@ this.groupBox1.Controls.Add(this.cboxEnableTC3); this.groupBox1.Controls.Add(this.cboxEnableTC2); this.groupBox1.Controls.Add(this.cboxEnableTC1); + this.groupBox1.Controls.Add(this.cboxEnableBeforePlaceProductGrab); this.groupBox1.Controls.Add(this.cboxDisableBuzzer); this.groupBox1.Controls.Add(this.cboxCheckVisionSwOpened); this.groupBox1.Controls.Add(this.cboxIsSimTest); @@ -728,6 +730,13 @@ this.cboxEnableScanBarCodeByDownCamera.Name = "cboxEnableScanBarCodeByDownCamera"; this.cboxEnableScanBarCodeByDownCamera.UseVisualStyleBackColor = true; // + // cboxEnableBeforePlaceProductGrab + // + resources.ApplyResources(this.cboxEnableBeforePlaceProductGrab, "cboxEnableBeforePlaceProductGrab"); + this.cboxEnableBeforePlaceProductGrab.Name = "cboxEnableBeforePlaceProductGrab"; + this.cboxEnableBeforePlaceProductGrab.UseVisualStyleBackColor = true; + this.cboxEnableBeforePlaceProductGrab.CheckedChanged += new System.EventHandler(this.cbox_CheckedChanged); + // // CommonConfig // resources.ApplyResources(this, "$this"); @@ -837,5 +846,6 @@ private System.Windows.Forms.Label label21; private System.Windows.Forms.TextBox txtProjectID; private System.Windows.Forms.CheckBox cboxDisableBuzzer; + private System.Windows.Forms.CheckBox cboxEnableBeforePlaceProductGrab; } } \ No newline at end of file diff --git a/Rs.DeweyTester/SysConfig/CommonConfig.resx b/Rs.DeweyTester/SysConfig/CommonConfig.resx index 8f7b9d0..c1dd754 100644 --- a/Rs.DeweyTester/SysConfig/CommonConfig.resx +++ b/Rs.DeweyTester/SysConfig/CommonConfig.resx @@ -1377,6 +1377,36 @@ 16 + + True + + + NoControl + + + 638, 183 + + + 96, 16 + + + 8 + + + 料仓放料拍照 + + + cboxEnableBeforePlaceProductGrab + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 17 + True @@ -1405,7 +1435,7 @@ groupBox1 - 17 + 18 True @@ -1435,7 +1465,7 @@ groupBox1 - 18 + 19 True @@ -1465,7 +1495,7 @@ groupBox1 - 19 + 20 True @@ -1495,7 +1525,7 @@ groupBox1 - 20 + 21 True @@ -1525,7 +1555,7 @@ groupBox1 - 21 + 22 True @@ -1555,7 +1585,7 @@ groupBox1 - 22 + 23 True @@ -1585,7 +1615,7 @@ groupBox1 - 23 + 24 True @@ -1615,7 +1645,7 @@ groupBox1 - 24 + 25 True @@ -1645,7 +1675,7 @@ groupBox1 - 25 + 26 True @@ -1675,7 +1705,7 @@ groupBox1 - 26 + 27 False @@ -1702,7 +1732,7 @@ groupBox1 - 27 + 28 True @@ -1732,7 +1762,7 @@ groupBox1 - 28 + 29 True @@ -1762,7 +1792,7 @@ groupBox1 - 29 + 30 True @@ -1792,7 +1822,7 @@ groupBox1 - 30 + 31 True @@ -1822,7 +1852,7 @@ groupBox1 - 31 + 32 True @@ -1852,7 +1882,7 @@ groupBox1 - 32 + 33 True @@ -1882,7 +1912,7 @@ groupBox1 - 33 + 34 Fill @@ -2383,6 +2413,6 @@ CommonConfig - Rs.MotionPlat.BaseForm, Rs.MotionPlat, Version=1.20.24.2, Culture=neutral, PublicKeyToken=null + Rs.MotionPlat.BaseForm, Rs.MotionPlat, Version=1.20.24.6, Culture=neutral, PublicKeyToken=null \ No newline at end of file