|
|
@@ -224,7 +224,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
|
|
|
/// </summary>
|
|
|
/// <param name="CompositeData"></param>
|
|
|
/// <param name="surface_dt2"></param>
|
|
|
- private void add_SetTableS(List<DataTable> CompositeData, DataTable surface_dt2)
|
|
|
+ private void add_Particle_size_table_multi_element(List<DataTable> CompositeData, DataTable surface_dt2)
|
|
|
{
|
|
|
ParticleSizeTableCreation particleSizeTableCreation = new ParticleSizeTableCreation();
|
|
|
//XRTable xrTa_ParticleSizeTable = add_particleSizeS();
|
|
|
@@ -1186,7 +1186,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
|
|
|
{
|
|
|
if (basicData.GetIsThereAMajorClassification())
|
|
|
{
|
|
|
- add_SetTableS(CompositeData, statisticalAuantity);
|
|
|
+ add_Particle_size_table_multi_element(CompositeData, statisticalAuantity);
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
@@ -1382,9 +1382,9 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
|
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
|
- /// 元素分析有大分类数据加载
|
|
|
+ /// 添加元素分析表格式并填充数据（大于7个元素种类的表格显示）
|
|
|
/// </summary>
|
|
|
- private void add_SetElementAvgGridS(List<DataTable> a_datas)
|
|
|
+ private void Add_and_create_element_analysis_table_multi_element(List<DataTable> a_datas)
|
|
|
{
|
|
|
ElementAnalysisTableCreation elementAnalysisTableCreation = new ElementAnalysisTableCreation();
|
|
|
XRTable xRTable = elementAnalysisTableCreation.add_ElementListS();
|
|
|
@@ -1456,24 +1456,27 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
|
|
|
XRTableCellData_ElementAnalysis(row, tCell_classify, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ElementalAnalysisData[i], "classify");
|
|
|
XRTableCellData_ElementAnalysis(row, tCell_subdivision, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ElementalAnalysisData[i], "subdivision");
|
|
|
XRTableCellData_ElementAnalysis(row, tCell_area, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ElementalAnalysisData[i], "Area");
|
|
|
- XRTableCellData_ElementAnalysis(row, tCell_s1, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ElementalAnalysisData[i], "s1");
|
|
|
- XRTableCellData_ElementAnalysis(row, tCell_s2, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ElementalAnalysisData[i], "s2");
|
|
|
- XRTableCellData_ElementAnalysis(row, tCell_s3, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ElementalAnalysisData[i], "s3");
|
|
|
- XRTableCellData_ElementAnalysis(row, tCell_s4, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ElementalAnalysisData[i], "s4");
|
|
|
- XRTableCellData_ElementAnalysis(row, tCell_s5, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ElementalAnalysisData[i], "s5");
|
|
|
- XRTableCellData_ElementAnalysis(row, tCell_s6, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ElementalAnalysisData[i], "s6");
|
|
|
- XRTableCellData_ElementAnalysis(row, tCell_s7, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ElementalAnalysisData[i], "s7");
|
|
|
- XRTableCellData_ElementAnalysis(row, tCell_s8, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ElementalAnalysisData[i], "s8");
|
|
|
- XRTableCellData_ElementAnalysis(row, tCell_s9, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ElementalAnalysisData[i], "s9");
|
|
|
- XRTableCellData_ElementAnalysis(row, tCell_s10, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ElementalAnalysisData[i], "s10");
|
|
|
+ XRTableCellData_ElementAnalysis(row, tCell_s1, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ElementalAnalysisData[i], "Data1");
|
|
|
+ XRTableCellData_ElementAnalysis(row, tCell_s2, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ElementalAnalysisData[i], "Data2");
|
|
|
+ XRTableCellData_ElementAnalysis(row, tCell_s3, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ElementalAnalysisData[i], "Data3");
|
|
|
+ XRTableCellData_ElementAnalysis(row, tCell_s4, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ElementalAnalysisData[i], "Data4");
|
|
|
+ XRTableCellData_ElementAnalysis(row, tCell_s5, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ElementalAnalysisData[i], "Data5");
|
|
|
+ XRTableCellData_ElementAnalysis(row, tCell_s6, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ElementalAnalysisData[i], "Data6");
|
|
|
+ XRTableCellData_ElementAnalysis(row, tCell_s7, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ElementalAnalysisData[i], "Data7");
|
|
|
+ XRTableCellData_ElementAnalysis(row, tCell_s8, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ElementalAnalysisData[i], "Data8");
|
|
|
+ XRTableCellData_ElementAnalysis(row, tCell_s9, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ElementalAnalysisData[i], "Data9");
|
|
|
+ XRTableCellData_ElementAnalysis(row, tCell_s10, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ElementalAnalysisData[i], "Data10");
|
|
|
xRTable.Rows.Add(row);
|
|
|
}
|
|
|
xRTable.LocationF = new PointF(10f, NeueStartposition);
|
|
|
NeueStartposition = xRTable.LocationF.Y + xRTable.SizeF.Height + 10;
|
|
|
this.Detail.Controls.Add(xRTable);
|
|
|
}
|
|
|
-
|
|
|
- private void add_SetElementAvgGrid(List<DataTable> a_datas)
|
|
|
+ /// <summary>
|
|
|
+ /// 添加创建元素分析表针对7钟元素以下的表格显示
|
|
|
+ /// </summary>
|
|
|
+ /// <param name="a_datas">大类表排序的数据</param>
|
|
|
+ private void Add_and_create_element_analysis_table(List<DataTable> a_datas)
|
|
|
{
|
|
|
ElementAnalysisTableCreation elementAnalysisTableCreation = new ElementAnalysisTableCreation();
|
|
|
|
|
|
@@ -1557,16 +1560,16 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
|
|
|
tCell_s10.WidthF = xRTable.Rows[2].Cells[11].WidthF;
|
|
|
XRTableCellData_ElementAnalysis(row, tCell_subdivision, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ElementalAnalysisData[i], "subdivision");
|
|
|
XRTableCellData_ElementAnalysis(row, tCell_area, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ElementalAnalysisData[i], "Area");
|
|
|
- XRTableCellData_ElementAnalysis(row, tCell_s1, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ElementalAnalysisData[i], "s1");
|
|
|
- XRTableCellData_ElementAnalysis(row, tCell_s2, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ElementalAnalysisData[i], "s2");
|
|
|
- XRTableCellData_ElementAnalysis(row, tCell_s3, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ElementalAnalysisData[i], "s3");
|
|
|
- XRTableCellData_ElementAnalysis(row, tCell_s4, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ElementalAnalysisData[i], "s4");
|
|
|
- XRTableCellData_ElementAnalysis(row, tCell_s5, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ElementalAnalysisData[i], "s5");
|
|
|
- XRTableCellData_ElementAnalysis(row, tCell_s6, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ElementalAnalysisData[i], "s6");
|
|
|
- XRTableCellData_ElementAnalysis(row, tCell_s7, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ElementalAnalysisData[i], "s7");
|
|
|
- XRTableCellData_ElementAnalysis(row, tCell_s8, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ElementalAnalysisData[i], "s8");
|
|
|
- XRTableCellData_ElementAnalysis(row, tCell_s9, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ElementalAnalysisData[i], "s9");
|
|
|
- XRTableCellData_ElementAnalysis(row, tCell_s10, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ElementalAnalysisData[i], "s10");
|
|
|
+ XRTableCellData_ElementAnalysis(row, tCell_s1, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ElementalAnalysisData[i], "Data1");
|
|
|
+ XRTableCellData_ElementAnalysis(row, tCell_s2, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ElementalAnalysisData[i], "Data2");
|
|
|
+ XRTableCellData_ElementAnalysis(row, tCell_s3, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ElementalAnalysisData[i], "Data3");
|
|
|
+ XRTableCellData_ElementAnalysis(row, tCell_s4, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ElementalAnalysisData[i], "Data4");
|
|
|
+ XRTableCellData_ElementAnalysis(row, tCell_s5, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ElementalAnalysisData[i], "Data5");
|
|
|
+ XRTableCellData_ElementAnalysis(row, tCell_s6, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ElementalAnalysisData[i], "Data6");
|
|
|
+ XRTableCellData_ElementAnalysis(row, tCell_s7, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ElementalAnalysisData[i], "Data7");
|
|
|
+ XRTableCellData_ElementAnalysis(row, tCell_s8, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ElementalAnalysisData[i], "Data8");
|
|
|
+ XRTableCellData_ElementAnalysis(row, tCell_s9, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ElementalAnalysisData[i], "Data9");
|
|
|
+ XRTableCellData_ElementAnalysis(row, tCell_s10, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ElementalAnalysisData[i], "Data10");
|
|
|
xRTable.Rows.Add(row);
|
|
|
}
|
|
|
xRTable.LocationF = new PointF(10f, NeueStartposition);
|
|
|
@@ -1580,16 +1583,18 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
|
|
|
public void setElementAvgGrid()
|
|
|
{
|
|
|
ElementalAnalysis elementalAnalysis = new ElementalAnalysis();
|
|
|
-
|
|
|
+ //判断元素数量是否大于7
|
|
|
if (basicData.GetIsThereAMajorClassification())
|
|
|
{
|
|
|
+ //得到元素分析数据列表
|
|
|
List<DataTable> datas = elementalAnalysis.GetElementData(basicData, m_otsreport_export);
|
|
|
- add_SetElementAvgGridS(datas);
|
|
|
+ //动态创建表格形式并填充数据
|
|
|
+ Add_and_create_element_analysis_table_multi_element(datas);
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
List<DataTable> datas = elementalAnalysis.GetElementData(basicData, m_otsreport_export);
|
|
|
- add_SetElementAvgGrid(datas);
|
|
|
+ Add_and_create_element_analysis_table(datas);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -2018,7 +2023,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
|
|
|
/// 颗粒列表
|
|
|
/// </summary>
|
|
|
/// <param name="TemplateClass"></param>
|
|
|
- public void set_kllb_data()
|
|
|
+ public void set_Particle_List_data()
|
|
|
{
|
|
|
ParticleList particleList = new ParticleList();
|
|
|
ParticleListCreation particleListCreation = new ParticleListCreation();
|
|
|
@@ -2051,7 +2056,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
|
|
|
for (int a = 0; a < datas[i].Rows.Count; a++)
|
|
|
{
|
|
|
XRTable table = particleListCreation.add_XRTable(Schriftart_chinese);
|
|
|
- add_kllb(TemplateClass, datas[i], a, table);
|
|
|
+ add_Particle_List(TemplateClass, datas[i], a, table);
|
|
|
}
|
|
|
NeueStartposition = NeueStartposition + 10;
|
|
|
}
|
|
|
@@ -2061,7 +2066,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
|
|
|
/// 颗粒列表 帧图
|
|
|
/// </summary>
|
|
|
/// <param name="TemplateClass"></param>
|
|
|
- public void set_kllb_data_frame()
|
|
|
+ public void set_Particle_List_data_frame()
|
|
|
{
|
|
|
ParticleListCreation particleListCreation = new ParticleListCreation();
|
|
|
ParticleList particleList = new ParticleList();
|
|
|
@@ -2229,19 +2234,19 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
|
|
|
/// <summary>
|
|
|
/// 元素分析表向list中插入数据
|
|
|
/// </summary>
|
|
|
- /// <param name="classify"></param>
|
|
|
- /// <param name="subdivision"></param>
|
|
|
- /// <param name="area"></param>
|
|
|
- /// <param name="s1"></param>
|
|
|
- /// <param name="s2"></param>
|
|
|
- /// <param name="s3"></param>
|
|
|
- /// <param name="s4"></param>
|
|
|
- /// <param name="s5"></param>
|
|
|
- /// <param name="s6"></param>
|
|
|
- /// <param name="s7"></param>
|
|
|
- /// <param name="s8"></param>
|
|
|
- /// <param name="s9"></param>
|
|
|
- /// <param name="s10"></param>
|
|
|
+ /// <param name="classify">分组名称</param>
|
|
|
+ /// <param name="subdivision">颗粒条目名称</param>
|
|
|
+ /// <param name="area">面积</param>
|
|
|
+ /// <param name="s1">数据1</param>
|
|
|
+ /// <param name="s2">数据2</param>
|
|
|
+ /// <param name="s3">数据3</param>
|
|
|
+ /// <param name="s4">数据4</param>
|
|
|
+ /// <param name="s5">数据5</param>
|
|
|
+ /// <param name="s6">数据6</param>
|
|
|
+ /// <param name="s7">数据7</param>
|
|
|
+ /// <param name="s8">数据8</param>
|
|
|
+ /// <param name="s9">数据9</param>
|
|
|
+ /// <param name="s10">数据10</param>
|
|
|
/// <returns></returns>
|
|
|
private List<ElementalAnalysisDEVData> set_ElementalAnalysis(string classify, string subdivision, string area, string s1, string s2, string s3, string s4, string s5, string s6, string s7, string s8, string s9, string s10)
|
|
|
{
|
|
|
@@ -2251,16 +2256,16 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
|
|
|
classify = classify,
|
|
|
subdivision = subdivision,
|
|
|
Area = area,
|
|
|
- s1 = s1,
|
|
|
- s2 = s2,
|
|
|
- s3 = s3,
|
|
|
- s4 = s4,
|
|
|
- s5 = s5,
|
|
|
- s6 = s6,
|
|
|
- s7 = s7,
|
|
|
- s8 = s8,
|
|
|
- s9 = s9,
|
|
|
- s10 = s10
|
|
|
+ Data1 = s1,
|
|
|
+ Data2 = s2,
|
|
|
+ Data3 = s3,
|
|
|
+ Data4 = s4,
|
|
|
+ Data5 = s5,
|
|
|
+ Data6 = s6,
|
|
|
+ Data7 = s7,
|
|
|
+ Data8 = s8,
|
|
|
+ Data9 = s9,
|
|
|
+ Data10 = s10
|
|
|
});
|
|
|
return oTS_DEVs;
|
|
|
}
|
|
|
@@ -2272,16 +2277,16 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
|
|
|
{
|
|
|
subdivision = subdivision,
|
|
|
Area = area,
|
|
|
- s1 = s1,
|
|
|
- s2 = s2,
|
|
|
- s3 = s3,
|
|
|
- s4 = s4,
|
|
|
- s5 = s5,
|
|
|
- s6 = s6,
|
|
|
- s7 = s7,
|
|
|
- s8 = s8,
|
|
|
- s9 = s9,
|
|
|
- s10 = s10
|
|
|
+ Data1 = s1,
|
|
|
+ Data2 = s2,
|
|
|
+ Data3 = s3,
|
|
|
+ Data4 = s4,
|
|
|
+ Data5 = s5,
|
|
|
+ Data6 = s6,
|
|
|
+ Data7 = s7,
|
|
|
+ Data8 = s8,
|
|
|
+ Data9 = s9,
|
|
|
+ Data10 = s10
|
|
|
});
|
|
|
return oTS_DEVs;
|
|
|
}
|
|
|
@@ -2363,7 +2368,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
|
|
|
|
|
|
|
|
|
#region 颗粒列表
|
|
|
- private void add_kllb(c_TemplateClass TemplateClass, DataTable dataTable, int position, XRTable xRTable)
|
|
|
+ private void add_Particle_List(c_TemplateClass TemplateClass, DataTable dataTable, int position, XRTable xRTable)
|
|
|
{
|
|
|
XRTable table = new XRTable();
|
|
|
table = xRTable;
|
|
|
@@ -2447,9 +2452,21 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
|
|
|
|
|
|
public class ParticleSizeDEVData
|
|
|
{
|
|
|
+ /// <summary>
|
|
|
+ /// 分组名称
|
|
|
+ /// </summary>
|
|
|
public string size_Class { get; set; }
|
|
|
+ /// <summary>
|
|
|
+ /// 种类条目名称
|
|
|
+ /// </summary>
|
|
|
public string size_Name { get; set; }
|
|
|
+ /// <summary>
|
|
|
+ /// 数量
|
|
|
+ /// </summary>
|
|
|
public string size_total { get; set; }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
public string size_1 { get; set; }
|
|
|
public string size_2 { get; set; }
|
|
|
public string size_3 { get; set; }
|
|
|
@@ -2464,21 +2481,28 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
|
|
|
public string size_11 { get; set; }
|
|
|
public string size_12 { get; set; }
|
|
|
}
|
|
|
+ /// <summary>
|
|
|
+ /// 存储元素数据
|
|
|
+ /// </summary>
|
|
|
public class ElementalAnalysisDEVData
|
|
|
{
|
|
|
+ //分组名称
|
|
|
public string classify { get; set; }
|
|
|
+ //种类条目名称
|
|
|
public string subdivision { get; set; }
|
|
|
+ //面积
|
|
|
public string Area { get; set; }
|
|
|
- public string s1 { get; set; }
|
|
|
- public string s2 { get; set; }
|
|
|
- public string s3 { get; set; }
|
|
|
- public string s4 { get; set; }
|
|
|
- public string s5 { get; set; }
|
|
|
- public string s6 { get; set; }
|
|
|
- public string s7 { get; set; }
|
|
|
- public string s8 { get; set; }
|
|
|
- public string s9 { get; set; }
|
|
|
- public string s10 { get; set; }
|
|
|
+
|
|
|
+ public string Data1 { get; set; }
|
|
|
+ public string Data2 { get; set; }
|
|
|
+ public string Data3 { get; set; }
|
|
|
+ public string Data4 { get; set; }
|
|
|
+ public string Data5 { get; set; }
|
|
|
+ public string Data6 { get; set; }
|
|
|
+ public string Data7 { get; set; }
|
|
|
+ public string Data8 { get; set; }
|
|
|
+ public string Data9 { get; set; }
|
|
|
+ public string Data10 { get; set; }
|
|
|
}
|
|
|
public class AreaOfInclusionDEVData
|
|
|
{
|
zhangjiaxin