|
|
@@ -228,13 +228,40 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
|
|
|
xrChart_ParticelSizeCalss.Visible = true;
|
|
|
xrChart_ParticelSizeSubdivision.Visible = true;
|
|
|
List<List<ParticleSizeDEVData>> list_ParticelSizeData = new List<List<ParticleSizeDEVData>>();
|
|
|
-
|
|
|
|
|
|
+ List<List<string>> llstr = new List<List<string>>();
|
|
|
+ for (int i = 0; i < CompositeData[1].Rows.Count; i++)
|
|
|
+ {
|
|
|
+ List<string> strings = new List<string>();
|
|
|
+ for (int a = 0; a < CompositeData[1].Columns.Count - 4; a++)
|
|
|
+ {
|
|
|
+ strings.Add(CompositeData[1].Rows[i][a].ToString());
|
|
|
+ }
|
|
|
+ llstr.Add(strings);
|
|
|
+ }
|
|
|
+ List<List<string>> llwrite = new List<List<string>>();
|
|
|
+ for (int i = 0; i < llstr.Count; i++)
|
|
|
+ {
|
|
|
+ List<string> strings = new List<string>();
|
|
|
+ for (int a = 0; a < 12; a++)
|
|
|
+ {
|
|
|
+ if (llstr[i].Count <= a)
|
|
|
+ {
|
|
|
+ strings.Add("0");
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ strings.Add(llstr[i][a]);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ llwrite.Add(strings);
|
|
|
+ }
|
|
|
|
|
|
for (int i = 0; i < CompositeData[1].Rows.Count; i++)
|
|
|
{
|
|
|
- list_ParticelSizeData.Add(switch_ParticleSize(subscript.Getsubscriptstring(CompositeData[1].Rows[i]["Class"].ToString()), subscript.Getsubscriptstring(CompositeData[1].Rows[i]["Name"].ToString()), CompositeData[1].Rows[i]["total"].ToString(), CompositeData[1].Rows[i]["c1"].ToString(), CompositeData[1].Rows[i]["c2"].ToString(), CompositeData[1].Rows[i]["c3"].ToString(),
|
|
|
- CompositeData[1].Rows[i]["c4"].ToString(), CompositeData[1].Rows[i]["c5"].ToString(), CompositeData[1].Rows[i]["c6"].ToString(), CompositeData[1].Rows[i]["c7"].ToString()));
|
|
|
+ list_ParticelSizeData.Add(switch_ParticleSize(subscript.Getsubscriptstring(CompositeData[1].Rows[i]["Class"].ToString()), subscript.Getsubscriptstring(CompositeData[1].Rows[i]["Name"].ToString()), CompositeData[1].Rows[i]["total"].ToString(),
|
|
|
+ llwrite[i][0], llwrite[i][1], llwrite[i][2],llwrite[i][3],llwrite[i][4],llwrite[i][5],llwrite[i][6],
|
|
|
+ llwrite[i][7], llwrite[i][8], llwrite[i][9], llwrite[i][10], llwrite[i][11]));
|
|
|
}
|
|
|
setXRLabelData(xrTa_ParticleSizeTable.Rows[2].Cells[0], GetlanguageData("dev_classify", "分类"));//分类
|
|
|
setXRLabelData(xrTa_ParticleSizeTable.Rows[2].Cells[1], GetlanguageData("dev_subdivision", "二级分类"));//二级分类（子分类）
|
|
|
@@ -250,13 +277,17 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
|
|
|
xrTa_ParticleSizeTable.Rows[2].Cells[1].Font = new Font(Schriftart_chinese, xrTa_ParticleSizeTable.Rows[2].Cells[1].Font.Size);
|
|
|
//dev_quantity.Text = "数量";
|
|
|
xrTa_ParticleSizeTable.Rows[2].Cells[2].Font = new Font(Schriftart_chinese, xrTa_ParticleSizeTable.Rows[2].Cells[2].Font.Size);
|
|
|
- xrTa_ParticleSizeTable.Rows[2].Cells[3].Text = CompositeData[0].Rows[0]["c1"].ToString();
|
|
|
- xrTa_ParticleSizeTable.Rows[2].Cells[4].Text = CompositeData[0].Rows[0]["c2"].ToString();
|
|
|
- xrTa_ParticleSizeTable.Rows[2].Cells[5].Text = CompositeData[0].Rows[0]["c3"].ToString();
|
|
|
- xrTa_ParticleSizeTable.Rows[2].Cells[6].Text = CompositeData[0].Rows[0]["c4"].ToString();
|
|
|
- xrTa_ParticleSizeTable.Rows[2].Cells[7].Text = CompositeData[0].Rows[0]["c5"].ToString();
|
|
|
- xrTa_ParticleSizeTable.Rows[2].Cells[8].Text = CompositeData[0].Rows[0]["c6"].ToString();
|
|
|
- xrTa_ParticleSizeTable.Rows[2].Cells[9].Text = CompositeData[0].Rows[0]["c7"].ToString();
|
|
|
+ for (int i=0;i< CompositeData[0].Columns.Count;i++)
|
|
|
+ {
|
|
|
+ xrTa_ParticleSizeTable.Rows[2].Cells[i+3].Text = CompositeData[0].Rows[0]["c"+(i+1).ToString()].ToString();
|
|
|
+ }
|
|
|
+ //xrTa_ParticleSizeTable.Rows[2].Cells[3].Text = CompositeData[0].Rows[0]["c1"].ToString();
|
|
|
+ //xrTa_ParticleSizeTable.Rows[2].Cells[4].Text = CompositeData[0].Rows[0]["c2"].ToString();
|
|
|
+ //xrTa_ParticleSizeTable.Rows[2].Cells[5].Text = CompositeData[0].Rows[0]["c3"].ToString();
|
|
|
+ //xrTa_ParticleSizeTable.Rows[2].Cells[6].Text = CompositeData[0].Rows[0]["c4"].ToString();
|
|
|
+ //xrTa_ParticleSizeTable.Rows[2].Cells[7].Text = CompositeData[0].Rows[0]["c5"].ToString();
|
|
|
+ //xrTa_ParticleSizeTable.Rows[2].Cells[8].Text = CompositeData[0].Rows[0]["c6"].ToString();
|
|
|
+ //xrTa_ParticleSizeTable.Rows[2].Cells[9].Text = CompositeData[0].Rows[0]["c7"].ToString();
|
|
|
xrTa_ParticleSizeTable.Rows[1].Cells[0].TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
|
|
|
xrTa_ParticleSizeTable.Rows[1].Cells[0].Text = xrTa_ParticleSizeTable.Rows[1].Cells[0].Text + ComputeModeName + "(μm)";
|
|
|
xrTa_ParticleSizeTable.Rows[1].Cells[0].Font = new Font(Schriftart_chinese, xrTa_ParticleSizeTable.Rows[1].Cells[0].Font.Size);
|
|
|
@@ -274,6 +305,14 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
|
|
|
XRTableCell tCell_size_5 = new XRTableCell();
|
|
|
XRTableCell tCell_size_6 = new XRTableCell();
|
|
|
XRTableCell tCell_size_7 = new XRTableCell();
|
|
|
+
|
|
|
+ XRTableCell tCell_size_8 = new XRTableCell();
|
|
|
+ XRTableCell tCell_size_9 = new XRTableCell();
|
|
|
+ XRTableCell tCell_size_10 = new XRTableCell();
|
|
|
+ XRTableCell tCell_size_11 = new XRTableCell();
|
|
|
+ XRTableCell tCell_size_12 = new XRTableCell();
|
|
|
+
|
|
|
+
|
|
|
tCell_Class.WidthF = xrTa_ParticleSizeTable.Rows[2].Cells[0].WidthF;
|
|
|
tCell_Name.WidthF = xrTa_ParticleSizeTable.Rows[2].Cells[1].WidthF;
|
|
|
tCell_total.WidthF = xrTa_ParticleSizeTable.Rows[2].Cells[2].WidthF;
|
|
|
@@ -285,6 +324,12 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
|
|
|
tCell_size_6.WidthF = xrTa_ParticleSizeTable.Rows[2].Cells[8].WidthF;
|
|
|
tCell_size_7.WidthF = xrTa_ParticleSizeTable.Rows[2].Cells[9].WidthF;
|
|
|
|
|
|
+ tCell_size_8.WidthF = xrTa_ParticleSizeTable.Rows[2].Cells[10].WidthF;
|
|
|
+ tCell_size_9.WidthF = xrTa_ParticleSizeTable.Rows[2].Cells[11].WidthF;
|
|
|
+ tCell_size_10.WidthF = xrTa_ParticleSizeTable.Rows[2].Cells[12].WidthF;
|
|
|
+ tCell_size_11.WidthF = xrTa_ParticleSizeTable.Rows[2].Cells[13].WidthF;
|
|
|
+ tCell_size_12.WidthF = xrTa_ParticleSizeTable.Rows[2].Cells[14].WidthF;
|
|
|
+
|
|
|
XRTableCellData(row, tCell_Class, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ParticelSizeData[i], "size_Class");
|
|
|
XRTableCellData(row, tCell_Name, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ParticelSizeData[i], "size_Name");
|
|
|
XRTableCellData(row, tCell_total, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ParticelSizeData[i], "size_total");
|
|
|
@@ -295,6 +340,12 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
|
|
|
XRTableCellData(row, tCell_size_5, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ParticelSizeData[i], "size_5");
|
|
|
XRTableCellData(row, tCell_size_6, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ParticelSizeData[i], "size_6");
|
|
|
XRTableCellData(row, tCell_size_7, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ParticelSizeData[i], "size_7");
|
|
|
+
|
|
|
+ XRTableCellData(row, tCell_size_8, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ParticelSizeData[i], "size_8");
|
|
|
+ XRTableCellData(row, tCell_size_9, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ParticelSizeData[i], "size_9");
|
|
|
+ XRTableCellData(row, tCell_size_10, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ParticelSizeData[i], "size_10");
|
|
|
+ XRTableCellData(row, tCell_size_11, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ParticelSizeData[i], "size_11");
|
|
|
+ XRTableCellData(row, tCell_size_12, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ParticelSizeData[i], "size_12");
|
|
|
xrTa_ParticleSizeTable.Rows.Add(row);
|
|
|
|
|
|
if (CompositeData[1].Rows[i]["Name"].ToString()!="")
|
|
|
@@ -310,28 +361,22 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
|
|
|
|
|
|
XRTable xrTable3 = add_particleSizeS_end();
|
|
|
xrTable3.LocationF = new PointF(10f, xrTa_ParticleSizeTable.LocationF.Y + xrTa_ParticleSizeTable.HeightF);
|
|
|
-
|
|
|
+
|
|
|
List<int> vs = new List<int>();
|
|
|
- vs.Add(0);
|
|
|
- vs.Add(0);
|
|
|
- vs.Add(0);
|
|
|
- vs.Add(0);
|
|
|
- vs.Add(0);
|
|
|
- vs.Add(0);
|
|
|
- vs.Add(0);
|
|
|
- vs.Add(0);
|
|
|
- vs.Add(0);
|
|
|
- vs.Add(0);
|
|
|
-
|
|
|
+ for (int i = 0; i < surface_dt2.Columns.Count - 4; i++)
|
|
|
+ {
|
|
|
+ vs.Add(0);
|
|
|
+ }
|
|
|
+
|
|
|
for (int i = 0; i < surface_dt2.Rows.Count; i++)
|
|
|
{
|
|
|
- for (int a = 1; a < 10; a++)
|
|
|
+ for (int a = 0; a < CompositeData[0].Columns.Count; a++)
|
|
|
{
|
|
|
- if (surface_dt2.Rows[i]["c" + a.ToString()] != " " && surface_dt2.Rows[i]["c" + a.ToString()] != "" && surface_dt2.Rows[i]["c" + a.ToString()] != null)
|
|
|
+ if ( surface_dt2.Rows[i]["c" + (a+1).ToString()] != null)
|
|
|
{
|
|
|
- bool isNumeric = double.TryParse(surface_dt2.Rows[i]["c" + a.ToString()].ToString(), out double result);
|
|
|
+ bool isNumeric = double.TryParse(surface_dt2.Rows[i]["c" + (a + 1).ToString()].ToString(), out double result);
|
|
|
if (isNumeric)
|
|
|
- vs[a - 1] += Convert.ToInt32(result);
|
|
|
+ vs[a] += Convert.ToInt32(result);
|
|
|
}
|
|
|
}
|
|
|
//total += Convert.ToInt32(surface_dt2.Rows[i]["total"]);
|
|
|
@@ -341,20 +386,27 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
|
|
|
xrTable3.Rows[0].Cells[0].TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
|
|
|
xrTable3.Rows[0].Cells[1].Text = total.ToString();
|
|
|
xrTable3.Rows[0].Cells[1].TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
|
|
|
- xrTable3.Rows[0].Cells[2].Text = vs[0].ToString();
|
|
|
- xrTable3.Rows[0].Cells[2].TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
|
|
|
- xrTable3.Rows[0].Cells[3].Text = vs[1].ToString();
|
|
|
- xrTable3.Rows[0].Cells[3].TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
|
|
|
- xrTable3.Rows[0].Cells[4].Text = vs[2].ToString();
|
|
|
- xrTable3.Rows[0].Cells[4].TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
|
|
|
- xrTable3.Rows[0].Cells[5].Text = vs[3].ToString();
|
|
|
- xrTable3.Rows[0].Cells[5].TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
|
|
|
- xrTable3.Rows[0].Cells[6].Text = vs[4].ToString();
|
|
|
- xrTable3.Rows[0].Cells[6].TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
|
|
|
- xrTable3.Rows[0].Cells[7].Text = vs[5].ToString();
|
|
|
- xrTable3.Rows[0].Cells[7].TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
|
|
|
- xrTable3.Rows[0].Cells[8].Text = vs[6].ToString();
|
|
|
- xrTable3.Rows[0].Cells[8].TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
|
|
|
+
|
|
|
+ for(int i=0;i< vs.Count;i++)
|
|
|
+ {
|
|
|
+ xrTable3.Rows[0].Cells[i+2].Text = vs[i].ToString();
|
|
|
+ xrTable3.Rows[0].Cells[i + 2].TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
|
|
|
+ }
|
|
|
+
|
|
|
+ //xrTable3.Rows[0].Cells[2].Text = vs[0].ToString();
|
|
|
+ //xrTable3.Rows[0].Cells[2].TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
|
|
|
+ //xrTable3.Rows[0].Cells[3].Text = vs[1].ToString();
|
|
|
+ //xrTable3.Rows[0].Cells[3].TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
|
|
|
+ //xrTable3.Rows[0].Cells[4].Text = vs[2].ToString();
|
|
|
+ //xrTable3.Rows[0].Cells[4].TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
|
|
|
+ //xrTable3.Rows[0].Cells[5].Text = vs[3].ToString();
|
|
|
+ //xrTable3.Rows[0].Cells[5].TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
|
|
|
+ //xrTable3.Rows[0].Cells[6].Text = vs[4].ToString();
|
|
|
+ //xrTable3.Rows[0].Cells[6].TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
|
|
|
+ //xrTable3.Rows[0].Cells[7].Text = vs[5].ToString();
|
|
|
+ //xrTable3.Rows[0].Cells[7].TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
|
|
|
+ //xrTable3.Rows[0].Cells[8].Text = vs[6].ToString();
|
|
|
+ //xrTable3.Rows[0].Cells[8].TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
|
|
|
NeueStartposition = xrTable3.LocationF.Y + xrTable3.SizeF.Height + 1;
|
|
|
|
|
|
this.Detail.Controls.Add(xrTable3);
|
|
|
@@ -368,17 +420,54 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
|
|
|
xrChart_ParticelSizeCalss.Visible = true;
|
|
|
xrChart_ParticelSizeSubdivision.Visible = true;
|
|
|
List<List<ParticleSizeDEVData>> list_ParticelSizeData = new List<List<ParticleSizeDEVData>>();
|
|
|
- int ls = 0;
|
|
|
+ //int ls = 0;
|
|
|
DataTable REORDER_data = REORDER(surface_dt2, "TypeId");
|
|
|
+
|
|
|
+ List<List<string>> llstr = new List<List<string>>();
|
|
|
+ for (int i=0;i< REORDER_data.Rows.Count;i++)
|
|
|
+ {
|
|
|
+ if (REORDER_data.Rows[i]["Name"].ToString() == "" || REORDER_data.Rows[i]["Name"].ToString() == null)
|
|
|
+ {
|
|
|
+ //ls = i;
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+
|
|
|
+ List<string> strings = new List<string>();
|
|
|
+ for (int a = 0; a < REORDER_data.Columns.Count - 4; a++)
|
|
|
+ {
|
|
|
+ strings.Add(REORDER_data.Rows[i][a].ToString());
|
|
|
+ }
|
|
|
+ llstr.Add(strings);
|
|
|
+ }
|
|
|
+ List<List<string>> llwrite = new List<List<string>>();
|
|
|
+ for (int i=0;i< llstr.Count;i++)
|
|
|
+ {
|
|
|
+ List<string> strings = new List<string>();
|
|
|
+ for (int a = 0; a < 12; a++)
|
|
|
+ {
|
|
|
+ if (llstr[i].Count <= a)
|
|
|
+ {
|
|
|
+ strings.Add("0");
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ strings.Add(llstr[i][a]);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ llwrite.Add(strings);
|
|
|
+ }
|
|
|
+
|
|
|
for (int i = 0; i < REORDER_data.Rows.Count; i++)
|
|
|
{
|
|
|
if (REORDER_data.Rows[i]["Name"].ToString() == "" || REORDER_data.Rows[i]["Name"].ToString() == null)
|
|
|
{
|
|
|
- ls = i;
|
|
|
+ //ls = i;
|
|
|
continue;
|
|
|
}
|
|
|
- list_ParticelSizeData.Add(switch_ParticleSize(subscript.Getsubscriptstring(REORDER_data.Rows[i]["Class"].ToString()), subscript.Getsubscriptstring(REORDER_data.Rows[i]["Name"].ToString()), REORDER_data.Rows[i]["total"].ToString(), REORDER_data.Rows[i]["c1"].ToString(), REORDER_data.Rows[i]["c2"].ToString(), REORDER_data.Rows[i]["c3"].ToString(),
|
|
|
- REORDER_data.Rows[i]["c4"].ToString(), REORDER_data.Rows[i]["c5"].ToString(), REORDER_data.Rows[i]["c6"].ToString(), REORDER_data.Rows[i]["c7"].ToString()));
|
|
|
+ list_ParticelSizeData.Add(switch_ParticleSize(subscript.Getsubscriptstring(REORDER_data.Rows[i]["Class"].ToString()), subscript.Getsubscriptstring(REORDER_data.Rows[i]["Name"].ToString()), REORDER_data.Rows[i]["total"].ToString(),
|
|
|
+ llwrite[i][0], llwrite[i][1], llwrite[i][2],llwrite[i][3], llwrite[i][4],
|
|
|
+ llwrite[i][5], llwrite[i][6], llwrite[i][7], llwrite[i][8], llwrite[i][9],
|
|
|
+ llwrite[i][10], llwrite[i][11]));
|
|
|
}
|
|
|
|
|
|
setXRLabelData(xrTa_ParticleSizeTable.Rows[2].Cells[0], GetlanguageData("dev_classify", "分类"));//二级分类（子分类）
|
|
|
@@ -391,13 +480,17 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
|
|
|
xrTa_ParticleSizeTable.Rows[2].Cells[0].Font = new Font(Schriftart_chinese, xrTa_ParticleSizeTable.Rows[2].Cells[0].Font.Size);
|
|
|
//dev_quantity.Text = "数量";
|
|
|
xrTa_ParticleSizeTable.Rows[2].Cells[1].Font = new Font(Schriftart_chinese, xrTa_ParticleSizeTable.Rows[2].Cells[1].Font.Size);
|
|
|
- xrTa_ParticleSizeTable.Rows[2].Cells[2].Text = CompositeData[0].Rows[0]["c1"].ToString();
|
|
|
- xrTa_ParticleSizeTable.Rows[2].Cells[3].Text = CompositeData[0].Rows[0]["c2"].ToString();
|
|
|
- xrTa_ParticleSizeTable.Rows[2].Cells[4].Text = CompositeData[0].Rows[0]["c3"].ToString();
|
|
|
- xrTa_ParticleSizeTable.Rows[2].Cells[5].Text = CompositeData[0].Rows[0]["c4"].ToString();
|
|
|
- xrTa_ParticleSizeTable.Rows[2].Cells[6].Text = CompositeData[0].Rows[0]["c5"].ToString();
|
|
|
- xrTa_ParticleSizeTable.Rows[2].Cells[7].Text = CompositeData[0].Rows[0]["c6"].ToString();
|
|
|
- xrTa_ParticleSizeTable.Rows[2].Cells[8].Text = CompositeData[0].Rows[0]["c7"].ToString();
|
|
|
+ for(int i=0;i< CompositeData[0].Columns.Count;i++)
|
|
|
+ {
|
|
|
+ xrTa_ParticleSizeTable.Rows[2].Cells[i+2].Text= CompositeData[0].Rows[0]["c"+(i+1).ToString()].ToString();
|
|
|
+ }
|
|
|
+ //xrTa_ParticleSizeTable.Rows[2].Cells[2].Text = CompositeData[0].Rows[0]["c1"].ToString();
|
|
|
+ //xrTa_ParticleSizeTable.Rows[2].Cells[3].Text = CompositeData[0].Rows[0]["c2"].ToString();
|
|
|
+ //xrTa_ParticleSizeTable.Rows[2].Cells[4].Text = CompositeData[0].Rows[0]["c3"].ToString();
|
|
|
+ //xrTa_ParticleSizeTable.Rows[2].Cells[5].Text = CompositeData[0].Rows[0]["c4"].ToString();
|
|
|
+ //xrTa_ParticleSizeTable.Rows[2].Cells[6].Text = CompositeData[0].Rows[0]["c5"].ToString();
|
|
|
+ //xrTa_ParticleSizeTable.Rows[2].Cells[7].Text = CompositeData[0].Rows[0]["c6"].ToString();
|
|
|
+ //xrTa_ParticleSizeTable.Rows[2].Cells[8].Text = CompositeData[0].Rows[0]["c7"].ToString();
|
|
|
xrTa_ParticleSizeTable.Rows[1].Cells[0].TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
|
|
|
xrTa_ParticleSizeTable.Rows[1].Cells[0].Text = xrTa_ParticleSizeTable.Rows[1].Cells[0].Text + ComputeModeName + "(μm)";
|
|
|
xrTa_ParticleSizeTable.Rows[1].Cells[0].Font = new Font(Schriftart_chinese, xrTa_ParticleSizeTable.Rows[1].Cells[0].Font.Size);
|
|
|
@@ -415,7 +508,14 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
|
|
|
XRTableCell tCell_size_5 = new XRTableCell();
|
|
|
XRTableCell tCell_size_6 = new XRTableCell();
|
|
|
XRTableCell tCell_size_7 = new XRTableCell();
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
+ XRTableCell tCell_size_8 = new XRTableCell();
|
|
|
+ XRTableCell tCell_size_9 = new XRTableCell();
|
|
|
+ XRTableCell tCell_size_10 = new XRTableCell();
|
|
|
+ XRTableCell tCell_size_11 = new XRTableCell();
|
|
|
+ XRTableCell tCell_size_12 = new XRTableCell();
|
|
|
+
|
|
|
tCell_Name.WidthF = xrTa_ParticleSizeTable.Rows[2].Cells[0].WidthF;
|
|
|
tCell_total.WidthF = xrTa_ParticleSizeTable.Rows[2].Cells[1].WidthF;
|
|
|
tCell_size_1.WidthF = xrTa_ParticleSizeTable.Rows[2].Cells[2].WidthF;
|
|
|
@@ -426,7 +526,11 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
|
|
|
tCell_size_6.WidthF = xrTa_ParticleSizeTable.Rows[2].Cells[7].WidthF;
|
|
|
tCell_size_7.WidthF = xrTa_ParticleSizeTable.Rows[2].Cells[8].WidthF;
|
|
|
|
|
|
-
|
|
|
+ tCell_size_8.WidthF = xrTa_ParticleSizeTable.Rows[2].Cells[9].WidthF;
|
|
|
+ tCell_size_9.WidthF = xrTa_ParticleSizeTable.Rows[2].Cells[10].WidthF;
|
|
|
+ tCell_size_10.WidthF = xrTa_ParticleSizeTable.Rows[2].Cells[11].WidthF;
|
|
|
+ tCell_size_11.WidthF = xrTa_ParticleSizeTable.Rows[2].Cells[12].WidthF;
|
|
|
+ tCell_size_12.WidthF = xrTa_ParticleSizeTable.Rows[2].Cells[13].WidthF;
|
|
|
XRTableCellData(row, tCell_Name, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ParticelSizeData[i], "size_Name");
|
|
|
XRTableCellData(row, tCell_total, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ParticelSizeData[i], "size_total");
|
|
|
XRTableCellData(row, tCell_size_1, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ParticelSizeData[i], "size_1");
|
|
|
@@ -436,6 +540,12 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
|
|
|
XRTableCellData(row, tCell_size_5, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ParticelSizeData[i], "size_5");
|
|
|
XRTableCellData(row, tCell_size_6, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ParticelSizeData[i], "size_6");
|
|
|
XRTableCellData(row, tCell_size_7, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ParticelSizeData[i], "size_7");
|
|
|
+
|
|
|
+ XRTableCellData(row, tCell_size_8, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ParticelSizeData[i], "size_8");
|
|
|
+ XRTableCellData(row, tCell_size_9, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ParticelSizeData[i], "size_9");
|
|
|
+ XRTableCellData(row, tCell_size_10, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ParticelSizeData[i], "size_10");
|
|
|
+ XRTableCellData(row, tCell_size_11, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ParticelSizeData[i], "size_11");
|
|
|
+ XRTableCellData(row, tCell_size_12, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ParticelSizeData[i], "size_12");
|
|
|
xrTa_ParticleSizeTable.Rows.Add(row);
|
|
|
|
|
|
}
|
|
|
@@ -446,26 +556,21 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
|
|
|
xrTable3.LocationF = new PointF(10f, xrTa_ParticleSizeTable.LocationF.Y + xrTa_ParticleSizeTable.HeightF);
|
|
|
|
|
|
List<int> vs = new List<int>();
|
|
|
- vs.Add(0);
|
|
|
- vs.Add(0);
|
|
|
- vs.Add(0);
|
|
|
- vs.Add(0);
|
|
|
- vs.Add(0);
|
|
|
- vs.Add(0);
|
|
|
- vs.Add(0);
|
|
|
- vs.Add(0);
|
|
|
- vs.Add(0);
|
|
|
- vs.Add(0);
|
|
|
+ for(int i=0;i< surface_dt2.Columns.Count - 4;i++)
|
|
|
+ {
|
|
|
+ vs.Add(0);
|
|
|
+ }
|
|
|
int total = 0;
|
|
|
for (int i = 0; i < surface_dt2.Rows.Count; i++)
|
|
|
{
|
|
|
- for (int a = 1; a < 10; a++)
|
|
|
+
|
|
|
+ for (int a = 0; a < surface_dt2.Columns.Count-4; a++)
|
|
|
{
|
|
|
- if (surface_dt2.Rows[i]["c" + a.ToString()] != " " && surface_dt2.Rows[i]["c" + a.ToString()] != "" && surface_dt2.Rows[i]["c" + a.ToString()] != null)
|
|
|
+ if (surface_dt2.Rows[i][a] != " " && surface_dt2.Rows[i][a] != null)
|
|
|
{
|
|
|
- bool isNumeric = double.TryParse(surface_dt2.Rows[i]["c" + a.ToString()].ToString(), out double result);
|
|
|
+ bool isNumeric = double.TryParse(surface_dt2.Rows[i][a].ToString(), out double result);
|
|
|
if (isNumeric)
|
|
|
- vs[a - 1] += Convert.ToInt32(result);
|
|
|
+ vs[a] += Convert.ToInt32(result);
|
|
|
}
|
|
|
}
|
|
|
total += Convert.ToInt32(surface_dt2.Rows[i]["total"]);
|
|
|
@@ -476,20 +581,27 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
|
|
|
xrTable3.Rows[0].Cells[0].TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
|
|
|
xrTable3.Rows[0].Cells[1].Text = total.ToString();
|
|
|
xrTable3.Rows[0].Cells[1].TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
|
|
|
- xrTable3.Rows[0].Cells[2].Text = vs[0].ToString();
|
|
|
- xrTable3.Rows[0].Cells[2].TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
|
|
|
- xrTable3.Rows[0].Cells[3].Text = vs[1].ToString();
|
|
|
- xrTable3.Rows[0].Cells[3].TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
|
|
|
- xrTable3.Rows[0].Cells[4].Text = vs[2].ToString();
|
|
|
- xrTable3.Rows[0].Cells[4].TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
|
|
|
- xrTable3.Rows[0].Cells[5].Text = vs[3].ToString();
|
|
|
- xrTable3.Rows[0].Cells[5].TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
|
|
|
- xrTable3.Rows[0].Cells[6].Text = vs[4].ToString();
|
|
|
- xrTable3.Rows[0].Cells[6].TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
|
|
|
- xrTable3.Rows[0].Cells[7].Text = vs[5].ToString();
|
|
|
- xrTable3.Rows[0].Cells[7].TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
|
|
|
- xrTable3.Rows[0].Cells[8].Text = vs[6].ToString();
|
|
|
- xrTable3.Rows[0].Cells[8].TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
|
|
|
+ for (int i=0;i< vs.Count; i++)
|
|
|
+ {
|
|
|
+ xrTable3.Rows[0].Cells[i+2].Text = vs[i].ToString();
|
|
|
+ xrTable3.Rows[0].Cells[i + 2].TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ //xrTable3.Rows[0].Cells[2].Text = vs[0].ToString();
|
|
|
+ //xrTable3.Rows[0].Cells[2].TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
|
|
|
+ //xrTable3.Rows[0].Cells[3].Text = vs[1].ToString();
|
|
|
+ //xrTable3.Rows[0].Cells[3].TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
|
|
|
+ //xrTable3.Rows[0].Cells[4].Text = vs[2].ToString();
|
|
|
+ //xrTable3.Rows[0].Cells[4].TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
|
|
|
+ //xrTable3.Rows[0].Cells[5].Text = vs[3].ToString();
|
|
|
+ //xrTable3.Rows[0].Cells[5].TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
|
|
|
+ //xrTable3.Rows[0].Cells[6].Text = vs[4].ToString();
|
|
|
+ //xrTable3.Rows[0].Cells[6].TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
|
|
|
+ //xrTable3.Rows[0].Cells[7].Text = vs[5].ToString();
|
|
|
+ //xrTable3.Rows[0].Cells[7].TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
|
|
|
+ //xrTable3.Rows[0].Cells[8].Text = vs[6].ToString();
|
|
|
+ //xrTable3.Rows[0].Cells[8].TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
|
|
|
NeueStartposition = xrTable3.LocationF.Y + xrTable3.SizeF.Height + 1;
|
|
|
|
|
|
this.Detail.Controls.Add(xrTable3);
|
|
|
@@ -525,15 +637,6 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- //for (int i=0;i< dataTable.Rows.Count;i++)
|
|
|
- //{
|
|
|
- // if (!string.IsNullOrWhiteSpace(dataTable.Rows[i]["Name"].ToString()))
|
|
|
- // {
|
|
|
- // dataTable.Rows[i].Delete();
|
|
|
- // }
|
|
|
- //}
|
|
|
-
|
|
|
- //dataTable.AcceptChanges();
|
|
|
DataTable dt = dataTable.Clone();
|
|
|
for (int i=0;i< dataTable.Rows.Count;i++)
|
|
|
{
|
|
|
@@ -894,15 +997,12 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
|
|
|
if (subdivdeData.Rows[i]["Name"].ToString() != "")
|
|
|
{
|
|
|
DataRow dr = surface_dt2.NewRow();
|
|
|
- dr["c1"] = subdivdeData.Rows[i]["c1"];
|
|
|
- dr["c2"] = subdivdeData.Rows[i]["c2"];
|
|
|
- dr["c3"] = subdivdeData.Rows[i]["c3"];
|
|
|
- dr["c4"] = subdivdeData.Rows[i]["c4"];
|
|
|
- dr["c5"] = subdivdeData.Rows[i]["c5"];
|
|
|
- dr["c6"] = subdivdeData.Rows[i]["c6"];
|
|
|
- dr["c7"] = subdivdeData.Rows[i]["c7"];
|
|
|
- dr["c8"] = subdivdeData.Rows[i]["c8"];
|
|
|
- dr["c9"] = subdivdeData.Rows[i]["c9"];
|
|
|
+ List<string> colid = basicData.GetParticlesizeTable();
|
|
|
+ for (int a=0;a< colid.Count;a++)
|
|
|
+ {
|
|
|
+ dr["c"+(a+1).ToString()] = subdivdeData.Rows[i]["c" + (a + 1).ToString()];
|
|
|
+ }
|
|
|
+
|
|
|
dr["Name"] = subdivdeData.Rows[i]["Name"];
|
|
|
dr["total"] = subdivdeData.Rows[i]["total"];
|
|
|
dr["Class"] = subdivdeData.Rows[i]["Class"];
|
|
|
@@ -1064,7 +1164,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
|
|
|
dt.Columns.Add("num");
|
|
|
for (int i = 0; i < dataTable.Rows.Count; i++)
|
|
|
{
|
|
|
- for (int a = 0; a < 10; a++)
|
|
|
+ for (int a = 0; a < TypeRange.Columns.Count; a++)
|
|
|
{
|
|
|
if (string.IsNullOrEmpty(TypeRange.Rows[0][a].ToString()))
|
|
|
continue;
|
|
|
@@ -1222,9 +1322,6 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
|
|
|
continue;
|
|
|
}
|
|
|
}
|
|
|
- //REORDER_data.Rows[ls].Delete();
|
|
|
- //REORDER_data.AcceptChanges();
|
|
|
-
|
|
|
|
|
|
|
|
|
List<List<ElementalAnalysisDEVData>> list_ElementalAnalysisData = new List<List<ElementalAnalysisDEVData>>();
|
|
|
@@ -1320,17 +1417,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
|
|
|
|
|
|
string name = "";
|
|
|
string notes = "";
|
|
|
- //for (int i=0;i< a_data.Rows.Count;i++)
|
|
|
- //{
|
|
|
- // if (languageData.Rows[i]["Name"].ToString()== "tCell_Name")
|
|
|
- // {
|
|
|
- // name = languageData.Rows[i]["Text"].ToString();
|
|
|
- // }
|
|
|
- // if (languageData.Rows[i]["Name"].ToString() == "tCell_Notes")
|
|
|
- // {
|
|
|
- // notes = languageData.Rows[i]["Text"].ToString();
|
|
|
- // }
|
|
|
- //}
|
|
|
+
|
|
|
|
|
|
name = GetlanguageData("tcell_name", "特征/夹杂物指数");
|
|
|
notes = GetlanguageData("tcell_notes", "夹杂物指数=夹杂物面积/扫描面积*比例因子");
|
|
|
@@ -1834,7 +1921,10 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
|
|
|
/// <param name="size_6"></param>
|
|
|
/// <param name="size_7"></param>
|
|
|
/// <returns></returns>
|
|
|
- private List<ParticleSizeDEVData> switch_ParticleSize(string Class, string Name, string total, string size_1, string size_2, string size_3, string size_4, string size_5, string size_6, string size_7)
|
|
|
+ private List<ParticleSizeDEVData> switch_ParticleSize(string Class, string Name,
|
|
|
+ string total, string size_1, string size_2, string size_3, string size_4, string size_5,
|
|
|
+ string size_6, string size_7, string size_8, string size_9, string size_10, string size_11
|
|
|
+ , string size_12)
|
|
|
{
|
|
|
List<ParticleSizeDEVData> oTS_DEVs = new List<ParticleSizeDEVData>();
|
|
|
oTS_DEVs.Add(new ParticleSizeDEVData
|
|
|
@@ -1848,7 +1938,13 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
|
|
|
size_4 = size_4,
|
|
|
size_5 = size_5,
|
|
|
size_6 = size_6,
|
|
|
- size_7 = size_7
|
|
|
+ size_7 = size_7,
|
|
|
+
|
|
|
+ size_8 = size_8,
|
|
|
+ size_9 = size_9,
|
|
|
+ size_10 = size_10,
|
|
|
+ size_11 = size_11,
|
|
|
+ size_12 = size_12
|
|
|
});
|
|
|
return oTS_DEVs;
|
|
|
}
|
|
|
@@ -2008,19 +2104,31 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
|
|
|
XRTableCell Template_Rows3_Cell_8 = new XRTableCell();
|
|
|
XRTableCell Template_Rows3_Cell_9 = new XRTableCell();
|
|
|
|
|
|
+ XRTableCell Template_Rows3_Cell_10 = new XRTableCell();
|
|
|
+ XRTableCell Template_Rows3_Cell_11 = new XRTableCell();
|
|
|
+ XRTableCell Template_Rows3_Cell_12 = new XRTableCell();
|
|
|
+ XRTableCell Template_Rows3_Cell_13 = new XRTableCell();
|
|
|
+ XRTableCell Template_Rows3_Cell_14 = new XRTableCell();
|
|
|
+
|
|
|
Template_Rows1_Cell_1.WidthF = 668f;
|
|
|
Template_Rows_1.Controls.Add(Template_Rows1_Cell_1);
|
|
|
Template_Rows2_Cell_1.WidthF = 668f;
|
|
|
Template_Rows_2.Controls.Add(Template_Rows2_Cell_1);
|
|
|
Template_Rows3_Cell_1.WidthF = 100f;
|
|
|
Template_Rows3_Cell_2.WidthF = 55;
|
|
|
- Template_Rows3_Cell_3.WidthF = 59;
|
|
|
- Template_Rows3_Cell_4.WidthF = 59;
|
|
|
- Template_Rows3_Cell_5.WidthF = 59;
|
|
|
- Template_Rows3_Cell_6.WidthF = 59;
|
|
|
- Template_Rows3_Cell_7.WidthF = 59;
|
|
|
- Template_Rows3_Cell_8.WidthF = 59;
|
|
|
- Template_Rows3_Cell_9.WidthF = 59;
|
|
|
+ Template_Rows3_Cell_3.WidthF = 45;
|
|
|
+ Template_Rows3_Cell_4.WidthF = 45;
|
|
|
+ Template_Rows3_Cell_5.WidthF = 45;
|
|
|
+ Template_Rows3_Cell_6.WidthF = 45;
|
|
|
+ Template_Rows3_Cell_7.WidthF = 45;
|
|
|
+ Template_Rows3_Cell_8.WidthF = 45;
|
|
|
+ Template_Rows3_Cell_9.WidthF = 45;
|
|
|
+
|
|
|
+ Template_Rows3_Cell_10.WidthF = 45;
|
|
|
+ Template_Rows3_Cell_11.WidthF = 45;
|
|
|
+ Template_Rows3_Cell_12.WidthF = 45;
|
|
|
+ Template_Rows3_Cell_13.WidthF = 45;
|
|
|
+ Template_Rows3_Cell_14.WidthF = 45;
|
|
|
Template_Rows_3.Controls.Add(Template_Rows3_Cell_1);
|
|
|
Template_Rows_3.Controls.Add(Template_Rows3_Cell_2);
|
|
|
Template_Rows_3.Controls.Add(Template_Rows3_Cell_3);
|
|
|
@@ -2030,6 +2138,14 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
|
|
|
Template_Rows_3.Controls.Add(Template_Rows3_Cell_7);
|
|
|
Template_Rows_3.Controls.Add(Template_Rows3_Cell_8);
|
|
|
Template_Rows_3.Controls.Add(Template_Rows3_Cell_9);
|
|
|
+
|
|
|
+ Template_Rows_3.Controls.Add(Template_Rows3_Cell_10);
|
|
|
+ Template_Rows_3.Controls.Add(Template_Rows3_Cell_11);
|
|
|
+ Template_Rows_3.Controls.Add(Template_Rows3_Cell_12);
|
|
|
+ Template_Rows_3.Controls.Add(Template_Rows3_Cell_13);
|
|
|
+ Template_Rows_3.Controls.Add(Template_Rows3_Cell_14);
|
|
|
+
|
|
|
+
|
|
|
Template.Rows.Add(Template_Rows_1);
|
|
|
Template.Rows.Add(Template_Rows_2);
|
|
|
Template.Rows.Add(Template_Rows_3);
|
|
|
@@ -2057,15 +2173,27 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
|
|
|
XRTableCell Template_Rows1_Cell_7 = new XRTableCell();
|
|
|
XRTableCell Template_Rows1_Cell_8 = new XRTableCell();
|
|
|
XRTableCell Template_Rows1_Cell_9 = new XRTableCell();
|
|
|
+
|
|
|
+ XRTableCell Template_Rows1_Cell_10 = new XRTableCell();
|
|
|
+ XRTableCell Template_Rows1_Cell_11= new XRTableCell();
|
|
|
+ XRTableCell Template_Rows1_Cell_12 = new XRTableCell();
|
|
|
+ XRTableCell Template_Rows1_Cell_13 = new XRTableCell();
|
|
|
+ XRTableCell Template_Rows1_Cell_14 = new XRTableCell();
|
|
|
Template_Rows1_Cell_1.WidthF = 100;
|
|
|
Template_Rows1_Cell_2.WidthF = 55f;
|
|
|
- Template_Rows1_Cell_3.WidthF = 59f;
|
|
|
- Template_Rows1_Cell_4.WidthF = 59f;
|
|
|
- Template_Rows1_Cell_5.WidthF = 59f;
|
|
|
- Template_Rows1_Cell_6.WidthF = 59f;
|
|
|
- Template_Rows1_Cell_7.WidthF = 59f;
|
|
|
- Template_Rows1_Cell_8.WidthF = 59f;
|
|
|
- Template_Rows1_Cell_9.WidthF = 59f;
|
|
|
+ Template_Rows1_Cell_3.WidthF = 45;
|
|
|
+ Template_Rows1_Cell_4.WidthF = 45;
|
|
|
+ Template_Rows1_Cell_5.WidthF = 45;
|
|
|
+ Template_Rows1_Cell_6.WidthF = 45;
|
|
|
+ Template_Rows1_Cell_7.WidthF = 45;
|
|
|
+ Template_Rows1_Cell_8.WidthF = 45;
|
|
|
+ Template_Rows1_Cell_9.WidthF = 45;
|
|
|
+
|
|
|
+ Template_Rows1_Cell_10.WidthF = 45;
|
|
|
+ Template_Rows1_Cell_11.WidthF = 45;
|
|
|
+ Template_Rows1_Cell_12.WidthF = 45;
|
|
|
+ Template_Rows1_Cell_13.WidthF = 45;
|
|
|
+ Template_Rows1_Cell_14.WidthF = 45;
|
|
|
Template_Rows_1.Controls.Add(Template_Rows1_Cell_1);
|
|
|
Template_Rows_1.Controls.Add(Template_Rows1_Cell_2);
|
|
|
Template_Rows_1.Controls.Add(Template_Rows1_Cell_3);
|
|
|
@@ -2075,6 +2203,13 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
|
|
|
Template_Rows_1.Controls.Add(Template_Rows1_Cell_7);
|
|
|
Template_Rows_1.Controls.Add(Template_Rows1_Cell_8);
|
|
|
Template_Rows_1.Controls.Add(Template_Rows1_Cell_9);
|
|
|
+
|
|
|
+ Template_Rows_1.Controls.Add(Template_Rows1_Cell_10);
|
|
|
+ Template_Rows_1.Controls.Add(Template_Rows1_Cell_11);
|
|
|
+ Template_Rows_1.Controls.Add(Template_Rows1_Cell_12);
|
|
|
+ Template_Rows_1.Controls.Add(Template_Rows1_Cell_13);
|
|
|
+ Template_Rows_1.Controls.Add(Template_Rows1_Cell_14);
|
|
|
+
|
|
|
Template.Rows.Add(Template_Rows_1);
|
|
|
Template.Borders = DevExpress.XtraPrinting.BorderSide.All;
|
|
|
Template.SizeF = new SizeF(668f, Template.SizeF.Height);
|
|
|
@@ -2106,6 +2241,12 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
|
|
|
XRTableCell Template_Rows3_Cell_9 = new XRTableCell();
|
|
|
XRTableCell Template_Rows3_Cell_10 = new XRTableCell();
|
|
|
|
|
|
+ XRTableCell Template_Rows3_Cell_11 = new XRTableCell();
|
|
|
+ XRTableCell Template_Rows3_Cell_12 = new XRTableCell();
|
|
|
+ XRTableCell Template_Rows3_Cell_13 = new XRTableCell();
|
|
|
+ XRTableCell Template_Rows3_Cell_14 = new XRTableCell();
|
|
|
+ XRTableCell Template_Rows3_Cell_15 = new XRTableCell();
|
|
|
+
|
|
|
Template_Rows1_Cell_1.WidthF = 668f;
|
|
|
Template_Rows_1.Controls.Add(Template_Rows1_Cell_1);
|
|
|
Template_Rows2_Cell_1.WidthF = 668f;
|
|
|
@@ -2113,13 +2254,20 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
|
|
|
Template_Rows3_Cell_1.WidthF = 100f;
|
|
|
Template_Rows3_Cell_2.WidthF = 100f;
|
|
|
Template_Rows3_Cell_3.WidthF = 55;
|
|
|
- Template_Rows3_Cell_4.WidthF = 59;
|
|
|
- Template_Rows3_Cell_5.WidthF = 59;
|
|
|
- Template_Rows3_Cell_6.WidthF = 59;
|
|
|
- Template_Rows3_Cell_7.WidthF = 59;
|
|
|
- Template_Rows3_Cell_8.WidthF = 59;
|
|
|
- Template_Rows3_Cell_9.WidthF = 59;
|
|
|
- Template_Rows3_Cell_10.WidthF = 59;
|
|
|
+ Template_Rows3_Cell_4.WidthF = 45;
|
|
|
+ Template_Rows3_Cell_5.WidthF = 45;
|
|
|
+ Template_Rows3_Cell_6.WidthF = 45;
|
|
|
+ Template_Rows3_Cell_7.WidthF = 45;
|
|
|
+ Template_Rows3_Cell_8.WidthF = 45;
|
|
|
+ Template_Rows3_Cell_9.WidthF = 45;
|
|
|
+ Template_Rows3_Cell_10.WidthF = 45;
|
|
|
+
|
|
|
+ Template_Rows3_Cell_11.WidthF = 45;
|
|
|
+ Template_Rows3_Cell_12.WidthF = 45;
|
|
|
+ Template_Rows3_Cell_13.WidthF = 45;
|
|
|
+ Template_Rows3_Cell_14.WidthF = 45;
|
|
|
+ Template_Rows3_Cell_15.WidthF = 45;
|
|
|
+
|
|
|
Template_Rows_3.Controls.Add(Template_Rows3_Cell_1);
|
|
|
Template_Rows_3.Controls.Add(Template_Rows3_Cell_2);
|
|
|
Template_Rows_3.Controls.Add(Template_Rows3_Cell_3);
|
|
|
@@ -2130,6 +2278,13 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
|
|
|
Template_Rows_3.Controls.Add(Template_Rows3_Cell_8);
|
|
|
Template_Rows_3.Controls.Add(Template_Rows3_Cell_9);
|
|
|
Template_Rows_3.Controls.Add(Template_Rows3_Cell_10);
|
|
|
+
|
|
|
+
|
|
|
+ Template_Rows_3.Controls.Add(Template_Rows3_Cell_11);
|
|
|
+ Template_Rows_3.Controls.Add(Template_Rows3_Cell_12);
|
|
|
+ Template_Rows_3.Controls.Add(Template_Rows3_Cell_13);
|
|
|
+ Template_Rows_3.Controls.Add(Template_Rows3_Cell_14);
|
|
|
+ Template_Rows_3.Controls.Add(Template_Rows3_Cell_15);
|
|
|
Template.Rows.Add(Template_Rows_1);
|
|
|
Template.Rows.Add(Template_Rows_2);
|
|
|
Template.Rows.Add(Template_Rows_3);
|
|
|
@@ -2157,15 +2312,27 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
|
|
|
XRTableCell Template_Rows1_Cell_7 = new XRTableCell();
|
|
|
XRTableCell Template_Rows1_Cell_8 = new XRTableCell();
|
|
|
XRTableCell Template_Rows1_Cell_9 = new XRTableCell();
|
|
|
+
|
|
|
+ XRTableCell Template_Rows1_Cell_10 = new XRTableCell();
|
|
|
+ XRTableCell Template_Rows1_Cell_11 = new XRTableCell();
|
|
|
+ XRTableCell Template_Rows1_Cell_12 = new XRTableCell();
|
|
|
+ XRTableCell Template_Rows1_Cell_13 = new XRTableCell();
|
|
|
+ XRTableCell Template_Rows1_Cell_14 = new XRTableCell();
|
|
|
Template_Rows1_Cell_1.WidthF = 200f;
|
|
|
Template_Rows1_Cell_2.WidthF = 55f;
|
|
|
- Template_Rows1_Cell_3.WidthF = 59f;
|
|
|
- Template_Rows1_Cell_4.WidthF = 59f;
|
|
|
- Template_Rows1_Cell_5.WidthF = 59f;
|
|
|
- Template_Rows1_Cell_6.WidthF = 59f;
|
|
|
- Template_Rows1_Cell_7.WidthF = 59f;
|
|
|
- Template_Rows1_Cell_8.WidthF = 59f;
|
|
|
- Template_Rows1_Cell_9.WidthF = 59f;
|
|
|
+ Template_Rows1_Cell_3.WidthF = 45;
|
|
|
+ Template_Rows1_Cell_4.WidthF = 45;
|
|
|
+ Template_Rows1_Cell_5.WidthF = 45;
|
|
|
+ Template_Rows1_Cell_6.WidthF = 45;
|
|
|
+ Template_Rows1_Cell_7.WidthF = 45;
|
|
|
+ Template_Rows1_Cell_8.WidthF = 45;
|
|
|
+ Template_Rows1_Cell_9.WidthF = 45;
|
|
|
+
|
|
|
+ Template_Rows1_Cell_10.WidthF = 45;
|
|
|
+ Template_Rows1_Cell_11.WidthF = 45;
|
|
|
+ Template_Rows1_Cell_12.WidthF = 45;
|
|
|
+ Template_Rows1_Cell_13.WidthF = 45;
|
|
|
+ Template_Rows1_Cell_14.WidthF = 45;
|
|
|
Template_Rows_1.Controls.Add(Template_Rows1_Cell_1);
|
|
|
Template_Rows_1.Controls.Add(Template_Rows1_Cell_2);
|
|
|
Template_Rows_1.Controls.Add(Template_Rows1_Cell_3);
|
|
|
@@ -2175,6 +2342,12 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
|
|
|
Template_Rows_1.Controls.Add(Template_Rows1_Cell_7);
|
|
|
Template_Rows_1.Controls.Add(Template_Rows1_Cell_8);
|
|
|
Template_Rows_1.Controls.Add(Template_Rows1_Cell_9);
|
|
|
+
|
|
|
+ Template_Rows_1.Controls.Add(Template_Rows1_Cell_10);
|
|
|
+ Template_Rows_1.Controls.Add(Template_Rows1_Cell_11);
|
|
|
+ Template_Rows_1.Controls.Add(Template_Rows1_Cell_12);
|
|
|
+ Template_Rows_1.Controls.Add(Template_Rows1_Cell_13);
|
|
|
+ Template_Rows_1.Controls.Add(Template_Rows1_Cell_14);
|
|
|
Template.Rows.Add(Template_Rows_1);
|
|
|
Template.Borders = DevExpress.XtraPrinting.BorderSide.All;
|
|
|
Template.SizeF = new SizeF(668f, Template.SizeF.Height);
|
|
|
@@ -2779,6 +2952,12 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
|
|
|
public string size_5 { get; set; }
|
|
|
public string size_6 { get; set; }
|
|
|
public string size_7 { get; set; }
|
|
|
+
|
|
|
+ public string size_8 { get; set; }
|
|
|
+ public string size_9 { get; set; }
|
|
|
+ public string size_10 { get; set; }
|
|
|
+ public string size_11 { get; set; }
|
|
|
+ public string size_12 { get; set; }
|
|
|
}
|
|
|
public class ElementalAnalysisDEVData
|
|
|
{
|
zhangjiaxin