Merge branch 'OTSMining' of http://36.129.163.148:30080/gogsadmin/OTS into OTSMining

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="OffLine" ImageInputSources="SE" />
-  <Member RegName="EDSName" Value="OffLine" />
+  <Member RegName="SemControllerName" Value="FEI" ImageInputSources="BSE" />
+  <Member RegName="EDSName" Value="FEI" />
   <Member RegName="BrukerDllVersion" Version="Bruker.API.Esprit2.2.dll" />
   <Member RegName="FEIIP" Value="192.168.0.1" />
   <Member RegName="FEIPORT" Value="7520" />

Bin/x64/Debug/Config/ProData/lj.psf

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<XMLData FileMark="626" Name="LiJi1" Sizes="0,0.5,1,2,5,30,100" Version="1.1.1" />
+<XMLData FileMark="626" Name="LiJi1" Sizes="0,2,5,10,20,30" Version="1.1.1" />

Bin/x64/Debug/Config/ProData/lj2.psf

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<XMLData FileMark="626" Name="LiJi2" Sizes="0,0.5,1,2,5,30,100" Version="1.1.1" />
+<XMLData FileMark="626" Name="LiJi2" Sizes="0.1,0.5,1,3,5,9,12,20,30,40,50,60" Version="1.1.1" />

Bin/x64/Debug/Config/SysData/OTSStage.stg

@@ -41,18 +41,5 @@
         <Member HoleName="4" rectDomian="-25000,-25000,40000,0" shape="0" />
       </Collection>
     </Member>
-    <Member strName="Axia七孔70mm">
-      <Member RegName="boundary" PolygonPoint="" rectDomian="0,0,70000,0" shape="0:ROUND" />
-      <Member RegName="std" PolygonPoint="" rectDomian="0,30000,10,0" shape="0:ROUND" />
-      <Collection RegName="Holes">
-        <Member HoleName="1" rectDomian="0,0,15000,0" shape="0" />
-        <Member HoleName="2" rectDomian="-12500,17320,15000,0" shape="0" />
-        <Member HoleName="3" rectDomian="12500,17320,15000,0" shape="0" />
-        <Member HoleName="4" rectDomian="23000,0,15000,0" shape="0" />
-        <Member HoleName="5" rectDomian="12500,-17320,15000,0" shape="0" />
-        <Member HoleName="6" rectDomian="-12500,-17320,15000,0" shape="0" />
-        <Member HoleName="7" rectDomian="-23000,0,15000,0" shape="0" />
-      </Collection>
-    </Member>
   </Collection>
 </XMLData>

Bin/x64/Debug/Resources/HTML/chartsMore.html

@@ -77,9 +77,6 @@
                 settri();
                
             }
-            if (type == '') {
-                setpie();
-            }
             setTimeout(function () {
                 var img = new Image();
                 img.src = myChart.getDataURL({

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

@@ -236,7 +236,7 @@
  <Form>
     <Name>Triangulation_List</Name>
     <Controls>
-      <Control name="Triangulation_List" text="三元图模板列表" />
+      <Control name="Triangulation_List" text="三元相图模板列表" />
 	  <Control name="button1" text="添  加" />
 	  <Control name="button2" text="返  回" />
     </Controls>
@@ -244,7 +244,7 @@
   <Form>
     <Name>Triangulation_Edit</Name>
     <Controls>
-      <Control name="Triangulation_Edit" text="三元图模板编辑" />
+      <Control name="Triangulation_Edit" text="三元相图模板编辑" />
     </Controls>
  </Form>
   <Form>
@@ -275,7 +275,7 @@
 	  <Control name="label7" text="文件夹" />
 	  <Control name="label17" text="文件" />
 	  <Control name="label5" text="文件夹" />
-	  <Control name="groupBox6" text="三元图模板设置" />
+	  <Control name="groupBox6" text="三元相图模板设置" />
 	  <Control name="groupBox7" text="颗粒分析标准库设置" />
 	  <Control name="groupBox9" text="纳入指数计算" />
 	  <Control name="label22" text="比例因子" />
@@ -330,14 +330,14 @@
 	  <Control name="lb_sjlx" text="数据类型" />
 	  <Control name="lb_ccjsff" text="尺寸计算方法" />
 	  <Control name="lb_ljb" text="粒级表" />
-	  <Control name="lb_syxtmb" text="三元图模板" />
+	  <Control name="lb_syxtmb" text="三元相图模板" />
 	  <Control name="OTSReport_Condition" text="编辑模板条件" />
     </Controls>
  </Form>
 <Form>
     <Name>OTSReport_Export</Name>
     <Controls>
-       <Control name="label2" text="当前导出进度" />
+      <Control name="label2" text="当前导出进度" />
 	  <Control name="label3" text="选择模板" />
 	  <Control name="btn_export" text="导出" />
 	  <Control name="btn_exit" text="退出" />
@@ -364,9 +364,11 @@
 	  <Control name="RictBox7" text="等待" />
 	  <Control name="RictBox8" text="加载测量结果信息表模块完成" />
 	  <Control name="RictBox9" text="加载颗粒列表模块中...." />
-	 
+	  <Control name="RictBox10" text="加载:颗粒列表" />
+	  <Control name="RictBox11" text="测量结果信息表" />
 	  <Control name="RictBox12" text="加载:" />
-	
+	  <Control name="RictBox13" text="颗粒列表" />
+	  <Control name="RictBox14" text="加载颗粒列表模块完成" />
 	  
 	  <Control name="RictBox15" text="加载平均元素含量表模块中...." />
 	  <Control name="RictBox16" text="加载:平均元素含量表" />
@@ -388,10 +390,10 @@
 	  <Control name="RictBox29" text="加载元素成份图模块完成" />
 	  <Control name="RictBox30" text="元素成份图" />
 	  
-	  <Control name="RictBox31" text="加载三元图模块中...." />
-	  <Control name="RictBox32" text="加载:三元图" />
-	  <Control name="RictBox33" text="加载三元图模块完成" />
-	  <Control name="RictBox34" text="三元图" />
+	  <Control name="RictBox31" text="加载三元相图模块中...." />
+	  <Control name="RictBox32" text="加载:三元相图" />
+	  <Control name="RictBox33" text="加载三元相图模块完成" />
+	  <Control name="RictBox34" text="三元相图" />
 	  
 	  <Control name="RictBox35" text="生成模板临时数据库文件...." />
 	  <Control name="RictBox36" text="加载:生成模板临时数据库文件" />
@@ -407,51 +409,6 @@
 	  
 	  <Control name="RictBox44" text="报告模板已打开，请先关闭！" />
 	  <Control name="RictBox45" text="提示" />
-	  
-	  
-	  
-	  <Control name="Result_information_ing" text="加载测量结果信息表模块中...." />
-	  <Control name="Load_result_information" text="加载:测量结果信息表" />
-	  <Control name="Loading_result_information_completed" text="加载测量结果信息表模块完成" />
-	  
-	  <Control name="Dimensional_analysis_table_ing" text="加载颗粒尺寸分析表模块中...." />
-	  <Control name="Loading_dimension_analysis_table" text="加载:颗粒尺寸分析表" />
-	  <Control name="Loading_dimension_analysis_table_completed" text="加载颗粒尺寸分析表模块完成" />
-	  
-	  <Control name="Element_analysis_table_ing" text="加载元素分析表模块中...." />
-	  <Control name="Load_element_analysis_table" text="加载:元素分析表" />
-	  <Control name="Loading_element_analysis_table_completed" text="加载元素分析表模块完成" />
-	  
-	  <Control name="inca_area_ratio_table_ing" text="加载夹杂物面积比表模块中...." />
-	  <Control name="Load_inca_area_ratio_table" text="加载:夹杂物面积比表" />
-	  <Control name="Loading_inca_area_ratio_table_completed" text="加载夹杂物面积比表模块完成" />
-	  
-	  <Control name="inca_area_ratio_diagram_ing" text="加载夹杂物面积比图模块中...." />
-	  <Control name="Load_inca_area_ratio_diagram" text="加载:夹杂物面积比图" />
-	  <Control name="Loading_inca_area_ratio_diagram_completed" text="加载夹杂物面积比图模块完成" />
-	  
-	  <Control name="ternary_graph_ing" text="加载三元图模块中...." />
-	  <Control name="Load_ternary_graph" text="加载:三元图" />
-	  <Control name="Loading_ternary_graph_completed" text="加载三元图模块完成" />
-	  
-	  <Control name="Particle_list_ing" text="加载颗粒列表模块中...." />
-	  <Control name="Load_particle_list" text="加载:颗粒列表" />
-	  <Control name="Loading_particle_list_completed" text="加载颗粒列表模块完成" />
-	  
-	  <Control name="Particle_list_frame_diagram_ing" text="加载颗粒帧图列表模块中...." />
-	  <Control name="Load_particle_list_frame_diagram" text="加载:颗粒帧图列表" />
-	  <Control name="Loading_Particle_list_frame_diagram_completed" text="加载颗粒帧图列表模块完成" />
-	  
-	  
-	  
-	  <Control name="Result_information" text="测量结果信息表" />
-	  <Control name="Dimensional_analysis_table" text="颗粒尺寸分析表" />
-	  <Control name="Element_analysis_table" text="元素分析表" />
-	  <Control name="inca_area_ratio_table" text="夹杂物面积比表" />
-	  <Control name="inca_area_ratio_diagram" text="夹杂物面积比图" />
-	  <Control name="ternary_graph" text="三元图" />
-	  <Control name="particle_list" text="颗粒列表" />
-	  <Control name="particle_list_frame_diagram" text="颗粒帧图列表" />
     </Controls>
  </Form>
  <Form>
@@ -495,11 +452,11 @@
 	  <Control name="label26" text="颗粒范围" />
 	  <Control name="label27" text="显示元素" />
 	  <Control name="label28" text="计算方式" />
-	  <Control name="tabPage5" text="三相图" />
-	  <Control name="groupBox7" text="三相图" />
+	  <Control name="tabPage5" text="三元相图" />
+	  <Control name="groupBox7" text="三元相图" />
 	  <Control name="label40" text="显示该模块" />
 	  <Control name="label41" text="颗粒范围" />
-	  <Control name="label33" text="三相图模板列表" />
+	  <Control name="label33" text="三元相图模板列表" />
 	  <Control name="label42" text="每行显示数量" />
 	  <Control name="label44" text="计算方式" />
 	  <Control name="tabPage6" text="颗粒列表信息" />
@@ -521,8 +478,8 @@
 	  <Control name="report4" text="线状图" />
 	  <Control name="report5" text="堆叠图" />
 	  
-	  <Control name="report10" text="三元图模板选择项需2整倍数，请重新选择！" />
-	  <Control name="report11" text="三元图模板选择项需3整倍数，请重新选择！" />
+	  <Control name="report10" text="三元相图模板选择项需2整倍数，请重新选择！" />
+	  <Control name="report11" text="三元相图模板选择项需3整倍数，请重新选择！" />
 	  <Control name="report12" text="提示" />
 	  
 	  <Control name="groupBox9" text="首页设置信息" />
@@ -778,7 +735,7 @@
 	  <Control name="str1" text="序号" />
 	  <Control name="str8" text="颗粒名" />
 	  <Control name="str9" text="代表色" />
-	  <Control name="str10" text="等效圆直径" />
+	  <Control name="str10" text="最大颗粒" />
 	  <Control name="str11" text="总数" />
 	  <Control name="partcletype0" text="过小颗粒" />
 	  <Control name="partcletype1" text="过大颗粒" />
@@ -826,7 +783,7 @@
 	  <Control name="sscaptionname9" text="数据类型" />
 	  <Control name="sscaptionname10" text="数据表类型" /> 
 	  <Control name="sscaptionname11" text="数据图类型" />
-	  <Control name="sscaptionname12" text="三元图" />
+	  <Control name="sscaptionname12" text="三元相图" />
 	  <Control name="sscaptionname13" text="颗粒分类图" />
 	  <Control name="sscaptionname14" text="颗粒分布图" />
 	  <Control name="sscaptionname15" text="颗粒排列图" />
@@ -853,7 +810,7 @@
 	  <Control name="m_reportname4" text="颗粒尺寸分布" />
 	  <Control name="m_str_axisy4" text="颗粒数" />
 	  <Control name="str_operatonmodule4" text="颗粒尺寸分布图" />
-	  <Control name="str_operatonmodule5" text="三元图" />
+	  <Control name="str_operatonmodule5" text="三元相图" />
 	  <Control name="str1" text="参数" />
 	  <Control name="str2" text="常规参数" />
 	  <Control name="BSEOriginal" text="BSE原图" />
@@ -1065,7 +1022,8 @@
 	  <Control name="label44" text="是否使用X-ray" />
 	  <Control name="btnok" text="确  定" />
 	  <Control name="btncancel" text="取  消" />
-	  <Control name="button1" text="特殊灰度颗粒识别设置" />
+	  <Control name="button_SpPart" text="特殊灰度颗粒识别设置" />
+	  <Control name="checkBox_Run" text="是否启用" />
 	  <Control name="ProgMgrInfoForm" text="程序管理" />
 	  <Control name="message1" text="样品台信息不能为空" />
 	  <Control name="message2" text="100倍时屏幕尺寸不能为空" />
@@ -1134,6 +1092,18 @@
 	  <Control name="message65" text="输入的腐蚀膨胀系数不可以为空!" />
 	  <Control name="message66" text="请输入正奇数或0!" />
     </Controls>
+ </Form>
+  <Form>
+    <Name>SpecialParticleForm</Name>
+    <Controls>
+	  <Control name="SpecialParticleForm" text="特殊灰度颗粒识别设置" />
+	  <Control name="RegName" text="名称" />
+	  <Control name="start" text="开始灰度（0-255）" />
+	  <Control name="end" text="结束灰度（0-255）" />
+	  <Control name="diameterStart" text="开始直径（微米）" />
+	  <Control name="diameterEnd" text="结束直径（微米）" />
+	  <Control name="collectXray" text="是否采集Xray" />
+    </Controls>
  </Form>
  <Form>
     <Name>OTSSolutionWindow</Name>
@@ -1339,7 +1309,7 @@
 	  <Control name="m_reportname4" text="颗粒尺寸分布" />
 	  <Control name="m_str_axisy4" text="颗粒数" />
 	  <Control name="str_operatonmodule4" text="颗粒尺寸分布图" />
-	  <Control name="str_operatonmodule5" text="三元图" />
+	  <Control name="str_operatonmodule5" text="三元相图" />
 	  <Control name="str1" text="参数" />
 	  <Control name="str2" text="常规参数" />
     </Controls>
@@ -1434,6 +1404,9 @@
 	  <Control name="str31" text="展开长度μm" />
 	  <Control name="str32" text="展开长宽比" />
 	  <Control name="str33" text="朝向角度°" />
+	  <Control name="str34" text="硬度" />
+	  <Control name="str35" text="密度" />
+	  <Control name="str36" text="导电性" />
     </Controls>
  </Form>
  <Form>

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

@@ -42,8 +42,6 @@
 	  <Control name="message33" text="Please open a database!"/>
 	  <Control name="message34" text="No matching energy spectrum data was found"/>
 	  <Control name="message36" text="Database File(*.db)|*.db"/>
-	  <Control name="message37" text="Please select the database you want to convert"/>
-	  <Control name="message38" text="Expressions and spectra cannot all be empty!" />
     </Controls>
   </Form>
   <Form>
@@ -381,12 +379,4 @@
 	  <Control name="message32" text="Tip"/>
     </Controls>
   </Form>
-  <Form>
-    <Name>ImportStandardLibraryTypeSelection</Name>
-    <Controls>
-	  <Control name="ImportStandardLibraryTypeSelection" text="Please select an import type"/>
-      <Control name="bn_xray" text="X-ray spectrum peak map"/>
-      <Control name="bn_expression" text="Expression"/>
-    </Controls>
-  </Form>
 </Resource>

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

@@ -41,8 +41,6 @@
 	  <Control name="message33" text="请打开一个数据库!"/>
 	  <Control name="message34" text="没有找到能匹配上的能谱数据！"/>
 	  <Control name="message36" text="数据库文件(*.db)|*.db"/>
-	  <Control name="message37" text="请选择要转换的数据库"/>
-	  <Control name="message38" text="表达式和谱图不能全部为空！"/>
     </Controls>
   </Form>
   <Form>
@@ -377,14 +375,7 @@
 	  <Control name="message30" text="所对应值输入错误！"/>
 	  <Control name="message31" text="常数库更新成功！"/>
 	  <Control name="message32" text="提示"/>
-    </Controls>
-  </Form>
-  <Form>
-    <Name>ImportStandardLibraryTypeSelection</Name>
-    <Controls>
-	  <Control name="ImportStandardLibraryTypeSelection" text="请选择导入类型"/>
-      <Control name="bn_xray" text="X-ray谱峰图"/>
-      <Control name="bn_expression" text="表达式"/>
+	  
     </Controls>
   </Form>
 </Resource>

OTSIncAReportApp/2-CommonFunction/CommonClass/DisplayParticle.cs

@@ -572,30 +572,36 @@ namespace OTSIncAReportGraph
            
             if (GetPaintState() == PaintState.PAINT)
             {
-                DisplaySegment ds = m_listdsegment[0];
-                if (ds.ShowMode == SegmentShowMode.DRAWPOINT)
+                if (m_listdsegment.Count > 0)
                 {
-                    try
+
+                    DisplaySegment ds = m_listdsegment[0];
+                    if (ds.ShowMode == SegmentShowMode.DRAWPOINT)
                     {
-                        e.Graphics.DrawImage(m_image, m_rect);
+                        try
+                        {
+                            e.Graphics.DrawImage(m_image, m_rect);
+
+                        }
+                        catch (Exception ex)
+                        {
+                            NLog.LogManager.GetCurrentClassLogger().Error(ex.ToString());
+                        }
+
 
                     }
-                    catch (Exception ex)
+                    else
                     {
-                        NLog.LogManager.GetCurrentClassLogger().Error(ex.ToString());
-                    }
-                  
+                        //调用绘制基本线
+                        foreach (DisplaySegment item in m_listdsegment)
+                        {
+                            item.OnPaint(e);
+                        }
 
-                }
-                else 
-                {
-                    //调用绘制基本线
-                    foreach (DisplaySegment item in m_listdsegment)
-                    {
-                        item.OnPaint(e);
                     }
 
                 }
+