瀏覽代碼

improve DeleteHoleBSEImageDataNoMessageBox function

gsp 2 年之前
父節點
當前提交
2c88ac10d9
共有 1 個文件被更改,包括 2 次插入74 次删除
  1. 2 74
      OTSIncAMeasureApp/4-OTSSamplespaceGraphicsPanel/OTSSamplespaceWindow.cs

+ 2 - 74
OTSIncAMeasureApp/4-OTSSamplespaceGraphicsPanel/OTSSamplespaceWindow.cs

@@ -284,7 +284,7 @@ namespace OTSMeasureApp
                     GetBSEPictures();
                     break;
                 case "DeleteBSEPicture":
-                    DeleteHoleBSEImageData();
+                    DeleteHoleBSEImageDataNoMessageBox();
                     break;
                 case "SlopFocusMenuItem":
 
@@ -2982,86 +2982,14 @@ namespace OTSMeasureApp
         #endregion
 
         #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()
         {
            
-                        //鼠标右键点击的位置坐标
-                        Point mouseCurrent = m_MouseDownPoint;
-                     
-                        var item = m_visualStage.GetHoleGDIByMousePoint(mouseCurrent);
-                        if (item!=null)
-                        {
                             m_ImageOfFieldGDIObjects.Clear();
                             m_ImageGDIObjects.Clear();
                            Invalidate();
 
-                        }
-              
         }
         #endregion