add icon named AutoBeamOff_off

OTSIncAMeasureApp/OTSIncAMeasureApp.csproj

@@ -602,6 +602,8 @@
     <None Include="Resources\ConnnectHardware.png" />
     <None Include="Resources\DisconnnectHardware.png" />
     <None Include="Resources\interrupt.png" />
+    <None Include="Resources\AutoBeamOff_off.png" />
+    <None Include="Resources\AutoBeamOff_on.png" />
     <Content Include="Resources\toopstripbackimage.png" />
     <Content Include="Resources\保存.png" />
     <None Include="Resources\删除32.png" />

OTSIncAMeasureApp/OTSIncAMeasureAppForm.Designer.cs

@@ -635,11 +635,11 @@
             this.rbAutoBeamOff.AltKey = null;
             this.rbAutoBeamOff.DropDownArrowDirection = System.Windows.Forms.RibbonArrowDirection.Down;
             this.rbAutoBeamOff.DropDownArrowSize = new System.Drawing.Size(3, 3);
-            this.rbAutoBeamOff.Image = global::OTSMeasureApp.Properties.Resources.interrupt;
-            this.rbAutoBeamOff.SmallImage = global::OTSMeasureApp.Properties.Resources.DisconnnectHardware;
+            this.rbAutoBeamOff.Image = global::OTSMeasureApp.Properties.Resources.AutoBeamOff_off;
+            this.rbAutoBeamOff.SmallImage = global::OTSMeasureApp.Properties.Resources.AutoBeamOff_off;
             this.rbAutoBeamOff.Style = System.Windows.Forms.RibbonButtonStyle.Normal;
             this.rbAutoBeamOff.Tag = "rbAutoBeamStatus";
-            this.rbAutoBeamOff.Text = "autobeam\nstatus:off";
+            this.rbAutoBeamOff.Text = "autobeamoff";
             this.rbAutoBeamOff.ToolTip = null;
             this.rbAutoBeamOff.ToolTipImage = null;
             this.rbAutoBeamOff.ToolTipTitle = null;

OTSIncAMeasureApp/OTSIncAMeasureAppForm.cs

@@ -1409,13 +1409,15 @@ namespace OTSMeasureApp
             if (m_ProjParam.AutoBeamOff)
             {
                 m_ProjParam.AutoBeamOff = false;
-                rbAutoBeamOff.Text = "autobeam\nstatus:off";
+                rbAutoBeamOff.Image = global::OTSMeasureApp.Properties.Resources.AutoBeamOff_off;
+                rbAutoBeamOff.SmallImage = global::OTSMeasureApp.Properties.Resources.AutoBeamOff_off;
                 rbAutoBeamOff.Checked = false;
             }
             else
             {
                 m_ProjParam.AutoBeamOff = true;
-                rbAutoBeamOff.Text = "autobeam\nstatus:on";
+                rbAutoBeamOff.Image = global::OTSMeasureApp.Properties.Resources.AutoBeamOff_on;
+                rbAutoBeamOff.SmallImage = global::OTSMeasureApp.Properties.Resources.AutoBeamOff_on;
                 rbAutoBeamOff.Checked = true;
             }
         }

OTSIncAMeasureApp/Properties/Resources.Designer.cs

@@ -110,6 +110,26 @@ namespace OTSMeasureApp.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
+        /// </summary>
+        public static System.Drawing.Bitmap AutoBeamOff_off {
+            get {
+                object obj = ResourceManager.GetObject("AutoBeamOff_off", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
+        /// </summary>
+        public static System.Drawing.Bitmap AutoBeamOff_on {
+            get {
+                object obj = ResourceManager.GetObject("AutoBeamOff_on", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   查找 System.Drawing.Bitmap 类型的本地化资源。
         /// </summary>

OTSIncAMeasureApp/Properties/Resources.resx

@@ -117,10 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="ID1053" xml:space="preserve">
-    <value>工作距离</value>
-    <comment>类型 double，从电镜里获得</comment>
-  </data>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="start161" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\start161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -196,6 +192,9 @@
   <data name="ID1079" xml:space="preserve">
     <value />
   </data>
+  <data name="ID1056" xml:space="preserve">
+    <value />
+  </data>
   <data name="deletefile16" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\deletefile16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -257,12 +256,12 @@
   <data name="delete161" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\delete161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ID1032" xml:space="preserve">
-    <value />
-  </data>
   <data name="检测321" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\检测32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="AutoBeamOff_off" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\AutoBeamOff_off.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="set161" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\set161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -275,8 +274,8 @@
   <data name="ID1019" xml:space="preserve">
     <value />
   </data>
-  <data name="deletefile161" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\deletefile161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="ConnnectHardware" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ConnnectHardware.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="save321" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\save32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -321,9 +320,6 @@
   <data name="newdocument32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\newdocument32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ConnnectHardware" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\ConnnectHardware.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="logo_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\logo_32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -358,10 +354,16 @@
   <data name="ID1085" xml:space="preserve">
     <value />
   </data>
+  <data name="sem162" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\sem162.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="ID1044" xml:space="preserve">
     <value>XRay扫描方式</value>
     <comment>类型 int   取图方式:  中心，自上而下，自下而上，随机</comment>
   </data>
+  <data name="Polygon32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Polygon32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="ID1033" xml:space="preserve">
     <value />
   </data>
@@ -384,8 +386,8 @@
   <data name="前进" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Image\前进.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Polygon32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Polygon32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="deletefile161" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\deletefile161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="sem161" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\sem161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -402,6 +404,9 @@
   <data name="Recover32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Recover32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="ID1089" xml:space="preserve">
+    <value />
+  </data>
   <data name="ID1059" xml:space="preserve">
     <value />
   </data>
@@ -424,15 +429,11 @@
   <data name="复位32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\复位32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="open321" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\open32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="Save16" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Save161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ID1061" xml:space="preserve">
-    <value>测量状态</value>
-    <comment>类型 int enum 枚举， 样品测量执行结果状态可以是：未测量、测量中、中止、完成、失败</comment>
+  <data name="open321" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\open32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="DeleteSampleImage" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\DeleteSampleImage.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -446,8 +447,8 @@
   <data name="NewDocment" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\NewDocment.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Ruler16" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Ruler16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="interrupt" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\interrupt.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Recover16new1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Recover16new1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -538,6 +539,9 @@
   <data name="sem16" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\sem16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="ID1080" xml:space="preserve">
+    <value />
+  </data>
   <data name="delete16" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\delete16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -558,8 +562,8 @@
     <value>测量面积</value>
     <comment>类型 int</comment>
   </data>
-  <data name="ID1080" xml:space="preserve">
-    <value />
+  <data name="GetSemData_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\GetSemData_32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="stop321" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\stop321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -567,9 +571,6 @@
   <data name="ID1057" xml:space="preserve">
     <value />
   </data>
-  <data name="Recover32New" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Recover32New.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="ID1010" xml:space="preserve">
     <value>图像扫描参数组</value>
     <comment>测量终止方式： 覆盖测量区域、测量时间、帧图数、夹杂物数  enum枚举,  当选择覆盖测量区域时，11，12，13都不用显示</comment>
@@ -587,8 +588,12 @@
   <data name="停止" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Image\停止.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Add Sample321" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Add Sample321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="ID1053" xml:space="preserve">
+    <value>工作距离</value>
+    <comment>类型 double，从电镜里获得</comment>
+  </data>
+  <data name="ID1048" xml:space="preserve">
+    <value />
   </data>
   <data name="Recover321" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Recover321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -714,6 +719,9 @@
   <data name="ID1049" xml:space="preserve">
     <value />
   </data>
+  <data name="Ruler16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Ruler16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="ID1047" xml:space="preserve">
     <value />
   </data>
@@ -724,9 +732,6 @@
   <data name="Recover32New1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Recover32New1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="GetSemData_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\GetSemData_32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="set321" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\set321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -755,8 +760,8 @@
     <value>颗粒面积最大范围</value>
     <comment>类型 int</comment>
   </data>
-  <data name="ID1089" xml:space="preserve">
-    <value />
+  <data name="Add Sample321" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Add Sample321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="ID1040" xml:space="preserve">
     <value>XRay参数组</value>
@@ -775,8 +780,8 @@
   <data name="ID1069" xml:space="preserve">
     <value />
   </data>
-  <data name="ID1056" xml:space="preserve">
-    <value />
+  <data name="Recover32New" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Recover32New.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Circle16" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Circle16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -809,10 +814,10 @@
   <data name="ID1066" xml:space="preserve">
     <value />
   </data>
-  <data name="ID1048" xml:space="preserve">
+  <data name="ID1035" xml:space="preserve">
     <value />
   </data>
-  <data name="ID1035" xml:space="preserve">
+  <data name="ID1032" xml:space="preserve">
     <value />
   </data>
   <data name="圆形32" type="System.Resources.ResXFileRef, System.Windows.Forms">
@@ -844,8 +849,9 @@
   <data name="ID1067" xml:space="preserve">
     <value />
   </data>
-  <data name="sem162" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\sem162.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="ID1061" xml:space="preserve">
+    <value>测量状态</value>
+    <comment>类型 int enum 枚举， 样品测量执行结果状态可以是：未测量、测量中、中止、完成、失败</comment>
   </data>
   <data name="stop161" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\stop161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -856,7 +862,7 @@
   <data name="ID1082" xml:space="preserve">
     <value />
   </data>
-  <data name="interrupt" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\interrupt.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="AutoBeamOff_on" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\AutoBeamOff_on.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
 </root>