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

Bin/x64/Debug/Config/SysData/OTSReportMgrParam.rpf

@@ -4,6 +4,6 @@
   <Member RegName="DefaultComputedColName" strValue="Area,EquivalentCircleDiameter,MaxDiameter,MinDiameter,DiameterRatio,FerretDiameter,PERP,PERI,INSCR,MEAN,ELONG,ASPECT_ELONG,Orientation" />
   <Member RegName="ElementsColName" strValue="O,Fe" />
   <Member RegName="PartSizeFile" name="lj2.psf" />
-  <Member RegName="TRIO_CHART_TYPE" strValue="Mn.Ni.Co" />
+  <Member RegName="TRIO_CHART_TYPE" strValue="CaO.SiO₂.Al₂O₃" />
   <Member RegName="SIZE_CAL_METHOD_TYPE" strValue="FERET" />
 </XMLData>

OTSIncAReportApp/2-CommonFunction/OTSDataMgrFunction/ResultDataMgr.cs

@@ -333,14 +333,14 @@ namespace OTSIncAReportApp.OTSDataMgrFunction
         public string GetDefaultTRIO_CHART_TYPE()
         {
             DataSet ds = DataOperation.DataAccess.XMLoperate.GetXml(Application.StartupPath + m_RptConfigFile.ReportMgrParamFile);
-            string sizestr = ds.Tables[1].Rows[5]["strValue"].ToString();
+            string sizestr = ds.Tables[1].Rows[4]["strValue"].ToString();
             return sizestr;
         }
 
         public string GetDefaultSIZE_CAL_METHOD_TYPE()
         {
             DataSet ds = DataOperation.DataAccess.XMLoperate.GetXml(Application.StartupPath + m_RptConfigFile.ReportMgrParamFile);
-            string sizestr = ds.Tables[1].Rows[6]["strValue"].ToString();
+            string sizestr = ds.Tables[1].Rows[5]["strValue"].ToString();
             return sizestr;
         }