diff --git a/Rs.SkyLine/SysConfig/ClampConfig.Designer.cs b/Rs.SkyLine/SysConfig/ClampConfig.Designer.cs index 3da9993..2381f35 100644 --- a/Rs.SkyLine/SysConfig/ClampConfig.Designer.cs +++ b/Rs.SkyLine/SysConfig/ClampConfig.Designer.cs @@ -234,7 +234,7 @@ this.label14.Name = "label14"; this.label14.Size = new System.Drawing.Size(65, 12); this.label14.TabIndex = 47; - this.label14.Text = "取料盘位X:"; + this.label14.Text = "相机中心X:"; // // label13 // @@ -243,7 +243,7 @@ this.label13.Name = "label13"; this.label13.Size = new System.Drawing.Size(65, 12); this.label13.TabIndex = 47; - this.label13.Text = "取料盘位Y:"; + this.label13.Text = "相机中心Y:"; // // btnTeachEmpty2TakeTrayX // @@ -346,7 +346,7 @@ this.label11.Name = "label11"; this.label11.Size = new System.Drawing.Size(65, 12); this.label11.TabIndex = 47; - this.label11.Text = "取料盘位X:"; + this.label11.Text = "相机中心X:"; // // btnTeachMultiTakeTrayX // @@ -370,7 +370,7 @@ this.label12.Name = "label12"; this.label12.Size = new System.Drawing.Size(65, 12); this.label12.TabIndex = 47; - this.label12.Text = "取料盘位Y:"; + this.label12.Text = "相机中心Y:"; // // txtMultiTakeTrayX // @@ -503,7 +503,7 @@ this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(65, 12); this.label9.TabIndex = 47; - this.label9.Text = "取料盘位Y:"; + this.label9.Text = "相机中心Y:"; // // label10 // @@ -512,7 +512,7 @@ this.label10.Name = "label10"; this.label10.Size = new System.Drawing.Size(65, 12); this.label10.TabIndex = 47; - this.label10.Text = "取料盘位X:"; + this.label10.Text = "相机中心X:"; // // groupBox6 // @@ -615,7 +615,7 @@ this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(65, 12); this.label7.TabIndex = 47; - this.label7.Text = "取料盘位X:"; + this.label7.Text = "相机中心X:"; // // label8 // @@ -624,7 +624,7 @@ this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(65, 12); this.label8.TabIndex = 47; - this.label8.Text = "取料盘位Y:"; + this.label8.Text = "相机中心Y:"; // // txtOkTakeTrayX // @@ -742,7 +742,7 @@ this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(65, 12); this.label6.TabIndex = 47; - this.label6.Text = "取料盘位Y:"; + this.label6.Text = "相机中心Y:"; // // txtInputTakeTrayX // @@ -766,7 +766,7 @@ this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(65, 12); this.label5.TabIndex = 47; - this.label5.Text = "取料盘位X:"; + this.label5.Text = "相机中心X:"; // // groupBox2 // @@ -839,7 +839,7 @@ this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(65, 12); this.label4.TabIndex = 47; - this.label4.Text = "取料盘位Y:"; + this.label4.Text = "相机中心Y:"; // // txtEmpty1TakeTrayX // @@ -863,7 +863,7 @@ this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(65, 12); this.label3.TabIndex = 47; - this.label3.Text = "取料盘位X:"; + this.label3.Text = "相机中心X:"; // // btnMoveEmpty1TakeTrayY // diff --git a/Rs.SkyLine/SysConfig/DownCameraCalibration.cs b/Rs.SkyLine/SysConfig/DownCameraCalibration.cs index a2a7994..b10eb35 100644 --- a/Rs.SkyLine/SysConfig/DownCameraCalibration.cs +++ b/Rs.SkyLine/SysConfig/DownCameraCalibration.cs @@ -21,9 +21,9 @@ namespace Rs.MotionPlat.SysConfig public DownCameraCalibration() { InitializeComponent(); - cameraTemplate1.ItemName = "下相机标定"; - cameraTemplate1.SetFindShapeMode(EFindShapeMode.SelfDefine); - cameraTemplate1.FindShapeEvent += CameraTemplate1_FindShapeEvent; + //cameraTemplate1.ItemName = "下相机标定"; + //cameraTemplate1.SetFindShapeMode(EFindShapeMode.SelfDefine); + //cameraTemplate1.FindShapeEvent += CameraTemplate1_FindShapeEvent; } private void CameraTemplate1_FindShapeEvent(ChoiceTech.Halcon.Control.HWindow_Final win, HObject sourceImage) @@ -74,18 +74,18 @@ namespace Rs.MotionPlat.SysConfig private void DownCameraCalibration_FormClosing(object sender, FormClosingEventArgs e) { - cameraTemplate1.RemoveGrabEvent(); + //cameraTemplate1.RemoveGrabEvent(); } private void btnGetMatchResult_Click(object sender, EventArgs e) { - cameraTemplate1.GetMatchResult(out double row, out double column, out double angle, out double score); - int rowIndex = dgvPixCalib.Rows.Add(); - dgvPixCalib.Rows[rowIndex].Cells[0].Value = row.ToString("0.000"); - dgvPixCalib.Rows[rowIndex].Cells[1].Value = column.ToString("0.000"); - dgvPixCalib.Rows[rowIndex].Cells[2].Value = angle.ToString("0.000"); - dgvPixCalib.Rows[rowIndex].Cells[3].Value = score.ToString("0.000"); - Msg.ShowInfo($"{row},{column},{angle},{score}"); + //cameraTemplate1.GetMatchResult(out double row, out double column, out double angle, out double score); + //int rowIndex = dgvPixCalib.Rows.Add(); + //dgvPixCalib.Rows[rowIndex].Cells[0].Value = row.ToString("0.000"); + //dgvPixCalib.Rows[rowIndex].Cells[1].Value = column.ToString("0.000"); + //dgvPixCalib.Rows[rowIndex].Cells[2].Value = angle.ToString("0.000"); + //dgvPixCalib.Rows[rowIndex].Cells[3].Value = score.ToString("0.000"); + //Msg.ShowInfo($"{row},{column},{angle},{score}"); } private void DownCameraCalibration_Load(object sender, EventArgs e) diff --git a/Rs.SkyLine/SysConfig/DownCameraCalibration.designer.cs b/Rs.SkyLine/SysConfig/DownCameraCalibration.designer.cs index f57bcd1..824cf30 100644 --- a/Rs.SkyLine/SysConfig/DownCameraCalibration.designer.cs +++ b/Rs.SkyLine/SysConfig/DownCameraCalibration.designer.cs @@ -28,16 +28,16 @@ /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = 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(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); this.panelEx2 = new Rs.Controls.PanelEx(); this.groupBox2 = new System.Windows.Forms.GroupBox(); this.dgvRotateCenter = new System.Windows.Forms.DataGridView(); @@ -73,13 +73,11 @@ this.label7 = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label(); this.panelEx1 = new Rs.Controls.PanelEx(); - this.cameraTemplate1 = new Rs.MotionPlat.CameraTemplate(); this.panelEx2.SuspendLayout(); this.groupBox2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dgvRotateCenter)).BeginInit(); this.groupBox1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dgvPixCalib)).BeginInit(); - this.panelEx1.SuspendLayout(); this.SuspendLayout(); // // panelEx2 @@ -119,9 +117,9 @@ this.dgvRotateCenter.AllowUserToDeleteRows = false; this.dgvRotateCenter.AllowUserToResizeColumns = false; this.dgvRotateCenter.AllowUserToResizeRows = false; - dataGridViewCellStyle16.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(56)))), ((int)(((byte)(56)))), ((int)(((byte)(56))))); - dataGridViewCellStyle16.ForeColor = System.Drawing.Color.White; - this.dgvRotateCenter.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle16; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(56)))), ((int)(((byte)(56)))), ((int)(((byte)(56))))); + dataGridViewCellStyle1.ForeColor = System.Drawing.Color.White; + this.dgvRotateCenter.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; this.dgvRotateCenter.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; this.dgvRotateCenter.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(56)))), ((int)(((byte)(56)))), ((int)(((byte)(56))))); this.dgvRotateCenter.ColumnHeadersHeight = 30; @@ -137,14 +135,14 @@ this.dgvRotateCenter.MultiSelect = false; this.dgvRotateCenter.Name = "dgvRotateCenter"; this.dgvRotateCenter.ReadOnly = true; - dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle20.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(11)))), ((int)(((byte)(16)))), ((int)(((byte)(36))))); - dataGridViewCellStyle20.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle20.ForeColor = System.Drawing.Color.White; - dataGridViewCellStyle20.SelectionBackColor = System.Drawing.Color.White; - dataGridViewCellStyle20.SelectionForeColor = System.Drawing.Color.White; - dataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dgvRotateCenter.RowHeadersDefaultCellStyle = dataGridViewCellStyle20; + 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.dgvRotateCenter.RowHeadersDefaultCellStyle = dataGridViewCellStyle5; this.dgvRotateCenter.RowHeadersVisible = false; this.dgvRotateCenter.RowHeadersWidth = 30; this.dgvRotateCenter.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; @@ -166,8 +164,8 @@ // dataGridViewTextBoxColumn2 // this.dataGridViewTextBoxColumn2.DataPropertyName = "X"; - dataGridViewCellStyle17.Format = "0.000"; - this.dataGridViewTextBoxColumn2.DefaultCellStyle = dataGridViewCellStyle17; + dataGridViewCellStyle2.Format = "0.000"; + this.dataGridViewTextBoxColumn2.DefaultCellStyle = dataGridViewCellStyle2; this.dataGridViewTextBoxColumn2.FillWeight = 25.76511F; this.dataGridViewTextBoxColumn2.HeaderText = "Column"; this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2"; @@ -176,8 +174,8 @@ // dataGridViewTextBoxColumn3 // this.dataGridViewTextBoxColumn3.DataPropertyName = "Y"; - dataGridViewCellStyle18.Format = "0.000"; - this.dataGridViewTextBoxColumn3.DefaultCellStyle = dataGridViewCellStyle18; + dataGridViewCellStyle3.Format = "0.000"; + this.dataGridViewTextBoxColumn3.DefaultCellStyle = dataGridViewCellStyle3; this.dataGridViewTextBoxColumn3.FillWeight = 24.21075F; this.dataGridViewTextBoxColumn3.HeaderText = "Angle"; this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3"; @@ -185,10 +183,10 @@ // // dataGridViewTextBoxColumn4 // - dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle19.BackColor = System.Drawing.Color.Silver; - dataGridViewCellStyle19.ForeColor = System.Drawing.Color.White; - this.dataGridViewTextBoxColumn4.DefaultCellStyle = dataGridViewCellStyle19; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle4.BackColor = System.Drawing.Color.Silver; + dataGridViewCellStyle4.ForeColor = System.Drawing.Color.White; + this.dataGridViewTextBoxColumn4.DefaultCellStyle = dataGridViewCellStyle4; this.dataGridViewTextBoxColumn4.FillWeight = 26.00443F; this.dataGridViewTextBoxColumn4.HeaderText = "Score"; this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4"; @@ -325,9 +323,9 @@ this.dgvPixCalib.AllowUserToDeleteRows = false; this.dgvPixCalib.AllowUserToResizeColumns = false; this.dgvPixCalib.AllowUserToResizeRows = false; - dataGridViewCellStyle11.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(56)))), ((int)(((byte)(56)))), ((int)(((byte)(56))))); - dataGridViewCellStyle11.ForeColor = System.Drawing.Color.White; - this.dgvPixCalib.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle11; + dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(56)))), ((int)(((byte)(56)))), ((int)(((byte)(56))))); + dataGridViewCellStyle6.ForeColor = System.Drawing.Color.White; + this.dgvPixCalib.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle6; this.dgvPixCalib.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; this.dgvPixCalib.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(56)))), ((int)(((byte)(56)))), ((int)(((byte)(56))))); this.dgvPixCalib.ColumnHeadersHeight = 30; @@ -343,14 +341,14 @@ this.dgvPixCalib.MultiSelect = false; this.dgvPixCalib.Name = "dgvPixCalib"; this.dgvPixCalib.ReadOnly = true; - dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle15.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(11)))), ((int)(((byte)(16)))), ((int)(((byte)(36))))); - dataGridViewCellStyle15.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle15.ForeColor = System.Drawing.Color.White; - dataGridViewCellStyle15.SelectionBackColor = System.Drawing.Color.White; - dataGridViewCellStyle15.SelectionForeColor = System.Drawing.Color.White; - dataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dgvPixCalib.RowHeadersDefaultCellStyle = dataGridViewCellStyle15; + 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.dgvPixCalib.RowHeadersDefaultCellStyle = dataGridViewCellStyle10; this.dgvPixCalib.RowHeadersVisible = false; this.dgvPixCalib.RowHeadersWidth = 30; this.dgvPixCalib.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; @@ -372,8 +370,8 @@ // X // this.X.DataPropertyName = "X"; - dataGridViewCellStyle12.Format = "0.000"; - this.X.DefaultCellStyle = dataGridViewCellStyle12; + dataGridViewCellStyle7.Format = "0.000"; + this.X.DefaultCellStyle = dataGridViewCellStyle7; this.X.FillWeight = 25.76511F; this.X.HeaderText = "Column"; this.X.Name = "X"; @@ -382,8 +380,8 @@ // Y // this.Y.DataPropertyName = "Y"; - dataGridViewCellStyle13.Format = "0.000"; - this.Y.DefaultCellStyle = dataGridViewCellStyle13; + dataGridViewCellStyle8.Format = "0.000"; + this.Y.DefaultCellStyle = dataGridViewCellStyle8; this.Y.FillWeight = 24.21075F; this.Y.HeaderText = "Angle"; this.Y.Name = "Y"; @@ -391,10 +389,10 @@ // // Move // - dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle14.BackColor = System.Drawing.Color.Silver; - dataGridViewCellStyle14.ForeColor = System.Drawing.Color.White; - this.Move.DefaultCellStyle = dataGridViewCellStyle14; + dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle9.BackColor = System.Drawing.Color.Silver; + dataGridViewCellStyle9.ForeColor = System.Drawing.Color.White; + this.Move.DefaultCellStyle = dataGridViewCellStyle9; this.Move.FillWeight = 26.00443F; this.Move.HeaderText = "Score"; this.Move.Name = "Move"; @@ -537,22 +535,12 @@ // // panelEx1 // - this.panelEx1.Controls.Add(this.cameraTemplate1); this.panelEx1.Dock = System.Windows.Forms.DockStyle.Fill; this.panelEx1.Location = new System.Drawing.Point(519, 0); this.panelEx1.Name = "panelEx1"; this.panelEx1.Size = new System.Drawing.Size(874, 822); this.panelEx1.TabIndex = 2; // - // cameraTemplate1 - // - this.cameraTemplate1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(11)))), ((int)(((byte)(16)))), ((int)(((byte)(36))))); - this.cameraTemplate1.Dock = System.Windows.Forms.DockStyle.Fill; - this.cameraTemplate1.Location = new System.Drawing.Point(0, 0); - this.cameraTemplate1.Name = "cameraTemplate1"; - this.cameraTemplate1.Size = new System.Drawing.Size(874, 822); - this.cameraTemplate1.TabIndex = 0; - // // DownCameraCalibration // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -571,7 +559,6 @@ this.groupBox1.ResumeLayout(false); this.groupBox1.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.dgvPixCalib)).EndInit(); - this.panelEx1.ResumeLayout(false); this.ResumeLayout(false); } @@ -580,7 +567,6 @@ private Controls.PanelEx panelEx2; private Controls.PanelEx panelEx1; - private CameraTemplate cameraTemplate1; private System.Windows.Forms.GroupBox groupBox2; private System.Windows.Forms.GroupBox groupBox1; private System.Windows.Forms.Label label1; diff --git a/Rs.SkyLine/SysConfig/DownCameraCalibration.resx b/Rs.SkyLine/SysConfig/DownCameraCalibration.resx index da9b9eb..d726269 100644 --- a/Rs.SkyLine/SysConfig/DownCameraCalibration.resx +++ b/Rs.SkyLine/SysConfig/DownCameraCalibration.resx @@ -117,28 +117,28 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + True - + True - + True - + True - + True - + True - + True - + True \ No newline at end of file diff --git a/Rs.SkyLine/SysConfig/NozzleDistance.Designer.cs b/Rs.SkyLine/SysConfig/NozzleDistance.Designer.cs index 1591ea4..b43138f 100644 --- a/Rs.SkyLine/SysConfig/NozzleDistance.Designer.cs +++ b/Rs.SkyLine/SysConfig/NozzleDistance.Designer.cs @@ -94,10 +94,8 @@ this.txtNozzle1CenterY = new System.Windows.Forms.TextBox(); this.label5 = new System.Windows.Forms.Label(); this.panelEx1 = new Rs.Controls.PanelEx(); - this.cameraTemplate1 = new Rs.MotionPlat.CameraTemplate(); this.panelEx2.SuspendLayout(); this.groupBox1.SuspendLayout(); - this.panelEx1.SuspendLayout(); this.SuspendLayout(); // // panelEx2 @@ -896,22 +894,12 @@ // // panelEx1 // - this.panelEx1.Controls.Add(this.cameraTemplate1); this.panelEx1.Dock = System.Windows.Forms.DockStyle.Fill; this.panelEx1.Location = new System.Drawing.Point(509, 0); this.panelEx1.Name = "panelEx1"; this.panelEx1.Size = new System.Drawing.Size(716, 778); this.panelEx1.TabIndex = 6; // - // cameraTemplate1 - // - this.cameraTemplate1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(11)))), ((int)(((byte)(16)))), ((int)(((byte)(36))))); - this.cameraTemplate1.Dock = System.Windows.Forms.DockStyle.Fill; - this.cameraTemplate1.Location = new System.Drawing.Point(0, 0); - this.cameraTemplate1.Name = "cameraTemplate1"; - this.cameraTemplate1.Size = new System.Drawing.Size(716, 778); - this.cameraTemplate1.TabIndex = 0; - // // NozzleDistance // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -926,7 +914,6 @@ this.panelEx2.ResumeLayout(false); this.groupBox1.ResumeLayout(false); this.groupBox1.PerformLayout(); - this.panelEx1.ResumeLayout(false); this.ResumeLayout(false); } @@ -948,7 +935,6 @@ private System.Windows.Forms.TextBox txtNozzle2CenterY; private System.Windows.Forms.Label label2; private Controls.PanelEx panelEx1; - private CameraTemplate cameraTemplate1; private System.Windows.Forms.Button btnGotoNozzle2; private System.Windows.Forms.Button btnGotoNozzle1; private System.Windows.Forms.Button btnGotoNozzle9; diff --git a/Rs.SkyLine/SysConfig/NozzleDistance.cs b/Rs.SkyLine/SysConfig/NozzleDistance.cs index 0b824bb..251b02c 100644 --- a/Rs.SkyLine/SysConfig/NozzleDistance.cs +++ b/Rs.SkyLine/SysConfig/NozzleDistance.cs @@ -21,9 +21,9 @@ namespace Rs.MotionPlat.SysConfig public NozzleDistance() { InitializeComponent(); - cameraTemplate1.ItemName = "吸嘴间距标定"; - cameraTemplate1.SetFindShapeMode(EFindShapeMode.SelfDefine); - cameraTemplate1.FindShapeEvent += CameraTemplate1_FindShapeEvent; + //cameraTemplate1.ItemName = "吸嘴间距标定"; + //cameraTemplate1.SetFindShapeMode(EFindShapeMode.SelfDefine); + //cameraTemplate1.FindShapeEvent += CameraTemplate1_FindShapeEvent; //cameraTemplate1.ManualGrab += CameraTemplate1_ManualGrab; } @@ -66,7 +66,7 @@ namespace Rs.MotionPlat.SysConfig private void NozzleDistance_FormClosing(object sender, FormClosingEventArgs e) { - cameraTemplate1.RemoveGrabEvent(); + //cameraTemplate1.RemoveGrabEvent(); } protected void Fetch_Position(object sender, EventArgs e) diff --git a/Rs.SkyLine/SysConfig/StartPosConfig.Designer.cs b/Rs.SkyLine/SysConfig/StartPosConfig.Designer.cs index f801e3f..3a2382c 100644 --- a/Rs.SkyLine/SysConfig/StartPosConfig.Designer.cs +++ b/Rs.SkyLine/SysConfig/StartPosConfig.Designer.cs @@ -121,7 +121,6 @@ this.btnTeachNozzleZ2GrabHeight = new System.Windows.Forms.Button(); this.btnTeachNozzleZ3GrabHeight = new System.Windows.Forms.Button(); this.btnTeachNozzleZ1GrabHeight = new System.Windows.Forms.Button(); - this.button9 = new System.Windows.Forms.Button(); this.panelEx1.SuspendLayout(); this.groupBox3.SuspendLayout(); this.groupBox1.SuspendLayout(); @@ -153,10 +152,11 @@ this.groupBox3.ForeColor = System.Drawing.Color.White; this.groupBox3.Location = new System.Drawing.Point(0, 102); this.groupBox3.Name = "groupBox3"; - this.groupBox3.Size = new System.Drawing.Size(401, 102); + this.groupBox3.Size = new System.Drawing.Size(401, 145); this.groupBox3.TabIndex = 1; this.groupBox3.TabStop = false; this.groupBox3.Text = "周转模组"; + this.groupBox3.Visible = false; // // txtTurnoverZStartPos // @@ -164,7 +164,7 @@ this.txtTurnoverZStartPos.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.txtTurnoverZStartPos.Font = new System.Drawing.Font("宋体", 9F); this.txtTurnoverZStartPos.ForeColor = System.Drawing.Color.White; - this.txtTurnoverZStartPos.Location = new System.Drawing.Point(98, 58); + this.txtTurnoverZStartPos.Location = new System.Drawing.Point(98, 94); this.txtTurnoverZStartPos.Name = "txtTurnoverZStartPos"; this.txtTurnoverZStartPos.ReadOnly = true; this.txtTurnoverZStartPos.Size = new System.Drawing.Size(85, 21); @@ -181,7 +181,7 @@ this.txtTurnoverYStartPos.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.txtTurnoverYStartPos.Font = new System.Drawing.Font("宋体", 9F); this.txtTurnoverYStartPos.ForeColor = System.Drawing.Color.White; - this.txtTurnoverYStartPos.Location = new System.Drawing.Point(98, 22); + this.txtTurnoverYStartPos.Location = new System.Drawing.Point(98, 58); this.txtTurnoverYStartPos.Name = "txtTurnoverYStartPos"; this.txtTurnoverYStartPos.ReadOnly = true; this.txtTurnoverYStartPos.Size = new System.Drawing.Size(85, 21); @@ -195,7 +195,7 @@ // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(12, 63); + this.label1.Location = new System.Drawing.Point(12, 99); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(65, 12); this.label1.TabIndex = 43; @@ -204,7 +204,7 @@ // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(12, 27); + this.label4.Location = new System.Drawing.Point(12, 63); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(65, 12); this.label4.TabIndex = 43; @@ -216,7 +216,7 @@ this.btnMoveTurnoverZStartPos.FlatAppearance.BorderColor = System.Drawing.Color.White; this.btnMoveTurnoverZStartPos.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnMoveTurnoverZStartPos.ForeColor = System.Drawing.Color.White; - this.btnMoveTurnoverZStartPos.Location = new System.Drawing.Point(299, 57); + this.btnMoveTurnoverZStartPos.Location = new System.Drawing.Point(299, 93); this.btnMoveTurnoverZStartPos.Name = "btnMoveTurnoverZStartPos"; this.btnMoveTurnoverZStartPos.Size = new System.Drawing.Size(79, 25); this.btnMoveTurnoverZStartPos.TabIndex = 44; @@ -231,7 +231,7 @@ this.btnTeachTurnoverZStartPos.FlatAppearance.BorderColor = System.Drawing.Color.White; this.btnTeachTurnoverZStartPos.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnTeachTurnoverZStartPos.ForeColor = System.Drawing.Color.White; - this.btnTeachTurnoverZStartPos.Location = new System.Drawing.Point(200, 57); + this.btnTeachTurnoverZStartPos.Location = new System.Drawing.Point(200, 93); this.btnTeachTurnoverZStartPos.Name = "btnTeachTurnoverZStartPos"; this.btnTeachTurnoverZStartPos.Size = new System.Drawing.Size(79, 25); this.btnTeachTurnoverZStartPos.TabIndex = 45; @@ -246,7 +246,7 @@ this.btnMoveTurnoverYStartPos.FlatAppearance.BorderColor = System.Drawing.Color.White; this.btnMoveTurnoverYStartPos.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnMoveTurnoverYStartPos.ForeColor = System.Drawing.Color.White; - this.btnMoveTurnoverYStartPos.Location = new System.Drawing.Point(299, 21); + this.btnMoveTurnoverYStartPos.Location = new System.Drawing.Point(299, 57); this.btnMoveTurnoverYStartPos.Name = "btnMoveTurnoverYStartPos"; this.btnMoveTurnoverYStartPos.Size = new System.Drawing.Size(79, 25); this.btnMoveTurnoverYStartPos.TabIndex = 44; @@ -261,7 +261,7 @@ this.btnTeachTurnoverYStartPos.FlatAppearance.BorderColor = System.Drawing.Color.White; this.btnTeachTurnoverYStartPos.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnTeachTurnoverYStartPos.ForeColor = System.Drawing.Color.White; - this.btnTeachTurnoverYStartPos.Location = new System.Drawing.Point(200, 21); + this.btnTeachTurnoverYStartPos.Location = new System.Drawing.Point(200, 57); this.btnTeachTurnoverYStartPos.Name = "btnTeachTurnoverYStartPos"; this.btnTeachTurnoverYStartPos.Size = new System.Drawing.Size(79, 25); this.btnTeachTurnoverYStartPos.TabIndex = 45; @@ -989,6 +989,7 @@ this.groupBox4.TabIndex = 3; this.groupBox4.TabStop = false; this.groupBox4.Text = "吸头Z"; + this.groupBox4.Visible = false; // // txtNozzleZ9GrabHeight // @@ -1467,22 +1468,11 @@ this.btnTeachNozzleZ1GrabHeight.UseVisualStyleBackColor = false; this.btnTeachNozzleZ1GrabHeight.Click += new System.EventHandler(this.Teach_Click); // - // button9 - // - this.button9.Location = new System.Drawing.Point(1245, 180); - this.button9.Name = "button9"; - this.button9.Size = new System.Drawing.Size(75, 23); - this.button9.TabIndex = 4; - this.button9.Text = "button9"; - this.button9.UseVisualStyleBackColor = true; - this.button9.Click += new System.EventHandler(this.button9_Click_1); - // // StartPosConfig // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(1405, 704); - this.Controls.Add(this.button9); this.Controls.Add(this.groupBox4); this.Controls.Add(this.groupBox2); this.Controls.Add(this.panelEx1); @@ -1597,6 +1587,5 @@ private System.Windows.Forms.Button btnTeachNozzleZ2GrabHeight; private System.Windows.Forms.Button btnTeachNozzleZ3GrabHeight; private System.Windows.Forms.Button btnTeachNozzleZ1GrabHeight; - private System.Windows.Forms.Button button9; } } \ No newline at end of file diff --git a/Rs.SkyLine/SysConfig/StartPosConfig.cs b/Rs.SkyLine/SysConfig/StartPosConfig.cs index 23b4b6b..f8bee67 100644 --- a/Rs.SkyLine/SysConfig/StartPosConfig.cs +++ b/Rs.SkyLine/SysConfig/StartPosConfig.cs @@ -71,36 +71,5 @@ namespace Rs.MotionPlat.SysConfig string content = JsonConvert.SerializeObject(s, new StringEnumConverter()); TestCenter.Instance.Send(content); } - - - private void button9_Click_1(object sender, EventArgs e) - { - //Dictionary buttonText = new Dictionary(); - //buttonText.Add(ETipButton.Yes, "继续|Continue"); - //buttonText.Add(ETipButton.Cancel, "跳过|Skip"); - //buttonText.Add(ETipButton.Retry, "重试|Retry"); - //buttonText.Add(ETipButton.No, "结束上料|EndInput"); - // TestCenterMessageBox.Show(111,"fasdf", (ETipButton.Yes| ETipButton.No| ETipButton.Retry|ETipButton.Cancel),buttonText); - - //TestCenterMessageBox.Show(AlarmConstID.TrayTakeFailAlarm, $"吸嘴次失败报警,请处理后点击确定", (ETipButton.Retry | ETipButton.Skip | ETipButton.Yes | ETipButton.No), buttonText); - //TestCenterMessageBox.Show(AlarmConstID.TurnoverTakeFailAlarm, $"请处理后点击确定", (ETipButton.Retry | ETipButton.Skip | ETipButton.Yes | ETipButton.No), buttonText); - //Task.Run(() => { - // while (true) - // { - // SchedulingMessageBox box1 = TestCenterMessageBox.WaitResult(AlarmConstID.TrayTakeFailAlarm); - // Msg.ShowInfo(box1.Button.ToString()); - // break; - // } - //}); - //Task.Run(() => { - // while (true) - // { - // SchedulingMessageBox box2 = TestCenterMessageBox.WaitResult(AlarmConstID.TurnoverTakeFailAlarm); - // Msg.ShowInfo(box2.Button.ToString()); - // break; - // } - //}); - - } } } diff --git a/Rs.SkyLine/SysConfig/UpCameraAndClampCalibration.cs b/Rs.SkyLine/SysConfig/UpCameraAndClampCalibration.cs index f3921e5..98a24d1 100644 --- a/Rs.SkyLine/SysConfig/UpCameraAndClampCalibration.cs +++ b/Rs.SkyLine/SysConfig/UpCameraAndClampCalibration.cs @@ -23,9 +23,9 @@ namespace Rs.MotionPlat.SysConfig public UpCameraAndClampCalibration() { InitializeComponent(); - cameraTemplate1.ItemName = "上相机与吸嘴中心标定"; - cameraTemplate1.SetFindShapeMode(EFindShapeMode.SelfDefine); - cameraTemplate1.FindShapeEvent += CameraTemplate1_FindShapeEvent; + //cameraTemplate1.ItemName = "上相机与吸嘴中心标定"; + //cameraTemplate1.SetFindShapeMode(EFindShapeMode.SelfDefine); + //cameraTemplate1.FindShapeEvent += CameraTemplate1_FindShapeEvent; } private void CameraTemplate1_FindShapeEvent(ChoiceTech.Halcon.Control.HWindow_Final win, HObject sourceImage) diff --git a/Rs.SkyLine/SysConfig/UpCameraAndClampCalibration.designer.cs b/Rs.SkyLine/SysConfig/UpCameraAndClampCalibration.designer.cs index 7ab94b6..956f49a 100644 --- a/Rs.SkyLine/SysConfig/UpCameraAndClampCalibration.designer.cs +++ b/Rs.SkyLine/SysConfig/UpCameraAndClampCalibration.designer.cs @@ -29,7 +29,6 @@ private void InitializeComponent() { this.panelEx1 = new Rs.Controls.PanelEx(); - this.cameraTemplate1 = new Rs.MotionPlat.CameraTemplate(); this.panelEx2 = new Rs.Controls.PanelEx(); this.groupBox1 = new System.Windows.Forms.GroupBox(); this.btnTeachCameraInkpad = new System.Windows.Forms.Button(); @@ -46,30 +45,18 @@ this.label1 = new System.Windows.Forms.Label(); this.txtInkpadY = new System.Windows.Forms.TextBox(); this.label5 = new System.Windows.Forms.Label(); - this.panelEx1.SuspendLayout(); this.panelEx2.SuspendLayout(); this.groupBox1.SuspendLayout(); this.SuspendLayout(); // // panelEx1 // - this.panelEx1.Controls.Add(this.cameraTemplate1); this.panelEx1.Dock = System.Windows.Forms.DockStyle.Right; this.panelEx1.Location = new System.Drawing.Point(494, 0); this.panelEx1.Name = "panelEx1"; this.panelEx1.Size = new System.Drawing.Size(1030, 816); this.panelEx1.TabIndex = 6; // - // cameraTemplate1 - // - this.cameraTemplate1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(11)))), ((int)(((byte)(16)))), ((int)(((byte)(36))))); - this.cameraTemplate1.Dock = System.Windows.Forms.DockStyle.Fill; - this.cameraTemplate1.ItemName = "Default"; - this.cameraTemplate1.Location = new System.Drawing.Point(0, 0); - this.cameraTemplate1.Name = "cameraTemplate1"; - this.cameraTemplate1.Size = new System.Drawing.Size(1030, 816); - this.cameraTemplate1.TabIndex = 1; - // // panelEx2 // this.panelEx2.Controls.Add(this.groupBox1); @@ -278,7 +265,6 @@ this.Name = "UpCameraAndClampCalibration"; this.Text = "UpCameraAndClampCalibration"; this.Load += new System.EventHandler(this.UpCameraAndClampCalibration_Load); - this.panelEx1.ResumeLayout(false); this.panelEx2.ResumeLayout(false); this.groupBox1.ResumeLayout(false); this.groupBox1.PerformLayout(); @@ -288,7 +274,6 @@ #endregion private Controls.PanelEx panelEx1; - private CameraTemplate cameraTemplate1; private Controls.PanelEx panelEx2; private System.Windows.Forms.GroupBox groupBox1; private System.Windows.Forms.Button btnTeachCameraInkpad; diff --git a/Rs.SkyLine/SysConfig/UpCameraCalibration.cs b/Rs.SkyLine/SysConfig/UpCameraCalibration.cs index 5a4afcb..af1c039 100644 --- a/Rs.SkyLine/SysConfig/UpCameraCalibration.cs +++ b/Rs.SkyLine/SysConfig/UpCameraCalibration.cs @@ -18,8 +18,8 @@ namespace Rs.MotionPlat.SysConfig public UpCameraCalibration() { InitializeComponent(); - cameraTemplate1.ItemName = "上相机标定"; - cameraTemplate1.CustomDefineGrabEvent += CameraTemplate1_CustomDefineGrabEvent; + //cameraTemplate1.ItemName = "上相机标定"; + //cameraTemplate1.CustomDefineGrabEvent += CameraTemplate1_CustomDefineGrabEvent; } private void CameraTemplate1_CustomDefineGrabEvent() @@ -29,7 +29,7 @@ namespace Rs.MotionPlat.SysConfig private void UpCameraCalibration_FormClosing(object sender, FormClosingEventArgs e) { - cameraTemplate1.RemoveGrabEvent(); + //cameraTemplate1.RemoveGrabEvent(); } private void btnMove_Click(object sender, EventArgs e) @@ -54,13 +54,13 @@ namespace Rs.MotionPlat.SysConfig private void btnGetMatchResult_Click(object sender, EventArgs e) { - cameraTemplate1.GetMatchResult(out double row, out double column, out double angle, out double score); - int rowIndex = dgvPixCalib.Rows.Add(); - dgvPixCalib.Rows[rowIndex].Cells[0].Value = row.ToString("0.000"); - dgvPixCalib.Rows[rowIndex].Cells[1].Value = column.ToString("0.000"); - dgvPixCalib.Rows[rowIndex].Cells[2].Value = angle.ToString("0.000"); - dgvPixCalib.Rows[rowIndex].Cells[3].Value = score.ToString("0.000"); - Msg.ShowInfo($"{row},{column},{angle},{score}"); + //cameraTemplate1.GetMatchResult(out double row, out double column, out double angle, out double score); + //int rowIndex = dgvPixCalib.Rows.Add(); + //dgvPixCalib.Rows[rowIndex].Cells[0].Value = row.ToString("0.000"); + //dgvPixCalib.Rows[rowIndex].Cells[1].Value = column.ToString("0.000"); + //dgvPixCalib.Rows[rowIndex].Cells[2].Value = angle.ToString("0.000"); + //dgvPixCalib.Rows[rowIndex].Cells[3].Value = score.ToString("0.000"); + //Msg.ShowInfo($"{row},{column},{angle},{score}"); } private void UpCameraCalibration_Load(object sender, EventArgs e) @@ -70,8 +70,8 @@ namespace Rs.MotionPlat.SysConfig protected override void OnClosed(EventArgs e) { - cameraTemplate1.StopGrab(); - base.OnClosed(e); + //cameraTemplate1.StopGrab(); + //base.OnClosed(e); } } } diff --git a/Rs.SkyLine/SysConfig/UpCameraCalibration.designer.cs b/Rs.SkyLine/SysConfig/UpCameraCalibration.designer.cs index feb9f6d..85a3f5d 100644 --- a/Rs.SkyLine/SysConfig/UpCameraCalibration.designer.cs +++ b/Rs.SkyLine/SysConfig/UpCameraCalibration.designer.cs @@ -28,12 +28,11 @@ /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); - this.cameraTemplate1 = new Rs.MotionPlat.CameraTemplate(); + 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.panelEx1 = new Rs.Controls.PanelEx(); this.panelEx2 = new Rs.Controls.PanelEx(); this.groupBox1 = new System.Windows.Forms.GroupBox(); @@ -54,25 +53,13 @@ this.txtMmPerPixY = new System.Windows.Forms.TextBox(); this.label7 = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label(); - this.panelEx1.SuspendLayout(); this.panelEx2.SuspendLayout(); this.groupBox1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dgvPixCalib)).BeginInit(); this.SuspendLayout(); // - // cameraTemplate1 - // - this.cameraTemplate1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(11)))), ((int)(((byte)(16)))), ((int)(((byte)(36))))); - this.cameraTemplate1.Dock = System.Windows.Forms.DockStyle.Fill; - this.cameraTemplate1.ItemName = "Default"; - this.cameraTemplate1.Location = new System.Drawing.Point(0, 0); - this.cameraTemplate1.Name = "cameraTemplate1"; - this.cameraTemplate1.Size = new System.Drawing.Size(592, 844); - this.cameraTemplate1.TabIndex = 0; - // // panelEx1 // - this.panelEx1.Controls.Add(this.cameraTemplate1); this.panelEx1.Dock = System.Windows.Forms.DockStyle.Fill; this.panelEx1.Location = new System.Drawing.Point(805, 0); this.panelEx1.Name = "panelEx1"; @@ -118,9 +105,9 @@ this.dgvPixCalib.AllowUserToDeleteRows = false; this.dgvPixCalib.AllowUserToResizeColumns = false; this.dgvPixCalib.AllowUserToResizeRows = false; - dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(56)))), ((int)(((byte)(56)))), ((int)(((byte)(56))))); - dataGridViewCellStyle6.ForeColor = System.Drawing.Color.White; - this.dgvPixCalib.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle6; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(56)))), ((int)(((byte)(56)))), ((int)(((byte)(56))))); + dataGridViewCellStyle1.ForeColor = System.Drawing.Color.White; + this.dgvPixCalib.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; this.dgvPixCalib.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; this.dgvPixCalib.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(56)))), ((int)(((byte)(56)))), ((int)(((byte)(56))))); this.dgvPixCalib.ColumnHeadersHeight = 30; @@ -136,14 +123,14 @@ this.dgvPixCalib.MultiSelect = false; this.dgvPixCalib.Name = "dgvPixCalib"; this.dgvPixCalib.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.dgvPixCalib.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.dgvPixCalib.RowHeadersDefaultCellStyle = dataGridViewCellStyle5; this.dgvPixCalib.RowHeadersVisible = false; this.dgvPixCalib.RowHeadersWidth = 30; this.dgvPixCalib.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; @@ -165,8 +152,8 @@ // X // this.X.DataPropertyName = "X"; - dataGridViewCellStyle7.Format = "0.000"; - this.X.DefaultCellStyle = dataGridViewCellStyle7; + dataGridViewCellStyle2.Format = "0.000"; + this.X.DefaultCellStyle = dataGridViewCellStyle2; this.X.FillWeight = 25.76511F; this.X.HeaderText = "Column"; this.X.Name = "X"; @@ -175,8 +162,8 @@ // Y // this.Y.DataPropertyName = "Y"; - dataGridViewCellStyle8.Format = "0.000"; - this.Y.DefaultCellStyle = dataGridViewCellStyle8; + dataGridViewCellStyle3.Format = "0.000"; + this.Y.DefaultCellStyle = dataGridViewCellStyle3; this.Y.FillWeight = 24.21075F; this.Y.HeaderText = "Angle"; this.Y.Name = "Y"; @@ -184,10 +171,10 @@ // // Move // - dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle9.BackColor = System.Drawing.Color.Silver; - dataGridViewCellStyle9.ForeColor = System.Drawing.Color.White; - this.Move.DefaultCellStyle = dataGridViewCellStyle9; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle4.BackColor = System.Drawing.Color.Silver; + dataGridViewCellStyle4.ForeColor = System.Drawing.Color.White; + this.Move.DefaultCellStyle = dataGridViewCellStyle4; this.Move.FillWeight = 26.00443F; this.Move.HeaderText = "Score"; this.Move.Name = "Move"; @@ -339,7 +326,6 @@ this.Text = "上相机标定"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.UpCameraCalibration_FormClosing); this.Load += new System.EventHandler(this.UpCameraCalibration_Load); - this.panelEx1.ResumeLayout(false); this.panelEx2.ResumeLayout(false); this.groupBox1.ResumeLayout(false); this.groupBox1.PerformLayout(); @@ -349,8 +335,6 @@ } #endregion - - private CameraTemplate cameraTemplate1; private Controls.PanelEx panelEx1; private Controls.PanelEx panelEx2; private System.Windows.Forms.GroupBox groupBox1;