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

OTSIncAReportApp/1-UI/Control_Grids/ResultGrid.cs

@@ -194,26 +194,6 @@ namespace OTSIncAReportGrids
             DateTime star = new DateTime();
             DateTime end = new DateTime();
 
-            //int filedCount = fielddata.GetFiledCount();
-            //double wide = resfile.GetImageWidth();
-            //double high = resfile.GetImageHeight();
-            //double pixelSize = resfile.GetPixelSize();
-            //double filedsArea = Math.Round(high * wide * pixelSize * pixelSize * filedCount, 2);
-            //int particleArea = fielddata.GetparticleArea();
-            //string xmlpath = Application.StartupPath + RptConfigFile.m_ReportMgrParamFile;
-            //DataSet ds = XMLoperate.GetXmlData(xmlpath, "XMLData");
-            //DataTable dt1 = ds.Tables["Member"];
-            //string sizestr = "1000";
-            //for (int i = 0; i < dt1.Rows.Count; i++)
-            //{
-            //    if (dt1.Rows[i]["RegName"].ToString() == "Scale")
-            //    {
-            //        sizestr = dt1.Rows[i]["strValue"].ToString();
-            //        break;
-            //    }
-            //}
-            //double ratio = Math.Round(particleArea / filedsArea * double.Parse(sizestr), 3);
-
             System.Globalization.DateTimeFormatInfo dtFormat = new System.Globalization.DateTimeFormatInfo();
             dtFormat.ShortDatePattern = "dd/MM/yyyy hh:mm:ss";
 
@@ -233,7 +213,6 @@ namespace OTSIncAReportGrids
 
             }
             TimeSpan timeSpan = end - star;
-            int all_FiledCount = resfile.GetTotalFields();
             double Magnification = resfile.GetMeasurementMagnification();
             int filedCount = fielddata.GetFiledCount();
 
@@ -266,6 +245,7 @@ namespace OTSIncAReportGrids
             keyValues.Add(table["col4"].ToString(), Math.Round(timeSpan.TotalMinutes, 2).ToString() + "mins");
             keyValues.Add(table["col5"].ToString(), filedCount.ToString());
 
+
             string LibraryName = "";
             string rstSTD = resfile.GetSTDName();
             if ("NoSTDDB" == rstSTD||

OTSIncAReportApp/1-UI/Purity.cs

@@ -92,6 +92,7 @@ namespace OTSIncAReportApp._1_UI.GBCalculate
             clr_prop.SetDataSourceId(index);
             clr_prop.SetType((int)OTSSampleReportInfo.DisplayPicutureType.AnalyzeDataTable);//table
             clr_prop.SetCalTableType((int)OTSSampleReportInfo.CALCULATE_TABLE_TYPE.GB_Method1);
+
             DataTable tbl = m_ReportApp.m_rstDataMgr.m_ReportMgr.GetAllGBFields(clr_prop);
             if (tbl != null)
             {
@@ -155,7 +156,7 @@ namespace OTSIncAReportApp._1_UI.GBCalculate
             }
             r2 = r2.Remove(r2.Length - 2, 2);
             r2 += ")";
-            double area = m_ReportApp.m_rstDataMgr.CurResultFile.GetImageWidth() * m_ReportApp.m_rstDataMgr.CurResultFile.GetImageHeight() * m_ReportApp.m_rstDataMgr.CurResultFile.GetPixelSize() * m_ReportApp.m_rstDataMgr.CurResultFile.GetPixelSize() * m_ReportApp.m_rstDataMgr.CurResultFile .GetTotalFields()* 0.000001;
+            double area = tbl.Rows.Count*0.5;
             K = K * 1000 / area;
             tB_result.Text = (Math.Round(K, 3).ToString());