fix bugs in DoHolePreview measure as well as the bugs in the report program.

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

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

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

@@ -142,6 +142,8 @@
       <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" />
@@ -1089,6 +1091,7 @@
 	  <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" />
@@ -1103,6 +1106,7 @@
 	  <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" />
@@ -1472,6 +1476,7 @@
 	  <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" />
@@ -1703,4 +1708,60 @@
 	  <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,6 +142,8 @@
       <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="矩形" />
@@ -1067,6 +1069,7 @@
 	  <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="实验室" />
@@ -1081,6 +1084,7 @@
 	  <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="特殊灰度颗粒识别设置" />
@@ -1414,6 +1418,7 @@
 	  <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="条记录，每页" />
@@ -1685,6 +1690,62 @@
 	  <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,62 +8,34 @@
 			<member itemKey="20003" itemName="" itemText="ConfigurationFileName"/>
 			<member itemKey="20004" itemName="" itemText="AnalysisSTDLib"/>
 			<member itemKey="20005" itemName="" itemText="MembraneType"/>
-			<member itemKey="20006" itemName="" itemText="SteelTechnology"/>
+			<member itemKey="20006" itemName="" itemText="SteelTechnology" comboContent="General Method,Calcium Treatment,Magnesium Treatment,Rare Earth Treatment"/>
 			<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"/>
+			<member itemKey="20010" itemName="" itemText="GetImageMode" comboContent="Center,FromTopToBottom(Meander),FromBottomToTop(Meander)"/>
 			<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"/>
-			<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="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="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" description=""/>		
-			<member itemKey="20027" itemName="" itemText="Auto Mode" 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="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)"/>
@@ -72,56 +44,21 @@
 			<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="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="20032" itemName="" itemText="Big x-ray(ms)"/>
+			<member itemKey="20033" itemName="" itemText="ScanMode" comboContent="Spot Scan,Plane Scan" />
 			<member itemKey="20034" itemName="" itemText="ExpectCounts"/>
-			<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="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="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="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="">
+
+       <collection RegName="ResGrp" grpKey="4" text="SEMParameter" description="">
 			<member itemKey="20040" itemName="" itemText="Magnification"/>
 			<member itemKey="20041" itemName="" itemText="PixcelSize(um)"/>
 			<member itemKey="20042" itemName="" itemText="WorkingDistance(mm)"/>
@@ -139,7 +76,7 @@
         <member itemKey="20118" itemName="" itemText="spare"/>
         <member itemKey="20119" itemName="" itemText="spare"/>
 		</collection>
-       <collection RegName="ResGrp" grpKey="6" text="MeasureState" description="">
+       <collection RegName="ResGrp" grpKey="5" text="MeasureState" description="">
 			<member itemKey="20050" itemName="" itemText="MeasureState"/>
 			<member itemKey="20051" itemName="" itemText="MeasureStartTime"/>
 			<member itemKey="20052" itemName="" itemText="MeasureUsingTime"/>
@@ -157,7 +94,7 @@
         <member itemKey="20128" itemName="" itemText="spare"/>
         <member itemKey="20129" itemName="" itemText="spare"/>
 		</collection>
-		<collection RegName="ResGrp" grpKey="7" text="MeasureResult" description="">
+		<collection RegName="ResGrp" grpKey="6" 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,160 +7,81 @@
 			<member itemKey="20002" itemName="" itemText="执行开关" description="选择则样品会在执行样品测量时进行样品测量，否则将不会。"/>
 			<member itemKey="20003" itemName="" itemText="设定参数文件名" description="选择测量参数文件。"/>
 			<member itemKey="20004" itemName="" itemText="分析标准库名" description="选择颗粒分析标准库。"/>
-			<member itemKey="20005" itemName="" itemText="滤膜类型" description="选择滤膜类型"/>
-			<member itemKey="20006" itemName="" itemText="精炼工艺"/>
+			<member itemKey="20005" itemName="" itemText="滤膜类型" comboContent="" description="选择滤膜类型"/>
+			<member itemKey="20006" itemName="" itemText="精炼工艺" comboContent="通用方法,钙处理,镁处理,稀土处理" />
 			<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="取图方式" description="选择从测量区域中心开始取图，或自上而下、自下而上取图，或随机取图。"/>
+			<member itemKey="20010" itemName="" itemText="取图方式" comboContent="中心,自上而下,自下而上" 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="扫描精度" 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="20016" itemName="" itemText="扫描精度" comboContent="低,中,高" description="选择扫描精度。"/>
+			<member itemKey="20017" itemName="" itemText="测量图精度" comboContent="512X384,1024X684,1024X704,1024X768,1536X1024,2048X1408,2048X1536,3072X2048,4096X3072"  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="背景处理方式" 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="20026" itemName="" itemText="背景处理方式" comboContent="自动方式,手动方式" description=""/>		
+			<member itemKey="20027" itemName="" itemText="自动方式" comboContent="取中,向下,向上" description=""/>
+			<member itemKey="20028" 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="扫描方式（大颗粒）" description="选择分析x-ray扫描方式。"/>
+			<member itemKey="20033" itemName="" itemText="扫描方式（大颗粒）" comboContent="点扫描,面扫描" 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" description="检测过程中是否对颗粒进行X-ray采集"/>
+			<member itemKey="20038" itemName="" itemText="是否采集X-ray" comboContent="是,否" 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="选择帧图扫描结束模式">
-			<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="">
+
+       <collection RegName="ResGrp" grpKey="4" 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="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"/>
+			<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="测量区域的面积（平方毫米）。"/>
+
 		</collection>
-       <collection RegName="ResGrp" grpKey="6" text="测量状态" description="">
+       <collection RegName="ResGrp" grpKey="5" 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="7" text="测量结果" description="">
+		<collection RegName="ResGrp" grpKey="6" text="测量结果" description="">
 
         <member itemKey="20030" itemName="" itemText="搜索x-ray精度"/>
         <member itemKey="20031" itemName="" itemText="最小计数率"/>
@@ -198,28 +119,8 @@
         <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="图像处理参数"/>
@@ -235,41 +136,8 @@
         <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="测量图类型"/>

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

@@ -64,7 +64,7 @@ namespace OTSModelSharp
 
         public struct RBSEDATA
         {
-
+            public int fieldId;
             public System.Drawing.Point pos;
             public int iBSEDataHeight;
             public int iBSEDataWidth;
@@ -455,10 +455,9 @@ namespace OTSModelSharp
 
 
             COTSSample pSampleHole = CreateHoleSample(a_pMeasureArea);
-            var sample = m_pProjData.GetWorkingSample();
-
+        
             // create a sample measure object for the sample
-            CSmplMeasure pSmplMeasure = new CSmplMeasure(m_strWorkingFolder, sample);
+            CSmplMeasure pSmplMeasure = new CSmplMeasure(m_strWorkingFolder, pSampleHole);
 
           
             // set measure thread
@@ -466,7 +465,7 @@ namespace OTSModelSharp
 
             // update thread measure status class, let the main thread know that this sample measurement starts
             // set working folder string
-            pSmplMeasure.SetSample(sample);
+            pSmplMeasure.SetSample(pSampleHole);
             pSmplMeasure.SetHolePreviewSample(pSampleHole);
             pSmplMeasure.SetWorkingFolder(m_strWorkingFolder);
 

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

@@ -272,8 +272,8 @@ namespace OTSModelSharp
             CSampleParam pMsrParam = sample.GetMsrParams();
             COTSImgScanPrm poImageScanParam = pMsrParam.GetImageScanParam();
             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
@@ -1228,7 +1228,8 @@ namespace OTSModelSharp
                     MsgFieldBSE.iMsgType = ENUM_MSG_TYPE.MSAMPLERESULT;
                     MsgFieldBSE.STMSampleRetData.iRetDataType = MSAMPLE_RET.BSE_DATA;
                     MsgFieldBSE.STMSampleRetData.BSEData.pos = poiFieldCentre;
-                 
+                    MsgFieldBSE.STMSampleRetData.BSEData.fieldId = i;
+
                     MsgFieldBSE.STMSampleRetData.BSEData.iBSEDataHeight = pBSEIamge.GetHeight();
                     MsgFieldBSE.STMSampleRetData.BSEData.iBSEDataWidth = pBSEIamge.GetWidth();
                     byte[] pImgData = pBSEIamge.GetImageDataPtr();

OTSIncAMeasureApp/1-OTSMeasure/OTSMeasureDisplayResult.cs

@@ -340,19 +340,7 @@ namespace OTSMeasureApp
 
        
 
-        #region 设置样品孔中BSE图像信息
-        /// <summary>
-        /// 设置样品孔中BSE图像信息
-        /// </summary>
-        /// <param name="ImageData">获取显示BSE的图片数据</param>
-        /// <param name="width">图片宽度</param>
-        /// <param name="height">图片高度</param>
-        /// <param name="fieldPos">Field位置</param>
-        public void SetHoleBSEImageData(byte[] ImageData, int width, int height, Point fieldPos)
-        {
-            m_MeasureApp.m_SamplepaceWindow.AddHoleBSEImageData(ImageData, width, height, fieldPos);
-        }
-        #endregion
+
 
         #region 测量方法
         //运行测量状态方法
@@ -540,8 +528,9 @@ namespace OTSMeasureApp
                                     int height = SMsrData.STMSampleRetData.BSEData.iBSEDataHeight;
                                     //Field位置
                                     Point fieldPos = SMsrData.STMSampleRetData.BSEData.pos;
+                                    int fieldid= SMsrData.STMSampleRetData.BSEData.fieldId;
                                     //设置样品孔中BSE图像信息
-                                    SetHoleBSEImageData(ImageData, width, height, fieldPos);
+                                    m_MeasureApp.m_SamplepaceWindow.AddHoleBSEImageData(ImageData, width, height, fieldPos,fieldid);
                                 }
                                 break;
                             case MSAMPLE_RET.FIELD_DATA:

OTSIncAMeasureApp/4-OTSSamplespaceGraphicsPanel/OTSSamplespaceWindow.cs

@@ -3007,7 +3007,7 @@ namespace OTSMeasureApp
         #endregion
 
         #region 添加样品孔中BSE图像信息
-        public void AddHoleBSEImageData(byte[] ImageData, int width, int height, Point fieldPos)
+        public void AddHoleBSEImageData(byte[] ImageData, int width, int height, Point fieldPos,int fieldId)
         {
          
             CRectangleGDIObject itemWorkSample;
@@ -3023,17 +3023,20 @@ namespace OTSMeasureApp
             {
                 for (int i = 0; i < sam.FrameOfHoleGDIObjects.Count; i++)
                 {
-                   
+
                     var ctrlPos = m_visualStage.OTSCoordToCtrlCoord(fieldPos);
+                  
                     if (sam.FrameOfHoleGDIObjects[i].IfContains(ctrlPos))
-                    { 
+                        //if (i == fieldId)
+                        {
+                           
 
-                        bseImage = CImageHandler.ToGrayBitmap(ImageData, m_iWidth, m_iHeigh);
-                        sam.FrameOfHoleGDIObjects[i].BSEImage = bseImage;
-                
-                       
-                        break;
-                    }
+                            bseImage = CImageHandler.ToGrayBitmap(ImageData, m_iWidth, m_iHeigh);
+                            sam.FrameOfHoleGDIObjects[i].BSEImage = bseImage;
+
+
+                            break;
+                        }
                 }
             }
             //显示样品孔照片
@@ -3110,10 +3113,7 @@ namespace OTSMeasureApp
             COTSSample WSample = m_MeasureAppForm.m_ProjParam.GetWorkSample();
             var stype = m_MeasureAppForm.m_ProjParam.GetDefaultParam().GetSysType();
             OTSSampleVisualPropertyInfo MeasureInfo = new OTSSampleVisualPropertyInfo(WSample,stype);
-            //if (!m_MeasureAppForm.m_ProjParam.GetWorkSamplePerameter(WSample, ref MeasureInfo))
-            //{
-            //    return;
-            //}
+       
             RectangleF measureSize = m_MeasureAppForm.m_ProjParam.CalculateMsrArea(MeasureInfo.SMeasurePara.sampleHoleName);
             //获取位置与尺寸
             MeasureInfo.SMeasurePara.MeasureRect.Location = measureSize.Location;

OTSIncAReportApp/1-UI/Control_Graph/Controls/Control_DrawDistrbutionImageAndBSE.cs

@@ -925,9 +925,8 @@ namespace OTSIncAReportGraph.Controls
                                 dp.IsMouseOver = true;
 
 
-                                Point point = CalculateParticleCenterPosition(resultFile, new Point(dp.SEMPosX, dp.SEMPosY), new Point(dp.objParticleData.PosX, dp.objParticleData.PosY));
 
-                         
+                                ShowParticleInfo(dp);
 
                                 m_ParticleSegmentation.Rectangle = dp.GetShowRect();
                             }
@@ -1220,8 +1219,6 @@ namespace OTSIncAReportGraph.Controls
 
 
 
-
-
             }
 
             Invalidate();

OTSIncAReportApp/3-ServiceCenter/DataOperation/DataAccess/ParticleData.cs

@@ -789,7 +789,11 @@ namespace OTSIncAReportApp.DataOperation.DataAccess
         public UserLibraryData(string libraryName)
         {
             NLog.Logger log = NLog.LogManager.GetCurrentClassLogger();
-            string fullPath = System.IO.Directory.GetCurrentDirectory() + "\\Config\\SysData\\" + libraryName + ".db";
+            if (!libraryName.Contains(".db"))
+            {
+                libraryName += ".db";
+            }
+            string fullPath = System.IO.Directory.GetCurrentDirectory() + "\\Config\\SysData\\" + libraryName ;
             if (System.IO.File.Exists(fullPath))
             {
                 dbHelper = new SqlHelper("data source='" + fullPath + "'");