refactor on the sourcegrid display algorithm.

Bin/x64/Debug/Resources/XMLData/AppResource_ZH.xml

@@ -193,12 +193,7 @@
       <Control name="str2" text=" file?" />
     </Controls>
  </Form>
- <Form>
- <Name>frmReportConditionChoose</Name>
-    <Controls>
-      <Control name="frmReportConditionChoose" text="查询参数窗口" />
-    </Controls>
- </Form>
+
   <Form>
  <Name>frmMultiSourceSelect</Name>
     <Controls>
@@ -713,7 +708,7 @@
     <Name>frmReportConditionChoose</Name>
     <Controls>
       <Control name="sscaptionname1" text="测量结果数据" />
-	  <Control name="sscaptionname2" text="测量图类型" />
+	  <Control name="sscaptionname2" text="颗粒显示方式" />
 	  <Control name="sscaptionname3" text="测量图显示方式" />
 	  <Control name="sscaptionname4" text="颗粒类型" />
 	  <Control name="sscaptionname5" text="粒级" />
@@ -731,9 +726,9 @@
 	  <Control name="sscaptionname17" text="分析颗粒" />
 	  <Control name="sscaptionname18" text="自定义" />
 	  <Control name="sscaptionname19" text="全部颗粒类型" />
-	  <Control name="sscaptionname20" text="分析颗粒类型" />
-	  <Control name="sscaptionname21" text="颗粒尺寸类型" />
-	  <Control name="sscaptionname22" text="测量数据" />
+	  <Control name="sscaptionname20" text="按类型排列" />
+	  <Control name="sscaptionname21" text="按尺寸排列" />
+	  <Control name="sscaptionname22" text="排列方式" />
 	  <Control name="sscaptionname23" text="全部颗粒" />
 	  <Control name="sscaptionname24" text="选择颗粒" />
 	  <Control name="sscaptionname25" text="测量结果概况" />

OTSIncAReportApp/1-UI/Control_ECharts/EChart_ParticlesComposition.cs

@@ -63,7 +63,7 @@ namespace OTSIncAReportApp.Control_ECharts
 
             //int idx = m_ReportApp.m_DataMgrFun.GetPropIndexByPropItemName(m_ReportApp.SourceGridData.ConditionItemList, OTSSampleReportInfo.OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE);
             //string sou = m_ReportApp.SourceGridData.ConditionItemList[idx].itemVal.ToString();
-            string sou = m_conditionChoose.SourceGridData.GetPropItemValueByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE).ToString();
+            string sou = m_conditionChoose.m_SourceGridData.GetPropItemValueByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE).ToString();
             if (sou.Contains("+"))
             {
                 if (m_ReportApp.more)
@@ -113,7 +113,7 @@ namespace OTSIncAReportApp.Control_ECharts
 
             //int idx = m_ReportApp.m_DataMgrFun.GetPropIndexByPropItemName(m_ReportApp.SourceGridData.ConditionItemList, OTSSampleReportInfo.OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE);
             //int sel = m_ReportApp.SourceGridData.ConditionItemList[idx].comboDownList.IndexOf(m_ReportApp.SourceGridData.ConditionItemList[idx].itemVal.ToString());
-            int sel = m_conditionChoose.SourceGridData.GetPropIndexByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE);
+            int sel = m_conditionChoose.m_SourceGridData.GetPropIndexByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE);
             string filedAndParticl = "";
             if (sel == 1)
             {
@@ -207,7 +207,7 @@ namespace OTSIncAReportApp.Control_ECharts
 
             //int idx = m_ReportApp.m_DataMgrFun.GetPropIndexByPropItemName(m_ReportApp.SourceGridData.ConditionItemList, OTSSampleReportInfo.OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE);
             //int sel = m_ReportApp.SourceGridData.ConditionItemList[idx].comboDownList.IndexOf(m_ReportApp.SourceGridData.ConditionItemList[idx].itemVal.ToString());
-            int sel = m_conditionChoose.SourceGridData.GetPropIndexByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE);
+            int sel = m_conditionChoose.m_SourceGridData.GetPropIndexByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE);
 
             string filedAndParticl = "";
             if (sel == 1)
@@ -297,7 +297,7 @@ namespace OTSIncAReportApp.Control_ECharts
 
             //int idx = m_ReportApp.m_DataMgrFun.GetPropIndexByPropItemName(m_ReportApp.SourceGridData.ConditionItemList, OTSSampleReportInfo.OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE);
             //int sel = m_ReportApp.SourceGridData.ConditionItemList[idx].comboDownList.IndexOf(m_ReportApp.SourceGridData.ConditionItemList[idx].itemVal.ToString());
-            int sel = m_conditionChoose.SourceGridData.GetPropIndexByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE);
+            int sel = m_conditionChoose.m_SourceGridData.GetPropIndexByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE);
 
             string filedAndParticl = "";
             if (sel == 1)
@@ -387,7 +387,7 @@ namespace OTSIncAReportApp.Control_ECharts
 
             //int idx = m_ReportApp.m_DataMgrFun.GetPropIndexByPropItemName(m_ReportApp.SourceGridData.ConditionItemList, OTSSampleReportInfo.OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE);
             //int sel = m_ReportApp.SourceGridData.ConditionItemList[idx].comboDownList.IndexOf(m_ReportApp.SourceGridData.ConditionItemList[idx].itemVal.ToString());
-            int sel = m_conditionChoose.SourceGridData.GetPropIndexByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE);
+            int sel = m_conditionChoose.m_SourceGridData.GetPropIndexByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE);
 
             string filedAndParticl = "";
             if (sel == 1)
@@ -405,7 +405,7 @@ namespace OTSIncAReportApp.Control_ECharts
 
             //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();
-            string con = m_conditionChoose.SourceGridData.GetPropItemValueByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.SIZE_CAL_METHOD_TYPE).ToString();
+            string con = m_conditionChoose.m_SourceGridData.GetPropItemValueByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.SIZE_CAL_METHOD_TYPE).ToString();
             string po = "";
             switch (con)
             {
@@ -491,7 +491,7 @@ namespace OTSIncAReportApp.Control_ECharts
         {
             //int idx = m_ReportApp.m_DataMgrFun.GetPropIndexByPropItemName(m_ReportApp.SourceGridData.ConditionItemList, OTSSampleReportInfo.OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE);
             //int sel = m_ReportApp.SourceGridData.ConditionItemList[idx].comboDownList.IndexOf(m_ReportApp.SourceGridData.ConditionItemList[idx].itemVal.ToString());
-            int sel = m_conditionChoose.SourceGridData.GetPropIndexByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE);
+            int sel = m_conditionChoose.m_SourceGridData.GetPropIndexByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE);
             string filedAndParticl = "";
             if (sel == 1)
             {
@@ -517,7 +517,7 @@ namespace OTSIncAReportApp.Control_ECharts
 
             //idx = m_ReportApp.m_DataMgrFun.GetPropIndexByPropItemName(m_ReportApp.SourceGridData.ConditionItemList, OTSSampleReportInfo.OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE);
             //string sou = m_ReportApp.SourceGridData.ConditionItemList[idx].itemVal.ToString();
-            string sou = m_conditionChoose.SourceGridData.GetPropItemValueByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE).ToString();
+            string sou = m_conditionChoose.m_SourceGridData.GetPropItemValueByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE).ToString();
             if (sou.Contains("+"))
             {
                 for (int i = 0; i < sou.Split('+').Length; i++)
@@ -660,7 +660,7 @@ namespace OTSIncAReportApp.Control_ECharts
                                 listName.Add(name1);
                             }
                             //string con = m_ReportApp.SourceGridData.ConditionItemList[m_ReportApp.m_DataMgrFun.GetPropIndexByPropItemName(m_ReportApp.SourceGridData.ConditionItemList, OTSSampleReportInfo.OTS_REPORT_PROP_GRID_ITEMS.SIZE_CAL_METHOD_TYPE)].itemVal.ToString();
-                            string con = m_conditionChoose.SourceGridData.GetPropItemValueByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.SIZE_CAL_METHOD_TYPE).ToString();
+                            string con = m_conditionChoose.m_SourceGridData.GetPropItemValueByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.SIZE_CAL_METHOD_TYPE).ToString();
                             string po = "";
                             switch (con)
                             {

OTSIncAReportApp/1-UI/Control_ECharts/EChart_Trianglediagram.cs

@@ -78,7 +78,7 @@ namespace OTSIncAReportApp.Control_ECharts
             string template = Template;
             if (template == "")
             { //三元相图模板
-                template = m_condition.SourceGridData.GetPropItemValueByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.TRIO_CHART_TYPE).ToString();
+                template = m_condition.m_SourceGridData.GetPropItemValueByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.TRIO_CHART_TYPE).ToString();
             }
 
             //获取粒级表
@@ -105,7 +105,7 @@ namespace OTSIncAReportApp.Control_ECharts
             //将所有的测量结果名添加到list中
             m_list_string_samplename.Clear();
 
-            string sou = m_condition.SourceGridData.GetPropItemValueByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE).ToString();
+            string sou = m_condition.m_SourceGridData.GetPropItemValueByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE).ToString();
             if (sou.Contains("+"))
             {
                 if (m_ReportApp.more)
@@ -232,7 +232,7 @@ namespace OTSIncAReportApp.Control_ECharts
             double d = Convert.ToDouble(sizestr.Split(',')[sizestr.Split(',').Length - 1]);
             listName.Add(d.ToString() + "~MAX");
             //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.SourceGridData.GetPropIndexByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE);
+            int sel = m_condition.m_SourceGridData.GetPropIndexByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE);
             string filedAndParticl = "";
             if (sel == 1)
             {
@@ -248,7 +248,7 @@ namespace OTSIncAReportApp.Control_ECharts
             }
             string po = "";
             string con = "";
-            int row = m_condition.SourceGridData.ConditionItemList.Count;
+            int row = m_condition.m_SourceGridData.ConditionItemList.Count;
             if (condition != -1)
             {
                 List<string> li = new List<string>() { "DMAX", "DMIN", "Area", "FERET" };
@@ -262,7 +262,7 @@ namespace OTSIncAReportApp.Control_ECharts
                 }
                 else
                 {
-                    con = m_condition.SourceGridData.GetPropItemValueByPropItemName( OTS_REPORT_PROP_GRID_ITEMS.SIZE_CAL_METHOD_TYPE).ToString();
+                    con = m_condition.m_SourceGridData.GetPropItemValueByPropItemName( OTS_REPORT_PROP_GRID_ITEMS.SIZE_CAL_METHOD_TYPE).ToString();
                 }
             }
 

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

@@ -510,9 +510,9 @@ namespace OTSIncAReportGraph.Controls
         {
   
             var list = sourceGridData.ConditionItemList.Find(s => s.iItemId == OTS_REPORT_PROP_GRID_ITEMS.GRAIN_SIZE_CLASS);
-            string size = list.itemVal.ToString();
+            string size = list.itemDisplayVal.ToString();
             int index = list.comboDownList.IndexOf(size);
-            string size_cal_method_type = sourceGridData.ConditionItemList.Find(s => Convert.ToInt32(s.iItemId) == 13).itemVal.ToString();
+            string size_cal_method_type = sourceGridData.ConditionItemList.Find(s => Convert.ToInt32(s.iItemId) == 13).itemDisplayVal.ToString();
             string con = "";
             switch (size_cal_method_type)
             {
@@ -533,8 +533,8 @@ namespace OTSIncAReportGraph.Controls
             string max = "999";
             if (index != 0)
             {
-                max = sourceGridData.ConditionItemList.Find(s => s.iItemId == OTS_REPORT_PROP_GRID_ITEMS.GRAIN_SIZE_MAX).itemVal.ToString();
-                min = sourceGridData.ConditionItemList.Find(s => s.iItemId == OTS_REPORT_PROP_GRID_ITEMS.GRAIN_SIZE_MIN).itemVal.ToString();
+                max = sourceGridData.ConditionItemList.Find(s => s.iItemId == OTS_REPORT_PROP_GRID_ITEMS.GRAIN_SIZE_MAX).itemDisplayVal.ToString();
+                min = sourceGridData.ConditionItemList.Find(s => s.iItemId == OTS_REPORT_PROP_GRID_ITEMS.GRAIN_SIZE_MIN).itemDisplayVal.ToString();
                 if (max.ToLower() == "max")
                 {
                     max = "999";

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

@@ -20,12 +20,12 @@ using System.Windows.Forms;
 
 namespace OTSIncAReportGraph.Controls
 {
-    public enum ParticleClassifyType
-    { 
-    MaterialType=0,
-    SizeType=1
+    //public enum ParticleClassifyType
+    //{ 
+    //MaterialType=0,
+    //SizeType=1
     
-    }
+    //}
     public partial class Control_DrawDistrbutionSortImage : UserControl
     {
  
@@ -1505,108 +1505,57 @@ namespace OTSIncAReportGraph.Controls
         /// <summary>
         /// 颗粒排序图中的颗粒,重新组织显示颗粒排序规则
         /// </summary>
-        public void GetDistrbutionSortimage_ByQuery(OTSIncAReportApp.OTSSampleReportInfo.ReportCondition sourceGridData)
+        public void GetDistrbutionSortimage_ByQuery(Dictionary<OTS_REPORT_PROP_GRID_ITEMS,ConditionItem> currentConditionValue)
         {
-            m_list_cgriddataclr = sourceGridData;
-            List<string> FLNameList = new List<string>();
-            //List<int> FLID = new List<int>() { -1,0, 1, 2, 4, 6, 7, 8, 9 };
-            List<int> FLID = new List<int>() { 0, 1, 2, 4, 6, 9, 10 };
-            List<string> NameList = new List<string>();
-            ParticleClassifyType fltype = ParticleClassifyType.MaterialType;
-            //先清除list
+           
+            Dictionary<string, List<DisplayParticle>> FLNameList = new System.Collections.Generic.Dictionary<string, List<DisplayParticle>>();
+
             m_list_sortparticledistribution.Clear();
-            m_old_list_sortparticledistribution.Clear();
+            List<string> NameList = new List<string>();
+         
             m_f_zoom_record = 1;
 
 
             //------------------------------------分解结果内容部份------------------------------------
-            string display_type = "";
-            string con = "";
-            var list = sourceGridData.ConditionItemList.Find(s => Convert.ToInt32(s.iItemId) == 4);
-            string sort_type = list.itemVal.ToString();
-            int _type = list.comboDownList.IndexOf(sort_type);
-            switch (_type)
+            //SIZECALMETHOM sizeCalculate_type;
+            //string con = "";
+            var conItem = currentConditionValue[OTS_REPORT_PROP_GRID_ITEMS.IMAGEGRID_DIS_TYPE];
+            if (conItem == null)
             {
-                case 0:
-                    fltype = ParticleClassifyType.MaterialType;
-                    break;
-                case 1:
-                    fltype = ParticleClassifyType.MaterialType; ;
-                //    break;
-                //case 2:
-                //    fltype = 2;
-                    display_type = sourceGridData.ConditionItemList.Find(s => Convert.ToInt32(s.iItemId) == 13).itemVal.ToString();
-                    switch (display_type)
-                    {
-                        case "DMAX":
-                            con = "DMAX";
-                            break;
-                        case "DMIN":
-                            con = "DMIN";
-                            break;
-                        case "Area":
-                            con = "Area";
-                            break;
-                        case "FERET":
-                            con = "DFERET";
-                            break;
-                    }
-                    break;
-
+                return;
             }
-            string path = resultFile.FilePath;
-            ParticleData particleData = new ParticleData(path);
-            List<Particle> particles = particleData.GetParticleListByCon("", "", "", 0);
+          
+            var _type = (IMAGEGRID_DIS_TYPE)conItem.itemVal;
 
-            foreach (DisplayParticle ls_dp in m_list_baseobject)
+            if (_type == IMAGEGRID_DIS_TYPE.CLASSIFY_TYPE)
             {
-                int dis = 0;
-                foreach (Particle particle in particles)
+                foreach (DisplayParticle ls_dp in m_list_baseobject)
                 {
-                    //找到对应的颗粒，将分类设置进去
-                    if (ls_dp.ParticleId == particle.ParticleId && ls_dp.FieldId == particle.FieldId)
+                    if (!FLNameList.ContainsKey(ls_dp.TypeName))
                     {
-                        if (!FLNameList.Contains(particle.TypeName) && particle.TypeName != "")
-                        {
-                            FLNameList.Add(particle.TypeName);
-                        }
-                    
-                        if (fltype == ParticleClassifyType.MaterialType)
-                        {
-                            ls_dp.ParticleFL = particle.TypeName.ToString();
-                        }
-                        if (fltype == ParticleClassifyType.SizeType)
-                        {
-                            if (con == "DMAX")
-                                ls_dp.ParticleFL = particle.DMAX.ToString();
-                            if (con == "DMIN")
-                                ls_dp.ParticleFL = particle.DMIN.ToString();
-                            if (con == "Area")
-                                ls_dp.ParticleFL = particle.Area.ToString();
-                            if (con == "DFERET")
-                                ls_dp.ParticleFL = particle.FERET.ToString();
-                        }
-                        ls_dp.displayState = DisplayState.NORMALDISPLAY;
-                        dis = 1;
-                        break;
+                        List<DisplayParticle> newParts = new List<DisplayParticle>();
+                        newParts.Add(ls_dp);
+                        FLNameList.Add(ls_dp.TypeName, newParts);
                     }
+                    else
+                    {
+                        FLNameList[ls_dp.TypeName].Add(ls_dp);
 
+                    }
                 }
-                if (dis == 0)
+                foreach (var keyvaluePair in FLNameList)
                 {
-                    ls_dp.displayState = DisplayState.NODISPLAY;
+                    SortParticleDistribution sortparticledistribution = new SortParticleDistribution();
+                    sortparticledistribution.RectF = new RectangleF(ClientRectangle.X, ClientRectangle.Y,
+                        800, ClientRectangle.Height);
+                    sortparticledistribution.ShowStr = keyvaluePair.Key;//设置分类grid
+                    sortparticledistribution.List_DParticle = keyvaluePair.Value;
+                    m_list_sortparticledistribution.Add(sortparticledistribution);
                 }
+
+
             }
-            //if (fltype == 0)
-            //{
-            //    //NameList = new List<string>() { table["partcletype0"].ToString(), table["partcletype1"].ToString(), table["partcletype2"].ToString(), table["partcletype4"].ToString(), table["partcletype6"].ToString(), table["partcletype7"].ToString(), table["partcletype8"].ToString(), table["partcletype9"].ToString(), table["partcletype10"].ToString() };
-            //    NameList = new List<string>() { resourceTable["partcletype9"].ToString(), resourceTable["partcletype10"].ToString() };
-            //}
-            if (fltype == ParticleClassifyType.MaterialType)
-            {
-                NameList = FLNameList;
-            }
-            if (fltype == ParticleClassifyType.SizeType)
+            else
             {
                 //获取粒级表
                 string flpath = m_ReportApp.m_DataMgrFun.m_RptConfigFile.FileFolderSize + m_ReportApp.m_DataMgrFun.m_RptConfigFile.PartSizeFile;
@@ -1626,57 +1575,40 @@ namespace OTSIncAReportGraph.Controls
                 double d = Convert.ToDouble(sizestr.Split(',')[sizestr.Split(',').Length - 1]);
                 sizeList.Add(d.ToString() + "~MAX");
                 NameList = sizeList;
-            }
-            //为颗粒排序图，创建分栏grid
-            foreach (string name in NameList)
-            {
-                SortParticleDistribution sortparticledistribution = new SortParticleDistribution();
-                sortparticledistribution.RectF = new RectangleF(ClientRectangle.X, ClientRectangle.Y,
-                    800, ClientRectangle.Height);
-                sortparticledistribution.ShowStr = name;//设置分类grid
-                m_list_sortparticledistribution.Add(sortparticledistribution);
-            }
-
-            //然后再重新将list_baseobject中的颗粒，分别添加到对应的sortgrid中
-            foreach (DisplayParticle ls_dp in m_list_baseobject)
-            {
 
-                var sort = m_list_sortparticledistribution;
-                for (int i = 0; i < sort.Count; i++)
+                foreach (string name in NameList)
                 {
-                    //if (fltype == 0)
-                    //{
+                    SortParticleDistribution sortparticledistribution = new SortParticleDistribution();
+                    sortparticledistribution.RectF = new RectangleF(ClientRectangle.X, ClientRectangle.Y,
+                        800, ClientRectangle.Height);
+                    sortparticledistribution.ShowStr = name;//设置分类grid
 
-                    //    if (ls_dp.TypeId == FLID[i])
-                    //    {
-                    //        //将对应的颗粒添加到分栏grid中
-                    //        DisplayParticle sort_dp = ls_dp.Clone() as DisplayParticle;
-                    //        sort_dp.Rect = sort_dp.GetRectFromDSegment();
-                    //        sort[i].List_DParticle.Add(sort_dp);
-                    //        break;
-                    //    }
-                    //    else if (ls_dp.TypeId > 10000)
-                    //    {
-                    //        //将对应的颗粒添加到分栏grid中
-                    //        DisplayParticle sort_dp = ls_dp.Clone() as DisplayParticle;
-                    //        sort_dp.Rect = sort_dp.GetRectFromDSegment();
-                    //        sort[sort.Count - 1].List_DParticle.Add(sort_dp);
-                    //        break;
-                    //    }
-                    //}
-                     if (fltype == ParticleClassifyType.MaterialType)
+                    m_list_sortparticledistribution.Add(sortparticledistribution);
+                }
+                foreach (DisplayParticle ls_dp in m_list_baseobject)
+                {
+                    var sizeCalItem = currentConditionValue[OTS_REPORT_PROP_GRID_ITEMS.SIZE_CAL_METHOD_TYPE];
+                    switch ((SIZECALMETHOM)sizeCalItem.itemVal)
                     {
-                        if (ls_dp.TypeName == NameList[i])
-                        {
-                            //将对应的颗粒添加到分栏grid中
-                            DisplayParticle sort_dp = ls_dp.Clone() as DisplayParticle;
-                            sort_dp.Rect = sort_dp.GetRectFromDSegment();
-                            sort[i].List_DParticle.Add(sort_dp);
+                        case SIZECALMETHOM.DMAX:
+                            ls_dp.ParticleFL = ls_dp.objParticleData.DMAX.ToString();
+                            break;
+                        case SIZECALMETHOM.DMIN:
+                            ls_dp.ParticleFL = ls_dp.objParticleData.DMIN.ToString();
+                            break;
+                        case SIZECALMETHOM.CIRCLE:
+                            ls_dp.ParticleFL = Convert.ToString(Math.Sqrt(ls_dp.objParticleData.Area / 3.14159) * 2);
+                            break;
+                        case SIZECALMETHOM.FERET:
+                            ls_dp.ParticleFL = ls_dp.objParticleData.FERET.ToString();
+                            break;
+                        default:
                             break;
-                        }
+
 
                     }
-                    else if (fltype == ParticleClassifyType.SizeType)
+                    var sort = m_list_sortparticledistribution;
+                    for (int i = 0; i < sort.Count; i++)
                     {
                         double min = Convert.ToDouble(NameList[i].Split('~')[0]);
                         double max = 0;
@@ -1697,9 +1629,78 @@ namespace OTSIncAReportGraph.Controls
                         }
 
                     }
-                }
 
+                }
             }
+     
+
+            
+
+       
+
+            //然后再重新将list_baseobject中的颗粒，分别添加到对应的sortgrid中
+            //foreach (DisplayParticle ls_dp in m_list_baseobject)
+            //{
+
+            //    var sort = m_list_sortparticledistribution;
+            //    for (int i = 0; i < sort.Count; i++)
+            //    {
+            //        //if (fltype == 0)
+            //        //{
+
+            //        //    if (ls_dp.TypeId == FLID[i])
+            //        //    {
+            //        //        //将对应的颗粒添加到分栏grid中
+            //        //        DisplayParticle sort_dp = ls_dp.Clone() as DisplayParticle;
+            //        //        sort_dp.Rect = sort_dp.GetRectFromDSegment();
+            //        //        sort[i].List_DParticle.Add(sort_dp);
+            //        //        break;
+            //        //    }
+            //        //    else if (ls_dp.TypeId > 10000)
+            //        //    {
+            //        //        //将对应的颗粒添加到分栏grid中
+            //        //        DisplayParticle sort_dp = ls_dp.Clone() as DisplayParticle;
+            //        //        sort_dp.Rect = sort_dp.GetRectFromDSegment();
+            //        //        sort[sort.Count - 1].List_DParticle.Add(sort_dp);
+            //        //        break;
+            //        //    }
+            //        //}
+            //         if (fltype == ParticleClassifyType.MaterialType)
+            //        {
+            //            if (ls_dp.TypeName == NameList[i])
+            //            {
+            //                //将对应的颗粒添加到分栏grid中
+            //                DisplayParticle sort_dp = ls_dp.Clone() as DisplayParticle;
+            //                sort_dp.Rect = sort_dp.GetRectFromDSegment();
+            //                sort[i].List_DParticle.Add(sort_dp);
+            //                break;
+            //            }
+
+            //        }
+            //        else if (fltype == ParticleClassifyType.SizeType)
+            //        {
+            //            double min = Convert.ToDouble(NameList[i].Split('~')[0]);
+            //            double max = 0;
+            //            if (NameList[i].Split('~')[1].ToLower() != "max")
+            //            { max = Convert.ToDouble(NameList[i].Split('~')[1]); }
+            //            else
+            //            {
+            //                max = 999;
+            //            }
+            //            double size = Convert.ToDouble(ls_dp.ParticleFL);
+            //            if (size <= max && size >= min)
+            //            {
+            //                //将对应的颗粒添加到分栏grid中
+            //                DisplayParticle sort_dp = ls_dp.Clone() as DisplayParticle;
+            //                sort_dp.Rect = sort_dp.GetRectFromDSegment();
+            //                sort[i].List_DParticle.Add(sort_dp);
+            //                break;
+            //            }
+
+            //        }
+            //    }
+
+            //}
 
             //循环分栏grid,对各分栏grid进行摆放
             for (int i = 0; i < m_list_sortparticledistribution.Count(); i++)
@@ -2096,7 +2097,7 @@ namespace OTSIncAReportGraph.Controls
 
             Control_DrawDistrbutionSortImage_Load(null, null);
 
-            GetDistrbutionSortimage_ByQuery(m_list_cgriddataclr);
+            GetDistrbutionSortimage_ByQuery(m_ReportApp.m_conditionChoose.m_CurrentConditions);
 
         }
 

OTSIncAReportApp/1-UI/Control_Grids/CompositionDistributionGrid.cs

@@ -60,7 +60,7 @@ namespace OTSIncAReportGrids
             gridView.Columns.Add("con", str10);
             //创建Grid的列颗粒数
             //gridView.Columns.Add("SmallParticle", str11);
-            string con = m_ReportApp.m_conditionChoose.SourceGridData.GetPropItemValueByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.SIZE_CAL_METHOD_TYPE).ToString();
+            string con = m_ReportApp.m_conditionChoose.m_SourceGridData.GetPropItemValueByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.SIZE_CAL_METHOD_TYPE).ToString();
             string po = "";
             switch (con)
             {
@@ -95,7 +95,7 @@ namespace OTSIncAReportGrids
             }
 
             //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.SourceGridData.GetPropIndexByPropItemName(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);
             string filedAndParticl = "";
             if (sel == 1)
             {
@@ -270,7 +270,7 @@ namespace OTSIncAReportGrids
         {
             m_ReportApp = ReportApp;
             result = m_ReportApp.m_DataMgrFun.resultFilesList[m_ReportApp.m_DataMgrFun.WorkingResult];
-            source = m_ReportApp.m_conditionChoose.SourceGridData;
+            source = m_ReportApp.m_conditionChoose.m_SourceGridData;
 
 
             InitializeComponent();
@@ -282,7 +282,7 @@ namespace OTSIncAReportGrids
         private void CompositionDistributionGrid_Load(object sender, EventArgs e)
         {
             //int idx = m_ReportApp.m_DataMgrFun.GetPropIndexByPropItemName(m_ReportApp.SourceGridData.ConditionItemList, OTSIncAReportApp.OTSSampleReportInfo.OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE);
-            string sou = m_ReportApp.m_conditionChoose.SourceGridData.GetPropItemValueByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE).ToString();
+            string sou = m_ReportApp.m_conditionChoose.m_SourceGridData.GetPropItemValueByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE).ToString();
             if (sou.Contains("+"))
             {
                 for (int i = 0; i < sou.Split('+').Length; i++)

OTSIncAReportApp/1-UI/Control_Grids/ElementCompositionAvgGrid.cs

@@ -59,7 +59,7 @@ namespace OTSIncAReportGrids
             List<string> NameList = new List<string>() { table["partcletype0"].ToString(), table["partcletype1"].ToString(), table["partcletype2"].ToString(), table["partcletype4"].ToString(), table["partcletype6"].ToString(), table["partcletype7"].ToString(), table["partcletype8"].ToString(), table["partcletype9"].ToString() };
 
             //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.SourceGridData.GetPropIndexByPropItemName(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);
             string filedAndParticl = "";
             if (sel == 1)
             {

OTSIncAReportApp/1-UI/Control_Grids/ElementContentGrid.cs

@@ -53,7 +53,7 @@ namespace OTSIncAReportGrids
             }
 
             //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.SourceGridData.GetPropIndexByPropItemName(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);
             string filedAndParticle = "";
             if (sel == 1)
             {
@@ -210,7 +210,7 @@ namespace OTSIncAReportGrids
         private void ElementContentGrid_Load(object sender, EventArgs e)
         {
             //int idx = m_ReportApp.m_DataMgrFun.GetPropIndexByPropItemName(m_ReportApp.SourceGridData.ConditionItemList, OTSIncAReportApp.OTSSampleReportInfo.OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE);
-            string sou = m_ReportApp.m_conditionChoose.SourceGridData.GetPropItemValueByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE).ToString();
+            string sou = m_ReportApp.m_conditionChoose.m_SourceGridData.GetPropItemValueByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE).ToString();
             if (sou.Contains("+"))
             {
                 for (int i = 0; i < sou.Split('+').Length; i++)
@@ -286,7 +286,7 @@ namespace OTSIncAReportGrids
             gridwidth = 0;
 
             //int idx = m_ReportApp.m_DataMgrFun.GetPropIndexByPropItemName(m_ReportApp.SourceGridData.ConditionItemList, OTSIncAReportApp.OTSSampleReportInfo.OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE);
-            string sou = m_ReportApp.m_conditionChoose.SourceGridData.GetPropItemValueByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE).ToString();
+            string sou = m_ReportApp.m_conditionChoose.m_SourceGridData.GetPropItemValueByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE).ToString();
             if (sou.Contains("+"))
             {
                 for (int i = 0; i < sou.Split('+').Length; i++)

OTSIncAReportApp/1-UI/Control_Grids/ParticlesSizeGrid.cs

@@ -294,7 +294,7 @@ namespace OTSIncAReportGrids
         {
             m_ReportApp = ReportApp;
             result = m_ReportApp.m_DataMgrFun.resultFilesList[m_ReportApp.m_DataMgrFun.WorkingResult];
-            source = m_ReportApp.m_conditionChoose.SourceGridData;
+            source = m_ReportApp.m_conditionChoose.m_SourceGridData;
 
 
             InitializeComponent();

OTSIncAReportApp/1-UI/Control_Grids/ResultGrid.cs

@@ -69,7 +69,7 @@ namespace OTSIncAReportGrids
 
             //int idx = m_frmReportApp.m_DataMgrFun.GetPropIndexByPropItemName(m_frmReportApp.SourceGridData.ConditionItemList, OTSIncAReportApp.OTSSampleReportInfo.OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE);
             //string sou = m_frmReportApp.SourceGridData.ConditionItemList[idx].itemVal.ToString();
-          string sou=  m_frmReportApp.m_conditionChoose.SourceGridData.GetPropItemValueByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE).ToString();
+          string sou=  m_frmReportApp.m_conditionChoose.m_SourceGridData.GetPropItemValueByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE).ToString();
             if (sou.Contains("+"))
             {
                 for (int i = 0; i < sou.Split('+').Length; i++)

OTSIncAReportApp/1-UI/frmMeasureRstMgr.cs

@@ -253,34 +253,34 @@ namespace OTSIncAReportApp
                 checkednode = "";
             }
             //ReportCondition SMeasureInfo = .SourceGridData;
-            for (int i = 0; i < 3; i++)
-            {
-                var reportcondition = m_ConditionChoose.SourceGridData;
-                //int idx = m_ReportApp.m_DataMgrFun.GetPropIndexByPropItemName(m_ReportApp.SourceGridData.ConditionItemList, OTSIncAReportApp.OTSSampleReportInfo.OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE);
-                int idx = reportcondition.GetPropIndexByPropItemName( OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE);
+            //for (int i = 0; i < 3; i++)
+            //{
+            //    var reportcondition = m_ConditionChoose.m_SourceGridData;
+            //    //int idx = m_ReportApp.m_DataMgrFun.GetPropIndexByPropItemName(m_ReportApp.SourceGridData.ConditionItemList, OTSIncAReportApp.OTSSampleReportInfo.OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE);
+            //    int idx = reportcondition.GetPropIndexByPropItemName( OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE);
 
-                //int n = m_ReportApp.SourceGridDataListLog[i].ConditionItemList[idx].comboDownList.Count;
-                int n = reportcondition.GetComboDownListByItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE).Count;
-                for (int j = 0; j < n; j++)
-                {
-                    if (m_ConditionChoose .SourceGridDataListLog[i].ConditionItemList[idx].comboDownList[j].Contains("+"))
-                    {
-                        m_ConditionChoose.SourceGridDataListLog[i].ConditionItemList[idx].comboDownList.RemoveAt(j);
-                        break;
-                    }
-                }
-            }
+            //    //int n = m_ReportApp.SourceGridDataListLog[i].ConditionItemList[idx].comboDownList.Count;
+            //    int n = reportcondition.GetComboDownListByItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE).Count;
+            //    for (int j = 0; j < n; j++)
+            //    {
+            //        if (m_ConditionChoose .m_SourceGridDataListLog[i].ConditionItemList[idx].comboDownList[j].Contains("+"))
+            //        {
+            //            m_ConditionChoose.m_SourceGridDataListLog[i].ConditionItemList[idx].comboDownList.RemoveAt(j);
+            //            break;
+            //        }
+            //    }
+            //}
 
             //插入多数据源选项
             m_ReportApp.MoreSource = checkednode;
-            if (m_ReportApp.MoreSource != "")
-            {
-                for (int i = 0; i < 3; i++)
-                {
-                    m_ConditionChoose.SourceGridDataListLog[i].ConditionItemList[0].comboDownList.Insert(0, checkednode);
-                }
-            }
-            m_ConditionChoose.DisProperyWindow(m_ConditionChoose.SourceGridData);//刷新
+            //if (m_ReportApp.MoreSource != "")
+            //{
+            //    for (int i = 0; i < 3; i++)
+            //    {
+            //        m_ConditionChoose.m_SourceGridDataListLog[i].ConditionItemList[0].comboDownList.Insert(0, checkednode);
+            //    }
+            //}
+            m_ConditionChoose.DisCurrentPicProperty();//刷新
 
 
             if (e.Button == MouseButtons.Right)//判断按下鼠标右键
@@ -334,12 +334,11 @@ namespace OTSIncAReportApp
             int index = m_DataMgr.resultFilesList.IndexOf(result);
             if (this.m_DataMgr.WorkingResult == -1)
             {
-                ReportCondition SMeasureInfo = new ReportCondition();
+                //ReportCondition SMeasureInfo = new ReportCondition();
                 this.m_DataMgr.WorkingResult = index;
 
-
-                m_ConditionChoose.GetWorkingPictureConditionVal(ref SMeasureInfo);
-                m_ConditionChoose.DisProperyWindow(SMeasureInfo);//刷新
+                m_ConditionChoose.SetDefaultConditionValue();
+                m_ConditionChoose.GetWorkingPictureConditionVal();
                 m_ReportApp.m_RstWindow.Show(m_ReportApp.DockWindowPanel);
 
 
@@ -361,15 +360,15 @@ namespace OTSIncAReportApp
                 //在treeview上添加测量结果
                 m_TreeViewData.DisplayWorkSampleTree(this.m_DataMgr.resultFilesList);
                 //在grid中添加新增的测量结果名称
-                ReportCondition SMeasureInfo = m_ConditionChoose.SourceGridData;
-                for (int i = 0; i < 3; i++)
-                {
-                    //int idx = m_ReportApp.m_DataMgrFun.GetPropIndexByPropItemName(m_ReportApp.SourceGridData.ConditionItemList, OTSIncAReportApp.OTSSampleReportInfo.OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE);
-                    int idx = SMeasureInfo.GetPropIndexByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE);
-                    m_ConditionChoose.SourceGridDataListLog[i].ConditionItemList[idx].comboDownList.Add(name);
-                }
-
-                m_ReportApp.m_conditionChoose.DisProperyWindow(SMeasureInfo);//刷新
+                //ReportCondition SMeasureInfo = m_ConditionChoose.m_SourceGridData;
+                //for (int i = 0; i < 3; i++)
+                //{
+                //    //int idx = m_ReportApp.m_DataMgrFun.GetPropIndexByPropItemName(m_ReportApp.SourceGridData.ConditionItemList, OTSIncAReportApp.OTSSampleReportInfo.OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE);
+                //    int idx = SMeasureInfo.GetPropIndexByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE);
+                //    m_ConditionChoose.m_SourceGridDataListLog[i].ConditionItemList[idx].comboDownList.Add(name);
+                //}
+                m_ConditionChoose.SetDefaultConditionValue();
+                m_ConditionChoose.DisCurrentPicProperty();
             }
             
             

OTSIncAReportApp/1-UI/frmReportApp.cs

@@ -421,7 +421,7 @@ namespace OTSIncAReportApp
                 case (int)DisplayPicutureType.AnalyzeImg:
                     //int idx = m_DataMgrFun.GetPropIndexByPropItemName(SourceGridData.ConditionItemList, OTSSampleReportInfo.OTS_REPORT_PROP_GRID_ITEMS.IMAGE_DISPLAY_TYPE);
                     //int imgDisType = SourceGridData.ConditionItemList[idx].comboDownList.IndexOf(SourceGridData.ConditionItemList[idx].itemVal.ToString());
-                    int imgDisType=m_conditionChoose.SourceGridData.GetComboDownListIndexByItemName(OTS_REPORT_PROP_GRID_ITEMS.IMAGE_DISPLAY_TYPE);
+                    int imgDisType=m_conditionChoose.m_SourceGridData.GetComboDownListIndexByItemName(OTS_REPORT_PROP_GRID_ITEMS.IMAGE_DISPLAY_TYPE);
                     if (imgDisType == 0)
                     {
                         if (im_Control_DrawDistrbutionImageAndBSE != null)
@@ -462,7 +462,7 @@ namespace OTSIncAReportApp
                 case (int)DisplayPicutureType.AnalyzeImg:
                     //int idx = m_DataMgrFun.GetPropIndexByPropItemName(SourceGridData.ConditionItemList, OTSSampleReportInfo.OTS_REPORT_PROP_GRID_ITEMS.IMAGE_DISPLAY_TYPE);
                     //int imgDisType = SourceGridData.ConditionItemList[idx].comboDownList.IndexOf(SourceGridData.ConditionItemList[idx].itemVal.ToString());
-                    int imgDisType = m_conditionChoose.SourceGridData.GetComboDownListIndexByItemName(OTS_REPORT_PROP_GRID_ITEMS.IMAGE_DISPLAY_TYPE);
+                    int imgDisType = m_conditionChoose.m_SourceGridData.GetComboDownListIndexByItemName(OTS_REPORT_PROP_GRID_ITEMS.IMAGE_DISPLAY_TYPE);
                     if (imgDisType == 0)
                     {
                         if (im_Control_DrawDistrbutionImageAndBSE != null)
@@ -503,7 +503,7 @@ namespace OTSIncAReportApp
                 case (int)DisplayPicutureType.AnalyzeImg:
                     //int idx = m_DataMgrFun.GetPropIndexByPropItemName(SourceGridData.ConditionItemList, OTSSampleReportInfo.OTS_REPORT_PROP_GRID_ITEMS.IMAGE_DISPLAY_TYPE);
                     //int imgDisType = SourceGridData.ConditionItemList[idx].comboDownList.IndexOf(SourceGridData.ConditionItemList[idx].itemVal.ToString());
-                    int imgDisType = m_conditionChoose.SourceGridData.GetComboDownListIndexByItemName(OTS_REPORT_PROP_GRID_ITEMS.IMAGE_DISPLAY_TYPE);
+                    int imgDisType = m_conditionChoose.m_SourceGridData.GetComboDownListIndexByItemName(OTS_REPORT_PROP_GRID_ITEMS.IMAGE_DISPLAY_TYPE);
                     if (imgDisType == 0)
                     {
                         if (im_Control_DrawDistrbutionImageAndBSE != null)
@@ -543,7 +543,7 @@ namespace OTSIncAReportApp
                 case (int)DisplayPicutureType.AnalyzeImg:
                     //int idx = m_DataMgrFun.GetPropIndexByPropItemName(SourceGridData.ConditionItemList, OTSSampleReportInfo.OTS_REPORT_PROP_GRID_ITEMS.IMAGE_DISPLAY_TYPE);
                     //int imgDisType = SourceGridData.ConditionItemList[idx].comboDownList.IndexOf(SourceGridData.ConditionItemList[idx].itemVal.ToString());
-                    int imgDisType = m_conditionChoose.SourceGridData.GetComboDownListIndexByItemName(OTS_REPORT_PROP_GRID_ITEMS.IMAGE_DISPLAY_TYPE);
+                    int imgDisType = m_conditionChoose.m_SourceGridData.GetComboDownListIndexByItemName(OTS_REPORT_PROP_GRID_ITEMS.IMAGE_DISPLAY_TYPE);
                     if (imgDisType == 0)
                     {
                         if (im_Control_DrawDistrbutionImageAndBSE != null)
@@ -581,11 +581,11 @@ namespace OTSIncAReportApp
             int tabIndex = (int)m_conditionChoose.tabIndex;
             //int idx = m_DataMgrFun.GetPropIndexByPropItemName(SourceGridData.ConditionItemList, OTSSampleReportInfo.OTS_REPORT_PROP_GRID_ITEMS.IMAGE_DISPLAY_TYPE);
             //int DisType = SourceGridData.ConditionItemList[idx].comboDownList.IndexOf(SourceGridData.ConditionItemList[idx].itemVal.ToString());
-            int DisType = m_conditionChoose.SourceGridData.GetComboDownListIndexByItemName(OTS_REPORT_PROP_GRID_ITEMS.IMAGE_DISPLAY_TYPE);
+            int DisType = m_conditionChoose.m_SourceGridData.GetComboDownListIndexByItemName(OTS_REPORT_PROP_GRID_ITEMS.IMAGE_DISPLAY_TYPE);
             switch (tabIndex)
             {
                 case (int)DisplayPicutureType.AnalyzeImg:
-                    if (DisType == (int)IMAGE_DISPLAY_TYPE.GENERAL)
+                    if (DisType == (int)IMAGE_DISPLAY_TYPE.DISTRIBUTION)
                     {
                         if (im_Control_DrawDistrbutionImageAndBSE != null)
                         {
@@ -600,7 +600,7 @@ namespace OTSIncAReportApp
                             m_SImageWindow.Controls.Add(im_Control_DrawDistrbutionImageAndBSE);
                             m_SImageWindow.Activate();
                             im_Control_DrawDistrbutionImageAndBSE.ShowSourceName = "";
-                            im_Control_DrawDistrbutionImageAndBSE.DrawDistrbutionImageAndBSE_ByQuery(m_conditionChoose.SourceGridData);
+                            im_Control_DrawDistrbutionImageAndBSE.DrawDistrbutionImageAndBSE_ByQuery(m_conditionChoose.m_SourceGridData);
                             im_Control_DrawDistrbutionImageAndBSE.SetSelectParticle(SelectedParticles);
                             //并删除排列图
                             im_Control_DrawDistrbutionSortImage = null;
@@ -620,7 +620,7 @@ namespace OTSIncAReportApp
                             m_SImageWindow.Controls.Add(im_Control_DrawDistrbutionSortImage);
                             m_SImageWindow.Activate();
                             im_Control_DrawDistrbutionSortImage.ShowSourceName = "";
-                            im_Control_DrawDistrbutionSortImage.GetDistrbutionSortimage_ByQuery(m_conditionChoose.SourceGridData);
+                            im_Control_DrawDistrbutionSortImage.GetDistrbutionSortimage_ByQuery(m_conditionChoose.m_CurrentConditions);
                             im_Control_DrawDistrbutionSortImage.SetSelectParticle(SelectedParticles);
                         }
                     }
@@ -649,7 +649,7 @@ namespace OTSIncAReportApp
 
                     //int idx = m_DataMgrFun.GetPropIndexByPropItemName(SourceGridData.ConditionItemList, OTSIncAReportApp.OTSSampleReportInfo.OTS_REPORT_PROP_GRID_ITEMS.IMAGE_DISPLAY_TYPE);
                     //int imgDisType = SourceGridData.ConditionItemList[idx].comboDownList.IndexOf(SourceGridData.ConditionItemList[idx].itemVal.ToString());
-                    int imgDisType = m_conditionChoose.SourceGridData.GetComboDownListIndexByItemName(OTS_REPORT_PROP_GRID_ITEMS.IMAGE_DISPLAY_TYPE);
+                    int imgDisType = m_conditionChoose.m_SourceGridData.GetComboDownListIndexByItemName(OTS_REPORT_PROP_GRID_ITEMS.IMAGE_DISPLAY_TYPE);
                     if (imgDisType == 0)
                     {
                         if (im_Control_DrawDistrbutionImageAndBSE != null)
@@ -690,7 +690,7 @@ namespace OTSIncAReportApp
 
                     //int idx = m_DataMgrFun.GetPropIndexByPropItemName(SourceGridData.ConditionItemList, OTSIncAReportApp.OTSSampleReportInfo.OTS_REPORT_PROP_GRID_ITEMS.IMAGE_DISPLAY_TYPE);
                     //int imgDisType = SourceGridData.ConditionItemList[idx].comboDownList.IndexOf(SourceGridData.ConditionItemList[idx].itemVal.ToString());
-                    int imgDisType = m_conditionChoose.SourceGridData.GetComboDownListIndexByItemName(OTS_REPORT_PROP_GRID_ITEMS.IMAGE_DISPLAY_TYPE);
+                    int imgDisType = m_conditionChoose.m_SourceGridData.GetComboDownListIndexByItemName(OTS_REPORT_PROP_GRID_ITEMS.IMAGE_DISPLAY_TYPE);
                     if (imgDisType == 0)
                     {
                         if (im_Control_DrawDistrbutionImageAndBSE != null)
@@ -731,7 +731,7 @@ namespace OTSIncAReportApp
 
                     //int idx = m_DataMgrFun.GetPropIndexByPropItemName(SourceGridData.ConditionItemList, OTSIncAReportApp.OTSSampleReportInfo.OTS_REPORT_PROP_GRID_ITEMS.IMAGE_DISPLAY_TYPE);
                     //int imgDisType = SourceGridData.ConditionItemList[idx].comboDownList.IndexOf(SourceGridData.ConditionItemList[idx].itemVal.ToString());
-                    int imgDisType = m_conditionChoose.SourceGridData.GetComboDownListIndexByItemName(OTS_REPORT_PROP_GRID_ITEMS.IMAGE_DISPLAY_TYPE);
+                    int imgDisType = m_conditionChoose.m_SourceGridData.GetComboDownListIndexByItemName(OTS_REPORT_PROP_GRID_ITEMS.IMAGE_DISPLAY_TYPE);
                     if (imgDisType == 0)
                     {
                         if (im_Control_DrawDistrbutionImageAndBSE != null)
@@ -772,7 +772,7 @@ namespace OTSIncAReportApp
 
                     //int idx = m_DataMgrFun.GetPropIndexByPropItemName(SourceGridData.ConditionItemList, OTSIncAReportApp.OTSSampleReportInfo.OTS_REPORT_PROP_GRID_ITEMS.IMAGE_DISPLAY_TYPE);
                     //int imgDisType = SourceGridData.ConditionItemList[idx].comboDownList.IndexOf(SourceGridData.ConditionItemList[idx].itemVal.ToString());
-                    int imgDisType = m_conditionChoose.SourceGridData.GetComboDownListIndexByItemName(OTS_REPORT_PROP_GRID_ITEMS.IMAGE_DISPLAY_TYPE);
+                    int imgDisType = m_conditionChoose.m_SourceGridData.GetComboDownListIndexByItemName(OTS_REPORT_PROP_GRID_ITEMS.IMAGE_DISPLAY_TYPE);
                     if (imgDisType == 0)// oper_module == "颗粒分布图"
                     {
                         if (im_Control_DrawDistrbutionImageAndBSE != null)
@@ -975,11 +975,11 @@ namespace OTSIncAReportApp
 
             //int idx = m_DataMgrFun.GetPropIndexByPropItemName(SourceGridData.ConditionItemList, OTSIncAReportApp.OTSSampleReportInfo.OTS_REPORT_PROP_GRID_ITEMS.CALCULATE_TABLE_TYPE);
             //int DisType = SourceGridData.ConditionItemList[idx].comboDownList.IndexOf(SourceGridData.ConditionItemList[idx].itemVal.ToString());
-            int DisType = m_conditionChoose.SourceGridData.GetComboDownListIndexByItemName(OTS_REPORT_PROP_GRID_ITEMS.IMAGE_DISPLAY_TYPE);
+            int DisType = m_conditionChoose.m_SourceGridData.GetComboDownListIndexByItemName(OTS_REPORT_PROP_GRID_ITEMS.IMAGE_DISPLAY_TYPE);
             switch (tabIndex)
             {
                 case (int)DisplayPicutureType.AnalyzeImg:                 //如果是分布图，排列图
-                    if (DisType == (int)IMAGE_DISPLAY_TYPE.GENERAL) //oper_module == "颗粒分布图"
+                    if (DisType == (int)IMAGE_DISPLAY_TYPE.DISTRIBUTION) //oper_module == "颗粒分布图"
                     {
                         if (im_Control_DrawDistrbutionImageAndBSE != null)
                         {
@@ -1097,11 +1097,11 @@ namespace OTSIncAReportApp
 
             //int idx = m_DataMgrFun.GetPropIndexByPropItemName(SourceGridData.ConditionItemList, OTSIncAReportApp.OTSSampleReportInfo.OTS_REPORT_PROP_GRID_ITEMS.CALCULATE_TABLE_TYPE);
             //int DisType = SourceGridData.ConditionItemList[idx].comboDownList.IndexOf(SourceGridData.ConditionItemList[idx].itemVal.ToString());
-            int DisType = m_conditionChoose.SourceGridData.GetComboDownListIndexByItemName(OTS_REPORT_PROP_GRID_ITEMS.IMAGE_DISPLAY_TYPE);
+            int DisType = m_conditionChoose.m_SourceGridData.GetComboDownListIndexByItemName(OTS_REPORT_PROP_GRID_ITEMS.IMAGE_DISPLAY_TYPE);
             switch (tabIndex)
             {
                 case (int)DisplayPicutureType.AnalyzeImg:
-                    if (DisType == (int)IMAGE_DISPLAY_TYPE.GENERAL)
+                    if (DisType == (int)IMAGE_DISPLAY_TYPE.DISTRIBUTION)
                     {
                         if (im_Control_DrawDistrbutionImageAndBSE != null)
                         {