Merge branch 'Release2.5' of http://36.129.163.148:30080/gogsadmin/OTS into Release2.5

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

@@ -0,0 +1,128 @@
+<XmlConfig>
+  <M_SY>
+    <str_tb_ZBT>Inca Report</str_tb_ZBT>
+    <str_tb_FBT>济源钢铁</str_tb_FBT>
+    <str_tb_YPBH>0003</str_tb_YPBH>
+    <str_tb_CKBZ>GB30834</str_tb_CKBZ>
+    <b_ck_ypsm>True</b_ck_ypsm>
+    <b_ck_jggk>True</b_ck_jggk>
+    <str_bz>
+    </str_bz>
+    <str_xzkl>全部颗粒</str_xzkl>
+    <int_xzkl>0</int_xzkl>
+  </M_SY>
+  <M_YMYJ>
+    <str_tb_ymwb>
+    </str_tb_ymwb>
+    <str_tb_KHH>Copi0000123012</str_tb_KHH>
+    <b_ck_ym>True</b_ck_ym>
+    <str_tb_yjwb>OTS夹杂物分析报告</str_tb_yjwb>
+  </M_YMYJ>
+  <M_KLFXJG>
+    <b_ck_klcc_xsmk>True</b_ck_klcc_xsmk>
+    <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>
+    <index_cb_jzwfl_xstx>0</index_cb_jzwfl_xstx>
+    <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>DMAX</str_cb_klcc_jsfs>
+  </M_KLFXJG>
+  <M_YSFXJG>
+    <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>
+    <list_str_tb_ysfx_xsys>
+      <YS0>Al</YS0>
+      <YS1>Si</YS1>
+      <YS2>C</YS2>
+      <YS3>S</YS3>
+      <YS4>N</YS4>
+      <YS5>O</YS5>
+      <YS6>Fe</YS6>
+      <YS7>Ti</YS7>
+      <YS8>Mn</YS8>
+      <YS9>Mg</YS9>
+      <YS10>Ca</YS10>
+      <YS11>Ce</YS11>
+      <YS12>La</YS12>
+    </list_str_tb_ysfx_xsys>
+    <b_ck_yscf_xsmk>True</b_ck_yscf_xsmk>
+    <index_cb_yscf_xstx>0</index_cb_yscf_xstx>
+    <index_cb_yscf_jsfs>0</index_cb_yscf_jsfs>
+    <index_cb_yscf_klfw>0</index_cb_yscf_klfw>
+    <str_tb_yscf_ysxx>H</str_tb_yscf_ysxx>
+    <list_str_tb_yscf_ysxx>
+      <YS0>H</YS0>
+    </list_str_tb_yscf_ysxx>
+  </M_YSFXJG>
+  <M_SYXT>
+    <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>
+    <list_lbv_syxt_mblb>
+      <MB0>MgO.CaO.Al₂O₃</MB0>
+      <MB1>CaO.SiO₂.Al₂O₃</MB1>
+    </list_lbv_syxt_mblb>
+    <list_lbv_syxt_mblb_index>
+      <MBIndex0>0</MBIndex0>
+      <MBIndex1>2</MBIndex1>
+    </list_lbv_syxt_mblb_index>
+  </M_SYXT>
+  <M_KLLBXX>
+    <b_ck_kllb_xsmk>True</b_ck_kllb_xsmk>
+    <index_cb_kllb_jsfs>0</index_cb_kllb_jsfs>
+    <index_cb_kllb_klfw>0</index_cb_kllb_klfw>
+    <int_tb_kllb_ylsx>1</int_tb_kllb_ylsx>
+    <str_tb_kllb_sxys>O,Al,Mg,Ca,Ti,Si,S,Mn</str_tb_kllb_sxys>
+    <list_str_tb_lllb_sxys>
+      <YS0>O</YS0>
+      <YS1>Al</YS1>
+      <YS2>Mg</YS2>
+      <YS3>Ca</YS3>
+      <YS4>Ti</YS4>
+      <YS5>Si</YS5>
+      <YS6>S</YS6>
+      <YS7>Mn</YS7>
+    </list_str_tb_lllb_sxys>
+    <b_ck_kllb_ystx>True</b_ck_kllb_ystx>
+    <b_ck_kllb_fdtx>False</b_ck_kllb_fdtx>
+    <b_ck_kllb_npxx>True</b_ck_kllb_npxx>
+    <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>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>Area</str_cb_kllb_chartSort_p1>
+    <index_cb_kllb_chartSort_p1>0</index_cb_kllb_chartSort_p1>
+    <str_cb_kllb_chartSort_p2>DMAX</str_cb_kllb_chartSort_p2>
+    <index_cb_kllb_chartSort_p2>1</index_cb_kllb_chartSort_p2>
+    <str_cb_kllb_chartSort_p3>AveGray</str_cb_kllb_chartSort_p3>
+    <index_cb_kllb_chartSort_p3>3</index_cb_kllb_chartSort_p3>
+    <str_cb_kllb_sort_p1>DMAX</str_cb_kllb_sort_p1>
+    <b_ck_kllb_fjzt>True</b_ck_kllb_fjzt>
+    <list_str_kllb_qcys>
+      <YS0>F</YS0>
+      <YS1>Fe</YS1>
+      <YS2>Cr</YS2>
+    </list_str_kllb_qcys>
+    <str_kllb_qcys>F,Fe,Cr</str_kllb_qcys>
+    <str_kllb_DeleteClass>SiC</str_kllb_DeleteClass>
+    <list_str_kllb_DeleteClass>
+      <YS0>SiC</YS0>
+    </list_str_kllb_DeleteClass>
+  </M_KLLBXX>
+  <M_address>
+    <Path>.\Config\ReportTemplate\ReportTemplateConfig.xml</Path>
+  </M_address>
+  <M_JZWZB>
+    <b_ck_surface>True</b_ck_surface>
+    <b_ck_chart>True</b_ck_chart>
+  </M_JZWZB>
+</XmlConfig>

OTSIncAReportApp/1-UI/OTSTemplateDesigner/Export_ReportTemplate.cs

@@ -1863,7 +1863,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             SolidBrush sbrush_White = new SolidBrush(Color.White);
             g.FillRectangle(sbrush_White, 0, 0, 530, 530);
 
-            Pen mypen = new Pen(Color.Black, 2);
+            Pen mypen = new Pen(Color.Black, 1);
             g.DrawImage(map, 0, 0, map.Width, map.Height);
             g.DrawLine(mypen, new Point(Line + 10, Line), new Point(Line / 2 + 10, Convert.ToInt32(Line - (Line / 2 * 1.732))));//"\"
             g.DrawLine(mypen, new Point(Line / 2 + 10, Convert.ToInt32(Line - (Line / 2 * 1.732))), new Point(0 + 10, Line));//"/"
@@ -1883,12 +1883,14 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
                 int x2_a = Line - (43 * i);
                 int y1_a = point * i;
                 g.DrawLine(mypen, new Point(x1_a + 10, x2_a), new Point(y1_a + 10, Line));
+               
 
                 //"/"
                 int x1_b = Line - (point / 2 + ((point / 2) * (i - 1)));
                 int x2_b = Line - (43 * i);
                 int y1_b = Line - (point * i);
                 g.DrawLine(mypen, new Point(x1_b + 10, x2_b), new Point(y1_b + 10, Line));
+               
 
                 //"_"
                 int x1_c = point / 2 + ((point / 2) * (i - 1));
@@ -1898,6 +1900,19 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
                 int y2_c = Line - (43 * i);
 
                 g.DrawLine(mypen, new Point(x1_c + 10, x2_c), new Point(y1_c + 10, y2_c));
+                
+
+
+
+                g.DrawLine(mypen, new Point(y1_a + 10, Line + 10), new Point(y1_a + 10, Line));
+                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("宋体", 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));
             }
 
             for (int i = 0; i < dt_point_sort.Rows.Count; i++)
@@ -1912,7 +1927,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
 
             Font Font_features = new Font("宋体", 10, FontStyle.Bold);
             SolidBrush sbrush = new SolidBrush(Color.Black);
-            g.DrawString("features:" + dt_point_sort.Rows.Count.ToString(), Font_features, sbrush, 350, 200);
+            g.DrawString("features:" + dt_point_sort.Rows.Count.ToString(), Font_features, sbrush, 400, 200);
 
 
 
@@ -1921,7 +1936,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             g.DrawString(TemplateName.Split('.')[0].ToString(), myFont, sbrush, 265 - (TemplateName.Split('.')[0].ToString().Length * 10 / 2), 45);//顶点名字
             g.DrawString(TemplateName.Split('.')[1].ToString(), myFont, sbrush, 0, 510);//左侧名字
             g.DrawString(TemplateName.Split('.')[2].ToString(), myFont, sbrush, 500 - (TemplateName.Split('.')[0].ToString().Length * 10), 510);//左侧名字
-                                                                                                                                      //           map.Save("D:\\1.bmp");
+            //map.Save("D:\\1.bmp");
             #endregion
 
             return map;

OTSIncAReportApp/1-UI/OTSTemplateDesigner/OTSReport_Export.cs

@@ -38,7 +38,7 @@ namespace OTSIncAReportApp
         public string m_export_type = "Excel";                          //导出文件的格式类型Excel,Word,Pdf
 
         Export_ReportTemplate m_export_reporttemplate;
-        public string strPath = "./ReportTemplateExe/ReportTemplate/ReportTemplateConfig.xml"; //报告模板设置文件的路径
+        public string strPath = "./Config/ReportTemplate/ReportTemplateConfig.xml"; //报告模板设置文件的路径
        
         public string strPath2;
         public XmlConfigUtil xmlutil;
@@ -1823,7 +1823,7 @@ namespace OTSIncAReportApp
         private DataTable dev_internationalLanguage()
         {
             string Language = "ZH";
-            OTSCommon.SqLiteHelper sh = new OTSCommon.SqLiteHelper("data source='" + System.IO.Directory.GetCurrentDirectory() + "\\ReportTemplateExe\\ReportTemplate\\language.db'");
+            OTSCommon.SqLiteHelper sh = new OTSCommon.SqLiteHelper("data source='" + System.IO.Directory.GetCurrentDirectory() + "\\Config\\ReportTemplate\\language.db'");
             DataTable dt_stl = sh.ExecuteQuery("select * from "+ Language);
             return dt_stl;
         }