Browse Source

Add ICON WHICH NAMED interrupt

CXS 3 năm trước cách đây
mục cha
commit
9aca3b67d7

+ 1 - 0
OTSIncAMeasureApp/OTSIncAMeasureApp.csproj

@@ -600,6 +600,7 @@
     <Content Include="OTSPeriodicTable\images\teragonal.gif" />
     <None Include="Resources\ConnnectHardware.png" />
     <None Include="Resources\DisconnnectHardware.png" />
+    <None Include="Resources\interrupt.png" />
     <Content Include="Resources\toopstripbackimage.png" />
     <Content Include="Resources\保存.png" />
     <None Include="Resources\删除32.png" />

+ 45 - 28
OTSIncAMeasureApp/OTSIncAMeasureAppForm.Designer.cs

@@ -55,8 +55,8 @@
             this.rbSaveFile = new System.Windows.Forms.RibbonOrbMenuItem();
             this.rvSaveAsFile = new System.Windows.Forms.RibbonOrbMenuItem();
             this.rbSTDEdit = new System.Windows.Forms.RibbonButton();
-            this.rbSysMgrApp = new System.Windows.Forms.RibbonButton();
             this.rbReClassify = new System.Windows.Forms.RibbonButton();
+            this.rbSysMgrApp = new System.Windows.Forms.RibbonButton();
             this.ribbonSeparator2 = new System.Windows.Forms.RibbonSeparator();
             this.rbAbout = new System.Windows.Forms.RibbonOrbMenuItem();
             this.rbExitApp = new System.Windows.Forms.RibbonOrbMenuItem();
@@ -75,10 +75,11 @@
             this.rbThreePoints = new System.Windows.Forms.RibbonButton();
             this.ribRectangle = new System.Windows.Forms.RibbonButton();
             this.ribPolygon = new System.Windows.Forms.RibbonButton();
-            this.rbPanelFunction = new System.Windows.Forms.RibbonPanel();
             this.rbSemFunction = new System.Windows.Forms.RibbonPanel();
             this.rbConnectHardware = new System.Windows.Forms.RibbonButton();
             this.rbDisconnectHardware = new System.Windows.Forms.RibbonButton();
+            this.rbinterrupt = new System.Windows.Forms.RibbonButton();
+            this.rbPanelFunction = new System.Windows.Forms.RibbonPanel();
             this.rbStart = new System.Windows.Forms.RibbonButton();
             this.rbStop = new System.Windows.Forms.RibbonButton();
             this.rbCheckParam = new System.Windows.Forms.RibbonButton();
@@ -291,21 +292,6 @@
             this.rbSTDEdit.ToolTipTitle = null;
             this.rbSTDEdit.Click += new System.EventHandler(this.rbSTDEdit_Click_1);
             // 
-            // rbSysMgrApp
-            // 
-            this.rbSysMgrApp.AltKey = null;
-            this.rbSysMgrApp.DropDownArrowDirection = System.Windows.Forms.RibbonArrowDirection.Left;
-            this.rbSysMgrApp.DropDownArrowSize = new System.Drawing.Size(5, 3);
-            this.rbSysMgrApp.Image = global::OTSMeasureApp.Properties.Resources.Ruler321;
-            this.rbSysMgrApp.SmallImage = global::OTSMeasureApp.Properties.Resources.Ruler321;
-            this.rbSysMgrApp.Style = System.Windows.Forms.RibbonButtonStyle.Normal;
-            this.rbSysMgrApp.Tag = "rbSysMgrApp";
-            this.rbSysMgrApp.Text = "系统设置";
-            this.rbSysMgrApp.ToolTip = null;
-            this.rbSysMgrApp.ToolTipImage = null;
-            this.rbSysMgrApp.ToolTipTitle = null;
-            this.rbSysMgrApp.Click += new System.EventHandler(this.rbSysMgrApp_Click);
-            // 
             // rbReClassify
             // 
             this.rbReClassify.AltKey = null;
@@ -321,6 +307,21 @@
             this.rbReClassify.ToolTipTitle = null;
             this.rbReClassify.Click += new System.EventHandler(this.rbReClassify_Click);
             // 
+            // rbSysMgrApp
+            // 
+            this.rbSysMgrApp.AltKey = null;
+            this.rbSysMgrApp.DropDownArrowDirection = System.Windows.Forms.RibbonArrowDirection.Left;
+            this.rbSysMgrApp.DropDownArrowSize = new System.Drawing.Size(5, 3);
+            this.rbSysMgrApp.Image = global::OTSMeasureApp.Properties.Resources.Ruler321;
+            this.rbSysMgrApp.SmallImage = global::OTSMeasureApp.Properties.Resources.Ruler321;
+            this.rbSysMgrApp.Style = System.Windows.Forms.RibbonButtonStyle.Normal;
+            this.rbSysMgrApp.Tag = "rbSysMgrApp";
+            this.rbSysMgrApp.Text = "系统设置";
+            this.rbSysMgrApp.ToolTip = null;
+            this.rbSysMgrApp.ToolTipImage = null;
+            this.rbSysMgrApp.ToolTipTitle = null;
+            this.rbSysMgrApp.Click += new System.EventHandler(this.rbSysMgrApp_Click);
+            // 
             // ribbonSeparator2
             // 
             this.ribbonSeparator2.AltKey = null;
@@ -578,19 +579,10 @@
             this.rbSemFunction.ButtonMoreVisible = false;
             this.rbSemFunction.Items.Add(this.rbConnectHardware);
             this.rbSemFunction.Items.Add(this.rbDisconnectHardware);
+            this.rbSemFunction.Items.Add(this.rbinterrupt);
             this.rbSemFunction.Tag = "rbSemFunction";
             this.rbSemFunction.Text = "Sem控制";
             // 
-            // rbPanelFunction
-            // 
-            this.rbPanelFunction.ButtonMoreEnabled = false;
-            this.rbPanelFunction.ButtonMoreVisible = false;
-            this.rbPanelFunction.Items.Add(this.rbStart);
-            this.rbPanelFunction.Items.Add(this.rbStop);
-            this.rbPanelFunction.Items.Add(this.rbCheckParam);
-            this.rbPanelFunction.Tag = "rbPanelFunction";
-            this.rbPanelFunction.Text = "测量控制";
-            // 
             // rbConnectHardware
             // 
             this.rbConnectHardware.AltKey = null;
@@ -621,6 +613,30 @@
             this.rbDisconnectHardware.ToolTipTitle = null;
             this.rbDisconnectHardware.Click += new System.EventHandler(this.rbDisconnectHardware_Click_1);
             // 
+            // rbinterrupt
+            // 
+            this.rbinterrupt.AltKey = null;
+            this.rbinterrupt.DropDownArrowDirection = System.Windows.Forms.RibbonArrowDirection.Down;
+            this.rbinterrupt.DropDownArrowSize = new System.Drawing.Size(3, 3);
+            this.rbinterrupt.Image = global::OTSMeasureApp.Properties.Resources.interrupt;
+            this.rbinterrupt.SmallImage = global::OTSMeasureApp.Properties.Resources.DisconnnectHardware;
+            this.rbinterrupt.Style = System.Windows.Forms.RibbonButtonStyle.Normal;
+            this.rbinterrupt.Tag = "rbinterrupt";
+            this.rbinterrupt.Text = "强制停止";
+            this.rbinterrupt.ToolTip = null;
+            this.rbinterrupt.ToolTipImage = null;
+            this.rbinterrupt.ToolTipTitle = null;
+            // 
+            // rbPanelFunction
+            // 
+            this.rbPanelFunction.ButtonMoreEnabled = false;
+            this.rbPanelFunction.ButtonMoreVisible = false;
+            this.rbPanelFunction.Items.Add(this.rbStart);
+            this.rbPanelFunction.Items.Add(this.rbStop);
+            this.rbPanelFunction.Items.Add(this.rbCheckParam);
+            this.rbPanelFunction.Tag = "rbPanelFunction";
+            this.rbPanelFunction.Text = "测量控制";
+            // 
             // rbStart
             // 
             this.rbStart.AltKey = null;
@@ -854,7 +870,7 @@
             this.dockPanel.DockLeftPortion = 0.21D;
             this.dockPanel.DockRightPortion = 0.27D;
             this.dockPanel.Location = new System.Drawing.Point(0, 130);
-            this.dockPanel.Margin = new System.Windows.Forms.Padding(8, 8, 8, 8);
+            this.dockPanel.Margin = new System.Windows.Forms.Padding(8);
             this.dockPanel.Name = "dockPanel";
             this.dockPanel.Size = new System.Drawing.Size(1703, 711);
             dockPanelGradient1.EndColor = System.Drawing.SystemColors.ControlLight;
@@ -1017,6 +1033,7 @@
         private System.Windows.Forms.RibbonButton rbThreePoints;
         public System.Windows.Forms.RibbonButton rbConnectHardware;
         public System.Windows.Forms.RibbonButton rbDisconnectHardware;
+        public System.Windows.Forms.RibbonButton rbinterrupt;
         public System.Windows.Forms.RibbonButton rbSysMgrApp;
     }
 }

+ 10 - 0
OTSIncAMeasureApp/Properties/Resources.Designer.cs

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

+ 118 - 115
OTSIncAMeasureApp/Properties/Resources.resx

@@ -117,6 +117,10 @@
   <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>
@@ -131,12 +135,12 @@
   <data name="ID1037" xml:space="preserve">
     <value />
   </data>
-  <data name="delete321" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\delete321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="ID1055" xml:space="preserve">
+  <data name="ID1036" xml:space="preserve">
     <value />
   </data>
+  <data name="DisconnnectHardware" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\DisconnnectHardware.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="stop32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\stop32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -159,6 +163,9 @@
   <data name="SmapleName161" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\SmapleName161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="关闭二16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\关闭二16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="ID1005" xml:space="preserve">
     <value>颗粒分析标准库名</value>
     <comment>类型String</comment>
@@ -172,6 +179,10 @@
   <data name="Circle321" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Circle321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="ID1060" xml:space="preserve">
+    <value>测量状态组</value>
+    <comment>类型String</comment>
+  </data>
   <data name="ID1046" xml:space="preserve">
     <value />
   </data>
@@ -226,19 +237,17 @@
     <value>通用参数组</value>
     <comment>类型 String</comment>
   </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="ID1063" xml:space="preserve">
+    <value>已测量时间</value>
+    <comment>类型 double 已经测量完成Field的时间</comment>
   </data>
-  <data name="ID1039" xml:space="preserve">
+  <data name="ID1018" xml:space="preserve">
     <value />
   </data>
   <data name="ID1074" xml:space="preserve">
     <value>测量面积</value>
     <comment>类型 int</comment>
   </data>
-  <data name="close322" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\close32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="prepare32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\prepare32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -248,6 +257,9 @@
   <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>
@@ -269,6 +281,10 @@
   <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>
   </data>
+  <data name="ID1030" xml:space="preserve">
+    <value>颗粒灰度最大范围</value>
+    <comment>类型 int</comment>
+  </data>
   <data name="ID1045" xml:space="preserve">
     <value>XRay计数期望值</value>
     <comment>类型 int</comment>
@@ -276,9 +292,6 @@
   <data name="ID1076" xml:space="preserve">
     <value />
   </data>
-  <data name="ID1036" xml:space="preserve">
-    <value />
-  </data>
   <data name="ID1025" xml:space="preserve">
     <value>图像处理参数组</value>
     <comment>类型String</comment>
@@ -308,6 +321,9 @@
   <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>
@@ -342,6 +358,13 @@
   <data name="ID1085" xml:space="preserve">
     <value />
   </data>
+  <data name="ID1044" xml:space="preserve">
+    <value>XRay扫描方式</value>
+    <comment>类型 int   取图方式:  中心,自上而下,自下而上,随机</comment>
+  </data>
+  <data name="ID1033" xml:space="preserve">
+    <value />
+  </data>
   <data name="ID1007" xml:space="preserve">
     <value />
   </data>
@@ -385,27 +408,32 @@
   <data name="Ruler32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Ruler32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ID1001" xml:space="preserve">
-    <value>样品名</value>
-    <comment>类型 bool, 使用checkbox按钮</comment>
+  <data name="ID1023" xml:space="preserve">
+    <value />
   </data>
   <data name="test16" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\test16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ID1018" xml:space="preserve">
-    <value />
-  </data>
-  <data name="ID1002" xml:space="preserve">
-    <value>执行开关</value>
-    <comment>类型 bool, 使用checkbox按钮</comment>
+  <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="ID1073" xml:space="preserve">
     <value>测量的颗粒数</value>
     <comment>类型 int</comment>
   </data>
+  <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>
   <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>
   </data>
@@ -418,8 +446,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="ID1035" xml:space="preserve">
-    <value />
+  <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="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>
@@ -455,9 +483,6 @@
   <data name="Ruler162" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Ruler162.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</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>
-  </data>
   <data name="addons32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\addons32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -468,18 +493,12 @@
     <value>完成幁图数</value>
     <comment>类型 int</comment>
   </data>
-  <data name="start321" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\start321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="Recover161" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Recover161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="ID1008" xml:space="preserve">
     <value />
   </data>
-  <data name="ID1047" xml:space="preserve">
-    <value />
-  </data>
   <data name="Polygon161" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Polygon161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -503,9 +522,6 @@
     <value>颗粒面积最小范围</value>
     <comment>类型 int</comment>
   </data>
-  <data name="ID1009" xml:space="preserve">
-    <value />
-  </data>
   <data name="SEMMoveToCenter_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\SEMMoveToCenter_32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -519,19 +535,12 @@
     <value>颗粒灰度最小范围</value>
     <comment>类型  int</comment>
   </data>
-  <data name="ID1013" xml:space="preserve">
-    <value>颗粒度</value>
-    <comment>类型 int 当 停止模式= ParticleMode ,显示</comment>
-  </data>
   <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="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>
-  <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="SEMMoveToCurrent_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\SEMMoveToCurrent_32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -542,6 +551,9 @@
     <value>颗粒分析标准库名</value>
     <comment>类型String</comment>
   </data>
+  <data name="Rectangle32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Rectangle32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="ID1072" xml:space="preserve">
     <value>测量面积</value>
     <comment>类型 int</comment>
@@ -555,6 +567,9 @@
   <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>
@@ -562,11 +577,8 @@
   <data name="close321" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\close32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <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="delete321" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\delete321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="ID1011" xml:space="preserve">
     <value>开始模式</value>
@@ -575,19 +587,14 @@
   <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="ID1053" xml:space="preserve">
-    <value>工作距离</value>
-    <comment>类型 double,从电镜里获得</comment>
-  </data>
-  <data name="ID1048" 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="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 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>
   </data>
-  <data name="ID1044" xml:space="preserve">
-    <value>XRay扫描方式</value>
-    <comment>类型 int   取图方式:  中心,自上而下,自下而上,随机</comment>
+  <data name="ID1055" xml:space="preserve">
+    <value />
   </data>
   <data name="SmapleName32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\SmapleName32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -650,15 +657,23 @@
   <data name="Ruler161" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Ruler161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ID1068" xml:space="preserve">
+  <data name="ID1075" xml:space="preserve">
     <value />
   </data>
-  <data name="ID1067" xml:space="preserve">
+  <data name="ID1068" xml:space="preserve">
     <value />
   </data>
-  <data name="ID1023" xml:space="preserve">
+  <data name="ID1051" xml:space="preserve">
+    <value>放大倍数</value>
+    <comment>类型 double,从电镜里获得</comment>
+  </data>
+  <data name="ID1078" xml:space="preserve">
     <value />
   </data>
+  <data name="ID1001" xml:space="preserve">
+    <value>样品名</value>
+    <comment>类型 bool, 使用checkbox按钮</comment>
+  </data>
   <data name="Add Sample161" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Add Sample161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -693,22 +708,21 @@
   <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="ID1060" xml:space="preserve">
-    <value>测量状态组</value>
-    <comment>类型String</comment>
+  <data name="ID1039" xml:space="preserve">
+    <value />
   </data>
   <data name="ID1049" xml:space="preserve">
     <value />
   </data>
-  <data name="ID1032" xml:space="preserve">
+  <data name="ID1047" xml:space="preserve">
     <value />
   </data>
   <data name="ID1042" xml:space="preserve">
     <value>搜索XRay最低计数</value>
     <comment>类型 int enum枚举  x-ray扫描方式有2个选择:点扫描、面扫描。</comment>
   </data>
-  <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 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>
@@ -716,12 +730,14 @@
   <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>
-  <data name="Rectangle32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Rectangle32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="close322" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\close32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ID1054" xml:space="preserve">
-    <value>覆盖测量区域帧图数</value>
-    <comment>类型 int</comment>
+  <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="关闭二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="Ruler321" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Ruler321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -732,8 +748,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="close32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\close32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="ID1009" xml:space="preserve">
+    <value />
   </data>
   <data name="ID1026" xml:space="preserve">
     <value>颗粒面积最大范围</value>
@@ -749,9 +765,9 @@
   <data name="ID1038" xml:space="preserve">
     <value />
   </data>
-  <data name="ID1061" xml:space="preserve">
-    <value>测量状态</value>
-    <comment>类型 int enum 枚举, 样品测量执行结果状态可以是:未测量、测量中、中止、完成、失败</comment>
+  <data name="ID1054" xml:space="preserve">
+    <value>覆盖测量区域帧图数</value>
+    <comment>类型 int</comment>
   </data>
   <data name="DelSemData_16" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\DelSemData_16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -768,19 +784,15 @@
   <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="saveas32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\saveas32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="ID1078" xml:space="preserve">
-    <value />
+  <data name="start321" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\start321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ID1051" xml:space="preserve">
-    <value>放大倍数</value>
-    <comment>类型 double,从电镜里获得</comment>
+  <data name="ID1002" xml:space="preserve">
+    <value>执行开关</value>
+    <comment>类型 bool, 使用checkbox按钮</comment>
   </data>
-  <data name="ID1030" xml:space="preserve">
-    <value>颗粒灰度最大范围</value>
-    <comment>类型 int</comment>
+  <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="Open16" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Open161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -788,18 +800,20 @@
   <data name="borderbottom16" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\borderbottom16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="sem321" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\sem321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="deletefile321" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\deletefile321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="ID1066" 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 name="ID1048" xml:space="preserve">
+    <value />
   </data>
-  <data name="ID1063" xml:space="preserve">
-    <value>已测量时间</value>
-    <comment>类型 double 已经测量完成Field的时间</comment>
+  <data name="ID1035" xml:space="preserve">
+    <value />
   </data>
   <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>
@@ -810,23 +824,24 @@
   <data name="delete32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\delete32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <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 name="saveas32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\saveas32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="ID1052" xml:space="preserve">
     <value>测量精度</value>
     <comment>类型 double        例如放大倍数为100时,测量精度为 1142/1042</comment>
   </data>
-  <data name="ID1033" xml:space="preserve">
-    <value />
+  <data name="ID1013" xml:space="preserve">
+    <value>颗粒度</value>
+    <comment>类型 int 当 停止模式= ParticleMode ,显示</comment>
   </data>
   <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="sem321" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\sem321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="close32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\close32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ID1075" xml:space="preserve">
+  <data name="ID1067" xml:space="preserve">
     <value />
   </data>
   <data name="sem162" type="System.Resources.ResXFileRef, System.Windows.Forms">
@@ -841,19 +856,7 @@
   <data name="ID1082" xml:space="preserve">
     <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="关闭二16" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\关闭二16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <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="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="DisconnnectHardware" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\DisconnnectHardware.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>
 </root>

BIN
OTSIncAMeasureApp/Resources/interrupt.png