Merge branch 'cxs' of http://36.129.169.60:30080/gogsadmin/OTS into cxs

# Conflicts:
#	OTSIncAReportApp/1-UI/OTSDisplaySourceGridData/frmReportConditionChoose.cs

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

@@ -208,10 +208,10 @@
 	  <Control name="ribbonOrbMenuItem_InclusionsTraceability" text="外来夹杂物溯源" />
 	  <Control name="ribbonOrbMenuItem_purity" text="钢铁中夹杂物纯洁度分析" />
 	  <Control name="message1" text="现已经有打开的测量结果文件新建项目后将不保存，是否确定新建？" />
-	  <Control name="AnalysisDiagram" text="分析图" />
-	  <Control name="AnalysisDataSheet" text="分析数据表" />
-	  <Control name="AnalysisDataChart" text="分析数据图" />
-	  
+	  <Control name="AnalysisDiagram" text="模拟分布图" />
+	  <Control name="AnalysisDataSheet" text="颗粒查询" />
+	  <Control name="analysisdatasheetandchart" text="统计分析" />
+	  <Control name="overviewtable" text="结果概况" />
 	  <Control name="dpbTemplateEditing" text="摸板编辑"/>
     </Controls>
  </Form>

OTSIncAReportApp/1-UI/OTSDisplaySourceGridData/ChangeGridCellValEvent.cs

@@ -95,7 +95,7 @@ namespace OTSIncAReportApp.OTSRstMgrFunction
             {
                 if ((OTSIncAReportApp.OTSSampleReportInfo.OTS_REPORT_PROP_GRID_ITEMS)m_SampleGrid.m_frmPropCondition.PropGrid.Rows[m_SampleGrid.m_ClickRow].Tag == OTSIncAReportApp.OTSSampleReportInfo.OTS_REPORT_PROP_GRID_ITEMS.PARTICE_LIST)
                 {
-                    if (sender.Position.Row == 3)
+                    if (sender.Position.Row == 2)
                         m_SampleGrid.m_frmPropCondition.m_ReportApp.im_ParticlesGridDevidePage = null;//需要重新刷新颗粒列表
                 }
             }

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

@@ -15,16 +15,19 @@ namespace OTSIncAReportApp.OTSSampleReportInfo
         FLOAT = 3
     }
 
+
     public enum DisplayPicutureType
     {
-        //分析图
-        AnalyzeImg = 0,
+        //结果概况
+        OverviewTable = 0,
         //分析数据表
         AnalyzeDataTable = 1,
         //分析数据图
-        AnalyzeDataChart = 2,
+        AnalyzeSheetandChart = 2,
+        //分析图
+        AnalyzeImg = 3,
         //标准库
-        AnalyzeStandardLibrary=3
+        AnalyzeStandardLibrary=4
     }
     public enum IMAGE_DISPLAY_TYPE
     {
@@ -47,20 +50,18 @@ namespace OTSIncAReportApp.OTSSampleReportInfo
         ALL=0,
         SELECTED=1
     }
+
     public enum CALCULATE_TABLE_TYPE
     {
         INVALID = -1,
-        MEASURE_INFO = 0,
-        PARTICALE_GENE_INFO = 1,
-        PARTICALE_COMP = 2,
-      
-        PARTICALE_SIZE_DISTRIBUTION = 3,
-        AVE_ELEMENT_COMP = 4,
-        GB_Method1 = 5,
-        GB_Method2 =6,
-        ASTM = 7,
-        DIN = 8,
-        YB6156=9
+        PARTICALE_COMP = 0,
+        PARTICALE_SIZE_DISTRIBUTION = 1,
+        AVE_ELEMENT_COMP = 2,
+        GB_Method1 = 3,
+        GB_Method2 =4,
+        ASTM = 5,
+        DIN = 6,
+        YB6156=7
     }
     public enum CALCULATE_CHART_TYPE
     {

OTSIncAReportApp/1-UI/OTSDisplaySourceGridData/OTSSourceGrid.cs

@@ -295,7 +295,7 @@ namespace OTSIncAReportApp.OTSRstMgrFunction
                         m_frmPropCondition.PropGrid[1, 0].RowSpan = Display_Mode_Row - 1;   //iCurRow + General_Totle_Row-1 : 去掉标题栏计数
                     }
                 }
-                if (m_frmPropCondition.tabIndex == DisplayPicutureType.AnalyzeDataChart)
+                if (m_frmPropCondition.tabIndex == DisplayPicutureType.AnalyzeSheetandChart)
                 {
                     //第二行的时候，需要定义左边的条框栏 
                     if (null == m_frmPropCondition.PropGrid[1, 0])

OTSIncAReportApp/1-UI/OTSDisplaySourceGridData/frmReportConditionChoose.cs

@@ -196,7 +196,7 @@ namespace OTSIncAReportApp
             //计算方式
             AddGridData(OTS_REPORT_PROP_GRID_ITEMS.SIZE_CAL_METHOD_TYPE, dimensionCalculationMethod, OTS_ITEM_TYPES.COMBO, false, "image property calculation method", DefaultSIZE_CAL_METHOD_TYPE, m_rstDataMgr.GetSizeCalMethodTypeList(), ind);
             //数据表类型
-            List<string> list2 = new List<string>() { surveyResults, sampleMeasurementInformation, granularComponent, particleSizeDistribution, averageElementComposition };
+            List<string> list2 = new List<string>() { granularComponent, particleSizeDistribution, averageElementComposition };
             ResultFile resultinfo = m_rstDataMgr.ResultFilesList[m_rstDataMgr.GetWorkingResultId()];
             var Systype = RptConfigFile.GetRptConfig().Systype;
 
@@ -206,10 +206,10 @@ namespace OTSIncAReportApp
                 List<string> listStd = new List<string>() { chineseStandard1, chineseStandard2, americanStandard, germanStandard, yb6156 };
                 list2.AddRange(listStd);
             }
-                
-           
 
-            AddGridData(OTS_REPORT_PROP_GRID_ITEMS.CALCULATE_TABLE_TYPE, dataTableType, OTS_ITEM_TYPES.COMBO, false, "Data table type", list2[0], list2, CALCULATE_TABLE_TYPE.MEASURE_INFO);
+
+
+            AddGridData(OTS_REPORT_PROP_GRID_ITEMS.CALCULATE_TABLE_TYPE, dataTableType, OTS_ITEM_TYPES.COMBO, false, "Data table type", list2[0], list2, CALCULATE_TABLE_TYPE.PARTICALE_COMP);
             // chart condition items
             List<string> list22 = new List<string>() { commonClassification, granularComponent, particleSizeDistribution, ternaryPhaseDiagram, InclusionAreaRatio };
             AddGridData(OTS_REPORT_PROP_GRID_ITEMS.CALCULATE_CHART_TYPE, dataTableType, OTS_ITEM_TYPES.COMBO, false, "Data graph type", list22[0], list22, CALCULATE_CHART_TYPE.COMMON_FIVE);
@@ -290,7 +290,6 @@ namespace OTSIncAReportApp
 
         public bool GetWorkingPictureConditionVal()
         {
-            //var tabindex = this.tabIndex;
             if (m_rstDataMgr.GetWorkingResultId() == -1)
             {
                 return false;
@@ -329,39 +328,17 @@ namespace OTSIncAReportApp
 
                     break;
                 case DisplayPicutureType.AnalyzeDataTable:
-                   
                     data.TabIndex = DisplayPicutureType.AnalyzeDataTable;
-
                     data.ConditionItemList = GetSourceGridData(DisplayPicutureType.AnalyzeDataTable);
-                    var sampleData3 = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.CALCULATE_TABLE_TYPE];
-                    if ((int)sampleData3.itemVal == (int)CALCULATE_TABLE_TYPE.PARTICALE_GENE_INFO)
-                    {
-                        for (int i = 0; i < data.ConditionItemList.Count; i++)
-                        {
-                            if (data.ConditionItemList[i].iItemId == OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE)
-                            {
-                                if (data.ConditionItemList[i].itemDisplayVal.ToString().Contains("+"))
-                                {
-                                    data.ConditionItemList[i].itemDisplayVal = data.ConditionItemList[i].comboDownList[0].ToString();
-                                    data.ConditionItemList[i].itemVal = 0;
-                                    m_rstDataMgr.SetWorkingResultId((int)data.ConditionItemList[i].itemVal);
-                                    m_ReportApp.m_StandardLibrary.DataRefresh();
-                                }
-                                else
-                                {
-                                    m_rstDataMgr.SetWorkingResultId((int)data.ConditionItemList[i].itemVal);
-                                    m_ReportApp.m_StandardLibrary.DataRefresh();
-                                }
-
-                            }
-                        }
-                    }
                     break;
-                case DisplayPicutureType.AnalyzeDataChart:
-                  
-                    data.TabIndex = DisplayPicutureType.AnalyzeDataChart;
-
-                    data.ConditionItemList = GetSourceGridData(DisplayPicutureType.AnalyzeDataChart);
+                case DisplayPicutureType.AnalyzeSheetandChart:
+                    data.TabIndex = DisplayPicutureType.AnalyzeSheetandChart;
+                    //var sampleData3 = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.CALCULATE_TABLE_TYPE];
+                    data.ConditionItemList = GetSourceGridData(DisplayPicutureType.AnalyzeSheetandChart);
+                    break;
+                case DisplayPicutureType.OverviewTable:
+                    data.TabIndex = DisplayPicutureType.OverviewTable;
+                    data.ConditionItemList = GetSourceGridData(DisplayPicutureType.OverviewTable);
                     break;
                 default:
                     break;
@@ -379,7 +356,6 @@ namespace OTSIncAReportApp
         /// <returns></returns>SampleData1
         private List<ConditionItem> GetSourceGridData(DisplayPicutureType tbindex)
         {
-
             string BSEOriginal = resTable["bseoriginal"].ToString();//BSE原图
             string ClassifiedDisplay = resTable["classifieddisplay"].ToString();//分类显示
             string OriginalSplicing = resTable["originalsplicing"].ToString();//原图拼接
@@ -388,6 +364,7 @@ namespace OTSIncAReportApp
 
             List<ConditionItem> list = new List<ConditionItem>();
             ConditionItem sampleData;
+            
             if (tbindex == DisplayPicutureType.AnalyzeImg)//分布图页
             {
                 //测量结果数据源
@@ -497,24 +474,26 @@ namespace OTSIncAReportApp
                 }
                 
             }
-            else if (tbindex == DisplayPicutureType.AnalyzeDataTable)//Grid表格页
+            else if (tbindex == DisplayPicutureType.AnalyzeDataTable)//颗粒列表
+            {
+                sampleData = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE];
+                list.Add(sampleData);
+                var sampleData1 = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.PARTICE_LIST];
+                list.Add(sampleData1);
+            }
+            else if (tbindex == DisplayPicutureType.AnalyzeSheetandChart)//统计分析
             {
-                //测量结果数据源
-
                 sampleData = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE];
                 list.Add(sampleData);
-
-                
                 var sampleData3 = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.CALCULATE_TABLE_TYPE];
                 list.Add(sampleData3);
 
-
-                if ((int)sampleData3.itemVal == (int)CALCULATE_TABLE_TYPE.PARTICALE_SIZE_DISTRIBUTION )
+                if ((int)sampleData3.itemVal == (int)CALCULATE_TABLE_TYPE.PARTICALE_SIZE_DISTRIBUTION)
                 {
                     //粒级表
 
                     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();
+                    m_ReportApp.m_rstDataMgr.m_RptConfigFile.PartSizeFile = sampleData_partsizefile.itemDisplayVal.ToString();
                     list.Add(sampleData_partsizefile);
 
                     //尺寸计算方法
@@ -526,7 +505,7 @@ namespace OTSIncAReportApp
 					list.Add(stditm);
 
 					var sampleData1 = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE];
-                  
+
                     list.Insert(2, sampleData1);
                 }
                 if ((int)sampleData3.itemVal == (int)CALCULATE_TABLE_TYPE.PARTICALE_COMP)
@@ -536,86 +515,36 @@ namespace OTSIncAReportApp
                     list.Add(sampleData5);
 
                     var sampleData1 = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE];
-                 
+
                     list.Insert(2, sampleData1);
 					var sampleDataA5 = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.GRAPHIC_TYPE];
 					list.Add(sampleDataA5);
 				}
 
-                if ((int)sampleData3.itemVal == (int)CALCULATE_TABLE_TYPE.PARTICALE_GENE_INFO)
-                {
-                    var sampleData1 = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.PARTICE_LIST];
-                  
-                    list.Insert(2, sampleData1);
-                }
+                //if ((int)sampleData3.itemVal == (int)CALCULATE_TABLE_TYPE.PARTICALE_GENE_INFO)
+                //{
+                //    var sampleData1 = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.PARTICE_LIST];
+
+                //    list.Insert(2, sampleData1);
+                //}
 
                 //元素分析表
                 if ((int)sampleData3.itemVal == (int)CALCULATE_TABLE_TYPE.AVE_ELEMENT_COMP)
                 {
                     var sampleData1 = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE];
-                 
+
                     list.Insert(2, sampleData1);
 
 					//all particle types
 					var stditm = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.STD_ID];
 					list.Add(stditm);
 				}
-              
+
             }
-            else if (tbindex == DisplayPicutureType.AnalyzeDataChart)//Chart图页
+            else if (tbindex == DisplayPicutureType.OverviewTable)//概况
             {
-                
                 sampleData = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE];
                 list.Add(sampleData);
-
-                var sampleData3 = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.CALCULATE_CHART_TYPE];
-                list.Add(sampleData3);
-            
-                var sampleData1 = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE];
-                list.Add(sampleData1);
-
-                //数据图类型
-
-                if ((int)sampleData3.itemVal == (int)CALCULATE_CHART_TYPE.PARTICALE_SIZE_DISTRIBUTION)
-                {
-                    //粒级表
-
-                    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 sampleData5 = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.SIZE_CAL_METHOD_TYPE];
-                    list.Add(sampleData5);
-
-                    if ((int)sampleData3.iItemId == (int)OTS_REPORT_PROP_GRID_ITEMS.CALCULATE_CHART_TYPE)
-                    {
-						//all particle types
-						var stditm = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.STD_ID];
-						list.Add(stditm);
-					}
-                }
-                else if ((int)sampleData3.itemVal == (int)CALCULATE_CHART_TYPE.TRIO_CHART)
-                {
-                    //三元相图模板
-
-                    var sampleData15 = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.TRIO_CHART_TYPE];
-                    list.Add(sampleData15);
-
-                    //粒级表
-
-                    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 sampleData5 = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.SIZE_CAL_METHOD_TYPE];
-                    list.Add(sampleData5);
-                }
-
-
             }
 
             return list;
@@ -759,59 +688,53 @@ namespace OTSIncAReportApp
                 case DisplayPicutureType.AnalyzeDataTable:
                     #region 第二页选项窗体，分析数据表
                     m_ReportApp.m_RibbonFun.SetRibbonButnStatu_ByModule(DisplayPicutureType.AnalyzeDataTable);
-
+                    if (m_ReportApp.im_ParticlesGridDevidePage != null && m_ReportApp.im_ParticlesGridDevidePage.FileName == m_fileName && (m_ReportApp.im_Control_DrawDistrbutionImageAndBSE == null || !m_ReportApp.im_Control_DrawDistrbutionImageAndBSE.WhetherThereAreDeleteParticles()))
+                    {
+                        m_ReportApp.m_ParticlesListWindow.Controls.Clear();
+                        m_ReportApp.m_ParticlesListWindow.Controls.Add(m_ReportApp.im_ParticlesGridDevidePage);
+                        m_ReportApp.m_ParticlesListWindow.Activate();
+                    }
+                    else
+                    {
+                        m_ReportApp.m_ParticlesListWindow.Controls.Clear();
+                        m_ReportApp.im_ParticlesGridDevidePage = new OTSIncAReportGrids.ParticlesGridDevidePage(m_ReportApp);
+                        m_ReportApp.im_ParticlesGridDevidePage.FileName = m_fileName;
+                        m_ReportApp.im_ParticlesGridDevidePage.Dock = DockStyle.Fill;
+                        m_ReportApp.m_ParticlesListWindow.Controls.Add(m_ReportApp.im_ParticlesGridDevidePage);
+                        m_ReportApp.m_ParticlesListWindow.Activate();
+                    }
+                    break;
+                #endregion
+                //分析数据图
+                case DisplayPicutureType.AnalyzeSheetandChart:
+                    m_ReportApp.m_RibbonFun.SetRibbonButnStatu_ByModule(DisplayPicutureType.AnalyzeSheetandChart);
                     CALCULATE_TABLE_TYPE TableType = (CALCULATE_TABLE_TYPE)prop.GetComboDownListIndexByItemName(OTS_REPORT_PROP_GRID_ITEMS.CALCULATE_TABLE_TYPE);
                     switch (TableType)
                     {
-                        case CALCULATE_TABLE_TYPE.MEASURE_INFO:
-                            m_ReportApp.m_TablesWindow.Controls.Clear();
-                            m_ReportApp.im_ResultGrid = new ResultGrid(m_ReportApp);
-                            m_ReportApp.im_ResultGrid.Dock = DockStyle.Fill;
-                            m_ReportApp.m_TablesWindow.Controls.Add(m_ReportApp.im_ResultGrid);
-                            m_ReportApp.m_TablesWindow.Activate();
-                            m_ReportApp.m_StandardLibrary.DataRefresh();
-                            break;
-                        case CALCULATE_TABLE_TYPE.PARTICALE_GENE_INFO:
-                            if (m_ReportApp.im_ParticlesGridDevidePage != null && m_ReportApp.im_ParticlesGridDevidePage.FileName == m_fileName&&(m_ReportApp.im_Control_DrawDistrbutionImageAndBSE==null||!m_ReportApp.im_Control_DrawDistrbutionImageAndBSE.WhetherThereAreDeleteParticles()))
-                            {
-                                m_ReportApp.m_TablesWindow.Controls.Clear();
-                                m_ReportApp.m_TablesWindow.Controls.Add(m_ReportApp.im_ParticlesGridDevidePage);
-                                m_ReportApp.m_TablesWindow.Activate();
-                            }
-                            else
-                            {
-                                m_ReportApp.m_TablesWindow.Controls.Clear();
-                                m_ReportApp.im_ParticlesGridDevidePage = new OTSIncAReportGrids.ParticlesGridDevidePage(m_ReportApp);
-                                m_ReportApp.im_ParticlesGridDevidePage.FileName = m_fileName;
-                                m_ReportApp.im_ParticlesGridDevidePage.Dock = DockStyle.Fill;
-                                m_ReportApp.m_TablesWindow.Controls.Add(m_ReportApp.im_ParticlesGridDevidePage);
-                                m_ReportApp.m_TablesWindow.Activate();
-                            }
-                            break;
                         case CALCULATE_TABLE_TYPE.PARTICALE_COMP:
-                            m_ReportApp.m_TablesWindow.Controls.Clear();
+                            m_ReportApp.m_TablesWindowandChart.Controls.Clear();
                             m_ReportApp.im_CompositionDistributionGrid = new CompositionDistributionGrid(m_ReportApp);
                             m_ReportApp.im_CompositionDistributionGrid.Dock = DockStyle.Fill;
-                            m_ReportApp.m_TablesWindow.Controls.Add(m_ReportApp.im_CompositionDistributionGrid);
-                            m_ReportApp.m_TablesWindow.Activate();
+                            m_ReportApp.m_TablesWindowandChart.Controls.Add(m_ReportApp.im_CompositionDistributionGrid);
+                            m_ReportApp.m_TablesWindowandChart.Activate();
 
 							m_ReportApp.im_CompositionDistributionGrid.SetGraphicType(m_conditionData);
 							break;
                         case CALCULATE_TABLE_TYPE.PARTICALE_SIZE_DISTRIBUTION://颗粒尺寸分布表
-                            m_ReportApp.m_TablesWindow.Controls.Clear();
+                            m_ReportApp.m_TablesWindowandChart.Controls.Clear();
                             m_ReportApp.im_ParticlesSizeGrid = new ParticlesSizeGrid(m_ReportApp);
                             m_ReportApp.im_ParticlesSizeGrid.Dock = DockStyle.Fill;
-                            m_ReportApp.m_TablesWindow.Controls.Add(m_ReportApp.im_ParticlesSizeGrid);
-                            m_ReportApp.m_TablesWindow.Activate();
+                            m_ReportApp.m_TablesWindowandChart.Controls.Add(m_ReportApp.im_ParticlesSizeGrid);
+                            m_ReportApp.m_TablesWindowandChart.Activate();
                             m_ReportApp.im_ParticlesSizeGrid.SetGraphicType(m_conditionData);
 
 							break;
                         case CALCULATE_TABLE_TYPE.AVE_ELEMENT_COMP:
-                            m_ReportApp.m_TablesWindow.Controls.Clear();
+                            m_ReportApp.m_TablesWindowandChart.Controls.Clear();
                             m_ReportApp.im_ElementCompositionAvgGrid = new ElementCompositionAvgGrid(m_ReportApp);
                             m_ReportApp.im_ElementCompositionAvgGrid.Dock = DockStyle.Fill;
-                            m_ReportApp.m_TablesWindow.Controls.Add(m_ReportApp.im_ElementCompositionAvgGrid);
-                            m_ReportApp.m_TablesWindow.Activate();
+                            m_ReportApp.m_TablesWindowandChart.Controls.Add(m_ReportApp.im_ElementCompositionAvgGrid);
+                            m_ReportApp.m_TablesWindowandChart.Activate();
 							m_ReportApp.im_ElementCompositionAvgGrid.SetGraphicType(m_conditionData);
 							break;
                         case CALCULATE_TABLE_TYPE.GB_Method1:
@@ -821,7 +744,7 @@ namespace OTSIncAReportApp
                                 MessageBox.Show("This function does not support multiple samples!");
                                 return;
                             }
-                                //国标一
+                            //国标一
                             Cursor.Current = Cursors.WaitCursor;
 
                             int index = m_ReportApp.m_conditionChoose.m_conditionData.GetComboDownListIndexByItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE);
@@ -844,14 +767,14 @@ namespace OTSIncAReportApp
 
                             List<OTSCLRINTERFACE.CGridDataClr> listGriddataclr = m_ReportApp.m_rstDataMgr.m_ReportMgr.GridDataTransfer(clr_prop);//
 
-                            m_ReportApp.m_TablesWindow.Controls.Clear();
+                            m_ReportApp.m_TablesWindowandChart.Controls.Clear();
                             m_ReportApp.im_ChineseStandardABCDDS = new ChineseStandardABCDDS(m_ReportApp.m_rstDataMgr.m_ReportMgr, listGriddataclr);
 
                             m_ReportApp.im_ChineseStandardABCDDS.Dock = DockStyle.Fill;
-                            m_ReportApp.m_TablesWindow.Controls.Add(m_ReportApp.im_ChineseStandardABCDDS);
+                            m_ReportApp.m_TablesWindowandChart.Controls.Add(m_ReportApp.im_ChineseStandardABCDDS);
                             m_ReportApp.im_ChineseStandardABCDDS.UseWaitCursor = false;
                             Cursor.Current = Cursors.Default;
-                            m_ReportApp.m_TablesWindow.Activate();
+                            m_ReportApp.m_TablesWindowandChart.Activate();
 
                             break;
                         case CALCULATE_TABLE_TYPE.GB_Method2:
@@ -864,7 +787,7 @@ namespace OTSIncAReportApp
                             //国标二
                             Cursor.Current = Cursors.WaitCursor;
                             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++)
                             {
                                 string anothername = m_ReportApp.m_rstDataMgr.ResultFilesList[i].anotherFileName.ToString();
@@ -882,12 +805,12 @@ namespace OTSIncAReportApp
                             clr_prop2.SetCalTableType((int)CALCULATE_TABLE_TYPE.GB_Method2);//国标2  
                             List<OTSCLRINTERFACE.CGridDataClr> listGriddataclr2 = m_ReportApp.m_rstDataMgr.m_ReportMgr.GridDataTransfer(clr_prop2);//
 
-                            m_ReportApp.m_TablesWindow.Controls.Clear();
+                            m_ReportApp.m_TablesWindowandChart.Controls.Clear();
                             m_ReportApp.im_NationalStandardMethodTwo = new NationalStandardMethodTwo(m_ReportApp.m_rstDataMgr.m_ReportMgr, listGriddataclr2);
                             m_ReportApp.im_NationalStandardMethodTwo.Dock = DockStyle.Fill;
-                            m_ReportApp.m_TablesWindow.Controls.Add(m_ReportApp.im_NationalStandardMethodTwo);
+                            m_ReportApp.m_TablesWindowandChart.Controls.Add(m_ReportApp.im_NationalStandardMethodTwo);
                             Cursor.Current = Cursors.WaitCursor;
-                            m_ReportApp.m_TablesWindow.Activate();
+                            m_ReportApp.m_TablesWindowandChart.Activate();
                             break;
                         case CALCULATE_TABLE_TYPE.ASTM:
                             var Val = m_ReportApp.m_conditionChoose.m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE].itemDisplayVal.ToString();
@@ -900,7 +823,7 @@ namespace OTSIncAReportApp
                             Cursor.Current = Cursors.WaitCursor;
 
                             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++)
                             {
                                 string anothername = m_ReportApp.m_rstDataMgr.ResultFilesList[i].anotherFileName.ToString();
@@ -918,12 +841,12 @@ namespace OTSIncAReportApp
                             clr_prop3.SetCalTableType((int)CALCULATE_TABLE_TYPE.ASTM);
                             List<OTSCLRINTERFACE.CGridDataClr> listGriddataclr3 = m_ReportApp.m_rstDataMgr.m_ReportMgr.GridDataTransfer(clr_prop3);
 
-                            m_ReportApp.m_TablesWindow.Controls.Clear();
+                            m_ReportApp.m_TablesWindowandChart.Controls.Clear();
                             m_ReportApp.im_ASTMStandardABCDDS = new ASTMStandardABCDDS(m_ReportApp.m_rstDataMgr.m_ReportMgr, listGriddataclr3);
                             m_ReportApp.im_ASTMStandardABCDDS.Dock = DockStyle.Fill;
-                            m_ReportApp.m_TablesWindow.Controls.Add(m_ReportApp.im_ASTMStandardABCDDS);
+                            m_ReportApp.m_TablesWindowandChart.Controls.Add(m_ReportApp.im_ASTMStandardABCDDS);
                             Cursor.Current = Cursors.Default;
-                            m_ReportApp.m_TablesWindow.Activate();
+                            m_ReportApp.m_TablesWindowandChart.Activate();
                             break;
                         case CALCULATE_TABLE_TYPE.DIN:
                             var ite = m_ReportApp.m_conditionChoose.m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE].itemDisplayVal.ToString();
@@ -935,7 +858,7 @@ namespace OTSIncAReportApp
                             //德标
                             Cursor.Current = Cursors.WaitCursor;
                             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++)
                             {
                                 string anothername = m_ReportApp.m_rstDataMgr.ResultFilesList[i].anotherFileName.ToString();
@@ -948,17 +871,17 @@ namespace OTSIncAReportApp
                             datasourcelist4.Add(m_ReportApp.m_conditionChoose.m_conditionData.GetComboDownListByItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE)[index4]);
                             clr_prop4.SetDataSourceList(datasourcelist4);
                             clr_prop4.SetDataSourceId(index4);//
-                           
+
                             clr_prop4.SetType((int)DisplayPicutureType.AnalyzeDataTable);//table
                             clr_prop4.SetCalTableType((int)CALCULATE_TABLE_TYPE.DIN);
                             List<OTSCLRINTERFACE.CGridDataClr> listGriddataclr4 = m_ReportApp.m_rstDataMgr.m_ReportMgr.GridDataTransfer(clr_prop4);
 
-                            m_ReportApp.m_TablesWindow.Controls.Clear();
+                            m_ReportApp.m_TablesWindowandChart.Controls.Clear();
                             m_ReportApp.im_DINStandardABCDDS = new DINStandardABCDDS(m_ReportApp.m_rstDataMgr.m_ReportMgr, listGriddataclr4);
                             m_ReportApp.im_DINStandardABCDDS.Dock = DockStyle.Fill;
-                            m_ReportApp.m_TablesWindow.Controls.Add(m_ReportApp.im_DINStandardABCDDS);
+                            m_ReportApp.m_TablesWindowandChart.Controls.Add(m_ReportApp.im_DINStandardABCDDS);
                             Cursor.Current = Cursors.Default;
-                              m_ReportApp.m_TablesWindow.Activate();
+                            m_ReportApp.m_TablesWindowandChart.Activate();
                             break;
                         case CALCULATE_TABLE_TYPE.YB6156:
                             var eve = m_ReportApp.m_conditionChoose.m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE].itemDisplayVal.ToString();
@@ -988,105 +911,31 @@ namespace OTSIncAReportApp
                             clr_prop5.SetCalTableType((int)CALCULATE_TABLE_TYPE.YB6156);
                             List<OTSCLRINTERFACE.CGridDataClr> listGriddataclr5 = m_ReportApp.m_rstDataMgr.m_ReportMgr.GridDataTransfer(clr_prop5);
 
-                            m_ReportApp.m_TablesWindow.Controls.Clear();
+                            m_ReportApp.m_TablesWindowandChart.Controls.Clear();
                             m_ReportApp.im_YB6156ABCD = new YB6156ABCD(m_ReportApp.m_rstDataMgr.m_ReportMgr, listGriddataclr5);
                             m_ReportApp.im_YB6156ABCD.Dock = DockStyle.Fill;
-                            m_ReportApp.m_TablesWindow.Controls.Add(m_ReportApp.im_YB6156ABCD);
+                            m_ReportApp.m_TablesWindowandChart.Controls.Add(m_ReportApp.im_YB6156ABCD);
                             Cursor.Current = Cursors.Default;
-                            m_ReportApp.m_TablesWindow.Activate();
+                            m_ReportApp.m_TablesWindowandChart.Activate();
                             break;
                     }
-
-                    #endregion 第二页选项窗体，分析数据表
                     break;
-                //分析数据图
-                case DisplayPicutureType.AnalyzeDataChart:
-                    m_ReportApp.m_RibbonFun.SetRibbonButnStatu_ByModule(DisplayPicutureType.AnalyzeDataChart);
-                    #region 第三页选项窗体，分析数据图
-                    m_ReportApp.m_ChartsWindow.Controls.Clear();
-
-                    string m_reportname = "";
-                    string m_str_AxisY = "";
-                    string str_operatonmodule = "";
-
-                    CALCULATE_CHART_TYPE ChartType = (CALCULATE_CHART_TYPE)prop.GetComboDownListIndexByItemName(OTS_REPORT_PROP_GRID_ITEMS.CALCULATE_CHART_TYPE);
-                    switch (ChartType)
-                    {
-                        case CALCULATE_CHART_TYPE.COMMON_FIVE:
-                            m_reportname = resTable["m_reportname1"].ToString();//常用夹杂物分类
-                            m_str_AxisY = resTable["m_str_axisy1"].ToString();
-                            str_operatonmodule = resTable["str_operatonmodule1"].ToString();
-
-                            m_ReportApp.im_EChart_ParticlesComposition = new Control_ECharts.DEVChart_ParticlesComposition(m_ReportApp, "CommonlyUsedClassify");
-                            m_ReportApp.im_EChart_ParticlesComposition.Dock = DockStyle.Fill;
-                            m_ReportApp.m_reportname = m_reportname;
-                            m_ReportApp.im_EChart_ParticlesComposition.m_str_AxisY = m_str_AxisY;
-                            m_ReportApp.type = "pie";
-                            m_ReportApp.m_ChartsWindow.Controls.Add(m_ReportApp.im_EChart_ParticlesComposition);
-                            m_ReportApp.m_ChartsWindow.Activate();
-                            break;
-                        case CALCULATE_CHART_TYPE.PARTICALE_COMP:
-                            m_reportname = resTable["m_reportname2"].ToString();//颗粒成分
-                            m_str_AxisY = resTable["m_str_axisy2"].ToString();//颗粒数
-                            str_operatonmodule = resTable["str_operatonmodule2"].ToString();//颗粒成分图
-
-                            m_ReportApp.im_EChart_ParticlesComposition = new Control_ECharts.DEVChart_ParticlesComposition(m_ReportApp, "PComponent");
-                            m_ReportApp.im_EChart_ParticlesComposition.Dock = DockStyle.Fill;
-                            m_ReportApp.m_reportname = m_reportname;
-                            m_ReportApp.im_EChart_ParticlesComposition.m_str_AxisY = m_str_AxisY;
-                            m_ReportApp.type = "pie";
-                            m_ReportApp.m_ChartsWindow.Controls.Add(m_ReportApp.im_EChart_ParticlesComposition);
-                            m_ReportApp.m_ChartsWindow.Activate();
-                            break;
-                        case CALCULATE_CHART_TYPE.PARTICALE_SIZE_DISTRIBUTION://颗粒尺寸分布图
-                            m_reportname = resTable["m_reportname4"].ToString();//颗粒尺寸分布
-                            m_str_AxisY = resTable["m_str_axisy4"].ToString();//颗粒数
-                            str_operatonmodule = resTable["str_operatonmodule4"].ToString();//颗粒尺寸分布图
-
-                            m_ReportApp.im_EChart_ParticlesComposition = new Control_ECharts.DEVChart_ParticlesComposition(m_ReportApp, "PSize");
-                            m_ReportApp.im_EChart_ParticlesComposition.Dock = DockStyle.Fill;
-                            m_ReportApp.m_reportname = m_reportname;
-                            m_ReportApp.im_EChart_ParticlesComposition.m_str_AxisY = m_str_AxisY;
-                            m_ReportApp.type = "pie";
-                            m_ReportApp.m_ChartsWindow.Controls.Add(m_ReportApp.im_EChart_ParticlesComposition);
-                            m_ReportApp.m_ChartsWindow.Activate();
-
-							m_ReportApp.im_EChart_ParticlesComposition.DisplayTheChartAgainByParticleCategory(m_conditionData);
-							break;
-                        case CALCULATE_CHART_TYPE.TRIO_CHART:
-
-                            int index = prop.GetComboDownListIndexByItemName(OTS_REPORT_PROP_GRID_ITEMS.TRIO_CHART_TYPE);
-
-                            str_operatonmodule = resTable["str_operatonmodule5"].ToString();
-
-                            m_ReportApp.im_EChart_Trianglediagram = new Control_ECharts.DEVChart_Trianglediagram(m_ReportApp);
-                            m_ReportApp.im_EChart_Trianglediagram.Template = "";
-                            m_ReportApp.im_EChart_Trianglediagram.Dock = DockStyle.Fill;
-                            m_ReportApp.m_ChartsWindow.Controls.Add(m_ReportApp.im_EChart_Trianglediagram);
-                            m_ReportApp.m_ChartsWindow.Activate();
-                            break;
-
-                        case CALCULATE_CHART_TYPE.INCLUSION_AREA_RATIO:
-                            m_reportname = resTable["incaareascale"].ToString();
-                            m_str_AxisY = "平方微米";
-
-                            m_ReportApp.im_EChart_ParticlesComposition = new Control_ECharts.DEVChart_ParticlesComposition(m_ReportApp, "InclusionareaRatio");
-                            m_ReportApp.im_EChart_ParticlesComposition.Dock = DockStyle.Fill;
-                            m_ReportApp.m_reportname = m_reportname;
-                            m_ReportApp.im_EChart_ParticlesComposition.m_str_AxisY = m_str_AxisY;
-                            m_ReportApp.type = "pie";
-                            m_ReportApp.m_ChartsWindow.Controls.Add(m_ReportApp.im_EChart_ParticlesComposition);
-                            m_ReportApp.m_ChartsWindow.Activate();
-                            break;
-                    }
-                    #endregion 第三页窗体，分析数据图
+                case DisplayPicutureType.OverviewTable:
+                    #region 第一页选项窗体，结果概况
+                    m_ReportApp.m_RibbonFun.SetRibbonButnStatu_ByModule(DisplayPicutureType.OverviewTable);
+
+                    m_ReportApp.m_OverviewWindow.Controls.Clear();
+                    m_ReportApp.im_ResultGrid = new ResultGrid(m_ReportApp);
+                    m_ReportApp.im_ResultGrid.Dock = DockStyle.Fill;
+                    m_ReportApp.m_OverviewWindow.Controls.Add(m_ReportApp.im_ResultGrid);
+                    m_ReportApp.m_OverviewWindow.Activate();
+                    m_ReportApp.m_StandardLibrary.DataRefresh();
+                    #endregion
                     break;
             }
             #endregion
         }
-
         #endregion
-
         #region 属性Grid相关事件
         /// <summary>
         /// 属性Grid点击事件

OTSIncAReportApp/1-UI/OTSReportExport/DataIntegration/GBData.cs

@@ -33,13 +33,13 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             {
                 List<OTSCLRINTERFACE.CGridDataClr> listGriddataclr = m_otsreport_export.m_ReportApp.m_rstDataMgr.m_ReportMgr.GridDataTransfer(cPropParamClr);
                 m_otsreport_export.m_ReportApp.im_ChineseStandardABCDDS = new OTSIncAReportGB.ChineseStandardABCDDS(m_otsreport_export.m_ReportApp.m_rstDataMgr.m_ReportMgr, listGriddataclr);
-                m_otsreport_export.m_ReportApp.m_TablesWindow.Controls.Clear();
+                m_otsreport_export.m_ReportApp.m_TablesWindowandChart.Controls.Clear();
                 return m_otsreport_export.m_ReportApp.im_ChineseStandardABCDDS.ChineseStandardABCD_GetDataTable(); ;
             }
             else
             {
                 List<OTSCLRINTERFACE.CGridDataClr> listGriddataclr2 = m_otsreport_export.m_ReportApp.m_rstDataMgr.m_ReportMgr.GridDataTransfer(cPropParamClr);//
-                m_otsreport_export.m_ReportApp.m_TablesWindow.Controls.Clear();
+                m_otsreport_export.m_ReportApp.m_TablesWindowandChart.Controls.Clear();
                 m_otsreport_export.m_ReportApp.im_NationalStandardMethodTwo = new OTSIncAReportGB.NationalStandardMethodTwo(m_otsreport_export.m_ReportApp.m_rstDataMgr.m_ReportMgr, listGriddataclr2);
                 return m_otsreport_export.m_ReportApp.im_NationalStandardMethodTwo.ChineseStandardABCD_GetDataTable();
             }

OTSIncAReportApp/1-UI/OTSRibbon/OTSRibbonFun.cs

@@ -101,7 +101,7 @@ namespace OTSIncAReportApp.OTSRibbon
 
                 m_ReportApp.rbReMeasure.Enabled = true;
             }
-            else if (in_enum_displaypicturetype == DisplayPicutureType.AnalyzeDataChart)
+            else if (in_enum_displaypicturetype == DisplayPicutureType.AnalyzeSheetandChart)
             {
                 m_ReportApp.rbSelTool.Enabled = false;//显示图匹配
                 m_ReportApp.rbChoiceTools.Enabled = false;//选择工具
@@ -122,6 +122,26 @@ namespace OTSIncAReportApp.OTSRibbon
                 m_ReportApp.rbOpen.Enabled = true;
                 m_ReportApp.rbReMeasure.Enabled = true;
             }
+            else if (in_enum_displaypicturetype == DisplayPicutureType.OverviewTable)
+            {
+                m_ReportApp.rbSelTool.Enabled = false;//显示图匹配
+                m_ReportApp.rbChoiceTools.Enabled = false;//选择工具
+                m_ReportApp.ribbonPanel2.Enabled = false;//图形工具
+                //（主菜单）下拉菜单中的 新建，打开，保存，另存为，输出
+                m_ReportApp.dpbOpen.Enabled = true;
+                m_ReportApp.dpbExport.Enabled = true;
+                m_ReportApp.Backup.Enabled = true;
+                //主菜单文件框里（保存、另存为、输出、新建）设置
+                m_ReportApp.rbSave.Enabled = true;
+                m_ReportApp.rbSaveAs.Enabled = true;
+                m_ReportApp.rbOut.Enabled = true;
+                m_ReportApp.ribbonButton2.Enabled = true;
+                //设置打开按钮
+                m_ReportApp.dpbOpen.Enabled = true;
+                m_ReportApp.rbOpen.Enabled = true;
+                m_ReportApp.rbReMeasure.Enabled = true;
+            }
+
             var m_RptConfigFile =RptConfigFile.GetRptConfig();         //报表程序的配置文件
             if (m_RptConfigFile.Systype == OTS_SysType_ID.IncA)
             {

OTSIncAReportApp/1-UI/frmCharts.cs

@@ -17,7 +17,6 @@ namespace OTSIncAReportApp
         Language lan1 = new Language();
         Hashtable table;
         #endregion
-
         #region 构造函数
         public frmCharts(frmReportApp ReportApp)
         {
@@ -38,49 +37,46 @@ namespace OTSIncAReportApp
         /// <param name="e"></param>
         private void OTSCaculationChartsWindow_Activated(object sender, EventArgs e)
         {
-            OTSSourceGrid m_SampleImage = m_ReportApp.m_conditionChoose.m_sourceGrid;
-            string str1 = "常规参数";
+            //OTSSourceGrid m_SampleImage = m_ReportApp.m_conditionChoose.m_sourceGrid;
+            //string str1 = "常规参数";
 
-            str1 = table["str1"].ToString();
-            m_SampleImage.InitGrid();
-            m_SampleImage.InitGroupTitle(0, str1);
-            m_SampleImage.SetPictureType(DisplayPicutureType.AnalyzeDataChart);
-            m_ReportApp.m_conditionChoose.DisCurrentPicProperty();
+            //str1 = table["str1"].ToString();
+            //m_SampleImage.InitGrid();
+            //m_SampleImage.InitGroupTitle(0, str1);
+            //m_SampleImage.SetPictureType(DisplayPicutureType.AnalyzeSheetandChart);
+            //m_ReportApp.m_conditionChoose.DisCurrentPicProperty();
 
-            string str2 = "颗粒成份图";
-            str2 = table["str2"].ToString();
-            //根据标签索引 显示默认的数据图表
-            if (m_ReportApp.m_ChartsWindow.Controls != null)
-            {
-                if (m_ReportApp.m_ChartsWindow.Controls.Count == 0)
-                {
-                    m_ReportApp.m_conditionChoose.tabIndex = DisplayPicutureType.AnalyzeDataChart;
-                    m_ReportApp.m_conditionChoose.ShowsTheDefaultPic();
-                }
-            }
-            m_ReportApp.m_RstWindow.SelectWorkSampleNode();
-            //设置每个功能模块限制菜单的显示
-            if (this.Controls.Count != 0)
-            {
-                m_ReportApp.m_RibbonFun.SetRibbonButnStatu_ByModule(DisplayPicutureType.AnalyzeDataChart);
-            }
+            //string str2 = "颗粒成份图";
+            //str2 = table["str2"].ToString();
+            ////根据标签索引 显示默认的数据图表
+            //if (m_ReportApp.m_ChartsWindow.Controls != null)
+            //{
+            //    if (m_ReportApp.m_ChartsWindow.Controls.Count == 0)
+            //    {
+            //        m_ReportApp.m_conditionChoose.tabIndex = DisplayPicutureType.AnalyzeSheetandChart;
+            //        m_ReportApp.m_conditionChoose.ShowsTheDefaultPic();
+            //    }
+            //}
+            //m_ReportApp.m_RstWindow.SelectWorkSampleNode();
+            ////设置每个功能模块限制菜单的显示
+            //if (this.Controls.Count != 0)
+            //{
+            //    m_ReportApp.m_RibbonFun.SetRibbonButnStatu_ByModule(DisplayPicutureType.AnalyzeSheetandChart);
+            //}
 
-            //判断样品属性与样品窗口在主窗体的位置
-            if (m_ReportApp.m_conditionChoose.DockState != m_ReportApp.m_RstWindow.DockState)
-            {
-                m_ReportApp.m_RstWindow.Activate();
-            }
-            else
-            {
-                if (!m_ReportApp.m_conditionChoose.Focus())
-                {
-                    m_ReportApp.m_RstWindow.Activate();
-                }
-            }
+            ////判断样品属性与样品窗口在主窗体的位置
+            //if (m_ReportApp.m_conditionChoose.DockState != m_ReportApp.m_RstWindow.DockState)
+            //{
+            //    m_ReportApp.m_RstWindow.Activate();
+            //}
+            //else
+            //{
+            //    if (!m_ReportApp.m_conditionChoose.Focus())
+            //    {
+            //        m_ReportApp.m_RstWindow.Activate();
+            //    }
+            //}
         }
         #endregion
-
-
-
     }
 }

OTSIncAReportApp/1-UI/frmReportApp.cs

@@ -32,14 +32,14 @@ namespace OTSIncAReportApp
     /// </summary>
     public partial class frmReportApp : Form
     {
-        
-
         #region 共享窗体对象--------------------------------------------------------------------------------------
         public frmMeasureRstMgr m_RstWindow = null;                             //测量结果，树控件窗体，属性Grid窗体
         public frmReportConditionChoose m_conditionChoose = null;                           //属性Grid窗体
         public frmSampleImage m_SImageWindow = null;                            //BSE窗体
-        public frmCharts m_ChartsWindow = null;                                //图表窗体
-        public frmTables m_TablesWindow = null;                                //报表窗体
+        //public frmCharts m_ChartsWindow = null;                                //图表窗体
+        public frmTables m_TablesWindowandChart = null;                                //统计分析窗体
+        public frmTables m_ParticlesListWindow = null;                         //颗粒列表窗体
+        public frmTables m_OverviewWindow = null;                                //结果概况窗体
         public FormStandardLibraryInformation m_StandardLibrary = null;         //标准库窗体
 
         public frmReportSysConfig m_ReportSysConfigForm;                        //配置参数窗体
@@ -228,10 +228,12 @@ namespace OTSIncAReportApp
             m_RstWindow = new frmMeasureRstMgr(this);
             //分布图，排列图窗体
             m_SImageWindow = new frmSampleImage(this);
-            //chart图表窗体
-            m_ChartsWindow = new frmCharts(this);
+            ////chart图表窗体
+            //m_ChartsWindow = new frmCharts(this);
             //grid表格窗体
-            m_TablesWindow = new frmTables(this);
+            m_TablesWindowandChart = new frmTables(this);
+            m_ParticlesListWindow=new frmTables(this);
+            m_OverviewWindow = new frmTables(this);
             //标准库窗体
             m_StandardLibrary = new FormStandardLibraryInformation (this);
 
@@ -301,10 +303,12 @@ namespace OTSIncAReportApp
 
             //分布图，排列图窗体
             m_SImageWindow = new frmSampleImage(this);
-            //chart图表窗体
-            m_ChartsWindow = new frmCharts(this);
+            ////chart图表窗体
+            //m_ChartsWindow = new frmCharts(this);
             //grid表格窗体
-            m_TablesWindow = new frmTables(this);
+            m_TablesWindowandChart = new frmTables(this);
+            m_ParticlesListWindow=new frmTables(this);
+            m_OverviewWindow =new frmTables(this);
             //标准库窗体
             m_StandardLibrary = new FormStandardLibraryInformation(this);
 
@@ -368,10 +372,7 @@ namespace OTSIncAReportApp
             //创建，树窗口，属性grid窗口，分布图，grid,chart窗体等。
             CreateNewWorkspaceWindow();
 
-            //激活测量结果窗体
-            this.m_RstWindow.Activate();
-            //激活表图窗体
-            this.m_TablesWindow.Activate();
+            this.m_OverviewWindow.Activate();
 
             
             //----------------end the initialization
@@ -425,8 +426,10 @@ namespace OTSIncAReportApp
             m_rstDataMgr.ResultFilesList.Clear();
 
             //清除各模块报表文件
-            m_ChartsWindow.Controls.Clear();
-            m_TablesWindow.Controls.Clear();
+            //m_ChartsWindow.Controls.Clear();
+            m_TablesWindowandChart.Controls.Clear();
+            m_ParticlesListWindow.Controls.Clear();
+            m_OverviewWindow.Controls.Clear();
             m_SImageWindow.Controls.Clear();
 
             //再重新初始化下拉菜单和ribbon菜单中的按钮状态
@@ -510,7 +513,7 @@ namespace OTSIncAReportApp
                     break;
                 case (int)DisplayPicutureType.AnalyzeDataTable:
                     break;
-                case (int)DisplayPicutureType.AnalyzeDataChart:
+                case (int)DisplayPicutureType.AnalyzeSheetandChart:
                     break;
                 default:
                     break;
@@ -548,7 +551,7 @@ namespace OTSIncAReportApp
                     break;
                 case (int)DisplayPicutureType.AnalyzeDataTable:
                     break;
-                case (int)DisplayPicutureType.AnalyzeDataChart:
+                case (int)DisplayPicutureType.AnalyzeSheetandChart:
                     break;
                 default:
                     break;
@@ -588,7 +591,7 @@ namespace OTSIncAReportApp
                     break;
                 case (int)DisplayPicutureType.AnalyzeDataTable:
                     break;
-                case (int)DisplayPicutureType.AnalyzeDataChart:
+                case (int)DisplayPicutureType.AnalyzeSheetandChart:
                     break;
                 default:
                     break;
@@ -663,7 +666,7 @@ namespace OTSIncAReportApp
                     break;
                 case (int)DisplayPicutureType.AnalyzeDataTable:
                     break;
-                case (int)DisplayPicutureType.AnalyzeDataChart:
+                case (int)DisplayPicutureType.AnalyzeSheetandChart:
                     break;
                 default:
                     break;
@@ -702,7 +705,7 @@ namespace OTSIncAReportApp
                     break;
                 case (int)DisplayPicutureType.AnalyzeDataTable:
                     break;
-                case (int)DisplayPicutureType.AnalyzeDataChart:
+                case (int)DisplayPicutureType.AnalyzeSheetandChart:
                     break;
                 default:
                     break;
@@ -741,7 +744,7 @@ namespace OTSIncAReportApp
                     break;
                 case (int)DisplayPicutureType.AnalyzeDataTable:
                     break;
-                case (int)DisplayPicutureType.AnalyzeDataChart:
+                case (int)DisplayPicutureType.AnalyzeSheetandChart:
                     break;
                 default:
                     break;
@@ -779,7 +782,7 @@ namespace OTSIncAReportApp
                     break;
                 case (int)DisplayPicutureType.AnalyzeDataTable:
                     break;
-                case (int)DisplayPicutureType.AnalyzeDataChart:
+                case (int)DisplayPicutureType.AnalyzeSheetandChart:
                     break;
                 default:
                     break;
@@ -817,7 +820,7 @@ namespace OTSIncAReportApp
                     break;
                 case (int)DisplayPicutureType.AnalyzeDataTable:
                     break;
-                case (int)DisplayPicutureType.AnalyzeDataChart:
+                case (int)DisplayPicutureType.AnalyzeSheetandChart:
                     break;
                 default:
                     break;
@@ -848,20 +851,21 @@ namespace OTSIncAReportApp
 
         #endregion
 
+
         #region 自定义封装相关方法
         /// <summary>
         /// 新建一个工作区域
         /// </summary>
         public void CreateNewWorkspaceWindow()
         {
-
-            
+            //创建测量数据窗口
+            CreateCOverviewWindow();
             //创建测量数据窗口
             CreateCTablesWindow();
+            //创建图表窗口
+            CreateCSheetandChartWindow();
             //Show BSE图窗口
             CreateSampleWindow();
-            //创建图表窗口
-            CreateChartsWindow();
 
             //StandardLibraryWindow();
 
@@ -884,18 +888,24 @@ namespace OTSIncAReportApp
         private OTS.WinFormsUI.Docking.DockContent CreateNewDocument(OTS.WinFormsUI.Docking.DockContent WorkWindow, DisplayPicutureType iType)
         {
             string text = "";
+
+
+
             if (iType == DisplayPicutureType.AnalyzeImg)
             {
-                
                 text = table["analysisdiagram"].ToString(); ;
             }
             else if (iType == DisplayPicutureType.AnalyzeDataTable)
             {
                 text = table["analysisdatasheet"].ToString();
             }
-            else if (iType == DisplayPicutureType.AnalyzeDataChart)
+            else if (iType == DisplayPicutureType.AnalyzeSheetandChart)
+            {
+                text = table["analysisdatasheetandchart"].ToString();
+            }
+            else if (iType == DisplayPicutureType.OverviewTable)
             {
-                text = table["analysisdatachart"].ToString();
+                text = table["overviewtable"].ToString();
             }
             else
             {
@@ -959,54 +969,98 @@ namespace OTSIncAReportApp
         }
 
 
+        /// <summary>
+        /// 创建Grid表格窗体
+        /// </summary>
+        private void CreateCSheetandChartWindow()
+        {
+            if (null == m_TablesWindowandChart)
+            {
+                m_TablesWindowandChart = new frmTables(this);
+            }
+
+            m_TablesWindowandChart = (frmTables)CreateNewDocument(m_TablesWindowandChart, DisplayPicutureType.AnalyzeSheetandChart);
+
+            if (DockWindowPanel.DocumentStyle == DocumentStyle.SystemMdi)
+            {
+                m_TablesWindowandChart.MdiParent = this;
+                m_TablesWindowandChart.Show();
+            }
+            else
+            {
+                m_TablesWindowandChart.Show(DockWindowPanel);
+            }
+        }
         /// <summary>
         /// 创建Grid表格窗体
         /// </summary>
         private void CreateCTablesWindow()
         {
-            if (null == m_TablesWindow)
+            if (null == m_ParticlesListWindow)
             {
-                m_TablesWindow = new frmTables(this);
+                m_ParticlesListWindow = new frmTables(this);
             }
 
-            m_TablesWindow = (frmTables)CreateNewDocument(m_TablesWindow, DisplayPicutureType.AnalyzeDataTable);
+            m_ParticlesListWindow = (frmTables)CreateNewDocument(m_ParticlesListWindow, DisplayPicutureType.AnalyzeDataTable);
 
             if (DockWindowPanel.DocumentStyle == DocumentStyle.SystemMdi)
             {
-                m_TablesWindow.MdiParent = this;
-                m_TablesWindow.Show();
+                m_ParticlesListWindow.MdiParent = this;
+                m_ParticlesListWindow.Show();
             }
             else
             {
-                m_TablesWindow.Show(DockWindowPanel);
+                m_ParticlesListWindow.Show(DockWindowPanel);
             }
 
         }
+        ///// <summary>
+        ///// 创建chart图表窗体
+        ///// </summary>
+        //private void CreateChartsWindow()
+        //{
+        //    if (null == m_ChartsWindow)
+        //    {
+        //        m_ChartsWindow = new frmCharts(this);
+        //    }
+
+        //    m_ChartsWindow = (frmCharts)CreateNewDocument(m_ChartsWindow, DisplayPicutureType.AnalyzeSheetandChart);
+
+        //    if (DockWindowPanel.DocumentStyle == DocumentStyle.SystemMdi)
+        //    {
+        //        m_ChartsWindow.MdiParent = this;
+        //        m_ChartsWindow.Show();
+        //    }
+        //    else
+        //    {
+        //        m_ChartsWindow.Show(DockWindowPanel);
+        //    }
+        //}
+
 
         /// <summary>
-        /// 创建chart图表窗体
+        /// 创建结果概况窗体
         /// </summary>
-        private void CreateChartsWindow()
+        private void CreateCOverviewWindow()
         {
-            if (null == m_ChartsWindow)
+            if (null == m_OverviewWindow)
             {
-                m_ChartsWindow = new frmCharts(this);
+                m_OverviewWindow = new frmTables(this);
             }
 
-            m_ChartsWindow = (frmCharts)CreateNewDocument(m_ChartsWindow, DisplayPicutureType.AnalyzeDataChart);
+            m_OverviewWindow = (frmTables)CreateNewDocument(m_OverviewWindow, DisplayPicutureType.OverviewTable);
 
             if (DockWindowPanel.DocumentStyle == DocumentStyle.SystemMdi)
             {
-                m_ChartsWindow.MdiParent = this;
-                m_ChartsWindow.Show();
+                m_OverviewWindow.MdiParent = this;
+                m_OverviewWindow.Show();
             }
             else
             {
-                m_ChartsWindow.Show(DockWindowPanel);
+                m_OverviewWindow.Show(DockWindowPanel);
             }
-        }
-
 
+        }
 
         /// <summary>
         /// 新建样品时提示保存样品信息Messagebox 

OTSIncAReportApp/1-UI/frmTables.cs

@@ -18,7 +18,6 @@ namespace OTSIncAReportApp
 
         Hashtable table;
         #endregion
-
         #region 构造函数
         public frmTables(frmReportApp ReportApp)
         {
@@ -30,45 +29,42 @@ namespace OTSIncAReportApp
             #endregion
         }
         #endregion
-
         #region Grid表格被激活时事件
         private void OTSCaculationTablesWindow_Activated(object sender, EventArgs e)
         {
             OTSSourceGrid m_SampleGrid = m_ReportApp.m_conditionChoose.m_sourceGrid;
             m_SampleGrid.InitGrid();
             m_SampleGrid.InitGroupTitle(0, table["generalparameters"].ToString());
-
-            m_SampleGrid.SetPictureType(DisplayPicutureType.AnalyzeDataTable);
+            System.Windows.Forms.Control ctl=(System.Windows.Forms.Control)sender;
+            m_SampleGrid.SetPictureType((DisplayPicutureType)ctl.TabIndex);
             m_ReportApp.m_conditionChoose.DisCurrentPicProperty();//先添加属性
-
             //根据标签索引 显示默认的数据图表
-            if (m_ReportApp.m_TablesWindow.Controls != null)
+            if (m_ReportApp.m_ParticlesListWindow.Controls != null)
             {
+
                 if (m_ReportApp.im_Control_DrawDistrbutionImageAndBSE != null)
                 {
-                    if (m_ReportApp.m_TablesWindow.Controls.Count == 0 || m_ReportApp.im_Control_DrawDistrbutionImageAndBSE.WhetherThereAreDeleteParticles())
+                    if (m_ReportApp.m_ParticlesListWindow.Controls.Count == 0 || m_ReportApp.im_Control_DrawDistrbutionImageAndBSE.WhetherThereAreDeleteParticles())
                     {
-                        m_ReportApp.m_conditionChoose.tabIndex = DisplayPicutureType.AnalyzeDataTable;
+                        m_ReportApp.m_conditionChoose.tabIndex = (DisplayPicutureType)ctl.TabIndex;
                         m_ReportApp.m_conditionChoose.ShowsTheDefaultPic();
                     }
                 }
-
                 else
                 {
-                    if (m_ReportApp.m_TablesWindow.Controls.Count == 0)
-                    {
-                        m_ReportApp.m_conditionChoose.tabIndex = DisplayPicutureType.AnalyzeDataTable;
+                    //if (m_ReportApp.m_ParticlesListWindow.Controls.Count == 0)
+                    //{
+                        m_ReportApp.m_conditionChoose.tabIndex = (DisplayPicutureType)ctl.TabIndex;
                         m_ReportApp.m_conditionChoose.ShowsTheDefaultPic();
-                    }
+                    //}
                 }
-
             }
 
             m_ReportApp.m_RstWindow.SelectWorkSampleNode();
             //设置每个功能模块限制菜单的显示
             if (this.Controls.Count != 0)
             {
-                m_ReportApp.m_RibbonFun.SetRibbonButnStatu_ByModule(DisplayPicutureType.AnalyzeDataTable);
+                m_ReportApp.m_RibbonFun.SetRibbonButnStatu_ByModule((DisplayPicutureType)ctl.TabIndex);
             }
             //判断样品属性与样品窗口在主窗体的位置
             if (m_ReportApp.m_conditionChoose.DockState != m_ReportApp.m_RstWindow.DockState)
@@ -84,6 +80,5 @@ namespace OTSIncAReportApp
             }
         }
         #endregion
-
     }
 }