Skip to content

孙克 / URSolderingRobot

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

增加中间点的配置功能

1 个父辈 4024e72c
内嵌 并排
正在显示 13 个修改的文件 包含 989 行增加 和 920 行删除
DeviceLibrary/Robot/soldering/WeldRobotBean_Partial.cs
...@@ -14,12 +14,8 @@ namespace URSoldering.DeviceLibrary ...@@ -14,12 +14,8 @@ namespace URSoldering.DeviceLibrary
public delegate void AOICheck( ); public delegate void AOICheck( );
public static event AOICheck AOICheckFun; public static event AOICheck AOICheckFun;
public static string StartWeld() public static string StartWeld( )
{
return StartWeld(0);
}
public static string StartWeld(int type)
{ {
StopSleep(); StopSleep();
KeepTemp(); KeepTemp();
...@@ -44,7 +40,7 @@ namespace URSoldering.DeviceLibrary ...@@ -44,7 +40,7 @@ namespace URSoldering.DeviceLibrary
WeldCount++; WeldCount++;
LogUtil.info(RobotName + "开始【" + BoardManager.CurrBoard.boardName + "】的焊接 ,WeldCount="+WeldCount); LogUtil.info(RobotName + "开始【" + BoardManager.CurrBoard.boardName + "】的焊接 ,WeldCount="+WeldCount);
if (!WeldMoveStep.NewWeld(MoveType.Weld, BoardManager.CurrBoard, type)) if (!WeldMoveStep.NewWeld(MoveType.Weld, BoardManager.CurrBoard))
{ {
return "没有找到需要焊接的焊点，启动焊接失败！"; return "没有找到需要焊接的焊点，启动焊接失败！";
} }
...@@ -69,26 +65,33 @@ namespace URSoldering.DeviceLibrary ...@@ -69,26 +65,33 @@ namespace URSoldering.DeviceLibrary
} }
else if (WeldMoveStep.moveStep.Equals(MoveStep.W01_RobotMoveToPoint)) else if (WeldMoveStep.moveStep.Equals(MoveStep.W01_RobotMoveToPoint))
{ {
if (WeldMoveStep.CurrPoint.pointType.Equals(0))
if (WeldMoveStep.IsSlowSendWire)
{ {
//已经慢速送丝
WeldMoveStep.NextMoveStep(MoveStep.W03_SendWire); if (WeldMoveStep.IsSlowSendWire)
SendWire();
}
else
{
if (WeldMoveStep.CurrPoint.startSendWireTime > 0 && WeldMoveStep.CurrPoint.startSendWireSpeed > 0)
{ {
WeldMoveStep.NextMoveStep(MoveStep.W02_SlowSendWire); //已经慢速送丝
SlowSendWire(); WeldMoveStep.NextMoveStep(MoveStep.W03_SendWire);
SendWire();
} }
else else
{ {
WeldMoveStep.NextMoveStep(MoveStep.W03_SendWire); if (WeldMoveStep.CurrPoint.startSendWireTime > 0 && WeldMoveStep.CurrPoint.startSendWireSpeed > 0)
SendWire(); {
WeldMoveStep.NextMoveStep(MoveStep.W02_SlowSendWire);
SlowSendWire();
}
else
{
WeldMoveStep.NextMoveStep(MoveStep.W03_SendWire);
SendWire();
}
} }
} }
else
{
PointEndPross();
}
} }
else if (WeldMoveStep.moveStep.Equals(MoveStep.W02_SlowSendWire)) else if (WeldMoveStep.moveStep.Equals(MoveStep.W02_SlowSendWire))
{ {
...@@ -184,12 +187,19 @@ namespace URSoldering.DeviceLibrary ...@@ -184,12 +187,19 @@ namespace URSoldering.DeviceLibrary
{ {
SetPreTemp(true, false); SetPreTemp(true, false);
} }
LogUtil.info(" 新焊点【" + WeldMoveStep.CurrPoint.pointName + "】预热" + WeldMoveStep.CurrPoint.preheatTemperature + "度，送丝下降，移动机械臂"); if (WeldMoveStep.CurrPoint.pointType.Equals(0))
MoveToPoint(WeldMoveStep.CurrPoint, false); {
WorkCountManager.AddWeldPint(); LogUtil.info(" 新" + WeldMoveStep.CurrPoint.TypeValue + "【" + WeldMoveStep.CurrPoint.pointName + "】预热" + WeldMoveStep.CurrPoint.preheatTemperature + "度，送丝下降，移动机械臂");
WeldMoveStep.IsSlowSendWire = true; MoveToPoint(WeldMoveStep.CurrPoint, false);
SlowSendWire(); WorkCountManager.AddWeldPint();
WeldMoveStep.IsSlowSendWire = true;
SlowSendWire();
}
else
{
LogUtil.info(" 新" + WeldMoveStep.CurrPoint.TypeValue + "【" + WeldMoveStep.CurrPoint.pointName + "】 移动机械臂");
MoveToPoint(WeldMoveStep.CurrPoint, false);
}
} }
private static void PointEndPross() private static void PointEndPross()
{ {
......
DeviceLibrary/Robot/soldering/WeldStepBean.cs
...@@ -3,6 +3,7 @@ using System; ...@@ -3,6 +3,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using URSoldering.Common;
namespace URSoldering.DeviceLibrary namespace URSoldering.DeviceLibrary
{ {
...@@ -92,8 +93,8 @@ namespace URSoldering.DeviceLibrary ...@@ -92,8 +93,8 @@ namespace URSoldering.DeviceLibrary
/// <summary> /// <summary>
/// 开始焊接 /// 开始焊接
/// </summary> /// </summary>
/// <param name="pointType">焊点类型，0=所有，1=只焊接左侧，2=只焊接右侧</param> /// <param name="pointType">焊点类型，0=所有 </param>
public bool NewWeld(MoveType type, BoardInfo board, int pointType) public bool NewWeld(MoveType type, BoardInfo board )
{ {
IsSlowSendWire = false; IsSlowSendWire = false;
StartPointIndex = 0; StartPointIndex = 0;
...@@ -101,14 +102,14 @@ namespace URSoldering.DeviceLibrary ...@@ -101,14 +102,14 @@ namespace URSoldering.DeviceLibrary
NewWeld(type); NewWeld(type);
this.currBoard = board; this.currBoard = board;
CurrPointIndex = 0; CurrPointIndex = 0;
if (pointType.Equals(0)) //if (pointType.Equals(0))
{ //{
weldPointList = board.pointList; weldPointList = board.pointList;
} //}
else //else
{ //{
weldPointList = (from m in board.pointList where m.pointType.Equals(pointType) && m.pointType.Equals(0) select m).ToList<WeldPointInfo>(); // weldPointList = (from m in board.pointList where m.pointType.Equals(pointType) && m.pointType.Equals(0) select m).ToList<WeldPointInfo>();
} //}
if (weldPointList.Count <= 0) if (weldPointList.Count <= 0)
{ {
return false; return false;
...@@ -117,6 +118,8 @@ namespace URSoldering.DeviceLibrary ...@@ -117,6 +118,8 @@ namespace URSoldering.DeviceLibrary
{ {
if (!URRobotControl.PointIsValid(p.GetURPoint())) if (!URRobotControl.PointIsValid(p.GetURPoint()))
{ {
LogUtil.error("【"+ board .boardName+ "】的焊点【"+p.pointName+"】坐标无效，无法开始焊接");
return false; return false;
} }
} }
......
DeviceLibrary/bean/BoardInfo.cs
...@@ -168,9 +168,9 @@ namespace URSoldering.DeviceLibrary ...@@ -168,9 +168,9 @@ namespace URSoldering.DeviceLibrary
isNeedClear = false; isNeedClear = false;
pointType = 0; pointType = 0;
} }
public WeldPointInfo(int hand) public WeldPointInfo(int type)
{ {
//this.HandDirection = hand; this.pointType = type;
} }
/// <summary> /// <summary>
...@@ -184,7 +184,7 @@ namespace URSoldering.DeviceLibrary ...@@ -184,7 +184,7 @@ namespace URSoldering.DeviceLibrary
public string pointName { get; set; } public string pointName { get; set; }
public double RobotX { get; set; } public double RobotX { get; set; }
public double RoobtY { get; set; } public double RobotY { get; set; }
public double RobotZ { get; set; } public double RobotZ { get; set; }
public double RobotRX { get; set; } public double RobotRX { get; set; }
public double RobotRY { get; set; } public double RobotRY { get; set; }
...@@ -242,7 +242,7 @@ namespace URSoldering.DeviceLibrary ...@@ -242,7 +242,7 @@ namespace URSoldering.DeviceLibrary
public double sendWireTime { get; set; } public double sendWireTime { get; set; }
/// <summary> /// <summary>
/// 焊点类型，0=普通焊点，必须要焊接，1=左侧焊点，起始运行模式不焊接。2=右侧焊点，排料模式不焊接 /// 焊点类型，0=普通焊点，必须要焊接，1=中间点，机器人跳转位置使用
/// </summary> /// </summary>
public int pointType { get; set; } public int pointType { get; set; }
/// <summary> /// <summary>
...@@ -253,10 +253,25 @@ namespace URSoldering.DeviceLibrary ...@@ -253,10 +253,25 @@ namespace URSoldering.DeviceLibrary
/// 清洗时间，毫秒数 /// 清洗时间，毫秒数
/// </summary> /// </summary>
public int ClearTime { get; set; } public int ClearTime { get; set; }
public string TypeValue
{
get
{
if (pointType.Equals(0))
{
return "普通焊点";
}
else
{
return "中间点";
}
} set
{
}
}
public URPointValue GetURPoint() public URPointValue GetURPoint()
{ {
URPointValue p = new URPointValue(RobotX, RoobtY, RobotZ, RobotRX, RobotRY, RobotRZ); URPointValue p = new URPointValue(RobotX, RobotY, RobotZ, RobotRX, RobotRY, RobotRZ);
return p; return p;
} }
......
DeviceLibrary/deviceLibrary/kangnaide/KNDManager.cs
...@@ -186,8 +186,9 @@ namespace URSoldering.DeviceLibrary ...@@ -186,8 +186,9 @@ namespace URSoldering.DeviceLibrary
} }
//关闭所有的DO //关闭所有的DO
public static void CloseAllDO() public static void CloseAllDO()
{ {
foreach (string key in mastMap.Keys) List<string> keyList = new List<string>(mastMap.Keys);
foreach (string key in keyList)
{ {
byte[] data = new byte[] { 0,0}; byte[] data = new byte[] { 0,0};
WriteMultipleDO(key, DefualtSlaveID, DoStartAddress, DefaultDOLength, data); WriteMultipleDO(key, DefualtSlaveID, DoStartAddress, DefaultDOLength, data);
......
URSolderingClient/FrmBoardInfo.Designer.cs
...@@ -34,6 +34,12 @@ ...@@ -34,6 +34,12 @@
this.保存焊点ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.保存焊点ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog(); this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog();
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
this.picRight = new System.Windows.Forms.PictureBox();
this.picLeft = new System.Windows.Forms.PictureBox();
this.picUp = new System.Windows.Forms.PictureBox();
this.picDown = new System.Windows.Forms.PictureBox();
this.picZDel = new System.Windows.Forms.PictureBox();
this.picZAdd = new System.Windows.Forms.PictureBox();
this.contextMenuStrip2 = new System.Windows.Forms.ContextMenuStrip(this.components); this.contextMenuStrip2 = new System.Windows.Forms.ContextMenuStrip(this.components);
this.更新坐标ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.更新坐标ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.测试位置ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.测试位置ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
...@@ -63,12 +69,6 @@ ...@@ -63,12 +69,6 @@
this.label16 = new System.Windows.Forms.Label(); this.label16 = new System.Windows.Forms.Label();
this.lblSpeed = new System.Windows.Forms.Label(); this.lblSpeed = new System.Windows.Forms.Label();
this.panel3 = new System.Windows.Forms.Panel(); this.panel3 = new System.Windows.Forms.Panel();
this.picRight = new System.Windows.Forms.PictureBox();
this.picLeft = new System.Windows.Forms.PictureBox();
this.picUp = new System.Windows.Forms.PictureBox();
this.picDown = new System.Windows.Forms.PictureBox();
this.picZDel = new System.Windows.Forms.PictureBox();
this.picZAdd = new System.Windows.Forms.PictureBox();
this.btnPositionTest = new System.Windows.Forms.Button(); this.btnPositionTest = new System.Windows.Forms.Button();
this.lblEpsonError = new System.Windows.Forms.Label(); this.lblEpsonError = new System.Windows.Forms.Label();
this.lblMsg = new System.Windows.Forms.Label(); this.lblMsg = new System.Windows.Forms.Label();
...@@ -88,6 +88,22 @@ ...@@ -88,6 +88,22 @@
this.txtRobotX = new System.Windows.Forms.Label(); this.txtRobotX = new System.Windows.Forms.Label();
this.label12 = new System.Windows.Forms.Label(); this.label12 = new System.Windows.Forms.Label();
this.dgvList = new System.Windows.Forms.DataGridView(); this.dgvList = new System.Windows.Forms.DataGridView();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.cmbAoiFile = new System.Windows.Forms.ComboBox();
this.label9 = 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_pointNum = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column_Name = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column_Name = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column_X = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column_X = new System.Windows.Forms.DataGridViewTextBoxColumn();
...@@ -108,7 +124,7 @@ ...@@ -108,7 +124,7 @@
this.Column_startSendWireTime = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column_startSendWireTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column_sendWireSpeed = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column_sendWireSpeed = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column_sendWireTime = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column_sendWireTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column_pointType = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column_pointType = new System.Windows.Forms.DataGridViewComboBoxColumn();
this.Column_isClear = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.Column_isClear = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.Column_ClearTime = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column_ClearTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column_getPosition = new System.Windows.Forms.DataGridViewLinkColumn(); this.Column_getPosition = new System.Windows.Forms.DataGridViewLinkColumn();
...@@ -117,35 +133,19 @@ ...@@ -117,35 +133,19 @@
this.Column_Del = new System.Windows.Forms.DataGridViewLinkColumn(); this.Column_Del = new System.Windows.Forms.DataGridViewLinkColumn();
this.Column_Up = new System.Windows.Forms.DataGridViewImageColumn(); this.Column_Up = new System.Windows.Forms.DataGridViewImageColumn();
this.Column_Down = new System.Windows.Forms.DataGridViewImageColumn(); this.Column_Down = new System.Windows.Forms.DataGridViewImageColumn();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.cmbAoiFile = new System.Windows.Forms.ComboBox();
this.label9 = 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(); this.contextMenuStrip1.SuspendLayout();
this.contextMenuStrip2.SuspendLayout();
this.panel1.SuspendLayout();
this.panBoard.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.picBoard)).BeginInit();
this.groupBox2.SuspendLayout();
this.panel3.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();
((System.ComponentModel.ISupportInitialize)(this.picUp)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.picUp)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picDown)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.picDown)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picZDel)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.picZDel)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picZAdd)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.picZAdd)).BeginInit();
this.contextMenuStrip2.SuspendLayout();
this.panel1.SuspendLayout();
this.panBoard.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.picBoard)).BeginInit();
this.groupBox2.SuspendLayout();
this.panel3.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.tckSpeed)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tckSpeed)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.dgvList)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dgvList)).BeginInit();
this.groupBox1.SuspendLayout(); this.groupBox1.SuspendLayout();
...@@ -169,6 +169,84 @@ ...@@ -169,6 +169,84 @@
// //
this.openFileDialog1.FileName = "openFileDialog1"; this.openFileDialog1.FileName = "openFileDialog1";
// //
// picRight
//
this.picRight.BackColor = System.Drawing.Color.Transparent;
this.picRight.Image = ((System.Drawing.Image)(resources.GetObject("picRight.Image")));
this.picRight.Location = new System.Drawing.Point(151, 42);
this.picRight.Name = "picRight";
this.picRight.Size = new System.Drawing.Size(45, 45);
this.picRight.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.picRight.TabIndex = 326;
this.picRight.TabStop = false;
this.toolTip1.SetToolTip(this.picRight, "向右");
this.picRight.Click += new System.EventHandler(this.btnRight_Click);
//
// picLeft
//
this.picLeft.BackColor = System.Drawing.Color.Transparent;
this.picLeft.Image = ((System.Drawing.Image)(resources.GetObject("picLeft.Image")));
this.picLeft.Location = new System.Drawing.Point(73, 42);
this.picLeft.Name = "picLeft";
this.picLeft.Size = new System.Drawing.Size(45, 45);
this.picLeft.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.picLeft.TabIndex = 323;
this.picLeft.TabStop = false;
this.toolTip1.SetToolTip(this.picLeft, "向左");
this.picLeft.Click += new System.EventHandler(this.btnLeft_Click);
//
// picUp
//
this.picUp.BackColor = System.Drawing.Color.Transparent;
this.picUp.Image = ((System.Drawing.Image)(resources.GetObject("picUp.Image")));
this.picUp.Location = new System.Drawing.Point(111, 2);
this.picUp.Name = "picUp";
this.picUp.Size = new System.Drawing.Size(45, 45);
this.picUp.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.picUp.TabIndex = 325;
this.picUp.TabStop = false;
this.toolTip1.SetToolTip(this.picUp, "向前");
this.picUp.Click += new System.EventHandler(this.btnUp_Click);
//
// picDown
//
this.picDown.BackColor = System.Drawing.Color.Transparent;
this.picDown.Image = ((System.Drawing.Image)(resources.GetObject("picDown.Image")));
this.picDown.Location = new System.Drawing.Point(111, 82);
this.picDown.Name = "picDown";
this.picDown.Size = new System.Drawing.Size(45, 45);
this.picDown.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.picDown.TabIndex = 324;
this.picDown.TabStop = false;
this.toolTip1.SetToolTip(this.picDown, "向后");
this.picDown.Click += new System.EventHandler(this.btnDown_Click);
//
// picZDel
//
this.picZDel.BackColor = System.Drawing.Color.Transparent;
this.picZDel.Image = ((System.Drawing.Image)(resources.GetObject("picZDel.Image")));
this.picZDel.Location = new System.Drawing.Point(2, 65);
this.picZDel.Name = "picZDel";
this.picZDel.Size = new System.Drawing.Size(45, 45);
this.picZDel.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.picZDel.TabIndex = 322;
this.picZDel.TabStop = false;
this.toolTip1.SetToolTip(this.picZDel, "向下");
this.picZDel.Click += new System.EventHandler(this.btnZDel_Click);
//
// picZAdd
//
this.picZAdd.BackColor = System.Drawing.Color.Transparent;
this.picZAdd.Image = ((System.Drawing.Image)(resources.GetObject("picZAdd.Image")));
this.picZAdd.Location = new System.Drawing.Point(2, 20);
this.picZAdd.Name = "picZAdd";
this.picZAdd.Size = new System.Drawing.Size(45, 45);
this.picZAdd.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.picZAdd.TabIndex = 320;
this.picZAdd.TabStop = false;
this.toolTip1.SetToolTip(this.picZAdd, "向上");
this.picZAdd.Click += new System.EventHandler(this.btnZAdd_Click);
//
// contextMenuStrip2 // contextMenuStrip2
// //
this.contextMenuStrip2.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.contextMenuStrip2.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
...@@ -274,7 +352,7 @@ ...@@ -274,7 +352,7 @@
| System.Windows.Forms.AnchorStyles.Left))); | System.Windows.Forms.AnchorStyles.Left)));
this.panPoint.Location = new System.Drawing.Point(12, 349); this.panPoint.Location = new System.Drawing.Point(12, 349);
this.panPoint.Name = "panPoint"; this.panPoint.Name = "panPoint";
this.panPoint.Size = new System.Drawing.Size(916, 267); this.panPoint.Size = new System.Drawing.Size(1049, 267);
this.panPoint.TabIndex = 321; this.panPoint.TabIndex = 321;
// //
// panBoard // panBoard
...@@ -283,9 +361,9 @@ ...@@ -283,9 +361,9 @@
| System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.panBoard.Controls.Add(this.picBoard); this.panBoard.Controls.Add(this.picBoard);
this.panBoard.Location = new System.Drawing.Point(940, 78); this.panBoard.Location = new System.Drawing.Point(1069, 78);
this.panBoard.Name = "panBoard"; this.panBoard.Name = "panBoard";
this.panBoard.Size = new System.Drawing.Size(440, 553); this.panBoard.Size = new System.Drawing.Size(311, 553);
this.panBoard.TabIndex = 261; this.panBoard.TabIndex = 261;
// //
// picBoard // picBoard
...@@ -296,7 +374,7 @@ ...@@ -296,7 +374,7 @@
this.picBoard.Cursor = System.Windows.Forms.Cursors.Cross; this.picBoard.Cursor = System.Windows.Forms.Cursors.Cross;
this.picBoard.Location = new System.Drawing.Point(0, 0); this.picBoard.Location = new System.Drawing.Point(0, 0);
this.picBoard.Name = "picBoard"; this.picBoard.Name = "picBoard";
this.picBoard.Size = new System.Drawing.Size(421, 493); this.picBoard.Size = new System.Drawing.Size(292, 493);
this.picBoard.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.picBoard.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.picBoard.TabIndex = 259; this.picBoard.TabIndex = 259;
this.picBoard.TabStop = false; this.picBoard.TabStop = false;
...@@ -339,7 +417,7 @@ ...@@ -339,7 +417,7 @@
this.groupBox2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); 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.Location = new System.Drawing.Point(12, 78);
this.groupBox2.Name = "groupBox2"; this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(916, 227); this.groupBox2.Size = new System.Drawing.Size(1049, 227);
this.groupBox2.TabIndex = 22; this.groupBox2.TabIndex = 22;
this.groupBox2.TabStop = false; this.groupBox2.TabStop = false;
this.groupBox2.Text = "机器人实时坐标"; this.groupBox2.Text = "机器人实时坐标";
...@@ -355,7 +433,7 @@ ...@@ -355,7 +433,7 @@
// label10 // label10
// //
this.label10.AutoSize = true; this.label10.AutoSize = true;
this.label10.Location = new System.Drawing.Point(-1, 22); this.label10.Location = new System.Drawing.Point(5, 22);
this.label10.Name = "label10"; this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(32, 17); this.label10.Size = new System.Drawing.Size(32, 17);
this.label10.TabIndex = 267; this.label10.TabIndex = 267;
...@@ -389,7 +467,7 @@ ...@@ -389,7 +467,7 @@
this.label6.AutoSize = true; this.label6.AutoSize = true;
this.label6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); 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.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label6.Location = new System.Drawing.Point(563, 66); this.label6.Location = new System.Drawing.Point(696, 66);
this.label6.Name = "label6"; this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(97, 17); this.label6.Size = new System.Drawing.Size(97, 17);
this.label6.TabIndex = 326; this.label6.TabIndex = 326;
...@@ -400,7 +478,7 @@ ...@@ -400,7 +478,7 @@
// //
this.txtSendWireLength.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); 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.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtSendWireLength.Location = new System.Drawing.Point(664, 63); this.txtSendWireLength.Location = new System.Drawing.Point(797, 63);
this.txtSendWireLength.MaxLength = 6; this.txtSendWireLength.MaxLength = 6;
this.txtSendWireLength.Name = "txtSendWireLength"; this.txtSendWireLength.Name = "txtSendWireLength";
this.txtSendWireLength.Size = new System.Drawing.Size(67, 23); this.txtSendWireLength.Size = new System.Drawing.Size(67, 23);
...@@ -479,94 +557,16 @@ ...@@ -479,94 +557,16 @@
this.panel3.Controls.Add(this.picDown); this.panel3.Controls.Add(this.picDown);
this.panel3.Controls.Add(this.picZDel); this.panel3.Controls.Add(this.picZDel);
this.panel3.Controls.Add(this.picZAdd); this.panel3.Controls.Add(this.picZAdd);
this.panel3.Location = new System.Drawing.Point(302, 44); this.panel3.Location = new System.Drawing.Point(375, 43);
this.panel3.Name = "panel3"; this.panel3.Name = "panel3";
this.panel3.Size = new System.Drawing.Size(199, 129); this.panel3.Size = new System.Drawing.Size(199, 129);
this.panel3.TabIndex = 259; this.panel3.TabIndex = 259;
// //
// picRight
//
this.picRight.BackColor = System.Drawing.Color.Transparent;
this.picRight.Image = ((System.Drawing.Image)(resources.GetObject("picRight.Image")));
this.picRight.Location = new System.Drawing.Point(151, 42);
this.picRight.Name = "picRight";
this.picRight.Size = new System.Drawing.Size(45, 45);
this.picRight.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.picRight.TabIndex = 326;
this.picRight.TabStop = false;
this.toolTip1.SetToolTip(this.picRight, "向右");
this.picRight.Click += new System.EventHandler(this.btnRight_Click);
//
// picLeft
//
this.picLeft.BackColor = System.Drawing.Color.Transparent;
this.picLeft.Image = ((System.Drawing.Image)(resources.GetObject("picLeft.Image")));
this.picLeft.Location = new System.Drawing.Point(73, 42);
this.picLeft.Name = "picLeft";
this.picLeft.Size = new System.Drawing.Size(45, 45);
this.picLeft.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.picLeft.TabIndex = 323;
this.picLeft.TabStop = false;
this.toolTip1.SetToolTip(this.picLeft, "向左");
this.picLeft.Click += new System.EventHandler(this.btnLeft_Click);
//
// picUp
//
this.picUp.BackColor = System.Drawing.Color.Transparent;
this.picUp.Image = ((System.Drawing.Image)(resources.GetObject("picUp.Image")));
this.picUp.Location = new System.Drawing.Point(111, 2);
this.picUp.Name = "picUp";
this.picUp.Size = new System.Drawing.Size(45, 45);
this.picUp.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.picUp.TabIndex = 325;
this.picUp.TabStop = false;
this.toolTip1.SetToolTip(this.picUp, "向前");
this.picUp.Click += new System.EventHandler(this.btnUp_Click);
//
// picDown
//
this.picDown.BackColor = System.Drawing.Color.Transparent;
this.picDown.Image = ((System.Drawing.Image)(resources.GetObject("picDown.Image")));
this.picDown.Location = new System.Drawing.Point(111, 82);
this.picDown.Name = "picDown";
this.picDown.Size = new System.Drawing.Size(45, 45);
this.picDown.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.picDown.TabIndex = 324;
this.picDown.TabStop = false;
this.toolTip1.SetToolTip(this.picDown, "向后");
this.picDown.Click += new System.EventHandler(this.btnDown_Click);
//
// picZDel
//
this.picZDel.BackColor = System.Drawing.Color.Transparent;
this.picZDel.Image = ((System.Drawing.Image)(resources.GetObject("picZDel.Image")));
this.picZDel.Location = new System.Drawing.Point(2, 65);
this.picZDel.Name = "picZDel";
this.picZDel.Size = new System.Drawing.Size(45, 45);
this.picZDel.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.picZDel.TabIndex = 322;
this.picZDel.TabStop = false;
this.toolTip1.SetToolTip(this.picZDel, "向下");
this.picZDel.Click += new System.EventHandler(this.btnZDel_Click);
//
// picZAdd
//
this.picZAdd.BackColor = System.Drawing.Color.Transparent;
this.picZAdd.Image = ((System.Drawing.Image)(resources.GetObject("picZAdd.Image")));
this.picZAdd.Location = new System.Drawing.Point(2, 20);
this.picZAdd.Name = "picZAdd";
this.picZAdd.Size = new System.Drawing.Size(45, 45);
this.picZAdd.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.picZAdd.TabIndex = 320;
this.picZAdd.TabStop = false;
this.toolTip1.SetToolTip(this.picZAdd, "向上");
this.picZAdd.Click += new System.EventHandler(this.btnZAdd_Click);
//
// btnPositionTest // btnPositionTest
// //
this.btnPositionTest.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.btnPositionTest.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnPositionTest.FlatAppearance.BorderSize = 0; this.btnPositionTest.FlatAppearance.BorderSize = 0;
this.btnPositionTest.Location = new System.Drawing.Point(793, 175); this.btnPositionTest.Location = new System.Drawing.Point(926, 175);
this.btnPositionTest.Name = "btnPositionTest"; this.btnPositionTest.Name = "btnPositionTest";
this.btnPositionTest.Size = new System.Drawing.Size(100, 37); this.btnPositionTest.Size = new System.Drawing.Size(100, 37);
this.btnPositionTest.TabIndex = 318; this.btnPositionTest.TabIndex = 318;
...@@ -590,7 +590,7 @@ ...@@ -590,7 +590,7 @@
this.lblMsg.AutoSize = true; 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.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.ForeColor = System.Drawing.Color.Red;
this.lblMsg.Location = new System.Drawing.Point(610, 144); this.lblMsg.Location = new System.Drawing.Point(743, 144);
this.lblMsg.Name = "lblMsg"; this.lblMsg.Name = "lblMsg";
this.lblMsg.Size = new System.Drawing.Size(65, 19); this.lblMsg.Size = new System.Drawing.Size(65, 19);
this.lblMsg.TabIndex = 260; this.lblMsg.TabIndex = 260;
...@@ -600,7 +600,7 @@ ...@@ -600,7 +600,7 @@
// //
this.btnSavePoint.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.btnSavePoint.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnSavePoint.FlatAppearance.BorderSize = 0; this.btnSavePoint.FlatAppearance.BorderSize = 0;
this.btnSavePoint.Location = new System.Drawing.Point(793, 136); this.btnSavePoint.Location = new System.Drawing.Point(926, 136);
this.btnSavePoint.Name = "btnSavePoint"; this.btnSavePoint.Name = "btnSavePoint";
this.btnSavePoint.Size = new System.Drawing.Size(100, 37); this.btnSavePoint.Size = new System.Drawing.Size(100, 37);
this.btnSavePoint.TabIndex = 30; this.btnSavePoint.TabIndex = 30;
...@@ -612,7 +612,7 @@ ...@@ -612,7 +612,7 @@
// //
this.btnStopDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); 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.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnStopDown.Location = new System.Drawing.Point(793, 58); this.btnStopDown.Location = new System.Drawing.Point(926, 58);
this.btnStopDown.Name = "btnStopDown"; this.btnStopDown.Name = "btnStopDown";
this.btnStopDown.Size = new System.Drawing.Size(100, 37); this.btnStopDown.Size = new System.Drawing.Size(100, 37);
this.btnStopDown.TabIndex = 317; this.btnStopDown.TabIndex = 317;
...@@ -624,7 +624,7 @@ ...@@ -624,7 +624,7 @@
// //
this.btnGoHome.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.btnGoHome.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnGoHome.FlatAppearance.BorderSize = 0; this.btnGoHome.FlatAppearance.BorderSize = 0;
this.btnGoHome.Location = new System.Drawing.Point(793, 97); this.btnGoHome.Location = new System.Drawing.Point(926, 97);
this.btnGoHome.Name = "btnGoHome"; this.btnGoHome.Name = "btnGoHome";
this.btnGoHome.Size = new System.Drawing.Size(100, 37); this.btnGoHome.Size = new System.Drawing.Size(100, 37);
this.btnGoHome.TabIndex = 35; this.btnGoHome.TabIndex = 35;
...@@ -638,7 +638,7 @@ ...@@ -638,7 +638,7 @@
this.label5.AutoSize = true; this.label5.AutoSize = true;
this.label5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); 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.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label5.Location = new System.Drawing.Point(563, 32); this.label5.Location = new System.Drawing.Point(696, 32);
this.label5.Name = "label5"; this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(97, 17); this.label5.Size = new System.Drawing.Size(97, 17);
this.label5.TabIndex = 276; this.label5.TabIndex = 276;
...@@ -676,7 +676,7 @@ ...@@ -676,7 +676,7 @@
// //
this.txtSpeed.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); 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.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtSpeed.Location = new System.Drawing.Point(664, 29); this.txtSpeed.Location = new System.Drawing.Point(797, 29);
this.txtSpeed.MaxLength = 6; this.txtSpeed.MaxLength = 6;
this.txtSpeed.Name = "txtSpeed"; this.txtSpeed.Name = "txtSpeed";
this.txtSpeed.Size = new System.Drawing.Size(66, 23); this.txtSpeed.Size = new System.Drawing.Size(66, 23);
...@@ -688,7 +688,7 @@ ...@@ -688,7 +688,7 @@
this.btnStopSend.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.btnStopSend.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnStopSend.Enabled = false; this.btnStopSend.Enabled = false;
this.btnStopSend.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); 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, 97); this.btnStopSend.Location = new System.Drawing.Point(783, 97);
this.btnStopSend.Name = "btnStopSend"; this.btnStopSend.Name = "btnStopSend";
this.btnStopSend.Size = new System.Drawing.Size(80, 34); this.btnStopSend.Size = new System.Drawing.Size(80, 34);
this.btnStopSend.TabIndex = 274; this.btnStopSend.TabIndex = 274;
...@@ -701,7 +701,7 @@ ...@@ -701,7 +701,7 @@
this.btnSendWire.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.btnSendWire.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnSendWire.Enabled = false; this.btnSendWire.Enabled = false;
this.btnSendWire.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); 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, 97); this.btnSendWire.Location = new System.Drawing.Point(696, 97);
this.btnSendWire.Name = "btnSendWire"; this.btnSendWire.Name = "btnSendWire";
this.btnSendWire.Size = new System.Drawing.Size(80, 34); this.btnSendWire.Size = new System.Drawing.Size(80, 34);
this.btnSendWire.TabIndex = 273; this.btnSendWire.TabIndex = 273;
...@@ -733,9 +733,8 @@ ...@@ -733,9 +733,8 @@
// btnWUp // btnWUp
// //
this.btnWUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); 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.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnWUp.Location = new System.Drawing.Point(793, 19); this.btnWUp.Location = new System.Drawing.Point(926, 19);
this.btnWUp.Name = "btnWUp"; this.btnWUp.Name = "btnWUp";
this.btnWUp.Size = new System.Drawing.Size(100, 37); this.btnWUp.Size = new System.Drawing.Size(100, 37);
this.btnWUp.TabIndex = 254; this.btnWUp.TabIndex = 254;
...@@ -807,7 +806,7 @@ ...@@ -807,7 +806,7 @@
this.dgvList.RowHeadersWidth = 5; this.dgvList.RowHeadersWidth = 5;
this.dgvList.RowTemplate.Height = 23; this.dgvList.RowTemplate.Height = 23;
this.dgvList.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; this.dgvList.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
this.dgvList.Size = new System.Drawing.Size(916, 316); this.dgvList.Size = new System.Drawing.Size(1049, 316);
this.dgvList.TabIndex = 31; this.dgvList.TabIndex = 31;
this.dgvList.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellContentClick); this.dgvList.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellContentClick);
this.dgvList.CellMouseDown += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dgvList_CellMouseDown); this.dgvList.CellMouseDown += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dgvList_CellMouseDown);
...@@ -818,49 +817,222 @@ ...@@ -818,49 +817,222 @@
this.dgvList.DragDrop += new System.Windows.Forms.DragEventHandler(this.dgvList_DragDrop); this.dgvList.DragDrop += new System.Windows.Forms.DragEventHandler(this.dgvList_DragDrop);
this.dgvList.DragEnter += new System.Windows.Forms.DragEventHandler(this.dgvList_DragEnter); this.dgvList.DragEnter += new System.Windows.Forms.DragEventHandler(this.dgvList_DragEnter);
// //
// Column_pointNum // groupBox1
//
this.Column_pointNum.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
this.Column_pointNum.DataPropertyName = "pointNum";
this.Column_pointNum.HeaderText = "ID";
this.Column_pointNum.Name = "Column_pointNum";
this.Column_pointNum.ReadOnly = true;
this.Column_pointNum.Width = 46;
// //
// Column_Name this.groupBox1.Controls.Add(this.cmbAoiFile);
this.groupBox1.Controls.Add(this.label9);
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(1049, 68);
this.groupBox1.TabIndex = 20;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "程序基本信息";
// //
this.Column_Name.DataPropertyName = "pointName"; // cmbAoiFile
this.Column_Name.HeaderText = "名称";
this.Column_Name.Name = "Column_Name";
this.Column_Name.ReadOnly = true;
this.Column_Name.Width = 120;
// //
// Column_X this.cmbAoiFile.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbAoiFile.FormattingEnabled = true;
this.cmbAoiFile.Location = new System.Drawing.Point(340, 23);
this.cmbAoiFile.Name = "cmbAoiFile";
this.cmbAoiFile.Size = new System.Drawing.Size(180, 25);
this.cmbAoiFile.TabIndex = 269;
// //
this.Column_X.DataPropertyName = "RobotX"; // label9
this.Column_X.HeaderText = "X";
this.Column_X.Name = "Column_X";
this.Column_X.ReadOnly = true;
this.Column_X.Visible = false;
this.Column_X.Width = 75;
// //
// Column_Y this.label9.AutoSize = true;
this.label9.Location = new System.Drawing.Point(256, 28);
this.label9.Name = "label9";
this.label9.Size = new System.Drawing.Size(78, 17);
this.label9.TabIndex = 268;
this.label9.Text = "AOI检测程序";
//
// 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(768, 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(631, 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(909, 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(576, 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(691, 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(554, 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(713, 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;
this.Column_pointNum.DataPropertyName = "pointNum";
this.Column_pointNum.HeaderText = "ID";
this.Column_pointNum.Name = "Column_pointNum";
this.Column_pointNum.ReadOnly = true;
this.Column_pointNum.Width = 46;
//
// Column_Name
//
this.Column_Name.DataPropertyName = "pointName";
this.Column_Name.HeaderText = "名称";
this.Column_Name.Name = "Column_Name";
this.Column_Name.ReadOnly = true;
this.Column_Name.Width = 120;
//
// Column_X
//
this.Column_X.DataPropertyName = "RobotX";
this.Column_X.HeaderText = "坐标X";
this.Column_X.Name = "Column_X";
this.Column_X.ReadOnly = true;
this.Column_X.Width = 68;
//
// Column_Y
// //
this.Column_Y.DataPropertyName = "RobotY"; this.Column_Y.DataPropertyName = "RobotY";
this.Column_Y.HeaderText = "Y"; this.Column_Y.HeaderText = "坐标Y";
this.Column_Y.Name = "Column_Y"; this.Column_Y.Name = "Column_Y";
this.Column_Y.ReadOnly = true; this.Column_Y.ReadOnly = true;
this.Column_Y.Visible = false; this.Column_Y.Width = 68;
this.Column_Y.Width = 75;
// //
// Column_Z // Column_Z
// //
this.Column_Z.DataPropertyName = "RobotZ"; this.Column_Z.DataPropertyName = "RobotZ";
this.Column_Z.HeaderText = "Z"; this.Column_Z.HeaderText = "坐标Z";
this.Column_Z.Name = "Column_Z"; this.Column_Z.Name = "Column_Z";
this.Column_Z.ReadOnly = true; this.Column_Z.ReadOnly = true;
this.Column_Z.Visible = false; this.Column_Z.Width = 68;
this.Column_Z.Width = 75;
// //
// Column_RX // Column_RX
// //
...@@ -919,6 +1091,7 @@ ...@@ -919,6 +1091,7 @@
this.Column_preheatTime.HeaderText = "预热时间"; this.Column_preheatTime.HeaderText = "预热时间";
this.Column_preheatTime.Name = "Column_preheatTime"; this.Column_preheatTime.Name = "Column_preheatTime";
this.Column_preheatTime.ReadOnly = true; this.Column_preheatTime.ReadOnly = true;
this.Column_preheatTime.Visible = false;
this.Column_preheatTime.Width = 80; this.Column_preheatTime.Width = 80;
// //
// Column_weldTemperature // Column_weldTemperature
...@@ -953,7 +1126,8 @@ ...@@ -953,7 +1126,8 @@
this.Column_weldTime.HeaderText = "焊接时间"; this.Column_weldTime.HeaderText = "焊接时间";
this.Column_weldTime.Name = "Column_weldTime"; this.Column_weldTime.Name = "Column_weldTime";
this.Column_weldTime.ReadOnly = true; this.Column_weldTime.ReadOnly = true;
this.Column_weldTime.Width = 80; this.Column_weldTime.Visible = false;
this.Column_weldTime.Width = 75;
// //
// Column_startSendWireSpeed // Column_startSendWireSpeed
// //
...@@ -994,7 +1168,9 @@ ...@@ -994,7 +1168,9 @@
this.Column_pointType.HeaderText = "焊点类型"; this.Column_pointType.HeaderText = "焊点类型";
this.Column_pointType.Name = "Column_pointType"; this.Column_pointType.Name = "Column_pointType";
this.Column_pointType.ReadOnly = true; this.Column_pointType.ReadOnly = true;
this.Column_pointType.Visible = false; this.Column_pointType.Resizable = System.Windows.Forms.DataGridViewTriState.True;
this.Column_pointType.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
this.Column_pointType.Width = 90;
// //
// Column_isClear // Column_isClear
// //
...@@ -1073,182 +1249,6 @@ ...@@ -1073,182 +1249,6 @@
this.Column_Down.Visible = false; this.Column_Down.Visible = false;
this.Column_Down.Width = 50; this.Column_Down.Width = 50;
// //
// groupBox1
//
this.groupBox1.Controls.Add(this.cmbAoiFile);
this.groupBox1.Controls.Add(this.label9);
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 = "程序基本信息";
//
// cmbAoiFile
//
this.cmbAoiFile.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbAoiFile.FormattingEnabled = true;
this.cmbAoiFile.Location = new System.Drawing.Point(331, 23);
this.cmbAoiFile.Name = "cmbAoiFile";
this.cmbAoiFile.Size = new System.Drawing.Size(180, 25);
this.cmbAoiFile.TabIndex = 269;
//
// label9
//
this.label9.AutoSize = true;
this.label9.Location = new System.Drawing.Point(247, 28);
this.label9.Name = "label9";
this.label9.Size = new System.Drawing.Size(78, 17);
this.label9.TabIndex = 268;
this.label9.Text = "AOI检测程序";
//
// 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(736, 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(606, 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(551, 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(659, 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(529, 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(681, 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 // FrmBoardInfo
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
...@@ -1265,6 +1265,12 @@ ...@@ -1265,6 +1265,12 @@
this.Load += new System.EventHandler(this.FrmBoardInfo_Load); this.Load += new System.EventHandler(this.FrmBoardInfo_Load);
this.Shown += new System.EventHandler(this.FrmBoardInfo_Shown); this.Shown += new System.EventHandler(this.FrmBoardInfo_Shown);
this.contextMenuStrip1.ResumeLayout(false); this.contextMenuStrip1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.picRight)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picLeft)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picUp)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picDown)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picZDel)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picZAdd)).EndInit();
this.contextMenuStrip2.ResumeLayout(false); this.contextMenuStrip2.ResumeLayout(false);
this.panel1.ResumeLayout(false); this.panel1.ResumeLayout(false);
this.panBoard.ResumeLayout(false); this.panBoard.ResumeLayout(false);
...@@ -1272,12 +1278,6 @@ ...@@ -1272,12 +1278,6 @@
this.groupBox2.ResumeLayout(false); this.groupBox2.ResumeLayout(false);
this.groupBox2.PerformLayout(); this.groupBox2.PerformLayout();
this.panel3.ResumeLayout(false); this.panel3.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.picRight)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picLeft)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picUp)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picDown)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picZDel)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picZAdd)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tckSpeed)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.tckSpeed)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.dgvList)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.dgvList)).EndInit();
this.groupBox1.ResumeLayout(false); this.groupBox1.ResumeLayout(false);
...@@ -1362,6 +1362,8 @@ ...@@ -1362,6 +1362,8 @@
private System.Windows.Forms.Label label11; private System.Windows.Forms.Label label11;
private System.Windows.Forms.CheckBox chbIsSafe; private System.Windows.Forms.CheckBox chbIsSafe;
private System.Windows.Forms.Button btnExit; private System.Windows.Forms.Button btnExit;
private System.Windows.Forms.Label label9;
private System.Windows.Forms.ComboBox cmbAoiFile;
private System.Windows.Forms.DataGridViewTextBoxColumn Column_pointNum; private System.Windows.Forms.DataGridViewTextBoxColumn Column_pointNum;
private System.Windows.Forms.DataGridViewTextBoxColumn Column_Name; private System.Windows.Forms.DataGridViewTextBoxColumn Column_Name;
private System.Windows.Forms.DataGridViewTextBoxColumn Column_X; private System.Windows.Forms.DataGridViewTextBoxColumn Column_X;
...@@ -1382,7 +1384,7 @@ ...@@ -1382,7 +1384,7 @@
private System.Windows.Forms.DataGridViewTextBoxColumn Column_startSendWireTime; private System.Windows.Forms.DataGridViewTextBoxColumn Column_startSendWireTime;
private System.Windows.Forms.DataGridViewTextBoxColumn Column_sendWireSpeed; private System.Windows.Forms.DataGridViewTextBoxColumn Column_sendWireSpeed;
private System.Windows.Forms.DataGridViewTextBoxColumn Column_sendWireTime; private System.Windows.Forms.DataGridViewTextBoxColumn Column_sendWireTime;
private System.Windows.Forms.DataGridViewTextBoxColumn Column_pointType; private System.Windows.Forms.DataGridViewComboBoxColumn Column_pointType;
private System.Windows.Forms.DataGridViewCheckBoxColumn Column_isClear; private System.Windows.Forms.DataGridViewCheckBoxColumn Column_isClear;
private System.Windows.Forms.DataGridViewTextBoxColumn Column_ClearTime; private System.Windows.Forms.DataGridViewTextBoxColumn Column_ClearTime;
private System.Windows.Forms.DataGridViewLinkColumn Column_getPosition; private System.Windows.Forms.DataGridViewLinkColumn Column_getPosition;
...@@ -1391,7 +1393,5 @@ ...@@ -1391,7 +1393,5 @@
private System.Windows.Forms.DataGridViewLinkColumn Column_Del; private System.Windows.Forms.DataGridViewLinkColumn Column_Del;
private System.Windows.Forms.DataGridViewImageColumn Column_Up; private System.Windows.Forms.DataGridViewImageColumn Column_Up;
private System.Windows.Forms.DataGridViewImageColumn Column_Down; private System.Windows.Forms.DataGridViewImageColumn Column_Down;
private System.Windows.Forms.Label label9;
private System.Windows.Forms.ComboBox cmbAoiFile;
} }
} }
\ No newline at end of file \ No newline at end of file
URSolderingClient/FrmBoardInfo.cs
...@@ -54,21 +54,15 @@ namespace URSoldering.Client ...@@ -54,21 +54,15 @@ namespace URSoldering.Client
StepValue = 0.5; StepValue = 0.5;
tckSpeed.Value = 3; tckSpeed.Value = 3;
isFinishLoad = false; isFinishLoad = false;
//cmbOrgType.SelectedIndex = 0; LoadType();
//LoadProgram();
if (isNew == false) if (isNew == false)
{ {
LoadBoardInfo(); LoadBoardInfo();
} }
else
{
//this.txtOriginX.Text = ConfigAppSettings.GetValue(Setting_Init.BOARD_ORIGIN_X);
//this.txtOriginY.Text = ConfigAppSettings.GetValue(Setting_Init.BOARD_ORIGIN_Y);
}
loadPictureBoxSize(); loadPictureBoxSize();
LOGGER.Info("load image " + picBoard.Name); LOGGER.Info("load image " + picBoard.Name);
txtBoardName.Focus(); txtBoardName.Focus();
LoadCom(); LoadAOIList();
if (WeldRobotBean.ISRun) if (WeldRobotBean.ISRun)
{ {
LogUtil.error("进入焊接界面，发现WeldRobotBean自动运行中，关闭自动运行"); LogUtil.error("进入焊接界面，发现WeldRobotBean自动运行中，关闭自动运行");
...@@ -117,7 +111,7 @@ namespace URSoldering.Client ...@@ -117,7 +111,7 @@ namespace URSoldering.Client
isFinishLoad = true; isFinishLoad = true;
} }
List<string> FileList = new List<string>(); List<string> FileList = new List<string>();
private void LoadCom() private void LoadAOIList()
{ {
try try
{ {
...@@ -160,6 +154,15 @@ namespace URSoldering.Client ...@@ -160,6 +154,15 @@ namespace URSoldering.Client
LogUtil.error("加载出错：" + ex.ToString()); LogUtil.error("加载出错：" + ex.ToString());
} }
} }
private void LoadType()
{
List<WeldPointInfo> npoint = new List<WeldPointInfo>();
npoint.Add(new WeldPointInfo(0));
npoint.Add(new WeldPointInfo(1));
this.Column_pointType.DataSource = npoint;
this.Column_pointType.ValueMember = "pointType";
this.Column_pointType.DisplayMember = "TypeValue";
}
private void UpdateRobotPosition() private void UpdateRobotPosition()
{ {
URPointValue point = URRobotControl.GetLastPosition(); URPointValue point = URRobotControl.GetLastPosition();
...@@ -172,6 +175,18 @@ namespace URSoldering.Client ...@@ -172,6 +175,18 @@ namespace URSoldering.Client
} }
private bool SureMoveRobot() private bool SureMoveRobot()
{ {
if (URRobotControl.IsRun.Equals(false))
{
if (label11.Text.Equals(""))
{
MessageBox.Show("机器人未连接成功", "提示");
}
else
{
MessageBox.Show(label11.Text, "提示");
}
return false;
}
if (chbIsSafe.Checked) if (chbIsSafe.Checked)
{ {
return true; return true;
...@@ -232,7 +247,7 @@ namespace URSoldering.Client ...@@ -232,7 +247,7 @@ namespace URSoldering.Client
view.Cells[0].Value = point.pointNum.ToString(); view.Cells[0].Value = point.pointNum.ToString();
view.Cells[1].Value = point.pointName; view.Cells[1].Value = point.pointName;
view.Cells[2].Value = point.RobotX.ToString(); view.Cells[2].Value = point.RobotX.ToString();
view.Cells[3].Value = point.RoobtY.ToString(); view.Cells[3].Value = point.RobotY.ToString();
view.Cells[4].Value = point.RobotZ.ToString(); view.Cells[4].Value = point.RobotZ.ToString();
view.Cells[5].Value = point.RobotRX.ToString(); view.Cells[5].Value = point.RobotRX.ToString();
view.Cells[6].Value = point.RobotRY.ToString(); view.Cells[6].Value = point.RobotRY.ToString();
...@@ -250,7 +265,7 @@ namespace URSoldering.Client ...@@ -250,7 +265,7 @@ namespace URSoldering.Client
view.Cells[17].Value = point.startSendWireTime.ToString(); view.Cells[17].Value = point.startSendWireTime.ToString();
view.Cells[18].Value = point.sendWireSpeed.ToString(); view.Cells[18].Value = point.sendWireSpeed.ToString();
view.Cells[19].Value = point.sendWireTime.ToString(); view.Cells[19].Value = point.sendWireTime.ToString();
view.Cells[20].Value = point.pointType.ToString(); view.Cells[20].Value = point.pointType;
view.Cells[21].Value = point.isNeedClear.ToString(); view.Cells[21].Value = point.isNeedClear.ToString();
view.Cells[22].Value = point.ClearTime; view.Cells[22].Value = point.ClearTime;
return view; return view;
...@@ -436,27 +451,33 @@ namespace URSoldering.Client ...@@ -436,27 +451,33 @@ namespace URSoldering.Client
private void UpdateRow(int rowIndex) private void UpdateRow(int rowIndex)
{ {
int x_colIndex = dgvList.Columns[this.Column_X.Name].Index; URPointValue point = URRobotControl.GetLastPosition();
int y_colIndex = dgvList.Columns[Column_Y.Name].Index;
int z_colIndex = dgvList.Columns[Column_Z.Name].Index; DialogResult result = MessageBox.Show("当前坐标:" + point.ToShowStr() + "，是否确定更新？", "提示", MessageBoxButtons.YesNo);
int rx_colIndex = dgvList.Columns[this.Column_RX.Name].Index; if (result.Equals(DialogResult.Yes))
int ry_colIndex = dgvList.Columns[Column_RY.Name].Index; {
int rz_colIndex = dgvList.Columns[Column_RZ.Name].Index; int x_colIndex = dgvList.Columns[this.Column_X.Name].Index;
int y_colIndex = dgvList.Columns[Column_Y.Name].Index;
int z_colIndex = dgvList.Columns[Column_Z.Name].Index;
int rx_colIndex = dgvList.Columns[this.Column_RX.Name].Index;
int ry_colIndex = dgvList.Columns[Column_RY.Name].Index;
int rz_colIndex = dgvList.Columns[Column_RZ.Name].Index;
dgvList.Rows[rowIndex].Cells[this.Column_X.Name].Value = txtRobotX.Text.ToString(); dgvList.Rows[rowIndex].Cells[this.Column_X.Name].Value = txtRobotX.Text.ToString();
dgvList.Rows[rowIndex].Cells[this.Column_Y.Name].Value = txtRobotY.Text.ToString(); dgvList.Rows[rowIndex].Cells[this.Column_Y.Name].Value = txtRobotY.Text.ToString();
dgvList.Rows[rowIndex].Cells[this.Column_Z.Name].Value = txtRobotZ.Text; dgvList.Rows[rowIndex].Cells[this.Column_Z.Name].Value = txtRobotZ.Text;
dgvList.Rows[rowIndex].Cells[this.Column_RX.Name].Value = lblRobotRX.Text.ToString(); dgvList.Rows[rowIndex].Cells[this.Column_RX.Name].Value = lblRobotRX.Text.ToString();
dgvList.Rows[rowIndex].Cells[this.Column_RY.Name].Value = lblRobotRY.Text.ToString(); dgvList.Rows[rowIndex].Cells[this.Column_RY.Name].Value = lblRobotRY.Text.ToString();
dgvList.Rows[rowIndex].Cells[this.Column_RZ.Name].Value = lblRobotRZ.Text; dgvList.Rows[rowIndex].Cells[this.Column_RZ.Name].Value = lblRobotRZ.Text;
dgvList.UpdateCellValue(x_colIndex, rowIndex); dgvList.UpdateCellValue(x_colIndex, rowIndex);
dgvList.UpdateCellValue(y_colIndex, rowIndex); dgvList.UpdateCellValue(y_colIndex, rowIndex);
dgvList.UpdateCellValue(z_colIndex, rowIndex); dgvList.UpdateCellValue(z_colIndex, rowIndex);
dgvList.UpdateCellValue(rx_colIndex, rowIndex); dgvList.UpdateCellValue(rx_colIndex, rowIndex);
dgvList.UpdateCellValue(ry_colIndex, rowIndex); dgvList.UpdateCellValue(ry_colIndex, rowIndex);
dgvList.UpdateCellValue(rz_colIndex, rowIndex); dgvList.UpdateCellValue(rz_colIndex, rowIndex);
}
} }
private void DeleteRow(int rowIndex) private void DeleteRow(int rowIndex)
...@@ -692,7 +713,7 @@ namespace URSoldering.Client ...@@ -692,7 +713,7 @@ namespace URSoldering.Client
point.pointNum = Convert.ToInt32(row.Cells[this.Column_pointNum.Name].Value.ToString()); point.pointNum = Convert.ToInt32(row.Cells[this.Column_pointNum.Name].Value.ToString());
point.RobotX = Convert.ToDouble(row.Cells[this.Column_X.Name].Value.ToString()); point.RobotX = Convert.ToDouble(row.Cells[this.Column_X.Name].Value.ToString());
point.RoobtY = Convert.ToDouble(row.Cells[this.Column_Y.Name].Value.ToString()); point.RobotY = Convert.ToDouble(row.Cells[this.Column_Y.Name].Value.ToString());
point.RobotZ = Convert.ToDouble(row.Cells[this.Column_Z.Name].Value.ToString()); point.RobotZ = Convert.ToDouble(row.Cells[this.Column_Z.Name].Value.ToString());
point.RobotRX = Convert.ToDouble(row.Cells[this.Column_RX.Name].Value.ToString()); point.RobotRX = Convert.ToDouble(row.Cells[this.Column_RX.Name].Value.ToString());
point.RobotRY = Convert.ToDouble(row.Cells[this.Column_RY.Name].Value.ToString()); point.RobotRY = Convert.ToDouble(row.Cells[this.Column_RY.Name].Value.ToString());
...@@ -1011,44 +1032,36 @@ namespace URSoldering.Client ...@@ -1011,44 +1032,36 @@ namespace URSoldering.Client
{ {
WeldPointInfo point = new WeldPointInfo(); WeldPointInfo point = new WeldPointInfo();
string name = "P" + (dgvList.Rows.Count + 1); string name = "P" + (dgvList.Rows.Count + 1);
FrmPointInfo fwpi = new FrmPointInfo(name,robotP); //FrmPointInfo fwpi = new FrmPointInfo(name,robotP);
DialogResult result = fwpi.ShowDialog(); //DialogResult result = fwpi.ShowDialog();
FrmPointInfo fwpi = new FrmPointInfo(name, robotP);
fwpi.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
fwpi.FormBorderStyle = FormBorderStyle.None;
fwpi.StartPosition = FormStartPosition.CenterParent;
fwpi.OnCloseEnd += NewPointClosePorcess;
fwpi.TopLevel = false;
fwpi.Parent = this.panPoint;
panPoint.Visible = true;
fwpi.Location = new Point(0, 0);
fwpi.Size = panPoint.Size;
this.dgvList.Visible = false;
fwpi.Show();
}
private void NewPointClosePorcess(DialogResult result, WeldPointInfo point)
{
if (result.Equals(DialogResult.OK)) if (result.Equals(DialogResult.OK))
{ {
point = fwpi.weldPointInfo; dgvList.Rows.Add(setPointInfo(null, point));
DataGridViewRow view = new DataGridViewRow();
view.CreateCells(dgvList);
view.Cells[0].Value = point.pointNum.ToString();
view.Cells[1].Value = point.pointName;
view.Cells[2].Value = point.RobotX.ToString();
view.Cells[3].Value = point.RoobtY.ToString();
view.Cells[4].Value = point.RobotZ.ToString();
view.Cells[5].Value = point.RobotRX.ToString();
view.Cells[6].Value = point.RobotRY.ToString();
view.Cells[7].Value = point.RobotRZ.ToString();
view.Cells[8].Value = point.preheatTemperature.ToString();
view.Cells[9].Value = point.preheatTemperatureMax.ToString();
view.Cells[10].Value = point.preheatTemperatureMin.ToString();
view.Cells[11].Value = point.preheatTime.ToString();
view.Cells[12].Value = point.weldTemperature.ToString();
view.Cells[13].Value = point.weldTemperatureMax.ToString();
view.Cells[14].Value = point.weldTemperatureMin.ToString();
view.Cells[15].Value = point.weldTime.ToString();
view.Cells[16].Value = point.startSendWireSpeed.ToString();
view.Cells[17].Value = point.startSendWireTime.ToString();
view.Cells[18].Value = point.sendWireSpeed.ToString();
view.Cells[19].Value = point.sendWireTime.ToString();
view.Cells[20].Value = point.pointType.ToString();
view.Cells[21].Value = point.isNeedClear.ToString();
view.Cells[22].Value = point.ClearTime;
dgvList.Rows.Add(view);
if (isFinishLoad && this.txtBoardLength.Text.Trim() != "" && this.txtBoardWidth.Text.Trim() != "") if (isFinishLoad && this.txtBoardLength.Text.Trim() != "" && this.txtBoardWidth.Text.Trim() != "")
{ {
loadPictureBoxSize(); loadPictureBoxSize();
} }
} }
panPoint.Visible = false;
this.dgvList.Visible = true;
} }
Point m_MouseDownPoint = new Point(0); Point m_MouseDownPoint = new Point(0);
private void picBoard_MouseDown(object sender, MouseEventArgs e) private void picBoard_MouseDown(object sender, MouseEventArgs e)
......
URSolderingClient/FrmBoardInfo.resx
...@@ -126,137 +126,7 @@ ...@@ -126,137 +126,7 @@
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>510, 17</value> <value>510, 17</value>
</metadata> </metadata>
<metadata name="contextMenuStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>611, 17</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="dataGridViewImageColumn1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
xAAADsQBlSsOGwAAANRJREFUSEvtk8ENhSAMQBnAgHplD/c/w8UN1Dkg4adESJWKlsM/8ZIm0FIekCDC
n+iiZtgia20MLizRvu9BCBEDxhw+i7CkRfZJdBxHIUkBtS+8irZty5tqrckxrHmjKsLPNc9zzKU5ME1T
nr8946MIS5RSZ/YqAqCWcjUZKcISODUm5THjOOb8k6wQGWNyE75JItXuSClzDfa4U3TAZ4TF0EjxJAKG
YYg16kOTHeu6Bu/9ObtSEznnYi8F3VGhJqrRRV2UYXcsyxKDC/9ojXRRIyH8ACKfopRlVag2AAAAAElF
TkSuQmCC
</value>
</data>
<data name="dataGridViewImageColumn2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
xAAADsQBlSsOGwAAAONJREFUSEvtk00OhCAMRlkb49/We3j/tS70BuI1TAwzH8FOVQTrYla8pIkttg9I
UOZPJNFrxKKu62xIEYuUUjakJFESEd6OcRzNuq4uOxISbdtmpmly2ZFLR9/3dlCWZa5yJCQqy9KuYcaZ
S8cwDDQsz3NX/XEnqqqK1jDjjHdrWmtqwi45e51T1zXV0evDfwdfuKwoCle9ivhJ7iTgVgS4DLsGew6a
pqE8JAFBEZjnmYa1bev9xj8xoiKwLAsNPQfWnvBIBPg17hG7Ls5jEeAyiQSIRABvxPdOYohFb0milxjz
AeLDoohrNFdzAAAAAElFTkSuQmCC
</value>
</data>
<metadata name="Column_pointNum.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column_Name.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column_X.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column_Y.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column_Z.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column_RX.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column_RY.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column_RZ.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column_preheatTemperature.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column_preheatTemperatureMax.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column_preheatTemperatureMin.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column_preheatTime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column_weldTemperature.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column_weldTemperatureMax.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column_weldTemperatureMin.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column_weldTime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column_startSendWireSpeed.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column_startSendWireTime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column_sendWireSpeed.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column_sendWireTime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column_pointType.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column_isClear.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column_ClearTime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column_getPosition.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column_MoveTest.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column_btnDetail.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column_Del.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column_Up.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<data name="Column_Up.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
xAAADsQBlSsOGwAAANRJREFUSEvtk8ENhSAMQBnAgHplD/c/w8UN1Dkg4adESJWKlsM/8ZIm0FIekCDC
n+iiZtgia20MLizRvu9BCBEDxhw+i7CkRfZJdBxHIUkBtS+8irZty5tqrckxrHmjKsLPNc9zzKU5ME1T
nr8946MIS5RSZ/YqAqCWcjUZKcISODUm5THjOOb8k6wQGWNyE75JItXuSClzDfa4U3TAZ4TF0EjxJAKG
YYg16kOTHeu6Bu/9ObtSEznnYi8F3VGhJqrRRV2UYXcsyxKDC/9ojXRRIyH8ACKfopRlVag2AAAAAElF
TkSuQmCC
</value>
</data>
<metadata name="Column_Down.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<data name="Column_Down.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
xAAADsQBlSsOGwAAAONJREFUSEvtk00OhCAMRlkb49/We3j/tS70BuI1TAwzH8FOVQTrYla8pIkttg9I
UOZPJNFrxKKu62xIEYuUUjakJFESEd6OcRzNuq4uOxISbdtmpmly2ZFLR9/3dlCWZa5yJCQqy9KuYcaZ
S8cwDDQsz3NX/XEnqqqK1jDjjHdrWmtqwi45e51T1zXV0evDfwdfuKwoCle9ivhJ7iTgVgS4DLsGew6a
pqE8JAFBEZjnmYa1bev9xj8xoiKwLAsNPQfWnvBIBPg17hG7Ls5jEeAyiQSIRABvxPdOYohFb0milxjz
AeLDoohrNFdzAAAAAElFTkSuQmCC
</value>
</data>
<data name="picRight.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="picRight.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAIAAABMXPacAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAIAAABMXPacAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
...@@ -486,6 +356,136 @@ ...@@ -486,6 +356,136 @@
2cgk09gaG1zYG35y8j/0HHGrAC9VdAAAAABJRU5ErkJggg== 2cgk09gaG1zYG35y8j/0HHGrAC9VdAAAAABJRU5ErkJggg==
</value> </value>
</data> </data>
<metadata name="contextMenuStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>611, 17</value>
</metadata>
<data name="dataGridViewImageColumn1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
xAAADsQBlSsOGwAAANRJREFUSEvtk8ENhSAMQBnAgHplD/c/w8UN1Dkg4adESJWKlsM/8ZIm0FIekCDC
n+iiZtgia20MLizRvu9BCBEDxhw+i7CkRfZJdBxHIUkBtS+8irZty5tqrckxrHmjKsLPNc9zzKU5ME1T
nr8946MIS5RSZ/YqAqCWcjUZKcISODUm5THjOOb8k6wQGWNyE75JItXuSClzDfa4U3TAZ4TF0EjxJAKG
YYg16kOTHeu6Bu/9ObtSEznnYi8F3VGhJqrRRV2UYXcsyxKDC/9ojXRRIyH8ACKfopRlVag2AAAAAElF
TkSuQmCC
</value>
</data>
<data name="dataGridViewImageColumn2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
xAAADsQBlSsOGwAAAONJREFUSEvtk00OhCAMRlkb49/We3j/tS70BuI1TAwzH8FOVQTrYla8pIkttg9I
UOZPJNFrxKKu62xIEYuUUjakJFESEd6OcRzNuq4uOxISbdtmpmly2ZFLR9/3dlCWZa5yJCQqy9KuYcaZ
S8cwDDQsz3NX/XEnqqqK1jDjjHdrWmtqwi45e51T1zXV0evDfwdfuKwoCle9ivhJ7iTgVgS4DLsGew6a
pqE8JAFBEZjnmYa1bev9xj8xoiKwLAsNPQfWnvBIBPg17hG7Ls5jEeAyiQSIRABvxPdOYohFb0milxjz
AeLDoohrNFdzAAAAAElFTkSuQmCC
</value>
</data>
<metadata name="Column_pointNum.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column_Name.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column_X.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column_Y.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column_Z.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column_RX.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column_RY.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column_RZ.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column_preheatTemperature.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column_preheatTemperatureMax.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column_preheatTemperatureMin.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column_preheatTime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column_weldTemperature.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column_weldTemperatureMax.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column_weldTemperatureMin.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column_weldTime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column_startSendWireSpeed.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column_startSendWireTime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column_sendWireSpeed.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column_sendWireTime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column_pointType.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column_isClear.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column_ClearTime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column_getPosition.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column_MoveTest.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column_btnDetail.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column_Del.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column_Up.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<data name="Column_Up.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
xAAADsQBlSsOGwAAANRJREFUSEvtk8ENhSAMQBnAgHplD/c/w8UN1Dkg4adESJWKlsM/8ZIm0FIekCDC
n+iiZtgia20MLizRvu9BCBEDxhw+i7CkRfZJdBxHIUkBtS+8irZty5tqrckxrHmjKsLPNc9zzKU5ME1T
nr8946MIS5RSZ/YqAqCWcjUZKcISODUm5THjOOb8k6wQGWNyE75JItXuSClzDfa4U3TAZ4TF0EjxJAKG
YYg16kOTHeu6Bu/9ObtSEznnYi8F3VGhJqrRRV2UYXcsyxKDC/9ojXRRIyH8ACKfopRlVag2AAAAAElF
TkSuQmCC
</value>
</data>
<metadata name="Column_Down.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<data name="Column_Down.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
xAAADsQBlSsOGwAAAONJREFUSEvtk00OhCAMRlkb49/We3j/tS70BuI1TAwzH8FOVQTrYla8pIkttg9I
UOZPJNFrxKKu62xIEYuUUjakJFESEd6OcRzNuq4uOxISbdtmpmly2ZFLR9/3dlCWZa5yJCQqy9KuYcaZ
S8cwDDQsz3NX/XEnqqqK1jDjjHdrWmtqwi45e51T1zXV0evDfwdfuKwoCle9ivhJ7iTgVgS4DLsGew6a
pqE8JAFBEZjnmYa1bev9xj8xoiKwLAsNPQfWnvBIBPg17hG7Ls5jEeAyiQSIRABvxPdOYohFb0milxjz
AeLDoohrNFdzAAAAAElFTkSuQmCC
</value>
</data>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>103</value> <value>103</value>
</metadata> </metadata>
......
URSolderingClient/FrmBoardList.Designer.cs
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
{ {
this.panel1 = new System.Windows.Forms.Panel(); this.panel1 = new System.Windows.Forms.Panel();
this.groupBox2 = new System.Windows.Forms.GroupBox(); this.groupBox2 = new System.Windows.Forms.GroupBox();
this.txtCode = new System.Windows.Forms.TextBox(); this.txtAOIName = new System.Windows.Forms.TextBox();
this.label10 = new System.Windows.Forms.Label(); this.label10 = new System.Windows.Forms.Label();
this.label9 = new System.Windows.Forms.Label(); this.label9 = new System.Windows.Forms.Label();
this.label8 = new System.Windows.Forms.Label(); this.label8 = new System.Windows.Forms.Label();
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.groupBox2.Controls.Add(this.txtCode); this.groupBox2.Controls.Add(this.txtAOIName);
this.groupBox2.Controls.Add(this.label10); this.groupBox2.Controls.Add(this.label10);
this.groupBox2.Controls.Add(this.label9); this.groupBox2.Controls.Add(this.label9);
this.groupBox2.Controls.Add(this.label8); this.groupBox2.Controls.Add(this.label8);
...@@ -106,27 +106,27 @@ ...@@ -106,27 +106,27 @@
this.groupBox2.TabStop = false; this.groupBox2.TabStop = false;
this.groupBox2.Text = "程序信息"; this.groupBox2.Text = "程序信息";
// //
// txtCode // txtAOIName
// //
this.txtCode.Enabled = false; this.txtAOIName.Enabled = false;
this.txtCode.Location = new System.Drawing.Point(322, 23); this.txtAOIName.Location = new System.Drawing.Point(353, 23);
this.txtCode.Name = "txtCode"; this.txtAOIName.Name = "txtAOIName";
this.txtCode.Size = new System.Drawing.Size(135, 23); this.txtAOIName.Size = new System.Drawing.Size(177, 23);
this.txtCode.TabIndex = 41; this.txtAOIName.TabIndex = 41;
// //
// label10 // label10
// //
this.label10.AutoSize = true; this.label10.AutoSize = true;
this.label10.Location = new System.Drawing.Point(265, 27); this.label10.Location = new System.Drawing.Point(280, 26);
this.label10.Name = "label10"; this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(56, 17); this.label10.Size = new System.Drawing.Size(66, 17);
this.label10.TabIndex = 40; this.label10.TabIndex = 40;
this.label10.Text = "条码："; this.label10.Text = "AOI程序：";
// //
// label9 // label9
// //
this.label9.AutoSize = true; this.label9.AutoSize = true;
this.label9.Location = new System.Drawing.Point(422, 68); this.label9.Location = new System.Drawing.Point(453, 68);
this.label9.Name = "label9"; this.label9.Name = "label9";
this.label9.Size = new System.Drawing.Size(35, 17); this.label9.Size = new System.Drawing.Size(35, 17);
this.label9.TabIndex = 39; this.label9.TabIndex = 39;
...@@ -135,7 +135,7 @@ ...@@ -135,7 +135,7 @@
// label8 // label8
// //
this.label8.AutoSize = true; this.label8.AutoSize = true;
this.label8.Location = new System.Drawing.Point(142, 67); this.label8.Location = new System.Drawing.Point(150, 68);
this.label8.Name = "label8"; this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(30, 17); this.label8.Size = new System.Drawing.Size(30, 17);
this.label8.TabIndex = 38; this.label8.TabIndex = 38;
...@@ -144,7 +144,7 @@ ...@@ -144,7 +144,7 @@
// label24 // label24
// //
this.label24.AutoSize = true; this.label24.AutoSize = true;
this.label24.Location = new System.Drawing.Point(144, 108); this.label24.Location = new System.Drawing.Point(152, 108);
this.label24.Name = "label24"; this.label24.Name = "label24";
this.label24.Size = new System.Drawing.Size(30, 17); this.label24.Size = new System.Drawing.Size(30, 17);
this.label24.TabIndex = 37; this.label24.TabIndex = 37;
...@@ -153,7 +153,7 @@ ...@@ -153,7 +153,7 @@
// txtMianji // txtMianji
// //
this.txtMianji.Enabled = false; this.txtMianji.Enabled = false;
this.txtMianji.Location = new System.Drawing.Point(322, 65); this.txtMianji.Location = new System.Drawing.Point(353, 65);
this.txtMianji.Name = "txtMianji"; this.txtMianji.Name = "txtMianji";
this.txtMianji.Size = new System.Drawing.Size(94, 23); this.txtMianji.Size = new System.Drawing.Size(94, 23);
this.txtMianji.TabIndex = 36; this.txtMianji.TabIndex = 36;
...@@ -161,7 +161,7 @@ ...@@ -161,7 +161,7 @@
// label7 // label7
// //
this.label7.AutoSize = true; this.label7.AutoSize = true;
this.label7.Location = new System.Drawing.Point(272, 69); this.label7.Location = new System.Drawing.Point(302, 68);
this.label7.Name = "label7"; this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(44, 17); this.label7.Size = new System.Drawing.Size(44, 17);
this.label7.TabIndex = 35; this.label7.TabIndex = 35;
...@@ -172,9 +172,9 @@ ...@@ -172,9 +172,9 @@
this.listPoint.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.listPoint.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left))); | System.Windows.Forms.AnchorStyles.Left)));
this.listPoint.GridLines = true; this.listPoint.GridLines = true;
this.listPoint.Location = new System.Drawing.Point(22, 142); this.listPoint.Location = new System.Drawing.Point(12, 141);
this.listPoint.Name = "listPoint"; this.listPoint.Name = "listPoint";
this.listPoint.Size = new System.Drawing.Size(461, 382); this.listPoint.Size = new System.Drawing.Size(572, 382);
this.listPoint.TabIndex = 34; this.listPoint.TabIndex = 34;
this.listPoint.UseCompatibleStateImageBehavior = false; this.listPoint.UseCompatibleStateImageBehavior = false;
this.listPoint.View = System.Windows.Forms.View.Details; this.listPoint.View = System.Windows.Forms.View.Details;
...@@ -197,9 +197,9 @@ ...@@ -197,9 +197,9 @@
| System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.panBoard.Controls.Add(this.picBoard); this.panBoard.Controls.Add(this.picBoard);
this.panBoard.Location = new System.Drawing.Point(489, 21); this.panBoard.Location = new System.Drawing.Point(601, 21);
this.panBoard.Name = "panBoard"; this.panBoard.Name = "panBoard";
this.panBoard.Size = new System.Drawing.Size(501, 502); this.panBoard.Size = new System.Drawing.Size(389, 502);
this.panBoard.TabIndex = 10; this.panBoard.TabIndex = 10;
// //
// picBoard // picBoard
...@@ -210,7 +210,7 @@ ...@@ -210,7 +210,7 @@
this.picBoard.BackColor = System.Drawing.Color.Green; this.picBoard.BackColor = System.Drawing.Color.Green;
this.picBoard.Location = new System.Drawing.Point(3, 3); this.picBoard.Location = new System.Drawing.Point(3, 3);
this.picBoard.Name = "picBoard"; this.picBoard.Name = "picBoard";
this.picBoard.Size = new System.Drawing.Size(428, 225); this.picBoard.Size = new System.Drawing.Size(316, 225);
this.picBoard.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.picBoard.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.picBoard.TabIndex = 10; this.picBoard.TabIndex = 10;
this.picBoard.TabStop = false; this.picBoard.TabStop = false;
...@@ -218,7 +218,7 @@ ...@@ -218,7 +218,7 @@
// txtPointCount // txtPointCount
// //
this.txtPointCount.Enabled = false; this.txtPointCount.Enabled = false;
this.txtPointCount.Location = new System.Drawing.Point(323, 100); this.txtPointCount.Location = new System.Drawing.Point(354, 105);
this.txtPointCount.Name = "txtPointCount"; this.txtPointCount.Name = "txtPointCount";
this.txtPointCount.Size = new System.Drawing.Size(70, 23); this.txtPointCount.Size = new System.Drawing.Size(70, 23);
this.txtPointCount.TabIndex = 8; this.txtPointCount.TabIndex = 8;
...@@ -226,7 +226,7 @@ ...@@ -226,7 +226,7 @@
// label5 // label5
// //
this.label5.AutoSize = true; this.label5.AutoSize = true;
this.label5.Location = new System.Drawing.Point(262, 103); this.label5.Location = new System.Drawing.Point(290, 108);
this.label5.Name = "label5"; this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(56, 17); this.label5.Size = new System.Drawing.Size(56, 17);
this.label5.TabIndex = 7; this.label5.TabIndex = 7;
...@@ -235,7 +235,7 @@ ...@@ -235,7 +235,7 @@
// txtWidth // txtWidth
// //
this.txtWidth.Enabled = false; this.txtWidth.Enabled = false;
this.txtWidth.Location = new System.Drawing.Point(68, 106); this.txtWidth.Location = new System.Drawing.Point(76, 105);
this.txtWidth.Name = "txtWidth"; this.txtWidth.Name = "txtWidth";
this.txtWidth.Size = new System.Drawing.Size(70, 23); this.txtWidth.Size = new System.Drawing.Size(70, 23);
this.txtWidth.TabIndex = 6; this.txtWidth.TabIndex = 6;
...@@ -243,7 +243,7 @@ ...@@ -243,7 +243,7 @@
// label4 // label4
// //
this.label4.AutoSize = true; this.label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(19, 107); this.label4.Location = new System.Drawing.Point(24, 108);
this.label4.Name = "label4"; this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(44, 17); this.label4.Size = new System.Drawing.Size(44, 17);
this.label4.TabIndex = 5; this.label4.TabIndex = 5;
...@@ -252,7 +252,7 @@ ...@@ -252,7 +252,7 @@
// txtLength // txtLength
// //
this.txtLength.Enabled = false; this.txtLength.Enabled = false;
this.txtLength.Location = new System.Drawing.Point(68, 64); this.txtLength.Location = new System.Drawing.Point(76, 65);
this.txtLength.Name = "txtLength"; this.txtLength.Name = "txtLength";
this.txtLength.Size = new System.Drawing.Size(70, 23); this.txtLength.Size = new System.Drawing.Size(70, 23);
this.txtLength.TabIndex = 4; this.txtLength.TabIndex = 4;
...@@ -260,7 +260,7 @@ ...@@ -260,7 +260,7 @@
// label3 // label3
// //
this.label3.AutoSize = true; this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(18, 68); this.label3.Location = new System.Drawing.Point(24, 68);
this.label3.Name = "label3"; this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(44, 17); this.label3.Size = new System.Drawing.Size(44, 17);
this.label3.TabIndex = 3; this.label3.TabIndex = 3;
...@@ -269,7 +269,7 @@ ...@@ -269,7 +269,7 @@
// txtBoardName // txtBoardName
// //
this.txtBoardName.Enabled = false; this.txtBoardName.Enabled = false;
this.txtBoardName.Location = new System.Drawing.Point(68, 23); this.txtBoardName.Location = new System.Drawing.Point(76, 23);
this.txtBoardName.Name = "txtBoardName"; this.txtBoardName.Name = "txtBoardName";
this.txtBoardName.Size = new System.Drawing.Size(177, 23); this.txtBoardName.Size = new System.Drawing.Size(177, 23);
this.txtBoardName.TabIndex = 2; this.txtBoardName.TabIndex = 2;
...@@ -277,7 +277,7 @@ ...@@ -277,7 +277,7 @@
// label2 // label2
// //
this.label2.AutoSize = true; this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(20, 27); this.label2.Location = new System.Drawing.Point(24, 26);
this.label2.Name = "label2"; this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(44, 17); this.label2.Size = new System.Drawing.Size(44, 17);
this.label2.TabIndex = 1; this.label2.TabIndex = 1;
...@@ -424,7 +424,7 @@ ...@@ -424,7 +424,7 @@
private System.Windows.Forms.Label label24; private System.Windows.Forms.Label label24;
private System.Windows.Forms.Label label9; private System.Windows.Forms.Label label9;
private System.Windows.Forms.Button btnCopy; private System.Windows.Forms.Button btnCopy;
private System.Windows.Forms.TextBox txtCode; private System.Windows.Forms.TextBox txtAOIName;
private System.Windows.Forms.Label label10; private System.Windows.Forms.Label label10;
} }
} }
\ No newline at end of file \ No newline at end of file
URSolderingClient/FrmBoardList.cs
...@@ -22,6 +22,14 @@ namespace URSoldering.Client ...@@ -22,6 +22,14 @@ namespace URSoldering.Client
{ {
LoadCom(); LoadCom();
} }
private void AddColumn(string text,int width)
{
ColumnHeader chName = new ColumnHeader();
chName.Text =text ; //设置列标题
chName.Width = width; //设置列宽度
chName.TextAlign = HorizontalAlignment.Left; //设置列的对齐方式
this.listPoint.Columns.Add(chName); //将列头添加到ListView控件。
}
private void LoadCom() private void LoadCom()
{ {
List<BoardInfo> newList = (from m in BoardManager.boardList orderby m.PartNumber ascending, m.boardName ascending select m).ToList<BoardInfo>(); List<BoardInfo> newList = (from m in BoardManager.boardList orderby m.PartNumber ascending, m.boardName ascending select m).ToList<BoardInfo>();
...@@ -34,31 +42,12 @@ namespace URSoldering.Client ...@@ -34,31 +42,12 @@ namespace URSoldering.Client
cmbBoardList.SelectedIndex = 0; cmbBoardList.SelectedIndex = 0;
} }
this.listPoint.Columns.Clear(); this.listPoint.Columns.Clear();
ColumnHeader chName = new ColumnHeader(); AddColumn("焊点名称", 120);
chName.Text = "焊点名称"; //设置列标题 AddColumn("类型", 90);
chName.Width = 150; //设置列宽度 AddColumn("预热温度", 90);
chName.TextAlign = HorizontalAlignment.Left; //设置列的对齐方式 AddColumn("焊接温度", 90);
this.listPoint.Columns.Add(chName); //将列头添加到ListView控件。 AddColumn("初始送丝", 90);
//ColumnHeader chValue = new ColumnHeader(); AddColumn("送丝量", 80);
//chValue.Text = "预热温度"; //设置列标题
//chValue.Width = 80; //设置列宽度
//chValue.TextAlign = HorizontalAlignment.Left; //设置列的对齐方式
//this.listPoint.Columns.Add(chValue); //将列头添加到ListView控件。
ColumnHeader chStatus = new ColumnHeader();
chStatus.Text = "焊接温度"; //设置列标题
chStatus.Width = 80; //设置列宽度
chStatus.TextAlign = HorizontalAlignment.Left; //设置列的对齐方式
this.listPoint.Columns.Add(chStatus); //将列头添加到ListView控件。
ColumnHeader preSendwire = new ColumnHeader();
preSendwire.Text = "初始送丝"; //设置列标题
preSendwire.Width = 80; //设置列宽度
preSendwire.TextAlign = HorizontalAlignment.Left; //设置列的对齐方式
this.listPoint.Columns.Add(preSendwire); //将列头添加到ListView控件。
ColumnHeader sendWire = new ColumnHeader();
sendWire.Text = "送丝量"; //设置列标题
sendWire.Width = 60; //设置列宽度
sendWire.TextAlign = HorizontalAlignment.Left; //设置列的对齐方式
this.listPoint.Columns.Add(sendWire); //将列头添加到ListView控件。
} }
private void btnSave_Click(object sender, EventArgs e) private void btnSave_Click(object sender, EventArgs e)
{ {
...@@ -95,7 +84,7 @@ namespace URSoldering.Client ...@@ -95,7 +84,7 @@ namespace URSoldering.Client
txtWidth.Text = board.boardWidth.ToString(); txtWidth.Text = board.boardWidth.ToString();
txtPointCount.Text = board.pointList.Count.ToString(); txtPointCount.Text = board.pointList.Count.ToString();
txtMianji.Text = (board.boardLength * board.boardWidth).ToString(); txtMianji.Text = (board.boardLength * board.boardWidth).ToString();
txtCode.Text = board.WareCode; txtAOIName.Text = board.AoiFileName;
loadPictureBoxSize(board); loadPictureBoxSize(board);
LoadPoint(board); LoadPoint(board);
} }
...@@ -115,7 +104,9 @@ namespace URSoldering.Client ...@@ -115,7 +104,9 @@ namespace URSoldering.Client
ListViewItem lvi = new ListViewItem(); ListViewItem lvi = new ListViewItem();
lvi.ImageIndex = i; lvi.ImageIndex = i;
lvi.Text = point.pointName; lvi.Text = point.pointName;
lvi.SubItems.Add(point.TypeValue);
lvi.SubItems.Add(point.preheatTemperature.ToString());
lvi.SubItems.Add(point.weldTemperature.ToString()); lvi.SubItems.Add(point.weldTemperature.ToString());
lvi.SubItems.Add((point.startSendWireSpeed * point.startSendWireTime).ToString()); lvi.SubItems.Add((point.startSendWireSpeed * point.startSendWireTime).ToString());
lvi.SubItems.Add((point.sendWireTime * point.sendWireSpeed).ToString()); lvi.SubItems.Add((point.sendWireTime * point.sendWireSpeed).ToString());
......
URSolderingClient/FrmPointInfo.Designer.cs
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
{ {
this.groupPoint = new System.Windows.Forms.GroupBox(); this.groupPoint = new System.Windows.Forms.GroupBox();
this.groupBox1 = new System.Windows.Forms.GroupBox(); this.groupBox1 = new System.Windows.Forms.GroupBox();
this.label17 = new System.Windows.Forms.Label(); this.lblMsg = new System.Windows.Forms.Label();
this.label16 = new System.Windows.Forms.Label(); this.label16 = new System.Windows.Forms.Label();
this.txtClearTime = new System.Windows.Forms.TextBox(); this.txtClearTime = new System.Windows.Forms.TextBox();
this.label15 = new System.Windows.Forms.Label(); this.label15 = new System.Windows.Forms.Label();
...@@ -102,14 +102,14 @@ ...@@ -102,14 +102,14 @@
this.groupPoint.Controls.Add(this.gbWireFeeding); this.groupPoint.Controls.Add(this.gbWireFeeding);
this.groupPoint.Location = new System.Drawing.Point(3, 1); this.groupPoint.Location = new System.Drawing.Point(3, 1);
this.groupPoint.Name = "groupPoint"; this.groupPoint.Name = "groupPoint";
this.groupPoint.Size = new System.Drawing.Size(712, 487); this.groupPoint.Size = new System.Drawing.Size(737, 487);
this.groupPoint.TabIndex = 61; this.groupPoint.TabIndex = 61;
this.groupPoint.TabStop = false; this.groupPoint.TabStop = false;
this.groupPoint.Text = "修改焊点[P2]"; this.groupPoint.Text = "修改焊点[P2]";
// //
// groupBox1 // groupBox1
// //
this.groupBox1.Controls.Add(this.label17); this.groupBox1.Controls.Add(this.lblMsg);
this.groupBox1.Controls.Add(this.label16); this.groupBox1.Controls.Add(this.label16);
this.groupBox1.Controls.Add(this.txtClearTime); this.groupBox1.Controls.Add(this.txtClearTime);
this.groupBox1.Controls.Add(this.label15); this.groupBox1.Controls.Add(this.label15);
...@@ -118,22 +118,21 @@ ...@@ -118,22 +118,21 @@
this.groupBox1.Controls.Add(this.label2); this.groupBox1.Controls.Add(this.label2);
this.groupBox1.Controls.Add(this.txtName); this.groupBox1.Controls.Add(this.txtName);
this.groupBox1.Controls.Add(this.label1); this.groupBox1.Controls.Add(this.label1);
this.groupBox1.Location = new System.Drawing.Point(21, 19); this.groupBox1.Location = new System.Drawing.Point(33, 30);
this.groupBox1.Name = "groupBox1"; this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(470, 119); this.groupBox1.Size = new System.Drawing.Size(470, 119);
this.groupBox1.TabIndex = 59; this.groupBox1.TabIndex = 59;
this.groupBox1.TabStop = false; this.groupBox1.TabStop = false;
this.groupBox1.Text = "焊点基本信息"; this.groupBox1.Text = "焊点基本信息";
// //
// label17 // lblMsg
// //
this.label17.AutoSize = true; this.lblMsg.AutoSize = true;
this.label17.Location = new System.Drawing.Point(219, 68); this.lblMsg.Location = new System.Drawing.Point(233, 68);
this.label17.Name = "label17"; this.lblMsg.Name = "lblMsg";
this.label17.Size = new System.Drawing.Size(92, 17); this.lblMsg.Size = new System.Drawing.Size(92, 17);
this.label17.TabIndex = 66; this.lblMsg.TabIndex = 66;
this.label17.Text = "正常焊接的焊点"; this.lblMsg.Text = "正常焊接的焊点";
this.label17.Visible = false;
// //
// label16 // label16
// //
...@@ -181,11 +180,13 @@ ...@@ -181,11 +180,13 @@
this.cmbPointType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbPointType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbPointType.FormattingEnabled = true; this.cmbPointType.FormattingEnabled = true;
this.cmbPointType.Items.AddRange(new object[] { this.cmbPointType.Items.AddRange(new object[] {
"普通焊点"}); "普通焊点",
"中间点"});
this.cmbPointType.Location = new System.Drawing.Point(92, 65); this.cmbPointType.Location = new System.Drawing.Point(92, 65);
this.cmbPointType.Name = "cmbPointType"; this.cmbPointType.Name = "cmbPointType";
this.cmbPointType.Size = new System.Drawing.Size(121, 25); this.cmbPointType.Size = new System.Drawing.Size(121, 25);
this.cmbPointType.TabIndex = 61; this.cmbPointType.TabIndex = 61;
this.cmbPointType.SelectedIndexChanged += new System.EventHandler(this.cmbPointType_SelectedIndexChanged);
// //
// label2 // label2
// //
...@@ -217,7 +218,7 @@ ...@@ -217,7 +218,7 @@
// //
this.groupBox2.Controls.Add(this.urRobot); this.groupBox2.Controls.Add(this.urRobot);
this.groupBox2.Controls.Add(this.btnUpdate); this.groupBox2.Controls.Add(this.btnUpdate);
this.groupBox2.Location = new System.Drawing.Point(499, 139); this.groupBox2.Location = new System.Drawing.Point(527, 159);
this.groupBox2.Name = "groupBox2"; this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(202, 306); this.groupBox2.Size = new System.Drawing.Size(202, 306);
this.groupBox2.TabIndex = 60; this.groupBox2.TabIndex = 60;
...@@ -243,7 +244,7 @@ ...@@ -243,7 +244,7 @@
// //
// btnSave // btnSave
// //
this.btnSave.Location = new System.Drawing.Point(540, 31); this.btnSave.Location = new System.Drawing.Point(581, 52);
this.btnSave.Name = "btnSave"; this.btnSave.Name = "btnSave";
this.btnSave.Size = new System.Drawing.Size(120, 35); this.btnSave.Size = new System.Drawing.Size(120, 35);
this.btnSave.TabIndex = 57; this.btnSave.TabIndex = 57;
...@@ -277,7 +278,7 @@ ...@@ -277,7 +278,7 @@
this.gbIron.Controls.Add(this.lblIronTime); this.gbIron.Controls.Add(this.lblIronTime);
this.gbIron.Controls.Add(this.txtDweldTemperature); this.gbIron.Controls.Add(this.txtDweldTemperature);
this.gbIron.Controls.Add(this.txtDweldTime); this.gbIron.Controls.Add(this.txtDweldTime);
this.gbIron.Location = new System.Drawing.Point(21, 139); this.gbIron.Location = new System.Drawing.Point(33, 155);
this.gbIron.Name = "gbIron"; this.gbIron.Name = "gbIron";
this.gbIron.Size = new System.Drawing.Size(470, 188); this.gbIron.Size = new System.Drawing.Size(470, 188);
this.gbIron.TabIndex = 55; this.gbIron.TabIndex = 55;
...@@ -502,7 +503,7 @@ ...@@ -502,7 +503,7 @@
// //
// btnCancel // btnCancel
// //
this.btnCancel.Location = new System.Drawing.Point(540, 74); this.btnCancel.Location = new System.Drawing.Point(581, 95);
this.btnCancel.Name = "btnCancel"; this.btnCancel.Name = "btnCancel";
this.btnCancel.Size = new System.Drawing.Size(120, 35); this.btnCancel.Size = new System.Drawing.Size(120, 35);
this.btnCancel.TabIndex = 58; this.btnCancel.TabIndex = 58;
...@@ -524,7 +525,7 @@ ...@@ -524,7 +525,7 @@
this.gbWireFeeding.Controls.Add(this.lblWirdFeedingTime); this.gbWireFeeding.Controls.Add(this.lblWirdFeedingTime);
this.gbWireFeeding.Controls.Add(this.txtStartDsendWireSpeed); this.gbWireFeeding.Controls.Add(this.txtStartDsendWireSpeed);
this.gbWireFeeding.Controls.Add(this.txtDsendWireTime); this.gbWireFeeding.Controls.Add(this.txtDsendWireTime);
this.gbWireFeeding.Location = new System.Drawing.Point(21, 329); this.gbWireFeeding.Location = new System.Drawing.Point(33, 349);
this.gbWireFeeding.Name = "gbWireFeeding"; this.gbWireFeeding.Name = "gbWireFeeding";
this.gbWireFeeding.Size = new System.Drawing.Size(470, 116); this.gbWireFeeding.Size = new System.Drawing.Size(470, 116);
this.gbWireFeeding.TabIndex = 56; this.gbWireFeeding.TabIndex = 56;
...@@ -639,14 +640,14 @@ ...@@ -639,14 +640,14 @@
this.txtDsendWireTime.TabIndex = 42; this.txtDsendWireTime.TabIndex = 42;
this.txtDsendWireTime.Text = "2"; this.txtDsendWireTime.Text = "2";
// //
// FrmWeldPointInfo // FrmPointInfo
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(719, 491); this.ClientSize = new System.Drawing.Size(744, 491);
this.Controls.Add(this.groupPoint); this.Controls.Add(this.groupPoint);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
this.Name = "FrmWeldPointInfo"; this.Name = "FrmPointInfo";
this.Text = "FrmWeldPointInfo"; this.Text = "FrmWeldPointInfo";
this.Load += new System.EventHandler(this.FrmWeldPointInfo_Load); this.Load += new System.EventHandler(this.FrmWeldPointInfo_Load);
this.groupPoint.ResumeLayout(false); this.groupPoint.ResumeLayout(false);
...@@ -714,7 +715,7 @@ ...@@ -714,7 +715,7 @@
private System.Windows.Forms.TextBox txtClearTime; private System.Windows.Forms.TextBox txtClearTime;
private System.Windows.Forms.Label label15; private System.Windows.Forms.Label label15;
private System.Windows.Forms.Label label16; private System.Windows.Forms.Label label16;
private System.Windows.Forms.Label label17; private System.Windows.Forms.Label lblMsg;
private System.Windows.Forms.GroupBox groupPoint; private System.Windows.Forms.GroupBox groupPoint;
private UserFromControl.URRobotMControl urRobot; private UserFromControl.URRobotMControl urRobot;
} }
......
URSolderingClient/FrmPointInfo.cs
...@@ -87,68 +87,18 @@ namespace URSoldering.Client ...@@ -87,68 +87,18 @@ namespace URSoldering.Client
int wTemp = FormUtil.GetIntValue(txtDweldTemperature); int wTemp = FormUtil.GetIntValue(txtDweldTemperature);
int wTempMax = FormUtil.GetIntValue(txtDweldTemMax); int wTempMax = FormUtil.GetIntValue(txtDweldTemMax);
int wTempMin = FormUtil.GetIntValue(txtDweldTemMin ); int wTempMin = FormUtil.GetIntValue(txtDweldTemMin );
if (ptemp > 400) double sendSpeed = FormUtil.getDoubleValue(txtDsendWireSpeed);
{ double sendtime = FormUtil.getDoubleValue(this.txtDsendWireTime);
MessageBox.Show("预热温度范围：200°-400°"); double startsendSpeed = FormUtil.getDoubleValue(txtStartDsendWireSpeed);
txtDpreheatTemperature.Focus(); double startsendTime = FormUtil.getDoubleValue(txtStartDsendWireTime);
return; string name = FormUtil.getValue(txtName);
} int clearTime = FormUtil.GetIntValue(txtClearTime);
if (ptempmin < 0)
{
MessageBox.Show("预热温度下限必须大于0°");
txtDweldTemMin.Focus();
return;
} if (wTemp > 400)
{
MessageBox.Show("焊接温度范围：200°-400°");
txtDweldTemperature.Focus();
return;
}
if (wTempMin < 0)
{
MessageBox.Show("焊接温度下限必须大于0°");
txtPreTempMin.Focus();
return;
}
if (ptempmax < ptempmin)
{
MessageBox.Show("预设温度上限必须大于预设温度下限");
this.txtPreTempMax.Focus();
return;
}
if (wTempMax < wTempMin)
{
MessageBox.Show("焊接温度上限必须大于焊接温度下限");
this.txtDweldTemMax.Focus();
return;
}
if (!(ptempmin <= ptemp && ptemp <= ptempmax))
{
MessageBox.Show("预设温度范围在：" + ptempmin + "°-"+ptempmax+"°");
this.txtDpreheatTemperature.Focus();
return;
}
if (!(wTempMin <= wTemp && wTemp <= wTempMax))
{
MessageBox.Show("焊接温度范围在：" + wTempMin + "°-" + wTempMax + "°");
this.txtDweldTemperature.Focus();
return;
}
double pTime = FormUtil.getDoubleValue(txtDpreheatTime); double pTime = FormUtil.getDoubleValue(txtDpreheatTime);
if (pTime < 0 || pTime > 60)
{
MessageBox.Show("预热时间范围：0-60！");
txtDpreheatTime.Focus();
return;
}
double wTime = FormUtil.getDoubleValue(txtDweldTime); double wTime = FormUtil.getDoubleValue(txtDweldTime);
if (pTime < 0 || pTime > 60) if (name.Equals(""))
{ {
MessageBox.Show("焊接时间范围：0-60！"); MessageBox.Show("请输入焊点名称！");
txtDweldTime.Focus(); txtName.Focus();
return; return;
} }
if (cmbPointType.SelectedIndex < 0) if (cmbPointType.SelectedIndex < 0)
...@@ -157,53 +107,108 @@ namespace URSoldering.Client ...@@ -157,53 +107,108 @@ namespace URSoldering.Client
cmbPointType.Focus(); cmbPointType.Focus();
return; return;
} }
double sendSpeed = FormUtil.getDoubleValue(txtDsendWireSpeed); int pointType = cmbPointType.SelectedIndex;
double sendtime = FormUtil.getDoubleValue(this.txtDsendWireTime); if (pointType.Equals(0))
double startsendSpeed = FormUtil.getDoubleValue(txtStartDsendWireSpeed);
double startsendTime = FormUtil.getDoubleValue(txtStartDsendWireTime);
if (startsendSpeed < 0)
{ {
MessageBox.Show("请正确输入起始送丝速度！"); if (ptemp > 400)
txtStartDsendWireSpeed.Focus(); {
return; MessageBox.Show("预热温度范围：200°-400°");
} txtDpreheatTemperature.Focus();
return;
}
if (ptempmin < 0)
{
MessageBox.Show("预热温度下限必须大于0°");
txtDweldTemMin.Focus();
return;
}
if (wTemp > 400)
{
MessageBox.Show("焊接温度范围：200°-400°");
txtDweldTemperature.Focus();
return;
}
if (wTempMin < 0)
{
MessageBox.Show("焊接温度下限必须大于0°");
txtPreTempMin.Focus();
return;
}
if (ptempmax < ptempmin)
{
MessageBox.Show("预设温度上限必须大于预设温度下限");
this.txtPreTempMax.Focus();
return;
}
if (wTempMax < wTempMin)
{
MessageBox.Show("焊接温度上限必须大于焊接温度下限");
this.txtDweldTemMax.Focus();
return;
}
if (!(ptempmin <= ptemp && ptemp <= ptempmax))
{
MessageBox.Show("预设温度范围在：" + ptempmin + "°-" + ptempmax + "°");
this.txtDpreheatTemperature.Focus();
return;
}
if (startsendTime < 0) if (!(wTempMin <= wTemp && wTemp <= wTempMax))
{ {
MessageBox.Show("起始送丝时间范围：0-60"); MessageBox.Show("焊接温度范围在：" + wTempMin + "°-" + wTempMax + "°");
txtStartDsendWireTime.Focus(); this.txtDweldTemperature.Focus();
return; return;
} }
if (sendSpeed < 0)
{
MessageBox.Show("请正确输入送丝速度！");
txtDsendWireSpeed.Focus();
return;
}
if (sendtime < 0 || sendtime > 60) if (pTime < 0 || pTime > 60)
{ {
MessageBox.Show("送丝时间范围：0-60 "); MessageBox.Show("预热时间范围：0-60！");
txtDsendWireSpeed.Focus(); txtDpreheatTime.Focus();
return; return;
} }
string name = FormUtil.getValue(txtName); if (pTime < 0 || pTime > 60)
if (name.Equals("")) {
{ MessageBox.Show("焊接时间范围：0-60！");
MessageBox.Show("请输入焊点名称！"); txtDweldTime.Focus();
txtName.Focus(); return;
return; }
}
int clearTime = FormUtil.GetIntValue(txtClearTime); if (startsendSpeed < 0)
if (chbClear.Checked) {
{ MessageBox.Show("请正确输入起始送丝速度！");
if (clearTime <= 0) txtStartDsendWireSpeed.Focus();
return;
}
if (startsendTime < 0)
{
MessageBox.Show("起始送丝时间范围：0-60");
txtStartDsendWireTime.Focus();
return;
}
if (sendSpeed < 0)
{ {
MessageBox.Show("请输入清洗时间！"); MessageBox.Show("请正确输入送丝速度！");
txtClearTime.Focus(); txtDsendWireSpeed.Focus();
return; return;
} }
if (sendtime < 0 || sendtime > 60)
{
MessageBox.Show("送丝时间范围：0-60 ");
txtDsendWireSpeed.Focus();
return;
}
if (chbClear.Checked)
{
if (clearTime <= 0)
{
MessageBox.Show("请输入清洗时间！");
txtClearTime.Focus();
return;
}
}
} }
weldPointInfo.preheatTemperature = ptemp; weldPointInfo.preheatTemperature = ptemp;
weldPointInfo.preheatTime = pTime; weldPointInfo.preheatTime = pTime;
...@@ -224,7 +229,7 @@ namespace URSoldering.Client ...@@ -224,7 +229,7 @@ namespace URSoldering.Client
URPointValue p = urRobot.GetPoint(); URPointValue p = urRobot.GetPoint();
weldPointInfo.RobotX = p.X; weldPointInfo.RobotX = p.X;
weldPointInfo.RoobtY = p.Y; weldPointInfo.RobotY = p.Y;
weldPointInfo.RobotZ = p.Z; weldPointInfo.RobotZ = p.Z;
weldPointInfo.RobotRX = p.RX; weldPointInfo.RobotRX = p.RX;
...@@ -280,6 +285,21 @@ namespace URSoldering.Client ...@@ -280,6 +285,21 @@ namespace URSoldering.Client
txtClearTime.Enabled = false; txtClearTime.Enabled = false;
} }
} }
private void cmbPointType_SelectedIndexChanged(object sender, EventArgs e)
{
if (cmbPointType.SelectedIndex.Equals(0))
{
lblMsg .Text= "正常焊接的焊点";
gbIron.Enabled = true ;
gbWireFeeding.Enabled = true ;
}
else if (cmbPointType.SelectedIndex.Equals(1))
{
lblMsg.Text = "两个焊点之间的位置跳转点";
gbIron.Enabled = false;
gbWireFeeding.Enabled = false;
}
}
} }
} }
URSolderingClient/FrmWork.Designer.cs
...@@ -30,23 +30,23 @@ ...@@ -30,23 +30,23 @@
{ {
this.components = new System.ComponentModel.Container(); this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmWork)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmWork));
System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea1 = new System.Windows.Forms.DataVisualization.Charting.ChartArea(); System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea7 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
System.Windows.Forms.DataVisualization.Charting.Legend legend1 = new System.Windows.Forms.DataVisualization.Charting.Legend(); System.Windows.Forms.DataVisualization.Charting.Legend legend7 = new System.Windows.Forms.DataVisualization.Charting.Legend();
System.Windows.Forms.DataVisualization.Charting.Series series1 = new System.Windows.Forms.DataVisualization.Charting.Series(); System.Windows.Forms.DataVisualization.Charting.Series series7 = new System.Windows.Forms.DataVisualization.Charting.Series();
System.Windows.Forms.DataVisualization.Charting.DataPoint dataPoint1 = new System.Windows.Forms.DataVisualization.Charting.DataPoint(1D, 98D); System.Windows.Forms.DataVisualization.Charting.DataPoint dataPoint5 = new System.Windows.Forms.DataVisualization.Charting.DataPoint(1D, 98D);
System.Windows.Forms.DataVisualization.Charting.DataPoint dataPoint2 = new System.Windows.Forms.DataVisualization.Charting.DataPoint(2D, 2D); System.Windows.Forms.DataVisualization.Charting.DataPoint dataPoint6 = new System.Windows.Forms.DataVisualization.Charting.DataPoint(2D, 2D);
System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea2 = new System.Windows.Forms.DataVisualization.Charting.ChartArea(); System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea8 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
System.Windows.Forms.DataVisualization.Charting.Legend legend2 = new System.Windows.Forms.DataVisualization.Charting.Legend(); System.Windows.Forms.DataVisualization.Charting.Legend legend8 = new System.Windows.Forms.DataVisualization.Charting.Legend();
System.Windows.Forms.DataVisualization.Charting.Series series2 = new System.Windows.Forms.DataVisualization.Charting.Series(); System.Windows.Forms.DataVisualization.Charting.Series series8 = new System.Windows.Forms.DataVisualization.Charting.Series();
System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea3 = new System.Windows.Forms.DataVisualization.Charting.ChartArea(); System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea9 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
System.Windows.Forms.DataVisualization.Charting.Legend legend3 = new System.Windows.Forms.DataVisualization.Charting.Legend(); System.Windows.Forms.DataVisualization.Charting.Legend legend9 = new System.Windows.Forms.DataVisualization.Charting.Legend();
System.Windows.Forms.DataVisualization.Charting.Series series3 = new System.Windows.Forms.DataVisualization.Charting.Series(); System.Windows.Forms.DataVisualization.Charting.Series series9 = new System.Windows.Forms.DataVisualization.Charting.Series();
this.timer = new System.Windows.Forms.Timer(this.components); this.timer = new System.Windows.Forms.Timer(this.components);
this.groupBox3 = new System.Windows.Forms.GroupBox(); this.groupBox3 = new System.Windows.Forms.GroupBox();
this.label2 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label();
this.logBox = new System.Windows.Forms.RichTextBox(); this.logBox = new System.Windows.Forms.RichTextBox();
this.lblRobot = new System.Windows.Forms.Label(); this.lblRobot = new System.Windows.Forms.Label();
this.groupBox2 = new System.Windows.Forms.GroupBox(); this.groupBox2 = new System.Windows.Forms.GroupBox();
this.button1 = new System.Windows.Forms.Button(); this.button1 = new System.Windows.Forms.Button();
this.axCKVisionCtrl1 = new AxCKVisionCtrlLib.AxCKVisionCtrl(); this.axCKVisionCtrl1 = new AxCKVisionCtrlLib.AxCKVisionCtrl();
this.lblCodeResult = new System.Windows.Forms.Label(); this.lblCodeResult = new System.Windows.Forms.Label();
...@@ -54,6 +54,7 @@ ...@@ -54,6 +54,7 @@
this.label1 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label();
this.lblAOIResult = new System.Windows.Forms.Label(); this.lblAOIResult = new System.Windows.Forms.Label();
this.groupBox1 = new System.Windows.Forms.GroupBox(); this.groupBox1 = new System.Windows.Forms.GroupBox();
this.chbXunHuan = new System.Windows.Forms.CheckBox();
this.btnWeld = new System.Windows.Forms.Button(); this.btnWeld = new System.Windows.Forms.Button();
this.panel2 = new System.Windows.Forms.Panel(); this.panel2 = new System.Windows.Forms.Panel();
this.lblRobotWarnMsg = new System.Windows.Forms.Label(); this.lblRobotWarnMsg = new System.Windows.Forms.Label();
...@@ -63,7 +64,6 @@ ...@@ -63,7 +64,6 @@
this.chbHigh = new System.Windows.Forms.CheckBox(); this.chbHigh = new System.Windows.Forms.CheckBox();
this.btnLook = new System.Windows.Forms.Button(); this.btnLook = new System.Windows.Forms.Button();
this.gbBoardInfo = new System.Windows.Forms.GroupBox(); this.gbBoardInfo = new System.Windows.Forms.GroupBox();
this.chbXunHuan = new System.Windows.Forms.CheckBox();
this.listPoint = new System.Windows.Forms.ListView(); this.listPoint = new System.Windows.Forms.ListView();
this.btnAoiTest = new System.Windows.Forms.Button(); this.btnAoiTest = new System.Windows.Forms.Button();
this.btnBlow = new System.Windows.Forms.Button(); this.btnBlow = new System.Windows.Forms.Button();
...@@ -71,7 +71,6 @@ ...@@ -71,7 +71,6 @@
this.panel1 = new System.Windows.Forms.Panel(); this.panel1 = new System.Windows.Forms.Panel();
this.lblMsg = new System.Windows.Forms.Label(); this.lblMsg = new System.Windows.Forms.Label();
this.btnSendWireRecover = new System.Windows.Forms.Button(); this.btnSendWireRecover = new System.Windows.Forms.Button();
this.btnGoHome = new System.Windows.Forms.Button();
this.groupBox4 = new System.Windows.Forms.GroupBox(); this.groupBox4 = new System.Windows.Forms.GroupBox();
this.panel3 = new System.Windows.Forms.Panel(); this.panel3 = new System.Windows.Forms.Panel();
this.btnChange = new System.Windows.Forms.Button(); this.btnChange = new System.Windows.Forms.Button();
...@@ -167,7 +166,6 @@ ...@@ -167,7 +166,6 @@
this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.groupBox2.Controls.Add(this.button1); this.groupBox2.Controls.Add(this.button1);
this.groupBox2.Controls.Add(this.axCKVisionCtrl1); this.groupBox2.Controls.Add(this.axCKVisionCtrl1);
this.groupBox2.Controls.Add(this.lblCodeResult); this.groupBox2.Controls.Add(this.lblCodeResult);
...@@ -180,7 +178,6 @@ ...@@ -180,7 +178,6 @@
this.groupBox2.Size = new System.Drawing.Size(99, 595); this.groupBox2.Size = new System.Drawing.Size(99, 595);
this.groupBox2.TabIndex = 269; this.groupBox2.TabIndex = 269;
this.groupBox2.TabStop = false; this.groupBox2.TabStop = false;
// //
// button1 // button1
// //
...@@ -236,9 +233,9 @@ ...@@ -236,9 +233,9 @@
this.label1.ForeColor = System.Drawing.Color.White; this.label1.ForeColor = System.Drawing.Color.White;
this.label1.Location = new System.Drawing.Point(4, 10); this.label1.Location = new System.Drawing.Point(4, 10);
this.label1.Name = "label1"; this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(173, 31); this.label1.Size = new System.Drawing.Size(134, 31);
this.label1.TabIndex = 299; this.label1.TabIndex = 299;
this.label1.Text = "视觉/扫码"; this.label1.Text = "视觉检测";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
// //
// lblAOIResult // lblAOIResult
...@@ -257,6 +254,7 @@ ...@@ -257,6 +254,7 @@
// //
this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.groupBox1.Controls.Add(this.chbXunHuan);
this.groupBox1.Controls.Add(this.btnWeld); this.groupBox1.Controls.Add(this.btnWeld);
this.groupBox1.Controls.Add(this.panel2); this.groupBox1.Controls.Add(this.panel2);
this.groupBox1.Controls.Add(this.btnStart); this.groupBox1.Controls.Add(this.btnStart);
...@@ -269,6 +267,22 @@ ...@@ -269,6 +267,22 @@
this.groupBox1.TabIndex = 268; this.groupBox1.TabIndex = 268;
this.groupBox1.TabStop = false; this.groupBox1.TabStop = false;
// //
// chbXunHuan
//
this.chbXunHuan.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.chbXunHuan.AutoSize = true;
this.chbXunHuan.Checked = true;
this.chbXunHuan.CheckState = System.Windows.Forms.CheckState.Checked;
this.chbXunHuan.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbXunHuan.Location = new System.Drawing.Point(423, 6);
this.chbXunHuan.Name = "chbXunHuan";
this.chbXunHuan.Size = new System.Drawing.Size(93, 25);
this.chbXunHuan.TabIndex = 315;
this.chbXunHuan.Text = "循环测试";
this.chbXunHuan.UseVisualStyleBackColor = true;
this.chbXunHuan.Visible = false;
this.chbXunHuan.CheckedChanged += new System.EventHandler(this.chbXunHuan_CheckedChanged);
//
// btnWeld // btnWeld
// //
this.btnWeld.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnWeld.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
...@@ -365,14 +379,12 @@ ...@@ -365,14 +379,12 @@
// //
this.gbBoardInfo.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.gbBoardInfo.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left))); | System.Windows.Forms.AnchorStyles.Left)));
this.gbBoardInfo.Controls.Add(this.chbXunHuan);
this.gbBoardInfo.Controls.Add(this.listPoint); this.gbBoardInfo.Controls.Add(this.listPoint);
this.gbBoardInfo.Controls.Add(this.btnAoiTest); this.gbBoardInfo.Controls.Add(this.btnAoiTest);
this.gbBoardInfo.Controls.Add(this.btnBlow); this.gbBoardInfo.Controls.Add(this.btnBlow);
this.gbBoardInfo.Controls.Add(this.lblWeldStation); this.gbBoardInfo.Controls.Add(this.lblWeldStation);
this.gbBoardInfo.Controls.Add(this.panel1); this.gbBoardInfo.Controls.Add(this.panel1);
this.gbBoardInfo.Controls.Add(this.btnSendWireRecover); this.gbBoardInfo.Controls.Add(this.btnSendWireRecover);
this.gbBoardInfo.Controls.Add(this.btnGoHome);
this.gbBoardInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.gbBoardInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.gbBoardInfo.Location = new System.Drawing.Point(16, 499); this.gbBoardInfo.Location = new System.Drawing.Point(16, 499);
this.gbBoardInfo.Name = "gbBoardInfo"; this.gbBoardInfo.Name = "gbBoardInfo";
...@@ -380,29 +392,13 @@ ...@@ -380,29 +392,13 @@
this.gbBoardInfo.TabIndex = 0; this.gbBoardInfo.TabIndex = 0;
this.gbBoardInfo.TabStop = false; this.gbBoardInfo.TabStop = false;
// //
// chbXunHuan
//
this.chbXunHuan.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.chbXunHuan.AutoSize = true;
this.chbXunHuan.Checked = true;
this.chbXunHuan.CheckState = System.Windows.Forms.CheckState.Checked;
this.chbXunHuan.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbXunHuan.Location = new System.Drawing.Point(1018, 89);
this.chbXunHuan.Name = "chbXunHuan";
this.chbXunHuan.Size = new System.Drawing.Size(93, 25);
this.chbXunHuan.TabIndex = 315;
this.chbXunHuan.Text = "循环测试";
this.chbXunHuan.UseVisualStyleBackColor = true;
this.chbXunHuan.Visible = false;
this.chbXunHuan.CheckedChanged += new System.EventHandler(this.chbXunHuan_CheckedChanged);
//
// listPoint // listPoint
// //
this.listPoint.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.listPoint.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.listPoint.BackgroundImageTiled = true; this.listPoint.BackgroundImageTiled = true;
this.listPoint.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.listPoint.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.listPoint.GridLines = true; this.listPoint.GridLines = true;
this.listPoint.Location = new System.Drawing.Point(3, 44); this.listPoint.Location = new System.Drawing.Point(3, 44);
this.listPoint.Name = "listPoint"; this.listPoint.Name = "listPoint";
...@@ -479,19 +475,6 @@ ...@@ -479,19 +475,6 @@
this.btnSendWireRecover.Visible = false; this.btnSendWireRecover.Visible = false;
this.btnSendWireRecover.Click += new System.EventHandler(this.btnSendWireRecover_Click); this.btnSendWireRecover.Click += new System.EventHandler(this.btnSendWireRecover_Click);
// //
// btnGoHome
//
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(1015, 133);
this.btnGoHome.Name = "btnGoHome";
this.btnGoHome.Size = new System.Drawing.Size(100, 40);
this.btnGoHome.TabIndex = 268;
this.btnGoHome.Text = "焊接模块复位";
this.btnGoHome.UseVisualStyleBackColor = true;
this.btnGoHome.Visible = false;
this.btnGoHome.Click += new System.EventHandler(this.btnGoHome_Click);
//
// groupBox4 // groupBox4
// //
this.groupBox4.BackColor = System.Drawing.SystemColors.Control; this.groupBox4.BackColor = System.Drawing.SystemColors.Control;
...@@ -657,25 +640,25 @@ ...@@ -657,25 +640,25 @@
// //
this.chartPersent.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.chartPersent.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left))); | System.Windows.Forms.AnchorStyles.Left)));
chartArea1.Name = "ChartArea1"; chartArea7.Name = "ChartArea1";
this.chartPersent.ChartAreas.Add(chartArea1); this.chartPersent.ChartAreas.Add(chartArea7);
legend1.Name = "Legend1"; legend7.Name = "Legend1";
this.chartPersent.Legends.Add(legend1); this.chartPersent.Legends.Add(legend7);
this.chartPersent.Location = new System.Drawing.Point(8, 227); this.chartPersent.Location = new System.Drawing.Point(8, 227);
this.chartPersent.Name = "chartPersent"; this.chartPersent.Name = "chartPersent";
this.chartPersent.Palette = System.Windows.Forms.DataVisualization.Charting.ChartColorPalette.Bright; this.chartPersent.Palette = System.Windows.Forms.DataVisualization.Charting.ChartColorPalette.Bright;
series1.ChartArea = "ChartArea1"; series7.ChartArea = "ChartArea1";
series1.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Pie; series7.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Pie;
series1.IsValueShownAsLabel = true; series7.IsValueShownAsLabel = true;
series1.Legend = "Legend1"; series7.Legend = "Legend1";
series1.Name = "Series1"; series7.Name = "Series1";
dataPoint1.Label = "合格"; dataPoint5.Label = "合格";
dataPoint1.MarkerColor = System.Drawing.Color.DarkGreen; dataPoint5.MarkerColor = System.Drawing.Color.DarkGreen;
dataPoint2.Label = "不合格"; dataPoint6.Label = "不合格";
dataPoint2.MarkerColor = System.Drawing.Color.Red; dataPoint6.MarkerColor = System.Drawing.Color.Red;
series1.Points.Add(dataPoint1); series7.Points.Add(dataPoint5);
series1.Points.Add(dataPoint2); series7.Points.Add(dataPoint6);
this.chartPersent.Series.Add(series1); this.chartPersent.Series.Add(series7);
this.chartPersent.Size = new System.Drawing.Size(286, 187); this.chartPersent.Size = new System.Drawing.Size(286, 187);
this.chartPersent.TabIndex = 303; this.chartPersent.TabIndex = 303;
this.chartPersent.Text = "烙铁头工作统计："; this.chartPersent.Text = "烙铁头工作统计：";
...@@ -696,17 +679,17 @@ ...@@ -696,17 +679,17 @@
// //
this.chartSolder.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) this.chartSolder.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
chartArea2.Name = "ChartArea1"; chartArea8.Name = "ChartArea1";
this.chartSolder.ChartAreas.Add(chartArea2); this.chartSolder.ChartAreas.Add(chartArea8);
legend2.Name = "Legend1"; legend8.Name = "Legend1";
this.chartSolder.Legends.Add(legend2); this.chartSolder.Legends.Add(legend8);
this.chartSolder.Location = new System.Drawing.Point(270, 4); this.chartSolder.Location = new System.Drawing.Point(270, 4);
this.chartSolder.Name = "chartSolder"; this.chartSolder.Name = "chartSolder";
series2.ChartArea = "ChartArea1"; series8.ChartArea = "ChartArea1";
series2.IsXValueIndexed = true; series8.IsXValueIndexed = true;
series2.Legend = "Legend1"; series8.Legend = "Legend1";
series2.Name = "烙铁头统计"; series8.Name = "烙铁头统计";
this.chartSolder.Series.Add(series2); this.chartSolder.Series.Add(series8);
this.chartSolder.Size = new System.Drawing.Size(847, 206); this.chartSolder.Size = new System.Drawing.Size(847, 206);
this.chartSolder.TabIndex = 308; this.chartSolder.TabIndex = 308;
this.chartSolder.Text = "烙铁头工作统计："; this.chartSolder.Text = "烙铁头工作统计：";
...@@ -715,18 +698,18 @@ ...@@ -715,18 +698,18 @@
// //
this.chartLine.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) this.chartLine.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
chartArea3.Name = "ChartArea1"; chartArea9.Name = "ChartArea1";
this.chartLine.ChartAreas.Add(chartArea3); this.chartLine.ChartAreas.Add(chartArea9);
legend3.Name = "Legend1"; legend9.Name = "Legend1";
this.chartLine.Legends.Add(legend3); this.chartLine.Legends.Add(legend9);
this.chartLine.Location = new System.Drawing.Point(270, 212); this.chartLine.Location = new System.Drawing.Point(270, 212);
this.chartLine.Name = "chartLine"; this.chartLine.Name = "chartLine";
this.chartLine.Palette = System.Windows.Forms.DataVisualization.Charting.ChartColorPalette.EarthTones; this.chartLine.Palette = System.Windows.Forms.DataVisualization.Charting.ChartColorPalette.EarthTones;
series3.ChartArea = "ChartArea1"; series9.ChartArea = "ChartArea1";
series3.IsXValueIndexed = true; series9.IsXValueIndexed = true;
series3.Legend = "Legend1"; series9.Legend = "Legend1";
series3.Name = "工作量统计"; series9.Name = "工作量统计";
this.chartLine.Series.Add(series3); this.chartLine.Series.Add(series9);
this.chartLine.Size = new System.Drawing.Size(847, 206); this.chartLine.Size = new System.Drawing.Size(847, 206);
this.chartLine.TabIndex = 302; this.chartLine.TabIndex = 302;
this.chartLine.Text = "烙铁头工作统计："; this.chartLine.Text = "烙铁头工作统计：";
...@@ -766,7 +749,6 @@ ...@@ -766,7 +749,6 @@
this.groupBox1.PerformLayout(); this.groupBox1.PerformLayout();
this.panel2.ResumeLayout(false); this.panel2.ResumeLayout(false);
this.gbBoardInfo.ResumeLayout(false); this.gbBoardInfo.ResumeLayout(false);
this.gbBoardInfo.PerformLayout();
this.panel1.ResumeLayout(false); this.panel1.ResumeLayout(false);
this.panel1.PerformLayout(); this.panel1.PerformLayout();
this.groupBox4.ResumeLayout(false); this.groupBox4.ResumeLayout(false);
...@@ -798,7 +780,6 @@ ...@@ -798,7 +780,6 @@
private System.Windows.Forms.RichTextBox logBox; private System.Windows.Forms.RichTextBox logBox;
private System.Windows.Forms.Label lblRobotWarnMsg; private System.Windows.Forms.Label lblRobotWarnMsg;
private System.Windows.Forms.Label lblWeldStation; private System.Windows.Forms.Label lblWeldStation;
private System.Windows.Forms.Button btnGoHome;
private System.Windows.Forms.Button btnAoiTest; private System.Windows.Forms.Button btnAoiTest;
private System.Windows.Forms.Label lblAOIResult; private System.Windows.Forms.Label lblAOIResult;
private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label1;
......
URSolderingClient/FrmWork.cs
...@@ -192,39 +192,69 @@ namespace URSoldering.Client ...@@ -192,39 +192,69 @@ namespace URSoldering.Client
chartLine.Series[0].Points[ShowPointIndex - 1].SetValueY(weldCount); chartLine.Series[0].Points[ShowPointIndex - 1].SetValueY(weldCount);
chartSolder.Series[0].Points[ShowPointIndex - 1].SetValueY(solderCount); chartSolder.Series[0].Points[ShowPointIndex - 1].SetValueY(solderCount);
} }
private void AddColumn(string text,int width)
private void LoadListPoint()
{ {
this.listPoint.Columns.Clear();
ColumnHeader chName = new ColumnHeader(); ColumnHeader chName = new ColumnHeader();
chName.Text = "焊点名称"; //设置列标题 chName.Text = text; //设置列标题
chName.Width = 250; //设置列宽度 chName.Width = width; //设置列宽度
chName.TextAlign = HorizontalAlignment.Left; //设置列的对齐方式 chName.TextAlign = HorizontalAlignment.Left; //设置列的对齐方式
this.listPoint.Columns.Add(chName); //将列头添加到ListView控件。 this.listPoint.Columns.Add(chName); //将列头添加到ListView控件。
}
ColumnHeader chStatus = new ColumnHeader(); private void LoadListPoint()
chStatus.Text = "焊接温度"; //设置列标题 {
chStatus.Width = 200; //设置列宽度 this.listPoint.Columns.Clear();
chStatus.TextAlign = HorizontalAlignment.Left; //设置列的对齐方式 AddColumn("焊点名称", 150);
this.listPoint.Columns.Add(chStatus); //将列头添加到ListView控件。 AddColumn("类型", 120);
ColumnHeader presendWire = new ColumnHeader(); AddColumn("坐标X", 100);
presendWire.Text = "预送丝量"; //设置列标题 AddColumn("坐标Y", 100);
presendWire.Width = 200; //设置列宽度 AddColumn("坐标Z", 100);
presendWire.TextAlign = HorizontalAlignment.Left; //设置列的对齐方式 AddColumn("预热温度", 100);
this.listPoint.Columns.Add(presendWire); //将列头添加到ListView控件。 AddColumn("焊接温度", 100);
AddColumn("预送丝量", 100);
ColumnHeader sendWire = new ColumnHeader(); AddColumn("送丝量", 100);
sendWire.Text = "送丝量"; //设置列标题 AddColumn("状态", 100);
sendWire.Width = 200; //设置列宽度 //ColumnHeader chName = new ColumnHeader();
sendWire.TextAlign = HorizontalAlignment.Left; //设置列的对齐方式 //chName.Text = "焊点名称"; //设置列标题
this.listPoint.Columns.Add(sendWire); //将列头添加到ListView控件。 //chName.Width = 200; //设置列宽度
//chName.TextAlign = HorizontalAlignment.Left; //设置列的对齐方式
ColumnHeader status = new ColumnHeader(); //this.listPoint.Columns.Add(chName); //将列头添加到ListView控件。
status.Text = "状态"; //设置列标题
status.Width = 180; //设置列宽度 //ColumnHeader chType = new ColumnHeader();
status.TextAlign = HorizontalAlignment.Left; //设置列的对齐方式 //chType.Text = "类型"; //设置列标题
this.listPoint.Columns.Add(status); //将列头添加到ListView控件。 //chType.Width = 150; //设置列宽度
//chType.TextAlign = HorizontalAlignment.Left; //设置列的对齐方式
//this.listPoint.Columns.Add(chType); //将列头添加到ListView控件。
//ColumnHeader chPreTemp = new ColumnHeader();
//chPreTemp.Text = "预热温度"; //设置列标题
//chPreTemp.Width = 130; //设置列宽度
//chPreTemp.TextAlign = HorizontalAlignment.Left; //设置列的对齐方式
//this.listPoint.Columns.Add(chPreTemp); //将列头添加到ListView控件
//ColumnHeader chStatus = new ColumnHeader();
//chStatus.Text = "焊接温度"; //设置列标题
//chStatus.Width = 130; //设置列宽度
//chStatus.TextAlign = HorizontalAlignment.Left; //设置列的对齐方式
//this.listPoint.Columns.Add(chStatus); //将列头添加到ListView控件。
//ColumnHeader presendWire = new ColumnHeader();
//presendWire.Text = "预送丝量"; //设置列标题
//presendWire.Width = 130; //设置列宽度
//presendWire.TextAlign = HorizontalAlignment.Left; //设置列的对齐方式
//this.listPoint.Columns.Add(presendWire); //将列头添加到ListView控件。
//ColumnHeader sendWire = new ColumnHeader();
//sendWire.Text = "送丝量"; //设置列标题
//sendWire.Width = 130; //设置列宽度
//sendWire.TextAlign = HorizontalAlignment.Left; //设置列的对齐方式
//this.listPoint.Columns.Add(sendWire); //将列头添加到ListView控件。
//ColumnHeader status = new ColumnHeader();
//status.Text = "状态"; //设置列标题
//status.Width = 120; //设置列宽度
//status.TextAlign = HorizontalAlignment.Left; //设置列的对齐方式
//this.listPoint.Columns.Add(status); //将列头添加到ListView控件。
} }
private int preIndex = -2; private int preIndex = -2;
private void LoadPoint(BoardInfo board, int currWeldIndex) private void LoadPoint(BoardInfo board, int currWeldIndex)
...@@ -243,14 +273,14 @@ namespace URSoldering.Client ...@@ -243,14 +273,14 @@ namespace URSoldering.Client
catch (Exception ex) catch (Exception ex)
{ {
} }
if (id != board.boardId || currWeldIndex == -3 || currWeldIndex .Equals( -1)||(board.pointList.Count!= listPoint.Items.Count)) if (id != board.boardId || currWeldIndex == -3 || currWeldIndex.Equals(-1) || (board.pointList.Count != listPoint.Items.Count))
{ {
this.lblPointCount.Text = board.pointList.Count.ToString(); this.lblPointCount.Text = board.pointList.Count.ToString();
this.lblProName.Text = board.boardName; this.lblProName.Text = board.boardName;
this.lblCode.Text = board.WareCode; this.lblCode.Text = board.WareCode;
this.lblAgvTime.Text = FormUtil.GetSpanStr(board.WeldTime); this.lblAgvTime.Text = FormUtil.GetSpanStr(board.WeldTime);
this.lblWeldTime.Text = FormUtil.GetSpanStr(board.WeldTime); this.lblWeldTime.Text = FormUtil.GetSpanStr(board.WeldTime);
this.Text = "工作状态【程序："+board.boardName+"】"; this.Text = "工作状态【程序：" + board.boardName + "】";
listPoint.Tag = board.boardId; listPoint.Tag = board.boardId;
listPoint.Items.Clear(); listPoint.Items.Clear();
int i = 0; int i = 0;
...@@ -260,9 +290,25 @@ namespace URSoldering.Client ...@@ -260,9 +290,25 @@ namespace URSoldering.Client
lvi.ImageIndex = i; lvi.ImageIndex = i;
lvi.Text = point.pointName; lvi.Text = point.pointName;
lvi.SubItems.Add(point.weldTemperature.ToString() + "°C"); lvi.SubItems.Add(point.TypeValue);
lvi.SubItems.Add((point.startSendWireSpeed * point.startSendWireTime).ToString() + "mm");
lvi.SubItems.Add((point.sendWireTime * point.sendWireSpeed).ToString() + "mm"); lvi.SubItems.Add(point.RobotX.ToString());
lvi.SubItems.Add(point.RobotY.ToString());
lvi.SubItems.Add(point.RobotZ.ToString());
if (point.pointType.Equals(0))
{
lvi.SubItems.Add(point.preheatTemperature.ToString() + "°C");
lvi.SubItems.Add(point.weldTemperature.ToString() + "°C");
lvi.SubItems.Add((point.startSendWireSpeed * point.startSendWireTime).ToString() + "mm");
lvi.SubItems.Add((point.sendWireTime * point.sendWireSpeed).ToString() + "mm");
}
else
{
lvi.SubItems.Add("--");
lvi.SubItems.Add("--");
lvi.SubItems.Add("--");
lvi.SubItems.Add("--");
}
lvi.SubItems.Add("--"); lvi.SubItems.Add("--");
this.listPoint.Items.Add(lvi); this.listPoint.Items.Add(lvi);
i++; i++;
...@@ -274,7 +320,7 @@ namespace URSoldering.Client ...@@ -274,7 +320,7 @@ namespace URSoldering.Client
} }
if (currWeldIndex >= -1) if (currWeldIndex >= -1)
{ {
int statusIndex = 4; int statusIndex = 9;
preIndex = currWeldIndex; preIndex = currWeldIndex;
for (int i = 0; i < board.pointList.Count; i++) for (int i = 0; i < board.pointList.Count; i++)
{ {
...@@ -338,31 +384,7 @@ namespace URSoldering.Client ...@@ -338,31 +384,7 @@ namespace URSoldering.Client
} }
} }
} }
private void StartRun()
{
if (Robot.Status <= RobotStatus.Wait)
{
LogUtil.info("开始启动机器人");
bool result = Robot.StartRun();
if (!result)
{
lblMsg.Text = "启动失败：" + Robot.WarnMsg;
LogUtil.error("启动失败：" + Robot.WarnMsg);
}
else
{
btnStart.Text = "复位";
btnWeld.Enabled = true;
btnStop.Enabled = true;
}
timer.Start();
}else
{
Robot.RobotReset();
btnStart.Text = "复位";
}
}
private void timer_Tick(object sender, EventArgs e) private void timer_Tick(object sender, EventArgs e)
{ {
ActualTime(null, null); ActualTime(null, null);
...@@ -503,7 +525,32 @@ namespace URSoldering.Client ...@@ -503,7 +525,32 @@ namespace URSoldering.Client
lblAOIResult.Visible = false; lblAOIResult.Visible = false;
lblCodeResult.Visible = false; lblCodeResult.Visible = false;
StartRun(); StartRun();
} }
private void StartRun()
{
if (Robot.Status <= RobotStatus.Wait)
{
LogUtil.info("开始启动机器人");
bool result = Robot.StartRun();
if (!result)
{
lblMsg.Text = "启动失败：" + Robot.WarnMsg;
LogUtil.error("启动失败：" + Robot.WarnMsg);
}
else
{
btnStart.Text = "复位";
btnWeld.Enabled = true;
btnStop.Enabled = true;
}
timer.Start();
}
else
{
Robot.RobotReset();
btnStart.Text = "复位";
}
}
private void btnStop_Click(object sender, EventArgs e) private void btnStop_Click(object sender, EventArgs e)
{ {
...@@ -550,20 +597,7 @@ namespace URSoldering.Client ...@@ -550,20 +597,7 @@ namespace URSoldering.Client
ConfigAppSettings.SaveValue(Setting_Init.Robot_IsHigh, 0); ConfigAppSettings.SaveValue(Setting_Init.Robot_IsHigh, 0);
} }
} }
private void btnGoHome_Click(object sender, EventArgs e)
{
btnGoHome.Enabled = false;
if (WeldRobotBean.ISRun)
{
string msg = WeldRobotBean.GoHome();
if (!msg.Equals(""))
{
MessageBox.Show("操作失败：" + msg);
}
}
btnGoHome.Enabled = true;
}
private void btnBack_Click(object sender, EventArgs e) private void btnBack_Click(object sender, EventArgs e)
{ {
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!