瀏覽代碼

提交报告重构bug

zhangjiaxin 1 年之前
父節點
當前提交
c1a9003513

+ 14 - 8
Bin/x64/Debug/Config/ReportTemplate/Inca_Template/ReportTemplateConfig.xml

@@ -1,7 +1,8 @@
 <XmlConfig>
   <M_SY>
     <str_tb_ZBT>颗粒分析</str_tb_ZBT>
-    <str_tb_FBT>xxx有限公司</str_tb_FBT>
+    <str_tb_FBT>
+    </str_tb_FBT>
     <str_tb_YPBH>0001</str_tb_YPBH>
     <str_tb_CKBZ>
     </str_tb_CKBZ>
@@ -22,7 +23,7 @@
   <M_KLFXJG>
     <b_ck_klcc_xsmk>True</b_ck_klcc_xsmk>
     <index_cb_klcc_jsfs>3</index_cb_klcc_jsfs>
-    <index_cb_klcc_ljb>0</index_cb_klcc_ljb>
+    <index_cb_klcc_ljb>1</index_cb_klcc_ljb>
     <index_cb_klcc_klfw>0</index_cb_klcc_klfw>
     <b_cb_jzwfl_xsmk>True</b_cb_jzwfl_xsmk>
     <index_cb_jzwfl_xstx>0</index_cb_jzwfl_xstx>
@@ -33,7 +34,7 @@
     <b_ck_klcc_xsddt>False</b_ck_klcc_xsddt>
     <b_ck_klcc_dfl>False</b_ck_klcc_dfl>
     <b_ck_klcc_xfl>False</b_ck_klcc_xfl>
-    <str_cb_klcc_ljb>li3.psf</str_cb_klcc_ljb>
+    <str_cb_klcc_ljb>lj.psf</str_cb_klcc_ljb>
   </M_KLFXJG>
   <M_YSFXJG>
     <b_ck_ysfx_xsmk>True</b_ck_ysfx_xsmk>
@@ -65,17 +66,21 @@
     </list_str_tb_yscf_ysxx>
   </M_YSFXJG>
   <M_SYXT>
-    <b_ck_syxt_xsmk>True</b_ck_syxt_xsmk>
+    <b_ck_syxt_xsmk>False</b_ck_syxt_xsmk>
     <index_cb_syxt_jsfs>0</index_cb_syxt_jsfs>
     <index_cb_syxt_klfw>0</index_cb_syxt_klfw>
     <str_cb_syxt_mhxssl>2</str_cb_syxt_mhxssl>
     <list_lbv_syxt_mblb>
       <MB0>MgO.CaO.Al₂O₃</MB0>
-      <MB1>CaO.SiO₂.Al₂O₃</MB1>
+      <MB1>CaO.S.Al₂O₃</MB1>
+      <MB2>CaO.SiO₂.Al₂O₃</MB2>
+      <MB3>MnO.S.Al₂O₃</MB3>
     </list_lbv_syxt_mblb>
     <list_lbv_syxt_mblb_index>
       <MBIndex0>0</MBIndex0>
-      <MBIndex1>2</MBIndex1>
+      <MBIndex1>1</MBIndex1>
+      <MBIndex2>2</MBIndex2>
+      <MBIndex3>3</MBIndex3>
     </list_lbv_syxt_mblb_index>
     <str_cb_syxt_ljb>li3.psf</str_cb_syxt_ljb>
   </M_SYXT>
@@ -117,11 +122,12 @@
       <YS0>C</YS0>
     </list_str_kllb_qcys>
     <str_kllb_qcys>C</str_kllb_qcys>
-    <str_kllb_DeleteClass>misc</str_kllb_DeleteClass>
+    <str_kllb_DeleteClass>misc,Not Identified</str_kllb_DeleteClass>
     <list_str_kllb_DeleteClass>
       <YS0>misc</YS0>
+      <YS1>Not Identified</YS1>
     </list_str_kllb_DeleteClass>
-    <list_int_kllb_number>18</list_int_kllb_number>
+    <list_int_kllb_number>20</list_int_kllb_number>
   </M_KLLBXX>
   <M_address>
     <Path>./Config/ReportTemplate/ReportTemplateConfig.xml</Path>

+ 12 - 11
Bin/x64/Debug/Config/ReportTemplate/ReportTemplateConfig.xml

@@ -1,10 +1,9 @@
 <XmlConfig>
   <M_SY>
-    <str_tb_ZBT>Cleanness Report</str_tb_ZBT>
-    <str_tb_FBT>宁德时代</str_tb_FBT>
+    <str_tb_ZBT>OTS Report</str_tb_ZBT>
+    <str_tb_FBT>XX有限公司</str_tb_FBT>
     <str_tb_YPBH>0001</str_tb_YPBH>
-    <str_tb_CKBZ>
-    </str_tb_CKBZ>
+    <str_tb_CKBZ>GB30834</str_tb_CKBZ>
     <b_ck_ypsm>True</b_ck_ypsm>
     <b_ck_jggk>True</b_ck_jggk>
     <str_bz>
@@ -34,7 +33,7 @@
     <b_ck_klcc_xfl>False</b_ck_klcc_xfl>
   </M_KLFXJG>
   <M_YSFXJG>
-    <b_ck_ysfx_xsmk>False</b_ck_ysfx_xsmk>
+    <b_ck_ysfx_xsmk>True</b_ck_ysfx_xsmk>
     <index_cb_yxfx_jsfs>0</index_cb_yxfx_jsfs>
     <index_cb_ysfx_klfw>0</index_cb_ysfx_klfw>
     <str_tb_ysfx_xsys>Al,Si,C,S,N,O,Fe,Ti,Mn,Mg,Ca,Ce,La</str_tb_ysfx_xsys>
@@ -63,7 +62,7 @@
     </list_str_tb_yscf_ysxx>
   </M_YSFXJG>
   <M_SYXT>
-    <b_ck_syxt_xsmk>False</b_ck_syxt_xsmk>
+    <b_ck_syxt_xsmk>True</b_ck_syxt_xsmk>
     <index_cb_syxt_jsfs>0</index_cb_syxt_jsfs>
     <index_cb_syxt_klfw>0</index_cb_syxt_klfw>
     <str_cb_syxt_mhxssl>2</str_cb_syxt_mhxssl>
@@ -112,11 +111,13 @@
     <b_ck_kllb_fjzt>True</b_ck_kllb_fjzt>
     <list_str_kllb_qcys>
       <YS0>C</YS0>
+      <YS1>Fe</YS1>
     </list_str_kllb_qcys>
-    <str_kllb_qcys>C</str_kllb_qcys>
-    <str_kllb_DeleteClass>misc</str_kllb_DeleteClass>
+    <str_kllb_qcys>C,Fe</str_kllb_qcys>
+    <str_kllb_DeleteClass>FeO,SiC</str_kllb_DeleteClass>
     <list_str_kllb_DeleteClass>
-      <YS0>misc</YS0>
+      <YS0>FeO</YS0>
+      <YS1>SiC</YS1>
     </list_str_kllb_DeleteClass>
     <list_int_kllb_number>20</list_int_kllb_number>
   </M_KLLBXX>
@@ -124,7 +125,7 @@
     <Path>./Config/ReportTemplate/ReportTemplateConfig.xml</Path>
   </M_address>
   <M_JZWZB>
-    <b_ck_surface>False</b_ck_surface>
-    <b_ck_chart>False</b_ck_chart>
+    <b_ck_surface>True</b_ck_surface>
+    <b_ck_chart>True</b_ck_chart>
   </M_JZWZB>
 </XmlConfig>

+ 26 - 2
Bin/x64/Debug/Config/SysData/OTSStage.stg

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<XMLData Modify="true" PathName=".\Config\SysData\OTSStage.stg" WorkingStageId="0">
+<XMLData Modify="true" PathName=".\Config\SysData\OTSStage.stg" WorkingStageId="3">
   <Collection RegName="Stagelist">
     <Member strName="圆形九圆孔50mm">
       <Member RegName="boundary" PolygonPoint="" rectDomian="0,0,50000,0" shape="0:ROUND" />
@@ -54,7 +54,7 @@
         <Member HoleName="7" rectDomian="-23000,0,15000,0" shape="0" />
       </Collection>
     </Member>
-    <Member strName="Apero12_90">
+    <Member strName="Apero90mm">
       <Member RegName="boundary" PolygonPoint="" rectDomian="0,0,90000,90000" shape="1:RECTANGLE" />
       <Member RegName="std" PolygonPoint="" rectDomian="6300,0,2,0" shape="0:ROUND" />
       <Collection RegName="Holes">
@@ -78,5 +78,29 @@
         <Member HoleName="18" rectDomian="-14500,-24500,12000,0" shape="0" />
       </Collection>
     </Member>
+    <Member strName="Apero">
+      <Member RegName="boundary" PolygonPoint="" rectDomian="0,0,130000,120000" shape="1:RECTANGLE" />
+      <Member RegName="std" PolygonPoint="" rectDomian="6300,0,2,0" shape="0:ROUND" />
+      <Collection RegName="Holes">
+        <Member HoleName="9" rectDomian="0,0,10000,0" shape="0" />
+        <Member HoleName="2" rectDomian="0,25000,10000,0" shape="0" />
+        <Member HoleName="3" rectDomian="-15000,25000,10000,0" shape="0" />
+        <Member HoleName="1" rectDomian="15000,25500,10000,0" shape="0" />
+        <Member HoleName="4" rectDomian="22000,13000,10000,0" shape="0" />
+        <Member HoleName="5" rectDomian="7000,13000,10000,0" shape="0" />
+        <Member HoleName="6" rectDomian="-7500,13000,10000,0" shape="0" />
+        <Member HoleName="7" rectDomian="-22500,13000,10000,0" shape="0" />
+        <Member HoleName="8" rectDomian="14000,0,10000,0" shape="0" />
+        <Member HoleName="10" rectDomian="-15000,0,10000,0" shape="0" />
+        <Member HoleName="11" rectDomian="-30000,0,10000,0" shape="0" />
+        <Member HoleName="12" rectDomian="22000,-12500,10000,0" shape="0" />
+        <Member HoleName="13" rectDomian="7000,-12500,10000,0" shape="0" />
+        <Member HoleName="14" rectDomian="-7500,-12500,10000,0" shape="0" />
+        <Member HoleName="15" rectDomian="-22500,-12500,10000,0" shape="0" />
+        <Member HoleName="16" rectDomian="14500,-24500,10000,0" shape="0" />
+        <Member HoleName="17" rectDomian="-500,-24500,10000,0" shape="0" />
+        <Member HoleName="18" rectDomian="-14500,-24500,10000,0" shape="0" />
+      </Collection>
+    </Member>
   </Collection>
 </XMLData>

+ 3 - 3
OTSIncAReportApp/1-UI/Control_Grids/ParticlesGridDevidePage/ParticlesGridDevidePage.cs

@@ -2487,17 +2487,17 @@ namespace OTSIncAReportGrids
         {
             int value = 0;
             a_value = a_value / 2;
-            for (int i = 100; i < 2000; i += 50)
+            for (int i = 10; i < 5000; i += 5)
             {
                 if (a_value < i)
                 {
-                    value = i - 50;
+                    value = i - 5;
                     break;
                 }
             }
             if (value == 0)
             {
-                value = 2000;
+                value = 5000;
             }
             return value;
 

+ 12 - 1
OTSIncAReportApp/1-UI/OTSReportExport/DataIntegration/ElementalAnalysis.cs

@@ -337,7 +337,18 @@ namespace OTSIncAReportApp._1_UI.OTSReportExport.DataIntegration
         {
             ParticleData fielddata = new ParticleData(m_otsreport_export.m_ReportApp.m_rstDataMgr.ResultFilesList[m_otsreport_export.m_ReportApp.m_rstDataMgr.getSelectedIndex()].FilePath);
             DataTable getClass_dt = fielddata.GetAllClass();
-            if (getClass_dt.Rows.Count < 2)
+            List<string> ClassName = new List<string>();
+            for (int i = 0; i < getClass_dt.Rows.Count; i++)
+            {
+                if (getClass_dt.Rows[i]["GroupName"].ToString() != "NOT_INCLUTION" && getClass_dt.Rows[i]["GroupName"].ToString() != "Invalid"
+                    && getClass_dt.Rows[i]["GroupName"].ToString() != "Not Identified")
+                    if (getClass_dt.Rows[i]["GroupName"].ToString() == "")
+                        ClassName.Add("Default");
+                    else
+                        ClassName.Add(getClass_dt.Rows[i]["GroupName"].ToString());
+            }
+
+            if (ClassName.Count < 2)
             {
                 return false;
             }

+ 30 - 7
OTSIncAReportApp/1-UI/OTSReportExport/DataIntegration/InclusionProportion.cs

@@ -31,7 +31,7 @@ namespace OTSIncAReportApp._1_UI.OTSReportExport.DataIntegration
             {
                 if (getClass_dt.Rows[i]["GroupName"].ToString() != "NOT_INCLUTION" && getClass_dt.Rows[i]["GroupName"].ToString() != "Invalid")
                     if (getClass_dt.Rows[i]["GroupName"].ToString() == "")
-                        ClassName.Add("NULL");
+                        ClassName.Add("Default");
                     else
                         ClassName.Add(getClass_dt.Rows[i]["GroupName"].ToString());
             }
@@ -63,6 +63,19 @@ namespace OTSIncAReportApp._1_UI.OTSReportExport.DataIntegration
                 data = GetParticleListForParticlSize(SelectParticl, AllInca);
             }
 
+            //去除物质分类(非夹杂物分类)
+            for (int a = 0; a < m_mbszclass.M_KLLBXX.list_str_kllb_DeleteClass.Count; a++)
+            {
+                for (int i = data.Rows.Count - 1; i >= 0; i--)
+                {
+                    if (data.Rows[i]["TypeName"].ToString() == m_mbszclass.M_KLLBXX.list_str_kllb_DeleteClass[a].ToString())
+                    {
+                        data.Rows.RemoveAt(i);
+                    }
+                }
+            }
+
+
 
             DataTable AreaInformationOfAllElements = ConSolidateInvalid(data);
             DataTable AllAnalysisDetails = new DataTable();
@@ -81,7 +94,7 @@ namespace OTSIncAReportApp._1_UI.OTSReportExport.DataIntegration
 
 
                 if (AreaInformationOfAllElements.Rows[i]["GroupName"].ToString() == "")
-                    dr2["Class"] = "NULL";
+                    dr2["Class"] = "Default";
                 else
                     dr2["Class"] = AreaInformationOfAllElements.Rows[i]["GroupName"].ToString();
                 //dr2["Class"] = AreaInformationOfAllElements.Rows[i]["GroupName"].ToString();
@@ -94,7 +107,7 @@ namespace OTSIncAReportApp._1_UI.OTSReportExport.DataIntegration
             {
 
                 if (getClass_dt.Rows[i]["GroupName"].ToString() == "")
-                    ClassName.Add("NULL");
+                    ClassName.Add("Default");
                 else
                     ClassName.Add(getClass_dt.Rows[i]["GroupName"].ToString());
             }
@@ -211,7 +224,18 @@ namespace OTSIncAReportApp._1_UI.OTSReportExport.DataIntegration
         {
             ParticleData fielddata = new ParticleData(m_otsreport_export.m_ReportApp.m_rstDataMgr.ResultFilesList[m_otsreport_export.m_ReportApp.m_rstDataMgr.getSelectedIndex()].FilePath);
             DataTable getClass_dt = fielddata.GetAllClass();
-            if (getClass_dt.Rows.Count < 2)
+            List<string> ClassName = new List<string>();
+            for (int i = 0; i < getClass_dt.Rows.Count; i++)
+            {
+                if (getClass_dt.Rows[i]["GroupName"].ToString() != "NOT_INCLUTION" && getClass_dt.Rows[i]["GroupName"].ToString() != "Invalid"
+                    && getClass_dt.Rows[i]["GroupName"].ToString() != "Not Identified")
+                    if (getClass_dt.Rows[i]["GroupName"].ToString() == "")
+                        ClassName.Add("Default");
+                    else
+                        ClassName.Add(getClass_dt.Rows[i]["GroupName"].ToString());
+            }
+
+            if (ClassName.Count < 2)
             {
                 return false;
             }
@@ -345,7 +369,6 @@ namespace OTSIncAReportApp._1_UI.OTSReportExport.DataIntegration
             DataTable AreaInformationOfAllElements = InvalidRemoval(fielddata.GetAreaByAllIncA(""));
 
             //去除物质分类(非夹杂物分类)
-
             for (int a = 0; a < m_mbszclass.M_KLLBXX.list_str_kllb_DeleteClass.Count; a++)
             {
                 for (int i = AreaInformationOfAllElements.Rows.Count - 1; i >= 0; i--)
@@ -383,7 +406,7 @@ namespace OTSIncAReportApp._1_UI.OTSReportExport.DataIntegration
                 if (getClass_dt.Rows[i]["GroupName"].ToString() != "NOT_INCLUTION" && getClass_dt.Rows[i]["GroupName"].ToString() != "Invalid")
                     //ClassName.Add(getClass_dt.Rows[i]["GroupName"].ToString());
                     if (getClass_dt.Rows[i]["GroupName"].ToString() == "")
-                        ClassName.Add("NULL");
+                        ClassName.Add("Default");
                     else
                         ClassName.Add(getClass_dt.Rows[i]["GroupName"].ToString());
             }
@@ -407,7 +430,7 @@ namespace OTSIncAReportApp._1_UI.OTSReportExport.DataIntegration
                 DataRow dr = AreaRatio.NewRow();
                 //dr["Class"] = AllAnalysisDetails.Rows[i]["Class"].ToString();
                 if (AllAnalysisDetails.Rows[i]["Class"].ToString() == "")
-                    dr["Class"] = "NULL";
+                    dr["Class"] = "Default";
                 else
                     dr["Class"] = AllAnalysisDetails.Rows[i]["Class"].ToString();
                 dr["subdivision"] = AllAnalysisDetails.Rows[i]["Name"].ToString();

+ 15 - 2
OTSIncAReportApp/1-UI/OTSReportExport/DataIntegration/ParticleAnalysis.cs

@@ -336,7 +336,9 @@ namespace OTSIncAReportApp._1_UI.OTSReportExport.DataIntegration
             DataTable getClass_dt = fielddata.GetAllClass();
             for (int i = 0; i < getClass_dt.Rows.Count; i++)
             {
-                if (getClass_dt.Rows[i]["GroupName"].ToString() != "NOT_INCLUTION" && getClass_dt.Rows[i]["GroupName"].ToString() != "Invalid")
+                
+                if (getClass_dt.Rows[i]["GroupName"].ToString() != "NOT_INCLUTION" && getClass_dt.Rows[i]["GroupName"].ToString() != "Invalid"
+                    && getClass_dt.Rows[i]["GroupName"].ToString() != "Not Identified")
                     if (getClass_dt.Rows[i]["GroupName"].ToString() == "")
                         ClassName.Add("Default");
                     else
@@ -359,7 +361,18 @@ namespace OTSIncAReportApp._1_UI.OTSReportExport.DataIntegration
         {
             ParticleData fielddata = new ParticleData(m_otsreport_export.m_ReportApp.m_rstDataMgr.ResultFilesList[m_otsreport_export.m_ReportApp.m_rstDataMgr.getSelectedIndex()].FilePath);
             DataTable getClass_dt = fielddata.GetAllClass();
-            if (getClass_dt.Rows.Count<2)
+            List<string> ClassName = new List<string>();
+            for (int i = 0; i < getClass_dt.Rows.Count; i++)
+            {
+                if (getClass_dt.Rows[i]["GroupName"].ToString() != "NOT_INCLUTION" && getClass_dt.Rows[i]["GroupName"].ToString() != "Invalid"
+                    && getClass_dt.Rows[i]["GroupName"].ToString() != "Not Identified")
+                    if (getClass_dt.Rows[i]["GroupName"].ToString() == "")
+                        ClassName.Add("Default");
+                    else
+                        ClassName.Add(getClass_dt.Rows[i]["GroupName"].ToString());
+            }
+
+            if (ClassName.Count < 2)
             {
                 return false;
             }

+ 11 - 8
OTSIncAReportApp/1-UI/OTSReportExport/Template/DataTemplate.cs

@@ -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;