Skip to content

孙克 / URSolderingRobot

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 68fc4aca 由 几米阳光
选项

新增程序无法再图片上添加焊点

1 个父辈 2930429c
内嵌 并排
正在显示 2 个修改的文件 包含 95 行增加 和 89 行删除
URSolderingClient/FrmBoardInfo.Designer.cs
...@@ -51,6 +51,15 @@ ...@@ -51,6 +51,15 @@
this.dataGridViewImageColumn2 = new System.Windows.Forms.DataGridViewImageColumn(); this.dataGridViewImageColumn2 = new System.Windows.Forms.DataGridViewImageColumn();
this.panel1 = new System.Windows.Forms.Panel(); this.panel1 = new System.Windows.Forms.Panel();
this.dgvPoint = new System.Windows.Forms.DataGridView(); this.dgvPoint = new System.Windows.Forms.DataGridView();
this.Col_ID = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Col_X = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Col_Y = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Col_Z = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Col_RX = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Col_RY = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Col_RZ = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Col_Update = new System.Windows.Forms.DataGridViewLinkColumn();
this.Col_Move = new System.Windows.Forms.DataGridViewLinkColumn();
this.btnExit = new System.Windows.Forms.Button(); this.btnExit = new System.Windows.Forms.Button();
this.panPoint = new System.Windows.Forms.Panel(); this.panPoint = new System.Windows.Forms.Panel();
this.panBoard = new System.Windows.Forms.Panel(); this.panBoard = new System.Windows.Forms.Panel();
...@@ -136,15 +145,6 @@ ...@@ -136,15 +145,6 @@
this.btnSStop = new System.Windows.Forms.Button(); this.btnSStop = new System.Windows.Forms.Button();
this.btnWStop = new System.Windows.Forms.Button(); this.btnWStop = new System.Windows.Forms.Button();
this.label14 = new System.Windows.Forms.Label(); this.label14 = new System.Windows.Forms.Label();
this.Col_ID = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Col_X = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Col_Y = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Col_Z = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Col_RX = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Col_RY = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Col_RZ = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Col_Update = new System.Windows.Forms.DataGridViewLinkColumn();
this.Col_Move = new System.Windows.Forms.DataGridViewLinkColumn();
this.contextMenuStrip1.SuspendLayout(); this.contextMenuStrip1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.picRight)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.picRight)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picLeft)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.picLeft)).BeginInit();
...@@ -365,7 +365,6 @@ ...@@ -365,7 +365,6 @@
this.Col_RZ, this.Col_RZ,
this.Col_Update, this.Col_Update,
this.Col_Move}); this.Col_Move});
this.dgvPoint.ContextMenuStrip = this.contextMenuStrip2;
this.dgvPoint.Location = new System.Drawing.Point(1080, 85); this.dgvPoint.Location = new System.Drawing.Point(1080, 85);
this.dgvPoint.MultiSelect = false; this.dgvPoint.MultiSelect = false;
this.dgvPoint.Name = "dgvPoint"; this.dgvPoint.Name = "dgvPoint";
...@@ -376,6 +375,83 @@ ...@@ -376,6 +375,83 @@
this.dgvPoint.TabIndex = 323; this.dgvPoint.TabIndex = 323;
this.dgvPoint.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvPoint_CellContentClick); this.dgvPoint.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvPoint_CellContentClick);
// //
// Col_ID
//
this.Col_ID.HeaderText = "位置";
this.Col_ID.Name = "Col_ID";
this.Col_ID.ReadOnly = true;
this.Col_ID.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
this.Col_ID.Width = 120;
//
// Col_X
//
this.Col_X.DataPropertyName = "RobotX";
this.Col_X.HeaderText = "X";
this.Col_X.Name = "Col_X";
this.Col_X.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
this.Col_X.Width = 75;
//
// Col_Y
//
this.Col_Y.DataPropertyName = "RobotY";
this.Col_Y.HeaderText = "Y";
this.Col_Y.Name = "Col_Y";
this.Col_Y.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
this.Col_Y.Width = 75;
//
// Col_Z
//
this.Col_Z.DataPropertyName = "RobotZ";
this.Col_Z.HeaderText = "Z";
this.Col_Z.Name = "Col_Z";
this.Col_Z.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
this.Col_Z.Width = 75;
//
// Col_RX
//
this.Col_RX.DataPropertyName = "RobotRX";
this.Col_RX.HeaderText = "RX";
this.Col_RX.Name = "Col_RX";
this.Col_RX.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
this.Col_RX.Width = 75;
//
// Col_RY
//
this.Col_RY.DataPropertyName = "RobotRY";
this.Col_RY.HeaderText = "RY";
this.Col_RY.Name = "Col_RY";
this.Col_RY.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
this.Col_RY.Width = 75;
//
// Col_RZ
//
this.Col_RZ.DataPropertyName = "RobotRZ";
this.Col_RZ.HeaderText = "RZ";
this.Col_RZ.Name = "Col_RZ";
this.Col_RZ.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
this.Col_RZ.Width = 75;
//
// Col_Update
//
this.Col_Update.HeaderText = "更新坐标";
this.Col_Update.Name = "Col_Update";
this.Col_Update.ReadOnly = true;
this.Col_Update.Resizable = System.Windows.Forms.DataGridViewTriState.True;
this.Col_Update.Text = "更新坐标";
this.Col_Update.ToolTipText = "更新坐标";
this.Col_Update.UseColumnTextForLinkValue = true;
this.Col_Update.Width = 75;
//
// Col_Move
//
this.Col_Move.HeaderText = "移动测试";
this.Col_Move.Name = "Col_Move";
this.Col_Move.ReadOnly = true;
this.Col_Move.Text = "移动测试";
this.Col_Move.ToolTipText = "移动测试";
this.Col_Move.UseColumnTextForLinkValue = true;
this.Col_Move.Width = 75;
//
// btnExit // btnExit
// //
this.btnExit.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.btnExit.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
...@@ -1303,83 +1379,6 @@ ...@@ -1303,83 +1379,6 @@
this.label14.Text = "条形码"; this.label14.Text = "条形码";
this.label14.Visible = false; this.label14.Visible = false;
// //
// Col_ID
//
this.Col_ID.HeaderText = "位置";
this.Col_ID.Name = "Col_ID";
this.Col_ID.ReadOnly = true;
this.Col_ID.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
this.Col_ID.Width = 120;
//
// Col_X
//
this.Col_X.DataPropertyName = "RobotX";
this.Col_X.HeaderText = "X";
this.Col_X.Name = "Col_X";
this.Col_X.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
this.Col_X.Width = 75;
//
// Col_Y
//
this.Col_Y.DataPropertyName = "RobotY";
this.Col_Y.HeaderText = "Y";
this.Col_Y.Name = "Col_Y";
this.Col_Y.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
this.Col_Y.Width = 75;
//
// Col_Z
//
this.Col_Z.DataPropertyName = "RobotZ";
this.Col_Z.HeaderText = "Z";
this.Col_Z.Name = "Col_Z";
this.Col_Z.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
this.Col_Z.Width = 75;
//
// Col_RX
//
this.Col_RX.DataPropertyName = "RobotRX";
this.Col_RX.HeaderText = "RX";
this.Col_RX.Name = "Col_RX";
this.Col_RX.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
this.Col_RX.Width = 75;
//
// Col_RY
//
this.Col_RY.DataPropertyName = "RobotRY";
this.Col_RY.HeaderText = "RY";
this.Col_RY.Name = "Col_RY";
this.Col_RY.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
this.Col_RY.Width = 75;
//
// Col_RZ
//
this.Col_RZ.DataPropertyName = "RobotRZ";
this.Col_RZ.HeaderText = "RZ";
this.Col_RZ.Name = "Col_RZ";
this.Col_RZ.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
this.Col_RZ.Width = 75;
//
// Col_Update
//
this.Col_Update.HeaderText = "更新坐标";
this.Col_Update.Name = "Col_Update";
this.Col_Update.ReadOnly = true;
this.Col_Update.Resizable = System.Windows.Forms.DataGridViewTriState.True;
this.Col_Update.Text = "更新坐标";
this.Col_Update.ToolTipText = "更新坐标";
this.Col_Update.UseColumnTextForLinkValue = true;
this.Col_Update.Width = 75;
//
// Col_Move
//
this.Col_Move.HeaderText = "移动测试";
this.Col_Move.Name = "Col_Move";
this.Col_Move.ReadOnly = true;
this.Col_Move.Text = "移动测试";
this.Col_Move.ToolTipText = "移动测试";
this.Col_Move.UseColumnTextForLinkValue = true;
this.Col_Move.Width = 75;
//
// FrmBoardInfo // FrmBoardInfo
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
......
URSolderingClient/FrmBoardInfo.cs
...@@ -57,8 +57,15 @@ namespace URSoldering.Client ...@@ -57,8 +57,15 @@ namespace URSoldering.Client
LoadType(); LoadType();
if (isNew == false) if (isNew == false)
{ {
LoadBoardInfo(); LoadBoardInfo();
} }
else
{
dgvPoint.Rows.Add(setFPoint(null, "固定点A（左上角）", new URPointValue ()));
dgvPoint.Rows.Add(setFPoint(null, "固定点B（左下角）", new URPointValue()));
dgvPoint.Rows.Add(setFPoint(null, "固定点C（右上角）", new URPointValue()));
dgvPoint.Rows.Add(setFPoint(null, "固定点D（右下角）", new URPointValue()));
}
loadPictureBoxSize(); loadPictureBoxSize();
LOGGER.Info("load image " + picBoard.Name); LOGGER.Info("load image " + picBoard.Name);
txtBoardName.Focus(); txtBoardName.Focus();
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!