优化德标

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

@@ -932,8 +932,8 @@
 	  <Control name="ChineseStandard1" text="GB30834方法一(10561)" />
 	  <Control name="ChineseStandard2" text="GB30834方法二" />
 	  <Control name="AmericanStandard" text="美标" />
-	  <Control name="GermanStandard" text="德标" />
-	  <Control name="yb6156" text="德标 K法（YB/T 6156-2023）" />
+	  <Control name="GermanStandard" text="德标 K法" />
+	  <Control name="yb6156" text="德标 K法（YB/T6156-2023）" />
 	  <Control name="CommonClassification" text="颗粒成分分类" />
 	  <Control name="ParticlesAnalyzed" text="已分析颗粒" />
 	  <Control name="SelectParticles" text="选择颗粒" />

OTSCPP/OTSRptCalculate/GBCal/CGBCalculate.cpp

@@ -27,15 +27,11 @@ namespace OTSGBCalculate
 	{
 	
 		CGBFieldList listCGBField;
-	
-
 		CGridDatasList listGridData;
 		listGridData.clear();
 		CGridDatasList multGridList;
 		multGridList.clear();
-
 		// depart compound source name
-
 		CPropParamPtr currentProp = m_rptMgrPtr->GetPropertyParamForGrid();
 		std::vector<CString> listDataSource = currentProp->GetDataSourceList();
 		int nSelectedDataSourceIndex = currentProp->GetDataSourceId();
@@ -49,42 +45,20 @@ namespace OTSGBCalculate
 			// data source id
 			std::vector<CString> listDataSource;
 			listDataSource.clear();
+
 			listDataSource = currentProp->GetDataSourceList();
 			pGridData->SetDataSourceList(listDataSource);
-
 			int nDataSourceId = currentProp->GetDataSourceId();
 			pGridData->SetDataSourceId(nDataSourceId);
-
-			
 			CSmplMsrResultFileMgrPtr rstFileMgrPrt = m_rptMgrPtr->GetASmplMsrResultMgrByFileName(strDataSourceName);
-			
-			
-
 			CSmplMsrResultFilePtr pSmplMsrResultFile = rstFileMgrPrt->GetSmplMsrResultFile();
-			
-
-		
-		
-			if (tableType == CALCULATE_TABLE_TYPE::DIN)
-			{
-				CGBFieldDataPtr DINFld(new CGBFieldData());
-			
-				DINFld->CaculateLevelDIN(pSmplMsrResultFile->GetAllParticles());
-
-				listGridData = this->GetGridDataListForOneDataSourceDIN(DINFld);//express these result data by grid
-			}
-			else if (tableType == CALCULATE_TABLE_TYPE::YB6156)
+			if (tableType == CALCULATE_TABLE_TYPE::YB6156|| tableType == CALCULATE_TABLE_TYPE::DIN)
 			{
 				CGBFieldList listRawGBFields = CalGBFields(rstFileMgrPrt, GB_METHODE_TYPE::YB6156K);
 
-				CategoryGBInclutions(listRawGBFields, tableType);
-
+				CategoryGBInclutions(listRawGBFields, CALCULATE_TABLE_TYPE::YB6156);
 				listCGBField = listRawGBFields;
-
-				//CGBGradeData gradeData = CGBGradeData(listCGBField);
-
 				listGridData = this->GetGridDataListForOneDataSourceYB6156(listRawGBFields);
-				
 			}
 			else
 			{
@@ -100,25 +74,22 @@ namespace OTSGBCalculate
 				case CALCULATE_TABLE_TYPE::ASTM:
 					t = GB_METHODE_TYPE::ASTM;
 					break;
-				/*case CALCULATE_TABLE_TYPE::YB6156:
-					t = GB_METHODE_TYPE::YB6156K;
-					break;*/
 				default:
 					t = GB_METHODE_TYPE::METHODE_1;
 					break;
 				}
 				CGBFieldList listRawGBFields = CalGBFields(rstFileMgrPrt,t);
-
 				CategoryGBInclutions(listRawGBFields, tableType);
-
 				listCGBField = listRawGBFields;
 
 				CGBGradeData gradeData = CGBGradeData(listCGBField);
-
 				listGridData = this->GetGridDataListForOneDataSource(&gradeData, tableType);//express these result data by grid
+
+
 			}
 			multGridList.insert (multGridList.end (), listGridData.begin(), listGridData.end());
 		}
+
 		return multGridList;
 	}
 	void CGBCalculate::CategoryGBInclutions(CGBFieldList listCGBField, CALCULATE_TABLE_TYPE ty)

OTSIncAReportApp/1-UI/GBCalculate/DINStandardABCDDS.cs

@@ -15,28 +15,30 @@ namespace OTSIncAReportGB
         #region 全局变量
         //设置数据表
         public DataTable m_dt = new DataTable();
-
         //底层相关,项目操作管理类
         CReportMgrClr m_ReportMgrClr = null;
-
-
-
         //获取从框架得到的底层计算结果,国标表A
-        List<CGridDataClr> m_list_cgriddataclr_A = null;
-
-
-        //定义整个一组返回List
-        List<CGridDataClr> m_list_ALL = null;
-
+        List<CGridDataClr> in_list_cgriddataclr = null;
         //接收底层数据
         public List<CGridDataClr> DataAll;
-
-
-
+        Language lan;
+        Hashtable table;
+        DataTable dt_yb6156 = new DataTable();
+        Dictionary<int, double> Level_Coefficient = new Dictionary<int, double>();
+        Dictionary<string, InclusionGradeInfo> SamplesInclusionGradeInfo;
+        public struct InclusionGradeInfo
+        {
+            public int[] GradeACount;
+            public int[] GradeBCount;
+            public int[] GradeCCount;
+            public int[] GradeDCount;
+
+            public double S;
+            public double O;
+            public double Area;
+        }
+        public Dictionary<int, List<InclusionGradeInfo>> InclusionGradeInfos = new Dictionary<int, List<InclusionGradeInfo>>();
         #endregion
-
-
-
         #region 窗体加载及初始化
         public DINStandardABCDDS()
         {
@@ -52,22 +54,11 @@ namespace OTSIncAReportGB
         /// <param name="in_list_CGridDataClrAll"></param>   //all  代表A、B、C、D、DS按顺序得表
         public string ColumnName;
         public string RowName;
-        #region 国际化语言
-        Language lan;
-        Hashtable table;
-        #endregion
         public DINStandardABCDDS(CReportMgrClr in_Cotsreportprojfilemgrclr, List<CGridDataClr> in_list_CGridDataClrAll)
         {
-
             DataAll = in_list_CGridDataClrAll;
-
-            //获取报告项目类对象
             m_ReportMgrClr = in_Cotsreportprojfilemgrclr;
-
-            m_list_cgriddataclr_A = in_list_CGridDataClrAll.GetRange(0, 1);
-
-            m_list_ALL = in_list_CGridDataClrAll;
-
+            in_list_cgriddataclr = in_list_CGridDataClrAll.GetRange(0, in_list_CGridDataClrAll.Count);
             InitializeComponent();
             #region 国际化语言
             lan = new Language(this);
@@ -77,16 +68,45 @@ namespace OTSIncAReportGB
 
         private void DINStandardABCDDS_Load(object sender, EventArgs e)
         {
+            Level_Coefficient.Clear();
+            Level_Coefficient.Add(0, 0.05);
+            Level_Coefficient.Add(1, 0.1);
+            Level_Coefficient.Add(2, 0.2);
+            Level_Coefficient.Add(3, 0.5);
+            Level_Coefficient.Add(4, 1);
+            Level_Coefficient.Add(5, 2);
+            Level_Coefficient.Add(6, 5);
+            Level_Coefficient.Add(7, 10);
+            Level_Coefficient.Add(8, 20);
+            Level_Coefficient.Add(9, 50);
+            comboBox_InitialRatingLevel.Items.Clear();
+            comboBox_InitialRatingLevel.Items.Add("0");
+            comboBox_InitialRatingLevel.Items.Add("1");
+            comboBox_InitialRatingLevel.Items.Add("2");
+            comboBox_InitialRatingLevel.Items.Add("3");
+            comboBox_InitialRatingLevel.Items.Add("4");
+            comboBox_InitialRatingLevel.Items.Add("5");
+            comboBox_InitialRatingLevel.Items.Add("6");
+            comboBox_InitialRatingLevel.Items.Add("7");
+            comboBox_InitialRatingLevel.Items.Add("8");
+            comboBox_InitialRatingLevel.Items.Add("9");
+            comboBox_InitialRatingLevel.SelectedIndex = 0;
+            this.comboBox_InitialRatingLevel.SelectedIndexChanged += new System.EventHandler(this.comboBox_InitialRatingLevel_SelectedIndexChanged);
+
+
+
+            List<DataTable> dts = GetDataTable(in_list_cgriddataclr);
+            SamplesInclusionGradeInfo = new Dictionary<string, InclusionGradeInfo>();
+            int t = 1;
+            foreach (DataTable dt in dts)
+            {
+                InclusionGradeInfo inclusionGradeInfo = CalInclusionGradeInfo(dt);
+                SamplesInclusionGradeInfo.Add(t.ToString(), inclusionGradeInfo);
+                t++;
+            }
+            BindDataGridView(SamplesInclusionGradeInfo[1.ToString()]);
 
-            //从底层结果类对象中，分解出数据保存到datatable中
-            m_dt = DINStandardABCD_GetDataTable_Total(m_list_cgriddataclr_A);
-            //创建datatable的列数据，及分栏,及相关行数据
-            BindDataGridView();
-            //设置grid风格
             SetDataGridViewStyle();
-
-            Invalidate();
-
         }
 
         /// <summary>
@@ -159,58 +179,120 @@ namespace OTSIncAReportGB
             return ret_color;
         }
 
+
+
+
+
+
+
+
+
+
         /// <summary>
         /// 绑定datagridview数据
         /// </summary>
-        public void BindDataGridView()
+        public void BindDataGridView(InclusionGradeInfo inclusionGradeInfo)
         {
-
-            for (int i = 0; i < m_dt.Columns.Count; i++)
+            Gview_gz.Columns.Clear();
+            Gview_gz.Columns.Add("Class", "Class");
+            for (int i = 0; i <10; i++)
             {
-                Gview_gz.Columns.Add(m_dt.Columns[i].ToString(), m_dt.Columns[i].ToString());
+                Gview_gz.Columns.Add("Grade"+ i.ToString(), i.ToString());
             }
-
-
-            //先设置一下头的高度，否则会太矮不好看
-            Gview_gz.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing;
-            Gview_gz.ColumnHeadersHeight = 40;
-            ////创建Grid的列
-            //this.Gview_gz.MergeColumnNames.Add("夹杂物级别");
-            //this.Gview_gz.AddSpanHeader(1, 9, table["str1"].ToString());
-            //Gview_gz.MergeColumnHeaderBackColor = Color.White;
-            //设置grid默认值的样式，防止图像为空时有红x
-            for (int i = 0; i < Gview_gz.Columns.Count; i++)
-            {
-                Gview_gz.Columns[i].DefaultCellStyle.NullValue = null;
-                Gview_gz.Columns[i].Width = 60;
-            }
-
-
+            Gview_gz.Columns.Add("S", "S");
+            Gview_gz.Columns.Add("O", "O");
             //设置数据
-            for (int i = 0; i < m_dt.Rows.Count; i++)
+            for (int i = 0; i < 4; i++)
             {
-                int add_rowindex = Gview_gz.Rows.Add();
-
-
-                for (int k = 0; k < m_dt.Columns.Count; k++)
+                Gview_gz.Rows.Add();
+                switch (i)
                 {
-
-                    Gview_gz.Rows[i].Cells[k].Value = m_dt.Rows[i][k].ToString();
+                    case 0:
+                        Gview_gz.Rows[i].Cells[0].Value="SS";
+                        double toS = 0;
+                        for (int k = 1; k < Gview_gz.Columns.Count - 2; k++)
+                        {
+                            if (k <= Convert.ToInt32(comboBox_InitialRatingLevel.SelectedItem))
+                            {
+                                Gview_gz.Rows[i].Cells[k].Value = "-";
+                            }
+                            else
+                            {
+                                Gview_gz.Rows[i].Cells[k].Value = inclusionGradeInfo.GradeACount[k-1];
+                                toS += Convert.ToDouble(inclusionGradeInfo.GradeACount[k - 1]) * Level_Coefficient[k - 1];
+                            }
+                            Gview_gz.Rows[0].Cells[11].Value = toS;
+                            Gview_gz.Rows[0].Cells[12].Value = "-";
+                        }
+                        break;
+                    case 1:
+                        Gview_gz.Rows[i].Cells[0].Value = "OA";
+                        double toOA = 0;
+                        for (int k = 1; k < Gview_gz.Columns.Count - 2; k++)
+                        {
+                            if (k <= Convert.ToInt32(comboBox_InitialRatingLevel.SelectedItem))
+                            {
+                                Gview_gz.Rows[i].Cells[k].Value = "-";
+                            }
+                            else
+                            {
+                                Gview_gz.Rows[i].Cells[k].Value = inclusionGradeInfo.GradeBCount[k - 1];
+                                toOA += Convert.ToDouble(inclusionGradeInfo.GradeBCount[k - 1]) * Level_Coefficient[k - 1];
+                            }
+                        }
+                            Gview_gz.Rows[i].Cells[11].Value = "-";
+                            Gview_gz.Rows[i].Cells[12].Value = toOA;
+                        break;
+                    case 2:
+                        Gview_gz.Rows[i].Cells[0].Value = "OS";
+                        double toOS = 0;
+                        for (int k = 1; k < Gview_gz.Columns.Count - 2; k++)
+                        {
+                            if (k <= Convert.ToInt32(comboBox_InitialRatingLevel.SelectedItem))
+                            {
+                                Gview_gz.Rows[i].Cells[k].Value = "-";
+                            }
+                            else
+                            {
+                                Gview_gz.Rows[i].Cells[k].Value = inclusionGradeInfo.GradeCCount[k - 1];
+                                toOS += Convert.ToDouble(inclusionGradeInfo.GradeCCount[k - 1]) * Level_Coefficient[k - 1];
+                            }
+                        }
+                            Gview_gz.Rows[i].Cells[11].Value = "-";
+                            Gview_gz.Rows[i].Cells[12].Value = toOS;
+                        break;
+                    case 3:
+                        Gview_gz.Rows[i].Cells[0].Value = "OG";
+                        double toOG = 0;
+                        for (int k = 1; k < Gview_gz.Columns.Count - 2; k++)
+                        {
+                            if (k <= Convert.ToInt32(comboBox_InitialRatingLevel.SelectedItem))
+                            {
+                                Gview_gz.Rows[i].Cells[k].Value = "-";
+                            }
+                            else
+                            {
+                                Gview_gz.Rows[i].Cells[k].Value = inclusionGradeInfo.GradeDCount[k - 1];
+                                toOG += Convert.ToDouble(inclusionGradeInfo.GradeDCount[k - 1]) * Level_Coefficient[k - 1];
+                            }
+                        }
+                            Gview_gz.Rows[i].Cells[11].Value = "-";
+                            Gview_gz.Rows[i].Cells[12].Value = toOG;
+                        break;
+                    default:
+                        break;
                 }
             }
             int totle = Gview_gz.Rows.Add();
             Gview_gz.Rows[totle].Cells[0].Value = table["str2"].ToString();
-            Gview_gz.Rows[totle].Cells[10].Value = "S=" + Gview_gz.Rows[0].Cells[10].Value;
-            double to = Convert.ToDouble(Gview_gz.Rows[1].Cells[11].Value) + Convert.ToDouble(Gview_gz.Rows[2].Cells[11].Value) + Convert.ToDouble(Gview_gz.Rows[3].Cells[11].Value);
-            Gview_gz.Rows[totle].Cells[11].Value = "O=" + to.ToString();
+            Gview_gz.Rows[totle].Cells[11].Value = "S=" + Gview_gz.Rows[0].Cells[11].Value;
+            double to = Convert.ToDouble(Gview_gz.Rows[1].Cells[12].Value) + Convert.ToDouble(Gview_gz.Rows[2].Cells[12].Value) + Convert.ToDouble(Gview_gz.Rows[3].Cells[12].Value);
+            Gview_gz.Rows[totle].Cells[12].Value = "O=" + to.ToString();
             int totle1 = Gview_gz.Rows.Add();
-            Gview_gz.Rows[totle1].Cells[10].Value = table["str3"].ToString();
-
-
-            uint area = m_ReportMgrClr.GetSmplMsrResultMgrs()[0].GetSmplMsrResultFile().GetSample().GetMsrResults().GetMeasuredArea();
-            double ts = Convert.ToDouble(Gview_gz.Rows[0].Cells[10].Value);
-            double gg = ((ts + to) * 1000 * 1000 * 1000) / area;
-            Gview_gz.Rows[totle1].Cells[11].Value = gg;
+            Gview_gz.Rows[totle1].Cells[11].Value = table["str3"].ToString();
+            double ts = Convert.ToDouble(Gview_gz.Rows[0].Cells[11].Value);
+            double gg = ((ts + to) * 1000) / inclusionGradeInfo.Area;
+            Gview_gz.Rows[totle1].Cells[12].Value = gg.ToString("F2");
             //设置颜色
             int color_count = 1;
             for (int i = 0; i < m_dt.Columns.Count; i++)
@@ -228,117 +310,69 @@ namespace OTSIncAReportGB
         {
             //用户不能调整标题的高度
             Gview_gz.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
-
             //用户不能调整 行高
             Gview_gz.AllowUserToResizeRows = false;
-
-            //改变行的高度;
-            //Gview_gz.RowTemplate.Height = 20;
-
             //点击选择整行
             Gview_gz.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
-
             //居中显示
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
             dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
             Gview_gz.DefaultCellStyle = dataGridViewCellStyle1;
             Gview_gz.ColumnHeadersDefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter;
-
             //再次重覆禁用拖动表头高度，居然有效果了
             Gview_gz.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
-
             //设置grid可以复制
             Gview_gz.ClipboardCopyMode = DataGridViewClipboardCopyMode.EnableAlwaysIncludeHeaderText;
-
             //设置每列的宽度
             Gview_gz.Columns[0].Width = 60;//第一列序号的宽度设置一下吧，要不太丑
-
             //设置序号列不排序
             Gview_gz.Columns[0].SortMode = DataGridViewColumnSortMode.NotSortable;
-
             //设置序号列不可以设置宽度
             Gview_gz.Columns[0].Resizable = DataGridViewTriState.False;
+            //先设置一下头的高度，否则会太矮不好看
+            Gview_gz.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing;
+            Gview_gz.ColumnHeadersHeight = 40;
+            ////创建Grid的列
+            //this.Gview_gz.MergeColumnNames.Add("夹杂物级别");
+            //this.Gview_gz.AddSpanHeader(1, 9, table["str1"].ToString());
+            //Gview_gz.MergeColumnHeaderBackColor = Color.White;
+            //设置grid默认值的样式，防止图像为空时有红x
+            for (int i = 0; i < Gview_gz.Columns.Count; i++)
+            {
+                Gview_gz.Columns[i].DefaultCellStyle.NullValue = null;
+                Gview_gz.Columns[i].Width = 60;
+                Gview_gz.Columns[i].DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter;
+            }
         }
 
         #endregion
 
-
-
-        #region 获取向导出模块提供的DataTable和GridView对象
-        /// <summary>
-        /// 获取到该模块输出后形成的DataTable,和GridView
-        /// </summary>
-        /// <param name="out_dt"></param>
-        /// <param name="out_dg"></param>
-        public void GetDataTableAndGridView(out DataTable out_dtA, out DataGridView out_dgA)
-        {
-            //从panel中找出前5个datagridview,然后进行输出
-            out_dtA = m_dt;
-            out_dgA = null;
-        }
-
-        #endregion
-
-
         #region clr部份
-        public DataTable DINStandardABCD_GetDataTable_Total(List<CGridDataClr> in_list_cgriddataclr)
+        List<DataTable> GetDataTable(List<CGridDataClr> in_list_cgriddataclr)
         {
-
-            //创建一个临时表
-            DataTable ret_dt = new DataTable();
-
+            List<DataTable> dataTables = new List<DataTable>();
             //判断传入的数据对象是否为空
             if (in_list_cgriddataclr == null)
             {
                 string str1 = "传入分解表格数据的CGridDataClr对象为空！";
                 str1 = table["str1"].ToString();
-                //log.Error("(OTSIncAReportGridsFun.DINStandardABCD_GetDataTable_Total)" + str1);
-                return ret_dt;
+                //log.Error("(OTSIncAReportGridsFun.ChineseStandardABCD_GetDataTable_Total)" + str1);
             }
-
             #region 根据返回的结构创建DataTable的结构---------------------------------------------
             for (int i = 0; i < in_list_cgriddataclr.Count(); i++)
             {
-                //分解结果内容
+                DataTable ret_dt = new DataTable(in_list_cgriddataclr[i].GetDataSourceList()[Convert.ToInt32(in_list_cgriddataclr[i].GetDataSourceId())].ToString());
                 List<CGridColumnClr> list_cgridcolumnclrs = new List<CGridColumnClr>();
                 list_cgridcolumnclrs = in_list_cgriddataclr[i].GetGridColumnList();    //获取各列
 
-
-
-                if (in_list_cgriddataclr.Count > 1)
-                {
-                    //创建DT的列,多个数据源，为每个字段带上索引号
-                    foreach (CGridColumnClr ls_cgridcolumnclr in list_cgridcolumnclrs)
-                    {
-                        string ls_fl_strName = ls_cgridcolumnclr.GetName();
-
-                        //通过获取到的列，创建表的列
-                        ret_dt.Columns.Add(ls_fl_strName + "(" + (i + 1).ToString() + ")");
-                    }
-                }
-                else
+                foreach (CGridColumnClr ls_cgridcolumnclr in list_cgridcolumnclrs)
                 {
-                    //创建DT的列,单个数据源，不带索引号
-                    foreach (CGridColumnClr ls_cgridcolumnclr in list_cgridcolumnclrs)
-                    {
-                        string ls_fl_strName = ls_cgridcolumnclr.GetName();
-
-                        //通过获取到的列，创建表的列
-                        ret_dt.Columns.Add(ls_fl_strName);
-                    }
+                    string ls_fl_strName = ls_cgridcolumnclr.GetName();
+                    ret_dt.Columns.Add(ls_fl_strName);
                 }
-            }
-            #endregion
-
-            #region 再创建表的行------------------------------------------------------------------
-            //取最大的rowlistcount,要不然，不知道这底层返回的数据居然还有2,2,3这样的行数据
-            int maxrownumber = 0;
-            for (int i = 0; i < in_list_cgriddataclr.Count(); i++)
-            {
-                //分解结果内容
-                List<CGridColumnClr> list_cgridcolumnclrs = new List<CGridColumnClr>();
-                list_cgridcolumnclrs = in_list_cgriddataclr[i].GetGridColumnList();    //获取各列
 
+                //取最大的rowlistcount,要不然，不知道这底层返回的数据居然还有2,2,3这样的行数据
+                int maxrownumber = 0;
                 //创建DT的行
                 if (list_cgridcolumnclrs != null)
                 {
@@ -350,21 +384,11 @@ namespace OTSIncAReportGB
                         }
                     }
                 }
-            }
-            for (int k = 0; k < maxrownumber; k++)
-            {
-                DataRow dr = ret_dt.NewRow();
-                ret_dt.Rows.Add(dr);
-            }
-            #endregion
-
-            #region //再次重新分解，先分解列，然后将获取到的各行各列的数据，填充到相应的位置上---
-            for (int i = 0; i < in_list_cgriddataclr.Count(); i++)
-            {
-                //分解结果内容
-                List<CGridColumnClr> list_cgridcolumnclrs = new List<CGridColumnClr>();
-                list_cgridcolumnclrs = in_list_cgriddataclr[i].GetGridColumnList();    //获取各列
-                                                                                       //再次重新分解，先分解列，然后将获取到的
+                for (int k = 0; k < maxrownumber; k++)
+                {
+                    DataRow dr = ret_dt.NewRow();
+                    ret_dt.Rows.Add(dr);
+                }
                 for (int k = 0; k < list_cgridcolumnclrs.Count(); k++)
                 {
                     string ls_fl_strName = list_cgridcolumnclrs[k].GetName();
@@ -381,7 +405,7 @@ namespace OTSIncAReportGB
                             case 0:
                                 //string
                                 str_value = ls_list_cgridrowclr[j].GetStringValue();
-                                ret_dt.Rows[j][k + i] = str_value;
+                                ret_dt.Rows[j][k] = str_value;
                                 break;
                             case 1:
                                 //该元素含量表没有需要显示的颗粒图像
@@ -390,25 +414,98 @@ namespace OTSIncAReportGB
                             case 2:
                                 //int
                                 str_value = ls_list_cgridrowclr[j].GetIntValue().ToString();
-                                ret_dt.Rows[j][k + i] = str_value;
+                                ret_dt.Rows[j][k] = str_value;
                                 break;
                             case 3:
                                 //float
                                 str_value = ls_list_cgridrowclr[j].GetDoubleValue().ToString("0.00");
-                                ret_dt.Rows[j][k + i] = str_value;
+                                ret_dt.Rows[j][k] = str_value;
                                 break;
                             default:
                                 str_value = "";
-                                ret_dt.Rows[j][k + i] = str_value;
+                                ret_dt.Rows[j][k] = str_value;
                                 break;
                         }
                     }
                 }
+                dataTables.Add(ret_dt);
             }
             #endregion
 
-            return ret_dt;
+
+            return dataTables;
         }
         #endregion
+        InclusionGradeInfo CalInclusionGradeInfo(DataTable dt)
+        {
+            InclusionGradeInfo inclusionGradeInfo = new InclusionGradeInfo();
+            inclusionGradeInfo.GradeACount = new int[10] { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+            inclusionGradeInfo.GradeBCount = new int[10] { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+            inclusionGradeInfo.GradeCCount = new int[10] { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+            inclusionGradeInfo.GradeDCount = new int[10] { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+            foreach (DataRow dr in dt.Rows)
+            {
+                int ret = CalInclusionGradeByArea(Convert.ToDouble(dr[0]));
+                if (ret != -1)
+                {
+                    inclusionGradeInfo.GradeACount[ret] += 1;
+                }
+                ret = CalInclusionGradeByArea(Convert.ToDouble(dr[1]));
+                if (ret != -1)
+                {
+                    inclusionGradeInfo.GradeBCount[ret] += 1;
+                }
+                ret = CalInclusionGradeByArea(Convert.ToDouble(dr[2]));
+                if (ret != -1)
+                {
+                    inclusionGradeInfo.GradeCCount[ret] += 1;
+                }
+                ret = CalInclusionGradeByArea(Convert.ToDouble(dr[3]));
+                if (ret != -1)
+                {
+                    inclusionGradeInfo.GradeDCount[ret] += 1;
+                }
+            }
+            inclusionGradeInfo.Area = dt.Rows.Count * 0.5;
+            return inclusionGradeInfo;
+        }
+        int CalInclusionGradeByArea(double Area)
+        {
+            if (Area < 71)
+            {
+                return -1;
+            }
+            else if (Area < 141)
+            {
+                return 0;
+            }
+            else if (Area < 283)
+            {
+                return 1;
+            }
+            else if (Area < 566)
+            { return 2; }
+            else if (Area < 1131)
+            { return 3; }
+            else if (Area < 2263)
+            { return 4; }
+            else if (Area < 4525)
+            { return 5; }
+            else if (Area < 9051)
+            { return 6; }
+            else if (Area < 18102)
+            { return 7; }
+            else if (Area < 36204)
+            { return 8; }
+            else
+            { return 9; }
+        }
+        private void comboBox_InitialRatingLevel_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            BindDataGridView(SamplesInclusionGradeInfo[1.ToString()]);
+            SetDataGridViewStyle();
+            this.Refresh();
+        }
+
     }
 }

OTSIncAReportApp/1-UI/GBCalculate/DINStandardABCDDS.designer.cs

@@ -29,6 +29,8 @@
         private void InitializeComponent()
         {
             this.panel1 = new System.Windows.Forms.Panel();
+            this.comboBox_InitialRatingLevel = new System.Windows.Forms.ComboBox();
+            this.label2 = new System.Windows.Forms.Label();
             this.Gview_gz = new System.Windows.Forms.DataGridView();
             this.panel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.Gview_gz)).BeginInit();
@@ -38,13 +40,33 @@
             // 
             this.panel1.AutoScroll = true;
             this.panel1.BackColor = System.Drawing.SystemColors.ButtonHighlight;
+            this.panel1.Controls.Add(this.comboBox_InitialRatingLevel);
+            this.panel1.Controls.Add(this.label2);
             this.panel1.Controls.Add(this.Gview_gz);
-            this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.panel1.Location = new System.Drawing.Point(0, 0);
+            this.panel1.Margin = new System.Windows.Forms.Padding(2);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(1000, 780);
+            this.panel1.Size = new System.Drawing.Size(1326, 775);
             this.panel1.TabIndex = 12;
             // 
+            // comboBox_InitialRatingLevel
+            // 
+            this.comboBox_InitialRatingLevel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBox_InitialRatingLevel.FormattingEnabled = true;
+            this.comboBox_InitialRatingLevel.Location = new System.Drawing.Point(68, 7);
+            this.comboBox_InitialRatingLevel.Name = "comboBox_InitialRatingLevel";
+            this.comboBox_InitialRatingLevel.Size = new System.Drawing.Size(102, 20);
+            this.comboBox_InitialRatingLevel.TabIndex = 15;
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Location = new System.Drawing.Point(3, 10);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(59, 12);
+            this.label2.TabIndex = 14;
+            this.label2.Text = "起评级别:";
+            // 
             // Gview_gz
             // 
             this.Gview_gz.AllowUserToAddRows = false;
@@ -52,25 +74,27 @@
             this.Gview_gz.AllowUserToResizeRows = false;
             this.Gview_gz.BackgroundColor = System.Drawing.SystemColors.ButtonHighlight;
             this.Gview_gz.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.Gview_gz.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.Gview_gz.Location = new System.Drawing.Point(0, 0);
+            this.Gview_gz.Location = new System.Drawing.Point(0, 32);
+            this.Gview_gz.Margin = new System.Windows.Forms.Padding(2);
             this.Gview_gz.Name = "Gview_gz";
             this.Gview_gz.ReadOnly = true;
             this.Gview_gz.RowHeadersVisible = false;
             this.Gview_gz.RowHeadersWidth = 40;
             this.Gview_gz.RowTemplate.Height = 30;
-            this.Gview_gz.Size = new System.Drawing.Size(1000, 780);
+            this.Gview_gz.Size = new System.Drawing.Size(1324, 741);
             this.Gview_gz.TabIndex = 13;
             // 
             // DINStandardABCDDS
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.Controls.Add(this.panel1);
+            this.Margin = new System.Windows.Forms.Padding(2);
             this.Name = "DINStandardABCDDS";
-            this.Size = new System.Drawing.Size(1000, 780);
+            this.Size = new System.Drawing.Size(1328, 777);
             this.Load += new System.EventHandler(this.DINStandardABCDDS_Load);
             this.panel1.ResumeLayout(false);
+            this.panel1.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.Gview_gz)).EndInit();
             this.ResumeLayout(false);
 
@@ -79,5 +103,7 @@
         #endregion
         private System.Windows.Forms.Panel panel1;
         public System.Windows.Forms.DataGridView Gview_gz;
+        private System.Windows.Forms.ComboBox comboBox_InitialRatingLevel;
+        private System.Windows.Forms.Label label2;
     }
 }

OTSIncAReportApp/1-UI/GBCalculate/YB6156ABCD.cs

@@ -344,7 +344,7 @@ namespace OTSIncAReportGB
             DataRow dr1 = dt.NewRow();
             dr1["SampleId"] = "Total";
             dr1["Area"] = "TotalArea:"+ TotalArea.ToString();
-            dr1["Gride9Count"] = "第二次求和值t";
+            dr1["Gride9Count"] = "第二次求和值";
             dr1["TotalS"] = TotalS2;
             dr1["TotalO"] = TotalO2;
             dt.Rows.Add(dr1);
@@ -352,7 +352,7 @@ namespace OTSIncAReportGB
             DataRow dr2 = dt.NewRow();
             dr2["SampleId"] = "Total";
             dr2["Area"] = "TotalArea:" + TotalArea.ToString();
-            dr2["Gride9Count"] = "特征值K4";
+            dr2["Gride9Count"] = "特征值";
             dr2["TotalS"] = (TotalS2 *1000/ TotalArea).ToString("F2");
             dr2["TotalO"] = (TotalO2 * 1000 / TotalArea).ToString("F2");
             dt.Rows.Add(dr2);

OTSIncAReportApp/1-UI/OTSDisplaySourceGridData/frmReportConditionChoose.cs

@@ -935,8 +935,9 @@ namespace OTSIncAReportApp
                             }
 
                             OTSCLRINTERFACE.CPropParamClr clr_prop4 = m_ReportApp.m_rstDataMgr.m_ReportMgr.GetPropertyParamTable();
-                            List<string> datasourcelist4 = m_ReportApp.m_conditionChoose.m_conditionData.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);
+                            List<string> datasourcelist4 = new List<string>();
+                            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);//