|
@@ -225,8 +225,8 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
|
|
|
}
|
|
|
total += Convert.ToInt32(surface_dt2.Rows[i]["total"]);
|
|
|
}
|
|
|
-
|
|
|
- xrTable3.Rows[0].Cells[0].Text = "总数量";
|
|
|
+ setXRLabelData(xrTable3.Rows[0].Cells[0], "总数量");
|
|
|
+ //xrTable3.Rows[0].Cells[0].Text = "总数量";
|
|
|
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;
|
|
@@ -362,7 +362,8 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
|
|
|
total += Convert.ToInt32(surface_dt2.Rows[i]["total"]);
|
|
|
}
|
|
|
|
|
|
- xrTable3.Rows[0].Cells[0].Text = "总数量";
|
|
|
+ //xrTable3.Rows[0].Cells[0].Text = "总数量";
|
|
|
+ setXRLabelData(xrTable3.Rows[0].Cells[0], "总数量");
|
|
|
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;
|
|
@@ -688,7 +689,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
|
|
|
XRTableCellData_ElementAnalysis(row, tCell_s10, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ElementalAnalysisData[i], "s10");
|
|
|
xRTable.Rows.Add(row);
|
|
|
}
|
|
|
- xRTable.LocationF = new PointF(0f, NeueStartposition);
|
|
|
+ xRTable.LocationF = new PointF(10f, NeueStartposition);
|
|
|
NeueStartposition = xRTable.LocationF.Y + xRTable.SizeF.Height + 10;
|
|
|
this.Detail.Controls.Add(xRTable);
|
|
|
}
|
|
@@ -782,7 +783,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
|
|
|
XRTableCellData_ElementAnalysis(row, tCell_s10, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ElementalAnalysisData[i], "s10");
|
|
|
xRTable.Rows.Add(row);
|
|
|
}
|
|
|
- xRTable.LocationF = new PointF(0f, NeueStartposition);
|
|
|
+ xRTable.LocationF = new PointF(10f, NeueStartposition);
|
|
|
NeueStartposition = xRTable.LocationF.Y + xRTable.SizeF.Height + 10;
|
|
|
this.Detail.Controls.Add(xRTable);
|
|
|
}
|
|
@@ -824,7 +825,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
|
|
|
}
|
|
|
xrTb_ElementAnalysis.Rows.Add(addElementalAnalysisRows(REORDER_data.Rows[i]["Name"].ToString(), str_data));
|
|
|
}
|
|
|
- xrTb_ElementAnalysis.LocationF = new PointF(xrTb_ElementAnalysis.LocationF.X, NeueStartposition);
|
|
|
+ xrTb_ElementAnalysis.LocationF = new PointF(10f, NeueStartposition);
|
|
|
NeueStartposition = xrTb_ElementAnalysis.LocationF.Y + xrTb_ElementAnalysis.SizeF.Height + 10;
|
|
|
}
|
|
|
|
|
@@ -1136,8 +1137,9 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
|
|
|
xrTable_kllb_surface.LocationF = new PointF(0, NeueStartposition + 5);
|
|
|
xrTable_kllb_surface.Visible = true;
|
|
|
NeueStartposition = xrTable_kllb_surface.LocationF.Y + xrTable_kllb_surface.SizeF.Height;
|
|
|
-
|
|
|
+ setXRLabelData(xrTable_kllb, "颗粒列表");
|
|
|
setXRLabelData(xrTableCell2, "Selected particles based on:" + TemplateClass.M_KLLBXX.str_cb_kllb_sort_p1.ToString() + "(μm)");
|
|
|
+
|
|
|
ParticleList particleList = new ParticleList();
|
|
|
DataTable dataTable = particleList.Get_dev_kllb_data(TemplateClass, m_otsreport_export,out DataTable data);
|
|
|
FrameData = data.Copy();
|
|
@@ -1430,7 +1432,8 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
|
|
|
XRTableRow Template_Rows_1 = new XRTableRow();
|
|
|
XRTableCell Template_Rows1_Cell_2 = new XRTableCell();
|
|
|
Template_Rows1_Cell_2.WidthF = 630f;
|
|
|
- Template_Rows1_Cell_2.Text = str;
|
|
|
+ setXRLabelData(Template_Rows1_Cell_2, str);
|
|
|
+ //Template_Rows1_Cell_2.Text = str;
|
|
|
Template_Rows_1.Controls.Add(Template_Rows1_Cell_2);
|
|
|
Template.Rows.Add(Template_Rows_1);
|
|
|
Template.WidthF = 630f;
|