|
@@ -273,18 +273,24 @@ namespace OTSIncAReportGrids
|
|
|
TimeSpan timeSpan = end - star;
|
|
|
double Magnification = resfile.GetMeasurementMagnification();
|
|
|
int filedCount = fielddata.GetFiledCount();
|
|
|
-
|
|
|
- double wide = resfile.GetImageWidth();
|
|
|
+ double scanFieldSize = resfile.GetScanFieldSizeX();
|
|
|
+ double wide = resfile.GetImageWidth();
|
|
|
double high = resfile.GetImageHeight();
|
|
|
double pixelSize = resfile.GetPixelSize();
|
|
|
//double filedsArea = Math.Round(high * wide * pixelSize * pixelSize * filedCount, 2);
|
|
|
double particleArea = fielddata.GetparticleArea();
|
|
|
double filedsArea = resfile.GetTotalArea();
|
|
|
|
|
|
- //double ratio = particleArea / filedsArea;
|
|
|
+ if (filedsArea == -1)
|
|
|
+ {
|
|
|
+ filedsArea = scanFieldSize * (scanFieldSize * high / wide) * filedCount;
|
|
|
+ filedsArea = filedsArea / 1000000;
|
|
|
+ }
|
|
|
|
|
|
- //报告参数文件
|
|
|
- string xmlpath = Application.StartupPath + RptConfigFile.m_ReportMgrParamFile;
|
|
|
+ //double ratio = particleArea / filedsArea;
|
|
|
+
|
|
|
+ //报告参数文件
|
|
|
+ string xmlpath = Application.StartupPath + RptConfigFile.m_ReportMgrParamFile;
|
|
|
DataSet ds = XMLoperate.GetXmlData(xmlpath, "XMLData");
|
|
|
DataTable dt1 = ds.Tables["Member"];
|
|
|
string sizestr = "1000";
|