1.中英文Material-->Code

2.新增程序选择的形状无效

DeviceLibrary/manager/work/TSAVBean.cs

@@ -719,6 +719,10 @@ namespace TSA_V.DeviceLibrary
 
 
         private static void AirCheckPro()
         private static void AirCheckPro()
         {
         {
+            if (!IOManager.DIList.ContainsKey(IOManager.AirCheck_Single))
+            {
+                return;
+            }
             if (IOManager.IOValue(IOManager.AirCheck_Single).Equals(IO_VALUE.LOW))
             if (IOManager.IOValue(IOManager.AirCheck_Single).Equals(IO_VALUE.LOW))
             {
             {
                 if (!NoAirAlarm)
                 if (!NoAirAlarm)

TSA-V/Properties/Resource.en-US.resx

@@ -517,7 +517,7 @@
     <value>length ↑</value>
     <value>length ↑</value>
   </data>
   </data>
   <data name="FrmBoardInfo_label14_Text" xml:space="preserve">
   <data name="FrmBoardInfo_label14_Text" xml:space="preserve">
-    <value>Material Code</value>
+    <value>Code</value>
   </data>
   </data>
   <data name="FrmBoardInfo_label3_Text" xml:space="preserve">
   <data name="FrmBoardInfo_label3_Text" xml:space="preserve">
     <value>Width →</value>
     <value>Width →</value>

TSA-V/frmBoard/FrmAddBoard.cs

@@ -181,7 +181,7 @@ namespace TSA_V
 
 
                 int pointSizeX =(int) numSizeX.Value;
                 int pointSizeX =(int) numSizeX.Value;
                 int pointSizeY = (int)numSizeY.Value;
                 int pointSizeY = (int)numSizeY.Value;
-                int pointType = cmbType.SelectedIndex;
+                int pointType = cmbType.SelectedIndex+1;
                 int penWidth =(int) numPenWidth.Value;
                 int penWidth =(int) numPenWidth.Value;
                 int PolaritiesType = 0;
                 int PolaritiesType = 0;
                 bool hasTest = chbShowText.Checked;
                 bool hasTest = chbShowText.Checked;
@@ -343,7 +343,14 @@ namespace TSA_V
             cmbType.SelectedIndex= 0;
             cmbType.SelectedIndex= 0;
             rdbData.Checked = true;
             rdbData.Checked = true;
             ComChange( );
             ComChange( );
+            List<string> list = new List<string>(ResourceCulture.GetPTypes());
 
 
+            cmbType.Items.Clear();
+            foreach (string str in list)
+            {
+                cmbType.Items.Add(str);
+            }
+            cmbType.SelectedIndex = 0;
             if (IOBase.NoLine)
             if (IOBase.NoLine)
             {
             {
                 lblWidth.Visible = false;
                 lblWidth.Visible = false;

TSA-V/frmBoard/FrmPointInfo.Designer.cs

@@ -266,6 +266,7 @@
             this.projectorControl.GroupName = "坐标";
             this.projectorControl.GroupName = "坐标";
             this.projectorControl.Location = new System.Drawing.Point(21, 4);
             this.projectorControl.Location = new System.Drawing.Point(21, 4);
             this.projectorControl.Margin = new System.Windows.Forms.Padding(4);
             this.projectorControl.Margin = new System.Windows.Forms.Padding(4);
+            this.projectorControl.MinimumSize = new System.Drawing.Size(506, 315);
             this.projectorControl.Name = "projectorControl";
             this.projectorControl.Name = "projectorControl";
             this.projectorControl.PenWidth = 2;
             this.projectorControl.PenWidth = 2;
             this.projectorControl.PointSizeX = 4;
             this.projectorControl.PointSizeX = 4;
@@ -299,6 +300,7 @@
             this.actControl.GroupName = "坐标";
             this.actControl.GroupName = "坐标";
             this.actControl.Location = new System.Drawing.Point(13, 4);
             this.actControl.Location = new System.Drawing.Point(13, 4);
             this.actControl.Margin = new System.Windows.Forms.Padding(4);
             this.actControl.Margin = new System.Windows.Forms.Padding(4);
+            this.actControl.MinimumSize = new System.Drawing.Size(506, 315);
             this.actControl.Name = "actControl";
             this.actControl.Name = "actControl";
             this.actControl.PenWidth = 2;
             this.actControl.PenWidth = 2;
             this.actControl.PointSizeX = 4;
             this.actControl.PointSizeX = 4;
@@ -369,8 +371,7 @@
             // 
             // 
             // FrmPointInfo
             // FrmPointInfo
             // 
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
             this.ClientSize = new System.Drawing.Size(620, 708);
             this.ClientSize = new System.Drawing.Size(620, 708);
             this.Controls.Add(this.groupBox2);
             this.Controls.Add(this.groupBox2);
             this.Controls.Add(this.btnPre);
             this.Controls.Add(this.btnPre);