报告测量面积和测量设置面积保持一致

Bin/x64/Debug/Config/ReportTemplate/Inca_Template/ReportTemplateConfig.xml

@@ -68,7 +68,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>

Bin/x64/Debug/Config/SysData/OTSProgMgrParam.pmf

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<XMLData RunMode="ProfessionalMode" SysType="BatteryCleannessA">
+<XMLData RunMode="ProfessionalMode" SysType="IncA">
   <Member RegName="GenParam" DefaultArea="100" DefaultSampleName="Sample" DefaultShape="0" MeasParamFileFolderName=".\Config\ProData\" MeasSwitch="true" PartSTDLibFolderName=".\Config\SysData\" PropertyDisplayMode="0" StdLibFileName="OTS_TC_Axia_per" SteelTechnology="0" UseSysSTD="true" />
   <Member RegName="ImageProcParam" AutoBGRemoveType="0:MIDDLE" BGRemoveType="1:MANUAL" MatrixStep="50" OverlapParam="0" ParticleSelectionCondition="">
     <Member RegName="BGGray" end="102" start="0" />

Bin/x64/Debug/Config/SysData/OTSReportMgrParam.rpf

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<XMLData systype="BatteryCleannessA">
+<XMLData systype="IncA">
   <Member RegName="Scale" strValue="1000" />
   <Member RegName="DefaultComputedColName" strValue="Area,EquivalentCircleDiameter,MaxDiameter,MinDiameter,DiameterRatio,FerretDiameter,PERP,PERI,INSCR,MEAN,ELONG,ASPECT_ELONG,Orientation" />
   <Member RegName="ElementsColName" strValue="C,O,Al,Fe,F,Ti,Na,Mn,Mg" />

OTSIncAReportApp/1-UI/Control_Grids/ResultGrid.cs

@@ -224,8 +224,9 @@ namespace OTSIncAReportGrids
             double wide = resfile.GetImageWidth();
             double high = resfile.GetImageHeight();
             double pixelSize = resfile.GetPixelSize();
-            double filedsArea = Math.Round(high * wide * pixelSize * pixelSize * filedCount, 2);
+            //double filedsArea = Math.Round(high * wide * pixelSize * pixelSize * filedCount, 2);
             double particleArea = fielddata.GetparticleArea();
+            double filedsArea = resfile.GetTotalArea();
 
             //double ratio = particleArea / filedsArea;
 
@@ -265,7 +266,7 @@ namespace OTSIncAReportGrids
 
             keyValues.Add(table["col6"].ToString(), LibraryName);
             keyValues.Add(table["col7"].ToString(), fielddata.GetparticleCount().ToString());
-            keyValues.Add(table["col8"].ToString(), filedsArea.ToString());
+            keyValues.Add(table["col8"].ToString(), Math.Round(filedsArea, 2).ToString());
             keyValues.Add(table["col9"].ToString(), particleArea.ToString());
             keyValues.Add(table["col10"].ToString(), ratio.ToString());
 

OTSIncAReportApp/1-UI/OTSReportExport/Template/DataTemplate.cs

@@ -3,12 +3,8 @@ using DevExpress.XtraCharts;
 using DevExpress.XtraPrinting.Drawing;
 using DevExpress.XtraReports.UI;
 using OTSCommon;
-
 using OTSIncAReportApp._1_UI.OTSReportExport.DataIntegration;
 using OTSIncAReportApp.OTSRstMgrFunction;
-using OTSIncAReportApp.OTSSampleReportInfo;
-using OTSIncAReportApp.OTSTemplateDesigner;
-using OTSIncAReportGrids;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -187,7 +183,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             setXRLabelData(dev_sczs_text, data.Rows[2][1].ToString());//视场总数
             setXRLabelData(dev_flfa_text, data.Rows[3][1].ToString());//分类方案
             setXRLabelData(dev_yjctz_text, data.Rows[4][1].ToString());//已检测特征
-            setXRLabelData(dev_scmj_text, data.Rows[5][1].ToString() + "μm²");//视场面积
+            setXRLabelData(dev_scmj_text, data.Rows[5][1].ToString() + "mm²");//视场面积
             setXRLabelData(dev_fdbs_text, data.Rows[6][1].ToString());//放大倍数
             setXRLabelData(dev_bgsj_text, DateTime.Now.ToShortDateString().ToString());//报告时间:
             setXRLabelData(dev_ckbz_text, TemplateClass.M_SY.str_tb_CKBZ.ToString());//参考标准
@@ -281,13 +277,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             {
                 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);
@@ -393,20 +383,6 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
                 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);
@@ -484,13 +460,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             {
                 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);
@@ -587,21 +557,6 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
                 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);