Merge branch 'OTSRelease3_0' of http://36.129.163.148:30080/gogsadmin/OTS into OTSRelease3_0

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

@@ -515,7 +515,6 @@ namespace OTSIncAReportGraph.Controls
 
                     foreach (DisplayParticle dp in m_list_allDPart)
                     {
-                        dp.SetDisplayState(DisplayState.DISPLAY);
                         dp.ShowMode = SegmentShowMode.DRAWLINE;
 
                         if (dp.GetPaintState() != PaintState.NOPAINT)
@@ -528,7 +527,6 @@ namespace OTSIncAReportGraph.Controls
                     foreach (DisplayParticle ls_dp in m_list_allDPart)
                     {
                         ls_dp.SetDisplayState(DisplayState.NODISPLAY);
-
                     }
                     DrawOriginalImageAsBackground(e);
                     break;

OTSIncAReportApp/1-UI/OTSDisplaySourceGridData/frmReportConditionChoose.cs

@@ -180,9 +180,11 @@ namespace OTSIncAReportApp
             AddGridData(OTS_REPORT_PROP_GRID_ITEMS.TRIO_CHART_TYPE, ternaryPhaseDiagram, OTS_ITEM_TYPES.COMBO, false, "Ternary phase diagram", trio_listname.First(), trio_listname, null);
           
             //颗粒分类ID
-            
             List<string> stdlistname = m_rstDataMgr.GetSTDIdList();
-           
+            if(stdlistname.Contains("Invalid"))
+            {
+                stdlistname.Remove("Invalid");
+            }
             AddGridData(OTS_REPORT_PROP_GRID_ITEMS.STD_ID, "ClassifyId", OTS_ITEM_TYPES.COMBO, false, "std list", stdlistname[0], stdlistname, null);
 
             //颗粒列表数据类型
@@ -338,53 +340,57 @@ namespace OTSIncAReportApp
                     sampleData.comboDownList = new List<string>() { BSEOriginal, ClassifiedDisplay, OriginalSplicing, OriginalDistribution };//bse,颗粒分类图
                     list.Add(sampleData);
 
-                    //粒级表
+                    if ((int)m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.IMAGE_TYPE].itemVal == (int)DISTRIBUTION_IMAGE_SHOW_MODE.BSE || (int)m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.IMAGE_TYPE].itemVal == (int)DISTRIBUTION_IMAGE_SHOW_MODE.CLASSIFIED|| (int)m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.IMAGE_TYPE].itemVal == (int)DISTRIBUTION_IMAGE_SHOW_MODE.ORIGINALCLASSIFIED)
+                    {
 
-                    var sampleData_partsizefile = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.GRAIN_SIZE_CLASS_TABLE];
-                    m_ReportApp.m_rstDataMgr.m_RptConfigFile.PartSizeFile = sampleData_partsizefile.itemDisplayVal.ToString();
-                    list.Add(sampleData_partsizefile);
+                        //粒级表
 
-                    //粒级
+                        var sampleData_partsizefile = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.GRAIN_SIZE_CLASS_TABLE];
+                        m_ReportApp.m_rstDataMgr.m_RptConfigFile.PartSizeFile = sampleData_partsizefile.itemDisplayVal.ToString();
+                        list.Add(sampleData_partsizefile);
 
-                    var sampleData4 = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.GRAIN_SIZE_CLASS];
-                    list.Add(sampleData4);
-                    if ((int)sampleData4.itemVal == (int)GRAIN_SIZE_CLASS.USERDEFINE)
-                    {
-                        //自定义最小
+                        //粒级
 
-                        var sampleData41 = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.GRAIN_SIZE_MIN];
-                        list.Add(sampleData41);
+                        var sampleData4 = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.GRAIN_SIZE_CLASS];
+                        list.Add(sampleData4);
+                        if ((int)sampleData4.itemVal == (int)GRAIN_SIZE_CLASS.USERDEFINE)
+                        {
+                            //自定义最小
 
-                        //自定义最大
+                            var sampleData41 = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.GRAIN_SIZE_MIN];
+                            list.Add(sampleData41);
 
-                        var sampleData42 = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.GRAIN_SIZE_MAX];
-                        list.Add(sampleData42);
-                    }
-                    else if ((int)sampleData4.itemVal > (int)GRAIN_SIZE_CLASS.USERDEFINE)
-                    {
-                        string min = sampleData4.itemDisplayVal.ToString().Split('~')[0];
-                        string max = sampleData4.itemDisplayVal.ToString().Split('~')[1];
-                        var sampleData41 = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.GRAIN_SIZE_MIN];
-                        sampleData41.itemDisplayVal = min;
-                        list.Add(sampleData41);
+                            //自定义最大
 
-                        //自定义最大
+                            var sampleData42 = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.GRAIN_SIZE_MAX];
+                            list.Add(sampleData42);
+                        }
+                        else if ((int)sampleData4.itemVal > (int)GRAIN_SIZE_CLASS.USERDEFINE)
+                        {
+                            string min = sampleData4.itemDisplayVal.ToString().Split('~')[0];
+                            string max = sampleData4.itemDisplayVal.ToString().Split('~')[1];
+                            var sampleData41 = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.GRAIN_SIZE_MIN];
+                            sampleData41.itemDisplayVal = min;
+                            list.Add(sampleData41);
 
-                        var sampleData42 = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.GRAIN_SIZE_MAX];
-                        sampleData42.itemDisplayVal = max;
-                        list.Add(sampleData42);
+                            //自定义最大
 
-                    }
+                            var sampleData42 = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.GRAIN_SIZE_MAX];
+                            sampleData42.itemDisplayVal = max;
+                            list.Add(sampleData42);
 
+                        }
 
 
-                    //尺寸计算方式
 
-                    var sampleData5 = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.SIZE_CAL_METHOD_TYPE];
-                    list.Add(sampleData5);
-                    //all particle types
-                    var stditm = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.STD_ID];
-                    list.Add(stditm);
+                        //尺寸计算方式
+
+                        var sampleData5 = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.SIZE_CAL_METHOD_TYPE];
+                        list.Add(sampleData5);
+                        //all particle types
+                        var stditm = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.STD_ID];
+                        list.Add(stditm);
+                    }
 
                 }
                 else 
@@ -576,7 +582,10 @@ namespace OTSIncAReportApp
                             DISTRIBUTION_IMAGE_SHOW_MODE t = (DISTRIBUTION_IMAGE_SHOW_MODE)imgType.itemVal;
                             m_ReportApp.im_Control_DrawDistrbutionImageAndBSE.SetShowMode(t);
                             m_ReportApp.m_SImageWindow.Activate();
-                            m_ReportApp.im_Control_DrawDistrbutionImageAndBSE.DrawDistrbutionImageAndBSE_ByQuery(m_conditionData);
+                            if (t == DISTRIBUTION_IMAGE_SHOW_MODE.BSE || t == DISTRIBUTION_IMAGE_SHOW_MODE.CLASSIFIED|| t == DISTRIBUTION_IMAGE_SHOW_MODE.ORIGINALCLASSIFIED)
+                            {
+                                m_ReportApp.im_Control_DrawDistrbutionImageAndBSE.DrawDistrbutionImageAndBSE_ByQuery(m_conditionData);
+                            }
                             m_ReportApp.im_Control_DrawDistrbutionImageAndBSE.SetSelectParticle(m_ReportApp.GetSelectedParticles());
 
                         }