Skip to content

孙克 / URSolderingRobot

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

断开连接时清理上次的命令

1 个父辈 07b72b9c
内嵌 并排
正在显示 5 个修改的文件 包含 255 行增加 和 254 行删除
DeviceLibrary/Robot/soldering/WeldRobotBean_Partial.cs
......@@ -152,11 +152,7 @@ namespace URSoldering.DeviceLibrary
{
WeldLog("焊接结束，等待AOI检测");
WeldMoveStep.NextMoveStep(MoveStep.W14_AOICheck);
int AOIWaitSeconds = ConfigAppSettings.GetIntValue(Setting_Init.AOIWaitSeconds);
if (AOIWaitSeconds <= 0)
{
AOIWaitSeconds = 4000;
}
int AOIWaitSeconds = ConfigAppSettings.GetIntValue(Setting_Init.AOIWaitSeconds);
WeldMoveStep.WaitList.Add(WaitResultInfo.WaitTime(AOIWaitSeconds));
}
else if (WeldMoveStep.moveStep.Equals(MoveStep.W14_AOICheck))
......
DeviceLibrary/deviceLibrary/urRobot/URRobotControl.cs
......@@ -157,6 +157,7 @@ namespace URSoldering.DeviceLibrary
}
WarnMsg = "";
IsRun = false;
ClearPreCMD();
LogUtil.info("" + LogName + "开始连接");
PreStartTime = DateTime.Now;
startCount++;
......@@ -330,7 +331,6 @@ namespace URSoldering.DeviceLibrary
{
WarnMsg = "机器人状态[" + msg + "]，启动超时";
StopRobot();
IsRun = false;
}
}
}
......@@ -370,7 +370,6 @@ namespace URSoldering.DeviceLibrary
{
WarnMsg = "机器人急停中[" + msg + "]，启动超时";
StopRobot();
IsRun = false;
}
}
else
......@@ -430,6 +429,7 @@ namespace URSoldering.DeviceLibrary
{
try
{
ClearPreCMD();
IsStartConnect = false;
reconnectTimer.Enabled = false;
URRobotClient.StopListen();
......@@ -481,19 +481,20 @@ namespace URSoldering.DeviceLibrary
{
moveCmd = "movep(p[" + x + spiltStr + y + spiltStr + z + spiltStr + point.RX + spiltStr + point.RY + spiltStr + point.RZ + "],a=1.0, v=1.0, r=0)";
}
ClearPreCMD();
URRobotClient.LastMoveCMD = moveCmd;
LastSendPoint = point;
}
public static void ClearPreCMD()
{
if (!URRobotClient.LastMoveCMD.Equals(""))
{
LogUtil.info(LogName+ ",清除上次未发送指令：【" + URRobotClient.LastMoveCMD + "】" + "新坐标" + point.ToShowStr());
LogUtil.info(LogName + ",清除上次未发送指令：【" + URRobotClient.LastMoveCMD + "】" );
URRobotClient.LastMoveCMD = "";
}
else
{
//LogUtil.info(LogName + "试图移动到：" + point.ToShowStr());
}
URRobotClient.LastMoveCMD = moveCmd;
LastSendPoint = point;
}
public static void MoveTo(URPointValue point)
public static void MoveTo(URPointValue point)
{
MoveTo(point, false);
}
......
URSolderingClient/App.config
......@@ -14,7 +14,7 @@
<add key="VideoCameraName" value="[0] Integrated Camera" />
<add key="AOIFileConfig" value="\RobotConfig\AOIConfig\AOIProgram.vscf" />
<add key="AOICheckPointFile" value="\RobotConfig\AOIConfig\AOIPointProgram.vscf" />
<add key="AOIWaitSeconds" value="4000" />
<add key="AOIWaitSeconds" value="1000" />
<!--送丝器消除报警需要持续的秒数-->
<add key="SendWireRecoverSeconds" value="5" />
<!--空闲多久需要休眠，=0表示不需要休眠，>0表示休眠秒数-->
......
URSolderingClient/FrmBoardInfo.Designer.cs
......@@ -97,6 +97,22 @@
this.txtRobotX = new System.Windows.Forms.Label();
this.label12 = new System.Windows.Forms.Label();
this.dgvList = new System.Windows.Forms.DataGridView();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.txtCode = new System.Windows.Forms.TextBox();
this.label10 = new System.Windows.Forms.Label();
this.txtBoardName = new System.Windows.Forms.TextBox();
this.label25 = new System.Windows.Forms.Label();
this.label24 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.btnSave = new System.Windows.Forms.Button();
this.txtBoardLength = new System.Windows.Forms.TextBox();
this.label4 = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label();
this.txtBoardWidth = new System.Windows.Forms.TextBox();
this.btnOpenFile = new System.Windows.Forms.Button();
this.btnSStop = new System.Windows.Forms.Button();
this.btnWStop = new System.Windows.Forms.Button();
this.label14 = new System.Windows.Forms.Label();
this.Column_pointNum = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column_Name = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column_X = new System.Windows.Forms.DataGridViewTextBoxColumn();
......@@ -126,22 +142,6 @@
this.Column_Del = new System.Windows.Forms.DataGridViewLinkColumn();
this.Column_Up = new System.Windows.Forms.DataGridViewImageColumn();
this.Column_Down = new System.Windows.Forms.DataGridViewImageColumn();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.txtCode = new System.Windows.Forms.TextBox();
this.label10 = new System.Windows.Forms.Label();
this.txtBoardName = new System.Windows.Forms.TextBox();
this.label25 = new System.Windows.Forms.Label();
this.label24 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.btnSave = new System.Windows.Forms.Button();
this.txtBoardLength = new System.Windows.Forms.TextBox();
this.label4 = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label();
this.txtBoardWidth = new System.Windows.Forms.TextBox();
this.btnOpenFile = new System.Windows.Forms.Button();
this.btnSStop = new System.Windows.Forms.Button();
this.btnWStop = new System.Windows.Forms.Button();
this.label14 = new System.Windows.Forms.Label();
this.contextMenuStrip1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.picRight)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picLeft)).BeginInit();
......@@ -362,7 +362,7 @@
| System.Windows.Forms.AnchorStyles.Left)));
this.panPoint.Location = new System.Drawing.Point(12, 349);
this.panPoint.Name = "panPoint";
this.panPoint.Size = new System.Drawing.Size(869, 267);
this.panPoint.Size = new System.Drawing.Size(916, 267);
this.panPoint.TabIndex = 321;
//
// panBoard
......@@ -372,9 +372,9 @@
| System.Windows.Forms.AnchorStyles.Right)));
this.panBoard.Controls.Add(this.picBoard);
this.panBoard.Controls.Add(this.gbOriginInfo);
this.panBoard.Location = new System.Drawing.Point(898, 78);
this.panBoard.Location = new System.Drawing.Point(940, 78);
this.panBoard.Name = "panBoard";
this.panBoard.Size = new System.Drawing.Size(482, 553);
this.panBoard.Size = new System.Drawing.Size(440, 553);
this.panBoard.TabIndex = 261;
//
// picBoard
......@@ -385,7 +385,7 @@
this.picBoard.Cursor = System.Windows.Forms.Cursors.Cross;
this.picBoard.Location = new System.Drawing.Point(0, 0);
this.picBoard.Name = "picBoard";
this.picBoard.Size = new System.Drawing.Size(463, 493);
this.picBoard.Size = new System.Drawing.Size(421, 493);
this.picBoard.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.picBoard.TabIndex = 259;
this.picBoard.TabStop = false;
......@@ -556,7 +556,7 @@
this.groupBox2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox2.Location = new System.Drawing.Point(12, 78);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(869, 227);
this.groupBox2.Size = new System.Drawing.Size(916, 227);
this.groupBox2.TabIndex = 22;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "机器人实时坐标";
......@@ -584,10 +584,11 @@
//
// label6
//
this.label6.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.label6.AutoSize = true;
this.label6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label6.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label6.Location = new System.Drawing.Point(563, 61);
this.label6.Location = new System.Drawing.Point(563, 66);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(97, 17);
this.label6.TabIndex = 326;
......@@ -596,8 +597,9 @@
//
// txtSendWireLength
//
this.txtSendWireLength.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.txtSendWireLength.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtSendWireLength.Location = new System.Drawing.Point(664, 58);
this.txtSendWireLength.Location = new System.Drawing.Point(664, 63);
this.txtSendWireLength.MaxLength = 6;
this.txtSendWireLength.Name = "txtSendWireLength";
this.txtSendWireLength.Size = new System.Drawing.Size(67, 23);
......@@ -676,7 +678,7 @@
this.panel3.Controls.Add(this.picDown);
this.panel3.Controls.Add(this.picZDel);
this.panel3.Controls.Add(this.picZAdd);
this.panel3.Location = new System.Drawing.Point(296, 45);
this.panel3.Location = new System.Drawing.Point(302, 44);
this.panel3.Name = "panel3";
this.panel3.Size = new System.Drawing.Size(199, 129);
this.panel3.TabIndex = 259;
......@@ -685,7 +687,7 @@
//
this.btnPositionTest.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnPositionTest.FlatAppearance.BorderSize = 0;
this.btnPositionTest.Location = new System.Drawing.Point(763, 178);
this.btnPositionTest.Location = new System.Drawing.Point(785, 178);
this.btnPositionTest.Name = "btnPositionTest";
this.btnPositionTest.Size = new System.Drawing.Size(100, 37);
this.btnPositionTest.TabIndex = 318;
......@@ -709,7 +711,7 @@
this.lblMsg.AutoSize = true;
this.lblMsg.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblMsg.ForeColor = System.Drawing.Color.Red;
this.lblMsg.Location = new System.Drawing.Point(563, 144);
this.lblMsg.Location = new System.Drawing.Point(610, 144);
this.lblMsg.Name = "lblMsg";
this.lblMsg.Size = new System.Drawing.Size(65, 19);
this.lblMsg.TabIndex = 260;
......@@ -719,7 +721,7 @@
//
this.btnSavePoint.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnSavePoint.FlatAppearance.BorderSize = 0;
this.btnSavePoint.Location = new System.Drawing.Point(763, 139);
this.btnSavePoint.Location = new System.Drawing.Point(785, 139);
this.btnSavePoint.Name = "btnSavePoint";
this.btnSavePoint.Size = new System.Drawing.Size(100, 37);
this.btnSavePoint.TabIndex = 30;
......@@ -731,7 +733,7 @@
//
this.btnStopDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnStopDown.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnStopDown.Location = new System.Drawing.Point(763, 61);
this.btnStopDown.Location = new System.Drawing.Point(785, 61);
this.btnStopDown.Name = "btnStopDown";
this.btnStopDown.Size = new System.Drawing.Size(100, 37);
this.btnStopDown.TabIndex = 317;
......@@ -743,7 +745,7 @@
//
this.btnGoHome.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnGoHome.FlatAppearance.BorderSize = 0;
this.btnGoHome.Location = new System.Drawing.Point(763, 100);
this.btnGoHome.Location = new System.Drawing.Point(785, 100);
this.btnGoHome.Name = "btnGoHome";
this.btnGoHome.Size = new System.Drawing.Size(100, 37);
this.btnGoHome.TabIndex = 35;
......@@ -757,7 +759,7 @@
this.label5.AutoSize = true;
this.label5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label5.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label5.Location = new System.Drawing.Point(564, 28);
this.label5.Location = new System.Drawing.Point(563, 32);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(97, 17);
this.label5.TabIndex = 276;
......@@ -795,7 +797,7 @@
//
this.txtSpeed.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.txtSpeed.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtSpeed.Location = new System.Drawing.Point(665, 25);
this.txtSpeed.Location = new System.Drawing.Point(664, 29);
this.txtSpeed.MaxLength = 6;
this.txtSpeed.Name = "txtSpeed";
this.txtSpeed.Size = new System.Drawing.Size(66, 23);
......@@ -807,7 +809,7 @@
this.btnStopSend.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnStopSend.Enabled = false;
this.btnStopSend.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnStopSend.Location = new System.Drawing.Point(650, 95);
this.btnStopSend.Location = new System.Drawing.Point(650, 97);
this.btnStopSend.Name = "btnStopSend";
this.btnStopSend.Size = new System.Drawing.Size(80, 34);
this.btnStopSend.TabIndex = 274;
......@@ -820,7 +822,7 @@
this.btnSendWire.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnSendWire.Enabled = false;
this.btnSendWire.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSendWire.Location = new System.Drawing.Point(563, 95);
this.btnSendWire.Location = new System.Drawing.Point(563, 97);
this.btnSendWire.Name = "btnSendWire";
this.btnSendWire.Size = new System.Drawing.Size(80, 34);
this.btnSendWire.TabIndex = 273;
......@@ -854,7 +856,7 @@
this.btnWUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnWUp.Enabled = false;
this.btnWUp.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnWUp.Location = new System.Drawing.Point(763, 22);
this.btnWUp.Location = new System.Drawing.Point(785, 22);
this.btnWUp.Name = "btnWUp";
this.btnWUp.Size = new System.Drawing.Size(100, 37);
this.btnWUp.TabIndex = 254;
......@@ -926,7 +928,7 @@
this.dgvList.RowHeadersWidth = 5;
this.dgvList.RowTemplate.Height = 23;
this.dgvList.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
this.dgvList.Size = new System.Drawing.Size(869, 316);
this.dgvList.Size = new System.Drawing.Size(916, 316);
this.dgvList.TabIndex = 31;
this.dgvList.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellContentClick);
this.dgvList.CellMouseDown += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dgvList_CellMouseDown);
......@@ -937,6 +939,180 @@
this.dgvList.DragDrop += new System.Windows.Forms.DragEventHandler(this.dgvList_DragDrop);
this.dgvList.DragEnter += new System.Windows.Forms.DragEventHandler(this.dgvList_DragEnter);
//
// groupBox1
//
this.groupBox1.Controls.Add(this.txtCode);
this.groupBox1.Controls.Add(this.label10);
this.groupBox1.Controls.Add(this.txtBoardName);
this.groupBox1.Controls.Add(this.label25);
this.groupBox1.Controls.Add(this.label24);
this.groupBox1.Controls.Add(this.label2);
this.groupBox1.Controls.Add(this.btnSave);
this.groupBox1.Controls.Add(this.txtBoardLength);
this.groupBox1.Controls.Add(this.label4);
this.groupBox1.Controls.Add(this.label3);
this.groupBox1.Controls.Add(this.txtBoardWidth);
this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox1.Location = new System.Drawing.Point(12, 8);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(916, 68);
this.groupBox1.TabIndex = 20;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "程序基本信息";
//
// txtCode
//
this.txtCode.Location = new System.Drawing.Point(289, 25);
this.txtCode.Name = "txtCode";
this.txtCode.Size = new System.Drawing.Size(155, 23);
this.txtCode.TabIndex = 268;
//
// label10
//
this.label10.AutoSize = true;
this.label10.Location = new System.Drawing.Point(249, 28);
this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(32, 17);
this.label10.TabIndex = 267;
this.label10.Text = "条码";
//
// txtBoardName
//
this.txtBoardName.Location = new System.Drawing.Point(46, 25);
this.txtBoardName.MaxLength = 20;
this.txtBoardName.Name = "txtBoardName";
this.txtBoardName.Size = new System.Drawing.Size(180, 23);
this.txtBoardName.TabIndex = 2;
//
// label25
//
this.label25.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.label25.AutoSize = true;
this.label25.Location = new System.Drawing.Point(680, 28);
this.label25.Name = "label25";
this.label25.Size = new System.Drawing.Size(30, 17);
this.label25.TabIndex = 37;
this.label25.Text = "mm";
//
// label24
//
this.label24.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.label24.AutoSize = true;
this.label24.Location = new System.Drawing.Point(550, 28);
this.label24.Name = "label24";
this.label24.Size = new System.Drawing.Size(30, 17);
this.label24.TabIndex = 36;
this.label24.Text = "mm";
//
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(9, 28);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(32, 17);
this.label2.TabIndex = 1;
this.label2.Text = "名称";
//
// btnSave
//
this.btnSave.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnSave.FlatAppearance.BorderSize = 0;
this.btnSave.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSave.Location = new System.Drawing.Point(793, 16);
this.btnSave.Name = "btnSave";
this.btnSave.Size = new System.Drawing.Size(117, 41);
this.btnSave.TabIndex = 40;
this.btnSave.Text = "保存";
this.btnSave.UseVisualStyleBackColor = true;
this.btnSave.Click += new System.EventHandler(this.btnSave_Click);
//
// txtBoardLength
//
this.txtBoardLength.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.txtBoardLength.Location = new System.Drawing.Point(492, 25);
this.txtBoardLength.MaxLength = 8;
this.txtBoardLength.Name = "txtBoardLength";
this.txtBoardLength.Size = new System.Drawing.Size(53, 23);
this.txtBoardLength.TabIndex = 4;
this.txtBoardLength.TextChanged += new System.EventHandler(this.txtBoardLength_TextChanged);
//
// label4
//
this.label4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(600, 28);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(20, 17);
this.label4.TabIndex = 5;
this.label4.Text = "宽";
//
// label3
//
this.label3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(466, 28);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(20, 17);
this.label3.TabIndex = 3;
this.label3.Text = "高";
//
// txtBoardWidth
//
this.txtBoardWidth.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.txtBoardWidth.Location = new System.Drawing.Point(622, 25);
this.txtBoardWidth.MaxLength = 8;
this.txtBoardWidth.Name = "txtBoardWidth";
this.txtBoardWidth.Size = new System.Drawing.Size(53, 23);
this.txtBoardWidth.TabIndex = 6;
this.txtBoardWidth.TextChanged += new System.EventHandler(this.txtBoardWidth_TextChanged);
//
// btnOpenFile
//
this.btnOpenFile.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnOpenFile.FlatAppearance.BorderSize = 0;
this.btnOpenFile.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOpenFile.Location = new System.Drawing.Point(1103, 22);
this.btnOpenFile.Name = "btnOpenFile";
this.btnOpenFile.Size = new System.Drawing.Size(117, 41);
this.btnOpenFile.TabIndex = 260;
this.btnOpenFile.Text = "打开图片";
this.btnOpenFile.UseVisualStyleBackColor = true;
this.btnOpenFile.Click += new System.EventHandler(this.btnOpenFile_Click);
//
// btnSStop
//
this.btnSStop.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnSStop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSStop.Location = new System.Drawing.Point(1264, 9);
this.btnSStop.Name = "btnSStop";
this.btnSStop.Size = new System.Drawing.Size(117, 23);
this.btnSStop.TabIndex = 256;
this.btnSStop.Text = "烙铁停止移动";
this.btnSStop.UseVisualStyleBackColor = true;
this.btnSStop.Visible = false;
//
// btnWStop
//
this.btnWStop.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnWStop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnWStop.Location = new System.Drawing.Point(1264, 37);
this.btnWStop.Name = "btnWStop";
this.btnWStop.Size = new System.Drawing.Size(117, 23);
this.btnWStop.TabIndex = 257;
this.btnWStop.Text = "送丝停止移动";
this.btnWStop.UseVisualStyleBackColor = true;
this.btnWStop.Visible = false;
//
// label14
//
this.label14.AutoSize = true;
this.label14.Location = new System.Drawing.Point(195, 34);
this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(44, 17);
this.label14.TabIndex = 9;
this.label14.Text = "条形码";
this.label14.Visible = false;
//
// Column_pointNum
//
this.Column_pointNum.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
......@@ -1105,7 +1281,6 @@
this.Column_sendWireTime.HeaderText = "送丝时间";
this.Column_sendWireTime.Name = "Column_sendWireTime";
this.Column_sendWireTime.ReadOnly = true;
this.Column_sendWireTime.Visible = false;
this.Column_sendWireTime.Width = 80;
//
// Column_pointType
......@@ -1151,8 +1326,7 @@
this.Column_MoveTest.Text = "测试位置";
this.Column_MoveTest.ToolTipText = "测试位置";
this.Column_MoveTest.UseColumnTextForLinkValue = true;
this.Column_MoveTest.Visible = false;
this.Column_MoveTest.Width = 80;
this.Column_MoveTest.Width = 75;
//
// Column_btnDetail
//
......@@ -1194,180 +1368,6 @@
this.Column_Down.Visible = false;
this.Column_Down.Width = 50;
//
// groupBox1
//
this.groupBox1.Controls.Add(this.txtCode);
this.groupBox1.Controls.Add(this.label10);
this.groupBox1.Controls.Add(this.txtBoardName);
this.groupBox1.Controls.Add(this.label25);
this.groupBox1.Controls.Add(this.label24);
this.groupBox1.Controls.Add(this.label2);
this.groupBox1.Controls.Add(this.btnSave);
this.groupBox1.Controls.Add(this.txtBoardLength);
this.groupBox1.Controls.Add(this.label4);
this.groupBox1.Controls.Add(this.label3);
this.groupBox1.Controls.Add(this.txtBoardWidth);
this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox1.Location = new System.Drawing.Point(12, 8);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(869, 68);
this.groupBox1.TabIndex = 20;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "程序基本信息";
//
// txtCode
//
this.txtCode.Location = new System.Drawing.Point(289, 25);
this.txtCode.Name = "txtCode";
this.txtCode.Size = new System.Drawing.Size(155, 23);
this.txtCode.TabIndex = 268;
//
// label10
//
this.label10.AutoSize = true;
this.label10.Location = new System.Drawing.Point(249, 28);
this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(32, 17);
this.label10.TabIndex = 267;
this.label10.Text = "条码";
//
// txtBoardName
//
this.txtBoardName.Location = new System.Drawing.Point(46, 25);
this.txtBoardName.MaxLength = 20;
this.txtBoardName.Name = "txtBoardName";
this.txtBoardName.Size = new System.Drawing.Size(180, 23);
this.txtBoardName.TabIndex = 2;
//
// label25
//
this.label25.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.label25.AutoSize = true;
this.label25.Location = new System.Drawing.Point(680, 28);
this.label25.Name = "label25";
this.label25.Size = new System.Drawing.Size(30, 17);
this.label25.TabIndex = 37;
this.label25.Text = "mm";
//
// label24
//
this.label24.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.label24.AutoSize = true;
this.label24.Location = new System.Drawing.Point(550, 28);
this.label24.Name = "label24";
this.label24.Size = new System.Drawing.Size(30, 17);
this.label24.TabIndex = 36;
this.label24.Text = "mm";
//
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(9, 28);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(32, 17);
this.label2.TabIndex = 1;
this.label2.Text = "名称";
//
// btnSave
//
this.btnSave.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnSave.FlatAppearance.BorderSize = 0;
this.btnSave.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSave.Location = new System.Drawing.Point(746, 16);
this.btnSave.Name = "btnSave";
this.btnSave.Size = new System.Drawing.Size(117, 41);
this.btnSave.TabIndex = 40;
this.btnSave.Text = "保存";
this.btnSave.UseVisualStyleBackColor = true;
this.btnSave.Click += new System.EventHandler(this.btnSave_Click);
//
// txtBoardLength
//
this.txtBoardLength.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.txtBoardLength.Location = new System.Drawing.Point(492, 25);
this.txtBoardLength.MaxLength = 8;
this.txtBoardLength.Name = "txtBoardLength";
this.txtBoardLength.Size = new System.Drawing.Size(53, 23);
this.txtBoardLength.TabIndex = 4;
this.txtBoardLength.TextChanged += new System.EventHandler(this.txtBoardLength_TextChanged);
//
// label4
//
this.label4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(600, 28);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(20, 17);
this.label4.TabIndex = 5;
this.label4.Text = "宽";
//
// label3
//
this.label3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(466, 28);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(20, 17);
this.label3.TabIndex = 3;
this.label3.Text = "高";
//
// txtBoardWidth
//
this.txtBoardWidth.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.txtBoardWidth.Location = new System.Drawing.Point(622, 25);
this.txtBoardWidth.MaxLength = 8;
this.txtBoardWidth.Name = "txtBoardWidth";
this.txtBoardWidth.Size = new System.Drawing.Size(53, 23);
this.txtBoardWidth.TabIndex = 6;
this.txtBoardWidth.TextChanged += new System.EventHandler(this.txtBoardWidth_TextChanged);
//
// btnOpenFile
//
this.btnOpenFile.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnOpenFile.FlatAppearance.BorderSize = 0;
this.btnOpenFile.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOpenFile.Location = new System.Drawing.Point(1103, 22);
this.btnOpenFile.Name = "btnOpenFile";
this.btnOpenFile.Size = new System.Drawing.Size(117, 41);
this.btnOpenFile.TabIndex = 260;
this.btnOpenFile.Text = "打开图片";
this.btnOpenFile.UseVisualStyleBackColor = true;
this.btnOpenFile.Click += new System.EventHandler(this.btnOpenFile_Click);
//
// btnSStop
//
this.btnSStop.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnSStop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSStop.Location = new System.Drawing.Point(1264, 9);
this.btnSStop.Name = "btnSStop";
this.btnSStop.Size = new System.Drawing.Size(117, 23);
this.btnSStop.TabIndex = 256;
this.btnSStop.Text = "烙铁停止移动";
this.btnSStop.UseVisualStyleBackColor = true;
this.btnSStop.Visible = false;
//
// btnWStop
//
this.btnWStop.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnWStop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnWStop.Location = new System.Drawing.Point(1264, 37);
this.btnWStop.Name = "btnWStop";
this.btnWStop.Size = new System.Drawing.Size(117, 23);
this.btnWStop.TabIndex = 257;
this.btnWStop.Text = "送丝停止移动";
this.btnWStop.UseVisualStyleBackColor = true;
this.btnWStop.Visible = false;
//
// label14
//
this.label14.AutoSize = true;
this.label14.Location = new System.Drawing.Point(195, 34);
this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(44, 17);
this.label14.TabIndex = 9;
this.label14.Text = "条形码";
this.label14.Visible = false;
//
// FrmBoardInfo
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
......@@ -1477,6 +1477,23 @@
private System.Windows.Forms.PictureBox picDown;
private System.Windows.Forms.PictureBox picZDel;
private System.Windows.Forms.PictureBox picZAdd;
private System.Windows.Forms.Label lblRobotRZ;
private System.Windows.Forms.Label label7;
private System.Windows.Forms.Label label8;
private System.Windows.Forms.Label lblRobotRY;
private System.Windows.Forms.Label lblRobotRX;
private System.Windows.Forms.Label label16;
private System.Windows.Forms.Label txtRobotZ;
private System.Windows.Forms.Label label13;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Label txtRobotY;
private System.Windows.Forms.Label txtRobotX;
private System.Windows.Forms.Label label12;
private System.Windows.Forms.Label label6;
private System.Windows.Forms.TextBox txtSendWireLength;
private System.Windows.Forms.Label label11;
private System.Windows.Forms.CheckBox chbIsSafe;
private System.Windows.Forms.Button btnExit;
private System.Windows.Forms.DataGridViewTextBoxColumn Column_pointNum;
private System.Windows.Forms.DataGridViewTextBoxColumn Column_Name;
private System.Windows.Forms.DataGridViewTextBoxColumn Column_X;
......@@ -1506,22 +1523,5 @@
private System.Windows.Forms.DataGridViewLinkColumn Column_Del;
private System.Windows.Forms.DataGridViewImageColumn Column_Up;
private System.Windows.Forms.DataGridViewImageColumn Column_Down;
private System.Windows.Forms.Label lblRobotRZ;
private System.Windows.Forms.Label label7;
private System.Windows.Forms.Label label8;
private System.Windows.Forms.Label lblRobotRY;
private System.Windows.Forms.Label lblRobotRX;
private System.Windows.Forms.Label label16;
private System.Windows.Forms.Label txtRobotZ;
private System.Windows.Forms.Label label13;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Label txtRobotY;
private System.Windows.Forms.Label txtRobotX;
private System.Windows.Forms.Label label12;
private System.Windows.Forms.Label label6;
private System.Windows.Forms.TextBox txtSendWireLength;
private System.Windows.Forms.Label label11;
private System.Windows.Forms.CheckBox chbIsSafe;
private System.Windows.Forms.Button btnExit;
}
}
\ No newline at end of file
URSolderingClient/FrmWeldPointInfo.Designer.cs
......@@ -128,48 +128,52 @@
// label17
//
this.label17.AutoSize = true;
this.label17.Location = new System.Drawing.Point(219, 58);
this.label17.Location = new System.Drawing.Point(219, 68);
this.label17.Name = "label17";
this.label17.Size = new System.Drawing.Size(32, 17);
this.label17.Size = new System.Drawing.Size(92, 17);
this.label17.TabIndex = 66;
this.label17.Text = "说明";
this.label17.Text = "正常焊接的焊点";
this.label17.Visible = false;
//
// label16
//
this.label16.AutoSize = true;
this.label16.Location = new System.Drawing.Point(215, 93);
this.label16.Location = new System.Drawing.Point(215, 98);
this.label16.Name = "label16";
this.label16.Size = new System.Drawing.Size(68, 17);
this.label16.TabIndex = 65;
this.label16.Text = "清洗时间：";
this.label16.Visible = false;
//
// txtClearTime
//
this.txtClearTime.Enabled = false;
this.txtClearTime.Location = new System.Drawing.Point(286, 90);
this.txtClearTime.Location = new System.Drawing.Point(286, 95);
this.txtClearTime.Name = "txtClearTime";
this.txtClearTime.Size = new System.Drawing.Size(66, 23);
this.txtClearTime.TabIndex = 64;
this.txtClearTime.Visible = false;
//
// label15
//
this.label15.AutoSize = true;
this.label15.Location = new System.Drawing.Point(358, 93);
this.label15.Location = new System.Drawing.Point(358, 98);
this.label15.Name = "label15";
this.label15.Size = new System.Drawing.Size(25, 17);
this.label15.TabIndex = 63;
this.label15.Text = "ms";
this.label15.Visible = false;
//
// chbClear
//
this.chbClear.AutoSize = true;
this.chbClear.Location = new System.Drawing.Point(92, 91);
this.chbClear.Location = new System.Drawing.Point(92, 96);
this.chbClear.Name = "chbClear";
this.chbClear.Size = new System.Drawing.Size(87, 21);
this.chbClear.TabIndex = 62;
this.chbClear.Text = "清洗烙铁头";
this.chbClear.UseVisualStyleBackColor = true;
this.chbClear.Visible = false;
this.chbClear.CheckedChanged += new System.EventHandler(this.chbClear_CheckedChanged);
//
// cmbPointType
......@@ -178,7 +182,7 @@
this.cmbPointType.FormattingEnabled = true;
this.cmbPointType.Items.AddRange(new object[] {
"普通焊点"});
this.cmbPointType.Location = new System.Drawing.Point(92, 55);
this.cmbPointType.Location = new System.Drawing.Point(92, 65);
this.cmbPointType.Name = "cmbPointType";
this.cmbPointType.Size = new System.Drawing.Size(121, 25);
this.cmbPointType.TabIndex = 61;
......@@ -186,7 +190,7 @@
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(43, 58);
this.label2.Location = new System.Drawing.Point(43, 68);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(44, 17);
this.label2.TabIndex = 60;
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!