|
@@ -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());
|
|
|
|