From a3bf5f7a83c59e237b4e5f6ddec56742c4e3bae7 Mon Sep 17 00:00:00 2001 From: lhiven <236881222@qq.com> Date: Thu, 13 Jun 2024 21:58:21 +0800 Subject: [PATCH] =?UTF-8?q?1=20=E5=A2=9E=E5=8A=A0=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E7=9A=84=E4=BF=9D=E5=AD=98=E8=B7=AF=E5=BE=84=E5=92=8C=E5=A4=A9?= =?UTF-8?q?=E6=95=B0=202=20=E4=BC=98=E5=8C=96=E5=85=B7=E6=94=BE=E6=96=99?= =?UTF-8?q?=E6=8A=A5=E8=AD=A6=E5=90=8E=E5=85=88=E7=A7=BB=E5=8A=A8=E5=88=B0?= =?UTF-8?q?=E5=AE=89=E5=85=A8=E5=90=8E=E5=86=8D=E7=82=B9=E5=87=BB=E9=87=8D?= =?UTF-8?q?=E8=AF=95=E6=B5=81=E7=A8=8B=E4=BC=9A=E7=BB=A7=E7=BB=AD=E6=89=A7?= =?UTF-8?q?=E8=A1=8C=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Rs.SkyLine/Commom/GlobalVar.cs | 26 + Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs | 2 +- .../SafePosFlow/TransitModuleSafePosFlow.cs | 10 +- Rs.SkyLine/Home.cs | 76 +- Rs.SkyLine/Rs.SkyLine.csproj | 1 + Rs.SkyLine/SysConfig/CommonConfig.Designer.cs | 52 ++ Rs.SkyLine/SysConfig/CommonConfig.cs | 15 +- Rs.SkyLine/SysConfig/CommonConfig.en-US.resx | 24 + Rs.SkyLine/SysConfig/CommonConfig.resx | 883 ++++++++++-------- 9 files changed, 674 insertions(+), 415 deletions(-) diff --git a/Rs.SkyLine/Commom/GlobalVar.cs b/Rs.SkyLine/Commom/GlobalVar.cs index a543eb7..f58b38c 100644 --- a/Rs.SkyLine/Commom/GlobalVar.cs +++ b/Rs.SkyLine/Commom/GlobalVar.cs @@ -1942,5 +1942,31 @@ namespace Rs.Framework return SysConfigParam.GetValue(nameof(PlaceTrayOffsetY)); } } + + /// + /// 图片保存路径 + /// + [ParameterInit("string", "d:\\images", "system", "图片保存路径")] + public static string ImageSavePath + { + get + { + return SysConfigParam.GetValue(nameof(ImageSavePath)); + } + } + + + /// + /// 图片保存天数 + /// + [ParameterInit("int", "15", "system", "图片保存天数")] + public static int ImageSaveDays + { + get + { + return SysConfigParam.GetValue(nameof(ImageSaveDays)); + } + } + } } diff --git a/Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs b/Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs index 36ba438..449b3fc 100644 --- a/Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs +++ b/Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs @@ -1404,7 +1404,7 @@ namespace Rs.MotionPlat.Flow LogHelper.Debug($"治具穴位{nozzle.NozzleIndex}真空异常"); TransitModuleSafePosFlow.Instance.GoSafePostion(EExceptionSafePos.SocketFrom9ToSixteen); } - Start(); + //Start(); break; } } diff --git a/Rs.SkyLine/Flow/SafePosFlow/TransitModuleSafePosFlow.cs b/Rs.SkyLine/Flow/SafePosFlow/TransitModuleSafePosFlow.cs index d8aa3ef..6fd767a 100644 --- a/Rs.SkyLine/Flow/SafePosFlow/TransitModuleSafePosFlow.cs +++ b/Rs.SkyLine/Flow/SafePosFlow/TransitModuleSafePosFlow.cs @@ -78,11 +78,11 @@ namespace Rs.MotionPlat.Flow.SafePosFlow } while (!finished) { - //if (MachineManage.Instance.MachineStatus == EMachineStatus.Stop) - //{ - // Thread.Sleep(10); - // continue; - //} + if (MachineManage.Instance.MachineStatus == EMachineStatus.Stop) + { + Thread.Sleep(10); + continue; + } switch (step) { case ETransitModuleSafePosFlowStep.抬起Z轴: diff --git a/Rs.SkyLine/Home.cs b/Rs.SkyLine/Home.cs index 0b37f1d..7fe07d7 100644 --- a/Rs.SkyLine/Home.cs +++ b/Rs.SkyLine/Home.cs @@ -831,49 +831,51 @@ namespace Rs.MotionPlat { try { - string dirpath = "D://images"; - string[] dirs = Directory.GetDirectories(dirpath); - if (!Directory.Exists(dirpath)) + string dirpath = GlobalVar.ImageSavePath;// "D://images"; + if(!string.IsNullOrEmpty(dirpath)) { - Directory.CreateDirectory(dirpath); - } - foreach (var dir in dirs) - { - DirectoryInfo di = new DirectoryInfo(dir); - DateTime dtCreate = di.CreationTime; - if ((DateTime.Now - dtCreate).Days > 15) + string[] dirs = Directory.GetDirectories(dirpath); + if (!Directory.Exists(dirpath)) { - di.Delete(true); + Directory.CreateDirectory(dirpath); } - } - dirpath = "D://软件备份"; - if (!Directory.Exists(dirpath)) - { - Directory.CreateDirectory(dirpath); - } - dirs = Directory.GetDirectories(dirpath); - foreach (var dir in dirs) - { - DirectoryInfo di = new DirectoryInfo(dir); - DateTime dtCreate = di.CreationTime; - if ((DateTime.Now - dtCreate).Days > 15) + foreach (var dir in dirs) { - di.Delete(true); + DirectoryInfo di = new DirectoryInfo(dir); + DateTime dtCreate = di.CreationTime; + if ((DateTime.Now - dtCreate).Days > GlobalVar.ImageSaveDays) + { + di.Delete(true); + } + } + dirpath = "D://软件备份"; + if (!Directory.Exists(dirpath)) + { + Directory.CreateDirectory(dirpath); + } + dirs = Directory.GetDirectories(dirpath); + foreach (var dir in dirs) + { + DirectoryInfo di = new DirectoryInfo(dir); + DateTime dtCreate = di.CreationTime; + if ((DateTime.Now - dtCreate).Days > GlobalVar.ImageSaveDays) + { + di.Delete(true); + } } - } - - //配置文件备份 - string workDir = System.Environment.CurrentDirectory; - string zipFileName = DateTime.Now.ToString("yyyyMMddHH"); - string bakDir = $"d://软件备份//{DateTime.Now.ToString("yyyyMMdd")}//{zipFileName}"; - if (!Directory.Exists(bakDir)) - { - Directory.CreateDirectory(bakDir); - CopyDirectory(workDir, bakDir); - string toDir = Path.Combine(Directory.GetParent(bakDir).FullName, zipFileName + ".zip"); - ZipHelper.ZipDirectory(bakDir, toDir); - Directory.Delete(bakDir, true); + //配置文件备份 + string workDir = System.Environment.CurrentDirectory; + string zipFileName = DateTime.Now.ToString("yyyyMMddHH"); + string bakDir = $"d://软件备份//{DateTime.Now.ToString("yyyyMMdd")}//{zipFileName}"; + if (!Directory.Exists(bakDir)) + { + Directory.CreateDirectory(bakDir); + CopyDirectory(workDir, bakDir); + string toDir = Path.Combine(Directory.GetParent(bakDir).FullName, zipFileName + ".zip"); + ZipHelper.ZipDirectory(bakDir, toDir); + Directory.Delete(bakDir, true); + } } } catch (Exception ex) diff --git a/Rs.SkyLine/Rs.SkyLine.csproj b/Rs.SkyLine/Rs.SkyLine.csproj index 35c1713..f0263c5 100644 --- a/Rs.SkyLine/Rs.SkyLine.csproj +++ b/Rs.SkyLine/Rs.SkyLine.csproj @@ -95,6 +95,7 @@ bin\Debug\Rs.Motion.dll + False diff --git a/Rs.SkyLine/SysConfig/CommonConfig.Designer.cs b/Rs.SkyLine/SysConfig/CommonConfig.Designer.cs index 4cfb26a..667504c 100644 --- a/Rs.SkyLine/SysConfig/CommonConfig.Designer.cs +++ b/Rs.SkyLine/SysConfig/CommonConfig.Designer.cs @@ -78,6 +78,9 @@ this.label7 = new System.Windows.Forms.Label(); this.cboxUpCameraName = new System.Windows.Forms.ComboBox(); this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.btnImageSavePath = new System.Windows.Forms.Button(); + this.txtImageSaveDays = new System.Windows.Forms.TextBox(); + this.txtImageSavePath = new System.Windows.Forms.TextBox(); this.panelEx1 = new Rs.Controls.PanelEx(); this.btnSaveSpeedParam = new System.Windows.Forms.Button(); this.cboxCurRecipe = new System.Windows.Forms.ComboBox(); @@ -92,6 +95,8 @@ this.lblScanBarcodeSpeed = new System.Windows.Forms.Label(); this.lblFlyCameraSpeed = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label(); + this.label17 = new System.Windows.Forms.Label(); + this.label10 = new System.Windows.Forms.Label(); this.label15 = new System.Windows.Forms.Label(); this.lblTakeTrayFromNg2InputSpeed = new System.Windows.Forms.Label(); this.lblStockBeltSpeed = new System.Windows.Forms.Label(); @@ -117,6 +122,7 @@ this.txtControlCenterPort = new System.Windows.Forms.TextBox(); this.cboxEnableExceptionHandlingNozzle = new System.Windows.Forms.CheckBox(); this.cboxEnableScanBarCodeByDownCamera = new System.Windows.Forms.CheckBox(); + this.folderBrowserDialog1 = new System.Windows.Forms.FolderBrowserDialog(); this.tableLayoutPanel1.SuspendLayout(); this.groupBox8.SuspendLayout(); this.groupBox2.SuspendLayout(); @@ -510,6 +516,9 @@ // groupBox1 // resources.ApplyResources(this.groupBox1, "groupBox1"); + this.groupBox1.Controls.Add(this.btnImageSavePath); + this.groupBox1.Controls.Add(this.txtImageSaveDays); + this.groupBox1.Controls.Add(this.txtImageSavePath); this.groupBox1.Controls.Add(this.panelEx1); this.groupBox1.Controls.Add(this.cboxCurRecipe); this.groupBox1.Controls.Add(this.label4); @@ -523,6 +532,8 @@ this.groupBox1.Controls.Add(this.lblScanBarcodeSpeed); this.groupBox1.Controls.Add(this.lblFlyCameraSpeed); this.groupBox1.Controls.Add(this.label5); + this.groupBox1.Controls.Add(this.label17); + this.groupBox1.Controls.Add(this.label10); this.groupBox1.Controls.Add(this.label15); this.groupBox1.Controls.Add(this.lblTakeTrayFromNg2InputSpeed); this.groupBox1.Controls.Add(this.lblStockBeltSpeed); @@ -535,6 +546,27 @@ this.groupBox1.Name = "groupBox1"; this.groupBox1.TabStop = false; // + // btnImageSavePath + // + resources.ApplyResources(this.btnImageSavePath, "btnImageSavePath"); + this.btnImageSavePath.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(56)))), ((int)(((byte)(56)))), ((int)(((byte)(56))))); + this.btnImageSavePath.FlatAppearance.BorderColor = System.Drawing.Color.White; + this.btnImageSavePath.ForeColor = System.Drawing.Color.White; + this.btnImageSavePath.Name = "btnImageSavePath"; + this.btnImageSavePath.UseVisualStyleBackColor = false; + this.btnImageSavePath.Click += new System.EventHandler(this.btnImageSavePath_Click); + // + // txtImageSaveDays + // + resources.ApplyResources(this.txtImageSaveDays, "txtImageSaveDays"); + this.txtImageSaveDays.Name = "txtImageSaveDays"; + this.txtImageSaveDays.KeyUp += new System.Windows.Forms.KeyEventHandler(this.txtSysParam_KeyUp); + // + // txtImageSavePath + // + resources.ApplyResources(this.txtImageSavePath, "txtImageSavePath"); + this.txtImageSavePath.Name = "txtImageSavePath"; + // // panelEx1 // resources.ApplyResources(this.panelEx1, "panelEx1"); @@ -650,6 +682,16 @@ resources.ApplyResources(this.label5, "label5"); this.label5.Name = "label5"; // + // label17 + // + resources.ApplyResources(this.label17, "label17"); + this.label17.Name = "label17"; + // + // label10 + // + resources.ApplyResources(this.label10, "label10"); + this.label10.Name = "label10"; + // // label15 // resources.ApplyResources(this.label15, "label15"); @@ -826,6 +868,10 @@ this.cboxEnableScanBarCodeByDownCamera.Name = "cboxEnableScanBarCodeByDownCamera"; this.cboxEnableScanBarCodeByDownCamera.UseVisualStyleBackColor = true; // + // folderBrowserDialog1 + // + resources.ApplyResources(this.folderBrowserDialog1, "folderBrowserDialog1"); + // // CommonConfig // resources.ApplyResources(this, "$this"); @@ -951,5 +997,11 @@ private System.Windows.Forms.DataGridViewCheckBoxColumn 是否显示; private System.Windows.Forms.DataGridViewCheckBoxColumn 是否需要登录; private System.Windows.Forms.CheckBox cboxEnableIndexTimeStatistics; + private System.Windows.Forms.Button btnImageSavePath; + private System.Windows.Forms.TextBox txtImageSaveDays; + private System.Windows.Forms.TextBox txtImageSavePath; + private System.Windows.Forms.Label label17; + private System.Windows.Forms.Label label10; + private System.Windows.Forms.FolderBrowserDialog folderBrowserDialog1; } } \ No newline at end of file diff --git a/Rs.SkyLine/SysConfig/CommonConfig.cs b/Rs.SkyLine/SysConfig/CommonConfig.cs index 21711bc..e613742 100644 --- a/Rs.SkyLine/SysConfig/CommonConfig.cs +++ b/Rs.SkyLine/SysConfig/CommonConfig.cs @@ -205,7 +205,10 @@ namespace Rs.MotionPlat.SysConfig public void txtSysParam_KeyUp(object sender, KeyEventArgs e) { - UpdateSysParam((TextBox)sender); + if(e.KeyCode== Keys.Enter) + { + UpdateSysParam((TextBox)sender); + } } private void txtQifuValue_KeyUp(object sender, KeyEventArgs e) { @@ -305,5 +308,15 @@ namespace Rs.MotionPlat.SysConfig //((DataGridViewCheckBoxCell)dataGridView1.Rows[e.RowIndex].Cells[e.ColumnIndex]).Value = true; } } + + private void btnImageSavePath_Click(object sender, EventArgs e) + { + DialogResult dr = folderBrowserDialog1.ShowDialog(); + if(dr== DialogResult.OK) + { + this.txtImageSavePath.Text = folderBrowserDialog1.SelectedPath; + SysConfigParam.Update("ImageSavePath", txtImageSavePath.Text); + } + } } } diff --git a/Rs.SkyLine/SysConfig/CommonConfig.en-US.resx b/Rs.SkyLine/SysConfig/CommonConfig.en-US.resx index 46c992f..d68ec36 100644 --- a/Rs.SkyLine/SysConfig/CommonConfig.en-US.resx +++ b/Rs.SkyLine/SysConfig/CommonConfig.en-US.resx @@ -379,6 +379,18 @@ Camera parameter setting + + 470, 243 + + + select + + + 139, 280 + + + 139, 246 + 638, 6 @@ -424,6 +436,18 @@ Handling Empty Tray speed: + + 101, 12 + + + Image save days: + + + 101, 12 + + + Image save path: + 94, 166 diff --git a/Rs.SkyLine/SysConfig/CommonConfig.resx b/Rs.SkyLine/SysConfig/CommonConfig.resx index 5891d02..bc75b76 100644 --- a/Rs.SkyLine/SysConfig/CommonConfig.resx +++ b/Rs.SkyLine/SysConfig/CommonConfig.resx @@ -131,17 +131,14 @@ label15 - - 3 - 禁用离子风扇检测 扫码失败自动跳过 - - cboxEnableTestFixtureFiberCheck + + cboxLanguage 1 @@ -177,12 +174,12 @@ 155, 100 - - Fill - 7 + + System.Windows.Forms.DataGridViewCheckBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + 42 @@ -195,6 +192,9 @@ ID + + lblTakeTraySpeed + True @@ -204,8 +204,8 @@ groupBox1 - - 20 + + groupBox1 groupBox9 @@ -222,15 +222,21 @@ 155, 14 + + 5% + 8 - - NoControl + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 NoControl + + System.Windows.Forms.FolderBrowserDialog, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + NoControl @@ -247,22 +253,25 @@ tbarTakeTrayFromNg2InputSpeed - 5 + 8 - - 24 + + 30, 25 787, 441 - - 3 + + 47, 12 设备参数 - - groupBox1 + + 选择 + + + 0 groupBox2 @@ -276,8 +285,8 @@ 8 - - 83, 21 + + Center 8 @@ -285,9 +294,15 @@ False + + 是否需要登录 + 300, 20 + + 0 + 10, 79 @@ -306,6 +321,9 @@ label2 + + groupBox1 + 3, 363 @@ -324,6 +342,9 @@ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + radioButton3 @@ -348,8 +369,8 @@ 35, 12 - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True NoControl @@ -357,8 +378,11 @@ 上相机: - - 75, 47 + + 300, 20 + + + panelEx1 83, 12 @@ -369,12 +393,18 @@ 35, 12 + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - 11 + 14 宋体, 9pt + + English + 拍照定位失败自动跳过 @@ -382,7 +412,7 @@ 59, 12 - Rs.MotionPlat.BaseForm, Rs.MotionPlat, Version=3.20.24.21, Culture=neutral, PublicKeyToken=null + Rs.MotionPlat.BaseForm, Rs.MotionPlat, Version=3.20.24.22, Culture=neutral, PublicKeyToken=null False @@ -396,11 +426,17 @@ False - - 1 + + 6, 12 - - 52 + + 83, 21 + + + 是否显示 + + + 韩文 groupBox10 @@ -408,9 +444,6 @@ NoControl - - groupBox8 - NoControl @@ -426,6 +459,9 @@ label16 + + 26, 283 + 120, 16 @@ -447,8 +483,8 @@ 0 - - 121, 20 + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -456,8 +492,8 @@ 保存 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + groupBox1 100, 21 @@ -483,8 +519,8 @@ 105, 67 - - groupBox1 + + 83, 21 353, 66 @@ -492,23 +528,35 @@ 0.01 + + 206, 168 + 取放料方式: System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 1 + 2 + + Center + - 14 + 19 - - True + + 1 - - 0 + + cboxLocationFailAutoSkip + + + groupBox8 1 @@ -522,14 +570,14 @@ groupBox8 - - 83, 12 - - + True + + 48, 16 + - 1 + 4 8 @@ -537,11 +585,11 @@ True - - 1% + + 22 - - True + + 83, 12 NoControl @@ -552,8 +600,11 @@ NoControl - - 韩文 + + Fill + + + NoControl False @@ -562,7 +613,7 @@ CommonConfig - 2 + 5 NoControl @@ -594,12 +645,18 @@ 8 + + 127.0.0.1 + groupBox9 Center + + 59, 12 + 43 @@ -612,14 +669,17 @@ groupBox8 - - 曝光: + + 17, 12 - - 48, 16 + + 93, 21 - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + NoControl + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 75, 20 @@ -630,6 +690,9 @@ 84, 16 + + 26, 249 + groupBox4 @@ -642,8 +705,11 @@ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.DataGridViewCheckBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + NoControl label5 @@ -666,6 +732,9 @@ 2 + + 35, 12 + 8 @@ -678,12 +747,15 @@ 75, 47 - - 0 + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 198, 123 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + groupBox1 @@ -693,12 +765,15 @@ label12 - - cboxDownLocationCameraName + + 627, 100 groupBox8 + + True + 42 @@ -708,14 +783,14 @@ 50, 47 - + NoControl 是否显示 - - False + + NoControl NoControl @@ -726,8 +801,11 @@ 8 - - NoControl + + False + + + 778, 433 tableLayoutPanel1 @@ -744,14 +822,14 @@ 11 - - 3, 17 + + True 202, 34 - - 1 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -768,11 +846,11 @@ 9 - - 257, 115 + + 34, 52 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + groupBox1 1 @@ -793,13 +871,13 @@ button1 - 7 + 10 778, 432 - - 1 + + 排料重取次数: groupBox4 @@ -816,9 +894,15 @@ 0 + + False + 2 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + False @@ -846,20 +930,23 @@ 107, 322 - - 6, 12 + + 155, 70 groupBox8 - - 35, 12 + + 257, 115 + + + 115, 246 True - - True + + 3 300, 20 @@ -873,8 +960,8 @@ 53 - - 127.0.0.1 + + cboxSocketHasProductCheck groupBox9 @@ -882,14 +969,14 @@ label26 - - txtFlyGrabExposureTime + + True True - - lblScanBarcodeSpeed + + 17 上相机 @@ -921,8 +1008,11 @@ NoControl - - 1 + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + folderBrowserDialog1 0 @@ -930,9 +1020,6 @@ groupBox4 - - 35, 12 - True @@ -942,9 +1029,15 @@ 50 + + 446, 243 + 300, 20 + + NoControl + cboxScanBarcodeFailAutoSkip @@ -954,23 +1047,26 @@ label14 + + label4 + + + 71, 16 + groupBox10 - - True + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 71, 12 + + 24 System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - cboxLocationFailAutoSkip - - - False + + Fill lblTakeTrayFromNg2InputSpeed @@ -984,6 +1080,9 @@ cboxEnableIndexTimeStatistics + + 43 + NoControl @@ -996,6 +1095,9 @@ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True + True @@ -1005,12 +1107,18 @@ groupBox1 + + 83, 12 + 14 27, 102 + + NoControl + 3, 441 @@ -1026,8 +1134,8 @@ True - - 83, 21 + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1 @@ -1062,11 +1170,8 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 6 - - - txtDownCameraFlyRegrabNum + + NoControl 59, 12 @@ -1086,6 +1191,9 @@ 60, 21 + + txtDownCameraFlyRegrabNum + 190, 33 @@ -1116,8 +1224,8 @@ 8 - - System.Windows.Forms.DataGridViewCheckBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 12 0 @@ -1134,14 +1242,14 @@ label8 - - 50, 73 + + txtControlCenterIP 174, 98 - - NoControl + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -1161,8 +1269,8 @@ 12 - - cboxCurRecipe + + 1 从左到右 @@ -1182,6 +1290,9 @@ True + + txtImageSavePath + panel1 @@ -1191,18 +1302,24 @@ 8 - - 重拍次数: + + NoControl - - 3 + + 3, 17 - + + groupBox1 + + NoControl System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 1 + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -1215,8 +1332,11 @@ $this - - 4 + + 112, 28 + + + False cboxGRR @@ -1233,8 +1353,11 @@ 53 - - groupBox1 + + 中文名 + + + 9 42 @@ -1242,29 +1365,23 @@ 宋体, 9pt + + label10 + 17, 12 - - 48 - - - 是否显示 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 弹框语言 - - panelEx1 + + cboxCurRecipe - - 整体速度: + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 1 + + False 37, 167 @@ -1275,20 +1392,17 @@ False - - False - 459, 170 - - 35, 117 + + True - - 206, 168 + + 20 - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + False False @@ -1323,17 +1437,14 @@ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - cboxLanguage - 43 groupBox1 - - 0 + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 cboxVirtualAxis @@ -1344,17 +1455,14 @@ 348, 20 - - 26, 166 - NoControl cboxEnableScanBarCodeByDownCamera - - 18 + + btnImageSavePath label6 @@ -1365,17 +1473,17 @@ 778, 433 + + 50, 73 + 60 空跑 - - label27 - - - 17, 12 + + 6 0 @@ -1395,14 +1503,20 @@ 17, 12 + + 1 + + + 4 + 1 - - True + + 0 - - True + + 0 0 @@ -1416,9 +1530,6 @@ 气压值: - - 72, 16 - 0 @@ -1428,14 +1539,11 @@ 中文 - - 英文 - 启用光纤检测 - - 是否需要登录 + + 3 8 @@ -1452,14 +1560,20 @@ 50, 104 - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + groupBox8 扫码飞怕速度: - - 47, 12 + + 26, 221 + + + Flat + + + 16 groupBox9 @@ -1470,8 +1584,11 @@ 4 - - groupBox1 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Windows.Forms.DataGridViewCheckBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 groupBox8 @@ -1494,6 +1611,9 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + NoControl + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -1518,12 +1638,18 @@ 255, 28 - - 300, 20 + + btnSaveSpeedParam + + + 52 71, 16 + + 图片保存路径: + Fill @@ -1533,8 +1659,8 @@ cboxUpCameraName - - 5% + + panel1 groupBox3 @@ -1549,7 +1675,7 @@ NoControl - 0 + 3 System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -1560,15 +1686,12 @@ groupBox8 - - False + + label27 宋体, 9pt - - groupBox9 - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -1584,20 +1707,20 @@ 1 + + NoControl + 226, 396 - - panel1 - - - True + + groupBox4 change - - False + + cboxDisableNPressCheck groupBox1 @@ -1611,11 +1734,8 @@ 治具有无产品检测 - - NoControl - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + groupBox4 cboxDisableIonFanCheck @@ -1645,7 +1765,7 @@ 宋体, 9pt - 4 + 7 48, 16 @@ -1656,17 +1776,17 @@ 8 - - 搬运料盘速度: - - + 0 + + groupBox9 + 12, 6 - 10 + 13 120, 16 @@ -1674,8 +1794,8 @@ 8 - - groupBox10 + + False panel1 @@ -1686,8 +1806,8 @@ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + cboxDownLocationCameraName 1% @@ -1707,14 +1827,17 @@ 42 + + True + 311, 98 groupBox8 - - 627, 100 + + 1% groupBox1 @@ -1734,6 +1857,9 @@ True + + cboxEnableTestFixtureFiberCheck + 增益: @@ -1752,8 +1878,8 @@ groupBox1 - - NoControl + + 0 System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -1764,29 +1890,23 @@ cboxDisablePPressCheck - - 速度 - 83, 21 - - 1 - groupBox8 label9 - - 5% + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 197, 54 - - 59, 12 + + NoControl NoControl @@ -1806,8 +1926,8 @@ 353, 98 - - 71, 16 + + True 1 @@ -1815,6 +1935,9 @@ 17, 12 + + 59, 25 + 3, 3 @@ -1842,9 +1965,6 @@ 73, 24 - - Center - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -1854,8 +1974,11 @@ 从右到左 - - Flat + + True + + + True 2 @@ -1863,8 +1986,11 @@ 禁用负压检测 - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 71, 12 + + + 2 153, 166 @@ -1888,7 +2014,7 @@ 英文名 - 13 + 18 NoControl @@ -1899,14 +2025,17 @@ 启用强力吸嘴 + + True + cboxCheckSafeEnable 0 - - True + + txtFlyGrabExposureTime System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -1914,8 +2043,8 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 0 + + 26, 166 Bottom @@ -1927,7 +2056,7 @@ 下相机扫码 - 18 + 23 48, 16 @@ -1935,20 +2064,23 @@ 60, 16 - - groupBox8 + + label17 + + + 115, 280 搬运带料料盘速度: - - cboxSocketHasProductCheck + + 整体速度: System.Windows.Forms.TrackBar, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - NoControl + + 35, 12 txtDischargeRetakeNum @@ -1956,6 +2088,9 @@ label1 + + lblScanBarcodeSpeed + 8 @@ -1968,11 +2103,14 @@ 5% + + 2 + 8 - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 25 groupBox8 @@ -1980,8 +2118,8 @@ 3 - - NoControl + + groupBox1 0 @@ -2013,8 +2151,8 @@ Fill - - NoControl + + 1 NoControl @@ -2022,6 +2160,9 @@ True + + txtImageSaveDays + groupBox8 @@ -2031,6 +2172,9 @@ True + + groupBox1 + 32, 115 @@ -2052,8 +2196,8 @@ 44, 33 - - 1 + + 曝光: System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -2064,14 +2208,17 @@ groupBox8 + + groupBox1 + True CommonConfig - - 17, 12 + + 8 8 @@ -2079,17 +2226,14 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - groupBox1 - 3 NoControl - - 120, 16 + + 0 Fill @@ -2115,9 +2259,6 @@ Bottom, Right - - 778, 433 - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -2133,11 +2274,11 @@ groupBox3 - - 8 + + NoControl - - 30, 25 + + 72, 16 5 @@ -2145,20 +2286,17 @@ groupBox8 - - 112, 28 - 15 cboxRunSpace - - lblTakeTraySpeed + + 1 - - False + + 18 60, 16 @@ -2169,18 +2307,18 @@ 8 - - False + + groupBox1 groupBox10 + + groupBox8 + ID - - groupBox8 - 83, 21 @@ -2217,8 +2355,8 @@ System.Windows.Forms.TrackBar, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.TrackBar, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 120, 16 0 @@ -2232,8 +2370,8 @@ False - - 是否需要登录 + + 60 19 @@ -2256,8 +2394,8 @@ System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - groupBox1 + + 重拍次数: NoControl @@ -2265,14 +2403,14 @@ 458, 75 - - NoControl + + 虚拟轴 相机参数设定 - - btnSaveSpeedParam + + Flat Center @@ -2286,6 +2424,9 @@ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 搬运料盘速度: + 48, 16 @@ -2301,8 +2442,8 @@ True - - 17 + + 311, 21 59, 12 @@ -2328,11 +2469,8 @@ 宋体, 9pt - - 2 - - - 8 + + 0 348, 20 @@ -2346,11 +2484,8 @@ 3 - - 26, 221 - - - groupBox4 + + NoControl 6 @@ -2364,11 +2499,14 @@ 禁用门禁 + + 75, 47 + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 中文名 + + groupBox1 74, 137 @@ -2382,14 +2520,11 @@ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - NoControl - 484, 184 - 12 + 15 NoControl @@ -2397,35 +2532,29 @@ groupBox1 + + 35, 117 + 6 - - cboxDisableNPressCheck - 60 False - - txtControlCenterIP - groupBox9 28, 30 - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - True - - 15 + + 121, 20 groupBox8 @@ -2433,8 +2562,8 @@ NoControl - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 速度 System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -2445,6 +2574,9 @@ groupBox1 + + 7 + Center @@ -2452,7 +2584,10 @@ 1 - 9 + 12 + + + 3 txtFlyGrabGain @@ -2460,18 +2595,21 @@ 102, 115 - - English + + 3 groupBox4 - + 0 1 + + System.Windows.Forms.TrackBar, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + 120, 16 @@ -2484,26 +2622,29 @@ 35, 12 - - 34, 52 + + False 增益: - - 43 + + 5% System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 19 + 24 + + + groupBox1 107, 12 - - True + + 英文 虚拟码 @@ -2511,15 +2652,12 @@ groupBox1 + + groupBox10 + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - groupBox4 - - - NoControl - 0 @@ -2529,14 +2667,11 @@ 4 - - 排料重取次数: - - 16 + 21 - - 60 + + 48 96, 16 @@ -2559,9 +2694,6 @@ True - - 虚拟轴 - 3 @@ -2577,36 +2709,42 @@ tableLayoutPanel1 - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - label4 + + 1 label21 - - Center + + 11 458, 18 - - 155, 70 + + 是否需要登录 0 - - Fill - True 0 + + 83, 12 + + + NoControl + + + 图片保存天数: + True @@ -2616,6 +2754,9 @@ True + + 17, 17 + True