|
@@ -284,7 +284,7 @@ namespace OTSMeasureApp
|
|
GetBSEPictures();
|
|
GetBSEPictures();
|
|
break;
|
|
break;
|
|
case "DeleteBSEPicture":
|
|
case "DeleteBSEPicture":
|
|
- DeleteHoleBSEImageData();
|
|
|
|
|
|
+ DeleteHoleBSEImageDataNoMessageBox();
|
|
break;
|
|
break;
|
|
case "SlopFocusMenuItem":
|
|
case "SlopFocusMenuItem":
|
|
|
|
|
|
@@ -2982,86 +2982,14 @@ namespace OTSMeasureApp
|
|
#endregion
|
|
#endregion
|
|
|
|
|
|
#region 删除样品孔中BSE图像信息
|
|
#region 删除样品孔中BSE图像信息
|
|
- public void DeleteHoleBSEImageData()
|
|
|
|
- {
|
|
|
|
- try
|
|
|
|
- {
|
|
|
|
- //鼠标右键点击的位置坐标
|
|
|
|
- Point mouseCurrent = m_MouseDownPoint;
|
|
|
|
-
|
|
|
|
- //样品名称
|
|
|
|
- string SampleName = "";
|
|
|
|
- //获取当前工作样品并删除对应BSE图
|
|
|
|
- foreach (CRectangleGDIObject ImageItem in m_ImageGDIObjects)
|
|
|
|
- {
|
|
|
|
- if (ImageItem.IfZoomContains(mouseCurrent))
|
|
|
|
- {
|
|
|
|
- SampleName = ImageItem.SampleName;
|
|
|
|
- break;
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- if (SampleName != null && !SampleName.Equals(""))
|
|
|
|
- {
|
|
|
|
- string message = table["message7"].ToString();
|
|
|
|
- if (MessageBox.Show(message, "Tip", MessageBoxButtons.YesNo, MessageBoxIcon.Information) == DialogResult.Yes)
|
|
|
|
- {
|
|
|
|
-
|
|
|
|
- DeleteHoleBSEImageDataNoMessageBox();
|
|
|
|
- return;
|
|
|
|
- }
|
|
|
|
- else
|
|
|
|
- {
|
|
|
|
- return;
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- //删除样品孔BSE图
|
|
|
|
- //样品孔名称
|
|
|
|
- string HoleName = "";
|
|
|
|
- var item = m_visualStage.GetHoleGDIByMousePoint(mouseCurrent);
|
|
|
|
-
|
|
|
|
- if (item!=null)
|
|
|
|
- {
|
|
|
|
- HoleName = item.NameOrHoleName;
|
|
|
|
-
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- if (HoleName != null && !HoleName.Equals(""))
|
|
|
|
- {
|
|
|
|
- string message = table["message8"].ToString();
|
|
|
|
- if (MessageBox.Show(message, "Tip", MessageBoxButtons.YesNo, MessageBoxIcon.Information) == DialogResult.Yes)
|
|
|
|
- {
|
|
|
|
-
|
|
|
|
- DeleteHoleBSEImageDataNoMessageBox();
|
|
|
|
- return;
|
|
|
|
- }
|
|
|
|
- else
|
|
|
|
- {
|
|
|
|
- return;
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- catch (Exception ex)
|
|
|
|
- {
|
|
|
|
-
|
|
|
|
- log.Trace(ex.ToString());
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
|
|
+
|
|
public void DeleteHoleBSEImageDataNoMessageBox()
|
|
public void DeleteHoleBSEImageDataNoMessageBox()
|
|
{
|
|
{
|
|
|
|
|
|
- //鼠标右键点击的位置坐标
|
|
|
|
- Point mouseCurrent = m_MouseDownPoint;
|
|
|
|
-
|
|
|
|
- var item = m_visualStage.GetHoleGDIByMousePoint(mouseCurrent);
|
|
|
|
- if (item!=null)
|
|
|
|
- {
|
|
|
|
m_ImageOfFieldGDIObjects.Clear();
|
|
m_ImageOfFieldGDIObjects.Clear();
|
|
m_ImageGDIObjects.Clear();
|
|
m_ImageGDIObjects.Clear();
|
|
Invalidate();
|
|
Invalidate();
|
|
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
}
|
|
}
|
|
#endregion
|
|
#endregion
|
|
|
|
|