Merge branch 'Release2.5' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into Release2.5

OTSCPP/OTSClassifyEngine/InclutionEngine/OTSClassifyEng.cpp

@@ -66,6 +66,7 @@ namespace OTSClassifyEngine
 		// the element chemistries list is an inclusion 
 		CElementChemistriesList listElChemsInc;
 		CElementChemistriesList listElChemsIncNoFe;
+	
 		double dMolarSum = 0.0f;
 		double dMolarSumNoFe = 0.0f;
 		OTS_PARTICLE_TYPE incId;
@@ -107,7 +108,7 @@ namespace OTSClassifyEngine
 		{// identified, return TRUE
 			a_nIncId = nIncId;
 			IDENTIFIED_INC_GRP_ID grpid;
-			GroupClassify(listElChemsIncNoFe,nIncId, grpid);
+			GroupClassify(a_listElementChemistries,nIncId, grpid);
 			a_GrpId = (int)grpid;
 			return TRUE;
 		}
@@ -126,7 +127,7 @@ namespace OTSClassifyEngine
 			// identified, return TRUE
 			a_nIncId = nIncId;
 			IDENTIFIED_INC_GRP_ID grpid;
-			GroupClassify(listElChemsIncNoFe,nIncId, grpid);
+			GroupClassify(a_listElementChemistries,nIncId, grpid);
 			a_GrpId = (int)grpid;
 			return TRUE;
 		}
@@ -134,7 +135,7 @@ namespace OTSClassifyEngine
 		// can't identify this inclusion
 		a_nIncId = (int)OTS_PARTICLE_TYPE::NOT_IDENTIFIED;
 		IDENTIFIED_INC_GRP_ID grpid;
-		GroupClassify(listElChemsIncNoFe,nIncId, grpid);
+		GroupClassify(a_listElementChemistries,nIncId, grpid);
 		a_GrpId = (int)grpid;
 		return TRUE;
 	}

OTSIncAReportApp/1-UI/Control_Grids/ResultGrid.cs

@@ -167,7 +167,8 @@ namespace OTSIncAReportGrids
             keyValues.Add(table["col5"].ToString(), filedCount.ToString());
             keyValues.Add(table["col12"].ToString(), Math.Round(Magnification, 2).ToString());
             string LibraryName = "";
-            if ("NoSTDDB"== ((Dictionary<string, object>)((Dictionary<string, object>)((Dictionary<string, object>)resfile.ResultInfo["Sample"])["Members"])["MsrParams"])["STDName"].ToString())
+            if ("NoSTDDB"== ((Dictionary<string, object>)((Dictionary<string, object>)((Dictionary<string, object>)resfile.ResultInfo["Sample"])["Members"])["MsrParams"])["STDName"].ToString() ||
+                "NoSTDDB.db" == ((Dictionary<string, object>)((Dictionary<string, object>)((Dictionary<string, object>)resfile.ResultInfo["Sample"])["Members"])["MsrParams"])["STDName"].ToString())
             {
                 LibraryName = "OTSIncASysSTD";
             }
@@ -258,7 +259,8 @@ namespace OTSIncAReportGrids
             keyValues.Add(table["col5"].ToString(), all_FiledCount.ToString());
 
             string LibraryName = "";
-            if ("NoSTDDB" == ((Dictionary<string, object>)((Dictionary<string, object>)((Dictionary<string, object>)resfile.ResultInfo["Sample"])["Members"])["MsrParams"])["STDName"].ToString())
+            if ("NoSTDDB" == ((Dictionary<string, object>)((Dictionary<string, object>)((Dictionary<string, object>)resfile.ResultInfo["Sample"])["Members"])["MsrParams"])["STDName"].ToString()||
+                "NoSTDDB.db" == ((Dictionary<string, object>)((Dictionary<string, object>)((Dictionary<string, object>)resfile.ResultInfo["Sample"])["Members"])["MsrParams"])["STDName"].ToString())
             {
                 LibraryName = "OTSIncASysSTD";
             }

OTSIncAReportApp/1-UI/OTSTemplateDesigner/Export_ReportTemplate.cs

@@ -247,7 +247,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
           
            
 
-            List<string> vs = new List<string>() { "DMAX", "DMIN", "Area", "FERET" };
+            List<string> vs = new List<string>() { "DMAX", "DMIN", "FERET", "Area" };
             string po = vs[m_otsreport_export.m_mbszclass.M_KLFXJG.index_cb_klcc_jsfs];
 
             switch (po)

OTSIncAReportApp/ReportTemplate/OTS_DEVReport.cs

@@ -261,7 +261,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             pieSeriesClass.ValueDataMembers.AddRange(new string[] { "total" });
             (pieSeriesClass.Label as PieSeriesLabel).Position = PieSeriesLabelPosition.Inside;
             //显示百分比
-            pieSeriesClass.PointOptions.PointView = PointView.ArgumentAndValues;
+            pieSeriesClass.PointOptions.PointView = PointView.ArgumentAndValues; 
             pieSeriesClass.PointOptions.ValueNumericOptions.Format = NumericFormat.Percent;
             //设置数据源
             pieSeriesClass.DataSource = dt_class_dt;