去除无效codes

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

@@ -49,14 +49,11 @@ namespace OTSIncAReportGraph.Controls
     }
     public enum RightButtonMenu
     { 
-       Include=0,
-      
-       MoveSEMToParticle=1,
-       CopyImage=2,
-       OriginalSplicing= 3,
+       MoveSEMToParticle=0,
+       CopyImage=1,
+       OriginalSplicing= 2,
        DeleteParticle=4,       
-	   ParticleSegmentation=5,
-       ImportSTDDb=6
+	   ParticleSegmentation=5
     }
     /// <summary>
     /// 选择导出的图片是原图还是颗粒渲染后的图片
@@ -1161,7 +1158,6 @@ namespace OTSIncAReportGraph.Controls
            
                 
                 bool ifClickOnParticle=false;
-                bool ifThereIsSelectedParticle = false;
 
                
                 foreach (DisplayParticle item in m_list_allDPart)
@@ -1169,7 +1165,6 @@ namespace OTSIncAReportGraph.Controls
                     if (true == imageDisHelper.WhetherInRange(item, e.Location))
                     {
                         ifClickOnParticle = true;
-                        CMenuStrip.Items[(int)RightButtonMenu.Include].Visible = false;
                        
                         CMenuStrip.Items[(int)RightButtonMenu.CopyImage].Visible = false;
                         CMenuStrip.Items[(int)RightButtonMenu.OriginalSplicing].Visible = false;
@@ -1181,40 +1176,18 @@ namespace OTSIncAReportGraph.Controls
 
                         DisplayParticle dp = (DisplayParticle)item;
                      
-                            CMenuStrip.Items[(int)RightButtonMenu.ImportSTDDb].Visible = true;
-                     
-
                         CMenuStrip.Items[(int)RightButtonMenu.ParticleSegmentation].Visible = true;
                         m_ParticleSegmentation.ParticleData = dp.objParticleData;
                     }
-                    if (((DisplayParticle)item).IsSelect)
-                    {
-                        ifThereIsSelectedParticle = true;
-                    }
                 }
                 if (ifClickOnParticle == false)
                 {
-                    if (ifThereIsSelectedParticle)
-                    {
-
-                        CMenuStrip.Items[(int)RightButtonMenu.Include].Visible = true;
-                       
-                       
-                    }
-                    else
-                    {
-                        CMenuStrip.Items[(int)RightButtonMenu.Include].Visible = false;
-                       
-                       
-
-                    }
                     CMenuStrip.Items[(int)RightButtonMenu.DeleteParticle].Visible = false;
                 
                     CMenuStrip.Items[(int)RightButtonMenu.CopyImage].Visible = true;
                     CMenuStrip.Items[(int)RightButtonMenu.OriginalSplicing].Visible = true;
                     CMenuStrip.Items[(int)RightButtonMenu.MoveSEMToParticle].Visible = false;
                     CMenuStrip.Items[(int)RightButtonMenu.ParticleSegmentation].Visible = false;
-                    CMenuStrip.Items[(int)RightButtonMenu.ImportSTDDb].Visible = false;
                 }
                 var m_RptConfigFile = RptConfigFile.GetRptConfig();         //报表程序的配置文件
                 if (m_RptConfigFile.Systype == OTS_SysType_ID.CleannessA)
@@ -1245,13 +1218,6 @@ namespace OTSIncAReportGraph.Controls
            
         }
 
-
-        private void ToolStripMenuItem_selected_Click(object sender, EventArgs e)
-        {
-            frmReportApp.selectedRegion = m_SelectTool.Rect;
-            SetParticlesSelected();
-        }
-
         void SetParticlesSelected()
         {
             List<DisplayParticle> selectedParts = new List<DisplayParticle>();

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

@@ -30,7 +30,6 @@
         {
             this.components = new System.ComponentModel.Container();
             this.CMenuStrip = new System.Windows.Forms.ContextMenuStrip(this.components);
-            this.ToolStripMenuItem_selected = new System.Windows.Forms.ToolStripMenuItem();
             this.ToolStripMenuItem_movesempoint = new System.Windows.Forms.ToolStripMenuItem();
             this.ToolStripMenuItem_ParticleSplicing = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripMenuItem_copyimage = new System.Windows.Forms.ToolStripMenuItem();
@@ -55,7 +54,6 @@
             // 
             this.CMenuStrip.ImageScalingSize = new System.Drawing.Size(24, 24);
             this.CMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.ToolStripMenuItem_selected,
             this.ToolStripMenuItem_movesempoint,
             this.ToolStripMenuItem_ParticleSplicing,
             this.toolStripMenuItem_copyimage,
@@ -67,14 +65,6 @@
             this.CMenuStrip.Name = "contextMenuStrip1";
             this.CMenuStrip.Size = new System.Drawing.Size(211, 202);
             // 
-            // ToolStripMenuItem_selected
-            // 
-            this.ToolStripMenuItem_selected.Name = "ToolStripMenuItem_selected";
-            this.ToolStripMenuItem_selected.Size = new System.Drawing.Size(210, 22);
-            this.ToolStripMenuItem_selected.Text = "选择颗粒";
-            this.ToolStripMenuItem_selected.Visible = false;
-            this.ToolStripMenuItem_selected.Click += new System.EventHandler(this.ToolStripMenuItem_selected_Click);
-            // 
             // ToolStripMenuItem_movesempoint
             // 
             this.ToolStripMenuItem_movesempoint.Name = "ToolStripMenuItem_movesempoint";
@@ -226,7 +216,6 @@
 
         private Control_XRayTable control_XRayTable1;
         private System.Windows.Forms.ContextMenuStrip CMenuStrip;
-        private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItem_selected;
         private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItem_movesempoint;
         private Control_Ruler control_Ruler1;
         private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem_copyimage;