合并提交

OTSIncAMeasureApp/0-OTSModel/Measure/ParamData/COTSMsrPrjResultData.cs

@@ -1421,6 +1421,7 @@ namespace OTSModelSharp
 
         //合并后新添加的需要的方法
         public void SetGenParam(COTSGeneralParam GenParam) { m_GenParam = GenParam; }
+        public COTSGeneralParam GetGenParam() { return m_GenParam; }
 
         public bool Reclassify()
         {

OTSIncAMeasureApp/0-OTSModel/Measure/ParamData/OTSGeneralParam.cs

@@ -30,6 +30,23 @@ namespace OTSModelSharp
         otsdataconst.DOMAIN_SHAPE m_nDefaultShape;
        
         otsdataconst.MEMBRANE_TYPE m_DefaultmembraneType;
+
+        bool m_AutoBeamOff;
+        /// <summary>
+        /// AutoBeamOff:自动关高压开关
+        /// </summary>
+        public bool AutoBeamOff
+        {
+            set
+            {
+                m_AutoBeamOff = value;
+            }
+            get
+            {
+                return m_AutoBeamOff;
+            }
+        }
+
         //--------------------public-----------------
         public COTSGeneralParam()
         {
@@ -213,6 +230,8 @@ namespace OTSModelSharp
             m_bSysSTD = false;
             m_steelTechnologyl = 0;
             m_sSTDSelect = ("");
+
+            m_AutoBeamOff = false;
         }
         protected void Duplicate(COTSGeneralParam a_oSource)
         {

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

@@ -168,7 +168,7 @@
             this.rbMenu.BorderMode = System.Windows.Forms.RibbonWindowMode.InsideWindow;
             this.rbMenu.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F);
             this.rbMenu.Location = new System.Drawing.Point(0, 0);
-            this.rbMenu.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.rbMenu.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.rbMenu.Minimized = true;
             this.rbMenu.Name = "rbMenu";
             // 
@@ -202,7 +202,7 @@
             this.rbMenu.QuickAcessToolbar.Image = null;
             this.rbMenu.QuickAcessToolbar.Tag = null;
             this.rbMenu.QuickAcessToolbar.ToolTipImage = null;
-            this.rbMenu.Size = new System.Drawing.Size(1703, 130);
+            this.rbMenu.Size = new System.Drawing.Size(1277, 130);
             this.rbMenu.TabIndex = 0;
             this.rbMenu.Tabs.Add(this.rbTabHome);
             this.rbMenu.Tabs.Add(this.rbTabView);
@@ -635,8 +635,8 @@
             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.AutoBeamOff_off;
-            this.rbAutoBeamOff.SmallImage = global::OTSMeasureApp.Properties.Resources.AutoBeamOff_off;
+            this.rbAutoBeamOff.Image = global::OTSMeasureApp.Properties.Resources.AutoBeamOff_on;
+            this.rbAutoBeamOff.SmallImage = global::OTSMeasureApp.Properties.Resources.Add_Sample16;
             this.rbAutoBeamOff.Style = System.Windows.Forms.RibbonButtonStyle.Normal;
             this.rbAutoBeamOff.Tag = "rbAutoBeamOff";
             this.rbAutoBeamOff.Text = "自动关枪";
@@ -848,11 +848,11 @@
             this.TSGrayVal,
             this.STSemCoordinate,
             this.toolStripStatusLabel1});
-            this.statusStrip1.Location = new System.Drawing.Point(0, 841);
+            this.statusStrip1.Location = new System.Drawing.Point(0, 671);
             this.statusStrip1.Name = "statusStrip1";
-            this.statusStrip1.Padding = new System.Windows.Forms.Padding(3, 0, 19, 0);
+            this.statusStrip1.Padding = new System.Windows.Forms.Padding(2, 0, 14, 0);
             this.statusStrip1.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
-            this.statusStrip1.Size = new System.Drawing.Size(1703, 30);
+            this.statusStrip1.Size = new System.Drawing.Size(1277, 26);
             this.statusStrip1.TabIndex = 2;
             this.statusStrip1.Text = "statusStrip1";
             // 
@@ -860,20 +860,20 @@
             // 
             this.TSGrayVal.BorderSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.Right;
             this.TSGrayVal.Name = "TSGrayVal";
-            this.TSGrayVal.Size = new System.Drawing.Size(58, 24);
+            this.TSGrayVal.Size = new System.Drawing.Size(48, 21);
             this.TSGrayVal.Text = "灰度值";
             // 
             // STSemCoordinate
             // 
             this.STSemCoordinate.BorderSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.Right;
             this.STSemCoordinate.Name = "STSemCoordinate";
-            this.STSemCoordinate.Size = new System.Drawing.Size(75, 24);
+            this.STSemCoordinate.Size = new System.Drawing.Size(62, 21);
             this.STSemCoordinate.Text = "SEM坐标";
             // 
             // toolStripStatusLabel1
             // 
             this.toolStripStatusLabel1.Name = "toolStripStatusLabel1";
-            this.toolStripStatusLabel1.Size = new System.Drawing.Size(65, 24);
+            this.toolStripStatusLabel1.Size = new System.Drawing.Size(54, 21);
             this.toolStripStatusLabel1.Text = "IsReady";
             this.toolStripStatusLabel1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             this.toolStripStatusLabel1.Visible = false;
@@ -888,9 +888,9 @@
             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);
+            this.dockPanel.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.dockPanel.Name = "dockPanel";
-            this.dockPanel.Size = new System.Drawing.Size(1703, 711);
+            this.dockPanel.Size = new System.Drawing.Size(1277, 541);
             dockPanelGradient1.EndColor = System.Drawing.SystemColors.ControlLight;
             dockPanelGradient1.StartColor = System.Drawing.SystemColors.ControlLight;
             autoHideStripSkin1.DockStripGradient = dockPanelGradient1;
@@ -967,9 +967,9 @@
             // 
             // OTSIncAMeasureAppForm
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1703, 871);
+            this.ClientSize = new System.Drawing.Size(1277, 697);
             this.Controls.Add(this.dockPanel);
             this.Controls.Add(this.statusStrip1);
             this.Controls.Add(this.rbMenu);
@@ -977,8 +977,8 @@
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.IsMdiContainer = true;
             this.KeyPreview = true;
-            this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.MinimumSize = new System.Drawing.Size(901, 621);
+            this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.MinimumSize = new System.Drawing.Size(680, 505);
             this.Name = "OTSIncAMeasureAppForm";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
             this.Text = "OTSMeasureApp";

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>
@@ -179,9 +175,8 @@
   <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 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="ID1046" xml:space="preserve">
     <value />
@@ -196,11 +191,14 @@
   <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>
-  <data name="SetSemData" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\SetSemData.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <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="ID1021" xml:space="preserve">
     <value />
@@ -237,13 +235,15 @@
     <value>通用参数组</value>
     <comment>类型 String</comment>
   </data>
-  <data name="ID1063" xml:space="preserve">
-    <value>已测量时间</value>
-    <comment>类型 double 已经测量完成Field的时间</comment>
+  <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="ID1018" xml:space="preserve">
     <value />
   </data>
+  <data name="ID1039" xml:space="preserve">
+    <value />
+  </data>
   <data name="ID1074" xml:space="preserve">
     <value>测量面积</value>
     <comment>类型 int</comment>
@@ -257,12 +257,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="SetSemData" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\SetSemData.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,16 +275,12 @@
   <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>
   </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>
@@ -321,9 +317,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,12 +351,11 @@
   <data name="ID1085" xml:space="preserve">
     <value />
   </data>
-  <data name="ID1044" xml:space="preserve">
-    <value>XRay扫描方式</value>
-    <comment>类型 int   取图方式:  中心，自上而下，自下而上，随机</comment>
+  <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>
   </data>
-  <data name="ID1033" xml:space="preserve">
-    <value />
+  <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="ID1007" xml:space="preserve">
     <value />
@@ -384,8 +376,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,14 +394,18 @@
   <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>
   <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="ID1023" xml:space="preserve">
-    <value />
+  <data name="ID1001" xml:space="preserve">
+    <value>样品名</value>
+    <comment>类型 bool， 使用checkbox按钮</comment>
   </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>
@@ -417,23 +413,17 @@
   <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="ID1002" xml:space="preserve">
+    <value>执行开关</value>
+    <comment>类型 bool， 使用checkbox按钮</comment>
+  </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>
@@ -446,8 +436,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="ID1035" xml:space="preserve">
+    <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>
@@ -483,6 +473,9 @@
   <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>
@@ -493,12 +486,18 @@
     <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>
@@ -535,6 +534,10 @@
     <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>
@@ -551,15 +554,12 @@
     <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>
   </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,16 +567,19 @@
   <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>
   </data>
+  <data name="ID1080" xml:space="preserve">
+    <value />
+  </data>
   <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="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>
@@ -587,14 +590,16 @@
   <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="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 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="ID1055" xml:space="preserve">
-    <value />
+  <data name="ID1044" xml:space="preserve">
+    <value>XRay扫描方式</value>
+    <comment>类型 int   取图方式:  中心，自上而下，自下而上，随机</comment>
   </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>
@@ -657,22 +662,14 @@
   <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="ID1075" xml:space="preserve">
-    <value />
-  </data>
   <data name="ID1068" xml:space="preserve">
     <value />
   </data>
-  <data name="ID1051" xml:space="preserve">
-    <value>放大倍数</value>
-    <comment>类型 double,从电镜里获得</comment>
-  </data>
-  <data name="ID1078" xml:space="preserve">
+  <data name="ID1067" xml:space="preserve">
     <value />
   </data>
-  <data name="ID1001" xml:space="preserve">
-    <value>样品名</value>
-    <comment>类型 bool， 使用checkbox按钮</comment>
+  <data name="ID1023" xml:space="preserve">
+    <value />
   </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>
@@ -708,39 +705,41 @@
   <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="ID1039" xml:space="preserve">
-    <value />
+  <data name="ID1060" xml:space="preserve">
+    <value>测量状态组</value>
+    <comment>类型String</comment>
   </data>
   <data name="ID1049" xml:space="preserve">
     <value />
   </data>
-  <data name="ID1047" xml:space="preserve">
+  <data name="ID1032" xml:space="preserve">
     <value />
   </data>
   <data name="ID1042" xml:space="preserve">
     <value>搜索XRay最低计数</value>
     <comment>类型 int enum枚举  x-ray扫描方式有2个选择：点扫描、面扫描。</comment>
   </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="复位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="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 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="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="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 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="开始" 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="ID1054" 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="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>
+  <data name="ID1055" xml:space="preserve">
+    <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>
@@ -755,8 +754,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>
@@ -765,9 +764,9 @@
   <data name="ID1038" xml:space="preserve">
     <value />
   </data>
-  <data name="ID1054" xml:space="preserve">
-    <value>覆盖测量区域帧图数</value>
-    <comment>类型 int</comment>
+  <data name="ID1061" xml:space="preserve">
+    <value>测量状态</value>
+    <comment>类型 int enum 枚举， 样品测量执行结果状态可以是：未测量、测量中、中止、完成、失败</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>
@@ -775,24 +774,31 @@
   <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>
   </data>
+  <data name="ID1082" xml:space="preserve">
+    <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="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 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="ID1002" xml:space="preserve">
-    <value>执行开关</value>
-    <comment>类型 bool， 使用checkbox按钮</comment>
+  <data name="ID1078" xml:space="preserve">
+    <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="ID1051" xml:space="preserve">
+    <value>放大倍数</value>
+    <comment>类型 double,从电镜里获得</comment>
+  </data>
+  <data name="ID1030" xml:space="preserve">
+    <value>颗粒灰度最大范围</value>
+    <comment>类型 int</comment>
   </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>
@@ -800,9 +806,6 @@
   <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>
@@ -812,8 +815,9 @@
   <data name="ID1048" xml:space="preserve">
     <value />
   </data>
-  <data name="ID1035" xml:space="preserve">
-    <value />
+  <data name="ID1063" xml:space="preserve">
+    <value>已测量时间</value>
+    <comment>类型 double 已经测量完成Field的时间</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>
@@ -824,24 +828,23 @@
   <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="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 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="ID1052" xml:space="preserve">
     <value>测量精度</value>
     <comment>类型 double        例如放大倍数为100时，测量精度为 1142/1042</comment>
   </data>
-  <data name="ID1013" xml:space="preserve">
-    <value>颗粒度</value>
-    <comment>类型 int 当 停止模式= ParticleMode ，显示</comment>
+  <data name="ID1033" xml:space="preserve">
+    <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="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="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="ID1067" xml:space="preserve">
+  <data name="ID1075" xml:space="preserve">
     <value />
   </data>
   <data name="sem162" type="System.Resources.ResXFileRef, System.Windows.Forms">
@@ -853,10 +856,13 @@
   <data name="send32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\send32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ID1082" xml:space="preserve">
-    <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="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_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="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>