|
@@ -3024,18 +3024,21 @@ namespace OTSMeasureApp
|
|
|
{
|
|
|
|
|
|
var ctrlPos = m_visualStage.OTSCoordToCtrlCoord(fieldPos);
|
|
|
-
|
|
|
- if (sam.FrameOfHoleGDIObjects[i].IfContains(ctrlPos))
|
|
|
- //if (i == fieldId)
|
|
|
+ if (sam.FrameOfHoleGDIObjects[i].BSEImage == null)// prevent miss match when this sample area is overlaying on the other area(already took image in the field)
|
|
|
{
|
|
|
+ if (sam.FrameOfHoleGDIObjects[i].IfContains(ctrlPos))
|
|
|
+ //if (i == fieldId)
|
|
|
+ {
|
|
|
|
|
|
|
|
|
- bseImage = CImageHandler.ToGrayBitmap(ImageData, m_iWidth, m_iHeigh);
|
|
|
- sam.FrameOfHoleGDIObjects[i].BSEImage = bseImage;
|
|
|
+ bseImage = CImageHandler.ToGrayBitmap(ImageData, m_iWidth, m_iHeigh);
|
|
|
+ sam.FrameOfHoleGDIObjects[i].BSEImage = bseImage;
|
|
|
|
|
|
|
|
|
- break;
|
|
|
+ break;
|
|
|
+ }
|
|
|
}
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
//显示样品孔照片
|