Browse Source

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

zhangjiaxin 3 years ago
parent
commit
0052c14eb5

BIN
Bin/x64/Debug/Config/Simulate/SimImage.bmp


+ 2 - 2
OTSIncAMeasureApp/0-OTSModel/OTSDataType/COTSSample.cs

@@ -2749,13 +2749,13 @@ namespace OTSDataType
                 OTS_IMAGE_RESULOTION_OPTIONS nImageSizeId = m_poMsrParams.GetImageScanParam().GetImageResulotion();
                 long nResulotionId = RESOLUTION_ID_FIRST_TIE + (long)nImageSizeId;
                 int nImageSize = RESOLUTION_VALUE[nResulotionId].Width;
-
+                int nHeight = RESOLUTION_VALUE[nResulotionId].Height;
                 // pixel size (micros)
                 double dPixelSize = 0;
                 dPixelSize = CalculatePixelSize();
 
                 // calculate pixel size 
-                dAFieldArea = (double)nImageSize * (double)nImageSize * 0.75 * dPixelSize * dPixelSize * 0.000001;// mm^2
+                dAFieldArea = (double)nImageSize * nHeight * dPixelSize * dPixelSize * 0.000001;// mm^2
             }
 
             // return pixel size