fix some bugs.

Bin/x64/Debug/Config/ProData/HardwareConfig.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <XMLData PathName="HardwareConfig.xml" ID="1">
-  <Member RegName="SemControllerName" Value="OffLine" ImageInputSources="SE" />
-  <Member RegName="EDSName" Value="OffLine" />
-  <Member RegName="BrukerDllVersion" Version="Bruker.API.Esprit2.2.dll" />
+  <Member RegName="SemControllerName" Value="Bruker" ImageInputSources="SE" />
+  <Member RegName="EDSName" Value="Bruker" />
+  <Member RegName="BrukerDllVersion" Version="Bruker.API.Esprit64.dll" />
   <Member RegName="FEIIP" Value="192.168.0.1" />
   <Member RegName="FEIPORT" Value="7520" />
 </XMLData>

Bin/x64/Debug/Config/ReportTemplate/ReportTemplateConfig.xml

@@ -119,7 +119,7 @@
     </list_str_kllb_DeleteClass>
   </M_KLLBXX>
   <M_address>
-    <Path>.\Config\ReportTemplate\ReportTemplateConfig.xml</Path>
+    <Path>F:\OTS2_0\Bin\x64\OTSRelease_oxford61AndBruker2.4\Release_oxford61\Config\ProData\ReportTemplateConfig.xml</Path>
   </M_address>
   <M_JZWZB>
     <b_ck_surface>True</b_ck_surface>

Bin/x64/Debug/Resources/XMLData/AppResource_EN.xml

@@ -142,8 +142,6 @@
       <Control name="rbAllImage" text="FullMatching" />
 	  <Control name="rbWidthImage" text="WidthMatching" />
 	  <Control name="rbChoiceTools" text="ChoiceTools" />
-	  <Control name="rbChoiceReMeasure" text="Particle" />
-	  <Control name="rbReMeasure" text="ReMeasure" />
 	  <Control name="rbReverseSelection" text="ReverseSelection" />
 	  <Control name="rbCircular" text="Circular" />
 	  <Control name="rbRectangle" text="Rectangle" />
@@ -1091,7 +1089,6 @@
 	  <Control name="label47" text="XrayLimit" />
 	  <Control name="label49" text="Coefficient of corrosion expansion" />
 	  <Control name="label37" text="Analysis threshold" />
-	  <Control name="label52" text="Enable particle filtering（Bruker）" />
 	  <Control name="groupBox7" text="ModeSelection" />
 	  <Control name="lbModelSel" text="ModeSelection" />
 	  <Control name="lbLaboratoty" text="Laboratoty" />
@@ -1106,7 +1103,6 @@
 	  <Control name="groupBox9" text="Standard library selection" />
 	  <Control name="label43" text="Background processing mode:" />
 	  <Control name="label44" text="Using X-ray" />
-	  <Control name="label50" text="ImageOverlap" />
 	  <Control name="btnok" text="Sure" />
 	  <Control name="btncancel" text="Cancel" />
 	  <Control name="button_SpPart" text="Special Gray Grain Recognition Settings" />
@@ -1476,7 +1472,6 @@
 	  <Control name="label_Dmax" text="Dmax(μm)" />
 	  <Control name="label_ParticleName" text="ParticleName" />
 	  <Control name="btn_Sel" text="Search" />
-	  <Control name="btn_ReMeasure" text="ReMeasure" />
 	  <Control name="label_order" text="Sort by:" />
 	  <Control name="label1" text="Total" />
 	  <Control name="label4" text="Records, Per page" />
@@ -1708,60 +1703,4 @@
 	  <Control name="button1" text="determine" />
     </Controls>
  </Form>
- <Form>
-    <Name>frmReMeasure</Name>
-    <Controls>
-	  <Control name="frmReMeasure" text="ReMeasure" />
-      <Control name="groupBox_img" text="ParticleImage" />
-	  <Control name="groupBox_param" text="MeasureParam" />
-	  <Control name="groupBox_state" text="MeasureState" />
-	  <Control name="BTN_EXPORT" text="Export" />
-	  <Control name="BTN_NO" text="Stop" />
-	  <Control name="BTN_YES" text="Begin" />
-	  <Control name="LB_IMGSCANSPEED" text="ImgScanSpeed：" />
-	  <Control name="LB_Outspread" text="Outspread：" />
-	  <Control name="LB_SCANTIME" text="ScanTime（ms）：" />
-	  <Control name="LB_XRAYSCANMODE" text="XrayScanMode：" />
-	  <Control name="LB_partFun" text="ParticleFun：" />
-	  <Control name="LB_HAND" text="HandFun：" />
-	  <Control name="str1" text="No" />
-	  <Control name="str2" text="Failed to connect to IPC server！" />
-	  <Control name="str3" text="Processing complete！" />
-	  <Control name="str4" text="---Start processing particles：" />
-	  <Control name="str5" text="Set magnification：" />
-	  <Control name="str6" text="Failed to set magnification！" />
-	  <Control name="str7" text="Move to particle Center：" />
-	  <Control name="str8" text="Move to particle center failed！" />
-	  <Control name="str9" text="Remake：" />
-	  <Control name="str10" text="Failed to take pictures！" />
-	  <Control name="str11" text="Looking for new location particle information：" />
-	  <Control name="str12" text="Failed to find new location particle information！" />
-	  <Control name="str13" text="Energy spectrum acquisition：" />
-	  <Control name="str14" text="Failed to collect energy spectrum！" />
-	  <Control name="str15" text="Energy spectrum analysis results：" />
-	  <Control name="str16" text="---End processing particles：" />
-	  <Control name="str17" text="Processing complete！" />
-	  <Control name="str18" text="Please manually select the particles to be processed on the picture！" />
-	  <Control name="str19" text="IsReMeasure" />
-	  <Control name="str20" text="TypeName" />
-	  <Control name="str21" text="Area μm²" />
-	  <Control name="str22" text="EquivalentCircleDiameter μm" />
-	  <Control name="str23" text="MaxDiameter μm" />
-	  <Control name="str24" text="MinDiameter μm" />
-	  <Control name="str25" text="DiameterRatio" />
-	  <Control name="str26" text="FerretDiameter um" />
-	  <Control name="str27" text="PERP um" />
-	  <Control name="str28" text="PERI um" />
-	  <Control name="str29" text="INSCR um" />
-	  <Control name="str30" text="MEAN um" />
-	  <Control name="str31" text="ELONG um" />
-	  <Control name="str32" text="ASPECT_ELONG" />
-	  <Control name="str33" text="Orientation°" />
-	  <Control name="str34" text="Electrical_conductivity" />
-	  <Control name="str35" text="Density" />
-	  <Control name="str36" text="Hardness" />
-	  <Control name="str37" text="Export Success！" />
-	  <Control name="str38" text="Tips" />
-    </Controls>
- </Form>
 </Resource>

Bin/x64/Debug/Resources/XMLData/AppResource_ZH.xml

@@ -142,8 +142,6 @@
       <Control name="rbAllImage" text="全图匹配" />
 	  <Control name="rbWidthImage" text="宽度匹配" />
 	  <Control name="rbChoiceTools" text="选择工具" />
-	  <Control name="rbChoiceReMeasure" text="颗粒" />
-	  <Control name="rbReMeasure" text="重新测量" />
 	  <Control name="rbReverseSelection" text="反选" />
 	  <Control name="rbCircular" text="圆形" />
 	  <Control name="rbRectangle" text="矩形" />
@@ -1069,7 +1067,6 @@
 	  <Control name="label49" text="腐蚀膨胀系数" />
 	  <Control name="label31" text="扫描方式(大颗粒）" /> 
 	  <Control name="label37" text="分析阈值" />
-	  <Control name="label52" text="是否启用颗粒过滤（Bruker）" />
 	  <Control name="groupBox7" text="模式选择" />
 	  <Control name="lbModelSel" text="模式选择" />
 	  <Control name="lbLaboratoty" text="实验室" />
@@ -1084,7 +1081,6 @@
 	  <Control name="groupBox9" text="标准库选择" />
 	  <Control name="label43" text="背景处理方式" />
 	  <Control name="label44" text="是否使用X-ray" />
-	  <Control name="label50" text="图像重叠像素(0=不启用)" />
 	  <Control name="btnok" text="确  定" />
 	  <Control name="btncancel" text="取  消" />
 	  <Control name="button1" text="特殊灰度颗粒识别设置" />
@@ -1418,7 +1414,6 @@
 	  <Control name="label_Dmax" text="Dmax(μm)" />
 	  <Control name="label_ParticleName" text="颗粒名称" />
 	  <Control name="btn_Sel" text="查询" />
-	  <Control name="btn_ReMeasure" text="二次采集" />
 	  <Control name="label_order" text="排序方式:" />
 	  <Control name="label1" text="共" />
 	  <Control name="label4" text="条记录，每页" />
@@ -1690,62 +1685,6 @@
 	  <Control name="str17" text="最大" />
     </Controls>
  </Form>
- <Form>
-    <Name>frmReMeasure</Name>
-    <Controls>
-	  <Control name="frmReMeasure" text="二次采集" />
-      <Control name="groupBox_img" text="颗粒图片" />
-	  <Control name="groupBox_param" text="测量参数" />
-	  <Control name="groupBox_state" text="测量状态" />
-	  <Control name="BTN_EXPORT" text="导出" />
-	  <Control name="BTN_NO" text="停止" />
-	  <Control name="BTN_YES" text="开始采集" />
-	  <Control name="LB_IMGSCANSPEED" text="图像扫描精度：" />
-	  <Control name="LB_Outspread" text="图像外扩像数值：" />
-	  <Control name="LB_SCANTIME" text="能谱扫描时间（毫秒）：" />
-	  <Control name="LB_XRAYSCANMODE" text="颗粒扫描方式：" />
-	  <Control name="LB_partFun" text="颗粒提取方法：" />
-	  <Control name="LB_HAND" text="手动处理：" />
-	  <Control name="str1" text="序号" />
-	  <Control name="str2" text="连接IPC服务器失败！" />
-	  <Control name="str3" text="处理完成！" />
-	  <Control name="str4" text="---开始处理颗粒：" />
-	  <Control name="str5" text="设置放大倍数：" />
-	  <Control name="str6" text="设置放大倍数失败！" />
-	  <Control name="str7" text="移动到颗粒中心位置：" />
-	  <Control name="str8" text="移动到颗粒中心位置失败！" />
-	  <Control name="str9" text="重新拍图：" />
-	  <Control name="str10" text="拍图失败！" />
-	  <Control name="str11" text="寻找新位置颗粒信息：" />
-	  <Control name="str12" text="寻找新位置颗粒信息失败！" />
-	  <Control name="str13" text="采集能谱：" />
-	  <Control name="str14" text="采集能谱失败！" />
-	  <Control name="str15" text="能谱分析结果：" />
-	  <Control name="str16" text="---结束处理颗粒：" />
-	  <Control name="str17" text="处理完成！" />
-	  <Control name="str18" text="请在图片上手动选择要处理的颗粒！" />
-	  <Control name="str19" text="已重测" />
-	  <Control name="str20" text="颗粒名" />
-	  <Control name="str21" text="面积μm²" />
-	  <Control name="str22" text="等效圆直径μm" />
-	  <Control name="str23" text="最长直径μm" />
-	  <Control name="str24" text="最短直径μm" />
-	  <Control name="str25" text="长短直径比" />
-	  <Control name="str26" text="费雷特直径um" />
-	  <Control name="str27" text="正交直径um" />
-	  <Control name="str28" text="周长um" />
-	  <Control name="str29" text="内接圆直径um" />
-	  <Control name="str30" text="内接圆平均直径um" />
-	  <Control name="str31" text="展开长度um" />
-	  <Control name="str32" text="展开长宽比" />
-	  <Control name="str33" text="转向角度°" />
-	  <Control name="str34" text="导电性" />
-	  <Control name="str35" text="密度" />
-	  <Control name="str36" text="硬度" />
-	  <Control name="str37" text="导出成功！" />
-	  <Control name="str38" text="提示" />
-    </Controls>
- </Form>
  <Form>
     <Name>InclusionsTraceability</Name>
     <Controls>

Bin/x64/Debug/Resources/XMLData/ResourceForMeasureSourceGrid-EN.xml

@@ -8,34 +8,62 @@
 			<member itemKey="20003" itemName="" itemText="ConfigurationFileName"/>
 			<member itemKey="20004" itemName="" itemText="AnalysisSTDLib"/>
 			<member itemKey="20005" itemName="" itemText="MembraneType"/>
-			<member itemKey="20006" itemName="" itemText="SteelTechnology" comboContent="General Method,Calcium Treatment,Magnesium Treatment,Rare Earth Treatment"/>
+			<member itemKey="20006" itemName="" itemText="SteelTechnology"/>
 			<member itemKey="20008" itemName="" itemText="SysLib switch"/>
-
+			<member itemKey="20353" itemName="" itemText="General Method"/>
+			<member itemKey="20354" itemName="" itemText="Calcium Treatment"/>
+			<member itemKey="20355" itemName="" itemText="Magnesium Treatment"/>
+			<member itemKey="20356" itemName="" itemText="Rare Earth Treatment"/>
+			<member itemKey="20070" itemName="" itemText="SampleName"/>
+			<member itemKey="20071" itemName="" itemText="SampleHoleName"/>
+			<member itemKey="20072" itemName="" itemText="Switch on then this sample will be measured."/>
+			<member itemKey="20073" itemName="" itemText="choose the preference file"/>
+			<member itemKey="20074" itemName="" itemText="choose the particle analysis stdLib"/>
+			<member itemKey="20075" itemName="" itemText="choose the steel technology"/>
+			<member itemKey="20076" itemName="" itemText="spare"/>
+			<member itemKey="20077" itemName="" itemText="spare"/>
+			<member itemKey="20078" itemName="" itemText="spare"/>
+			<member itemKey="20079" itemName="" itemText="spare"/>
 		</collection>
 		<collection RegName="ResGrp" grpKey="1" text="ScanParams" description="">
-			<member itemKey="20010" itemName="" itemText="GetImageMode" comboContent="Center,FromTopToBottom(Meander),FromBottomToTop(Meander)"/>
+			<member itemKey="20010" itemName="" itemText="GetImageMode"/>
 			<member itemKey="20011" itemName="" itemText="StopMode"/>
 			<member itemKey="20012" itemName="" itemText="ParticalNum"/>
 			<member itemKey="20013" itemName="" itemText="FieldNum"/>
 			<member itemKey="20014" itemName="" itemText="MeasureTime(s)"/>
 			<member itemKey="20015" itemName="" itemText="MeasureStopArea(mm2)"/>
-			<member itemKey="20016" itemName="" itemText="ScanResolution" comboContent="Low,Medium,High"/>
-			<member itemKey="20017" itemName="" itemText="MeasureImageResolution" comboContent="512X384,1024X684,1024X704,1024X768,1536X1024,2048X1408,2048X1536,3072X2048,4096X3072" />
-	
+			<member itemKey="20016" itemName="" itemText="ScanResolution"/>
+			<member itemKey="20017" itemName="" itemText="MeasureImageResolution"/>
+			<member itemKey="20160" itemName="" itemText="Center"/>
+			<member itemKey="20161" itemName="" itemText="FromTopToBottom(Meander)"/>
+			<member itemKey="20162" itemName="" itemText="FromBottomToTop(Meander)"/>
 			<member itemKey="20163" itemName="" itemText="Random"/>
 			<member itemKey="20170" itemName="" itemText="CoverMeasureArea"/>
 			<member itemKey="20171" itemName="" itemText="FieldNumber"/>
 			<member itemKey="20172" itemName="" itemText="ParticleNumber"/>
 			<member itemKey="20173" itemName="" itemText="Time"/>
-
-
+			<member itemKey="20180" itemName="" itemText="Low"/>
+			<member itemKey="20181" itemName="" itemText="Medium"/>
+			<member itemKey="20182" itemName="" itemText="High"/>
+			       <member itemKey="20080" itemName="" itemText="choose the geting image mode ,from center or from up to down,from down to up or random"/>
+        <member itemKey="20081" itemName="" itemText="choose the particle numbers, field numbers,measure time or all fields of the measure area. "/>
+        <member itemKey="20082" itemName="" itemText="input the expect measure particle numbers"/>
+        <member itemKey="20083" itemName="" itemText="input the measure field numbers"/>
+        <member itemKey="20084" itemName="" itemText="input measure time"/>
+        <member itemKey="20085" itemName="" itemText="choose the scan resolution"/>
+        <member itemKey="20086" itemName="" itemText="choose the image resolution(size)."/>
+        <member itemKey="20087" itemName="" itemText="spare"/>
+        <member itemKey="20088" itemName="" itemText="spare"/>
+        <member itemKey="20089" itemName="" itemText="spare"/>
 		</collection>
 
 		<collection RegName="ResGrp" grpKey="2" text="ImageProcess" description="">
-            <member itemKey="20026" itemName="" itemText="BGRemoveType" comboContent="Manual Mode,Auto Mode" description=""/>		
-			<member itemKey="20027" itemName="" itemText="Auto Mode" comboContent="Middle,Downward,Upward" description=""/>
+            <member itemKey="20026" itemName="" itemText="BGRemoveType" description=""/>		
+			<member itemKey="20027" itemName="" itemText="Auto Mode" description=""/>
 			<member itemKey="20028" itemName="" itemText="Manual Mode" description=""/>			
-			
+			<member itemKey="20029" itemName="" itemText="Middle" description=""/>
+			<member itemKey="20030" itemName="" itemText="Downward" description=""/>
+			<member itemKey="20031" itemName="" itemText="Upward" description=""/>
 
 			<member itemKey="20020" itemName="" itemText="MinEqualCirCleDiameter(um)"/>
 			<member itemKey="20021" itemName="" itemText="MaxEqualCirCleDiamiter(um)"/>
@@ -44,21 +72,56 @@
 			<member itemKey="20024" itemName="" itemText="PART_GRAY_MIN"/>
 			<member itemKey="20025" itemName="" itemText="PART_GRAY_MAX"/>
 			
-
+			    <member itemKey="20090" itemName="" itemText="input the minimal area of analysis particle(um)"/>
+        <member itemKey="20091" itemName="" itemText="input the maximum area of analysis particle(um)"/>
+        <member itemKey="20092" itemName="" itemText="input the BG_GRAY_MIN value(0~255)"/>
+        <member itemKey="20093" itemName="" itemText="input the BG_GRAY_MAX value(0~255),not lower than BG_GRAY_MIN"/>
+        <member itemKey="20094" itemName="" itemText="input the min gray value of the analysis particle "/>
+        <member itemKey="20095" itemName="" itemText="input the max gray value of the analysis particle"/>
+        <member itemKey="20096" itemName="" itemText="spare"/>
+        <member itemKey="20097" itemName="" itemText="spare"/>
+        <member itemKey="20098" itemName="" itemText="spare"/>
+        <member itemKey="20099" itemName="" itemText="spare"/>
         </collection>
 		<collection RegName="ResGrp" grpKey="3" text="x-ray" description="">
-
-			<member itemKey="20032" itemName="" itemText="Big x-ray(ms)"/>
-			<member itemKey="20033" itemName="" itemText="ScanMode" comboContent="Spot Scan,Plane Scan" />
+			<member itemKey="20030" itemName="" itemText="Search_x-ray_Resolution"/>
+			<member itemKey="20031" itemName="" itemText="Min_Counts"/>
+			<member itemKey="20032" itemName="" itemText="Analysis_x-ray(ms)"/>
+			<member itemKey="20033" itemName="" itemText="ScanMode"/>
 			<member itemKey="20034" itemName="" itemText="ExpectCounts"/>
-			<member itemKey="20036" itemName="" itemText="BigPartThreshold（ECD/um）" description=""/>
-			<member itemKey="20037" itemName="" itemText="Small X-ray（Ms）" description=""/>
-			<member itemKey="20038" itemName="" itemText="Collect X-ray" comboContent="Yes,No" description="Whether to collect X-ray during the detection process"/>
+			<member itemKey="20036" itemName="" itemText="QuantifyThreshold（EqualCircle/um）" description="进行X-ray quantify 分析的最小颗粒尺寸"/>
+			<member itemKey="20037" itemName="" itemText="FastX-ray（Ms）" description="进行X-ray quantify 分析的最小颗粒尺寸"/>
+			<member itemKey="20038" itemName="" itemText="Collect X-ray" description="Whether to collect X-ray during the detection process"/>
 			<member itemKey="20039" itemName="" itemText="XrayLimit"/>
-
+			<member itemKey="20185" itemName="" itemText="Spot Scan"/>
+			<member itemKey="20186" itemName="" itemText="Plane Scan"/>
+			<member itemKey="20200" itemName="" itemText="Yes" description=""/>
+			<member itemKey="20201" itemName="" itemText="No" description=""/>
+			
+			 <member itemKey="20100" itemName="" itemText="choose the search x-ray resolution"/>
+        <member itemKey="20101" itemName="" itemText="input the down limit of search x-ray counts"/>
+        <member itemKey="20102" itemName="" itemText="input the analysis x-ray time"/>
+        <member itemKey="20103" itemName="" itemText="choose the analysis x-ray scan mode"/>
+        <member itemKey="20104" itemName="" itemText="input the analysis x-ray expect counts"/>
+        <member itemKey="20105" itemName="" itemText="spare"/>
+        <member itemKey="20106" itemName="" itemText="spare"/>
+        <member itemKey="20107" itemName="" itemText="spare"/>
+        <member itemKey="20108" itemName="" itemText="spare"/>
+        <member itemKey="20109" itemName="" itemText="spare"/>
 		</collection>
-
-       <collection RegName="ResGrp" grpKey="4" text="SEMParameter" description="">
+		<collection RegName="ResGrp" grpKey="4" text="FieldStopMode" description="选择帧图扫描结束模式">
+			<member itemKey="20400" itemName="" itemText="FieldStopMode" description=""/>				
+			<member itemKey="20401" itemName="" itemText="NumberPercent" description=""/>
+            <member itemKey="20402" itemName="" itemText="Number" description=""/>	
+			<member itemKey="20403" itemName="" itemText="AreaPercent" description=""/>				
+			<member itemKey="20404" itemName="" itemText="BigPartNum" description=""/>	
+			<member itemKey="20405" itemName="" itemText="SmallPartNum" description=""/>	
+			<member itemKey="20406" itemName="" itemText="BigPartPercent" description=""/>			
+			<member itemKey="20407" itemName="" itemText="SmallPartPercent" description=""/>
+           		
+					
+		</collection>
+       <collection RegName="ResGrp" grpKey="5" text="SEMParameter" description="">
 			<member itemKey="20040" itemName="" itemText="Magnification"/>
 			<member itemKey="20041" itemName="" itemText="PixcelSize(um)"/>
 			<member itemKey="20042" itemName="" itemText="WorkingDistance(mm)"/>
@@ -76,7 +139,7 @@
         <member itemKey="20118" itemName="" itemText="spare"/>
         <member itemKey="20119" itemName="" itemText="spare"/>
 		</collection>
-       <collection RegName="ResGrp" grpKey="5" text="MeasureState" description="">
+       <collection RegName="ResGrp" grpKey="6" text="MeasureState" description="">
 			<member itemKey="20050" itemName="" itemText="MeasureState"/>
 			<member itemKey="20051" itemName="" itemText="MeasureStartTime"/>
 			<member itemKey="20052" itemName="" itemText="MeasureUsingTime"/>
@@ -94,7 +157,7 @@
         <member itemKey="20128" itemName="" itemText="spare"/>
         <member itemKey="20129" itemName="" itemText="spare"/>
 		</collection>
-		<collection RegName="ResGrp" grpKey="6" text="MeasureResult" description="">
+		<collection RegName="ResGrp" grpKey="7" text="MeasureResult" description="">
 			<member itemKey="20060" itemName="" itemText="Retio"/>
         <member itemKey="20061" itemName="" itemText="MeasureArea(um2)"/>
         <member itemKey="20062" itemName="" itemText="ParticleNum"/>

Bin/x64/Debug/Resources/XMLData/ResourceForMeasureSourceGrid-ZH.xml

@@ -7,81 +7,160 @@
 			<member itemKey="20002" itemName="" itemText="执行开关" description="选择则样品会在执行样品测量时进行样品测量，否则将不会。"/>
 			<member itemKey="20003" itemName="" itemText="设定参数文件名" description="选择测量参数文件。"/>
 			<member itemKey="20004" itemName="" itemText="分析标准库名" description="选择颗粒分析标准库。"/>
-			<member itemKey="20005" itemName="" itemText="滤膜类型" comboContent="" description="选择滤膜类型"/>
-			<member itemKey="20006" itemName="" itemText="精炼工艺" comboContent="通用方法,钙处理,镁处理,稀土处理" />
+			<member itemKey="20005" itemName="" itemText="滤膜类型" description="选择滤膜类型"/>
+			<member itemKey="20006" itemName="" itemText="精炼工艺"/>
 			<member itemKey="20008" itemName="" itemText="使用系统库开关"/>
+			<member itemKey="20353" itemName="" itemText="通用方法"/>
+			<member itemKey="20354" itemName="" itemText="钙处理"/>
+			<member itemKey="20355" itemName="" itemText="镁处理"/>
+			<member itemKey="20356" itemName="" itemText="稀土处理"/>
+			<member itemKey="20070" itemName="" itemText="样品名。"/>
+			<member itemKey="20071" itemName="" itemText="样品所在样品孔名。"/>
+			<member itemKey="20072" itemName="" itemText="选择则样品会在执行样品测量时进行样品测量，否则将不会。"/>
+			<member itemKey="20073" itemName="" itemText="选择测量参数文件。"/>
+			<member itemKey="20074" itemName="" itemText="选择颗粒分析标准库。"/>
+			<member itemKey="20075" itemName="" itemText="选择精炼工艺方法"/>
 			<member itemKey="20076" itemName="" itemText="spare"/>
 			<member itemKey="20077" itemName="" itemText="spare"/>
 			<member itemKey="20078" itemName="" itemText="spare"/>
 			<member itemKey="20079" itemName="" itemText="spare"/>
 		</collection>
 		<collection RegName="ResGrp" grpKey="1" text="扫描参数" description="">
-			<member itemKey="20010" itemName="" itemText="取图方式" comboContent="中心,自上而下,自下而上" description="选择从测量区域中心开始取图，或自上而下、自下而上取图，或随机取图。"/>
+			<member itemKey="20010" itemName="" itemText="取图方式" description="选择从测量区域中心开始取图，或自上而下、自下而上取图，或随机取图。"/>
 			<member itemKey="20011" itemName="" itemText="终止方式" description="选择颗粒数、帧图数、测量时间，或覆盖测量区域。"/>
 			<member itemKey="20012" itemName="" itemText="颗粒数" description="输入测量颗粒数。"/>
 			<member itemKey="20013" itemName="" itemText="帧图数" description="输入测量帧图数。"/>
 			<member itemKey="20014" itemName="" itemText="测量时间（秒）" description="输入测量时间。"/>
 			<member itemKey="20015" itemName="" itemText="测量结束面积（mm2）" description="输入测量结束面积。"/>
-			<member itemKey="20016" itemName="" itemText="扫描精度" comboContent="低,中,高" description="选择扫描精度。"/>
-			<member itemKey="20017" itemName="" itemText="测量图精度" comboContent="512X384,1024X684,1024X704,1024X768,1536X1024,2048X1408,2048X1536,3072X2048,4096X3072"  description="选择扫描图精度（尺寸）。"/>
+			<member itemKey="20016" itemName="" itemText="扫描精度" description="选择扫描精度。"/>
+			<member itemKey="20017" itemName="" itemText="测量图精度" description="选择扫描图精度（尺寸）。"/>
+			<member itemKey="20160" itemName="" itemText="中心" description=""/>
+            <member itemKey="20161" itemName="" itemText="自上而下" description=""/>
+            <member itemKey="20162" itemName="" itemText="自下而上" description=""/>
+            <member itemKey="20163" itemName="" itemText="随机" description=""/>
+			<member itemKey="20170" itemName="" itemText="覆盖测量区域" description=""/>
+			<member itemKey="20171" itemName="" itemText="帧图数" description=""/>
+			<member itemKey="20172" itemName="" itemText="颗粒数" description=""/>
+			<member itemKey="20173" itemName="" itemText="时间" description=""/>
+			<member itemKey="20180" itemName="" itemText="低" description=""/>
+			<member itemKey="20181" itemName="" itemText="中" description=""/>
+			<member itemKey="20182" itemName="" itemText="高" description=""/>
 			
-           
-
-			
-		
+			<member itemKey="20080" itemName="" itemText="选择从测量区域中心开始取图，或自上而下、自下而上取图，或随机取图。"/>
+			<member itemKey="20081" itemName="" itemText="选择颗粒数、帧图数、测量时间，或覆盖测量区域。"/>
+			<member itemKey="20082" itemName="" itemText="输入测量颗粒数。"/>
+			<member itemKey="20083" itemName="" itemText="输入测量帧图数。"/>
+			<member itemKey="20084" itemName="" itemText="输入测量时间。"/>
+			<member itemKey="20085" itemName="" itemText="选择扫描精度。"/>
+			<member itemKey="20086" itemName="" itemText="选择扫描图精度（尺寸）。"/>
+			<member itemKey="20087" itemName="" itemText="spare"/>
+			<member itemKey="20088" itemName="" itemText="spare"/>
+			<member itemKey="20089" itemName="" itemText="spare"/>
 		</collection>
 
 		<collection RegName="ResGrp" grpKey="2" text="图像处理参数" description="">
-            <member itemKey="20026" itemName="" itemText="背景处理方式" comboContent="自动方式,手动方式" description=""/>		
-			<member itemKey="20027" itemName="" itemText="自动方式" comboContent="取中,向下,向上" description=""/>
-			<member itemKey="20028" itemName="" itemText="手动方式" description=""/>		
+            <member itemKey="20026" itemName="" itemText="背景处理方式" description=""/>		
+			<member itemKey="20027" itemName="" itemText="自动方式" description=""/>
+			<member itemKey="20028" itemName="" itemText="手动方式" description=""/>			
+			<member itemKey="20029" itemName="" itemText="取中" description=""/>
+			<member itemKey="20030" itemName="" itemText="向下" description=""/>
+			<member itemKey="20031" itemName="" itemText="向上" description=""/>
 			<member itemKey="20022" itemName="" itemText="背景灰度最小值" description="输入背景灰度最小值（0~255）。"/>
 			<member itemKey="20023" itemName="" itemText="背景灰度最大值" description="输入背景灰度最大值（0~255），不小于背景灰度最小值。"/>
 			<member itemKey="20024" itemName="" itemText="颗粒灰度最小值" description="输入分析颗粒灰度最大值（0~255）。"/>
 			<member itemKey="20025" itemName="" itemText="颗粒灰度最大值" description="输入分析颗粒灰度最大值（0~255），不小于分析颗粒灰度最小值。"/>
 			<member itemKey="20020" itemName="" itemText="等效圆直径最小值（微米）" description="输入分析颗粒面积最小值（微米）。"/>
 			<member itemKey="20021" itemName="" itemText="等效圆直径最大值（微米）" description="输入分析颗粒面积最大值（微米）。"/>
-
+			
+			<member itemKey="20090" itemName="" itemText="输入分析颗粒面积最小值（微米）。"/>
+			<member itemKey="20091" itemName="" itemText="输入分析颗粒面积最大值（微米）。"/>
+			<member itemKey="20092" itemName="" itemText="输入背景灰度最小值（0~255）。"/>
+			<member itemKey="20093" itemName="" itemText="输入背景灰度最大值（0~255），不小于背景灰度最小值。"/>
+			<member itemKey="20094" itemName="" itemText="输入分析颗粒灰度最小值。"/>
+			<member itemKey="20095" itemName="" itemText="输入分析颗粒灰度最大值（0~255），不小于分析颗粒灰度最小值。"/>
+			<member itemKey="20096" itemName="" itemText="spare"/>
+			<member itemKey="20097" itemName="" itemText="spare"/>
+			<member itemKey="20098" itemName="" itemText="spare"/>
+			<member itemKey="20099" itemName="" itemText="spare"/>
+	
         </collection>
 		<collection RegName="ResGrp" grpKey="3" text="x-ray参数" description="">
-		
+			<member itemKey="20030" itemName="" itemText="搜索x-ray精度" description="选择搜索x-ray精度。"/>
+			<member itemKey="20031" itemName="" itemText="最小计数率" description="输入搜索x-ray计数率下限值。"/>
 			<member itemKey="20032" itemName="" itemText="大颗粒x-ray时间（毫秒）" description="输入分析x-ray时间。"/>
-			<member itemKey="20033" itemName="" itemText="扫描方式（大颗粒）" comboContent="点扫描,面扫描" description="选择分析x-ray扫描方式。"/>
+			<member itemKey="20033" itemName="" itemText="扫描方式（大颗粒）" description="选择分析x-ray扫描方式。"/>
 			<member itemKey="20034" itemName="" itemText="期望计数率" description="输入分析x-ray计数率期望值。"/>
 			<member itemKey="20036" itemName="" itemText="分析阈值（等效圆直径/微米）" description="进行X-ray quantify 分析的最小颗粒尺寸"/>
 			<member itemKey="20037" itemName="" itemText="小颗粒x-ray时间（毫秒）" description="进行X-ray quantify 分析的最小颗粒尺寸"/>
-			<member itemKey="20038" itemName="" itemText="是否采集X-ray" comboContent="是,否" description="检测过程中是否对颗粒进行X-ray采集"/>
+			<member itemKey="20038" itemName="" itemText="是否采集X-ray" description="检测过程中是否对颗粒进行X-ray采集"/>
 			<member itemKey="20039" itemName="" itemText="数量限值"/>
-
-
+			<member itemKey="20185" itemName="" itemText="点扫描" description=""/>
+            <member itemKey="20186" itemName="" itemText="面扫描" description=""/>
+			<member itemKey="20200" itemName="" itemText="是" description=""/>
+			<member itemKey="20201" itemName="" itemText="否" description=""/>
+			
+			<member itemKey="20100" itemName="" itemText="选择搜索x-ray精度。"/>
+			<member itemKey="20101" itemName="" itemText="输入搜索x-ray计数率下限值。"/>
+			<member itemKey="20102" itemName="" itemText="输入分析x-ray时间。"/>
+			<member itemKey="20103" itemName="" itemText="选择分析x-ray扫描方式。"/>
+			<member itemKey="20104" itemName="" itemText="输入分析x-ray计数率期望值。"/>
+			<member itemKey="20105" itemName="" itemText=""/>
+			<member itemKey="20106" itemName="" itemText="spare"/>
+			<member itemKey="20107" itemName="" itemText="spare"/>
+			<member itemKey="20108" itemName="" itemText="spare"/>
+			<member itemKey="20109" itemName="" itemText="spare"/>
 
 			
 		</collection>
-
-       <collection RegName="ResGrp" grpKey="4" text="电镜工作参数" description="">
+		<collection RegName="ResGrp" grpKey="4" text="帧处理参数" description="选择帧图扫描结束模式">
+			<member itemKey="20400" itemName="" itemText="帧结束方式" description=""/>				
+			<member itemKey="20401" itemName="" itemText="颗粒百分比" description=""/>
+            <member itemKey="20402" itemName="" itemText="颗粒数量" description=""/>	
+			<member itemKey="20403" itemName="" itemText="面积百分比" description=""/>				
+			<member itemKey="20404" itemName="" itemText="大颗粒数量" description=""/>	
+			<member itemKey="20405" itemName="" itemText="小颗粒数量" description=""/>	
+			<member itemKey="20406" itemName="" itemText="大颗粒百分比" description=""/>			
+			<member itemKey="20407" itemName="" itemText="小颗粒百分比" description=""/>
+           		
+					
+		</collection>
+       <collection RegName="ResGrp" grpKey="5" text="电镜工作参数" description="">
 			<member itemKey="20040" itemName="" itemText="放大倍数" description="放大倍数。"/>
 			<member itemKey="20041" itemName="" itemText="像素尺寸（微米）" description="像素尺寸（微米）。"/>
 			<member itemKey="20042" itemName="" itemText="工作距离（毫米）" description="工作距离（毫米）。"/>
 			<member itemKey="20043" itemName="" itemText="覆盖测量区域帧图数" description="覆盖测量区域帧所需要的分析帧图数。"/>
 			<member itemKey="20044" itemName="" itemText="测量区域面积（平方毫米）" description="测量区域的面积（平方毫米）。"/>
 			 
-			<member itemKey="20110" itemName="" itemText="放大倍数。"/>
-			<member itemKey="20111" itemName="" itemText="像素尺寸（微米）。"/>
-			<member itemKey="20112" itemName="" itemText="工作距离（毫米）。"/>
-			<member itemKey="20113" itemName="" itemText="覆盖测量区域帧所需要的分析帧图数。"/>
-			<member itemKey="20114" itemName="" itemText="测量区域的面积（平方毫米）。"/>
-
+			 <member itemKey="20110" itemName="" itemText="放大倍数。"/>
+        <member itemKey="20111" itemName="" itemText="像素尺寸（微米）。"/>
+        <member itemKey="20112" itemName="" itemText="工作距离（毫米）。"/>
+        <member itemKey="20113" itemName="" itemText="覆盖测量区域帧所需要的分析帧图数。"/>
+        <member itemKey="20114" itemName="" itemText="测量区域的面积（平方毫米）。"/>
+        <member itemKey="20115" itemName="" itemText="spare"/>
+        <member itemKey="20116" itemName="" itemText="spare"/>
+        <member itemKey="20117" itemName="" itemText="spare"/>
+        <member itemKey="20118" itemName="" itemText="spare"/>
+        <member itemKey="20119" itemName="" itemText="spare"/>
 		</collection>
-       <collection RegName="ResGrp" grpKey="5" text="测量状态" description="">
+       <collection RegName="ResGrp" grpKey="6" text="测量状态" description="">
 			<member itemKey="20050" itemName="" itemText="测量状态" description="测量状态。"/>
 			<member itemKey="20051" itemName="" itemText="测量开始时间" description="测量开始时间。"/>
 			<member itemKey="20052" itemName="" itemText="使用时间" description="测量使用时间。"/>
 			<member itemKey="20053" itemName="" itemText="结束/暂停时间" description="测量完成时间或暂停时间。"/>
 			<member itemKey="20054" itemName="" itemText="完成帧图数" description="测量完成的帧图数。"/>
 			
-
+			<member itemKey="20120" itemName="" itemText="测量状态。"/>
+			<member itemKey="20121" itemName="" itemText="测量开始时间。"/>
+			<member itemKey="20122" itemName="" itemText="测量使用时间。"/>
+			<member itemKey="20123" itemName="" itemText="测量完成时间或暂停时间。"/>
+			<member itemKey="20124" itemName="" itemText="测量完成的帧图数。"/>
+			<member itemKey="20125" itemName="" itemText="spare"/>
+			<member itemKey="20126" itemName="" itemText="spare"/>
+			<member itemKey="20127" itemName="" itemText="spare"/>
+			<member itemKey="20128" itemName="" itemText="spare"/>
+			<member itemKey="20129" itemName="" itemText="spare"/>
 		</collection>
-		<collection RegName="ResGrp" grpKey="6" text="测量结果" description="">
+		<collection RegName="ResGrp" grpKey="7" text="测量结果" description="">
 
         <member itemKey="20030" itemName="" itemText="搜索x-ray精度"/>
         <member itemKey="20031" itemName="" itemText="最小计数率"/>
@@ -119,8 +198,28 @@
         <member itemKey="20061" itemName="" itemText="检测面积（平方微米）"/>
         <member itemKey="20062" itemName="" itemText="颗粒数"/>
         <member itemKey="20063" itemName="" itemText="颗粒面积（平方微米）"/>
+        <member itemKey="20064" itemName="" itemText="spare"/>
+        <member itemKey="20065" itemName="" itemText="spare"/>
+        <member itemKey="20066" itemName="" itemText="spare"/>
+        <member itemKey="20067" itemName="" itemText="spare"/>
+        <member itemKey="20068" itemName="" itemText="spare"/>
+        <member itemKey="20069" itemName="" itemText="spare"/>
 
-
+        
+        
+        
+       
+        
+        <member itemKey="20130" itemName="" itemText="比率。"/>
+        <member itemKey="20131" itemName="" itemText="检测面积。"/>
+        <member itemKey="20132" itemName="" itemText="分析颗粒数。"/>
+        <member itemKey="20133" itemName="" itemText="分析颗粒面积。"/>
+        <member itemKey="20134" itemName="" itemText="spare"/>
+        <member itemKey="20135" itemName="" itemText="spare"/>
+        <member itemKey="20136" itemName="" itemText="spare"/>
+        <member itemKey="20137" itemName="" itemText="spare"/>
+        <member itemKey="20138" itemName="" itemText="spare"/>
+        <member itemKey="20139" itemName="" itemText="spare"/>
         <member itemKey="20140" itemName="" itemText="常规参数"/>
         <member itemKey="20141" itemName="" itemText="图像扫描参数"/>
         <member itemKey="20142" itemName="" itemText="图像处理参数"/>
@@ -136,8 +235,41 @@
         <member itemKey="20152" itemName="" itemText="测量中断"/>
         <member itemKey="20153" itemName="" itemText="测量失败"/>
         <member itemKey="20154" itemName="" itemText="测量完成"/>
-
-
+        <member itemKey="20155" itemName="" itemText="spare"/>
+        <member itemKey="20156" itemName="" itemText="spare"/>
+        <member itemKey="20157" itemName="" itemText="spare"/>
+        <member itemKey="20158" itemName="" itemText="spare"/>
+        <member itemKey="20159" itemName="" itemText="spare"/>
+        <member itemKey="20160" itemName="" itemText="中心"/>
+        <member itemKey="20161" itemName="" itemText="自上而下"/>
+        <member itemKey="20162" itemName="" itemText="自下而上"/>
+        <member itemKey="20163" itemName="" itemText="随机"/>
+        <member itemKey="20164" itemName="" itemText="spare"/>
+        <member itemKey="20165" itemName="" itemText="spare"/>
+        <member itemKey="20166" itemName="" itemText="spare"/>
+        <member itemKey="20167" itemName="" itemText="spare"/>
+        <member itemKey="20168" itemName="" itemText="spare"/>
+        <member itemKey="20169" itemName="" itemText="spare"/>
+        <member itemKey="20170" itemName="" itemText="覆盖测量区域"/>
+        <member itemKey="20171" itemName="" itemText="帧图数"/>
+        <member itemKey="20172" itemName="" itemText="颗粒数"/>
+        <member itemKey="20173" itemName="" itemText="时间"/>
+        <member itemKey="20174" itemName="" itemText="spare"/>
+        <member itemKey="20175" itemName="" itemText="spare"/>
+        <member itemKey="20176" itemName="" itemText="spare"/>
+        <member itemKey="20177" itemName="" itemText="spare"/>
+        <member itemKey="20178" itemName="" itemText="是"/>
+        <member itemKey="20179" itemName="" itemText="否"/>
+        <member itemKey="20180" itemName="" itemText="低"/>
+        <member itemKey="20181" itemName="" itemText="中"/>
+        <member itemKey="20182" itemName="" itemText="高"/>
+        <member itemKey="20183" itemName="" itemText="spare"/>
+        <member itemKey="20184" itemName="" itemText="spare"/>
+        <member itemKey="20185" itemName="" itemText="点扫描"/>
+        <member itemKey="20186" itemName="" itemText="面扫描"/>
+        <member itemKey="20187" itemName="" itemText="spare"/>
+        <member itemKey="20188" itemName="" itemText="spare"/>
+        <member itemKey="20189" itemName="" itemText="spare"/>
         <member itemKey="20190" itemName="" itemText="测量结果数据"/>
         <member itemKey="20191" itemName="" itemText="数据类型"/>
         <member itemKey="20192" itemName="" itemText="测量图类型"/>

OTSCommon/Model/ResultFile.cs

@@ -55,7 +55,7 @@ namespace OTSCommon.Model
         {
             var Systype = ((Dictionary<string, object>)((Dictionary<string, object>)((Dictionary<string, object>)(Dictionary<string, object>)this.ResultInfo["Sample"])["Members"])["MsrParams"])["SysType"];
 
-            return (OTS_SysType_ID)Systype;
+            return (OTS_SysType_ID)(Convert.ToInt32( Systype.ToString().Split(':')[0]));
         }
     }
 

OTSIncAMeasureApp/0-OTSModel/Measure/3-MeasureFlow/CSmplMeasure.cs

@@ -274,8 +274,7 @@ namespace OTSModelSharp
             COTSImageProcParam pImgProcParam = pMsrParam.GetImageProcessParam();
             CSEMDataMsr poSEMDataMsr = m_Sample.GetSEMDataMsr();
             CMsrSampleStatus pStatus = m_Sample.GetMsrStatus();
-            //CSEMDataMsr poSEMDataMsr = sample.GetSEMDataMsr();
-            //CMsrSampleStatus pStatus = sample.GetMsrStatus();
+
 
             // measured field centers list
             List<System.Drawing.PointF> listCompletedCenter = pStatus.GetCompletedFieldsCenter();

OTSIncAMeasureApp/5-OTSMeasureStatuImageFun/OTSMeasureStatusWindow.cs

@@ -309,13 +309,13 @@ namespace OTSMeasureApp
                     switch (level)
                     {
                         case 0:
-                            nDwellTime = 4;
+                            nDwellTime = 2;
                             break;
                         case 1:
-                            nDwellTime = 8;
+                            nDwellTime = 4;
                             break;
                         case 2:
-                            nDwellTime = 16;
+                            nDwellTime = 8;
                             break;
                     }
                 }
@@ -394,7 +394,7 @@ namespace OTSMeasureApp
                 return GrayLevelData;
            
         }
-        public bool GetScanImage(int iWidth, int iHeigh, int iDwellTime, ref byte[] bImageData)
+        public bool GetScanImage(int iWidth, int iHeight, int iDwellTime, ref byte[] bImageData)
         {
 
             //电镜设置对象
@@ -412,7 +412,7 @@ namespace OTSMeasureApp
                     }
               
 
-                    cfun.SetImageSize(width, height);
+                    cfun.SetImageSize(iWidth, iHeight);
                     cfun.SetDwellTime(iDwellTime);
 
                     var bse = cfun.AcquireBSEImage( );

OTSIncAReportApp/1-UI/frmReMeasure.Designer.cs

@@ -95,7 +95,7 @@ namespace OTSIncAReportApp
             this.tableLayoutPanel1.Controls.Add(this.LB_IMGSCANSPEED, 0, 0);
             this.tableLayoutPanel1.Controls.Add(this.IDC_COMBO_IMGSCANSPEED, 1, 0);
             this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tableLayoutPanel1.Location = new System.Drawing.Point(3, 17);
+            this.tableLayoutPanel1.Location = new System.Drawing.Point(3, 16);
             this.tableLayoutPanel1.Name = "tableLayoutPanel1";
             this.tableLayoutPanel1.RowCount = 6;
             this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 16.66667F));
@@ -104,24 +104,24 @@ namespace OTSIncAReportApp
             this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 16.66667F));
             this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 16.66667F));
             this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 16.66667F));
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
-            this.tableLayoutPanel1.Size = new System.Drawing.Size(239, 145);
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 22F));
+            this.tableLayoutPanel1.Size = new System.Drawing.Size(239, 160);
             this.tableLayoutPanel1.TabIndex = 0;
             // 
             // LB_SCANTIME
             // 
             this.LB_SCANTIME.Anchor = System.Windows.Forms.AnchorStyles.None;
             this.LB_SCANTIME.AutoSize = true;
-            this.LB_SCANTIME.Location = new System.Drawing.Point(5, 54);
+            this.LB_SCANTIME.Location = new System.Drawing.Point(4, 58);
             this.LB_SCANTIME.Name = "LB_SCANTIME";
-            this.LB_SCANTIME.Size = new System.Drawing.Size(137, 12);
+            this.LB_SCANTIME.Size = new System.Drawing.Size(139, 13);
             this.LB_SCANTIME.TabIndex = 0;
             this.LB_SCANTIME.Text = "能谱扫描时间（毫秒）：";
             // 
             // NUD_SCANTIME
             // 
             this.NUD_SCANTIME.Anchor = System.Windows.Forms.AnchorStyles.None;
-            this.NUD_SCANTIME.Location = new System.Drawing.Point(150, 51);
+            this.NUD_SCANTIME.Location = new System.Drawing.Point(150, 55);
             this.NUD_SCANTIME.Maximum = new decimal(new int[] {
             1000000,
             0,
@@ -133,7 +133,7 @@ namespace OTSIncAReportApp
             0,
             0});
             this.NUD_SCANTIME.Name = "NUD_SCANTIME";
-            this.NUD_SCANTIME.Size = new System.Drawing.Size(85, 21);
+            this.NUD_SCANTIME.Size = new System.Drawing.Size(85, 20);
             this.NUD_SCANTIME.TabIndex = 2;
             this.NUD_SCANTIME.Value = new decimal(new int[] {
             1000,
@@ -145,9 +145,9 @@ namespace OTSIncAReportApp
             // 
             this.LB_HAND.Anchor = System.Windows.Forms.AnchorStyles.None;
             this.LB_HAND.AutoSize = true;
-            this.LB_HAND.Location = new System.Drawing.Point(41, 126);
+            this.LB_HAND.Location = new System.Drawing.Point(40, 138);
             this.LB_HAND.Name = "LB_HAND";
-            this.LB_HAND.Size = new System.Drawing.Size(65, 12);
+            this.LB_HAND.Size = new System.Drawing.Size(67, 13);
             this.LB_HAND.TabIndex = 0;
             this.LB_HAND.Text = "手动处理：";
             // 
@@ -157,7 +157,7 @@ namespace OTSIncAReportApp
             this.CB_HAND.AutoSize = true;
             this.CB_HAND.Checked = true;
             this.CB_HAND.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.CB_HAND.Location = new System.Drawing.Point(185, 125);
+            this.CB_HAND.Location = new System.Drawing.Point(185, 138);
             this.CB_HAND.Name = "CB_HAND";
             this.CB_HAND.Size = new System.Drawing.Size(15, 14);
             this.CB_HAND.TabIndex = 6;
@@ -167,9 +167,9 @@ namespace OTSIncAReportApp
             // 
             this.LB_partFun.Anchor = System.Windows.Forms.AnchorStyles.None;
             this.LB_partFun.AutoSize = true;
-            this.LB_partFun.Location = new System.Drawing.Point(29, 102);
+            this.LB_partFun.Location = new System.Drawing.Point(28, 110);
             this.LB_partFun.Name = "LB_partFun";
-            this.LB_partFun.Size = new System.Drawing.Size(89, 12);
+            this.LB_partFun.Size = new System.Drawing.Size(91, 13);
             this.LB_partFun.TabIndex = 0;
             this.LB_partFun.Text = "颗粒提取方法：";
             // 
@@ -181,18 +181,18 @@ namespace OTSIncAReportApp
             this.CB_partFun.Items.AddRange(new object[] {
             "方法一",
             "方法二"});
-            this.CB_partFun.Location = new System.Drawing.Point(150, 99);
+            this.CB_partFun.Location = new System.Drawing.Point(150, 107);
             this.CB_partFun.Name = "CB_partFun";
-            this.CB_partFun.Size = new System.Drawing.Size(85, 20);
+            this.CB_partFun.Size = new System.Drawing.Size(85, 21);
             this.CB_partFun.TabIndex = 3;
             // 
             // LB_XRAYSCANMODE
             // 
             this.LB_XRAYSCANMODE.Anchor = System.Windows.Forms.AnchorStyles.None;
             this.LB_XRAYSCANMODE.AutoSize = true;
-            this.LB_XRAYSCANMODE.Location = new System.Drawing.Point(29, 78);
+            this.LB_XRAYSCANMODE.Location = new System.Drawing.Point(28, 84);
             this.LB_XRAYSCANMODE.Name = "LB_XRAYSCANMODE";
-            this.LB_XRAYSCANMODE.Size = new System.Drawing.Size(89, 12);
+            this.LB_XRAYSCANMODE.Size = new System.Drawing.Size(91, 13);
             this.LB_XRAYSCANMODE.TabIndex = 0;
             this.LB_XRAYSCANMODE.Text = "颗粒扫描方式：";
             // 
@@ -201,27 +201,27 @@ namespace OTSIncAReportApp
             this.IDC_COMBO_XRAYSCANMODE.Anchor = System.Windows.Forms.AnchorStyles.None;
             this.IDC_COMBO_XRAYSCANMODE.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.IDC_COMBO_XRAYSCANMODE.FormattingEnabled = true;
-            this.IDC_COMBO_XRAYSCANMODE.Location = new System.Drawing.Point(150, 75);
+            this.IDC_COMBO_XRAYSCANMODE.Location = new System.Drawing.Point(150, 81);
             this.IDC_COMBO_XRAYSCANMODE.Name = "IDC_COMBO_XRAYSCANMODE";
-            this.IDC_COMBO_XRAYSCANMODE.Size = new System.Drawing.Size(85, 20);
+            this.IDC_COMBO_XRAYSCANMODE.Size = new System.Drawing.Size(85, 21);
             this.IDC_COMBO_XRAYSCANMODE.TabIndex = 3;
             // 
             // LB_Outspread
             // 
             this.LB_Outspread.Anchor = System.Windows.Forms.AnchorStyles.None;
             this.LB_Outspread.AutoSize = true;
-            this.LB_Outspread.Location = new System.Drawing.Point(23, 30);
+            this.LB_Outspread.Location = new System.Drawing.Point(22, 32);
             this.LB_Outspread.Name = "LB_Outspread";
-            this.LB_Outspread.Size = new System.Drawing.Size(101, 12);
+            this.LB_Outspread.Size = new System.Drawing.Size(103, 13);
             this.LB_Outspread.TabIndex = 0;
             this.LB_Outspread.Text = "图像外扩像数值：";
             // 
             // NUD_Outspread
             // 
             this.NUD_Outspread.Anchor = System.Windows.Forms.AnchorStyles.None;
-            this.NUD_Outspread.Location = new System.Drawing.Point(150, 27);
+            this.NUD_Outspread.Location = new System.Drawing.Point(150, 29);
             this.NUD_Outspread.Name = "NUD_Outspread";
-            this.NUD_Outspread.Size = new System.Drawing.Size(85, 21);
+            this.NUD_Outspread.Size = new System.Drawing.Size(85, 20);
             this.NUD_Outspread.TabIndex = 2;
             this.NUD_Outspread.Value = new decimal(new int[] {
             50,
@@ -233,9 +233,9 @@ namespace OTSIncAReportApp
             // 
             this.LB_IMGSCANSPEED.Anchor = System.Windows.Forms.AnchorStyles.None;
             this.LB_IMGSCANSPEED.AutoSize = true;
-            this.LB_IMGSCANSPEED.Location = new System.Drawing.Point(29, 6);
+            this.LB_IMGSCANSPEED.Location = new System.Drawing.Point(28, 6);
             this.LB_IMGSCANSPEED.Name = "LB_IMGSCANSPEED";
-            this.LB_IMGSCANSPEED.Size = new System.Drawing.Size(89, 12);
+            this.LB_IMGSCANSPEED.Size = new System.Drawing.Size(91, 13);
             this.LB_IMGSCANSPEED.TabIndex = 0;
             this.LB_IMGSCANSPEED.Text = "图像扫描精度：";
             // 
@@ -246,15 +246,15 @@ namespace OTSIncAReportApp
             this.IDC_COMBO_IMGSCANSPEED.FormattingEnabled = true;
             this.IDC_COMBO_IMGSCANSPEED.Location = new System.Drawing.Point(150, 3);
             this.IDC_COMBO_IMGSCANSPEED.Name = "IDC_COMBO_IMGSCANSPEED";
-            this.IDC_COMBO_IMGSCANSPEED.Size = new System.Drawing.Size(85, 20);
+            this.IDC_COMBO_IMGSCANSPEED.Size = new System.Drawing.Size(85, 21);
             this.IDC_COMBO_IMGSCANSPEED.TabIndex = 3;
             // 
             // groupBox_img
             // 
             this.groupBox_img.Controls.Add(this.pictureBox_part);
-            this.groupBox_img.Location = new System.Drawing.Point(2, 239);
+            this.groupBox_img.Location = new System.Drawing.Point(2, 259);
             this.groupBox_img.Name = "groupBox_img";
-            this.groupBox_img.Size = new System.Drawing.Size(468, 439);
+            this.groupBox_img.Size = new System.Drawing.Size(468, 476);
             this.groupBox_img.TabIndex = 1;
             this.groupBox_img.TabStop = false;
             this.groupBox_img.Text = "颗粒图片";
@@ -262,9 +262,9 @@ namespace OTSIncAReportApp
             // pictureBox_part
             // 
             this.pictureBox_part.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.pictureBox_part.Location = new System.Drawing.Point(3, 17);
+            this.pictureBox_part.Location = new System.Drawing.Point(3, 16);
             this.pictureBox_part.Name = "pictureBox_part";
-            this.pictureBox_part.Size = new System.Drawing.Size(462, 419);
+            this.pictureBox_part.Size = new System.Drawing.Size(462, 457);
             this.pictureBox_part.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
             this.pictureBox_part.TabIndex = 0;
             this.pictureBox_part.TabStop = false;
@@ -284,16 +284,16 @@ namespace OTSIncAReportApp
             this.richTextBox_process.Location = new System.Drawing.Point(3, 3);
             this.richTextBox_process.Name = "richTextBox_process";
             this.richTextBox_process.ReadOnly = true;
-            this.richTextBox_process.Size = new System.Drawing.Size(353, 181);
+            this.richTextBox_process.Size = new System.Drawing.Size(353, 199);
             this.richTextBox_process.TabIndex = 4;
             this.richTextBox_process.Text = "";
             // 
             // groupBox_state
             // 
             this.groupBox_state.Controls.Add(this.tableLayoutPanel2);
-            this.groupBox_state.Location = new System.Drawing.Point(721, 471);
+            this.groupBox_state.Location = new System.Drawing.Point(721, 510);
             this.groupBox_state.Name = "groupBox_state";
-            this.groupBox_state.Size = new System.Drawing.Size(365, 207);
+            this.groupBox_state.Size = new System.Drawing.Size(365, 224);
             this.groupBox_state.TabIndex = 5;
             this.groupBox_state.TabStop = false;
             this.groupBox_state.Text = "测量状态";
@@ -305,19 +305,19 @@ namespace OTSIncAReportApp
             this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F));
             this.tableLayoutPanel2.Controls.Add(this.richTextBox_process, 0, 0);
             this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tableLayoutPanel2.Location = new System.Drawing.Point(3, 17);
+            this.tableLayoutPanel2.Location = new System.Drawing.Point(3, 16);
             this.tableLayoutPanel2.Name = "tableLayoutPanel2";
             this.tableLayoutPanel2.RowCount = 1;
             this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
-            this.tableLayoutPanel2.Size = new System.Drawing.Size(359, 187);
+            this.tableLayoutPanel2.Size = new System.Drawing.Size(359, 205);
             this.tableLayoutPanel2.TabIndex = 1;
             // 
             // groupBox_param
             // 
             this.groupBox_param.Controls.Add(this.tableLayoutPanel1);
-            this.groupBox_param.Location = new System.Drawing.Point(473, 471);
+            this.groupBox_param.Location = new System.Drawing.Point(473, 510);
             this.groupBox_param.Name = "groupBox_param";
-            this.groupBox_param.Size = new System.Drawing.Size(245, 165);
+            this.groupBox_param.Size = new System.Drawing.Size(245, 179);
             this.groupBox_param.TabIndex = 6;
             this.groupBox_param.TabStop = false;
             this.groupBox_param.Text = "测量参数";
@@ -327,7 +327,7 @@ namespace OTSIncAReportApp
             this.BTN_NO.Anchor = System.Windows.Forms.AnchorStyles.None;
             this.BTN_NO.Location = new System.Drawing.Point(86, 4);
             this.BTN_NO.Name = "BTN_NO";
-            this.BTN_NO.Size = new System.Drawing.Size(70, 31);
+            this.BTN_NO.Size = new System.Drawing.Size(70, 34);
             this.BTN_NO.TabIndex = 1;
             this.BTN_NO.Text = "停止";
             this.BTN_NO.UseVisualStyleBackColor = true;
@@ -338,7 +338,7 @@ namespace OTSIncAReportApp
             this.BTN_YES.Anchor = System.Windows.Forms.AnchorStyles.None;
             this.BTN_YES.Location = new System.Drawing.Point(168, 4);
             this.BTN_YES.Name = "BTN_YES";
-            this.BTN_YES.Size = new System.Drawing.Size(70, 31);
+            this.BTN_YES.Size = new System.Drawing.Size(70, 34);
             this.BTN_YES.TabIndex = 1;
             this.BTN_YES.Text = "开始采集";
             this.BTN_YES.UseVisualStyleBackColor = true;
@@ -353,11 +353,11 @@ namespace OTSIncAReportApp
             this.tableLayoutPanel3.Controls.Add(this.BTN_YES, 2, 0);
             this.tableLayoutPanel3.Controls.Add(this.BTN_NO, 1, 0);
             this.tableLayoutPanel3.Controls.Add(this.BTN_EXPORT, 0, 0);
-            this.tableLayoutPanel3.Location = new System.Drawing.Point(473, 639);
+            this.tableLayoutPanel3.Location = new System.Drawing.Point(473, 692);
             this.tableLayoutPanel3.Name = "tableLayoutPanel3";
             this.tableLayoutPanel3.RowCount = 1;
             this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
-            this.tableLayoutPanel3.Size = new System.Drawing.Size(245, 39);
+            this.tableLayoutPanel3.Size = new System.Drawing.Size(245, 42);
             this.tableLayoutPanel3.TabIndex = 4;
             // 
             // BTN_EXPORT
@@ -365,7 +365,7 @@ namespace OTSIncAReportApp
             this.BTN_EXPORT.Anchor = System.Windows.Forms.AnchorStyles.None;
             this.BTN_EXPORT.Location = new System.Drawing.Point(5, 4);
             this.BTN_EXPORT.Name = "BTN_EXPORT";
-            this.BTN_EXPORT.Size = new System.Drawing.Size(70, 31);
+            this.BTN_EXPORT.Size = new System.Drawing.Size(70, 34);
             this.BTN_EXPORT.TabIndex = 1;
             this.BTN_EXPORT.Text = "导出";
             this.BTN_EXPORT.UseVisualStyleBackColor = true;
@@ -373,9 +373,9 @@ namespace OTSIncAReportApp
             // 
             // groupBox2
             // 
-            this.groupBox2.Location = new System.Drawing.Point(471, 239);
+            this.groupBox2.Location = new System.Drawing.Point(471, 259);
             this.groupBox2.Name = "groupBox2";
-            this.groupBox2.Size = new System.Drawing.Size(618, 226);
+            this.groupBox2.Size = new System.Drawing.Size(618, 245);
             this.groupBox2.TabIndex = 9;
             this.groupBox2.TabStop = false;
             this.groupBox2.Text = "能谱结果";
@@ -387,7 +387,7 @@ namespace OTSIncAReportApp
             this.tabControl_grid.Location = new System.Drawing.Point(5, 3);
             this.tabControl_grid.Name = "tabControl_grid";
             this.tabControl_grid.SelectedIndex = 0;
-            this.tabControl_grid.Size = new System.Drawing.Size(1084, 230);
+            this.tabControl_grid.Size = new System.Drawing.Size(1084, 249);
             this.tabControl_grid.TabIndex = 0;
             // 
             // tabPage1
@@ -396,7 +396,7 @@ namespace OTSIncAReportApp
             this.tabPage1.Location = new System.Drawing.Point(4, 22);
             this.tabPage1.Name = "tabPage1";
             this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
-            this.tabPage1.Size = new System.Drawing.Size(1076, 204);
+            this.tabPage1.Size = new System.Drawing.Size(1076, 223);
             this.tabPage1.TabIndex = 0;
             this.tabPage1.Text = "待测颗粒";
             this.tabPage1.UseVisualStyleBackColor = true;
@@ -414,7 +414,7 @@ namespace OTSIncAReportApp
             this.dgV_ParticlesDevidePage.RowHeadersWidth = 4;
             this.dgV_ParticlesDevidePage.RowTemplate.Height = 23;
             this.dgV_ParticlesDevidePage.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-            this.dgV_ParticlesDevidePage.Size = new System.Drawing.Size(1070, 198);
+            this.dgV_ParticlesDevidePage.Size = new System.Drawing.Size(1070, 217);
             this.dgV_ParticlesDevidePage.TabIndex = 8;
             this.dgV_ParticlesDevidePage.CellMouseClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dgV_ParticlesDevidePage_CellMouseClick);
             this.dgV_ParticlesDevidePage.ColumnHeaderMouseClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dgV_ParticlesDevidePage_ColumnHeaderMouseClick);
@@ -425,7 +425,7 @@ namespace OTSIncAReportApp
             this.tabPage2.Location = new System.Drawing.Point(4, 22);
             this.tabPage2.Name = "tabPage2";
             this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
-            this.tabPage2.Size = new System.Drawing.Size(1076, 204);
+            this.tabPage2.Size = new System.Drawing.Size(1076, 223);
             this.tabPage2.TabIndex = 1;
             this.tabPage2.Text = "已测颗粒";
             this.tabPage2.UseVisualStyleBackColor = true;
@@ -443,15 +443,15 @@ namespace OTSIncAReportApp
             this.dataGridView_success.RowHeadersWidth = 4;
             this.dataGridView_success.RowTemplate.Height = 23;
             this.dataGridView_success.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-            this.dataGridView_success.Size = new System.Drawing.Size(1070, 198);
+            this.dataGridView_success.Size = new System.Drawing.Size(1070, 217);
             this.dataGridView_success.TabIndex = 9;
             this.dataGridView_success.CellMouseClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dataGridView_success_CellMouseClick);
             // 
             // frmReMeasure
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1092, 681);
+            this.ClientSize = new System.Drawing.Size(1092, 738);
             this.Controls.Add(this.tabControl_grid);
             this.Controls.Add(this.groupBox2);
             this.Controls.Add(this.groupBox_param);
@@ -459,9 +459,9 @@ namespace OTSIncAReportApp
             this.Controls.Add(this.groupBox_img);
             this.Controls.Add(this.tableLayoutPanel3);
             this.MaximizeBox = false;
-            this.MaximumSize = new System.Drawing.Size(1108, 720);
+            this.MaximumSize = new System.Drawing.Size(1108, 777);
             this.MinimizeBox = false;
-            this.MinimumSize = new System.Drawing.Size(1108, 720);
+            this.MinimumSize = new System.Drawing.Size(1108, 777);
             this.Name = "frmReMeasure";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "二次采集";