删除 选择颗粒相关 codes

OTSIncAReportApp/1-UI/Control_ECharts/EChart_ParticlesComposition.cs

@@ -42,10 +42,6 @@ namespace OTSIncAReportApp.Control_ECharts
         //数据图类型:常用夹杂物分类CommonlyUsedClassify ,颗粒成分PComponent，元素成分EComponent，颗粒尺寸分布PSize
         string ComSel { get; set; }
         public bool Report { get; set; }
-        /// <summary>
-        /// 选择颗粒范围（true为全部颗粒false为选择颗粒）
-        /// </summary>
-        public bool ParticleRange { set; get; }
         frmReportApp m_ReportApp;
         List<int> FLID = new List<int>() { 0, 1, 2, 4, 6, 7, 8, 9 };
         List<string> NameList = new List<string>() { "过小颗粒", "过大颗粒", "亮度不在分析范围内的颗粒", "低计数率颗粒", "不含分析元素的颗粒", "非夹杂物颗粒SiC", "非夹杂物颗粒FeO", "未识别颗粒" };
@@ -79,13 +75,7 @@ namespace OTSIncAReportApp.Control_ECharts
             if (Report)
             {
                 sou = m_DataMgr.ResultFilesList[m_DataMgr.getSelectedIndex()].anotherFileName.ToString();
-                if(ParticleRange)
-                {
-                    sel = 0;
-                }else
-                {
-                    sel = 1;
-                }
+                sel = 0;
             }
             else
             {
@@ -170,62 +160,7 @@ namespace OTSIncAReportApp.Control_ECharts
             //int sel = m_conditionChoose.m_SourceGridData.GetPropIndexByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE);
             int sel = m_ReportApp.m_conditionChoose.m_conditionData.GetComboDownListIndexByItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE);
             DataTable dt = new DataTable();
-            if (sel == 1)
-            {
-                
-                List<Particle> particles = m_ReportApp.GetSelectedParticles();
-                int SPINEL = 0;
-                int OXIDE = 0;
-                int SULFIDE_OXIDE = 0;
-                int NITRIDE = 0;
-                int SULFIDE = 0;
-                for (int i = 0; i < m_ReportApp.GetSelectedParticles().Count; i++)
-                {
-                    //SPINEL 
-                    if ((particles[i].TypeId >= 10100 || particles[i].TypeId <= 10199) || (particles[i].TypeId >= 12200 || particles[i].TypeId <= 12299) || (particles[i].TypeId >= 11300 || particles[i].TypeId <= 11299))
-                    {
-                        SPINEL = SPINEL + 1;
-                    }
-                    //OXIDE 
-                    if (particles[i].TypeId >= 10000 || particles[i].TypeId <= 10999)
-                    {
-                        OXIDE = OXIDE + 1;
-                    }
-                    //SULFIDE_OXIDE
-                    if ((particles[i].TypeId >= 11200 || particles[i].TypeId <= 11299) || (particles[i].TypeId >= 11400 || particles[i].TypeId <= 11499) || (particles[i].TypeId >= 11200 || particles[i].TypeId <= 11599))
-                    {
-                        SULFIDE_OXIDE = SULFIDE_OXIDE + 1;
-                    }
-                    //NITRIDE 
-                    if (particles[i].TypeId >= 12000 || particles[i].TypeId <= 12999)
-                    {
-                        NITRIDE = NITRIDE + 1;
-                    }
-                    //SULFIDE 
-                    if (particles[i].TypeId >= 11000 || particles[i].TypeId <= 11999)
-                    {
-                        SULFIDE = SULFIDE + 1;
-                    }
-                }
-                DataTable dataTable = new DataTable();
-                dataTable.Columns.Add("SPINEL", typeof(String));
-                dataTable.Columns.Add("OXIDE", typeof(String));
-                dataTable.Columns.Add("SULFIDE_OXIDE", typeof(String));
-                dataTable.Columns.Add("NITRIDE", typeof(String));
-                dataTable.Columns.Add("SULFIDE", typeof(String));
-                dataTable.Rows.Add();
-                dataTable.Rows[0]["SPINEL"] = SPINEL.ToString();
-                dataTable.Rows[0]["OXIDE"] = OXIDE.ToString();
-                dataTable.Rows[0]["SULFIDE_OXIDE"] = SULFIDE_OXIDE.ToString();
-                dataTable.Rows[0]["NITRIDE"] = NITRIDE.ToString();
-                dataTable.Rows[0]["SULFIDE"] = SULFIDE.ToString();
-                dt = dataTable;
-
-            }
-            else
-            {
-                dt = particledata.GetCommonlyUsedClassifyData();
-            }
+            dt = particledata.GetCommonlyUsedClassifyData();
 
 
             //DataTable dt = dataTable;
@@ -304,16 +239,7 @@ namespace OTSIncAReportApp.Control_ECharts
 
 
             DataTable data = new DataTable();
-            if (sel == 0)
-            {
-                data = particledata.GetAreaByAllIncA("");//获取所有分类面积和数量信息
-            }
-            else
-            {
-                DataTable AllInca = particledata.GetAreaByAllIncA("");
-                DataTable SelectParticl = SelectParticleData();
-                data = GetParticleListForParticlSize(SelectParticl, AllInca);
-            }
+            data = particledata.GetAreaByAllIncA("");//获取所有分类面积和数量信息
 
 
             //DataTable data = particledata.GetAreaByAllIncA("");
@@ -410,16 +336,7 @@ namespace OTSIncAReportApp.Control_ECharts
 
             DataOperation.DataAccess.ParticleData particledata = new DataOperation.DataAccess.ParticleData(path);
             DataTable data = new DataTable();
-            if (sel==0)
-            {
-                data = particledata.GetAreaByAllIncA("");//获取所有分类面积和数量信息
-            }
-            else
-            {
-                DataTable AllInca = particledata.GetAreaByAllIncA("");
-                DataTable SelectParticl = SelectParticleData();
-                data = GetParticleListForParticlSize(SelectParticl, AllInca);
-            }
+            data = particledata.GetAreaByAllIncA("");//获取所有分类面积和数量信息
 
             
             DataTable AreaInformationOfAllElements = ConSolidateInvalid(data);
@@ -585,49 +502,6 @@ namespace OTSIncAReportApp.Control_ECharts
             }
             return dt_Partick;
         }
-
-        #region 读取选择颗粒数据
-        private DataTable SelectParticleData()
-        {
-            List<Particle> selectParticles = m_ReportApp.GetSelectedParticles();
-
-            #region Datatable数据表格式
-            DataTable dtUelect = new DataTable();
-            dtUelect.Columns.Add("fieldid");
-            dtUelect.Columns.Add("particleid");
-            dtUelect.Columns.Add("AveGray");
-            dtUelect.Columns.Add("RectLeft");
-            dtUelect.Columns.Add("RectTop");
-            dtUelect.Columns.Add("RectWidth");
-            dtUelect.Columns.Add("RectHeight");
-            dtUelect.Columns.Add("Area");
-            dtUelect.Columns.Add("PosX");
-            dtUelect.Columns.Add("PosY");
-            dtUelect.Columns.Add("TypeId");
-            dtUelect.Columns.Add("SegmentNum");
-            dtUelect.Columns.Add("SEMPosX");
-            dtUelect.Columns.Add("SEMPosY");
-            dtUelect.Columns.Add("XrayId");
-            dtUelect.Columns.Add("DMAX");
-            dtUelect.Columns.Add("DMIN");
-            dtUelect.Columns.Add("DPERP");
-            dtUelect.Columns.Add("PERIMETER");
-            dtUelect.Columns.Add("ORIENTATION");
-            dtUelect.Columns.Add("DINSCR");
-            dtUelect.Columns.Add("DMEAN");
-            dtUelect.Columns.Add("DELONG");
-            dtUelect.Columns.Add("DFERET");
-            dtUelect.Columns.Add("TypeName");
-            dtUelect.Columns.Add("TypeColor");
-
-            #endregion
-            for (int i = 0; i < selectParticles.Count; i++)
-            {
-                dtUelect.Rows.Add(selectParticles[i].FieldId, selectParticles[i].ParticleId, selectParticles[i].AveGray, selectParticles[i].RectLeft, selectParticles[i].RectTop, selectParticles[i].RectWidth, selectParticles[i].RectHeight, selectParticles[i].Area, selectParticles[i].PosX, selectParticles[i].PosX, selectParticles[i].TypeId, /*selectParticles[i].ElementNum,*/ selectParticles[i].SegmentNum, selectParticles[i].SEMPosX, selectParticles[i].SEMPosY, selectParticles[i].ParticleId, selectParticles[i].DMAX, selectParticles[i].DMIN, selectParticles[i].DPERP, selectParticles[i].PERIMETER, selectParticles[i].ORIENTATION, selectParticles[i].DINSCR, selectParticles[i].DMEAN, selectParticles[i].DELONG, selectParticles[i].DFERET, selectParticles[i].TypeName, selectParticles[i].TypeColor);
-            }
-           return  dtUelect;
-        }
-        #endregion
         private DataTable ConSolidateInvalid(DataTable dt)
         {
            
@@ -664,18 +538,7 @@ namespace OTSIncAReportApp.Control_ECharts
             int sel = m_ReportApp.m_conditionChoose.m_conditionData.GetComboDownListIndexByItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE);
 
             string filedAndParticl = "";
-            if (sel == 1)
-            {
-                List<Particle> selectParticles = m_ReportApp.GetSelectedParticles();
-                foreach (var item in selectParticles)
-                {
-                    filedAndParticl = filedAndParticl + "," + (item.FieldId.ToString() + "-" + item.ParticleId.ToString());
-                }
-                if (filedAndParticl != "")
-                {
-                    filedAndParticl = filedAndParticl + ",";
-                }
-            }
+            
 
             DataTable dt = particledata.GetParticleListForParticlSize("area", filedAndParticl);
             //设置标签名称
@@ -754,18 +617,6 @@ namespace OTSIncAReportApp.Control_ECharts
             //int sel = m_conditionChoose.m_SourceGridData.GetPropIndexByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE);
             int sel = m_ReportApp.m_conditionChoose.m_conditionData.GetComboDownListIndexByItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE);
             string filedAndParticl = "";
-            if (sel == 1)
-            {
-                List<Particle> selectParticles = m_ReportApp.GetSelectedParticles();
-                foreach (var item in selectParticles)
-                {
-                    filedAndParticl = filedAndParticl + "," + (item.FieldId.ToString() + "-" + item.ParticleId.ToString());
-                }
-                if (filedAndParticl != "")
-                {
-                    filedAndParticl = filedAndParticl + ",";
-                }
-            }
 
             DataTable dt = particledata.GetElementForArea(filedAndParticl);
 
@@ -844,18 +695,6 @@ namespace OTSIncAReportApp.Control_ECharts
             //int sel = m_conditionChoose.m_SourceGridData.GetPropIndexByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE);
             int sel = m_ReportApp.m_conditionChoose.m_conditionData.GetComboDownListIndexByItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE);
             string filedAndParticl = "";
-            if (sel == 1)
-            {
-                List<Particle> selectParticles = m_ReportApp.GetSelectedParticles();
-                foreach (var item in selectParticles)
-                {
-                    filedAndParticl = filedAndParticl + "," + (item.FieldId.ToString() + "-" + item.ParticleId.ToString());
-                }
-                if (filedAndParticl != "")
-                {
-                    filedAndParticl = filedAndParticl + ",";
-                }
-            }
 
             //idx = m_ReportApp.m_DataMgrFun.GetPropIndexByPropItemName(m_ReportApp.SourceGridData.ConditionItemList, OTSSampleReportInfo.OTS_REPORT_PROP_GRID_ITEMS.SIZE_CAL_METHOD_TYPE);
             //string con = m_ReportApp.SourceGridData.ConditionItemList[idx].itemVal.ToString();
@@ -937,18 +776,6 @@ namespace OTSIncAReportApp.Control_ECharts
             //int sel = m_conditionChoose.m_SourceGridData.GetPropIndexByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE);
             int sel = m_ReportApp.m_conditionChoose.m_conditionData.GetComboDownListIndexByItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE);
             string filedAndParticl = "";
-            if (sel == 1)
-            {
-                List<Particle> selectParticles = m_ReportApp.GetSelectedParticles();
-                foreach (var item in selectParticles)
-                {
-                    filedAndParticl = filedAndParticl + "," + (item.FieldId.ToString() + "-" + item.ParticleId.ToString());
-                }
-                if (filedAndParticl != "")
-                {
-                    filedAndParticl = filedAndParticl + ",";
-                }
-            }
 
             //idx = m_ReportApp.m_DataMgrFun.GetPropIndexByPropItemName(m_ReportApp.SourceGridData.ConditionItemList, OTSSampleReportInfo.OTS_REPORT_PROP_GRID_ITEMS.SIZE_CAL_METHOD_TYPE);
             //string con = m_ReportApp.SourceGridData.ConditionItemList[idx].itemVal.ToString();
@@ -1080,18 +907,6 @@ namespace OTSIncAReportApp.Control_ECharts
 
             int sel = m_conditionChoose.m_conditionData.ProItemProIndex();
             string filedAndParticl = "";
-            if (sel == 1)
-            {
-                List<Particle> selectParticles = m_ReportApp.GetSelectedParticles();
-                foreach (var item in selectParticles)
-                {
-                    filedAndParticl = filedAndParticl + "," + (item.FieldId.ToString() + "-" + item.ParticleId.ToString());
-                }
-                if (filedAndParticl != "")
-                {
-                    filedAndParticl = filedAndParticl + ",";
-                }
-            }
             DataOperation.DataAccess.ParticleData particledata = null;
             DataTable dt = new DataTable();
 

OTSIncAReportApp/1-UI/Control_ECharts/EChart_Trianglediagram.cs

@@ -291,18 +291,6 @@ namespace OTSIncAReportApp.Control_ECharts
             //int sel = m_condition.SourceGridData.ConditionItemList[m_ReportApp.m_DataMgrFun.GetPropIndexByPropItemName(m_ReportApp.SourceGridData.ConditionItemList, OTSSampleReportInfo.OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE)].comboDownList.IndexOf(m_ReportApp.SourceGridData.ConditionItemList[1].itemVal.ToString());
             //int sel = m_condition.m_SourceGridData.GetPropIndexByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE);
             string filedAndParticl = "";
-            if (sel == 1)
-            {
-                List<Particle> selectParticles = m_ReportApp.GetSelectedParticles();
-                foreach (var item in selectParticles)
-                {
-                    filedAndParticl = filedAndParticl + "," + (item.FieldId.ToString() + "-" + item.ParticleId.ToString());
-                }
-                if (filedAndParticl != "")
-                {
-                    filedAndParticl = filedAndParticl + ",";
-                }
-            }
             string po = "";
             string con = "";
             int row = m_condition.m_conditionData.ConditionItemList.Count;

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

@@ -358,10 +358,6 @@ namespace OTSIncAReportGraph.Controls
             }
             ProgressBarUpdate(100, table["str2"].ToString());
             m_frm_userprogress.Visible = false;
-            if (m_ReportApp.im_ParticlesGridDevidePage != null)
-            {
-                m_ReportApp.im_ParticlesGridDevidePage.ToolStripMenuItem_Addparticlestotheselectparticleslist.Visible = true; //由于分布图和颗粒表数据来源相对独立，所以只能在这里激活颗粒表选择菜单，待日后修改数据源加载方式，此项需修改
-            }
         }
 
 

OTSIncAReportApp/1-UI/Control_Grids/CompositionDistributionGrid.cs

@@ -116,86 +116,11 @@ namespace OTSIncAReportGrids
             }
             double totalArea = 0;
 
-            //int idx = m_ReportApp.m_DataMgrFun.GetPropIndexByPropItemName(m_ReportApp.SourceGridData.ConditionItemList, OTSIncAReportApp.OTSSampleReportInfo.OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE);
-            //int sel = m_ReportApp.m_conditionChoose.m_SourceGridData.GetPropIndexByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE);
+            
             int sel = m_ReportApp.m_conditionChoose.m_conditionData.GetComboDownListIndexByItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE);
             gridView.MergeColumnNames.Add(filename);
             gridView.AddSpanHeader(1, gridView.Columns.Count - 1, filename);
-            if (sel == 1)
-            {
-                List<Particle> selectParticles = m_ReportApp.GetSelectedParticles();
-
-
-                Dictionary<int,List<Particle>> selectNameGroup = new Dictionary<int, List<Particle>>();
-                for(int i=0;i< selectParticles.Count;i++)
-                {
-                    if(!selectNameGroup.ContainsKey(selectParticles[i].TypeId))
-                    {
-                        List<Particle> particles = new List<Particle>();
-                        particles.Add(selectParticles[i]);
-                        selectNameGroup.Add(selectParticles[i].TypeId, particles);
-                    }
-                    else
-                    {
-                        selectNameGroup[selectParticles[i].TypeId].Add(selectParticles[i]);
-                    }
-                }
-
-                double areaSum = 0,avg = 0,max = 0;
-                DataTable dtUelect = new DataTable();
-                dtUelect.Columns.Add("typeid");
-                dtUelect.Columns.Add("TypeName");
-                dtUelect.Columns.Add("TypeColor");
-                dtUelect.Columns.Add("con");
-                dtUelect.Columns.Add("Area");
-                dtUelect.Columns.Add("av");
-                dtUelect.Columns.Add("max");
-                foreach (KeyValuePair<int, List<Particle>> kv in selectNameGroup)
-                {
-                    areaSum = avg = max = 0;
-                    for(int i=0;i< kv.Value.Count;i++)
-                    {
-                        areaSum += kv.Value[i].Area;
-                        switch (con)
-                        {
-                            case "DMAX":
-                                avg += kv.Value[i].DMAX;
-                                if(kv.Value[i].DMAX> max)
-                                {
-                                    max = kv.Value[i].DMAX;
-                                }
-                                break;
-                            case "DMIN":
-                                avg += kv.Value[i].DMIN;
-                                if (kv.Value[i].DMIN > max)
-                                {
-                                    max = kv.Value[i].DMIN;
-                                }
-                                break;
-                            case "ECD":
-                                avg += kv.Value[i].Area;
-                                if (kv.Value[i].Area > max)
-                                {
-                                    max = kv.Value[i].Area;
-                                }
-                                break;
-                            case "FERET":
-                                avg += kv.Value[i].DFERET;
-                                if (kv.Value[i].DFERET > max)
-                                {
-                                    max = kv.Value[i].DFERET;
-                                }
-                                break;
-                        }
-                    }
-                    avg = avg / kv.Value.Count;
-                    dtUelect.Rows.Add(kv.Key, kv.Value[0].TypeName, kv.Value[0].TypeColor, kv.Value.Count, areaSum, avg, max);
-                }
-                totalArea = OTSIncAReportApp.frmReportApp.selectedRegion.Width * OTSIncAReportApp.frmReportApp.selectedRegion.Height;
-                dt = dtUelect.Copy();
-            }
-            else
-            {
+            
                 FieldData fielddata = new FieldData(path);
                 //Dictionary<string, object> sampleMembers = ((Dictionary<string, object>)((Dictionary<string, object>)result.ResultInfo["Sample"])["Members"]);
                 //Dictionary<string, object> semDataMsr = (Dictionary<string, object>)sampleMembers["SEMDataMsr"];
@@ -210,7 +135,6 @@ namespace OTSIncAReportGrids
                 int filedCount = fielddata.GetFiledCount();
                 totalArea = high * pixelSize*wide* pixelSize * filedCount;
                 dt = particledata.GetParticleListByIncA(po);
-            }
 
             for (int i = 0; i < dt.Rows.Count; i++)
             {

OTSIncAReportApp/1-UI/Control_Grids/ElementCompositionAvgGrid.cs

@@ -76,31 +76,7 @@ namespace OTSIncAReportGrids
             gridView.MergeColumnNames.Add(filename);
             gridView.AddSpanHeader(1, gridView.Columns.Count - 1, filename);
             DataTable dt;
-            //sel(1,为选择颗粒，0,为全部颗粒)
-            if (sel == 1)
-            {
-                List<Particle> selectParticles = m_ReportApp.GetSelectedParticles();
-                foreach (var item in selectParticles)
-                {
-                    filedAndParticl = filedAndParticl + "," + (item.FieldId.ToString() + "-" + item.ParticleId.ToString());
-                }
-                if (filedAndParticl != "")
-                {
-                    filedAndParticl = filedAndParticl + ",";
-                }
-                if (selectParticles.Count == 0)
-                {
-                    dt = new DataTable();
-                }
-                else
-                {
-                    dt = particledata.GetAreaByAllIncA(filedAndParticl);
-                }
-            }
-            else
-            {
-                dt = particledata.GetAreaByAllIncA(filedAndParticl);
-            }
+            dt = particledata.GetAreaByAllIncA(filedAndParticl);
              
 
             for (int i = 0; i < dt.Rows.Count; i++)

OTSIncAReportApp/1-UI/Control_Grids/ParticlesGridDevidePage/ParticlesGridDevidePage.Designer.cs

@@ -72,8 +72,6 @@
             this.testToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.EXCELToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.ToolStripMenuItemDelete_Particle = new System.Windows.Forms.ToolStripMenuItem();
-            this.ToolStripMenuItem_Addparticlestotheselectparticleslist = new System.Windows.Forms.ToolStripMenuItem();
-            this.ToolStripMenuItem_Removeparticlesfromtheselectparticleslist = new System.Windows.Forms.ToolStripMenuItem();
             this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
             this.dgV_ParticlesDevidePage = new System.Windows.Forms.DataGridView();
             this.panel2.SuspendLayout();
@@ -416,63 +414,61 @@
             this.ToolStripMenuItem_exportimagefile,
             this.testToolStripMenuItem,
             this.EXCELToolStripMenuItem,
-            this.ToolStripMenuItemDelete_Particle,
-            this.ToolStripMenuItem_Addparticlestotheselectparticleslist,
-            this.ToolStripMenuItem_Removeparticlesfromtheselectparticleslist});
+            this.ToolStripMenuItemDelete_Particle});
             this.contextMenuStrip1.Name = "contextMenuStrip1";
-            this.contextMenuStrip1.Size = new System.Drawing.Size(221, 252);
+            this.contextMenuStrip1.Size = new System.Drawing.Size(211, 230);
             // 
             // ToolStripMenuItem1
             // 
             this.ToolStripMenuItem1.Name = "ToolStripMenuItem1";
-            this.ToolStripMenuItem1.Size = new System.Drawing.Size(220, 22);
+            this.ToolStripMenuItem1.Size = new System.Drawing.Size(210, 22);
             this.ToolStripMenuItem1.Text = "复制整个表";
             this.ToolStripMenuItem1.Click += new System.EventHandler(this.ToolStripMenuItem1_Click);
             // 
             // ToolStripMenuItem2
             // 
             this.ToolStripMenuItem2.Name = "ToolStripMenuItem2";
-            this.ToolStripMenuItem2.Size = new System.Drawing.Size(220, 22);
+            this.ToolStripMenuItem2.Size = new System.Drawing.Size(210, 22);
             this.ToolStripMenuItem2.Text = "复制选择区域";
             this.ToolStripMenuItem2.Click += new System.EventHandler(this.ToolStripMenuItem2_Click);
             // 
             // toolStripMenuItem4
             // 
             this.toolStripMenuItem4.Name = "toolStripMenuItem4";
-            this.toolStripMenuItem4.Size = new System.Drawing.Size(220, 22);
+            this.toolStripMenuItem4.Size = new System.Drawing.Size(210, 22);
             this.toolStripMenuItem4.Text = "复制图像";
             this.toolStripMenuItem4.Click += new System.EventHandler(this.toolStripMenuItem4_Click);
             // 
             // toolStripSeparator1
             // 
             this.toolStripSeparator1.Name = "toolStripSeparator1";
-            this.toolStripSeparator1.Size = new System.Drawing.Size(217, 6);
+            this.toolStripSeparator1.Size = new System.Drawing.Size(207, 6);
             // 
             // ToolStripMenuItem3
             // 
             this.ToolStripMenuItem3.Name = "ToolStripMenuItem3";
-            this.ToolStripMenuItem3.Size = new System.Drawing.Size(220, 22);
+            this.ToolStripMenuItem3.Size = new System.Drawing.Size(210, 22);
             this.ToolStripMenuItem3.Text = "恢复至初始状态";
             this.ToolStripMenuItem3.Click += new System.EventHandler(this.ToolStripMenuItem3_Click);
             // 
             // ToolStripMenuItem5
             // 
             this.ToolStripMenuItem5.Name = "ToolStripMenuItem5";
-            this.ToolStripMenuItem5.Size = new System.Drawing.Size(220, 22);
+            this.ToolStripMenuItem5.Size = new System.Drawing.Size(210, 22);
             this.ToolStripMenuItem5.Text = "移动SEM到颗粒视域位置";
             this.ToolStripMenuItem5.Click += new System.EventHandler(this.ToolStripMenuItem5_Click);
             // 
             // ToolStripMenuItem_exportimagefile
             // 
             this.ToolStripMenuItem_exportimagefile.Name = "ToolStripMenuItem_exportimagefile";
-            this.ToolStripMenuItem_exportimagefile.Size = new System.Drawing.Size(220, 22);
+            this.ToolStripMenuItem_exportimagefile.Size = new System.Drawing.Size(210, 22);
             this.ToolStripMenuItem_exportimagefile.Text = "导出图像文件";
             this.ToolStripMenuItem_exportimagefile.Click += new System.EventHandler(this.ToolStripMenuItem_exportimagefile_Click);
             // 
             // testToolStripMenuItem
             // 
             this.testToolStripMenuItem.Name = "testToolStripMenuItem";
-            this.testToolStripMenuItem.Size = new System.Drawing.Size(220, 22);
+            this.testToolStripMenuItem.Size = new System.Drawing.Size(210, 22);
             this.testToolStripMenuItem.Text = "显示能谱数据";
             this.testToolStripMenuItem.Visible = false;
             this.testToolStripMenuItem.Click += new System.EventHandler(this.testToolStripMenuItem_Click);
@@ -480,33 +476,17 @@
             // EXCELToolStripMenuItem
             // 
             this.EXCELToolStripMenuItem.Name = "EXCELToolStripMenuItem";
-            this.EXCELToolStripMenuItem.Size = new System.Drawing.Size(220, 22);
+            this.EXCELToolStripMenuItem.Size = new System.Drawing.Size(210, 22);
             this.EXCELToolStripMenuItem.Text = "导出EXCEL";
             this.EXCELToolStripMenuItem.Click += new System.EventHandler(this.EXCELToolStripMenuItem_Click);
             // 
             // ToolStripMenuItemDelete_Particle
             // 
             this.ToolStripMenuItemDelete_Particle.Name = "ToolStripMenuItemDelete_Particle";
-            this.ToolStripMenuItemDelete_Particle.Size = new System.Drawing.Size(220, 22);
+            this.ToolStripMenuItemDelete_Particle.Size = new System.Drawing.Size(210, 22);
             this.ToolStripMenuItemDelete_Particle.Text = "删除颗粒";
             this.ToolStripMenuItemDelete_Particle.Click += new System.EventHandler(this.ToolStripMenuItem_Delete_Particle_Click);
             // 
-            // ToolStripMenuItem_Addparticlestotheselectparticleslist
-            // 
-            this.ToolStripMenuItem_Addparticlestotheselectparticleslist.Name = "ToolStripMenuItem_Addparticlestotheselectparticleslist";
-            this.ToolStripMenuItem_Addparticlestotheselectparticleslist.Size = new System.Drawing.Size(220, 22);
-            this.ToolStripMenuItem_Addparticlestotheselectparticleslist.Text = "将颗粒添加到选择颗粒列表";
-            this.ToolStripMenuItem_Addparticlestotheselectparticleslist.Visible = false;
-            this.ToolStripMenuItem_Addparticlestotheselectparticleslist.Click += new System.EventHandler(this.ToolStripMenuItem_Addparticlestotheselectparticleslist_Click);
-            // 
-            // ToolStripMenuItem_Removeparticlesfromtheselectparticleslist
-            // 
-            this.ToolStripMenuItem_Removeparticlesfromtheselectparticleslist.Name = "ToolStripMenuItem_Removeparticlesfromtheselectparticleslist";
-            this.ToolStripMenuItem_Removeparticlesfromtheselectparticleslist.Size = new System.Drawing.Size(220, 22);
-            this.ToolStripMenuItem_Removeparticlesfromtheselectparticleslist.Text = "在选择颗粒列表中去除颗粒";
-            this.ToolStripMenuItem_Removeparticlesfromtheselectparticleslist.Visible = false;
-            this.ToolStripMenuItem_Removeparticlesfromtheselectparticleslist.Click += new System.EventHandler(this.ToolStripMenuItem_Removeparticlesfromtheselectparticleslist_Click);
-            // 
             // tableLayoutPanel1
             // 
             this.tableLayoutPanel1.ColumnCount = 1;
@@ -607,8 +587,6 @@
         private System.Windows.Forms.TextBox tB_ParticleId;
         private System.Windows.Forms.Label label3;
         private System.Windows.Forms.Button btn_showconfig;
-        private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItem_Removeparticlesfromtheselectparticleslist;
         public System.Windows.Forms.ContextMenuStrip contextMenuStrip1;
-        public System.Windows.Forms.ToolStripMenuItem ToolStripMenuItem_Addparticlestotheselectparticleslist;
     }
 }

OTSIncAReportApp/1-UI/Control_Grids/ParticlesGridDevidePage/ParticlesGridDevidePage.cs

@@ -57,6 +57,10 @@ namespace OTSIncAReportGrids
 
         OTSImageDisHelp m_ReportFun = null;
         private OTSImageDisHelp ReportFun { get => m_ReportFun; set => m_ReportFun = value; }
+        /// <summary>
+        /// 选择颗粒缓存表
+        /// </summary>
+        List<Particle> Particleslist_selecttodisplay = new List<Particle>();
 
         //多个数据源，每个数据源拥有的列数，这里保存下来，供分组使用
         public List<int> m_list_oneresult_columncount;
@@ -77,7 +81,6 @@ namespace OTSIncAReportGrids
         enum SelItem
         {
             analyticalParticle = 0,
-            selectParticles = 1,
             otherParticles = 2,
             MergeParticles = 3,
             allParticles=4
@@ -261,150 +264,70 @@ namespace OTSIncAReportGrids
         bool UpdateTable()
         {
             int sel = m_ReportApp.m_conditionChoose.m_conditionData.GetComboDownListIndexByItemName(OTSIncAReportApp.OTSSampleReportInfo.OTS_REPORT_PROP_GRID_ITEMS.PARTICE_LIST);
-            if (sel == (int)SelItem.selectParticles)
-            {
-                List<Particle> selectParticles = m_ReportApp.GetSelectedParticles();
-                DataTable dtUelect = new DataTable();
-                dtUelect.Columns.Add("fieldid");
-                dtUelect.Columns.Add("particleid");
-                dtUelect.Columns.Add("AveGray");
-                dtUelect.Columns.Add("RectLeft");
-                dtUelect.Columns.Add("RectTop");
-                dtUelect.Columns.Add("RectWidth");
-                dtUelect.Columns.Add("RectHeight");
-                dtUelect.Columns.Add("Area");
-                dtUelect.Columns.Add("PosX");
-                dtUelect.Columns.Add("PosY");
-                dtUelect.Columns.Add("TypeId");
-                //dtUelect.Columns.Add("ElementNum");
-                dtUelect.Columns.Add("SegmentNum");
-                dtUelect.Columns.Add("SEMPosX");
-                dtUelect.Columns.Add("SEMPosY");
-                dtUelect.Columns.Add("XrayId");
-                dtUelect.Columns.Add("DMAX");
-                dtUelect.Columns.Add("DMIN");
-                dtUelect.Columns.Add("DPERP");
-                dtUelect.Columns.Add("PERIMETER");
-                dtUelect.Columns.Add("ORIENTATION");
-                dtUelect.Columns.Add("DINSCR");
-                dtUelect.Columns.Add("DMEAN");
-                dtUelect.Columns.Add("DELONG");
-                dtUelect.Columns.Add("DFERET");
-                dtUelect.Columns.Add("TypeName");
-                dtUelect.Columns.Add("TypeColor");
-                //dtUelect.Columns.Add("SubParticles");
-                dtUelect.Columns.Add("Element");
-                dtUelect.Columns.Add("Hardness");
-                dtUelect.Columns.Add("Density");
-                dtUelect.Columns.Add("Electrical_conductivity");
-                for (int i = 0; i < selectParticles.Count; i++)
-                {
-                    dtUelect.Rows.Add(selectParticles[i].FieldId, selectParticles[i].ParticleId, selectParticles[i].AveGray, selectParticles[i].RectLeft, selectParticles[i].RectTop, selectParticles[i].RectWidth, selectParticles[i].RectHeight, selectParticles[i].Area, selectParticles[i].PosX, selectParticles[i].PosX, selectParticles[i].TypeId, /*selectParticles[i].ElementNum,*/ selectParticles[i].SegmentNum, selectParticles[i].SEMPosX, selectParticles[i].SEMPosY, selectParticles[i].ParticleId, selectParticles[i].DMAX, selectParticles[i].DMIN, selectParticles[i].DPERP, selectParticles[i].PERIMETER, selectParticles[i].ORIENTATION, selectParticles[i].DINSCR, selectParticles[i].DMEAN, selectParticles[i].DELONG, selectParticles[i].DFERET, selectParticles[i].TypeName, selectParticles[i].TypeColor,/* "", */"", "", "", "");
-                }
-                if (userLibraryData != null)
-                {
-                    for (int i = 0; i < dtUelect.Rows.Count; i++)
-                    {
-                        DataRow[] dr = userLibraryData.Select("STDId=" + dtUelect.Rows[i]["TypeId"].ToString());
-                        if (dr.Length > 0)
-                        {
-                            dtUelect.Rows[i]["Hardness"] = System.Text.RegularExpressions.Regex.Replace(dr[0]["Hardness"].ToString(), @"[^\d.\d]", "");
-                            dtUelect.Rows[i]["Density"] = System.Text.RegularExpressions.Regex.Replace(dr[0]["Density"].ToString(), @"[^\d.\d]", "");
-                            dtUelect.Rows[i]["Electrical_conductivity"] = System.Text.RegularExpressions.Regex.Replace(dr[0]["Electrical_conductivity"].ToString(), @"[^\d.\d]", "");
-                        }
-                        else
-                        {
-                            dtUelect.Rows[i]["Hardness"] = "";
-                            dtUelect.Rows[i]["Density"] = "";
-                            dtUelect.Rows[i]["Electrical_conductivity"] = "";
-                        }
-                    }
-                }
-                else
+
+            //多次测试发现 读取数据库时间耗时长，但读取条数目对读取数据库时长影响不大，故此处直接读取所有数据库信息，以取代多次连接数据库方式，优化分页速度
+            particlesAll = new DataTable();
+            if (sel == (int)SelItem.analyticalParticle)
+            {
+                //particlesAll = Particledata.GetInfoForPartucleDevidePage2(condition);
+                particlesAll = Particledata.GetInfoForPartucleDevidePage_analyticalParticle(condition);
+                DataTable mergeParticles = Particledata.GetInfoForPartucleDevidePage_mergeParticles(condition);
+                if (mergeParticles != null && mergeParticles.Rows.Count > 0)
                 {
-                    for (int i = 0; i < dtUelect.Rows.Count; i++)
-                    {
-                        dtUelect.Rows[i]["Hardness"] = "";
-                        dtUelect.Rows[i]["Density"] = "";
-                        dtUelect.Rows[i]["Electrical_conductivity"] = "";
-                    }
+                    RemoveMergeParticles(ref particlesAll, mergeParticles);
                 }
-                particlesAll = new DataTable();
-                particlesAll = dtUelect.Copy();
-                btn_Sel.Enabled = false;
-                ToolStripMenuItem_Removeparticlesfromtheselectparticleslist.Visible = false;
-                ToolStripMenuItem_Addparticlestotheselectparticleslist.Visible = false;
             }
-            else
+            if (sel == (int)SelItem.otherParticles)
             {
-                //多次测试发现 读取数据库时间耗时长，但读取条数目对读取数据库时长影响不大，故此处直接读取所有数据库信息，以取代多次连接数据库方式，优化分页速度
-                particlesAll = new DataTable();
-                if (sel == (int)SelItem.analyticalParticle)
-                {
-                    //particlesAll = Particledata.GetInfoForPartucleDevidePage2(condition);
-                    particlesAll = Particledata.GetInfoForPartucleDevidePage_analyticalParticle(condition);
-                    DataTable mergeParticles = Particledata.GetInfoForPartucleDevidePage_mergeParticles(condition);
-                    if(mergeParticles!=null&& mergeParticles.Rows.Count>0)
-                    {
-                        RemoveMergeParticles(ref particlesAll, mergeParticles);
-                    }
-                    ToolStripMenuItem_Addparticlestotheselectparticleslist.Visible = true;
-                }                                              
-                if (sel == (int)SelItem.otherParticles)
-                {
-                    particlesAll = Particledata.GetInfoForPartucleDevidePage_otherParticle(condition);
-                    DataTable mergeParticles = Particledata.GetInfoForPartucleDevidePage_mergeParticles(condition);
-                    if (mergeParticles != null && mergeParticles.Rows.Count > 0)
-                    {
-                        RemoveMergeParticles(ref particlesAll, mergeParticles);
-                    }
-                    ToolStripMenuItem_Addparticlestotheselectparticleslist.Visible = false;
-                }
-                if (sel == (int)SelItem.MergeParticles)
-                {
-                    particlesAll = Particledata.GetInfoForPartucleDevidePage_mergeParticles(condition);
-                    ToolStripMenuItem_Addparticlestotheselectparticleslist.Visible = false;
-                }
-                if (sel == (int)SelItem.allParticles)
+                particlesAll = Particledata.GetInfoForPartucleDevidePage_otherParticle(condition);
+                DataTable mergeParticles = Particledata.GetInfoForPartucleDevidePage_mergeParticles(condition);
+                if (mergeParticles != null && mergeParticles.Rows.Count > 0)
                 {
-                    particlesAll = Particledata.GetInfoForPartucleDevidePage_allParticles(condition);
-                    ToolStripMenuItem_Addparticlestotheselectparticleslist.Visible = false;
+                    RemoveMergeParticles(ref particlesAll, mergeParticles);
                 }
-                particlesAll.Columns.Add("Hardness");
-                particlesAll.Columns.Add("Density");
-                particlesAll.Columns.Add("Electrical_conductivity");
-                if (userLibraryData != null)
+            }
+            if (sel == (int)SelItem.MergeParticles)
+            {
+                particlesAll = Particledata.GetInfoForPartucleDevidePage_mergeParticles(condition);
+            }
+            if (sel == (int)SelItem.allParticles)
+            {
+                particlesAll = Particledata.GetInfoForPartucleDevidePage_allParticles(condition);
+            }
+            particlesAll.Columns.Add("Hardness");
+            particlesAll.Columns.Add("Density");
+            particlesAll.Columns.Add("Electrical_conductivity");
+            if (userLibraryData != null)
+            {
+                for (int i = 0; i < particlesAll.Rows.Count; i++)
                 {
-                    for (int i = 0; i < particlesAll.Rows.Count; i++)
+                    DataRow[] dr = userLibraryData.Select("STDId=" + particlesAll.Rows[i]["TypeId"].ToString());
+                    if (dr.Length > 0)
                     {
-                        DataRow[] dr = userLibraryData.Select("STDId=" + particlesAll.Rows[i]["TypeId"].ToString());
-                        if (dr.Length > 0)
-                        {
-                            particlesAll.Rows[i]["Hardness"] = dr[0]["Hardness"].ToString();
-                            particlesAll.Rows[i]["Density"] = dr[0]["Density"].ToString();
-                            particlesAll.Rows[i]["Electrical_conductivity"] = dr[0]["Electrical_conductivity"].ToString();
-                        }
-                        else
-                        {
-                            particlesAll.Rows[i]["Hardness"] = "";
-                            particlesAll.Rows[i]["Density"] = "";
-                            particlesAll.Rows[i]["Electrical_conductivity"] = "";
-                        }
+                        particlesAll.Rows[i]["Hardness"] = dr[0]["Hardness"].ToString();
+                        particlesAll.Rows[i]["Density"] = dr[0]["Density"].ToString();
+                        particlesAll.Rows[i]["Electrical_conductivity"] = dr[0]["Electrical_conductivity"].ToString();
                     }
-                }
-                else
-                {
-                    for (int i = 0; i < particlesAll.Rows.Count; i++)
+                    else
                     {
                         particlesAll.Rows[i]["Hardness"] = "";
                         particlesAll.Rows[i]["Density"] = "";
                         particlesAll.Rows[i]["Electrical_conductivity"] = "";
                     }
                 }
-
-                btn_Sel.Enabled = true;
-                ToolStripMenuItem_Removeparticlesfromtheselectparticleslist.Visible = false;
             }
+            else
+            {
+                for (int i = 0; i < particlesAll.Rows.Count; i++)
+                {
+                    particlesAll.Rows[i]["Hardness"] = "";
+                    particlesAll.Rows[i]["Density"] = "";
+                    particlesAll.Rows[i]["Electrical_conductivity"] = "";
+                }
+            }
+
+            btn_Sel.Enabled = true;
+
             if (particlesAll == null)
             {
                 log.Error("There is an exception in the data of the database!");
@@ -2571,17 +2494,9 @@ namespace OTSIncAReportGrids
                     ToolStripMenuItemDelete_Particle.Visible = false;
                 }
             }
-            if(m_ReportApp.im_Control_DrawDistrbutionImageAndBSE==null)
-            {
-                //ToolStripMenuItemDelete_Particle.Enabled = false;
-                ToolStripMenuItem_Addparticlestotheselectparticleslist.Visible = false;
-                ToolStripMenuItem_Removeparticlesfromtheselectparticleslist.Visible = false;
-            }
-            else
+            if(SelectRows!=null)
             {
-                //ToolStripMenuItemDelete_Particle.Enabled = true;
-                ToolStripMenuItem_Addparticlestotheselectparticleslist.Visible = false;
-                ToolStripMenuItem_Removeparticlesfromtheselectparticleslist.Visible = false;
+                SaveParticleslist_select();
             }
         }
         /// <summary>
@@ -2636,45 +2551,14 @@ namespace OTSIncAReportGrids
             }
         }
 
-        private void ToolStripMenuItem_Addparticlestotheselectparticleslist_Click(object sender, EventArgs e)
-        {
-            string path = result.FilePath;
-            ParticleData fielddata = new ParticleData(result.FilePath);
-            List<Particle> particles = fielddata.GetParticleAllList();
 
-            List<Particle> ls_list_cotsparticleclr = new List<Particle>();
-            for (int l = 0; l < dgV_ParticlesDevidePage.SelectedRows.Count; l++)
-            {
-                //从事先加载的Bitmap对象的Tag中取出List<string>
-                DataGridViewRow dgvr = dgV_ParticlesDevidePage.SelectedRows[l];
-                Bitmap ls_bp = (Bitmap)dgvr.Cells[2].Value;
-                List<string> list_str = (List<string>)ls_bp.Tag;
-                if (list_str != null)
-                {
-                    int i_ls_fieldid = Convert.ToInt32(list_str[0]);
-                    int i_ls_particleid = Convert.ToInt32(list_str[1]);
-                    foreach (Particle item in particles)
-                    {
-                        if (i_ls_fieldid == item.FieldId && i_ls_particleid == item.ParticleId)
-                        {
-                            ls_list_cotsparticleclr.Add(item);
-                            break;
-                        }
-                    }
-
-                }
-            }
-            m_ReportApp.AddParticlesToSelectedParticles(ls_list_cotsparticleclr);
-        }
-
-        private void ToolStripMenuItem_Removeparticlesfromtheselectparticleslist_Click(object sender, EventArgs e)
+        private void SaveParticleslist_select()
         {
-            string path = result.FilePath;
             ParticleData fielddata = new ParticleData(result.FilePath);
             List<Particle> particles = fielddata.GetParticleAllList();
 
-            List<Particle> ls_list_cotsparticleclr = new List<Particle>();
-            for (int l = 0; l < dgV_ParticlesDevidePage.SelectedRows.Count; l++)
+            List<Particle> Particleslist_selecttodisplay = new List<Particle>();
+            for (int l = 0; l < 1; l++)
             {
                 //从事先加载的Bitmap对象的Tag中取出List<string>
                 DataGridViewRow dgvr = dgV_ParticlesDevidePage.SelectedRows[l];
@@ -2688,18 +2572,13 @@ namespace OTSIncAReportGrids
                     {
                         if (i_ls_fieldid == item.FieldId && i_ls_particleid == item.ParticleId)
                         {
-                            ls_list_cotsparticleclr.Add(item);
+                            Particleslist_selecttodisplay.Add(item);
                             break;
                         }
                     }
 
                 }
             }
-            m_ReportApp.DeleteParticlesFromSelectedParticles(ls_list_cotsparticleclr);
-            foreach (DataGridViewRow Row in dgV_ParticlesDevidePage.SelectedRows)
-            {
-                dgV_ParticlesDevidePage.Rows.Remove(Row);
-            }
         }
     }
 }

OTSIncAReportApp/1-UI/Control_Grids/ParticlesSizeGrid.cs

@@ -95,30 +95,7 @@ namespace OTSIncAReportGrids
             int sel = m_ReportApp.m_conditionChoose.m_conditionData.GetComboDownListIndexByItemName(OTSIncAReportApp.OTSSampleReportInfo.OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE);
             string filedAndParticl = "";
             DataTable dt;
-            if (sel == 1)
-            {
-                List<Particle> selectParticles = m_ReportApp.GetSelectedParticles();
-                foreach (var item in selectParticles)
-                {
-                    filedAndParticl = filedAndParticl + "," + (item.FieldId.ToString() + "-" + item.ParticleId.ToString());
-                }
-                if (filedAndParticl != "")
-                {
-                    filedAndParticl = filedAndParticl + ",";
-                }
-                if(selectParticles.Count == 0)
-                {
-                    dt = new DataTable();
-                }
-                else
-                {
-                    dt = particledata.GetParticleListForParticlSize("area", filedAndParticl);
-                }
-            }
-            else
-            {
-                dt = particledata.GetParticleListForParticlSize("area", filedAndParticl);
-            }
+            dt = particledata.GetParticleListForParticlSize("area", filedAndParticl);
             gridView.MergeColumnNames.Add(filename);
             gridView.AddSpanHeader(1, gridView.Columns.Count - 1, filename);
 

OTSIncAReportApp/1-UI/OTSDisplaySourceGridData/frmReportConditionChoose.Designer.cs

@@ -47,7 +47,7 @@
             this.PropGrid.ToolTipText = "";
             this.PropGrid.Click += new System.EventHandler(this.PropGrid_Click_1);
             // 
-            // frmMeasureRstProp
+            // frmReportConditionChoose
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
@@ -58,13 +58,14 @@
             this.DockAreas = ((OTS.WinFormsUI.Docking.DockAreas)((((OTS.WinFormsUI.Docking.DockAreas.DockLeft | OTS.WinFormsUI.Docking.DockAreas.DockRight) 
             | OTS.WinFormsUI.Docking.DockAreas.DockTop) 
             | OTS.WinFormsUI.Docking.DockAreas.DockBottom)));
-            this.Font = new System.Drawing.Font("SimSun", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Margin = new System.Windows.Forms.Padding(4);
             this.Name = "frmReportConditionChoose";
             this.RightToLeftLayout = true;
             this.Text = "查询参数窗口";
             this.WindowState = System.Windows.Forms.FormWindowState.Minimized;
+            this.Load += new System.EventHandler(this.frmReportConditionChoose_Load);
             this.Resize += new System.EventHandler(this.OTSPropertyWindow_Resize);
             this.ResumeLayout(false);
 

OTSIncAReportApp/1-UI/OTSDisplaySourceGridData/frmReportConditionChoose.cs

@@ -83,6 +83,7 @@ namespace OTSIncAReportApp
         public void SetDefaultConditionValue()
         {
             m_CurrentConditions.Clear();
+
             //image condition items.
             #region 从xml文档中读取的数据信息
             string resultData = resTable["sscaptionname1"].ToString();//测量结果数据
@@ -130,7 +131,7 @@ namespace OTSIncAReportApp
             List<string> list_source_str = m_rstDataMgr.GetSampleListName();
             AddGridData(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE, resultData, OTS_ITEM_TYPES.COMBO, false, "Select Measurement Result", list_source_str[m_rstDataMgr.GetWorkingResultId()], list_source_str, m_rstDataMgr.GetWorkingResultId());
             //数据源类型，全部 or selected
-            List<string> list_sourcetype = new List<string>() { allParticles, selectParticles};
+            List<string> list_sourcetype = new List<string>() { allParticles};
             AddGridData(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE, dataSourceType, OTS_ITEM_TYPES.COMBO, false, "data source type", list_sourcetype[(int)DATASOURCE_TYPE.ALL], list_sourcetype, DATASOURCE_TYPE.ALL);
             //测量图类别 分布图 or 排列图
             List<string> list1 = new List<string>() { distributionMap, arrangementDiagram };
@@ -192,7 +193,7 @@ namespace OTSIncAReportApp
             AddGridData(OTS_REPORT_PROP_GRID_ITEMS.STD_ID, "ClassifyId", OTS_ITEM_TYPES.COMBO, false, "std list", stdlistname[0], stdlistname, null);
 
             //颗粒列表数据类型
-            List<string> list_PARTICE_LIST = new List<string>() { analyticalParticle, selectParticles, otherParticles, MergeParticles, allParticles };
+            List<string> list_PARTICE_LIST = new List<string>() { analyticalParticle, otherParticles, MergeParticles, allParticles };
             AddGridData(OTS_REPORT_PROP_GRID_ITEMS.PARTICE_LIST, dataSourceType, OTS_ITEM_TYPES.COMBO, false, "data source type", list_PARTICE_LIST[0], list_PARTICE_LIST, 0);
         }
         #region 属性Grid相关方法
@@ -985,5 +986,9 @@ namespace OTSIncAReportApp
         }
         #endregion
 
+        private void frmReportConditionChoose_Load(object sender, EventArgs e)
+        {
+
+        }
     }
 }

OTSIncAReportApp/1-UI/frmReportApp.cs

@@ -213,26 +213,6 @@ namespace OTSIncAReportApp
                 }
             }
         }
-
-        public void DeleteParticlesFromSelectedParticles(List<Particle> value)
-        {
-            foreach (var p2 in value)
-            {
-                foreach (var p in selectedParticles.Values)
-                {
-                    if (p.objParticleData.FieldId == p2.FieldId)
-                    {
-                        if (p.objParticleData.ParticleId == p2.ParticleId)
-                        {
-                            p.IsSelect = false;
-                            selectedParticles.Remove(p.guid);
-                            break;
-                        }
-                    }
-                }
-            }
-        }
-
         #endregion //--------------------------------------------------------------------------------------------