add close result file function

OTSIncAReportApp/1-UI/Control_ECharts/EChart_ParticlesComposition.cs

@@ -90,8 +90,8 @@ namespace OTSIncAReportApp.Control_ECharts
             }
             else
             {
-                sou = m_conditionChoose.m_SourceGridData.GetPropItemDisplayValueByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE).ToString();
-                sel = m_ReportApp.m_conditionChoose.m_SourceGridData.GetComboDownListIndexByItemName(OTSIncAReportApp.OTSSampleReportInfo.OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE);
+                sou = m_conditionChoose.m_conditionData.GetPropItemDisplayValueByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE).ToString();
+                sel = m_ReportApp.m_conditionChoose.m_conditionData.GetComboDownListIndexByItemName(OTSIncAReportApp.OTSSampleReportInfo.OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE);
 
             }
             Report = false;
@@ -126,11 +126,11 @@ namespace OTSIncAReportApp.Control_ECharts
                 m_ReportApp.more = false;
                 //获取到List,json的字符串
                 
-                for (int i=0;i< m_conditionChoose.m_SourceGridData.ConditionItemList.Count;i++)
+                for (int i=0;i< m_conditionChoose.m_conditionData.ConditionItemList.Count;i++)
                 {
-                    if (m_conditionChoose.m_SourceGridData.ConditionItemList[i].itemDisplayVal.ToString()== sou)
+                    if (m_conditionChoose.m_conditionData.ConditionItemList[i].itemDisplayVal.ToString()== sou)
                     {
-                        m_DataMgr.SetWorkingResult((int)m_conditionChoose.m_SourceGridData.ConditionItemList[i].itemVal);
+                        m_DataMgr.SetWorkingResult((int)m_conditionChoose.m_conditionData.ConditionItemList[i].itemVal);
                     }
                 }
                 
@@ -169,7 +169,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.m_SourceGridData.GetPropIndexByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE);
-            int sel = m_ReportApp.m_conditionChoose.m_SourceGridData.GetComboDownListIndexByItemName(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)
             {
@@ -662,7 +662,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.m_SourceGridData.GetPropIndexByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE);
-            int sel = m_ReportApp.m_conditionChoose.m_SourceGridData.GetComboDownListIndexByItemName(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)
@@ -753,7 +753,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.m_SourceGridData.GetPropIndexByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE);
-            int sel = m_ReportApp.m_conditionChoose.m_SourceGridData.GetComboDownListIndexByItemName(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)
             {
@@ -843,7 +843,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.m_SourceGridData.GetPropIndexByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE);
-            int sel = m_ReportApp.m_conditionChoose.m_SourceGridData.GetComboDownListIndexByItemName(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)
             {
@@ -860,7 +860,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.m_SourceGridData.GetPropItemDisplayValueByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.SIZE_CAL_METHOD_TYPE).ToString();
+            string con = m_conditionChoose.m_conditionData.GetPropItemDisplayValueByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.SIZE_CAL_METHOD_TYPE).ToString();
             string po = "";
             switch (con)
             {
@@ -936,7 +936,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.m_SourceGridData.GetPropIndexByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE);
-            int sel = m_ReportApp.m_conditionChoose.m_SourceGridData.GetComboDownListIndexByItemName(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)
             {
@@ -953,7 +953,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.m_SourceGridData.GetPropItemDisplayValueByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.SIZE_CAL_METHOD_TYPE).ToString();
+            string con = m_conditionChoose.m_conditionData.GetPropItemDisplayValueByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.SIZE_CAL_METHOD_TYPE).ToString();
             string po = "";
             switch (con)
             {
@@ -1079,7 +1079,7 @@ namespace OTSIncAReportApp.Control_ECharts
 
             //int sel = m_conditionChoose.m_SourceGridData.GetPropIndexByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE);
 
-            int sel = m_conditionChoose.m_SourceGridData.ProItemProIndex();
+            int sel = m_conditionChoose.m_conditionData.ProItemProIndex();
             string filedAndParticl = "";
             if (sel == 1)
             {
@@ -1105,7 +1105,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.m_SourceGridData.GetPropItemDisplayValueByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE).ToString();
+            string sou = m_conditionChoose.m_conditionData.GetPropItemDisplayValueByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE).ToString();
             if (sou.Contains("+"))
             {
                 for (int i = 0; i < sou.Split('+').Length; i++)
@@ -1317,7 +1317,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.m_SourceGridData.GetPropItemDisplayValueByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.SIZE_CAL_METHOD_TYPE).ToString();
+                            string con = m_conditionChoose.m_conditionData.GetPropItemDisplayValueByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.SIZE_CAL_METHOD_TYPE).ToString();
                             string po = "";
                             switch (con)
                             {

OTSIncAReportApp/1-UI/Control_ECharts/EChart_Trianglediagram.cs

@@ -88,7 +88,7 @@ namespace OTSIncAReportApp.Control_ECharts
             string template = Template;
             if (template == "")
             { //三元相图模板
-                template = m_condition.m_SourceGridData.GetPropItemDisplayValueByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.TRIO_CHART_TYPE).ToString();
+                template = m_condition.m_conditionData.GetPropItemDisplayValueByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.TRIO_CHART_TYPE).ToString();
             }
 
             //获取粒级表
@@ -132,7 +132,7 @@ namespace OTSIncAReportApp.Control_ECharts
             {
                 sou = m_condition.m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE].itemDisplayVal.ToString();
                 //判断颗粒范围（全部颗粒或者选择颗粒）
-                sel = m_ReportApp.m_conditionChoose.m_SourceGridData.GetComboDownListIndexByItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE);
+                sel = m_ReportApp.m_conditionChoose.m_conditionData.GetComboDownListIndexByItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE);
             }
             Report = false;
              
@@ -305,7 +305,7 @@ namespace OTSIncAReportApp.Control_ECharts
             }
             string po = "";
             string con = "";
-            int row = m_condition.m_SourceGridData.ConditionItemList.Count;
+            int row = m_condition.m_conditionData.ConditionItemList.Count;
             if (condition != -1)
             {
                 List<string> li = new List<string>() { "DMAX", "DMIN", "Area", "FERET" };
@@ -319,7 +319,7 @@ namespace OTSIncAReportApp.Control_ECharts
                 }
                 else
                 {
-                    con = m_condition.m_SourceGridData.GetPropItemDisplayValueByPropItemName( OTS_REPORT_PROP_GRID_ITEMS.SIZE_CAL_METHOD_TYPE).ToString();
+                    con = m_condition.m_conditionData.GetPropItemDisplayValueByPropItemName( OTS_REPORT_PROP_GRID_ITEMS.SIZE_CAL_METHOD_TYPE).ToString();
                 }
             }
 

OTSIncAReportApp/1-UI/Control_Grids/CompositionDistributionGrid.cs

@@ -81,7 +81,7 @@ namespace OTSIncAReportGrids
             //gridView.Columns.Add("SmallParticle", str11);
             //创建Grid的列面积占比
             gridView.Columns.Add("AreaRadio", str13);
-            string con = m_ReportApp.m_conditionChoose.m_SourceGridData.GetPropItemDisplayValueByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.SIZE_CAL_METHOD_TYPE).ToString();
+            string con = m_ReportApp.m_conditionChoose.m_conditionData.GetPropItemDisplayValueByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.SIZE_CAL_METHOD_TYPE).ToString();
             string po = "";
             switch (con)
             {
@@ -118,7 +118,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.m_SourceGridData.GetPropIndexByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE);
-            int sel = m_ReportApp.m_conditionChoose.m_SourceGridData.GetComboDownListIndexByItemName(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)
@@ -418,7 +418,7 @@ namespace OTSIncAReportGrids
         {
             m_ReportApp = ReportApp;
             result = m_ReportApp.m_rstDataMgr.ResultFilesList[m_ReportApp.m_rstDataMgr.GetWorkingResult()];
-            source = m_ReportApp.m_conditionChoose.m_SourceGridData;
+            source = m_ReportApp.m_conditionChoose.m_conditionData;
 
             m_condition= ReportApp.m_conditionChoose;
             InitializeComponent();

OTSIncAReportApp/1-UI/Control_Grids/ElementCompositionAvgGrid.cs

@@ -312,7 +312,7 @@ namespace OTSIncAReportGrids
             else
             {
                 sou = m_condition.m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE].itemDisplayVal.ToString();
-                sel = m_ReportApp.m_conditionChoose.m_SourceGridData.GetComboDownListIndexByItemName(OTSIncAReportApp.OTSSampleReportInfo.OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE);
+                sel = m_ReportApp.m_conditionChoose.m_conditionData.GetComboDownListIndexByItemName(OTSIncAReportApp.OTSSampleReportInfo.OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE);
             }
             Report = false;
 

OTSIncAReportApp/1-UI/Control_Grids/ParticlesGridDevidePage.cs

@@ -288,7 +288,7 @@ namespace OTSIncAReportGrids
 
         bool UpdateTable()
         {
-            int sel = m_ReportApp.m_conditionChoose.m_SourceGridData.GetComboDownListIndexByItemName(OTSIncAReportApp.OTSSampleReportInfo.OTS_REPORT_PROP_GRID_ITEMS.PARTICE_LIST);
+            int sel = m_ReportApp.m_conditionChoose.m_conditionData.GetComboDownListIndexByItemName(OTSIncAReportApp.OTSSampleReportInfo.OTS_REPORT_PROP_GRID_ITEMS.PARTICE_LIST);
             if (sel == 1)
             {
                 List<Particle> selectParticles = m_ReportApp.GetSelectedParticles();
@@ -2466,7 +2466,7 @@ namespace OTSIncAReportGrids
         {
 
             var SelectRows = dgV_ParticlesDevidePage.SelectedRows;
-            int sel = m_ReportApp.m_conditionChoose.m_SourceGridData.GetComboDownListIndexByItemName(OTSIncAReportApp.OTSSampleReportInfo.OTS_REPORT_PROP_GRID_ITEMS.PARTICE_LIST);
+            int sel = m_ReportApp.m_conditionChoose.m_conditionData.GetComboDownListIndexByItemName(OTSIncAReportApp.OTSSampleReportInfo.OTS_REPORT_PROP_GRID_ITEMS.PARTICE_LIST);
             {
                 if (sel != (int)SelItem.MergeParticles)
                 {

OTSIncAReportApp/1-UI/Control_Grids/ParticlesSizeGrid.cs

@@ -92,7 +92,7 @@ namespace OTSIncAReportGrids
 
             //int idx = m_ReportApp.m_DataMgrFun.GetPropIndexByPropItemName(m_ReportApp.SourceGridData.ConditionItemList, OTSIncAReportApp.OTSSampleReportInfo.OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE);
             //int sel = m_ReportApp.SourceGridData.ConditionItemList[idx].comboDownList.IndexOf(m_ReportApp.SourceGridData.ConditionItemList[idx].itemVal.ToString());
-            int sel = m_ReportApp.m_conditionChoose.m_SourceGridData.GetComboDownListIndexByItemName(OTSIncAReportApp.OTSSampleReportInfo.OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE);
+            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)
@@ -330,7 +330,7 @@ namespace OTSIncAReportGrids
         {
             m_ReportApp = ReportApp;
             result = m_ReportApp.m_rstDataMgr.ResultFilesList[m_ReportApp.m_rstDataMgr.GetWorkingResult()];
-            source = m_ReportApp.m_conditionChoose.m_SourceGridData;
+            source = m_ReportApp.m_conditionChoose.m_conditionData;
 
 
             InitializeComponent();

OTSIncAReportApp/1-UI/OTSDisplaySourceGridData/OTSSampleReportInfo/OTSSampleReportInfo.cs

@@ -244,7 +244,7 @@ namespace OTSIncAReportApp.OTSSampleReportInfo
 
     #endregion
 
-    #region 相关结构类定义
+  
     /// <summary>
     /// 树控件结构类，ReportApp 给 RetMgrWindow 发送添加测量结果文件的信息
     /// </summary>
@@ -279,7 +279,7 @@ namespace OTSIncAReportApp.OTSSampleReportInfo
         /// <summary>
         /// 样品属性数据
         /// </summary>
-        public List<ConditionItem> ConditionItemList;
+        private List<ConditionItem> ConditionItmList;
         /// <summary>
         /// 树控件类，全局变量
         /// </summary>
@@ -288,6 +288,8 @@ namespace OTSIncAReportApp.OTSSampleReportInfo
         /// 索引
         /// </summary>
         public DisplayPicutureType TabIndex;
+
+        public List<ConditionItem> ConditionItemList { get => ConditionItmList; set => ConditionItmList = value; }
         #endregion
 
         #region 构造函数
@@ -386,8 +388,14 @@ namespace OTSIncAReportApp.OTSSampleReportInfo
             return ConditionItemList[i].itemDisplayVal.ToString();
 
         }
+        public void SetItemvalByItemName(OTS_REPORT_PROP_GRID_ITEMS in_orpgi,int value)
+        {
+            int i = GetPropIndexByPropItemName(in_orpgi);
 
+            ConditionItemList[i].itemVal = value;
 
-    };
-    #endregion
+        }
+
+
+    }   
 }

OTSIncAReportApp/1-UI/OTSDisplaySourceGridData/frmReportConditionChoose.cs

@@ -26,7 +26,7 @@ namespace OTSIncAReportApp
         /// <summary>
         /// 属性Grid对象，全局变量
         /// </summary>
-        public OTSSourceGrid m_ConditionGrid = null;
+        public OTSSourceGrid m_sourceGrid = null;
 
         /// <summary>
         /// 记录当前标签索引
@@ -35,9 +35,9 @@ namespace OTSIncAReportApp
 
 
 
-        public ReportCondition m_SourceGridData = new ReportCondition();  //current displayed condition item                                       
+        public ReportCondition m_conditionData = new ReportCondition();  //current displayed condition item                                       
 
-        public Dictionary<OTS_REPORT_PROP_GRID_ITEMS, ConditionItem> m_CurrentConditions;//record all the conditions that user  selected or seted.
+        public Dictionary<OTS_REPORT_PROP_GRID_ITEMS, ConditionItem> m_CurrentConditions;//record all the conditions that user has  selected or set.
 
         //国际化存储信息
         Hashtable resTable;
@@ -53,7 +53,7 @@ namespace OTSIncAReportApp
             InitializeComponent();
             m_ReportApp = ReportApp;
 
-            m_ConditionGrid = new OTSSourceGrid(this);
+            m_sourceGrid = new OTSSourceGrid(this);
             
             m_rstDataMgr = ReportApp.m_rstDataMgr;
             #region 国际化语言
@@ -221,19 +221,19 @@ namespace OTSIncAReportApp
         /// 接收 MeasureApp 发送的样品属性数据,通过Grid显示在properyWindow上
         /// </summary>
         /// <param name="SampleInfo"></param>
-        private void DisProperyWindow()
+        public void DisProperyWindow()
         {
             // 当点击事件响应结束后，将之前点击的行数和列数清0，避免选择工作样品重新赋值响应CELL值改变事件
             PropGrid.Show();
-            m_ConditionGrid.m_ClickRow = 0;
-            m_ConditionGrid.m_ClickColumn = 0;
+            m_sourceGrid.m_ClickRow = 0;
+            m_sourceGrid.m_ClickColumn = 0;
             if (PropGrid.Rows.Count() > 0)
             {
                 PropGrid.Rows.Clear();
                 PropGrid.Redim(OTSSourceGrid.m_Const_Grid_Row, OTSSourceGrid.m_Const_Grid_Column);
             }
-            m_ConditionGrid.InitGrid();
-            m_ConditionGrid.ShowGeneralGrid(m_SourceGridData);
+            m_sourceGrid.InitGrid();
+            m_sourceGrid.ShowGeneralGrid(m_conditionData);
         }
 
         public bool GetWorkingPictureConditionVal()
@@ -294,7 +294,7 @@ namespace OTSIncAReportApp
 
 
             }
-            m_SourceGridData = data;
+            m_conditionData = data;
             //SMeasureInfo = data;
                
             return true;
@@ -534,7 +534,7 @@ namespace OTSIncAReportApp
             sourceid =(int) m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE].itemVal;
          
 
-            var prop = m_SourceGridData;
+            var prop = m_conditionData;
 
            
             String m_fileName=m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE].itemDisplayVal.ToString();
@@ -574,7 +574,7 @@ namespace OTSIncAReportApp
                             IMAGE_TYPE t = (IMAGE_TYPE)imgType.itemVal;
                             m_ReportApp.im_Control_DrawDistrbutionImageAndBSE.SetShowMode(t);
                             m_ReportApp.m_SImageWindow.Activate();
-                            m_ReportApp.im_Control_DrawDistrbutionImageAndBSE.DrawDistrbutionImageAndBSE_ByQuery(m_SourceGridData);
+                            m_ReportApp.im_Control_DrawDistrbutionImageAndBSE.DrawDistrbutionImageAndBSE_ByQuery(m_conditionData);
                             m_ReportApp.im_Control_DrawDistrbutionImageAndBSE.SetSelectParticle(m_ReportApp.GetSelectedParticles());
 
                             
@@ -591,7 +591,7 @@ namespace OTSIncAReportApp
                             m_ReportApp.im_Control_DrawDistrbutionImageAndBSE.Dock = DockStyle.Fill;
                             m_ReportApp.m_SImageWindow.Controls.Add(m_ReportApp.im_Control_DrawDistrbutionImageAndBSE);
                             m_ReportApp.m_SImageWindow.Activate();
-                            m_ReportApp.im_Control_DrawDistrbutionImageAndBSE.DrawDistrbutionImageAndBSE_ByQuery(m_SourceGridData);
+                            m_ReportApp.im_Control_DrawDistrbutionImageAndBSE.DrawDistrbutionImageAndBSE_ByQuery(m_conditionData);
                             m_ReportApp.im_Control_DrawDistrbutionImageAndBSE.SetSelectParticle(m_ReportApp.GetSelectedParticles());
                             m_ReportApp.im_Control_DrawDistrbutionImageAndBSE.FullGraphMatch();
                         }
@@ -712,7 +712,7 @@ namespace OTSIncAReportApp
                             //国标一
                             Cursor.Current = Cursors.WaitCursor;
 
-                            int index = m_ReportApp.m_conditionChoose.m_SourceGridData.GetComboDownListIndexByItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE);
+                            int index = m_ReportApp.m_conditionChoose.m_conditionData.GetComboDownListIndexByItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE);
 
                             for (int i = 0; i < m_ReportApp.m_rstDataMgr.ResultFilesList.Count; i++)
                             {
@@ -722,7 +722,7 @@ namespace OTSIncAReportApp
                             }
 
                             OTSCLRINTERFACE.CPropParamClr clr_prop = m_ReportApp.m_rstDataMgr.m_ReportMgr.GetPropertyParamTable();
-                            List<string> datasourcelist = m_ReportApp.m_conditionChoose.m_SourceGridData.GetComboDownListByItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE);
+                            List<string> datasourcelist = m_ReportApp.m_conditionChoose.m_conditionData.GetComboDownListByItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE);
 
                             clr_prop.SetDataSourceList(datasourcelist);
                             clr_prop.SetDataSourceId(index);//
@@ -745,7 +745,7 @@ namespace OTSIncAReportApp
                         case CALCULATE_TABLE_TYPE.GB_Method2:
                             //国标二
                             Cursor.Current = Cursors.WaitCursor;
-                            int index2 = m_ReportApp.m_conditionChoose.m_SourceGridData.GetComboDownListIndexByItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE);
+                            int index2 = m_ReportApp.m_conditionChoose.m_conditionData.GetComboDownListIndexByItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE);
                         
                             for (int i = 0; i < m_ReportApp.m_rstDataMgr.ResultFilesList.Count; i++)
                             {
@@ -755,7 +755,7 @@ namespace OTSIncAReportApp
                             }
 
                             OTSCLRINTERFACE.CPropParamClr clr_prop2 = m_ReportApp.m_rstDataMgr.m_ReportMgr.GetPropertyParamTable();
-                            List<string> datasourcelist2 = m_ReportApp.m_conditionChoose.m_SourceGridData.GetComboDownListByItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE);
+                            List<string> datasourcelist2 = m_ReportApp.m_conditionChoose.m_conditionData.GetComboDownListByItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE);
 
                             clr_prop2.SetDataSourceList(datasourcelist2);
                             clr_prop2.SetDataSourceId(index2);//
@@ -775,7 +775,7 @@ namespace OTSIncAReportApp
                             //美标
                             Cursor.Current = Cursors.WaitCursor;
 
-                            int index3 = m_ReportApp.m_conditionChoose.m_SourceGridData.GetComboDownListIndexByItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE);
+                            int index3 = m_ReportApp.m_conditionChoose.m_conditionData.GetComboDownListIndexByItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE);
                          
                             for (int i = 0; i < m_ReportApp.m_rstDataMgr.ResultFilesList.Count; i++)
                             {
@@ -785,7 +785,7 @@ namespace OTSIncAReportApp
                             }
 
                             OTSCLRINTERFACE.CPropParamClr clr_prop3 = m_ReportApp.m_rstDataMgr.m_ReportMgr.GetPropertyParamTable();
-                            List<string> datasourcelist3 = m_ReportApp.m_conditionChoose.m_SourceGridData.GetComboDownListByItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE);
+                            List<string> datasourcelist3 = m_ReportApp.m_conditionChoose.m_conditionData.GetComboDownListByItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE);
 
                             clr_prop3.SetDataSourceList(datasourcelist3);
                             clr_prop3.SetDataSourceId(index3);//
@@ -804,7 +804,7 @@ namespace OTSIncAReportApp
                         case CALCULATE_TABLE_TYPE.DIN:
                             //德标
                             Cursor.Current = Cursors.WaitCursor;
-                            int index4 = m_ReportApp.m_conditionChoose.m_SourceGridData.GetComboDownListIndexByItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE);
+                            int index4 = m_ReportApp.m_conditionChoose.m_conditionData.GetComboDownListIndexByItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE);
                        
                             for (int i = 0; i < m_ReportApp.m_rstDataMgr.ResultFilesList.Count; i++)
                             {
@@ -814,7 +814,7 @@ namespace OTSIncAReportApp
                             }
 
                             OTSCLRINTERFACE.CPropParamClr clr_prop4 = m_ReportApp.m_rstDataMgr.m_ReportMgr.GetPropertyParamTable();
-                            List<string> datasourcelist4 = m_ReportApp.m_conditionChoose.m_SourceGridData.GetComboDownListByItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE);
+                            List<string> datasourcelist4 = m_ReportApp.m_conditionChoose.m_conditionData.GetComboDownListByItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE);
 
                             clr_prop4.SetDataSourceList(datasourcelist4);
                             clr_prop4.SetDataSourceId(index4);//
@@ -930,8 +930,8 @@ namespace OTSIncAReportApp
         {
             SourceGrid.Grid ls_gd = (SourceGrid.Grid)sender;
             ls_gd.Focus();
-            m_ConditionGrid.m_ClickRow = ls_gd.Selection.ActivePosition.Row;
-            m_ConditionGrid.m_ClickColumn = ls_gd.Selection.ActivePosition.Column;
+            m_sourceGrid.m_ClickRow = ls_gd.Selection.ActivePosition.Row;
+            m_sourceGrid.m_ClickColumn = ls_gd.Selection.ActivePosition.Column;
         }
 
         /// <summary>
@@ -941,10 +941,10 @@ namespace OTSIncAReportApp
         /// <param name="e"></param>
         private void OTSPropertyWindow_Resize(object sender, EventArgs e)
         {
-            if (null != m_ConditionGrid)
+            if (null != m_sourceGrid)
             {
-                m_ConditionGrid.m_PropWindow_X = this.Width;
-                m_ConditionGrid.InitGridTitlet();
+                m_sourceGrid.m_PropWindow_X = this.Width;
+                m_sourceGrid.InitGridTitlet();
             }
         }
         #endregion

OTSIncAReportApp/1-UI/OTSTemplateDesigner/Export_ReportTemplate.cs

@@ -1755,7 +1755,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             string template = TemplateList[selectindex];
             if (template == "")
             { //三元相图模板
-                template = m_condition.m_SourceGridData.GetPropItemDisplayValueByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.TRIO_CHART_TYPE).ToString();
+                template = m_condition.m_conditionData.GetPropItemDisplayValueByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.TRIO_CHART_TYPE).ToString();
             }
             //获取粒级表
             string pathtpf = Application.StartupPath + "\\Config\\ProData\\DefaultTriTemplateFile.tpf";
@@ -2005,7 +2005,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             }
             string po = "";
             string con = "";
-            int row = m_condition.m_SourceGridData.ConditionItemList.Count;
+            int row = m_condition.m_conditionData.ConditionItemList.Count;
             if (condition != -1)
             {
                 List<string> li = new List<string>() { "DMAX", "DMIN", "Area", "FERET" };
@@ -2019,7 +2019,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
                 }
                 else
                 {
-                    con = m_condition.m_SourceGridData.GetPropItemDisplayValueByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.SIZE_CAL_METHOD_TYPE).ToString();
+                    con = m_condition.m_conditionData.GetPropItemDisplayValueByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.SIZE_CAL_METHOD_TYPE).ToString();
                 }
             }
 
@@ -2552,7 +2552,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
                 m_otsreport_export.m_ReportApp.m_rstDataMgr.m_ReportMgr.AddASmplMsrResultMgr(resultfile, anothername);
             }
             OTSCLRINTERFACE.CPropParamClr clr_prop = m_otsreport_export.m_ReportApp.m_rstDataMgr.m_ReportMgr.GetPropertyParamTable();
-            List<string> datasourcelist = m_otsreport_export.m_ReportApp.m_conditionChoose.m_SourceGridData.GetComboDownListByItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE);
+            List<string> datasourcelist = m_otsreport_export.m_ReportApp.m_conditionChoose.m_conditionData.GetComboDownListByItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE);
 
             if (gb_1)
             {

OTSIncAReportApp/1-UI/OTSTreeViewData/OTSTreeViewData.cs

@@ -248,7 +248,7 @@ namespace OTSIncAReportApp.OTSDataMgrFunction
         /// <param name="node"></param>
         private void SetTreeNodeFocus_ByWorkingIndex(TreeNode node)
         {
-            if (node.Text == m_RstWindow.m_WorkSampleNode.Text)
+            if (node.Text == m_RstWindow.treeView1.SelectedNode.Text)
             {
                 m_RstWindow.treeView1.SelectedNode = m_RstWindow.m_WorkSampleNode;
                 m_RstWindow.treeView1.Focus();

OTSIncAReportApp/1-UI/frmCharts.cs

@@ -38,7 +38,7 @@ namespace OTSIncAReportApp
         /// <param name="e"></param>
         private void OTSCaculationChartsWindow_Activated(object sender, EventArgs e)
         {
-            OTSSourceGrid m_SampleImage = m_ReportApp.m_conditionChoose.m_ConditionGrid;
+            OTSSourceGrid m_SampleImage = m_ReportApp.m_conditionChoose.m_sourceGrid;
             string str1 = "常规参数";
 
             str1 = table["str1"].ToString();

OTSIncAReportApp/1-UI/frmMeasureRstMgr.cs

@@ -284,38 +284,10 @@ namespace OTSIncAReportApp
         public void AddSampleResult(string str_path)
         {
             
-            //if (m_DataMgr.AddDataResult(str_path))
-            //{
-             
-            //    return;
-            //}
-
-            //加载测量结果文件
-            //Dictionary<string, object> suggestions = DataOperation.DataAccess.XMLoperate.GetXMLAllInfo(str_path);
-
-
-            //string name = System.IO.Path.GetFileName(str_path);
-            //int workingid = (this.m_ReportApp.ResultFileId++);
-            //string path = System.IO.Path.GetDirectoryName(str_path);
-            //if (m_DataMgr.resultFilesList.Find(s => s.FileName == name) != null)
-            //{
-            //    MessageBox.Show("The file with the same name has been loaded, please select again！");
-            //    return;
-            //}
-
-            //DataOperation.Model.ResultFile result = new DataOperation.Model.ResultFile()
-            //{
-            //    FileId = workingid.ToString(),
-            //    FileName = name,
-            //    FilePath = path,
-            //    ResultInfo = suggestions
-            //};
-            //this.m_DataMgr.resultFilesList.Add(result);
-            //int index = m_DataMgr.resultFilesList.IndexOf(result);
+         
             if (m_DataMgr.AddDataResult(str_path))
             {
-                //ReportCondition SMeasureInfo = new ReportCondition();
-                //this.m_DataMgr.WorkingResult = index;
+             
 
                 m_ConditionChoose.SetDefaultConditionValue();
                 m_ConditionChoose.GetWorkingPictureConditionVal();
@@ -351,22 +323,39 @@ namespace OTSIncAReportApp
         /// <param name="e"></param>
         private void RDeleteNode_Click_1(object sender, EventArgs e)
         {
+            RemoveSample();
+        }
+
+        //ReportApp窗口给 RetMgrWindow 发送窗口删除样品回复
+        public void RemoveSample()
+        {
+            if (this.treeView1.SelectedNode == null) return;
             string str1 = table["str1"].ToString();
             string str2 = table["str2"].ToString();
             string sDeleteSampleName = str1;
-
-            sDeleteSampleName += this.treeView1.SelectedNode.Text;
+            var sDeletSName = this.treeView1.SelectedNode.Text;
+            sDeleteSampleName += sDeletSName;
             sDeleteSampleName += str2;
 
             if (DialogResult.OK == MessageBox.Show(sDeleteSampleName, "Tip", MessageBoxButtons.OKCancel, MessageBoxIcon.Warning))
             {
                 //删除当前选中的节点
-                DeletSample_Event(treeView1.SelectedNode.Text);
+                treeView1.Nodes.Remove(this.treeView1.SelectedNode);   //移除当前工作样品
+           
+
+                if ("" == sDeletSName)
+                {
+                    return;
+                }
+                //重新获取Treeview上的工作样品节点
+                this.m_TreeViewData.GetTreeWorkSampleNode(sDeletSName);
+                //设置工作样品焦点
+                this.m_TreeViewData.ReSetWorkSampleFoucs();
 
                 //当节点全部删除完时刷新树以及主窗口的控件
                 if (treeView1.Nodes.Count == 0)
                 {
-                    treeView1.Nodes.Clear();
+                    //treeView1.Nodes.Clear();
                     //如果已经没有测量结果，则将报告程序初始化到刚打开的状态
                     m_ReportApp.InitReportProState();
                 }
@@ -378,24 +367,29 @@ namespace OTSIncAReportApp
                     //删除树上的节点
                     m_WorkSampleName = m_ReportApp.m_rstDataMgr.GetSampleName();
                     m_TreeViewData.GetTreeWorkSampleNode(m_WorkSampleName);
-                    
+
                 }
             }
-        }
+            m_DataMgr.RemoveDataResult(sDeletSName);
+            var rstlist = m_ConditionChoose.m_conditionData.GetComboDownListByItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE);
+            rstlist.Remove(sDeletSName);
+            m_ConditionChoose.m_conditionData.SetComboDownListByItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE, rstlist);
+            if (rstlist.Count > 0)
+            {
+                m_ConditionChoose.m_conditionData.SetPropByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE, rstlist[0]);
+                m_ConditionChoose.m_conditionData.SetItemvalByItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE, 0);
+            }
 
-        //ReportApp窗口给 RetMgrWindow 发送窗口删除样品回复
-        public void DeletSample_Event(string sDeletSName)
-        {
-            treeView1.Nodes.Remove(m_WorkSampleNode);   //移除当前工作样品
 
-            if ("" == sDeletSName)
+            ConditionItem itm = m_ConditionChoose.m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE];
+            itm.comboDownList = rstlist;
+            if (rstlist.Count > 0)
             {
-                return;
+                itm.itemDisplayVal = rstlist[0];
+                itm.itemVal = 0;
             }
-            //重新获取Treeview上的工作样品节点
-            this.m_TreeViewData.GetTreeWorkSampleNode(sDeletSName);
-            //设置工作样品焦点
-            this.m_TreeViewData.ReSetWorkSampleFoucs();
+            m_ConditionChoose.DisCurrentPicProperty();
+
         }
         //切换当前工作样品
         //string sNewWorkSample : 新的工作样品名
@@ -452,7 +446,8 @@ namespace OTSIncAReportApp
             {
                 foreach (TreeNode childTN in TN.Nodes)
                 {
-                    childTN.Checked = flag; DG_Check(childTN, flag);
+                    childTN.Checked = flag; 
+                    DG_Check(childTN, flag);
                 }
             }
         }
@@ -494,15 +489,7 @@ namespace OTSIncAReportApp
                         iselectcount++;
                     }
 
-                    //更新底层及属性窗口
-                    //m_ReportApp.m_DataMgrFun.m_ReportProjFileMgr.SetSwitchForSmlResultFile(i, frm_Mss.treeView1.Nodes[i].Checked);
-
-                    //获取属性窗口底层值
-                    //m_ReportApp.m_DataMgrFun.GetPropertyData();
-                    //OTSSampleMeaInfo SMInfo = m_ReportApp.m_DataMgrFun.AddNewMeaResult(i);
-
-                    //将treeview的选择值，传送给属性grid上。
-                    //m_ReportApp.m_PropWindow.DisProperyWindow(SMInfo);
+                  
 
                 }
 
@@ -545,91 +532,13 @@ namespace OTSIncAReportApp
             }
         }
 
-        /// <summary>
-        /// 取消多数据源选择
-        /// </summary>
-        public void UnplugMultipleDataDataSources()
-        {
-            //int iselectcount = 0;
-
-            ////查找是否已经有超过2个以上的数据源被选择上
-            //for (int i = 0; i < this.treeView1.Nodes.Count; i++)
-            //{
-            //    this.treeView1.Nodes[i].Checked = this.treeView1.Nodes[i].Checked;
-            //    if (this.treeView1.Nodes[i].Checked == true)
-            //    {
-            //        iselectcount++;
-            //    }
-            //}
-
-            ////已经有两个以上的数据源被选择上,进行取消操作
-            //if (iselectcount >= 2)
-            //{
-            //    //先取消所有的treeview节点的选择
-            //    for (int i = 0; i < this.treeView1.Nodes.Count; i++)
-            //    {
-            //        this.treeView1.Nodes[i].Checked = false;
-
-            //        //更新底层及属性窗口
-            //        m_ReportApp.m_DataMgrFun.m_ReportProjFileMgr.SetSwitchForSmlResultFile(i, this.treeView1.Nodes[i].Checked);
-            //    }
-
-            //    //获取
-            //    OTSSampleMeaInfo SMInfo = new OTSSampleMeaInfo();
-            //    DataMgrFun dataMgr = m_ReportApp.m_DataMgrFun;
-            //    dataMgr.SetSampleParamVal(OTS_RETORT_PROP_GRID_ITEMS.DATA_SOURCE, OTS_ITEM_TYPES.COMBO, 0);
-
-            //    //获取属性窗口更新显示
-            //    dataMgr.GetWorkSamplePropertyVal(ref SMInfo);
-
-            //    //显示默认的图表
-            //    m_ReportApp.m_PropWindow.m_SampleGrid.ShowDataDiagram();
-            //}
-        }
+     
 
       
 
         #endregion
 
-        //读取rst文件中的帧图位置信息
-        //private DataTable ReadXML(string a_position)
-        //{
-        //    //创建空列
-        //    DataTable dt = new DataTable();
-        //    dt.TableName = "Fields";
-        //    dt.Columns.Add("FieldX");
-        //    dt.Columns.Add("FieldY");
-        //    dt.Columns.Add("ID");
-
-        //    XmlDocument doc = new XmlDocument();
-        //    XmlReaderSettings settings = new XmlReaderSettings();
-        //    settings.IgnoreComments = true;//忽略文档里的注释
-        //    XmlReader reader = XmlReader.Create(a_position, settings);
-        //    doc.Load(reader);
-        //    //得到根结点
-        //    XmlNode xn = doc.SelectSingleNode("XMLData");
-        //    //得到根结点的所有子节点
-        //    XmlNodeList xnl = xn.ChildNodes;
-        //    foreach (XmlNode xml in xnl)
-        //    {
-        //        if (xml.Name.ToString() == "Collection")
-        //        {
-        //            for (int i = 0; i < xml.ChildNodes.Count; i++)
-        //            {
-        //                if (xml.ChildNodes[i].Name.ToLower() == "member")
-        //                {
-        //                        DataRow dr = dt.NewRow();
-        //                        dr["FieldX"] = xml.ChildNodes[i].Attributes.GetNamedItem("FieldX").Value;
-        //                        dr["FieldY"] = xml.ChildNodes[i].Attributes.GetNamedItem("FieldY").Value;
-        //                        dr["ID"] = xml.ChildNodes[i].Attributes.GetNamedItem("ID").Value;
-        //                        dt.Rows.Add(dr);
-
-        //                }
-        //            }
-        //        }
-        //    }
-        //    return dt;
-        //}
+       
 
     }
 }

OTSIncAReportApp/1-UI/frmReportApp.Designer.cs

@@ -31,27 +31,28 @@
             this.components = new System.ComponentModel.Container();
             System.Windows.Forms.RibbonPanel ribbonPanel1;
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmReportApp));
-            OTS.WinFormsUI.Docking.DockPanelSkin dockPanelSkin1 = new OTS.WinFormsUI.Docking.DockPanelSkin();
-            OTS.WinFormsUI.Docking.AutoHideStripSkin autoHideStripSkin1 = new OTS.WinFormsUI.Docking.AutoHideStripSkin();
-            OTS.WinFormsUI.Docking.DockPanelGradient dockPanelGradient1 = new OTS.WinFormsUI.Docking.DockPanelGradient();
-            OTS.WinFormsUI.Docking.TabGradient tabGradient1 = new OTS.WinFormsUI.Docking.TabGradient();
-            OTS.WinFormsUI.Docking.DockPaneStripSkin dockPaneStripSkin1 = new OTS.WinFormsUI.Docking.DockPaneStripSkin();
-            OTS.WinFormsUI.Docking.DockPaneStripGradient dockPaneStripGradient1 = new OTS.WinFormsUI.Docking.DockPaneStripGradient();
-            OTS.WinFormsUI.Docking.TabGradient tabGradient2 = new OTS.WinFormsUI.Docking.TabGradient();
-            OTS.WinFormsUI.Docking.DockPanelGradient dockPanelGradient2 = new OTS.WinFormsUI.Docking.DockPanelGradient();
-            OTS.WinFormsUI.Docking.TabGradient tabGradient3 = new OTS.WinFormsUI.Docking.TabGradient();
-            OTS.WinFormsUI.Docking.DockPaneStripToolWindowGradient dockPaneStripToolWindowGradient1 = new OTS.WinFormsUI.Docking.DockPaneStripToolWindowGradient();
-            OTS.WinFormsUI.Docking.TabGradient tabGradient4 = new OTS.WinFormsUI.Docking.TabGradient();
-            OTS.WinFormsUI.Docking.TabGradient tabGradient5 = new OTS.WinFormsUI.Docking.TabGradient();
-            OTS.WinFormsUI.Docking.DockPanelGradient dockPanelGradient3 = new OTS.WinFormsUI.Docking.DockPanelGradient();
-            OTS.WinFormsUI.Docking.TabGradient tabGradient6 = new OTS.WinFormsUI.Docking.TabGradient();
-            OTS.WinFormsUI.Docking.TabGradient tabGradient7 = new OTS.WinFormsUI.Docking.TabGradient();
+            OTS.WinFormsUI.Docking.DockPanelSkin dockPanelSkin3 = new OTS.WinFormsUI.Docking.DockPanelSkin();
+            OTS.WinFormsUI.Docking.AutoHideStripSkin autoHideStripSkin3 = new OTS.WinFormsUI.Docking.AutoHideStripSkin();
+            OTS.WinFormsUI.Docking.DockPanelGradient dockPanelGradient7 = new OTS.WinFormsUI.Docking.DockPanelGradient();
+            OTS.WinFormsUI.Docking.TabGradient tabGradient15 = new OTS.WinFormsUI.Docking.TabGradient();
+            OTS.WinFormsUI.Docking.DockPaneStripSkin dockPaneStripSkin3 = new OTS.WinFormsUI.Docking.DockPaneStripSkin();
+            OTS.WinFormsUI.Docking.DockPaneStripGradient dockPaneStripGradient3 = new OTS.WinFormsUI.Docking.DockPaneStripGradient();
+            OTS.WinFormsUI.Docking.TabGradient tabGradient16 = new OTS.WinFormsUI.Docking.TabGradient();
+            OTS.WinFormsUI.Docking.DockPanelGradient dockPanelGradient8 = new OTS.WinFormsUI.Docking.DockPanelGradient();
+            OTS.WinFormsUI.Docking.TabGradient tabGradient17 = new OTS.WinFormsUI.Docking.TabGradient();
+            OTS.WinFormsUI.Docking.DockPaneStripToolWindowGradient dockPaneStripToolWindowGradient3 = new OTS.WinFormsUI.Docking.DockPaneStripToolWindowGradient();
+            OTS.WinFormsUI.Docking.TabGradient tabGradient18 = new OTS.WinFormsUI.Docking.TabGradient();
+            OTS.WinFormsUI.Docking.TabGradient tabGradient19 = new OTS.WinFormsUI.Docking.TabGradient();
+            OTS.WinFormsUI.Docking.DockPanelGradient dockPanelGradient9 = new OTS.WinFormsUI.Docking.DockPanelGradient();
+            OTS.WinFormsUI.Docking.TabGradient tabGradient20 = new OTS.WinFormsUI.Docking.TabGradient();
+            OTS.WinFormsUI.Docking.TabGradient tabGradient21 = new OTS.WinFormsUI.Docking.TabGradient();
             this.rbSave = new System.Windows.Forms.RibbonButton();
             this.rbSaveAs = new System.Windows.Forms.RibbonButton();
             this.rbOut = new System.Windows.Forms.RibbonButton();
             this.ribbonButton2 = new System.Windows.Forms.RibbonButton();
             this.rbOpen = new System.Windows.Forms.RibbonButton();
             this.ribbonButton1 = new System.Windows.Forms.RibbonButton();
+            this.rbClose = new System.Windows.Forms.RibbonButton();
             this.ribbon1 = new System.Windows.Forms.Ribbon();
             this.dpbOpen = new System.Windows.Forms.RibbonOrbMenuItem();
             this.dpbExport = new System.Windows.Forms.RibbonOrbMenuItem();
@@ -85,8 +86,8 @@
             this.DockWindowPanel = new OTS.WinFormsUI.Docking.DockPanel();
             this.ribbonOrbMenuItem5 = new System.Windows.Forms.RibbonOrbMenuItem();
             this.ribbonOrbMenuItem7 = new System.Windows.Forms.RibbonOrbMenuItem();
-            this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
             this.ribbonButton3 = new System.Windows.Forms.RibbonButton();
+            this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
             ribbonPanel1 = new System.Windows.Forms.RibbonPanel();
             this.statusStrip1.SuspendLayout();
             this.SuspendLayout();
@@ -182,11 +183,27 @@
             this.ribbonButton1.ToolTipImage = null;
             this.ribbonButton1.ToolTipTitle = null;
             // 
+            // rbClose
+            // 
+            this.rbClose.AltKey = null;
+            this.rbClose.DropDownArrowDirection = System.Windows.Forms.RibbonArrowDirection.Left;
+            this.rbClose.DropDownArrowSize = new System.Drawing.Size(5, 3);
+            this.rbClose.DropDownItems.Add(this.ribbonButton1);
+            this.rbClose.Image = global::OTSIncAReportApp.Properties.Resources.close32;
+            this.rbClose.SmallImage = ((System.Drawing.Image)(resources.GetObject("rbClose.SmallImage")));
+            this.rbClose.Style = System.Windows.Forms.RibbonButtonStyle.Normal;
+            this.rbClose.Tag = null;
+            this.rbClose.Text = "关闭";
+            this.rbClose.ToolTip = "rbClose";
+            this.rbClose.ToolTipImage = null;
+            this.rbClose.ToolTipTitle = null;
+            this.rbClose.Click += new System.EventHandler(this.rbClose_Click);
+            // 
             // ribbon1
             // 
             this.ribbon1.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.ribbon1.Location = new System.Drawing.Point(0, 0);
-            this.ribbon1.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
+            this.ribbon1.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3);
             this.ribbon1.Minimized = false;
             this.ribbon1.Name = "ribbon1";
             // 
@@ -215,7 +232,7 @@
             this.ribbon1.QuickAcessToolbar.ToolTip = null;
             this.ribbon1.QuickAcessToolbar.ToolTipImage = null;
             this.ribbon1.QuickAcessToolbar.ToolTipTitle = null;
-            this.ribbon1.Size = new System.Drawing.Size(1701, 130);
+            this.ribbon1.Size = new System.Drawing.Size(2552, 130);
             this.ribbon1.TabIndex = 0;
             this.ribbon1.Tabs.Add(this.ribbonTab1);
             this.ribbon1.Tabs.Add(this.rbMenu);
@@ -340,6 +357,7 @@
             this.ribbonPanel3.ButtonMoreEnabled = false;
             this.ribbonPanel3.ButtonMoreVisible = false;
             this.ribbonPanel3.Items.Add(this.rbOpen);
+            this.ribbonPanel3.Items.Add(this.rbClose);
             this.ribbonPanel3.Tag = null;
             this.ribbonPanel3.Text = "文件";
             // 
@@ -569,11 +587,11 @@
             this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.RSGrayVal,
             this.mouseMatter});
-            this.statusStrip1.Location = new System.Drawing.Point(0, 823);
+            this.statusStrip1.Location = new System.Drawing.Point(0, 1019);
             this.statusStrip1.Name = "statusStrip1";
-            this.statusStrip1.Padding = new System.Windows.Forms.Padding(12, 0, 3, 0);
+            this.statusStrip1.Padding = new System.Windows.Forms.Padding(18, 0, 4, 0);
             this.statusStrip1.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
-            this.statusStrip1.Size = new System.Drawing.Size(1701, 26);
+            this.statusStrip1.Size = new System.Drawing.Size(2552, 26);
             this.statusStrip1.TabIndex = 4;
             this.statusStrip1.Text = "statusStrip1";
             // 
@@ -597,53 +615,53 @@
             this.DockWindowPanel.Dock = System.Windows.Forms.DockStyle.Fill;
             this.DockWindowPanel.DockBackColor = System.Drawing.SystemColors.Control;
             this.DockWindowPanel.Location = new System.Drawing.Point(0, 130);
-            this.DockWindowPanel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.DockWindowPanel.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.DockWindowPanel.Name = "DockWindowPanel";
-            this.DockWindowPanel.Size = new System.Drawing.Size(1701, 693);
-            dockPanelGradient1.EndColor = System.Drawing.SystemColors.ControlLight;
-            dockPanelGradient1.StartColor = System.Drawing.SystemColors.ControlLight;
-            autoHideStripSkin1.DockStripGradient = dockPanelGradient1;
-            tabGradient1.EndColor = System.Drawing.SystemColors.Control;
-            tabGradient1.StartColor = System.Drawing.SystemColors.Control;
-            tabGradient1.TextColor = System.Drawing.SystemColors.ControlDarkDark;
-            autoHideStripSkin1.TabGradient = tabGradient1;
-            dockPanelSkin1.AutoHideStripSkin = autoHideStripSkin1;
-            tabGradient2.EndColor = System.Drawing.SystemColors.ControlLightLight;
-            tabGradient2.StartColor = System.Drawing.SystemColors.ControlLightLight;
-            tabGradient2.TextColor = System.Drawing.SystemColors.ControlText;
-            dockPaneStripGradient1.ActiveTabGradient = tabGradient2;
-            dockPanelGradient2.EndColor = System.Drawing.SystemColors.Control;
-            dockPanelGradient2.StartColor = System.Drawing.SystemColors.Control;
-            dockPaneStripGradient1.DockStripGradient = dockPanelGradient2;
-            tabGradient3.EndColor = System.Drawing.SystemColors.ControlLight;
-            tabGradient3.StartColor = System.Drawing.SystemColors.ControlLight;
-            tabGradient3.TextColor = System.Drawing.SystemColors.ControlText;
-            dockPaneStripGradient1.InactiveTabGradient = tabGradient3;
-            dockPaneStripSkin1.DocumentGradient = dockPaneStripGradient1;
-            tabGradient4.EndColor = System.Drawing.SystemColors.ActiveCaption;
-            tabGradient4.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical;
-            tabGradient4.StartColor = System.Drawing.SystemColors.GradientActiveCaption;
-            tabGradient4.TextColor = System.Drawing.SystemColors.ActiveCaptionText;
-            dockPaneStripToolWindowGradient1.ActiveCaptionGradient = tabGradient4;
-            tabGradient5.EndColor = System.Drawing.SystemColors.Control;
-            tabGradient5.StartColor = System.Drawing.SystemColors.Control;
-            tabGradient5.TextColor = System.Drawing.SystemColors.ControlText;
-            dockPaneStripToolWindowGradient1.ActiveTabGradient = tabGradient5;
-            dockPanelGradient3.EndColor = System.Drawing.SystemColors.ControlLight;
-            dockPanelGradient3.StartColor = System.Drawing.SystemColors.ControlLight;
-            dockPaneStripToolWindowGradient1.DockStripGradient = dockPanelGradient3;
-            tabGradient6.EndColor = System.Drawing.SystemColors.GradientInactiveCaption;
-            tabGradient6.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical;
-            tabGradient6.StartColor = System.Drawing.SystemColors.GradientInactiveCaption;
-            tabGradient6.TextColor = System.Drawing.SystemColors.ControlText;
-            dockPaneStripToolWindowGradient1.InactiveCaptionGradient = tabGradient6;
-            tabGradient7.EndColor = System.Drawing.Color.Transparent;
-            tabGradient7.StartColor = System.Drawing.Color.Transparent;
-            tabGradient7.TextColor = System.Drawing.SystemColors.ControlDarkDark;
-            dockPaneStripToolWindowGradient1.InactiveTabGradient = tabGradient7;
-            dockPaneStripSkin1.ToolWindowGradient = dockPaneStripToolWindowGradient1;
-            dockPanelSkin1.DockPaneStripSkin = dockPaneStripSkin1;
-            this.DockWindowPanel.Skin = dockPanelSkin1;
+            this.DockWindowPanel.Size = new System.Drawing.Size(2552, 889);
+            dockPanelGradient7.EndColor = System.Drawing.SystemColors.ControlLight;
+            dockPanelGradient7.StartColor = System.Drawing.SystemColors.ControlLight;
+            autoHideStripSkin3.DockStripGradient = dockPanelGradient7;
+            tabGradient15.EndColor = System.Drawing.SystemColors.Control;
+            tabGradient15.StartColor = System.Drawing.SystemColors.Control;
+            tabGradient15.TextColor = System.Drawing.SystemColors.ControlDarkDark;
+            autoHideStripSkin3.TabGradient = tabGradient15;
+            dockPanelSkin3.AutoHideStripSkin = autoHideStripSkin3;
+            tabGradient16.EndColor = System.Drawing.SystemColors.ControlLightLight;
+            tabGradient16.StartColor = System.Drawing.SystemColors.ControlLightLight;
+            tabGradient16.TextColor = System.Drawing.SystemColors.ControlText;
+            dockPaneStripGradient3.ActiveTabGradient = tabGradient16;
+            dockPanelGradient8.EndColor = System.Drawing.SystemColors.Control;
+            dockPanelGradient8.StartColor = System.Drawing.SystemColors.Control;
+            dockPaneStripGradient3.DockStripGradient = dockPanelGradient8;
+            tabGradient17.EndColor = System.Drawing.SystemColors.ControlLight;
+            tabGradient17.StartColor = System.Drawing.SystemColors.ControlLight;
+            tabGradient17.TextColor = System.Drawing.SystemColors.ControlText;
+            dockPaneStripGradient3.InactiveTabGradient = tabGradient17;
+            dockPaneStripSkin3.DocumentGradient = dockPaneStripGradient3;
+            tabGradient18.EndColor = System.Drawing.SystemColors.ActiveCaption;
+            tabGradient18.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical;
+            tabGradient18.StartColor = System.Drawing.SystemColors.GradientActiveCaption;
+            tabGradient18.TextColor = System.Drawing.SystemColors.ActiveCaptionText;
+            dockPaneStripToolWindowGradient3.ActiveCaptionGradient = tabGradient18;
+            tabGradient19.EndColor = System.Drawing.SystemColors.Control;
+            tabGradient19.StartColor = System.Drawing.SystemColors.Control;
+            tabGradient19.TextColor = System.Drawing.SystemColors.ControlText;
+            dockPaneStripToolWindowGradient3.ActiveTabGradient = tabGradient19;
+            dockPanelGradient9.EndColor = System.Drawing.SystemColors.ControlLight;
+            dockPanelGradient9.StartColor = System.Drawing.SystemColors.ControlLight;
+            dockPaneStripToolWindowGradient3.DockStripGradient = dockPanelGradient9;
+            tabGradient20.EndColor = System.Drawing.SystemColors.GradientInactiveCaption;
+            tabGradient20.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical;
+            tabGradient20.StartColor = System.Drawing.SystemColors.GradientInactiveCaption;
+            tabGradient20.TextColor = System.Drawing.SystemColors.ControlText;
+            dockPaneStripToolWindowGradient3.InactiveCaptionGradient = tabGradient20;
+            tabGradient21.EndColor = System.Drawing.Color.Transparent;
+            tabGradient21.StartColor = System.Drawing.Color.Transparent;
+            tabGradient21.TextColor = System.Drawing.SystemColors.ControlDarkDark;
+            dockPaneStripToolWindowGradient3.InactiveTabGradient = tabGradient21;
+            dockPaneStripSkin3.ToolWindowGradient = dockPaneStripToolWindowGradient3;
+            dockPanelSkin3.DockPaneStripSkin = dockPaneStripSkin3;
+            this.DockWindowPanel.Skin = dockPanelSkin3;
             this.DockWindowPanel.TabIndex = 5;
             // 
             // ribbonOrbMenuItem5
@@ -690,15 +708,15 @@
             // 
             // frmReportApp
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1701, 849);
+            this.ClientSize = new System.Drawing.Size(2552, 1045);
             this.Controls.Add(this.DockWindowPanel);
             this.Controls.Add(this.statusStrip1);
             this.Controls.Add(this.ribbon1);
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.IsMdiContainer = true;
-            this.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
+            this.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3);
             this.Name = "frmReportApp";
             this.Text = "OTSReportApp";
             this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
@@ -719,6 +737,7 @@
         private System.Windows.Forms.RibbonButton ribbonButton1;
         public System.Windows.Forms.RibbonButton rbSave;
         public System.Windows.Forms.RibbonButton rbOpen;
+        public System.Windows.Forms.RibbonButton rbClose;
         public System.Windows.Forms.RibbonButton rbSaveAs;
         public System.Windows.Forms.RibbonButton rbOut;
         public System.Windows.Forms.RibbonButton rbWidthImage;
@@ -755,13 +774,14 @@
         private System.Windows.Forms.RibbonOrbRecentItem ribbonOrbRecentItem1;
         public System.Windows.Forms.RibbonOrbMenuItem dpbUnDo;
         public System.Windows.Forms.RibbonOrbMenuItem dpbReDo;
-        private System.Windows.Forms.ToolTip toolTip1;
         private System.Windows.Forms.RibbonPanel ribbonPanelOthers;
         public System.Windows.Forms.RibbonButton ribbonButton3;
         public System.Windows.Forms.RibbonButton rbHelp;
         private System.Windows.Forms.RibbonOrbMenuItem ribbonOrbMenuItem_Extremum;
         public System.Windows.Forms.RibbonOrbMenuItem Backup;
         public System.Windows.Forms.RibbonOrbMenuItem ribbonOrbMenuItem_InclusionsTraceability;
+        private System.Windows.Forms.ToolTip toolTip1;
+       
     }
 }
 

OTSIncAReportApp/1-UI/frmReportApp.cs

@@ -398,7 +398,7 @@ namespace OTSIncAReportApp
             m_RstWindow.treeView1.Nodes.Clear();
 
             //清除属性Grid
-            m_conditionChoose.m_ConditionGrid = new OTSSourceGrid(m_conditionChoose);
+            m_conditionChoose.m_sourceGrid = new OTSSourceGrid(m_conditionChoose);
 
             m_rstDataMgr.ResultFilesList.Clear();
 
@@ -474,7 +474,7 @@ namespace OTSIncAReportApp
             switch (tabIndex)
             {
                 case (int)DisplayPicutureType.AnalyzeImg:
-                    int imgDisType=m_conditionChoose.m_SourceGridData.GetComboDownListIndexByItemName(OTS_REPORT_PROP_GRID_ITEMS.IMAGE_DISPLAY_TYPE);
+                    int imgDisType=m_conditionChoose.m_conditionData.GetComboDownListIndexByItemName(OTS_REPORT_PROP_GRID_ITEMS.IMAGE_DISPLAY_TYPE);
                     if (imgDisType == 0)
                     {
                         if (im_Control_DrawDistrbutionImageAndBSE != null)
@@ -513,7 +513,7 @@ namespace OTSIncAReportApp
             switch (tabIndex)
             {
                 case (int)DisplayPicutureType.AnalyzeImg:
-                    int imgDisType = m_conditionChoose.m_SourceGridData.GetComboDownListIndexByItemName(OTS_REPORT_PROP_GRID_ITEMS.IMAGE_DISPLAY_TYPE);
+                    int imgDisType = m_conditionChoose.m_conditionData.GetComboDownListIndexByItemName(OTS_REPORT_PROP_GRID_ITEMS.IMAGE_DISPLAY_TYPE);
                     if (imgDisType == 0)
                     {
                         if (im_Control_DrawDistrbutionImageAndBSE != null)
@@ -552,7 +552,7 @@ namespace OTSIncAReportApp
             switch (tabIndex)
             {
                 case (int)DisplayPicutureType.AnalyzeImg:
-                    int imgDisType = m_conditionChoose.m_SourceGridData.GetComboDownListIndexByItemName(OTS_REPORT_PROP_GRID_ITEMS.IMAGE_DISPLAY_TYPE);
+                    int imgDisType = m_conditionChoose.m_conditionData.GetComboDownListIndexByItemName(OTS_REPORT_PROP_GRID_ITEMS.IMAGE_DISPLAY_TYPE);
                     if (imgDisType == 0)
                     {
                         if (im_Control_DrawDistrbutionImageAndBSE != null)
@@ -590,7 +590,7 @@ namespace OTSIncAReportApp
             switch (tabIndex)
             {
                 case (int)DisplayPicutureType.AnalyzeImg:
-                    int imgDisType = m_conditionChoose.m_SourceGridData.GetComboDownListIndexByItemName(OTS_REPORT_PROP_GRID_ITEMS.IMAGE_DISPLAY_TYPE);
+                    int imgDisType = m_conditionChoose.m_conditionData.GetComboDownListIndexByItemName(OTS_REPORT_PROP_GRID_ITEMS.IMAGE_DISPLAY_TYPE);
                     if (imgDisType == 0)
                     {
                         if (im_Control_DrawDistrbutionImageAndBSE != null)
@@ -631,7 +631,7 @@ namespace OTSIncAReportApp
         public void rbRenewFun(bool isReview, int FieldId, int ParticleId)
         {
             int tabIndex = (int)m_conditionChoose.tabIndex;
-            int DisType = m_conditionChoose.m_SourceGridData.GetComboDownListIndexByItemName(OTS_REPORT_PROP_GRID_ITEMS.IMAGE_DISPLAY_TYPE);
+            int DisType = m_conditionChoose.m_conditionData.GetComboDownListIndexByItemName(OTS_REPORT_PROP_GRID_ITEMS.IMAGE_DISPLAY_TYPE);
             switch (tabIndex)
             {
                 case (int)DisplayPicutureType.AnalyzeImg:
@@ -653,7 +653,7 @@ namespace OTSIncAReportApp
                             m_SImageWindow.Controls.Add(im_Control_DrawDistrbutionImageAndBSE);
                             m_SImageWindow.Activate();
                             im_Control_DrawDistrbutionImageAndBSE.ShowSourceName = "";
-                            im_Control_DrawDistrbutionImageAndBSE.DrawDistrbutionImageAndBSE_ByQuery(m_conditionChoose.m_SourceGridData);
+                            im_Control_DrawDistrbutionImageAndBSE.DrawDistrbutionImageAndBSE_ByQuery(m_conditionChoose.m_conditionData);
                             im_Control_DrawDistrbutionImageAndBSE.SetSelectParticle(GetSelectedParticles());
 
                             ConditionItem imgType = m_conditionChoose.m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.IMAGE_TYPE];
@@ -706,7 +706,7 @@ namespace OTSIncAReportApp
             {
                 case (int)DisplayPicutureType.AnalyzeImg:
 
-                    int imgDisType = m_conditionChoose.m_SourceGridData.GetComboDownListIndexByItemName(OTS_REPORT_PROP_GRID_ITEMS.IMAGE_DISPLAY_TYPE);
+                    int imgDisType = m_conditionChoose.m_conditionData.GetComboDownListIndexByItemName(OTS_REPORT_PROP_GRID_ITEMS.IMAGE_DISPLAY_TYPE);
                     if (imgDisType == 0)
                     {
                         if (im_Control_DrawDistrbutionImageAndBSE != null)
@@ -745,7 +745,7 @@ namespace OTSIncAReportApp
             {
                 case (int)DisplayPicutureType.AnalyzeImg:
 
-                    IMAGE_DISPLAY_TYPE imgDisType = (IMAGE_DISPLAY_TYPE)m_conditionChoose.m_SourceGridData.GetComboDownListIndexByItemName(OTS_REPORT_PROP_GRID_ITEMS.IMAGE_DISPLAY_TYPE);
+                    IMAGE_DISPLAY_TYPE imgDisType = (IMAGE_DISPLAY_TYPE)m_conditionChoose.m_conditionData.GetComboDownListIndexByItemName(OTS_REPORT_PROP_GRID_ITEMS.IMAGE_DISPLAY_TYPE);
                     if (imgDisType == IMAGE_DISPLAY_TYPE.DISTRIBUTION)
                     {
                         if (im_Control_DrawDistrbutionImageAndBSE != null)
@@ -783,7 +783,7 @@ namespace OTSIncAReportApp
             switch (tabIndex)
             {
                 case (int)DisplayPicutureType.AnalyzeImg:
-                    int imgDisType = m_conditionChoose.m_SourceGridData.GetComboDownListIndexByItemName(OTS_REPORT_PROP_GRID_ITEMS.IMAGE_DISPLAY_TYPE);
+                    int imgDisType = m_conditionChoose.m_conditionData.GetComboDownListIndexByItemName(OTS_REPORT_PROP_GRID_ITEMS.IMAGE_DISPLAY_TYPE);
                     if (imgDisType == 0)
                     {
                         if (im_Control_DrawDistrbutionImageAndBSE != null)
@@ -822,7 +822,7 @@ namespace OTSIncAReportApp
             {
                 case (int)DisplayPicutureType.AnalyzeImg:
 
-                    int imgDisType = m_conditionChoose.m_SourceGridData.GetComboDownListIndexByItemName(OTS_REPORT_PROP_GRID_ITEMS.IMAGE_DISPLAY_TYPE);
+                    int imgDisType = m_conditionChoose.m_conditionData.GetComboDownListIndexByItemName(OTS_REPORT_PROP_GRID_ITEMS.IMAGE_DISPLAY_TYPE);
                     if (imgDisType == 0)
                     {
                         if (im_Control_DrawDistrbutionImageAndBSE != null)
@@ -1206,6 +1206,11 @@ namespace OTSIncAReportApp
                 log.Error("InclusionsTraceability :" + ex.ToString());
             }
         }
+
+        private void rbClose_Click(object sender, EventArgs e)
+        {
+           m_RstWindow. RemoveSample();
+        }
     }
 }
 

OTSIncAReportApp/1-UI/frmReportApp.resx

@@ -167,6 +167,12 @@
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAW
         JQAAFiUBSVIk8AAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="rbOpen.SmallImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        wwAADsMBx2+oZAAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="ribbonButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -181,7 +187,7 @@
         JQAAFiUBSVIk8AAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="rbOpen.SmallImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="rbClose.SmallImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
         wwAADsMBx2+oZAAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
@@ -298,15 +304,15 @@
         JQAAFiUBSVIk8AAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
 </value>
   </data>
-  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>183, 17</value>
-  </metadata>
   <data name="ribbonButton3.SmallImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAW
         JQAAFiUBSVIk8AAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
 </value>
   </data>
+  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>183, 17</value>
+  </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>144</value>
   </metadata>

OTSIncAReportApp/1-UI/frmSampleImage.cs

@@ -32,7 +32,7 @@ namespace OTSIncAReportApp
         #region 分布图排列图主窗体被激活时触发事件
         private void OTSSampleImageWindow_Activated(object sender, EventArgs e)
         {
-            OTSSourceGrid m_SampleImage = m_ReportApp.m_conditionChoose.m_ConditionGrid;
+            OTSSourceGrid m_SampleImage = m_ReportApp.m_conditionChoose.m_sourceGrid;
             m_SampleImage.InitGrid();
             m_SampleImage.InitGroupTitle(0, table["generalparameters"].ToString());
 

OTSIncAReportApp/1-UI/frmTables.cs

@@ -32,7 +32,7 @@ namespace OTSIncAReportApp
         #region Grid表格被激活时事件
         private void OTSCaculationTablesWindow_Activated(object sender, EventArgs e)
         {
-            OTSSourceGrid m_SampleGrid = m_ReportApp.m_conditionChoose.m_ConditionGrid;
+            OTSSourceGrid m_SampleGrid = m_ReportApp.m_conditionChoose.m_sourceGrid;
 
             m_SampleGrid.InitGrid();
             m_SampleGrid.InitGroupTitle(0, table["generalparameters"].ToString());

OTSIncAReportApp/2-CommonFunction/OTSDataMgrFunction/ResultDataMgr.cs

@@ -46,8 +46,12 @@ namespace OTSIncAReportApp.OTSDataMgrFunction
 
         public void SetWorkingResult(int value)
         {
-            workingResult = value;
-            m_curResultFile = resultFilesList[value];
+            if (resultFilesList.Count > 0)
+            {
+                workingResult = value;
+                m_curResultFile = resultFilesList[value];
+            }
+           
         }
         public void setSelectedIndex(int value)
         {
@@ -119,6 +123,29 @@ namespace OTSIncAReportApp.OTSDataMgrFunction
 
             return true;
         }
+        public void RemoveDataResult(string fileName)
+        {
+            ResultFile rst=null;
+            foreach (var r in resultFilesList)
+            {
+                if (r.FileName_real == fileName)
+                {
+                    rst = r;
+                }
+            
+            }
+            if (rst != null)
+            {
+                resultFilesList.Remove(rst);
+                workingResult = 0;
+            }
+            else 
+            {
+                workingResult =-1;
+            }
+           
+        
+        }
 
         private string UpdateName(string name, List<ResultFile> ResultFilesList)
         {