diff --git a/Rs.SkyLine/Commom/GlobalVar.cs b/Rs.SkyLine/Commom/GlobalVar.cs index 73a1f4d..e045b16 100644 --- a/Rs.SkyLine/Commom/GlobalVar.cs +++ b/Rs.SkyLine/Commom/GlobalVar.cs @@ -595,5 +595,38 @@ namespace Rs.Framework return SysConfigParam.GetValue(nameof(TurnoverTrayLocateRRange)); } } + + /// + /// 系统语言 + /// + public static string Language + { + get + { + return SysConfigParam.GetValue(nameof(Language)); + } + } + + /// + /// 上相机曝光时间 + /// + public static int UpCameraExposureTime + { + get + { + return SysConfigParam.GetValue(nameof(UpCameraExposureTime)); + } + } + + /// + /// 上相机增益 + /// + public static int UpCameraGain + { + get + { + return SysConfigParam.GetValue(nameof(UpCameraGain)); + } + } } } diff --git a/Rs.SkyLine/Flow/Camera/VisionManager.cs b/Rs.SkyLine/Flow/Camera/VisionManager.cs index 647b016..6e355ee 100644 --- a/Rs.SkyLine/Flow/Camera/VisionManager.cs +++ b/Rs.SkyLine/Flow/Camera/VisionManager.cs @@ -40,8 +40,6 @@ namespace Rs.MotionPlat.Flow.Camera string cameraName = "upCamera"; string LightName = ""; //1、拍照 - ImageProcess.ClearManualTrigger(); - string m_savePath = Path.Combine("Recipe", GlobalVar.CurRecipe, "料仓料盘产品有无"); //IniHelper iniHelper = new IniHelper(Path.Combine(m_savePath,"default.ini")); //string AngleStart = iniHelper.ReadValue("ModelParam", "AngleStart", "-10"); @@ -53,6 +51,8 @@ namespace Rs.MotionPlat.Flow.Camera ImageProcess.ClearManualTrigger(); HikCamera.Instance.SetTrigger(cameraName, ETriggerMode.Manual); + HikCamera.Instance.SetExposure(cameraName, GlobalVar.UpCameraExposureTime); + HikCamera.Instance.SetGain(cameraName, GlobalVar.UpCameraGain); AxisControl.LoadX.ComparePulse(2, false); //LightName = SysConfigParam.GetValue(cameraName + "LightName"); //if (!string.IsNullOrEmpty(LightName)) diff --git a/Rs.SkyLine/Flow/SubFlow/UpCameraScanBarCodeFlow.cs b/Rs.SkyLine/Flow/SubFlow/UpCameraScanBarCodeFlow.cs index 8fd0749..3555133 100644 --- a/Rs.SkyLine/Flow/SubFlow/UpCameraScanBarCodeFlow.cs +++ b/Rs.SkyLine/Flow/SubFlow/UpCameraScanBarCodeFlow.cs @@ -142,8 +142,8 @@ namespace Rs.MotionPlat.Flow.SubFlow } } ImageProcess.ClearAutoTrigger(); - HikCamera.Instance.SetExposure("upCamera", GlobalVar.FlyGrabExposureTime); - HikCamera.Instance.SetGain("upCamera", 15); + HikCamera.Instance.SetExposure("upCamera", GlobalVar.UpCameraExposureTime); + HikCamera.Instance.SetGain("upCamera", GlobalVar.UpCameraGain); HikCamera.Instance.SetTrigger("upCamera", ETriggerMode.Auto); AxisControl.LoadX.SetPosCompare(2, grabPoints.ToArray()); AxisControl.LoadX.CompareStatus(out short pstatu, out int pcount); @@ -282,9 +282,9 @@ namespace Rs.MotionPlat.Flow.SubFlow { Thread.Sleep(200); ImageProcess.ClearManualTrigger(); - //HikCamera.Instance.SetExposure("upCamera", GlobalVar.FlyGrabExposureTime); - //HikCamera.Instance.SetGain("upCamera", 15); HikCamera.Instance.SetTrigger("upCamera", ETriggerMode.Manual); + HikCamera.Instance.SetExposure("upCamera", GlobalVar.UpCameraExposureTime); + HikCamera.Instance.SetGain("upCamera", GlobalVar.UpCameraGain); AxisControl.LoadX.ComparePulse(2, false); logInfo = GetClassName() + $"已运动到扫码起始位"; MessageQueue.Instance.Insert(logInfo); diff --git a/Rs.SkyLine/SysConfig/CommonConfig.Designer.cs b/Rs.SkyLine/SysConfig/CommonConfig.Designer.cs index 730661d..4b4315d 100644 --- a/Rs.SkyLine/SysConfig/CommonConfig.Designer.cs +++ b/Rs.SkyLine/SysConfig/CommonConfig.Designer.cs @@ -30,62 +30,43 @@ { this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.groupBox8 = new System.Windows.Forms.GroupBox(); - this.panel1 = new System.Windows.Forms.Panel(); - this.radioButton4 = new System.Windows.Forms.RadioButton(); - this.radioButton3 = new System.Windows.Forms.RadioButton(); - this.radioButton2 = new System.Windows.Forms.RadioButton(); - this.radioButton1 = new System.Windows.Forms.RadioButton(); - this.label22 = new System.Windows.Forms.Label(); - this.label6 = new System.Windows.Forms.Label(); this.groupBox3 = new System.Windows.Forms.GroupBox(); + this.groupBox10 = new System.Windows.Forms.GroupBox(); + this.txtUpCameraExposureTime = new System.Windows.Forms.TextBox(); + this.label21 = new System.Windows.Forms.Label(); + this.label24 = new System.Windows.Forms.Label(); + this.txtUpCameraGain = new System.Windows.Forms.TextBox(); + this.groupBox9 = new System.Windows.Forms.GroupBox(); + this.txtFlyGrabExposureTime = new System.Windows.Forms.TextBox(); this.txtDownCameraFlyRegrabNum = new System.Windows.Forms.TextBox(); + this.label12 = new System.Windows.Forms.Label(); this.label14 = new System.Windows.Forms.Label(); - this.txtFlyGrabGain = new System.Windows.Forms.TextBox(); this.label13 = new System.Windows.Forms.Label(); - this.txtFlyGrabExposureTime = new System.Windows.Forms.TextBox(); - this.label12 = new System.Windows.Forms.Label(); - this.groupBox2 = new System.Windows.Forms.GroupBox(); - this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); - this.groupBox6 = new System.Windows.Forms.GroupBox(); - this.textBox9 = new System.Windows.Forms.TextBox(); - this.label17 = new System.Windows.Forms.Label(); - this.textBox8 = new System.Windows.Forms.TextBox(); - this.label16 = new System.Windows.Forms.Label(); - this.groupBox5 = new System.Windows.Forms.GroupBox(); - this.textBox7 = new System.Windows.Forms.TextBox(); - this.label15 = new System.Windows.Forms.Label(); - this.textBox6 = new System.Windows.Forms.TextBox(); - this.label11 = new System.Windows.Forms.Label(); - this.groupBox4 = new System.Windows.Forms.GroupBox(); - this.textBox5 = new System.Windows.Forms.TextBox(); - this.textBox4 = new System.Windows.Forms.TextBox(); - this.label10 = new System.Windows.Forms.Label(); - this.label9 = new System.Windows.Forms.Label(); - this.groupBox7 = new System.Windows.Forms.GroupBox(); - this.textBox11 = new System.Windows.Forms.TextBox(); - this.label19 = new System.Windows.Forms.Label(); - this.label18 = new System.Windows.Forms.Label(); - this.textBox10 = new System.Windows.Forms.TextBox(); + this.txtFlyGrabGain = new System.Windows.Forms.TextBox(); + this.cboxDownLocationCameraName = new System.Windows.Forms.ComboBox(); + this.label8 = new System.Windows.Forms.Label(); + this.label7 = new System.Windows.Forms.Label(); + this.cboxUpCameraName = new System.Windows.Forms.ComboBox(); this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.comboBox1 = new System.Windows.Forms.ComboBox(); + this.panel1 = new System.Windows.Forms.Panel(); + this.radioButton4 = new System.Windows.Forms.RadioButton(); + this.radioButton3 = new System.Windows.Forms.RadioButton(); + this.label2 = new System.Windows.Forms.Label(); + this.label6 = new System.Windows.Forms.Label(); this.cboxVirtualAxis = new System.Windows.Forms.CheckBox(); this.cboxCheckSafeEnable = new System.Windows.Forms.CheckBox(); this.cboxRunSpace = new System.Windows.Forms.CheckBox(); this.panelEx1 = new Rs.Controls.PanelEx(); this.btnSaveSpeedParam = new System.Windows.Forms.Button(); this.cboxCurRecipe = new System.Windows.Forms.ComboBox(); - this.cboxDownScanCameraName = new System.Windows.Forms.ComboBox(); - this.cboxDownLocationCameraName = new System.Windows.Forms.ComboBox(); this.label4 = new System.Windows.Forms.Label(); - this.cboxUpCameraName = new System.Windows.Forms.ComboBox(); - this.label2 = new System.Windows.Forms.Label(); this.tbarPressLowSpeed = new System.Windows.Forms.TrackBar(); this.tbarTakeTraySpeed = new System.Windows.Forms.TrackBar(); this.tbarFlyCameraSpeed = new System.Windows.Forms.TrackBar(); - this.label7 = new System.Windows.Forms.Label(); this.tbarWholeSpeed = new System.Windows.Forms.TrackBar(); this.lblPressLowSpeed = new System.Windows.Forms.Label(); this.lblTakeTraySpeed = new System.Windows.Forms.Label(); - this.label8 = new System.Windows.Forms.Label(); this.lblFlyCameraSpeed = new System.Windows.Forms.Label(); this.label20 = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label(); @@ -97,16 +78,11 @@ this.txtControlCenterIP = new System.Windows.Forms.TextBox(); this.label26 = new System.Windows.Forms.Label(); this.tableLayoutPanel1.SuspendLayout(); - this.groupBox8.SuspendLayout(); - this.panel1.SuspendLayout(); this.groupBox3.SuspendLayout(); - this.groupBox2.SuspendLayout(); - this.tableLayoutPanel2.SuspendLayout(); - this.groupBox6.SuspendLayout(); - this.groupBox5.SuspendLayout(); - this.groupBox4.SuspendLayout(); - this.groupBox7.SuspendLayout(); + this.groupBox10.SuspendLayout(); + this.groupBox9.SuspendLayout(); this.groupBox1.SuspendLayout(); + this.panel1.SuspendLayout(); this.panelEx1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.tbarPressLowSpeed)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tbarTakeTraySpeed)).BeginInit(); @@ -121,7 +97,6 @@ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); this.tableLayoutPanel1.Controls.Add(this.groupBox8, 1, 0); this.tableLayoutPanel1.Controls.Add(this.groupBox3, 0, 1); - this.tableLayoutPanel1.Controls.Add(this.groupBox2, 0, 1); this.tableLayoutPanel1.Controls.Add(this.groupBox1, 0, 0); this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0); @@ -135,11 +110,6 @@ // // groupBox8 // - this.groupBox8.Controls.Add(this.panel1); - this.groupBox8.Controls.Add(this.radioButton2); - this.groupBox8.Controls.Add(this.radioButton1); - this.groupBox8.Controls.Add(this.label22); - this.groupBox8.Controls.Add(this.label6); this.groupBox8.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBox8.ForeColor = System.Drawing.Color.White; this.groupBox8.Location = new System.Drawing.Point(787, 3); @@ -149,89 +119,14 @@ this.groupBox8.TabStop = false; this.groupBox8.Text = "设备参数"; // - // panel1 - // - this.panel1.Controls.Add(this.radioButton4); - this.panel1.Controls.Add(this.radioButton3); - this.panel1.Location = new System.Drawing.Point(114, 56); - this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(190, 33); - this.panel1.TabIndex = 2; - // - // radioButton4 - // - this.radioButton4.AutoSize = true; - this.radioButton4.FlatAppearance.CheckedBackColor = System.Drawing.Color.Lime; - this.radioButton4.Location = new System.Drawing.Point(90, 6); - this.radioButton4.Name = "radioButton4"; - this.radioButton4.Size = new System.Drawing.Size(71, 16); - this.radioButton4.TabIndex = 1; - this.radioButton4.Text = "从右到左"; - this.radioButton4.UseVisualStyleBackColor = true; - // - // radioButton3 - // - this.radioButton3.AutoSize = true; - this.radioButton3.Checked = true; - this.radioButton3.FlatAppearance.CheckedBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0))))); - this.radioButton3.Location = new System.Drawing.Point(12, 6); - this.radioButton3.Name = "radioButton3"; - this.radioButton3.Size = new System.Drawing.Size(71, 16); - this.radioButton3.TabIndex = 1; - this.radioButton3.TabStop = true; - this.radioButton3.Text = "从左到右"; - this.radioButton3.UseVisualStyleBackColor = true; - // - // radioButton2 - // - this.radioButton2.AutoSize = true; - this.radioButton2.FlatAppearance.CheckedBackColor = System.Drawing.Color.Lime; - this.radioButton2.Location = new System.Drawing.Point(180, 34); - this.radioButton2.Name = "radioButton2"; - this.radioButton2.Size = new System.Drawing.Size(35, 16); - this.radioButton2.TabIndex = 1; - this.radioButton2.Text = "LG"; - this.radioButton2.UseVisualStyleBackColor = true; - // - // radioButton1 - // - this.radioButton1.AutoSize = true; - this.radioButton1.Checked = true; - this.radioButton1.FlatAppearance.CheckedBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0))))); - this.radioButton1.Location = new System.Drawing.Point(126, 34); - this.radioButton1.Name = "radioButton1"; - this.radioButton1.Size = new System.Drawing.Size(35, 16); - this.radioButton1.TabIndex = 1; - this.radioButton1.TabStop = true; - this.radioButton1.Text = "SM"; - this.radioButton1.UseVisualStyleBackColor = true; - // - // label22 - // - this.label22.AutoSize = true; - this.label22.Location = new System.Drawing.Point(23, 36); - this.label22.Name = "label22"; - this.label22.Size = new System.Drawing.Size(59, 12); - this.label22.TabIndex = 0; - this.label22.Text = "设备类型:"; - // - // label6 - // - this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(11, 69); - this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(71, 12); - this.label6.TabIndex = 0; - this.label6.Text = "取放料方式:"; - // // groupBox3 // - this.groupBox3.Controls.Add(this.txtDownCameraFlyRegrabNum); - this.groupBox3.Controls.Add(this.label14); - this.groupBox3.Controls.Add(this.txtFlyGrabGain); - this.groupBox3.Controls.Add(this.label13); - this.groupBox3.Controls.Add(this.txtFlyGrabExposureTime); - this.groupBox3.Controls.Add(this.label12); + this.groupBox3.Controls.Add(this.groupBox10); + this.groupBox3.Controls.Add(this.groupBox9); + this.groupBox3.Controls.Add(this.cboxDownLocationCameraName); + this.groupBox3.Controls.Add(this.label8); + this.groupBox3.Controls.Add(this.label7); + this.groupBox3.Controls.Add(this.cboxUpCameraName); this.groupBox3.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBox3.ForeColor = System.Drawing.Color.White; this.groupBox3.Location = new System.Drawing.Point(3, 441); @@ -241,13 +136,103 @@ this.groupBox3.TabStop = false; this.groupBox3.Text = "相机参数设定"; // + // groupBox10 + // + this.groupBox10.Controls.Add(this.txtUpCameraExposureTime); + this.groupBox10.Controls.Add(this.label21); + this.groupBox10.Controls.Add(this.label24); + this.groupBox10.Controls.Add(this.txtUpCameraGain); + this.groupBox10.ForeColor = System.Drawing.Color.White; + this.groupBox10.Location = new System.Drawing.Point(32, 115); + this.groupBox10.Name = "groupBox10"; + this.groupBox10.Size = new System.Drawing.Size(198, 123); + this.groupBox10.TabIndex = 43; + this.groupBox10.TabStop = false; + this.groupBox10.Text = "上相机"; + // + // txtUpCameraExposureTime + // + this.txtUpCameraExposureTime.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(16)))), ((int)(((byte)(16)))), ((int)(((byte)(16))))); + this.txtUpCameraExposureTime.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.txtUpCameraExposureTime.Font = new System.Drawing.Font("宋体", 9F); + this.txtUpCameraExposureTime.ForeColor = System.Drawing.Color.White; + this.txtUpCameraExposureTime.Location = new System.Drawing.Point(75, 20); + this.txtUpCameraExposureTime.Name = "txtUpCameraExposureTime"; + this.txtUpCameraExposureTime.Size = new System.Drawing.Size(83, 21); + this.txtUpCameraExposureTime.TabIndex = 42; + this.txtUpCameraExposureTime.Text = "60"; + this.txtUpCameraExposureTime.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.txtUpCameraExposureTime.KeyUp += new System.Windows.Forms.KeyEventHandler(this.txtSysParam_KeyUp); + // + // label21 + // + this.label21.AutoSize = true; + this.label21.Location = new System.Drawing.Point(30, 25); + this.label21.Name = "label21"; + this.label21.Size = new System.Drawing.Size(35, 12); + this.label21.TabIndex = 0; + this.label21.Text = "曝光:"; + // + // label24 + // + this.label24.AutoSize = true; + this.label24.Location = new System.Drawing.Point(30, 52); + this.label24.Name = "label24"; + this.label24.Size = new System.Drawing.Size(35, 12); + this.label24.TabIndex = 0; + this.label24.Text = "增益:"; + // + // txtUpCameraGain + // + this.txtUpCameraGain.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(16)))), ((int)(((byte)(16)))), ((int)(((byte)(16))))); + this.txtUpCameraGain.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.txtUpCameraGain.Font = new System.Drawing.Font("宋体", 9F); + this.txtUpCameraGain.ForeColor = System.Drawing.Color.White; + this.txtUpCameraGain.Location = new System.Drawing.Point(75, 47); + this.txtUpCameraGain.Name = "txtUpCameraGain"; + this.txtUpCameraGain.Size = new System.Drawing.Size(83, 21); + this.txtUpCameraGain.TabIndex = 42; + this.txtUpCameraGain.Text = "60"; + this.txtUpCameraGain.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.txtUpCameraGain.KeyUp += new System.Windows.Forms.KeyEventHandler(this.txtSysParam_KeyUp); + // + // groupBox9 + // + this.groupBox9.Controls.Add(this.txtFlyGrabExposureTime); + this.groupBox9.Controls.Add(this.txtDownCameraFlyRegrabNum); + this.groupBox9.Controls.Add(this.label12); + this.groupBox9.Controls.Add(this.label14); + this.groupBox9.Controls.Add(this.label13); + this.groupBox9.Controls.Add(this.txtFlyGrabGain); + this.groupBox9.ForeColor = System.Drawing.Color.White; + this.groupBox9.Location = new System.Drawing.Point(257, 115); + this.groupBox9.Name = "groupBox9"; + this.groupBox9.Size = new System.Drawing.Size(198, 123); + this.groupBox9.TabIndex = 43; + this.groupBox9.TabStop = false; + this.groupBox9.Text = "下相机"; + // + // txtFlyGrabExposureTime + // + this.txtFlyGrabExposureTime.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(16)))), ((int)(((byte)(16)))), ((int)(((byte)(16))))); + this.txtFlyGrabExposureTime.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.txtFlyGrabExposureTime.Font = new System.Drawing.Font("宋体", 9F); + this.txtFlyGrabExposureTime.ForeColor = System.Drawing.Color.White; + this.txtFlyGrabExposureTime.Location = new System.Drawing.Point(75, 20); + this.txtFlyGrabExposureTime.Name = "txtFlyGrabExposureTime"; + this.txtFlyGrabExposureTime.Size = new System.Drawing.Size(83, 21); + this.txtFlyGrabExposureTime.TabIndex = 42; + this.txtFlyGrabExposureTime.Text = "60"; + this.txtFlyGrabExposureTime.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.txtFlyGrabExposureTime.KeyUp += new System.Windows.Forms.KeyEventHandler(this.txtSysParam_KeyUp); + // // txtDownCameraFlyRegrabNum // this.txtDownCameraFlyRegrabNum.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(16)))), ((int)(((byte)(16)))), ((int)(((byte)(16))))); this.txtDownCameraFlyRegrabNum.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.txtDownCameraFlyRegrabNum.Font = new System.Drawing.Font("宋体", 9F); this.txtDownCameraFlyRegrabNum.ForeColor = System.Drawing.Color.White; - this.txtDownCameraFlyRegrabNum.Location = new System.Drawing.Point(566, 38); + this.txtDownCameraFlyRegrabNum.Location = new System.Drawing.Point(75, 74); this.txtDownCameraFlyRegrabNum.Name = "txtDownCameraFlyRegrabNum"; this.txtDownCameraFlyRegrabNum.Size = new System.Drawing.Size(83, 21); this.txtDownCameraFlyRegrabNum.TabIndex = 42; @@ -255,14 +240,32 @@ this.txtDownCameraFlyRegrabNum.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.txtDownCameraFlyRegrabNum.KeyUp += new System.Windows.Forms.KeyEventHandler(this.txtSysParam_KeyUp); // + // label12 + // + this.label12.AutoSize = true; + this.label12.Location = new System.Drawing.Point(30, 25); + this.label12.Name = "label12"; + this.label12.Size = new System.Drawing.Size(35, 12); + this.label12.TabIndex = 0; + this.label12.Text = "曝光:"; + // // label14 // this.label14.AutoSize = true; - this.label14.Location = new System.Drawing.Point(465, 40); + this.label14.Location = new System.Drawing.Point(10, 79); this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(95, 12); + this.label14.Size = new System.Drawing.Size(59, 12); this.label14.TabIndex = 0; - this.label14.Text = "下相机重拍次数:"; + this.label14.Text = "重拍次数:"; + // + // label13 + // + this.label13.AutoSize = true; + this.label13.Location = new System.Drawing.Point(34, 52); + this.label13.Name = "label13"; + this.label13.Size = new System.Drawing.Size(35, 12); + this.label13.TabIndex = 0; + this.label13.Text = "增益:"; // // txtFlyGrabGain // @@ -270,7 +273,7 @@ this.txtFlyGrabGain.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.txtFlyGrabGain.Font = new System.Drawing.Font("宋体", 9F); this.txtFlyGrabGain.ForeColor = System.Drawing.Color.White; - this.txtFlyGrabGain.Location = new System.Drawing.Point(325, 36); + this.txtFlyGrabGain.Location = new System.Drawing.Point(75, 47); this.txtFlyGrabGain.Name = "txtFlyGrabGain"; this.txtFlyGrabGain.Size = new System.Drawing.Size(83, 21); this.txtFlyGrabGain.TabIndex = 42; @@ -278,333 +281,58 @@ this.txtFlyGrabGain.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.txtFlyGrabGain.KeyUp += new System.Windows.Forms.KeyEventHandler(this.txtSysParam_KeyUp); // - // label13 + // cboxDownLocationCameraName // - this.label13.AutoSize = true; - this.label13.Location = new System.Drawing.Point(224, 38); - this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(95, 12); - this.label13.TabIndex = 0; - this.label13.Text = "下相机飞拍增益:"; + this.cboxDownLocationCameraName.FormattingEnabled = true; + this.cboxDownLocationCameraName.Location = new System.Drawing.Point(105, 67); + this.cboxDownLocationCameraName.Name = "cboxDownLocationCameraName"; + this.cboxDownLocationCameraName.Size = new System.Drawing.Size(348, 20); + this.cboxDownLocationCameraName.TabIndex = 1; // - // txtFlyGrabExposureTime + // label8 // - this.txtFlyGrabExposureTime.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(16)))), ((int)(((byte)(16)))), ((int)(((byte)(16))))); - this.txtFlyGrabExposureTime.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.txtFlyGrabExposureTime.Font = new System.Drawing.Font("宋体", 9F); - this.txtFlyGrabExposureTime.ForeColor = System.Drawing.Color.White; - this.txtFlyGrabExposureTime.Location = new System.Drawing.Point(124, 34); - this.txtFlyGrabExposureTime.Name = "txtFlyGrabExposureTime"; - this.txtFlyGrabExposureTime.Size = new System.Drawing.Size(83, 21); - this.txtFlyGrabExposureTime.TabIndex = 42; - this.txtFlyGrabExposureTime.Text = "60"; - this.txtFlyGrabExposureTime.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.txtFlyGrabExposureTime.KeyUp += new System.Windows.Forms.KeyEventHandler(this.txtSysParam_KeyUp); + this.label8.AutoSize = true; + this.label8.Location = new System.Drawing.Point(44, 33); + this.label8.Name = "label8"; + this.label8.Size = new System.Drawing.Size(47, 12); + this.label8.TabIndex = 0; + this.label8.Text = "上相机:"; // - // label12 + // label7 // - this.label12.AutoSize = true; - this.label12.Location = new System.Drawing.Point(23, 36); - this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(95, 12); - this.label12.TabIndex = 0; - this.label12.Text = "下相机飞拍曝光:"; - // - // groupBox2 - // - this.groupBox2.Controls.Add(this.tableLayoutPanel2); - this.groupBox2.Dock = System.Windows.Forms.DockStyle.Fill; - this.groupBox2.ForeColor = System.Drawing.Color.White; - this.groupBox2.Location = new System.Drawing.Point(787, 441); - this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(778, 433); - this.groupBox2.TabIndex = 1; - this.groupBox2.TabStop = false; - this.groupBox2.Text = "参数设定"; - // - // tableLayoutPanel2 - // - this.tableLayoutPanel2.ColumnCount = 4; - this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F)); - this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F)); - this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F)); - this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F)); - this.tableLayoutPanel2.Controls.Add(this.groupBox6, 2, 0); - this.tableLayoutPanel2.Controls.Add(this.groupBox5, 1, 0); - this.tableLayoutPanel2.Controls.Add(this.groupBox4, 0, 0); - this.tableLayoutPanel2.Controls.Add(this.groupBox7, 3, 0); - this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel2.Location = new System.Drawing.Point(3, 17); - this.tableLayoutPanel2.Name = "tableLayoutPanel2"; - this.tableLayoutPanel2.RowCount = 1; - this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel2.Size = new System.Drawing.Size(772, 413); - this.tableLayoutPanel2.TabIndex = 0; - // - // groupBox6 - // - this.groupBox6.Controls.Add(this.textBox9); - this.groupBox6.Controls.Add(this.label17); - this.groupBox6.Controls.Add(this.textBox8); - this.groupBox6.Controls.Add(this.label16); - this.groupBox6.Dock = System.Windows.Forms.DockStyle.Fill; - this.groupBox6.ForeColor = System.Drawing.Color.White; - this.groupBox6.Location = new System.Drawing.Point(389, 3); - this.groupBox6.Name = "groupBox6"; - this.groupBox6.Size = new System.Drawing.Size(187, 407); - this.groupBox6.TabIndex = 2; - this.groupBox6.TabStop = false; - this.groupBox6.Text = "周转吸头"; - // - // textBox9 - // - this.textBox9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(16)))), ((int)(((byte)(16)))), ((int)(((byte)(16))))); - this.textBox9.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.textBox9.Font = new System.Drawing.Font("宋体", 9F); - this.textBox9.ForeColor = System.Drawing.Color.White; - this.textBox9.Location = new System.Drawing.Point(121, 61); - this.textBox9.Name = "textBox9"; - this.textBox9.Size = new System.Drawing.Size(50, 21); - this.textBox9.TabIndex = 48; - this.textBox9.Tag = "SysParam"; - this.textBox9.Text = "1"; - this.textBox9.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - // - // label17 - // - this.label17.AutoSize = true; - this.label17.Location = new System.Drawing.Point(20, 65); - this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(95, 12); - this.label17.TabIndex = 47; - this.label17.Text = "吸嘴放料破延时:"; - // - // textBox8 - // - this.textBox8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(16)))), ((int)(((byte)(16)))), ((int)(((byte)(16))))); - this.textBox8.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.textBox8.Font = new System.Drawing.Font("宋体", 9F); - this.textBox8.ForeColor = System.Drawing.Color.White; - this.textBox8.Location = new System.Drawing.Point(121, 29); - this.textBox8.Name = "textBox8"; - this.textBox8.Size = new System.Drawing.Size(50, 21); - this.textBox8.TabIndex = 48; - this.textBox8.Tag = "SysParam"; - this.textBox8.Text = "1"; - this.textBox8.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - // - // label16 - // - this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(20, 33); - this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(95, 12); - this.label16.TabIndex = 47; - this.label16.Text = "吸嘴取料吸延时:"; - // - // groupBox5 - // - this.groupBox5.Controls.Add(this.textBox7); - this.groupBox5.Controls.Add(this.label15); - this.groupBox5.Controls.Add(this.textBox6); - this.groupBox5.Controls.Add(this.label11); - this.groupBox5.Dock = System.Windows.Forms.DockStyle.Fill; - this.groupBox5.ForeColor = System.Drawing.Color.White; - this.groupBox5.Location = new System.Drawing.Point(196, 3); - this.groupBox5.Name = "groupBox5"; - this.groupBox5.Size = new System.Drawing.Size(187, 407); - this.groupBox5.TabIndex = 1; - this.groupBox5.TabStop = false; - this.groupBox5.Text = "周转盘"; - // - // textBox7 - // - this.textBox7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(16)))), ((int)(((byte)(16)))), ((int)(((byte)(16))))); - this.textBox7.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.textBox7.Font = new System.Drawing.Font("宋体", 9F); - this.textBox7.ForeColor = System.Drawing.Color.White; - this.textBox7.Location = new System.Drawing.Point(118, 56); - this.textBox7.Name = "textBox7"; - this.textBox7.Size = new System.Drawing.Size(50, 21); - this.textBox7.TabIndex = 48; - this.textBox7.Tag = "SysParam"; - this.textBox7.Text = "1"; - this.textBox7.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - // - // label15 - // - this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(17, 60); - this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(107, 12); - this.label15.TabIndex = 47; - this.label15.Text = "周转盘真空破延时:"; - // - // textBox6 - // - this.textBox6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(16)))), ((int)(((byte)(16)))), ((int)(((byte)(16))))); - this.textBox6.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.textBox6.Font = new System.Drawing.Font("宋体", 9F); - this.textBox6.ForeColor = System.Drawing.Color.White; - this.textBox6.Location = new System.Drawing.Point(118, 24); - this.textBox6.Name = "textBox6"; - this.textBox6.Size = new System.Drawing.Size(50, 21); - this.textBox6.TabIndex = 48; - this.textBox6.Tag = "SysParam"; - this.textBox6.Text = "1"; - this.textBox6.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - // - // label11 - // - this.label11.AutoSize = true; - this.label11.Location = new System.Drawing.Point(17, 28); - this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(107, 12); - this.label11.TabIndex = 47; - this.label11.Text = "周转盘真空吸延时:"; - // - // groupBox4 - // - this.groupBox4.Controls.Add(this.textBox5); - this.groupBox4.Controls.Add(this.textBox4); - this.groupBox4.Controls.Add(this.label10); - this.groupBox4.Controls.Add(this.label9); - this.groupBox4.Dock = System.Windows.Forms.DockStyle.Fill; - this.groupBox4.ForeColor = System.Drawing.Color.White; - this.groupBox4.Location = new System.Drawing.Point(3, 3); - this.groupBox4.Name = "groupBox4"; - this.groupBox4.Size = new System.Drawing.Size(187, 407); - this.groupBox4.TabIndex = 0; - this.groupBox4.TabStop = false; - this.groupBox4.Text = "排料吸头"; - // - // textBox5 - // - this.textBox5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(16)))), ((int)(((byte)(16)))), ((int)(((byte)(16))))); - this.textBox5.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.textBox5.Font = new System.Drawing.Font("宋体", 9F); - this.textBox5.ForeColor = System.Drawing.Color.White; - this.textBox5.Location = new System.Drawing.Point(108, 51); - this.textBox5.Name = "textBox5"; - this.textBox5.Size = new System.Drawing.Size(50, 21); - this.textBox5.TabIndex = 48; - this.textBox5.Tag = "SysParam"; - this.textBox5.Text = "1"; - this.textBox5.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - // - // textBox4 - // - this.textBox4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(16)))), ((int)(((byte)(16)))), ((int)(((byte)(16))))); - this.textBox4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.textBox4.Font = new System.Drawing.Font("宋体", 9F); - this.textBox4.ForeColor = System.Drawing.Color.White; - this.textBox4.Location = new System.Drawing.Point(108, 19); - this.textBox4.Name = "textBox4"; - this.textBox4.Size = new System.Drawing.Size(50, 21); - this.textBox4.TabIndex = 48; - this.textBox4.Tag = "SysParam"; - this.textBox4.Text = "1"; - this.textBox4.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - // - // label10 - // - this.label10.AutoSize = true; - this.label10.Location = new System.Drawing.Point(7, 55); - this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(95, 12); - this.label10.TabIndex = 47; - this.label10.Text = "吸嘴放料破延时:"; - // - // label9 - // - this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(7, 23); - this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(95, 12); - this.label9.TabIndex = 47; - this.label9.Text = "吸嘴取料吸延时:"; - // - // groupBox7 - // - this.groupBox7.Controls.Add(this.textBox11); - this.groupBox7.Controls.Add(this.label19); - this.groupBox7.Controls.Add(this.label18); - this.groupBox7.Controls.Add(this.textBox10); - this.groupBox7.Dock = System.Windows.Forms.DockStyle.Fill; - this.groupBox7.ForeColor = System.Drawing.Color.White; - this.groupBox7.Location = new System.Drawing.Point(582, 3); - this.groupBox7.Name = "groupBox7"; - this.groupBox7.Size = new System.Drawing.Size(187, 407); - this.groupBox7.TabIndex = 2; - this.groupBox7.TabStop = false; - this.groupBox7.Text = "测试位"; - // - // textBox11 - // - this.textBox11.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(16)))), ((int)(((byte)(16)))), ((int)(((byte)(16))))); - this.textBox11.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.textBox11.Font = new System.Drawing.Font("宋体", 9F); - this.textBox11.ForeColor = System.Drawing.Color.White; - this.textBox11.Location = new System.Drawing.Point(131, 61); - this.textBox11.Name = "textBox11"; - this.textBox11.Size = new System.Drawing.Size(50, 21); - this.textBox11.TabIndex = 48; - this.textBox11.Tag = "SysParam"; - this.textBox11.Text = "1"; - this.textBox11.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - // - // label19 - // - this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(6, 65); - this.label19.Name = "label19"; - this.label19.Size = new System.Drawing.Size(119, 12); - this.label19.TabIndex = 47; - this.label19.Text = "测试穴位真空破延时:"; - // - // label18 - // - this.label18.AutoSize = true; - this.label18.Location = new System.Drawing.Point(6, 33); - this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(119, 12); - this.label18.TabIndex = 47; - this.label18.Text = "测试穴位真空吸延时:"; - // - // textBox10 - // - this.textBox10.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(16)))), ((int)(((byte)(16)))), ((int)(((byte)(16))))); - this.textBox10.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.textBox10.Font = new System.Drawing.Font("宋体", 9F); - this.textBox10.ForeColor = System.Drawing.Color.White; - this.textBox10.Location = new System.Drawing.Point(131, 29); - this.textBox10.Name = "textBox10"; - this.textBox10.Size = new System.Drawing.Size(50, 21); - this.textBox10.TabIndex = 48; - this.textBox10.Tag = "SysParam"; - this.textBox10.Text = "1"; - this.textBox10.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.label7.AutoSize = true; + this.label7.Location = new System.Drawing.Point(39, 70); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(47, 12); + this.label7.TabIndex = 0; + this.label7.Text = "下相机:"; + // + // cboxUpCameraName + // + this.cboxUpCameraName.FormattingEnabled = true; + this.cboxUpCameraName.Location = new System.Drawing.Point(105, 30); + this.cboxUpCameraName.Name = "cboxUpCameraName"; + this.cboxUpCameraName.Size = new System.Drawing.Size(348, 20); + this.cboxUpCameraName.TabIndex = 1; // // groupBox1 // + this.groupBox1.Controls.Add(this.comboBox1); + this.groupBox1.Controls.Add(this.panel1); + this.groupBox1.Controls.Add(this.label2); + this.groupBox1.Controls.Add(this.label6); this.groupBox1.Controls.Add(this.cboxVirtualAxis); this.groupBox1.Controls.Add(this.cboxCheckSafeEnable); this.groupBox1.Controls.Add(this.cboxRunSpace); this.groupBox1.Controls.Add(this.panelEx1); this.groupBox1.Controls.Add(this.cboxCurRecipe); - this.groupBox1.Controls.Add(this.cboxDownScanCameraName); - this.groupBox1.Controls.Add(this.cboxDownLocationCameraName); this.groupBox1.Controls.Add(this.label4); - this.groupBox1.Controls.Add(this.cboxUpCameraName); - this.groupBox1.Controls.Add(this.label2); this.groupBox1.Controls.Add(this.tbarPressLowSpeed); this.groupBox1.Controls.Add(this.tbarTakeTraySpeed); this.groupBox1.Controls.Add(this.tbarFlyCameraSpeed); - this.groupBox1.Controls.Add(this.label7); this.groupBox1.Controls.Add(this.tbarWholeSpeed); this.groupBox1.Controls.Add(this.lblPressLowSpeed); this.groupBox1.Controls.Add(this.lblTakeTraySpeed); - this.groupBox1.Controls.Add(this.label8); this.groupBox1.Controls.Add(this.lblFlyCameraSpeed); this.groupBox1.Controls.Add(this.label20); this.groupBox1.Controls.Add(this.label5); @@ -624,10 +352,75 @@ this.groupBox1.TabStop = false; this.groupBox1.Text = "参数设定"; // + // comboBox1 + // + this.comboBox1.FormattingEnabled = true; + this.comboBox1.Items.AddRange(new object[] { + "中文", + "English"}); + this.comboBox1.Location = new System.Drawing.Point(109, 273); + this.comboBox1.Name = "comboBox1"; + this.comboBox1.Size = new System.Drawing.Size(121, 20); + this.comboBox1.TabIndex = 43; + // + // panel1 + // + this.panel1.Controls.Add(this.radioButton4); + this.panel1.Controls.Add(this.radioButton3); + this.panel1.Location = new System.Drawing.Point(564, 295); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(190, 33); + this.panel1.TabIndex = 2; + this.panel1.Visible = false; + // + // radioButton4 + // + this.radioButton4.AutoSize = true; + this.radioButton4.FlatAppearance.CheckedBackColor = System.Drawing.Color.Lime; + this.radioButton4.Location = new System.Drawing.Point(90, 6); + this.radioButton4.Name = "radioButton4"; + this.radioButton4.Size = new System.Drawing.Size(71, 16); + this.radioButton4.TabIndex = 1; + this.radioButton4.Text = "从右到左"; + this.radioButton4.UseVisualStyleBackColor = true; + // + // radioButton3 + // + this.radioButton3.AutoSize = true; + this.radioButton3.Checked = true; + this.radioButton3.FlatAppearance.CheckedBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0))))); + this.radioButton3.Location = new System.Drawing.Point(12, 6); + this.radioButton3.Name = "radioButton3"; + this.radioButton3.Size = new System.Drawing.Size(71, 16); + this.radioButton3.TabIndex = 1; + this.radioButton3.TabStop = true; + this.radioButton3.Text = "从左到右"; + this.radioButton3.UseVisualStyleBackColor = true; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.ForeColor = System.Drawing.Color.White; + this.label2.Location = new System.Drawing.Point(57, 273); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(35, 12); + this.label2.TabIndex = 0; + this.label2.Text = "语言:"; + // + // label6 + // + this.label6.AutoSize = true; + this.label6.Location = new System.Drawing.Point(469, 305); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(71, 12); + this.label6.TabIndex = 0; + this.label6.Text = "取放料方式:"; + this.label6.Visible = false; + // // cboxVirtualAxis // this.cboxVirtualAxis.AutoSize = true; - this.cboxVirtualAxis.Location = new System.Drawing.Point(257, 341); + this.cboxVirtualAxis.Location = new System.Drawing.Point(256, 240); this.cboxVirtualAxis.Name = "cboxVirtualAxis"; this.cboxVirtualAxis.Size = new System.Drawing.Size(60, 16); this.cboxVirtualAxis.TabIndex = 8; @@ -637,7 +430,7 @@ // cboxCheckSafeEnable // this.cboxCheckSafeEnable.AutoSize = true; - this.cboxCheckSafeEnable.Location = new System.Drawing.Point(179, 341); + this.cboxCheckSafeEnable.Location = new System.Drawing.Point(172, 240); this.cboxCheckSafeEnable.Name = "cboxCheckSafeEnable"; this.cboxCheckSafeEnable.Size = new System.Drawing.Size(72, 16); this.cboxCheckSafeEnable.TabIndex = 8; @@ -647,7 +440,7 @@ // cboxRunSpace // this.cboxRunSpace.AutoSize = true; - this.cboxRunSpace.Location = new System.Drawing.Point(112, 340); + this.cboxRunSpace.Location = new System.Drawing.Point(112, 239); this.cboxRunSpace.Name = "cboxRunSpace"; this.cboxRunSpace.Size = new System.Drawing.Size(48, 16); this.cboxRunSpace.TabIndex = 8; @@ -683,53 +476,20 @@ this.cboxCurRecipe.FormattingEnabled = true; this.cboxCurRecipe.Items.AddRange(new object[] { "Default"}); - this.cboxCurRecipe.Location = new System.Drawing.Point(112, 310); + this.cboxCurRecipe.Location = new System.Drawing.Point(112, 202); this.cboxCurRecipe.Name = "cboxCurRecipe"; this.cboxCurRecipe.Size = new System.Drawing.Size(348, 20); this.cboxCurRecipe.TabIndex = 1; // - // cboxDownScanCameraName - // - this.cboxDownScanCameraName.FormattingEnabled = true; - this.cboxDownScanCameraName.Location = new System.Drawing.Point(112, 273); - this.cboxDownScanCameraName.Name = "cboxDownScanCameraName"; - this.cboxDownScanCameraName.Size = new System.Drawing.Size(348, 20); - this.cboxDownScanCameraName.TabIndex = 1; - // - // cboxDownLocationCameraName - // - this.cboxDownLocationCameraName.FormattingEnabled = true; - this.cboxDownLocationCameraName.Location = new System.Drawing.Point(112, 234); - this.cboxDownLocationCameraName.Name = "cboxDownLocationCameraName"; - this.cboxDownLocationCameraName.Size = new System.Drawing.Size(348, 20); - this.cboxDownLocationCameraName.TabIndex = 1; - // // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(39, 313); + this.label4.Location = new System.Drawing.Point(57, 205); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(35, 12); this.label4.TabIndex = 0; this.label4.Text = "配方:"; // - // cboxUpCameraName - // - this.cboxUpCameraName.FormattingEnabled = true; - this.cboxUpCameraName.Location = new System.Drawing.Point(112, 197); - this.cboxUpCameraName.Name = "cboxUpCameraName"; - this.cboxUpCameraName.Size = new System.Drawing.Size(348, 20); - this.cboxUpCameraName.TabIndex = 1; - // - // label2 - // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(39, 276); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(59, 12); - this.label2.TabIndex = 0; - this.label2.Text = "扫码相机:"; - // // tbarPressLowSpeed // this.tbarPressLowSpeed.AutoSize = false; @@ -738,7 +498,7 @@ this.tbarPressLowSpeed.Maximum = 100; this.tbarPressLowSpeed.Minimum = 1; this.tbarPressLowSpeed.Name = "tbarPressLowSpeed"; - this.tbarPressLowSpeed.Size = new System.Drawing.Size(379, 24); + this.tbarPressLowSpeed.Size = new System.Drawing.Size(350, 20); this.tbarPressLowSpeed.TabIndex = 1; this.tbarPressLowSpeed.TickStyle = System.Windows.Forms.TickStyle.None; this.tbarPressLowSpeed.Value = 1; @@ -748,11 +508,11 @@ // this.tbarTakeTraySpeed.AutoSize = false; this.tbarTakeTraySpeed.LargeChange = 1; - this.tbarTakeTraySpeed.Location = new System.Drawing.Point(105, 95); + this.tbarTakeTraySpeed.Location = new System.Drawing.Point(105, 90); this.tbarTakeTraySpeed.Maximum = 100; this.tbarTakeTraySpeed.Minimum = 1; this.tbarTakeTraySpeed.Name = "tbarTakeTraySpeed"; - this.tbarTakeTraySpeed.Size = new System.Drawing.Size(379, 24); + this.tbarTakeTraySpeed.Size = new System.Drawing.Size(350, 20); this.tbarTakeTraySpeed.TabIndex = 1; this.tbarTakeTraySpeed.TickStyle = System.Windows.Forms.TickStyle.None; this.tbarTakeTraySpeed.Value = 1; @@ -762,25 +522,16 @@ // this.tbarFlyCameraSpeed.AutoSize = false; this.tbarFlyCameraSpeed.LargeChange = 1; - this.tbarFlyCameraSpeed.Location = new System.Drawing.Point(105, 65); + this.tbarFlyCameraSpeed.Location = new System.Drawing.Point(105, 59); this.tbarFlyCameraSpeed.Maximum = 100; this.tbarFlyCameraSpeed.Minimum = 1; this.tbarFlyCameraSpeed.Name = "tbarFlyCameraSpeed"; - this.tbarFlyCameraSpeed.Size = new System.Drawing.Size(379, 24); + this.tbarFlyCameraSpeed.Size = new System.Drawing.Size(350, 20); this.tbarFlyCameraSpeed.TabIndex = 1; this.tbarFlyCameraSpeed.TickStyle = System.Windows.Forms.TickStyle.None; this.tbarFlyCameraSpeed.Value = 1; this.tbarFlyCameraSpeed.ValueChanged += new System.EventHandler(this.tbarFlyCameraSpeed_ValueChanged); // - // label7 - // - this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(27, 237); - this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(71, 12); - this.label7.TabIndex = 0; - this.label7.Text = "下定位相机:"; - // // tbarWholeSpeed // this.tbarWholeSpeed.AutoSize = false; @@ -789,7 +540,7 @@ this.tbarWholeSpeed.Maximum = 100; this.tbarWholeSpeed.Minimum = 1; this.tbarWholeSpeed.Name = "tbarWholeSpeed"; - this.tbarWholeSpeed.Size = new System.Drawing.Size(379, 24); + this.tbarWholeSpeed.Size = new System.Drawing.Size(350, 20); this.tbarWholeSpeed.TabIndex = 1; this.tbarWholeSpeed.TickStyle = System.Windows.Forms.TickStyle.None; this.tbarWholeSpeed.Value = 1; @@ -798,7 +549,7 @@ // lblPressLowSpeed // this.lblPressLowSpeed.AutoSize = true; - this.lblPressLowSpeed.Location = new System.Drawing.Point(490, 126); + this.lblPressLowSpeed.Location = new System.Drawing.Point(458, 125); this.lblPressLowSpeed.Name = "lblPressLowSpeed"; this.lblPressLowSpeed.Size = new System.Drawing.Size(17, 12); this.lblPressLowSpeed.TabIndex = 0; @@ -807,25 +558,16 @@ // lblTakeTraySpeed // this.lblTakeTraySpeed.AutoSize = true; - this.lblTakeTraySpeed.Location = new System.Drawing.Point(490, 99); + this.lblTakeTraySpeed.Location = new System.Drawing.Point(458, 96); this.lblTakeTraySpeed.Name = "lblTakeTraySpeed"; this.lblTakeTraySpeed.Size = new System.Drawing.Size(17, 12); this.lblTakeTraySpeed.TabIndex = 0; this.lblTakeTraySpeed.Text = "5%"; // - // label8 - // - this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(51, 200); - this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(47, 12); - this.label8.TabIndex = 0; - this.label8.Text = "上相机:"; - // // lblFlyCameraSpeed // this.lblFlyCameraSpeed.AutoSize = true; - this.lblFlyCameraSpeed.Location = new System.Drawing.Point(490, 69); + this.lblFlyCameraSpeed.Location = new System.Drawing.Point(458, 64); this.lblFlyCameraSpeed.Name = "lblFlyCameraSpeed"; this.lblFlyCameraSpeed.Size = new System.Drawing.Size(17, 12); this.lblFlyCameraSpeed.TabIndex = 0; @@ -834,7 +576,7 @@ // label20 // this.label20.AutoSize = true; - this.label20.Location = new System.Drawing.Point(47, 126); + this.label20.Location = new System.Drawing.Point(39, 126); this.label20.Name = "label20"; this.label20.Size = new System.Drawing.Size(53, 12); this.label20.TabIndex = 0; @@ -843,7 +585,7 @@ // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(17, 99); + this.label5.Location = new System.Drawing.Point(9, 94); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(83, 12); this.label5.TabIndex = 0; @@ -852,7 +594,7 @@ // lblWholeSpeed // this.lblWholeSpeed.AutoSize = true; - this.lblWholeSpeed.Location = new System.Drawing.Point(490, 32); + this.lblWholeSpeed.Location = new System.Drawing.Point(458, 32); this.lblWholeSpeed.Name = "lblWholeSpeed"; this.lblWholeSpeed.Size = new System.Drawing.Size(17, 12); this.lblWholeSpeed.TabIndex = 0; @@ -861,7 +603,7 @@ // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(41, 69); + this.label3.Location = new System.Drawing.Point(33, 62); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(59, 12); this.label3.TabIndex = 0; @@ -870,7 +612,7 @@ // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(41, 32); + this.label1.Location = new System.Drawing.Point(33, 32); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(59, 12); this.label1.TabIndex = 0; @@ -914,7 +656,7 @@ // label26 // this.label26.AutoSize = true; - this.label26.Location = new System.Drawing.Point(51, 159); + this.label26.Location = new System.Drawing.Point(45, 159); this.label26.Name = "label26"; this.label26.Size = new System.Drawing.Size(47, 12); this.label26.TabIndex = 0; @@ -930,24 +672,16 @@ this.Text = "CommonConfig"; this.Load += new System.EventHandler(this.CommonConfig_Load); this.tableLayoutPanel1.ResumeLayout(false); - this.groupBox8.ResumeLayout(false); - this.groupBox8.PerformLayout(); - this.panel1.ResumeLayout(false); - this.panel1.PerformLayout(); this.groupBox3.ResumeLayout(false); this.groupBox3.PerformLayout(); - this.groupBox2.ResumeLayout(false); - this.tableLayoutPanel2.ResumeLayout(false); - this.groupBox6.ResumeLayout(false); - this.groupBox6.PerformLayout(); - this.groupBox5.ResumeLayout(false); - this.groupBox5.PerformLayout(); - this.groupBox4.ResumeLayout(false); - this.groupBox4.PerformLayout(); - this.groupBox7.ResumeLayout(false); - this.groupBox7.PerformLayout(); + this.groupBox10.ResumeLayout(false); + this.groupBox10.PerformLayout(); + this.groupBox9.ResumeLayout(false); + this.groupBox9.PerformLayout(); this.groupBox1.ResumeLayout(false); this.groupBox1.PerformLayout(); + this.panel1.ResumeLayout(false); + this.panel1.PerformLayout(); this.panelEx1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.tbarPressLowSpeed)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.tbarTakeTraySpeed)).EndInit(); @@ -976,39 +710,15 @@ private System.Windows.Forms.Label label27; private System.Windows.Forms.TextBox txtControlCenterIP; private System.Windows.Forms.Label label26; - private System.Windows.Forms.ComboBox cboxDownScanCameraName; - private System.Windows.Forms.Label label2; private System.Windows.Forms.ComboBox cboxCurRecipe; private System.Windows.Forms.Label label4; private System.Windows.Forms.TrackBar tbarTakeTraySpeed; private System.Windows.Forms.Label lblTakeTraySpeed; private System.Windows.Forms.Label label5; private System.Windows.Forms.CheckBox cboxCheckSafeEnable; - private System.Windows.Forms.GroupBox groupBox2; private Controls.PanelEx panelEx1; private System.Windows.Forms.Button btnSaveSpeedParam; private System.Windows.Forms.GroupBox groupBox3; - private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2; - private System.Windows.Forms.GroupBox groupBox4; - private System.Windows.Forms.GroupBox groupBox6; - private System.Windows.Forms.GroupBox groupBox5; - private System.Windows.Forms.TextBox textBox4; - private System.Windows.Forms.Label label9; - private System.Windows.Forms.TextBox textBox5; - private System.Windows.Forms.Label label10; - private System.Windows.Forms.TextBox textBox9; - private System.Windows.Forms.Label label17; - private System.Windows.Forms.TextBox textBox8; - private System.Windows.Forms.Label label16; - private System.Windows.Forms.TextBox textBox7; - private System.Windows.Forms.Label label15; - private System.Windows.Forms.TextBox textBox6; - private System.Windows.Forms.Label label11; - private System.Windows.Forms.GroupBox groupBox7; - private System.Windows.Forms.TextBox textBox11; - private System.Windows.Forms.Label label19; - private System.Windows.Forms.Label label18; - private System.Windows.Forms.TextBox textBox10; private System.Windows.Forms.TextBox txtFlyGrabGain; private System.Windows.Forms.Label label13; private System.Windows.Forms.TextBox txtFlyGrabExposureTime; @@ -1020,12 +730,17 @@ private System.Windows.Forms.Label label20; private System.Windows.Forms.CheckBox cboxVirtualAxis; private System.Windows.Forms.GroupBox groupBox8; - private System.Windows.Forms.Label label22; - private System.Windows.Forms.RadioButton radioButton2; - private System.Windows.Forms.RadioButton radioButton1; private System.Windows.Forms.Panel panel1; private System.Windows.Forms.RadioButton radioButton4; private System.Windows.Forms.RadioButton radioButton3; private System.Windows.Forms.Label label6; + private System.Windows.Forms.GroupBox groupBox10; + private System.Windows.Forms.TextBox txtUpCameraExposureTime; + private System.Windows.Forms.Label label21; + private System.Windows.Forms.Label label24; + private System.Windows.Forms.TextBox txtUpCameraGain; + private System.Windows.Forms.GroupBox groupBox9; + private System.Windows.Forms.ComboBox comboBox1; + private System.Windows.Forms.Label label2; } } \ No newline at end of file diff --git a/Rs.SkyLine/SysConfig/CommonConfig.cs b/Rs.SkyLine/SysConfig/CommonConfig.cs index 9b754d8..b8b119f 100644 --- a/Rs.SkyLine/SysConfig/CommonConfig.cs +++ b/Rs.SkyLine/SysConfig/CommonConfig.cs @@ -33,7 +33,6 @@ namespace Rs.MotionPlat.SysConfig { cboxUpCameraName.Items.Add(cam); cboxDownLocationCameraName.Items.Add(cam); - cboxDownScanCameraName.Items.Add(cam); } foreach (var con in groupBox1.Controls) { @@ -60,8 +59,9 @@ namespace Rs.MotionPlat.SysConfig } } - LoadSysParam(groupBox2); - PositionHelper.BindPosition(groupBox3,"int"); + //LoadSysParam(groupBox2); + PositionHelper.BindPosition(groupBox9,"int"); + PositionHelper.BindPosition(groupBox10, "int"); } private void btnSaveSpeedParam_Click(object sender, EventArgs e)