报告程序导出优化

Bin/x64/Debug/Config/ProData/lj.psf

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<XMLData FileMark="626" Name="LiJi1" Sizes="0,0.5,1,2,5,30,100" Version="1.1.1" />
+<XMLData FileMark="626" Name="LiJi1" Sizes="15,20,25,30,50,70,100" Version="1.1.1" />

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

@@ -1,7 +1,7 @@
 <XmlConfig>
   <M_SY>
     <str_tb_ZBT>Cleanness Report</str_tb_ZBT>
-    <str_tb_FBT>XXXXXX有限公司</str_tb_FBT>
+    <str_tb_FBT>湖南中伟新能源科技有限公司</str_tb_FBT>
     <str_tb_YPBH>0001</str_tb_YPBH>
     <str_tb_CKBZ>VDA19</str_tb_CKBZ>
     <b_ck_ypsm>True</b_ck_ypsm>
@@ -19,7 +19,7 @@
   </M_YMYJ>
   <M_KLFXJG>
     <b_ck_klcc_xsmk>True</b_ck_klcc_xsmk>
-    <index_cb_klcc_jsfs>3</index_cb_klcc_jsfs>
+    <index_cb_klcc_jsfs>0</index_cb_klcc_jsfs>
     <index_cb_klcc_ljb>0</index_cb_klcc_ljb>
     <index_cb_klcc_klfw>0</index_cb_klcc_klfw>
     <b_cb_jzwfl_xsmk>True</b_cb_jzwfl_xsmk>
@@ -27,8 +27,8 @@
     <index_cb_jzwfl_jsfs>0</index_cb_jzwfl_jsfs>
     <index_cb_jzwfl_ljb>0</index_cb_jzwfl_ljb>
     <index_cb_jzwfl_klfw>0</index_cb_jzwfl_klfw>
-    <str_cb_klcc_jsfs>CIRCLE</str_cb_klcc_jsfs>
-    <b_ck_klcc_xsddt>True</b_ck_klcc_xsddt>
+    <str_cb_klcc_jsfs>DMAX</str_cb_klcc_jsfs>
+    <b_ck_klcc_xsddt>False</b_ck_klcc_xsddt>
     <b_ck_klcc_dfl>True</b_ck_klcc_dfl>
     <b_ck_klcc_xfl>True</b_ck_klcc_xfl>
   </M_KLFXJG>
@@ -62,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>
@@ -97,12 +97,12 @@
     <str_cb_kllb_sort>Hardness</str_cb_kllb_sort>
     <index_cb_kllb_sort>2</index_cb_kllb_sort>
     <index_cb_kllb_sort_p1>1</index_cb_kllb_sort_p1>
-    <str_cb_kllb_sort_p2>Hardness</str_cb_kllb_sort_p2>
-    <index_cb_kllb_sort_p2>2</index_cb_kllb_sort_p2>
-    <str_cb_kllb_sort_p3>Area</str_cb_kllb_sort_p3>
-    <index_cb_kllb_sort_p3>0</index_cb_kllb_sort_p3>
-    <str_cb_kllb_chartSort_p1>Hardness</str_cb_kllb_chartSort_p1>
-    <index_cb_kllb_chartSort_p1>2</index_cb_kllb_chartSort_p1>
+    <str_cb_kllb_sort_p2>Area</str_cb_kllb_sort_p2>
+    <index_cb_kllb_sort_p2>0</index_cb_kllb_sort_p2>
+    <str_cb_kllb_sort_p3>AveGray</str_cb_kllb_sort_p3>
+    <index_cb_kllb_sort_p3>3</index_cb_kllb_sort_p3>
+    <str_cb_kllb_chartSort_p1>DMAX</str_cb_kllb_chartSort_p1>
+    <index_cb_kllb_chartSort_p1>1</index_cb_kllb_chartSort_p1>
     <str_cb_kllb_chartSort_p2>Area</str_cb_kllb_chartSort_p2>
     <index_cb_kllb_chartSort_p2>0</index_cb_kllb_chartSort_p2>
     <str_cb_kllb_chartSort_p3>AveGray</str_cb_kllb_chartSort_p3>
@@ -120,10 +120,10 @@
     <list_int_kllb_number>20</list_int_kllb_number>
   </M_KLLBXX>
   <M_address>
-    <Path>C:\Others\Opton\cleanness\OTS\Bin\x64\Debug\Config\ConfigTemplate\BatteryCleannessA\ReportTemplateConfig.xml</Path>
+    <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>

OTSCommon/ReportModel/ResultFile.cs

@@ -180,6 +180,7 @@ public    enum OTS_Y_AXIS_DIRECTION
             return m_pixelSize;
 
         }
+      
 
         public string GetSTDName()
         {

OTSIncAMeasureApp/OTSIncAMeasureApp.csproj

@@ -218,9 +218,8 @@
       <EmbedInteropTypes>True</EmbedInteropTypes>
       <HintPath>..\OpenDll\WordApiDll\office.dll</HintPath>
     </Reference>
-    <Reference Include="OINA.Extender, Version=6.1.0.0, Culture=neutral, PublicKeyToken=5efad68c95e0364e, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>E:\OTSSoftWare\OTS2_MiningDev\OpenDll\OxfordApi50Dll\OINA.Extender.dll</HintPath>
+    <Reference Include="OINA.Extender">
+      <HintPath>..\Bin\x64\Debug\OxfordExtender\OINA.Extender.dll</HintPath>
     </Reference>
     <Reference Include="OpenCvSharp">
       <HintPath>..\OpenDll\OpenCvSharp\OpenCvSharp.dll</HintPath>

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

@@ -2319,8 +2319,13 @@ namespace OTSIncAReportGrids
             int intQuantity = 0;
             dt_FIeld = new DataTable();
             vs = new List<string>();
+            ResultFile resfile = m_ReportApp.m_rstDataMgr.ResultFilesList[m_ReportApp.m_rstDataMgr.getSelectedIndex()];
+            float PixelSize = resfile.GetPixelSize();
 
+            float ScanFieldSizeX = resfile.GetScanFieldSizeX();
 
+            int gauge = RulerSelection(ScanFieldSizeX);
+            float RulerPixels = gauge / PixelSize;
             //查找该field下对应所有的颗粒
             DataTable dt_AllParticle = fieldData.GetAllParticle_DataTable();
 
@@ -2373,7 +2378,7 @@ namespace OTSIncAReportGrids
                         vs.Add(dt_FIeld.Rows[i]["id"].ToString());
 
                         Image img = Image.FromFile(dt_FIeld.Rows[i]["fieldFullName"].ToString());
-                        //img.Save(@"D:\1.bmp");
+                      
                         Bitmap ls_fieldbp = new Bitmap(img.Width, img.Height, System.Drawing.Imaging.PixelFormat.Format32bppArgb);
 
                         using (Graphics g = Graphics.FromImage(ls_fieldbp))
@@ -2383,7 +2388,7 @@ namespace OTSIncAReportGrids
                             g.CompositingQuality = System.Drawing.Drawing2D.CompositingQuality.HighQuality;
                             g.DrawImage(img, new Rectangle(0, 0, img.Width, img.Height));
                         }
-                        //ls_fieldbp.Save(@"D:\1.bmp");
+                     
                         img.Dispose();
                         img = null;
 
@@ -2394,7 +2399,7 @@ namespace OTSIncAReportGrids
                             intQuantity = intQuantity + 1;
                         for (int i_row = 0; i_row < drlist.Count(); i_row++)
                         {
-                            //string str_fieldid = drlist[i_row]["fieldid"].ToString();
+                            
                             string str_particleid = drlist[i_row]["particleid"].ToString();
                             string str_stdtypeid = drlist[i_row]["typeid"].ToString();
                             string str_offset_rect_X = drlist[i_row]["RectLeft"].ToString();
@@ -2419,14 +2424,13 @@ namespace OTSIncAReportGrids
 
                             g.DrawString(dt_FIeld.Rows[i]["id"].ToString() + "" + str_particleid.ToString(),
                                 new Font("黑体", 8), new SolidBrush(Color.Aqua), new PointF(ls_offsetx, offset_rect.Y));
+                            var bitmap = DrawRuler(ls_fieldbp, (int)RulerPixels, 2, gauge.ToString()+ "microns");
+                            dt_FIeld.Rows[i]["Field_pic"] = bitmap;
+                            //bitmap.Save("D:\\图片\\asd.bmp");
 
-                            dt_FIeld.Rows[i]["Field_pic"] = ls_fieldbp;
-
-                            //保存带有标记的帧图
-                            //ls_fieldbp.Save(str_path_FIELD_FILES_MARK + dt_FIeld.Rows[i]["id"].ToString() + ".bmp");
 
-                            //ls_fieldbp.Dispose();
                         }
+
                     }
                 }
 
@@ -2435,6 +2439,75 @@ namespace OTSIncAReportGrids
             GC.Collect();
             GC.WaitForPendingFinalizers();
         }
+        /// <summary>
+        /// 在图片上绘制标尺
+        /// </summary>
+        /// <param name="bitmap">图片</param>
+        /// <param name="LineLength">线长（像素）</param>
+        /// <param name="LineWidth">线宽（像素）</param>
+        /// <returns></returns>
+        private Bitmap DrawRuler(Bitmap bitmap, int LineLength, int LineWidth,string a_str)
+        {
+            if (bitmap == null)
+                throw new ArgumentNullException(nameof(bitmap));
+
+            // 创建一个新的Bitmap，并设置其大小与原图相同 
+            Bitmap rgbBitmap = new Bitmap(bitmap.Width, bitmap.Height);
+
+            using (Graphics graphics = Graphics.FromImage(rgbBitmap))
+            {
+                // 将原图转换为RGB格式，并绘制到新的Bitmap上  
+                graphics.DrawImage(bitmap, new Rectangle(0, 0, bitmap.Width, bitmap.Height));
+
+                // 设置线条颜色和宽度  
+                Pen pen = new Pen(Color.Black, LineWidth);
+                Font font = new Font("Arial", 20, GraphicsUnit.Pixel);
+                Brush brush = new SolidBrush(Color.Black);
+                StringFormat stringFormat = new StringFormat();
+                stringFormat.Alignment = StringAlignment.Center; // 居中对齐  
+                stringFormat.LineAlignment = StringAlignment.Center; // 居中对齐行  
+                                                                     // 绘制文字  
+
+                SizeF textSize = Graphics.FromImage(bitmap).MeasureString(a_str, font);
+                PointF point = new PointF();
+                // 计算文本应该开始的位置，使其居中  
+                point.X = (bitmap.Width - LineLength - 20) + ((LineLength - textSize.Width) / 2);
+                point.Y = bitmap.Height - 80;
+
+
+                graphics.DrawString(a_str, font, new SolidBrush(Color.Black), point);
+                graphics.DrawLine(pen, bitmap.Width - LineLength - 20, bitmap.Height - 40, bitmap.Width - 20, bitmap.Height - 40);
+                graphics.DrawLine(pen, bitmap.Width - LineLength - 20, bitmap.Height - 40, bitmap.Width - LineLength - 20, bitmap.Height - 50);
+                graphics.DrawLine(pen, bitmap.Width - 20, bitmap.Height - 40, bitmap.Width - 20, bitmap.Height - 50);
+
+
+            }
+            return rgbBitmap;
+        }
+        /// <summary>
+        /// 判断当前图片应该使用多大标尺
+        /// </summary>
+        /// <param name="a_value"> </param>
+        /// <returns></returns>
+        private int RulerSelection(float a_value)
+        {
+            int value = 0;
+            a_value = a_value / 2;
+            for (int i = 100; i < 2000; i += 50)
+            {
+                if (a_value < i)
+                {
+                    value = i - 50;
+                    break;
+                }
+            }
+            if (value == 0)
+            {
+                value = 2000;
+            }
+            return value;
+
+        }
 
         private void ImportSTDDb_Click(object sender, EventArgs e)
         {

OTSIncAReportApp/1-UI/OTSTemplateDesigner/Export_ReportTemplate.cs

@@ -851,7 +851,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             for (int geti = 0; geti < 11; geti++)
             {
                 double max_elementvalue = -1;
-                string max_elementname = "";
+                string max_elementname = " ";
                 int max_index = -1;
 
                 if (list_elementvalue.Count > 0)
@@ -945,6 +945,8 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             ResultFile resfile = m_otsreport_export.m_ReportApp.m_rstDataMgr.ResultFilesList[m_otsreport_export.m_ReportApp.m_rstDataMgr.getSelectedIndex()];
             //string str_libraryName = ((Dictionary<string, object>)((Dictionary<string, object>)((Dictionary<string, object>)resfile.ResultInfo["Sample"])["Members"])["MsrParams"])["STDName"].ToString();
             string str_libraryName = resfile.GetSTDName();
+            //string str_libraryName = resfile.GetSTDName();
+            //float PixelSize = resfile.GetPixelSize();
             if (m_otsreport_export.m_ReportApp.m_RptConfigFile.Systype == OTS_SysType_ID.CleannessA)
             {
                 dt.Columns.Add("Hardness", typeof(double));
@@ -1128,28 +1130,28 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
                     dr["ColName2"] = list_max_elementname[1];
                     dr["ColVal2"] = ParameterNormalization(colVal, list_max_elementvale[1]);
                     //元素3
-                    dr["ColName3"] = list_max_elementname[2];
+                    dr["ColName3"] = list_max_elementname[2] ;
                     dr["ColVal3"] = ParameterNormalization(colVal, list_max_elementvale[2]);
                     //元素4
-                    dr["ColName4"] = list_max_elementname[3];
+                    dr["ColName4"] = list_max_elementname[3] ;
                     dr["ColVal4"] = ParameterNormalization(colVal, list_max_elementvale[3]);
                     //元素5
-                    dr["ColName5"] = list_max_elementname[4];
+                    dr["ColName5"] = list_max_elementname[4] ;
                     dr["ColVal5"] = ParameterNormalization(colVal, list_max_elementvale[4]);
                     //元素6
-                    dr["ColName6"] = list_max_elementname[5];
+                    dr["ColName6"] = list_max_elementname[5] ;
                     dr["ColVal6"] = ParameterNormalization(colVal, list_max_elementvale[5]);
                     //元素7
                     dr["ColName7"] = list_max_elementname[6];
                     dr["ColVal7"] = ParameterNormalization(colVal, list_max_elementvale[6]);
                     //元素8
-                    dr["ColName8"] = list_max_elementname[7];
+                    dr["ColName8"] = list_max_elementname[7] ;
                     dr["ColVal8"] = ParameterNormalization(colVal, list_max_elementvale[7]);
                     //元素6
-                    dr["ColName9"] = list_max_elementname[8];
+                    dr["ColName9"] = list_max_elementname[8] ;
                     dr["ColVal9"] = ParameterNormalization(colVal, list_max_elementvale[8]);
                     //元素6
-                    dr["ColName9"] = list_max_elementname[9];
+                    dr["ColName9"] = list_max_elementname[9] ;
                     dr["ColVal9"] = ParameterNormalization(colVal, list_max_elementvale[9]);
 
                     DT_Largest20.Rows.Add(dr);
@@ -1331,8 +1333,11 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             FrameGraphSubTable.Columns.Add("pic", typeof(Bitmap));
 
             FrameGraphSubTable.Columns.Add("FieldId", typeof(int));
+            ResultFile resfile = m_otsreport_export.m_ReportApp.m_rstDataMgr.ResultFilesList[m_otsreport_export.m_ReportApp.m_rstDataMgr.getSelectedIndex()];
+          
+      
 
-
+           
             for (int i_row = 0; i_row < dt.Rows.Count; i_row++)
             {
                 if (dt.Rows[i_row]["element"].ToString() == "")
@@ -1360,7 +1365,8 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
                     bp_particle.Tag = new List<string>() { dt.Rows[i_row]["FieldId"].ToString(), dt.Rows[i_row]["ParticleId"].ToString(), dt.Rows[i_row]["TypeId"].ToString() };
 
                     DataRow dr = FrameGraphSubTable.NewRow();
-
+                    //var bitmap = DrawRuler(bp_particle, (int)RulerPixels, 2);
+                    //bitmap.Save("D:\\图片\\asd.bmp");
                     dr["pic"] = bp_particle;
                     //帧图列表列第一个字段的可选参数
                     dr["pid"] = datatable_data(dt, i_row, m_mbszclass.M_KLLBXX.str_cb_kllb_chartSort_p1);
@@ -1381,34 +1387,34 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
                     }
 
                     //元素1
-                    dr["ColName1"] = list_max_elementname[0];
+                    dr["ColName1"] = list_max_elementname[0] ;
                     dr["ColVal1"] = ParameterNormalization(colVal, list_max_elementvale[0]);
                     //元素2
-                    dr["ColName2"] = list_max_elementname[1];
+                    dr["ColName2"] = list_max_elementname[1] ;
                     dr["ColVal2"] = ParameterNormalization(colVal, list_max_elementvale[1]);
                     //元素3
-                    dr["ColName3"] = list_max_elementname[2];
+                    dr["ColName3"] = list_max_elementname[2] ;
                     dr["ColVal3"] = ParameterNormalization(colVal, list_max_elementvale[2]);
                     //元素4
-                    dr["ColName4"] = list_max_elementname[3];
+                    dr["ColName4"] = list_max_elementname[3] ;
                     dr["ColVal4"] = ParameterNormalization(colVal, list_max_elementvale[3]);
                     //元素5
-                    dr["ColName5"] = list_max_elementname[4];
+                    dr["ColName5"] = list_max_elementname[4] ;
                     dr["ColVal5"] = ParameterNormalization(colVal, list_max_elementvale[4]);
                     //元素6
-                    dr["ColName6"] = list_max_elementname[5];
+                    dr["ColName6"] = list_max_elementname[5] ;
                     dr["ColVal6"] = ParameterNormalization(colVal, list_max_elementvale[5]);
                     //元素6
-                    dr["ColName7"] = list_max_elementname[6];
+                    dr["ColName7"] = list_max_elementname[6] ;
                     dr["ColVal7"] = ParameterNormalization(colVal, list_max_elementvale[6]);
                     //元素6
-                    dr["ColName8"] = list_max_elementname[7];
+                    dr["ColName8"] = list_max_elementname[7] ;
                     dr["ColVal8"] = ParameterNormalization(colVal, list_max_elementvale[7]);
                     //元素6
-                    dr["ColName9"] = list_max_elementname[8];
+                    dr["ColName9"] = list_max_elementname[8] ;
                     dr["ColVal9"] = ParameterNormalization(colVal, list_max_elementvale[8]);
                     //元素6
-                    dr["ColName10"] = list_max_elementname[9];
+                    dr["ColName10"] = list_max_elementname[9] ;
                     dr["ColVal10"] = ParameterNormalization(colVal, list_max_elementvale[9]);
 
                     FrameGraphSubTable.Rows.Add(dr);
@@ -1418,7 +1424,9 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             data_A = FrameGraphSubTable.Copy();
 
         }
+       
 
+     
         public void ParticleSizeTable(c_TemplateClass m_mbszclass, out DataTable surface_dt, out DataTable partsize_dt, out DataTable class_dt, out DataTable subdivide_dt, out DataTable colid_data)
         {
             //全部大类
@@ -2133,11 +2141,11 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
                 g.DrawLine(mypen, new Point(x1_b + 10, x2_b), new Point(x1_b + 10 + 10, x2_b));
                 g.DrawLine(mypen, new Point(x1_c + 10 - 10, x2_c), new Point(y1_c + 10, y2_c));
 
-                g.DrawString((i * 10).ToString(), new Font("宋体", 8, FontStyle.Bold), new SolidBrush(Color.Black), new Point(x1_c  - 20, x2_c-5));
+                g.DrawString((i * 10).ToString(), new Font("Arial Unicode MS", 8, FontStyle.Bold), new SolidBrush(Color.Black), new Point(x1_c  - 20, x2_c-5));
 
-                g.DrawString((i * 10).ToString(), new Font("宋体", 8, FontStyle.Bold), new SolidBrush(Color.Black), new Point(y1_b , Line+8));
+                g.DrawString((i * 10).ToString(), new Font("Arial Unicode MS", 8, FontStyle.Bold), new SolidBrush(Color.Black), new Point(y1_b , Line+8));
 
-                g.DrawString(((10-i) * 10).ToString(), new Font("宋体", 8, FontStyle.Bold), new SolidBrush(Color.Black), new Point(x1_b + 20, x2_b-5));
+                g.DrawString(((10-i) * 10).ToString(), new Font("Arial Unicode MS", 8, FontStyle.Bold), new SolidBrush(Color.Black), new Point(x1_b + 20, x2_b-5));
             }
 
             for (int i = 0; i < dt_point_sort.Rows.Count; i++)
@@ -2148,9 +2156,9 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
                 g.FillRectangle(mysbrush, Convert.ToInt32(dt_point_sort.Rows[i]["X"]) + 8, 500 - Convert.ToInt32(dt_point_sort.Rows[i]["Y"]) - 2, 4, 5);
                 g.DrawRectangle(mypen, Convert.ToInt32(dt_point_sort.Rows[i]["X"]) + 7, 500 - Convert.ToInt32(dt_point_sort.Rows[i]["Y"]) - 2, 5, 5);
             }
-            Font myFont = new Font("宋体", 13, FontStyle.Bold);
+            Font myFont = new Font("Arial Unicode MS", 13, FontStyle.Bold);
 
-            Font Font_features = new Font("宋体", 10, FontStyle.Bold);
+            Font Font_features = new Font("Arial Unicode MS", 10, FontStyle.Bold);
             SolidBrush sbrush = new SolidBrush(Color.Black);
             g.DrawString("features:" + dt_point_sort.Rows.Count.ToString(), Font_features, sbrush, 400, 200);
 
@@ -2174,7 +2182,8 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             SolidBrush sbrush_White = new SolidBrush(Color.White);
             SolidBrush sbrush = new SolidBrush(Color.Black);
             g.FillRectangle(sbrush_White, 0, 0, 450, 115);
-            Font myFont = new Font("宋体", 10, FontStyle.Bold);
+            Font myFont = new Font("Arial Unicode MS", 10, FontStyle.Bold);
+            Font myFont2 = new Font("Arial Unicode MS", 10, FontStyle.Regular);
             g.DrawString("legend(length,microns)", myFont, sbrush, 140, 3);
             //legend(length,microns)
             Pen mypen = new Pen(Color.Black, 1);
@@ -2208,21 +2217,21 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
                     SolidBrush sbrush_Color = new SolidBrush(Color_list[i]);
                     g.DrawRectangle(mypen, 26, PositionJeight, 8, 8);
                     g.FillRectangle(sbrush_Color, 27, PositionJeight + 1, 7, 7);
-                    g.DrawString(listName[i].ToString()+ str_unit, myFont, sbrush, 38, PositionJeight-2);
+                    g.DrawString(listName[i].ToString()+ str_unit, myFont2, sbrush, 38, PositionJeight-2);
                 }
                 if (i+1 < listName.Count)
                 {
                     SolidBrush sbrush_Color = new SolidBrush(Color_list[i+1]);
                     g.DrawRectangle(mypen, 170, PositionJeight, 8, 8);
                     g.FillRectangle(sbrush_Color, 171, PositionJeight + 1, 7, 7);
-                    g.DrawString(listName[i+1].ToString()+ str_unit, myFont, sbrush, 182, PositionJeight - 2);
+                    g.DrawString(listName[i+1].ToString()+ str_unit, myFont2, sbrush, 182, PositionJeight - 2);
                 }
                 if (i + 2 < listName.Count)
                 {
                     SolidBrush sbrush_Color = new SolidBrush(Color_list[i + 2]);
                     g.DrawRectangle(mypen, 314, PositionJeight, 8, 8);
                     g.FillRectangle(sbrush_Color, 315, PositionJeight + 1, 7, 7);
-                    g.DrawString(listName[i + 2].ToString()+ str_unit, myFont, sbrush, 326, PositionJeight - 2);
+                    g.DrawString(listName[i + 2].ToString()+ str_unit, myFont2, sbrush, 326, PositionJeight - 2);
                 }
 
                 PositionJeight = PositionJeight + 15;

OTSIncAReportApp/1-UI/OTSTemplateDesigner/OTSReport_TemplateDesignerRM.Designer.cs

@@ -50,8 +50,6 @@
             this.tb_khh = new System.Windows.Forms.TextBox();
             this.label2 = new System.Windows.Forms.Label();
             this.groupBox1 = new System.Windows.Forms.GroupBox();
-            this.tb_ymwb = new System.Windows.Forms.TextBox();
-            this.label8 = new System.Windows.Forms.Label();
             this.groupBox4 = new System.Windows.Forms.GroupBox();
             this.ck_klcc_xsddt = new System.Windows.Forms.CheckBox();
             this.label111231 = new System.Windows.Forms.Label();
@@ -295,7 +293,7 @@
             // 
             // tb_yjwb
             // 
-            this.tb_yjwb.Location = new System.Drawing.Point(7, 89);
+            this.tb_yjwb.Location = new System.Drawing.Point(8, 38);
             this.tb_yjwb.Margin = new System.Windows.Forms.Padding(2);
             this.tb_yjwb.Name = "tb_yjwb";
             this.tb_yjwb.Size = new System.Drawing.Size(250, 21);
@@ -304,7 +302,7 @@
             // label10
             // 
             this.label10.AutoSize = true;
-            this.label10.Location = new System.Drawing.Point(5, 75);
+            this.label10.Location = new System.Drawing.Point(6, 24);
             this.label10.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label10.Name = "label10";
             this.label10.Size = new System.Drawing.Size(53, 12);
@@ -323,7 +321,7 @@
             // 
             // tb_khh
             // 
-            this.tb_khh.Location = new System.Drawing.Point(7, 147);
+            this.tb_khh.Location = new System.Drawing.Point(8, 96);
             this.tb_khh.Margin = new System.Windows.Forms.Padding(2);
             this.tb_khh.Name = "tb_khh";
             this.tb_khh.Size = new System.Drawing.Size(250, 21);
@@ -333,7 +331,7 @@
             // label2
             // 
             this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(5, 133);
+            this.label2.Location = new System.Drawing.Point(6, 82);
             this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(41, 12);
@@ -345,38 +343,18 @@
             // 
             this.groupBox1.Controls.Add(this.ck_ym);
             this.groupBox1.Controls.Add(this.label9);
-            this.groupBox1.Controls.Add(this.tb_ymwb);
             this.groupBox1.Controls.Add(this.tb_yjwb);
             this.groupBox1.Controls.Add(this.tb_khh);
             this.groupBox1.Controls.Add(this.label2);
             this.groupBox1.Controls.Add(this.label10);
-            this.groupBox1.Controls.Add(this.label8);
             this.groupBox1.Location = new System.Drawing.Point(3, 263);
             this.groupBox1.Margin = new System.Windows.Forms.Padding(2);
             this.groupBox1.Name = "groupBox1";
             this.groupBox1.Padding = new System.Windows.Forms.Padding(2);
-            this.groupBox1.Size = new System.Drawing.Size(263, 181);
+            this.groupBox1.Size = new System.Drawing.Size(263, 132);
             this.groupBox1.TabIndex = 0;
             this.groupBox1.TabStop = false;
-            this.groupBox1.Text = "页眉页脚设置";
-            // 
-            // tb_ymwb
-            // 
-            this.tb_ymwb.Location = new System.Drawing.Point(7, 33);
-            this.tb_ymwb.Margin = new System.Windows.Forms.Padding(2);
-            this.tb_ymwb.Name = "tb_ymwb";
-            this.tb_ymwb.Size = new System.Drawing.Size(250, 21);
-            this.tb_ymwb.TabIndex = 42;
-            // 
-            // label8
-            // 
-            this.label8.AutoSize = true;
-            this.label8.Location = new System.Drawing.Point(5, 17);
-            this.label8.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.label8.Name = "label8";
-            this.label8.Size = new System.Drawing.Size(53, 12);
-            this.label8.TabIndex = 41;
-            this.label8.Text = "页眉文本";
+            this.groupBox1.Text = "页脚设置";
             // 
             // groupBox4
             // 
@@ -392,7 +370,7 @@
             this.groupBox4.Controls.Add(this.cb_klcc_jsfs);
             this.groupBox4.Controls.Add(this.label15);
             this.groupBox4.Controls.Add(this.label14);
-            this.groupBox4.Location = new System.Drawing.Point(3, 448);
+            this.groupBox4.Location = new System.Drawing.Point(3, 399);
             this.groupBox4.Margin = new System.Windows.Forms.Padding(2);
             this.groupBox4.Name = "groupBox4";
             this.groupBox4.Padding = new System.Windows.Forms.Padding(2);
@@ -529,7 +507,7 @@
             this.groupBox6.Controls.Add(this.button4);
             this.groupBox6.Controls.Add(this.ck_ysfx_xsmk);
             this.groupBox6.Controls.Add(this.label25);
-            this.groupBox6.Location = new System.Drawing.Point(3, 671);
+            this.groupBox6.Location = new System.Drawing.Point(3, 622);
             this.groupBox6.Margin = new System.Windows.Forms.Padding(2);
             this.groupBox6.Name = "groupBox6";
             this.groupBox6.Padding = new System.Windows.Forms.Padding(2);
@@ -608,7 +586,7 @@
             this.groupBox7.Controls.Add(this.label38);
             this.groupBox7.Controls.Add(this.label33);
             this.groupBox7.Controls.Add(this.label42);
-            this.groupBox7.Location = new System.Drawing.Point(3, 809);
+            this.groupBox7.Location = new System.Drawing.Point(3, 760);
             this.groupBox7.Margin = new System.Windows.Forms.Padding(2);
             this.groupBox7.Name = "groupBox7";
             this.groupBox7.Padding = new System.Windows.Forms.Padding(2);
@@ -718,7 +696,7 @@
             this.groupBox8.Controls.Add(this.groupBox_px);
             this.groupBox8.Controls.Add(this.ck_kllb_xsmk);
             this.groupBox8.Controls.Add(this.label34);
-            this.groupBox8.Location = new System.Drawing.Point(3, 1240);
+            this.groupBox8.Location = new System.Drawing.Point(3, 1191);
             this.groupBox8.Margin = new System.Windows.Forms.Padding(2);
             this.groupBox8.Name = "groupBox8";
             this.groupBox8.Padding = new System.Windows.Forms.Padding(2);
@@ -1080,7 +1058,7 @@
             this.groupBox211.Controls.Add(this.label1311);
             this.groupBox211.Controls.Add(this.label1211);
             this.groupBox211.Controls.Add(this.ck_jzwzb_surface);
-            this.groupBox211.Location = new System.Drawing.Point(3, 1774);
+            this.groupBox211.Location = new System.Drawing.Point(3, 1725);
             this.groupBox211.Name = "groupBox211";
             this.groupBox211.Size = new System.Drawing.Size(263, 81);
             this.groupBox211.TabIndex = 8;
@@ -1127,7 +1105,7 @@
             // groupBZ
             // 
             this.groupBZ.Controls.Add(this.textBox_strBZ);
-            this.groupBZ.Location = new System.Drawing.Point(3, 1861);
+            this.groupBZ.Location = new System.Drawing.Point(3, 1812);
             this.groupBZ.Name = "groupBZ";
             this.groupBZ.Size = new System.Drawing.Size(263, 139);
             this.groupBZ.TabIndex = 7;
@@ -1261,8 +1239,6 @@
         private System.Windows.Forms.TextBox tb_yjwb;
         private System.Windows.Forms.Label label10;
         private System.Windows.Forms.Label label9;
-        private System.Windows.Forms.TextBox tb_ymwb;
-        private System.Windows.Forms.Label label8;
         private System.Windows.Forms.GroupBox groupBox4;
         private System.Windows.Forms.CheckBox ck_klcc_xsmk;
         private System.Windows.Forms.Label label17;

OTSIncAReportApp/1-UI/OTSTemplateDesigner/OTSReport_TemplateDesignerRM.cs

@@ -649,7 +649,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             m_OTSReport_Export.m_mbszclass.M_SY.b_ck_jggk = ck_jggk.Checked;
 
             //页眉页脚
-            m_OTSReport_Export.m_mbszclass.M_YMYJ.str_tb_ymwb = tb_ymwb.Text;
+            //m_OTSReport_Export.m_mbszclass.M_YMYJ.str_tb_ymwb = tb_ymwb.Text;
             m_OTSReport_Export.m_mbszclass.M_YMYJ.str_tb_KHH = tb_khh.Text;
             m_OTSReport_Export.m_mbszclass.M_YMYJ.b_ck_ym = ck_ym.Checked;
             m_OTSReport_Export.m_mbszclass.M_YMYJ.str_tb_yjwb = tb_yjwb.Text;
@@ -765,7 +765,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             ck_jggk.Checked = m_OTSReport_Export.m_mbszclass.M_SY.b_ck_jggk;
 
             //页眉页脚
-            tb_ymwb.Text = m_OTSReport_Export.m_mbszclass.M_YMYJ.str_tb_ymwb;
+            //tb_ymwb.Text = m_OTSReport_Export.m_mbszclass.M_YMYJ.str_tb_ymwb;
             tb_khh.Text = m_OTSReport_Export.m_mbszclass.M_YMYJ.str_tb_KHH;
             ck_ym.Checked = m_OTSReport_Export.m_mbszclass.M_YMYJ.b_ck_ym;
             tb_yjwb.Text = m_OTSReport_Export.m_mbszclass.M_YMYJ.str_tb_yjwb;

OTSIncAReportApp/ReportTemplate/OTS_DEVReport.Designer.cs

@@ -32,13 +32,23 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(OTS_DEVReport));
             this.TopMargin = new DevExpress.XtraReports.UI.TopMarginBand();
             this.xrLine1 = new DevExpress.XtraReports.UI.XRLine();
-            this.dev_ym = new DevExpress.XtraReports.UI.XRLabel();
             this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
             this.BottomMargin = new DevExpress.XtraReports.UI.BottomMarginBand();
             this.xrLabel_pageinfo = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLine2 = new DevExpress.XtraReports.UI.XRLine();
             this.dev_yj = new DevExpress.XtraReports.UI.XRLabel();
             this.Detail = new DevExpress.XtraReports.UI.DetailBand();
+            this.xrTable3 = new DevExpress.XtraReports.UI.XRTable();
+            this.xrTableRow24 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell32 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xtParticleResultsB = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xtParticleResultsC = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xtParticleResultsD = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xtParticleResultsE = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xtParticleResultsF = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xtParticleResultsG = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xtParticleResultsH = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xtParticleResultsI = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrChart1 = new DevExpress.XtraReports.UI.XRChart();
             this.xrLabel_size_IconQuestion_Subdivision = new DevExpress.XtraReports.UI.XRLabel();
             this.xrChart_ParticelSizeSubdivision = new DevExpress.XtraReports.UI.XRChart();
@@ -179,17 +189,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             this.dev_fbt = new DevExpress.XtraReports.UI.XRLabel();
             this.dev_zbt = new DevExpress.XtraReports.UI.XRLabel();
             this.xrPictureBox2 = new DevExpress.XtraReports.UI.XRPictureBox();
-            this.xrTable3 = new DevExpress.XtraReports.UI.XRTable();
-            this.xrTableRow24 = new DevExpress.XtraReports.UI.XRTableRow();
-            this.xrTableCell32 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xtParticleResultsB = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xtParticleResultsC = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xtParticleResultsD = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xtParticleResultsE = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xtParticleResultsF = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xtParticleResultsG = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xtParticleResultsH = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xtParticleResultsI = new DevExpress.XtraReports.UI.XRTableCell();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrChart1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrChart_ParticelSizeSubdivision)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTb_ElementAnalysis)).BeginInit();
@@ -202,14 +202,12 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             ((System.ComponentModel.ISupportInitialize)(this.xrChart_ParticelSizeCalss)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTa_ParticleSizeTable)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
             // 
             // TopMargin
             // 
             this.TopMargin.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
             this.xrLine1,
-            this.dev_ym,
             this.xrPictureBox1});
             this.TopMargin.HeightF = 73F;
             this.TopMargin.Name = "TopMargin";
@@ -221,19 +219,6 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             this.xrLine1.Name = "xrLine1";
             this.xrLine1.SizeF = new System.Drawing.SizeF(667.9998F, 23F);
             // 
-            // dev_ym
-            // 
-            this.dev_ym.Font = new System.Drawing.Font("Arial", 12F);
-            this.dev_ym.LocationFloat = new DevExpress.Utils.PointFloat(166.2501F, 17.77083F);
-            this.dev_ym.Multiline = true;
-            this.dev_ym.Name = "dev_ym";
-            this.dev_ym.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.dev_ym.SizeF = new System.Drawing.SizeF(511.7498F, 23F);
-            this.dev_ym.StylePriority.UseFont = false;
-            this.dev_ym.StylePriority.UseTextAlignment = false;
-            this.dev_ym.Text = "dev_ym";
-            this.dev_ym.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
-            // 
             // xrPictureBox1
             // 
             this.xrPictureBox1.ImageAlignment = DevExpress.XtraPrinting.ImageAlignment.MiddleCenter;
@@ -315,9 +300,130 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             this.dev_fbt,
             this.dev_zbt,
             this.xrPictureBox2});
-            this.Detail.HeightF = 4513.333F;
+            this.Detail.HeightF = 4719.417F;
             this.Detail.Name = "Detail";
             // 
+            // xrTable3
+            // 
+            this.xrTable3.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(10.0001F, 1039.917F);
+            this.xrTable3.Name = "xrTable3";
+            this.xrTable3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 96F);
+            this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+            this.xrTableRow24});
+            this.xrTable3.SizeF = new System.Drawing.SizeF(667.9998F, 25F);
+            this.xrTable3.StylePriority.UseBorders = false;
+            this.xrTable3.Visible = false;
+            // 
+            // xrTableRow24
+            // 
+            this.xrTableRow24.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell32,
+            this.xtParticleResultsB,
+            this.xtParticleResultsC,
+            this.xtParticleResultsD,
+            this.xtParticleResultsE,
+            this.xtParticleResultsF,
+            this.xtParticleResultsG,
+            this.xtParticleResultsH,
+            this.xtParticleResultsI});
+            this.xrTableRow24.Name = "xrTableRow24";
+            this.xrTableRow24.Weight = 1D;
+            // 
+            // xrTableCell32
+            // 
+            this.xrTableCell32.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell32.Multiline = true;
+            this.xrTableCell32.Name = "xrTableCell32";
+            this.xrTableCell32.StylePriority.UseBorders = false;
+            this.xrTableCell32.StylePriority.UseTextAlignment = false;
+            this.xrTableCell32.Text = "总数量";
+            this.xrTableCell32.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
+            this.xrTableCell32.Weight = 1.1360665286429279D;
+            // 
+            // xtParticleResultsB
+            // 
+            this.xtParticleResultsB.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xtParticleResultsB.Multiline = true;
+            this.xtParticleResultsB.Name = "xtParticleResultsB";
+            this.xtParticleResultsB.StylePriority.UseBorders = false;
+            this.xtParticleResultsB.Text = "xtParticleResultsB";
+            this.xtParticleResultsB.Weight = 0.31241855456998036D;
+            // 
+            // xtParticleResultsC
+            // 
+            this.xtParticleResultsC.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xtParticleResultsC.Multiline = true;
+            this.xtParticleResultsC.Name = "xtParticleResultsC";
+            this.xtParticleResultsC.StylePriority.UseBorders = false;
+            this.xtParticleResultsC.Text = "xtParticleResultsC";
+            this.xtParticleResultsC.Weight = 0.33513938981554842D;
+            // 
+            // xtParticleResultsD
+            // 
+            this.xtParticleResultsD.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xtParticleResultsD.Multiline = true;
+            this.xtParticleResultsD.Name = "xtParticleResultsD";
+            this.xtParticleResultsD.StylePriority.UseBorders = false;
+            this.xtParticleResultsD.Text = "xtParticleResultsD";
+            this.xtParticleResultsD.Weight = 0.33513938981554842D;
+            // 
+            // xtParticleResultsE
+            // 
+            this.xtParticleResultsE.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xtParticleResultsE.Multiline = true;
+            this.xtParticleResultsE.Name = "xtParticleResultsE";
+            this.xtParticleResultsE.StylePriority.UseBorders = false;
+            this.xtParticleResultsE.Text = "xtParticleResultsE";
+            this.xtParticleResultsE.Weight = 0.33513938981554842D;
+            // 
+            // xtParticleResultsF
+            // 
+            this.xtParticleResultsF.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xtParticleResultsF.Multiline = true;
+            this.xtParticleResultsF.Name = "xtParticleResultsF";
+            this.xtParticleResultsF.StylePriority.UseBorders = false;
+            this.xtParticleResultsF.Text = "xtParticleResultsF";
+            this.xtParticleResultsF.Weight = 0.33513938981554842D;
+            // 
+            // xtParticleResultsG
+            // 
+            this.xtParticleResultsG.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xtParticleResultsG.Multiline = true;
+            this.xtParticleResultsG.Name = "xtParticleResultsG";
+            this.xtParticleResultsG.StylePriority.UseBorders = false;
+            this.xtParticleResultsG.Text = "xtParticleResultsG";
+            this.xtParticleResultsG.Weight = 0.33513938981554842D;
+            // 
+            // xtParticleResultsH
+            // 
+            this.xtParticleResultsH.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xtParticleResultsH.Multiline = true;
+            this.xtParticleResultsH.Name = "xtParticleResultsH";
+            this.xtParticleResultsH.StylePriority.UseBorders = false;
+            this.xtParticleResultsH.Text = "xtParticleResultsH";
+            this.xtParticleResultsH.Weight = 0.33513938981554842D;
+            // 
+            // xtParticleResultsI
+            // 
+            this.xtParticleResultsI.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xtParticleResultsI.Multiline = true;
+            this.xtParticleResultsI.Name = "xtParticleResultsI";
+            this.xtParticleResultsI.StylePriority.UseBorders = false;
+            this.xtParticleResultsI.Text = "xtParticleResultsI";
+            this.xtParticleResultsI.Weight = 0.33513938981554842D;
+            // 
             // xrChart1
             // 
             this.xrChart1.BorderColor = System.Drawing.Color.Black;
@@ -330,11 +436,13 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             // 
             // xrLabel_size_IconQuestion_Subdivision
             // 
+            this.xrLabel_size_IconQuestion_Subdivision.BackColor = System.Drawing.Color.DarkGray;
             this.xrLabel_size_IconQuestion_Subdivision.LocationFloat = new DevExpress.Utils.PointFloat(30.41636F, 2159.292F);
             this.xrLabel_size_IconQuestion_Subdivision.Multiline = true;
             this.xrLabel_size_IconQuestion_Subdivision.Name = "xrLabel_size_IconQuestion_Subdivision";
             this.xrLabel_size_IconQuestion_Subdivision.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel_size_IconQuestion_Subdivision.SizeF = new System.Drawing.SizeF(630F, 23F);
+            this.xrLabel_size_IconQuestion_Subdivision.StylePriority.UseBackColor = false;
             this.xrLabel_size_IconQuestion_Subdivision.StylePriority.UseTextAlignment = false;
             this.xrLabel_size_IconQuestion_Subdivision.Text = "xrLabel_size_IconQuestion_Subdivision";
             this.xrLabel_size_IconQuestion_Subdivision.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
@@ -726,13 +834,13 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             | DevExpress.XtraPrinting.BorderSide.Right) 
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
             this.xrTable_kllb_surface.BorderWidth = 0.5F;
-            this.xrTable_kllb_surface.LocationFloat = new DevExpress.Utils.PointFloat(0F, 3858.858F);
+            this.xrTable_kllb_surface.LocationFloat = new DevExpress.Utils.PointFloat(0F, 3868.858F);
             this.xrTable_kllb_surface.Name = "xrTable_kllb_surface";
             this.xrTable_kllb_surface.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 96F);
             this.xrTable_kllb_surface.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
             this.xrTableRow16,
             this.xrTableRow17});
-            this.xrTable_kllb_surface.SizeF = new System.Drawing.SizeF(688F, 60F);
+            this.xrTable_kllb_surface.SizeF = new System.Drawing.SizeF(688F, 50F);
             this.xrTable_kllb_surface.StylePriority.UseBorders = false;
             this.xrTable_kllb_surface.StylePriority.UseBorderWidth = false;
             this.xrTable_kllb_surface.Visible = false;
@@ -747,7 +855,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             // xrTable_kllb
             // 
             this.xrTable_kllb.BackColor = System.Drawing.Color.DarkGray;
-            this.xrTable_kllb.Font = new System.Drawing.Font("宋体", 18F, System.Drawing.FontStyle.Bold);
+            this.xrTable_kllb.Font = new System.Drawing.Font("Arial", 9.75F);
             this.xrTable_kllb.Multiline = true;
             this.xrTable_kllb.Name = "xrTable_kllb";
             this.xrTable_kllb.StylePriority.UseBackColor = false;
@@ -773,11 +881,13 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             // 
             // xrLabel_inca_pic_subdivision
             // 
+            this.xrLabel_inca_pic_subdivision.BackColor = System.Drawing.Color.DarkGray;
             this.xrLabel_inca_pic_subdivision.LocationFloat = new DevExpress.Utils.PointFloat(30.41636F, 3357.528F);
             this.xrLabel_inca_pic_subdivision.Multiline = true;
             this.xrLabel_inca_pic_subdivision.Name = "xrLabel_inca_pic_subdivision";
             this.xrLabel_inca_pic_subdivision.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel_inca_pic_subdivision.SizeF = new System.Drawing.SizeF(630F, 23F);
+            this.xrLabel_inca_pic_subdivision.StylePriority.UseBackColor = false;
             this.xrLabel_inca_pic_subdivision.StylePriority.UseTextAlignment = false;
             this.xrLabel_inca_pic_subdivision.Text = "xrLabel_inca_pic_subdivision";
             this.xrLabel_inca_pic_subdivision.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
@@ -796,11 +906,13 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             // 
             // xrLabel_inca_pic_class
             // 
+            this.xrLabel_inca_pic_class.BackColor = System.Drawing.Color.DarkGray;
             this.xrLabel_inca_pic_class.LocationFloat = new DevExpress.Utils.PointFloat(30.41636F, 2934.528F);
             this.xrLabel_inca_pic_class.Multiline = true;
             this.xrLabel_inca_pic_class.Name = "xrLabel_inca_pic_class";
             this.xrLabel_inca_pic_class.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel_inca_pic_class.SizeF = new System.Drawing.SizeF(629.9998F, 23F);
+            this.xrLabel_inca_pic_class.StylePriority.UseBackColor = false;
             this.xrLabel_inca_pic_class.StylePriority.UseTextAlignment = false;
             this.xrLabel_inca_pic_class.Text = "xrLabel_inca_pic_class";
             this.xrLabel_inca_pic_class.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
@@ -1081,11 +1193,13 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             // 
             // xrLabel_size_IconQuestion_Class
             // 
+            this.xrLabel_size_IconQuestion_Class.BackColor = System.Drawing.Color.DarkGray;
             this.xrLabel_size_IconQuestion_Class.LocationFloat = new DevExpress.Utils.PointFloat(30.41611F, 1736.292F);
             this.xrLabel_size_IconQuestion_Class.Multiline = true;
             this.xrLabel_size_IconQuestion_Class.Name = "xrLabel_size_IconQuestion_Class";
             this.xrLabel_size_IconQuestion_Class.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel_size_IconQuestion_Class.SizeF = new System.Drawing.SizeF(630F, 23F);
+            this.xrLabel_size_IconQuestion_Class.StylePriority.UseBackColor = false;
             this.xrLabel_size_IconQuestion_Class.StylePriority.UseTextAlignment = false;
             this.xrLabel_size_IconQuestion_Class.Text = "xrLabel_size_IconQuestion_Class";
             this.xrLabel_size_IconQuestion_Class.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
@@ -1135,7 +1249,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             // dev_DimensionTable
             // 
             this.dev_DimensionTable.BackColor = System.Drawing.Color.DarkGray;
-            this.dev_DimensionTable.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Bold);
+            this.dev_DimensionTable.Font = new System.Drawing.Font("Arial", 9.75F);
             this.dev_DimensionTable.Multiline = true;
             this.dev_DimensionTable.Name = "dev_DimensionTable";
             this.dev_DimensionTable.StylePriority.UseBackColor = false;
@@ -1704,127 +1818,6 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             this.xrPictureBox2.Sizing = DevExpress.XtraPrinting.ImageSizeMode.Squeeze;
             this.xrPictureBox2.Visible = false;
             // 
-            // xrTable3
-            // 
-            this.xrTable3.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
-            | DevExpress.XtraPrinting.BorderSide.Right) 
-            | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(10.0001F, 1039.917F);
-            this.xrTable3.Name = "xrTable3";
-            this.xrTable3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 96F);
-            this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
-            this.xrTableRow24});
-            this.xrTable3.SizeF = new System.Drawing.SizeF(667.9998F, 25F);
-            this.xrTable3.StylePriority.UseBorders = false;
-            this.xrTable3.Visible = false;
-            // 
-            // xrTableRow24
-            // 
-            this.xrTableRow24.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
-            this.xrTableCell32,
-            this.xtParticleResultsB,
-            this.xtParticleResultsC,
-            this.xtParticleResultsD,
-            this.xtParticleResultsE,
-            this.xtParticleResultsF,
-            this.xtParticleResultsG,
-            this.xtParticleResultsH,
-            this.xtParticleResultsI});
-            this.xrTableRow24.Name = "xrTableRow24";
-            this.xrTableRow24.Weight = 1D;
-            // 
-            // xrTableCell32
-            // 
-            this.xrTableCell32.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
-            | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrTableCell32.Multiline = true;
-            this.xrTableCell32.Name = "xrTableCell32";
-            this.xrTableCell32.StylePriority.UseBorders = false;
-            this.xrTableCell32.StylePriority.UseTextAlignment = false;
-            this.xrTableCell32.Text = "总数量";
-            this.xrTableCell32.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
-            this.xrTableCell32.Weight = 1.1360665286429279D;
-            // 
-            // xtParticleResultsB
-            // 
-            this.xtParticleResultsB.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
-            | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xtParticleResultsB.Multiline = true;
-            this.xtParticleResultsB.Name = "xtParticleResultsB";
-            this.xtParticleResultsB.StylePriority.UseBorders = false;
-            this.xtParticleResultsB.Text = "xtParticleResultsB";
-            this.xtParticleResultsB.Weight = 0.31241855456998036D;
-            // 
-            // xtParticleResultsC
-            // 
-            this.xtParticleResultsC.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
-            | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xtParticleResultsC.Multiline = true;
-            this.xtParticleResultsC.Name = "xtParticleResultsC";
-            this.xtParticleResultsC.StylePriority.UseBorders = false;
-            this.xtParticleResultsC.Text = "xtParticleResultsC";
-            this.xtParticleResultsC.Weight = 0.33513938981554842D;
-            // 
-            // xtParticleResultsD
-            // 
-            this.xtParticleResultsD.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
-            | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xtParticleResultsD.Multiline = true;
-            this.xtParticleResultsD.Name = "xtParticleResultsD";
-            this.xtParticleResultsD.StylePriority.UseBorders = false;
-            this.xtParticleResultsD.Text = "xtParticleResultsD";
-            this.xtParticleResultsD.Weight = 0.33513938981554842D;
-            // 
-            // xtParticleResultsE
-            // 
-            this.xtParticleResultsE.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
-            | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xtParticleResultsE.Multiline = true;
-            this.xtParticleResultsE.Name = "xtParticleResultsE";
-            this.xtParticleResultsE.StylePriority.UseBorders = false;
-            this.xtParticleResultsE.Text = "xtParticleResultsE";
-            this.xtParticleResultsE.Weight = 0.33513938981554842D;
-            // 
-            // xtParticleResultsF
-            // 
-            this.xtParticleResultsF.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
-            | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xtParticleResultsF.Multiline = true;
-            this.xtParticleResultsF.Name = "xtParticleResultsF";
-            this.xtParticleResultsF.StylePriority.UseBorders = false;
-            this.xtParticleResultsF.Text = "xtParticleResultsF";
-            this.xtParticleResultsF.Weight = 0.33513938981554842D;
-            // 
-            // xtParticleResultsG
-            // 
-            this.xtParticleResultsG.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
-            | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xtParticleResultsG.Multiline = true;
-            this.xtParticleResultsG.Name = "xtParticleResultsG";
-            this.xtParticleResultsG.StylePriority.UseBorders = false;
-            this.xtParticleResultsG.Text = "xtParticleResultsG";
-            this.xtParticleResultsG.Weight = 0.33513938981554842D;
-            // 
-            // xtParticleResultsH
-            // 
-            this.xtParticleResultsH.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
-            | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xtParticleResultsH.Multiline = true;
-            this.xtParticleResultsH.Name = "xtParticleResultsH";
-            this.xtParticleResultsH.StylePriority.UseBorders = false;
-            this.xtParticleResultsH.Text = "xtParticleResultsH";
-            this.xtParticleResultsH.Weight = 0.33513938981554842D;
-            // 
-            // xtParticleResultsI
-            // 
-            this.xtParticleResultsI.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
-            | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xtParticleResultsI.Multiline = true;
-            this.xtParticleResultsI.Name = "xtParticleResultsI";
-            this.xtParticleResultsI.StylePriority.UseBorders = false;
-            this.xtParticleResultsI.Text = "xtParticleResultsI";
-            this.xtParticleResultsI.Weight = 0.33513938981554842D;
-            // 
             // OTS_DEVReport
             // 
             this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -1834,6 +1827,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             this.Font = new System.Drawing.Font("Arial", 9.75F);
             this.Margins = new System.Drawing.Printing.Margins(77, 85, 73, 55);
             this.Version = "21.2";
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrChart1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrChart_ParticelSizeSubdivision)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTb_ElementAnalysis)).EndInit();
@@ -1846,7 +1840,6 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             ((System.ComponentModel.ISupportInitialize)(this.xrChart_ParticelSizeCalss)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTa_ParticleSizeTable)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
 
         }
@@ -1856,7 +1849,6 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
         private DevExpress.XtraReports.UI.TopMarginBand TopMargin;
         private DevExpress.XtraReports.UI.BottomMarginBand BottomMargin;
         private DevExpress.XtraReports.UI.DetailBand Detail;
-        private DevExpress.XtraReports.UI.XRLabel dev_ym;
         private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1;
         private DevExpress.XtraReports.UI.XRLabel dev_yj;
         private DevExpress.XtraReports.UI.XRLabel dev_zbt;

OTSIncAReportApp/ReportTemplate/OTS_DEVReport.cs

@@ -16,7 +16,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
     {
         public OTSReport_Export m_otsreport_export;
         //string typeface = "Arial Unicode MS";
-        string Schriftart_chinese = "微软雅黑";
+        string Schriftart_chinese = "Arial Unicode MS";
         string Schriftart_english = "Arial Unicode MS";
         List<string> TemplateList;
         Export_ReportTemplate export_ReportTemplate;
@@ -153,7 +153,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
 
             #endregion
             #region 加载模板设置文档数据
-            setXRLabelData(dev_ym, TemplateClass.M_YMYJ.str_tb_ymwb.ToString());//页眉
+            //setXRLabelData(dev_ym, TemplateClass.M_YMYJ.str_tb_ymwb.ToString());//页眉
             setXRLabelData(dev_yj, TemplateClass.M_YMYJ.str_tb_yjwb.ToString());//页脚
             setXRLabelData(dev_zbt, TemplateClass.M_SY.str_tb_ZBT.ToString());//主标题
             setXRLabelData(dev_fbt, TemplateClass.M_SY.str_tb_FBT.ToString());//副标题
@@ -205,7 +205,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             dev_size_6.Text = ls_partsize_dt.Rows[0]["c6"].ToString();
             dev_size_7.Text = ls_partsize_dt.Rows[0]["c7"].ToString();
             dev_DimensionTable_2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
-            dev_DimensionTable_2.Text = dev_DimensionTable_2.Text.ToString() + TemplateClass.M_KLFXJG.str_cb_klcc_jsfs.ToString();
+            dev_DimensionTable_2.Text = dev_DimensionTable_2.Text.ToString() + TemplateClass.M_KLFXJG.str_cb_klcc_jsfs.ToString() + ", microns";
             dev_DimensionTable_2.Font = new Font(Schriftart_chinese, dev_DimensionTable_2.Font.Size);
             for (int i = 0; i < surface_dt.Rows.Count; i++)
             {
@@ -811,7 +811,7 @@ 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;
-            xrTableCell2.Text = "Selected particles based on：" + TemplateClass.M_KLLBXX.str_cb_kllb_sort_p1.ToString() + ", Descending";
+            xrTableCell2.Text = "Selected particles based on：" + TemplateClass.M_KLLBXX.str_cb_kllb_sort_p1.ToString();
             DataTable dataTable = export_ReportTemplate.Get_dev_kllb_data(TemplateClass);
 
             for (int i = 0; i < dataTable.Rows.Count; i++)
@@ -900,24 +900,29 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
                             xRTable.Rows[0].Cells[2].Text = TemplateClass.M_KLLBXX.str_cb_kllb_chartSort_p1.ToString();
                             xRTable.Rows[0].Cells[3].Text = TemplateClass.M_KLLBXX.str_cb_kllb_chartSort_p2.ToString();
 
-                            XRPictureBox xRPicture1 = new XRPictureBox();
-                            xRPicture1.ImageSource = new ImageSource((Bitmap)listData[a].Rows[b]["pic"]);
-                            xRPicture1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.Squeeze;
-                            xRPicture1.SizeF = new SizeF(94, 35);
-                            //xRPicture1.BackColor = Color.DarkGray;
-                            xRTable.Rows[1].Cells[0].Controls.Add(xRPicture1);
+                        
                             xRTable.Rows[1].Cells[1].Text = listData[a].Rows[b]["Class"].ToString();
                             xRTable.Rows[1].Cells[2].Text = listData[a].Rows[b]["pid"].ToString();
                             xRTable.Rows[1].Cells[3].Text = listData[a].Rows[b]["Size"].ToString();
 
-                            for (int c = 0; c < 10; c++)
+                            for (int c = 1; c < 11; c++)
                             {
-                                xRTable.Rows[2].Cells[c].Text = listData[a].Rows[b]["ColName" + (c + 1).ToString()].ToString();
-                                xRTable.Rows[3].Cells[c].Text = listData[a].Rows[b]["ColVal" + (c + 1).ToString()].ToString();
+                                
+                                xRTable.Rows[2].Cells[c-1].Text = listData[a].Rows[b]["ColName" + (c).ToString()].ToString();
+                                xRTable.Rows[3].Cells[c-1].Text = listData[a].Rows[b]["ColVal" + (c).ToString()].ToString();
                             }
 
                             xRTable.LocationF = new PointF(0, NeueStartposition );
+
+                            XRPictureBox xRPicture1 = new XRPictureBox();
+                            xRPicture1.ImageSource = new ImageSource((Bitmap)listData[a].Rows[b]["pic"]);
+                            xRPicture1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.Squeeze;
+                            xRPicture1.SizeF = new SizeF(94, 70);
+                            xRPicture1.LocationF = new PointF(0, NeueStartposition + 20);
+                            //xRPicture1.BackColor = Color.DarkGray;
+                            //xRTable.Rows[1].Cells[0].Controls.Add(xRPicture1);
                             this.Detail.Controls.Add(xRTable);
+                            this.Detail.Controls.Add(xRPicture1);
                             NeueStartposition = NeueStartposition + xRTable.SizeF.Height +1 ;
                         }
                     }
@@ -1093,8 +1098,6 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             xRPicture.Visible = true;
             this.Detail.Controls.Add(xRPicture);
 
-
-            //LowPlace = syx_Size.Height + LowPlace ;
         }
 
         private void set_syt_pic_legend(List<Color> Color_list)
@@ -1115,7 +1118,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
         {
             XRTable Template = new XRTable();
             XRTableRow Template_Rows_1 = new XRTableRow();
-            XRTableCell Template_Rows1_Cell_1 = new XRTableCell();
+            
             XRTableCell Template_Rows1_Cell_2 = new XRTableCell();
             XRTableCell Template_Rows1_Cell_3 = new XRTableCell();
             XRTableCell Template_Rows1_Cell_4 = new XRTableCell();
@@ -1123,7 +1126,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             XRTableCell Template_Rows1_Cell_6 = new XRTableCell();
 
             XRTableRow Template_Rows_2 = new XRTableRow();
-            XRTableCell Template_Rows2_Cell_1 = new XRTableCell();
+           
             XRTableCell Template_Rows2_Cell_2 = new XRTableCell();
             XRTableCell Template_Rows2_Cell_3 = new XRTableCell();
             XRTableCell Template_Rows2_Cell_4 = new XRTableCell();
@@ -1131,7 +1134,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             XRTableCell Template_Rows2_Cell_6 = new XRTableCell();
 
             XRTableRow Template_Rows_3 = new XRTableRow();
-            XRTableCell Template_Rows3_Cell_1 = new XRTableCell();
+          
             XRTableCell Template_Rows3_Cell_2 = new XRTableCell();
             XRTableCell Template_Rows3_Cell_3 = new XRTableCell();
             XRTableCell Template_Rows3_Cell_4 = new XRTableCell();
@@ -1144,7 +1147,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             XRTableCell Template_Rows3_Cell_11 = new XRTableCell();
 
             XRTableRow Template_Rows_4 = new XRTableRow();
-            XRTableCell Template_Rows4_Cell_1 = new XRTableCell();
+           
             XRTableCell Template_Rows4_Cell_2 = new XRTableCell();
             XRTableCell Template_Rows4_Cell_3 = new XRTableCell();
             XRTableCell Template_Rows4_Cell_4 = new XRTableCell();
@@ -1162,39 +1165,31 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
 
             Template.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
         
-            //Template_Rows1_Cell_1.WidthF = 115.67f;
             Template_Rows1_Cell_2.WidthF = 57.22f;
             Template_Rows1_Cell_3.WidthF = 256f;
             Template_Rows1_Cell_4.WidthF = 85.85f;
             Template_Rows1_Cell_5.WidthF = 85.85f;
             Template_Rows1_Cell_6.WidthF = 85.85f;
 
-
-            //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);
             Template_Rows_1.Controls.Add(Template_Rows1_Cell_4);
             Template_Rows_1.Controls.Add(Template_Rows1_Cell_5);
             Template_Rows_1.Controls.Add(Template_Rows1_Cell_6);
 
-
-
-            //Template_Rows2_Cell_1.WidthF = 115.67f;
             Template_Rows2_Cell_2.WidthF = 57.22f;
             Template_Rows2_Cell_3.WidthF = 256f;
             Template_Rows2_Cell_4.WidthF = 85.85f;
             Template_Rows2_Cell_5.WidthF = 85.85f;
             Template_Rows2_Cell_6.WidthF = 85.85f;
 
-
-            //Template_Rows_2.Controls.Add(Template_Rows2_Cell_1);
             Template_Rows_2.Controls.Add(Template_Rows2_Cell_2);
             Template_Rows_2.Controls.Add(Template_Rows2_Cell_3);
             Template_Rows_2.Controls.Add(Template_Rows2_Cell_4);
             Template_Rows_2.Controls.Add(Template_Rows2_Cell_5);
             Template_Rows_2.Controls.Add(Template_Rows2_Cell_6);
 
-            //Template_Rows3_Cell_1.WidthF = 115.67f;
+            
             Template_Rows3_Cell_2.WidthF = 57.23f;//63.59f
             Template_Rows3_Cell_3.WidthF = 57.23f;
             Template_Rows3_Cell_4.WidthF = 57.23f;
@@ -1206,7 +1201,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             Template_Rows3_Cell_10.WidthF = 57.23f;
             Template_Rows3_Cell_11.WidthF = 57.23f;
 
-            //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);
             Template_Rows_3.Controls.Add(Template_Rows3_Cell_4);
@@ -1218,7 +1213,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             Template_Rows_3.Controls.Add(Template_Rows3_Cell_10);
             Template_Rows_3.Controls.Add(Template_Rows3_Cell_11);
 
-            //Template_Rows4_Cell_1.WidthF = 115.67f;
+           
             Template_Rows4_Cell_2.WidthF = 57.23f;//63.59f
             Template_Rows4_Cell_3.WidthF = 57.23f;
             Template_Rows4_Cell_4.WidthF = 57.23f;
@@ -1231,8 +1226,6 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             Template_Rows4_Cell_11.WidthF = 57.23f;
 
 
-
-            //Template_Rows_4.Controls.Add(Template_Rows4_Cell_1);
             Template_Rows_4.Controls.Add(Template_Rows4_Cell_2);
             Template_Rows_4.Controls.Add(Template_Rows4_Cell_3);
             Template_Rows_4.Controls.Add(Template_Rows4_Cell_4);
@@ -1263,18 +1256,11 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
 
             Template.Rows[0].BackColor = Color.DarkGray;
             Template.Rows[2].BackColor = Color.DarkGray;
-            //Template.Rows[0].Cells[0].BackColor = Color.Transparent;
-            //Template.Rows[2].Cells[0].BackColor = Color.Transparent;
+    
             Template.Rows[2].BackColor = Color.DarkGray;
 
-            
-
-
             Template.Borders = DevExpress.XtraPrinting.BorderSide.All;
-            //Template.Rows[0].Cells[0].Borders = DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top;
-            //Template.Rows[1].Cells[0].Borders = DevExpress.XtraPrinting.BorderSide.Left;
-            //Template.Rows[2].Cells[0].Borders = DevExpress.XtraPrinting.BorderSide.Left;
-            //Template.Rows[3].Cells[0].Borders = DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom;
+
 
             return Template;
         }
@@ -1310,9 +1296,6 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
                 table.Rows[3].Cells[i].Text = str_ColVal;
             }
 
-           
-            //table.Rows[4].Cells[0].BackColor = Color.DarkGray;
-            //table.Rows[4].Cells[0].TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
             XRPictureBox xRPicture2 = new XRPictureBox();
             xRPicture2.Sizing = DevExpress.XtraPrinting.ImageSizeMode.AutoSize;
             xRPicture2.ImageSource = new ImageSource((Bitmap)dataTable.Rows[position]["p3"]);
@@ -1326,25 +1309,12 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             table.Visible = true;
             table.LocationF = new PointF(0, NeueStartposition);
             table.SendToBack();
-            //table.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+
 
             table.BorderWidth = 0.5f;
 
             this.Detail.Controls.Add(table);
 
-
-            //XRPictureBox xRPicture_pic = new XRPictureBox();
-            //xRPicture_pic.Name = "Picture_kllb_" + position.ToString();
-            //xRPicture_pic.ImageSource = new ImageSource((Image)dataTable.Rows[position]["p1"]);
-            //xRPicture_pic.LocationF = new PointF(1, NeueStartposition);
-            //xRPicture_pic.Visible = true;
-            //xRPicture_pic.BackColor = Color.DarkGray;
-            //xRPicture_pic.Sizing = DevExpress.XtraPrinting.ImageSizeMode.Squeeze;
-            //xRPicture_pic.SizeF = new SizeF(115f, 96.88f);
-            //xRPicture_pic.BringToFront();
-            //this.Detail.Controls.Add(xRPicture_pic);
-
-            //NeueStartposition = table.SizeF.Height + NeueStartposition+5;
             NeueStartposition = table.SizeF.Height + NeueStartposition;
         }
         #endregion
@@ -1391,33 +1361,33 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
 
             Template.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
             Template_Rows1_Cell_1.WidthF = 94.63f;
-            Template_Rows1_Cell_2.WidthF = 290f;
-            Template_Rows1_Cell_3.WidthF = 155.73f;
-            Template_Rows1_Cell_4.WidthF = 155.73f;
+            Template_Rows1_Cell_2.WidthF = 334.15f;
+            Template_Rows1_Cell_3.WidthF = 133.66f;
+            Template_Rows1_Cell_4.WidthF = 133.66f;
             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);
             Template_Rows_1.Controls.Add(Template_Rows1_Cell_4);
 
             Template_Rows2_Cell_1.WidthF = 94.63f;
-            Template_Rows2_Cell_2.WidthF = 290f;
-            Template_Rows2_Cell_3.WidthF = 155.73f;
-            Template_Rows2_Cell_4.WidthF = 155.73f;
+            Template_Rows2_Cell_2.WidthF = 334.15f;
+            Template_Rows2_Cell_3.WidthF = 133.66f;
+            Template_Rows2_Cell_4.WidthF = 133.66f;
             Template_Rows_2.Controls.Add(Template_Rows2_Cell_1);
             Template_Rows_2.Controls.Add(Template_Rows2_Cell_2);
             Template_Rows_2.Controls.Add(Template_Rows2_Cell_3);
             Template_Rows_2.Controls.Add(Template_Rows2_Cell_4);
 
-            Template_Rows3_Cell_1.WidthF = 68.8f;
-            Template_Rows3_Cell_2.WidthF = 68.8f;
-            Template_Rows3_Cell_3.WidthF = 68.8f;
-            Template_Rows3_Cell_4.WidthF = 68.8f;
-            Template_Rows3_Cell_5.WidthF = 68.8f;
-            Template_Rows3_Cell_6.WidthF = 68.8f;
-            Template_Rows3_Cell_7.WidthF = 68.8f;
-            Template_Rows3_Cell_8.WidthF = 68.8f;
-            Template_Rows3_Cell_9.WidthF = 68.8f;
-            Template_Rows3_Cell_10.WidthF = 68.8f;
+            Template_Rows3_Cell_1.WidthF = 94.63f;
+            Template_Rows3_Cell_2.WidthF = 66.83f;
+            Template_Rows3_Cell_3.WidthF = 66.83f;
+            Template_Rows3_Cell_4.WidthF = 66.83f;
+            Template_Rows3_Cell_5.WidthF = 66.83f;
+            Template_Rows3_Cell_6.WidthF = 66.83f;
+            Template_Rows3_Cell_7.WidthF = 66.83f;
+            Template_Rows3_Cell_8.WidthF = 66.83f;
+            Template_Rows3_Cell_9.WidthF = 66.83f;
+            Template_Rows3_Cell_10.WidthF = 66.83f;
             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);
@@ -1429,16 +1399,16 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             Template_Rows_3.Controls.Add(Template_Rows3_Cell_9);
             Template_Rows_3.Controls.Add(Template_Rows3_Cell_10);
 
-            Template_Rows4_Cell_1.WidthF = 68.8f;
-            Template_Rows4_Cell_2.WidthF = 68.8f;
-            Template_Rows4_Cell_3.WidthF = 68.8f;
-            Template_Rows4_Cell_4.WidthF = 68.8f;
-            Template_Rows4_Cell_5.WidthF = 68.8f;
-            Template_Rows4_Cell_6.WidthF = 68.8f;
-            Template_Rows4_Cell_7.WidthF = 68.8f;
-            Template_Rows4_Cell_8.WidthF = 68.8f;
-            Template_Rows4_Cell_9.WidthF = 68.8f;
-            Template_Rows4_Cell_10.WidthF = 68.8f;
+            Template_Rows4_Cell_1.WidthF = 94.63f;
+            Template_Rows4_Cell_2.WidthF = 66.83f;
+            Template_Rows4_Cell_3.WidthF = 66.83f;
+            Template_Rows4_Cell_4.WidthF = 66.83f;
+            Template_Rows4_Cell_5.WidthF = 66.83f;
+            Template_Rows4_Cell_6.WidthF = 66.83f;
+            Template_Rows4_Cell_7.WidthF = 66.83f;
+            Template_Rows4_Cell_8.WidthF = 66.83f;
+            Template_Rows4_Cell_9.WidthF = 66.83f;
+            Template_Rows4_Cell_10.WidthF = 66.83f;
             Template_Rows_4.Controls.Add(Template_Rows4_Cell_1);
             Template_Rows_4.Controls.Add(Template_Rows4_Cell_2);
             Template_Rows_4.Controls.Add(Template_Rows4_Cell_3);
@@ -1456,6 +1426,10 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             Template.Rows.Add(Template_Rows_4);
             Template.Rows[0].BackColor = Color.DarkGray;
             Template.Rows[2].BackColor = Color.DarkGray;
+            Template.Rows[2].Cells[0].BackColor = Color.Transparent;
+            Template.Rows[2].Cells[0].Borders = DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right;
+            Template.Rows[1].Cells[0].Borders = DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Top;
+            //Transparent
             Template.Borders = DevExpress.XtraPrinting.BorderSide.All;
             Template.SizeF = new SizeF(688f, 30);
             Template.Font= new Font(Schriftart_english, 12f);

OxfordExtenderWrapper/OxfordExtenderWrapper.csproj

@@ -39,9 +39,8 @@
       <HintPath>..\OpenDll\Nlog\NLog.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="OINA.Extender, Version=6.1.0.0, Culture=neutral, PublicKeyToken=5efad68c95e0364e, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>E:\OTSSoftWare\OTS2_MiningDev\OpenDll\OxfordApi50Dll\OINA.Extender.dll</HintPath>
+    <Reference Include="OINA.Extender">
+      <HintPath>..\OpenDll\OxfordApi50Dll\OINA.Extender.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="System" />