handle the conflict when merging code.

OTSIncAMeasureApp/4-OTSSamplespaceGraphicsPanel/OTSSamplespaceWindow.cs

@@ -232,17 +232,20 @@ namespace OTSMeasureApp
                     DeleteHoleBSEImageDataNoMessageBox();
                     break;
                 case "DeleteSampleData":
-                    if (MessageBox.Show("The result data of this sample will be deleted, continue?", "DeleteData", MessageBoxButtons.OKCancel) == DialogResult.OK)
-                    {
-                        m_MeasureAppForm.InitCurrentSampleState();
-                        m_MeasureAppForm.m_MeasureResultWindow.SetInit();
-                        PrepareMeasureField(GetWorkingVisualSample(), MSR_RUN_TYPE.RUNMEASURE);
-                    }
-                        catch(Exception ex)
+                    try                     
+                   {
+                        if (MessageBox.Show("The result data of this sample will be deleted, continue?", "DeleteData", MessageBoxButtons.OKCancel) == DialogResult.OK)
                         {
-                            MessageBox.Show(ex.ToString());
+                            m_MeasureAppForm.InitCurrentSampleState();
+                            m_MeasureAppForm.m_MeasureResultWindow.SetInit();
+                            PrepareMeasureField(GetWorkingVisualSample(), MSR_RUN_TYPE.RUNMEASURE);
                         }
                     }
+                    catch (Exception ex)
+                    {
+                        MessageBox.Show(ex.ToString());
+                    }
+
                     break;
                 case "SlopFocusMenuItem":
 

OTSIncAReportApp/1-UI/Control_Graph/Controls/Control_DrawDistrbutionImageAndBSE.designer.cs

@@ -54,10 +54,10 @@
             this.方法一ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.方法二ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.aSTMToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
-            this.国标图导出ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.方法一ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.方法二ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.aSTMToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
+            //this.国标图导出ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            //this.方法一ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            //this.方法二ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            //this.aSTMToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
             this.contextMenuStrip_Particle = new System.Windows.Forms.ContextMenuStrip(this.components);
             this.ToolStripMenuItem_movesempoint = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripMenuItem_DeleteParticles = new System.Windows.Forms.ToolStripMenuItem();