导入元器件增加一列： 投影文字

DeviceLibrary/bean/BoardInfo.cs

@@ -188,7 +188,7 @@ namespace TSA_V.DeviceLibrary
             PositionX = 0;
             PositionY = 0;
         }
-        public SMTPointInfo(int num, string partNum, string name, double positionX, double positionY, string PositionNum,
+        public SMTPointInfo(int num, string partNum, string name, double positionX, double positionY, string PositionNum,string showText,
             int pointType=1,int pointSizex=1,int pointSizeY=1,int penWidth =2, 
             bool needs = false, bool needc = false, int sTemp = 0, double sTime = 0)
         {
@@ -206,7 +206,11 @@ namespace TSA_V.DeviceLibrary
             this.PointSizeX = pointSizex;
             this.PointSizeY = pointSizeY;
             this.PenWidth = penWidth;
-            this.ShowText = name;
+            this.ShowText = showText;
+            if (String.IsNullOrEmpty(this.ShowText))
+            {
+                this.ShowText = name;
+            }
         }
        
         /// <summary>

DeviceLibrary/config/元器件信息模板.csv

-位号,物料编码,数量,料盘位置,元器件描述,X坐标,Y坐标,注意事项
-必填，不可重复,必填,必填,必填（1-100）,,,,
+位号,物料编码,数量,料盘位置,元器件描述,X坐标,Y坐标,注意事项,投影文字
+必填，不可重复,必填,必填,必填（1-100）,,,,,

DeviceLibrary/csvLoad/position/ComponetInfo.cs

@@ -16,6 +16,7 @@ namespace TSA_V.LoadCSVLibrary
             PositionY = 0;
             Notes = "";
             ComponentDes = "";
+            Text = "";
         }
          
         public int Id { get; set; }
@@ -66,7 +67,11 @@ namespace TSA_V.LoadCSVLibrary
         /// </summary>
         [CSVAttribute("Notes", "注意事项", false)]
         public string Notes { get; set; }
-
+        /// <summary>
+        ///投影文字
+        /// </summary>
+        [CSVAttribute("Text", "投影文字", false)]
+        public string Text { get; set; }
 
         public int  GetSortPosition()
         {

DeviceLibrary/manager/BoardManager.cs

@@ -229,6 +229,7 @@ namespace TSA_V.DeviceLibrary
                         c.PositionY = p.PositionY;
                         c.TagNo = p.TagNo;
                         c.Notes = "";
+                        c.Text =p.ShowText;
                         c.ComponentDes = "";
 
                     }

TSA-V/FrmAddBoard.cs

@@ -193,7 +193,7 @@ namespace TSA_V
                         y = board.boardLength - y;
                         x = board.boardWidth - x;
                     }
-                    SMTPointInfo point = new SMTPointInfo(i, com.TagNo, com.PN, x, y, com.PositionNum,pointType,pointSizeX,pointSizeY,penWidth);
+                    SMTPointInfo point = new SMTPointInfo(i, com.TagNo, com.PN, x, y, com.PositionNum,com.Text, pointType,pointSizeX,pointSizeY,penWidth);
 
 
                     y = board.boardLength - y;
@@ -313,6 +313,8 @@ namespace TSA_V
             xyMoveControl1.ShowPointEvent += XyMoveControl1_ShowPointEvent;
             xyMoveControl1.XValue = TSAVBean.X_Max/2;
             xyMoveControl1.YValue = TSAVBean.Y_Max/2;
+            xyMoveControl1.MaxX =(int) TSAVBean.X_Max;
+            xyMoveControl1.MaxY = (int)TSAVBean.Y_Max;
             xyMoveControl1.ShowText = "";
 
             rdbUpload.Checked = true;

TSA-V/FrmPointInfo.cs

@@ -40,7 +40,10 @@ namespace TSA_V
             xyMoveControl1.ShowPointEvent += XyMoveControl1_ShowPointEvent;
             xyMoveControl1.XValue = nodex;
             xyMoveControl1.YValue = nodey;
-            
+
+            xyMoveControl1.MaxX = (int)TSAVBean.X_Max;
+            xyMoveControl1.MaxY = (int)TSAVBean.Y_Max;
+
             this.txtX.Text = x.ToString();
             this.txtY.Text = y.ToString();
 
@@ -119,6 +122,8 @@ namespace TSA_V
                 return;
             } 
             xyMoveControl1.ShowPointEvent += XyMoveControl1_ShowPointEvent;
+            xyMoveControl1.MaxX = (int)TSAVBean.X_Max;
+            xyMoveControl1.MaxY = (int)TSAVBean.Y_Max;
             this.PointList = list;
             this.CurrIndex = currIndex;
             ShowPoint();

TSA-V/projector/FrmProjectorScreen.cs

@@ -66,7 +66,7 @@ namespace TSA_V
                 TSAVBean.Y_Max = ScreenHeight;
                 TSAVBean.X_Min = 1;
                 TSAVBean.Y_Min = 1;
-
+                 
                 ISShow = true;
 
                 this.Location = new Point(screen.Bounds.Left, screen.Bounds.Top);