Merge branch 'Release2.5' of http://36.129.163.148:30080/gogsadmin/OTS into zty

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

@@ -238,7 +238,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>
@@ -246,7 +246,7 @@
   <Form>
     <Name>Triangulation_Edit</Name>
     <Controls>
-      <Control name="Triangulation_Edit" text="三元相图模板编辑" />
+      <Control name="Triangulation_Edit" text="三元图模板编辑" />
     </Controls>
  </Form>
   <Form>
@@ -277,7 +277,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="比例因子" />
@@ -332,7 +332,7 @@
 	  <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>
@@ -390,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="加载:生成模板临时数据库文件" />
@@ -497,11 +497,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="颗粒列表信息" />
@@ -523,8 +523,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="首页设置信息" />
@@ -828,7 +828,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="颗粒排列图" />
@@ -855,7 +855,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原图" />
@@ -1344,7 +1344,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>

OTSIncAMeasureApp/1-OTSMeasure/OTSMeasureDisplayResult.cs

@@ -98,7 +98,7 @@ namespace OTSMeasureApp
                             m_OTSMeasureResultWindow = m_MeasureApp.m_MeasureRetWindow;
                         }
                         //设置工作样品
-                        m_MeasureApp.m_ProjParam.SetWorkSample(m_OTSSamplespaceWindow.m_SampleSelectName);
+                        m_MeasureApp.m_ProjParam.SetWorkSample(m_OTSSamplespaceWindow.GetWorkingVisualSample().GetSampleName());
                         //获取工作样品信息
                         COTSSample WSample = m_MeasureApp.m_ProjParam.GetWorkSample();
                         CMsrDisplayResults cMsrResultsClr = WSample.GetMsrResults();