更新修改三元图显示格式，一行两个，一页四个，（仿照ASPEX三元图格式）

OTSIncAReportApp/1-UI/OTSTemplateDesigner/Export_ReportTemplate.cs

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

@@ -1384,7 +1384,7 @@ namespace OTSIncAReportApp
             worker.ReportProgress(0, table["loading_inca_area_ratio_diagram_completed"].ToString());//加载夹杂物面积比图模块完成
 
 
-            System.Threading.Thread.Sleep(2000);
+            //System.Threading.Thread.Sleep(2000);
             //调用,三元相图----------------------------------------------
             worker.ReportProgress(0, table["ternary_graph_ing"].ToString());//加载三元相图模块中....
             worker.ReportProgress(0, table["load_ternary_graph"].ToString());//加载:三元相图

OTSIncAReportApp/ReportTemplate/OTS_DEVReport.Designer.cs

@@ -38,6 +38,10 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             this.xrLine2 = new DevExpress.XtraReports.UI.XRLine();
             this.dev_yj = new DevExpress.XtraReports.UI.XRLabel();
             this.Detail = new DevExpress.XtraReports.UI.DetailBand();
+            this.xrPictureBox6 = new DevExpress.XtraReports.UI.XRPictureBox();
+            this.xrPictureBox7 = new DevExpress.XtraReports.UI.XRPictureBox();
+            this.xrPictureBox5 = new DevExpress.XtraReports.UI.XRPictureBox();
+            this.xrPageBreak6 = new DevExpress.XtraReports.UI.XRPageBreak();
             this.xrTable2 = new DevExpress.XtraReports.UI.XRTable();
             this.xrTableRow18 = new DevExpress.XtraReports.UI.XRTableRow();
             this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -172,12 +176,8 @@ 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.xrPageBreak6 = new DevExpress.XtraReports.UI.XRPageBreak();
-            this.xrPictureBox4 = new DevExpress.XtraReports.UI.XRPictureBox();
-            this.xrPictureBox5 = new DevExpress.XtraReports.UI.XRPictureBox();
-            this.xrPictureBox6 = new DevExpress.XtraReports.UI.XRPictureBox();
-            this.xrPictureBox7 = new DevExpress.XtraReports.UI.XRPictureBox();
             this.xrPictureBox3 = new DevExpress.XtraReports.UI.XRPictureBox();
+            this.xrPictureBox4 = new DevExpress.XtraReports.UI.XRPictureBox();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable_kllb_surface)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrChart_incaSubdivision)).BeginInit();
@@ -201,17 +201,20 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             // 
             // xrLine1
             // 
+            this.xrLine1.LineWidth = 2F;
             this.xrLine1.LocationFloat = new DevExpress.Utils.PointFloat(10.0001F, 50F);
             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;
@@ -233,6 +236,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             // 
             // xrLine2
             // 
+            this.xrLine2.LineWidth = 2F;
             this.xrLine2.LocationFloat = new DevExpress.Utils.PointFloat(10.0001F, 9.999847F);
             this.xrLine2.Name = "xrLine2";
             this.xrLine2.SizeF = new System.Drawing.SizeF(667.9998F, 23F);
@@ -290,6 +294,39 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             this.Detail.HeightF = 10000F;
             this.Detail.Name = "Detail";
             // 
+            // xrPictureBox6
+            // 
+            this.xrPictureBox6.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox6.ImageSource"));
+            this.xrPictureBox6.LocationFloat = new DevExpress.Utils.PointFloat(10.0001F, 4589.084F);
+            this.xrPictureBox6.Name = "xrPictureBox6";
+            this.xrPictureBox6.SizeF = new System.Drawing.SizeF(321.0803F, 330.2085F);
+            this.xrPictureBox6.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
+            this.xrPictureBox6.Visible = false;
+            // 
+            // xrPictureBox7
+            // 
+            this.xrPictureBox7.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox7.ImageSource"));
+            this.xrPictureBox7.LocationFloat = new DevExpress.Utils.PointFloat(342.8782F, 4589.083F);
+            this.xrPictureBox7.Name = "xrPictureBox7";
+            this.xrPictureBox7.SizeF = new System.Drawing.SizeF(335.1217F, 330.2085F);
+            this.xrPictureBox7.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
+            this.xrPictureBox7.Visible = false;
+            // 
+            // xrPictureBox5
+            // 
+            this.xrPictureBox5.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox5.ImageSource"));
+            this.xrPictureBox5.LocationFloat = new DevExpress.Utils.PointFloat(342.8782F, 4220.75F);
+            this.xrPictureBox5.Name = "xrPictureBox5";
+            this.xrPictureBox5.SizeF = new System.Drawing.SizeF(335.1217F, 330.2085F);
+            this.xrPictureBox5.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
+            this.xrPictureBox5.Visible = false;
+            // 
+            // xrPageBreak6
+            // 
+            this.xrPageBreak6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 4070.75F);
+            this.xrPageBreak6.Name = "xrPageBreak6";
+            this.xrPageBreak6.Visible = false;
+            // 
             // xrTable2
             // 
             this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 3732.208F);
@@ -1585,11 +1622,14 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             this.xrPictureBox2.Sizing = DevExpress.XtraPrinting.ImageSizeMode.Squeeze;
             this.xrPictureBox2.Visible = false;
             // 
-            // xrPageBreak6
+            // xrPictureBox3
             // 
-            this.xrPageBreak6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 4070.75F);
-            this.xrPageBreak6.Name = "xrPageBreak6";
-            this.xrPageBreak6.Visible = false;
+            this.xrPictureBox3.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox3.ImageSource"));
+            this.xrPictureBox3.LocationFloat = new DevExpress.Utils.PointFloat(94.6256F, 4091.578F);
+            this.xrPictureBox3.Name = "xrPictureBox3";
+            this.xrPictureBox3.SizeF = new System.Drawing.SizeF(503.9998F, 120.8501F);
+            this.xrPictureBox3.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
+            this.xrPictureBox3.Visible = false;
             // 
             // xrPictureBox4
             // 
@@ -1600,42 +1640,6 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             this.xrPictureBox4.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
             this.xrPictureBox4.Visible = false;
             // 
-            // xrPictureBox5
-            // 
-            this.xrPictureBox5.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox5.ImageSource"));
-            this.xrPictureBox5.LocationFloat = new DevExpress.Utils.PointFloat(342.8782F, 4220.75F);
-            this.xrPictureBox5.Name = "xrPictureBox5";
-            this.xrPictureBox5.SizeF = new System.Drawing.SizeF(335.1217F, 330.2085F);
-            this.xrPictureBox5.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
-            this.xrPictureBox5.Visible = false;
-            // 
-            // xrPictureBox6
-            // 
-            this.xrPictureBox6.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox6.ImageSource"));
-            this.xrPictureBox6.LocationFloat = new DevExpress.Utils.PointFloat(10.0001F, 4562F);
-            this.xrPictureBox6.Name = "xrPictureBox6";
-            this.xrPictureBox6.SizeF = new System.Drawing.SizeF(321.0803F, 330.2085F);
-            this.xrPictureBox6.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
-            this.xrPictureBox6.Visible = false;
-            // 
-            // xrPictureBox7
-            // 
-            this.xrPictureBox7.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox7.ImageSource"));
-            this.xrPictureBox7.LocationFloat = new DevExpress.Utils.PointFloat(342.8782F, 4562F);
-            this.xrPictureBox7.Name = "xrPictureBox7";
-            this.xrPictureBox7.SizeF = new System.Drawing.SizeF(335.1217F, 330.2085F);
-            this.xrPictureBox7.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
-            this.xrPictureBox7.Visible = false;
-            // 
-            // xrPictureBox3
-            // 
-            this.xrPictureBox3.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox3.ImageSource"));
-            this.xrPictureBox3.LocationFloat = new DevExpress.Utils.PointFloat(94.6256F, 4091.578F);
-            this.xrPictureBox3.Name = "xrPictureBox3";
-            this.xrPictureBox3.SizeF = new System.Drawing.SizeF(503.9998F, 120.8501F);
-            this.xrPictureBox3.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
-            this.xrPictureBox3.Visible = false;
-            // 
             // OTS_DEVReport
             // 
             this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {

OTSIncAReportApp/ReportTemplate/OTS_DEVReport.cs

@@ -448,16 +448,76 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             Color_list.Add(Color.FromArgb(247, 172, 189));
             Color_list.Add(Color.FromArgb(202, 134, 135));
             Color_list.Add(Color.FromArgb(34, 90, 31));
-            for (int i = 0; i < m_mbszclass.M_SYXT.list_lbv_syxt_mblb_index.Count; i++)
+
+            Color_list.Add(Color.FromArgb(238, 175, 14));
+            Color_list.Add(Color.FromArgb(0, 0, 238));
+            Color_list.Add(Color.FromArgb(0, 205, 0));
+            Color_list.Add(Color.FromArgb(238, 0, 0));
+            Color_list.Add(Color.FromArgb(153, 50, 204));
+            Color_list.Add(Color.FromArgb(255, 102, 153));
+            Color_list.Add(Color.FromArgb(160, 82, 45));
+            Color_list.Add(Color.FromArgb(181, 181, 181));
+            Color_list.Add(Color.FromArgb(250, 235, 215));
+            Color_list.Add(Color.FromArgb(238, 130, 238));
+            Color_list.Add(Color.FromArgb(174, 238, 238));
+            Color_list.Add(Color.FromArgb(247, 172, 189));
+            Color_list.Add(Color.FromArgb(202, 134, 135));
+            Color_list.Add(Color.FromArgb(34, 90, 31));
+            //for (int i = 0; i < m_mbszclass.M_SYXT.list_lbv_syxt_mblb_index.Count; i++)
+            //{
+
+            //    set_syt_pic_legend(Color_list);
+            //    set_syt_pic( m_mbszclass, m_mbszclass.M_SYXT.list_lbv_syxt_mblb_index[i], Color_list);
+
+            //    XRPageBreak xRPage = new XRPageBreak();
+            //    xRPage.LocationF = new PointF(0, LowPlace + 2);
+            //    this.Detail.Controls.Add(xRPage);
+            //}
+          
+
+            for (int i = 0; i < m_mbszclass.M_SYXT.list_lbv_syxt_mblb_index.Count; i=i+4)
             {
-                //set_syt_pic("xrPictureBox_syt_" + i.ToString(), "syt_Page_" + i.ToString(), m_mbszclass, m_mbszclass.M_SYXT.list_lbv_syxt_mblb_index[i]);
+
                 set_syt_pic_legend(Color_list);
-                set_syt_pic( m_mbszclass, m_mbszclass.M_SYXT.list_lbv_syxt_mblb_index[i], Color_list);
+
+                if (i< m_mbszclass.M_SYXT.list_lbv_syxt_mblb_index.Count)
+                {
+                    set_syt_pic(m_mbszclass, m_mbszclass.M_SYXT.list_lbv_syxt_mblb_index[i], Color_list, new PointF(10f, LowPlace + 2));
+                }
+                if (i+1 < m_mbszclass.M_SYXT.list_lbv_syxt_mblb_index.Count)
+                {
+                    set_syt_pic(m_mbszclass, m_mbszclass.M_SYXT.list_lbv_syxt_mblb_index[i+1], Color_list, new PointF(343.8f, LowPlace + 2));
+                }
+
+                if (i+2 < m_mbszclass.M_SYXT.list_lbv_syxt_mblb_index.Count)
+                {
+                    set_syt_pic(m_mbszclass, m_mbszclass.M_SYXT.list_lbv_syxt_mblb_index[i+2], Color_list, new PointF(10f, LowPlace + 345+5));
+                }
+                if (i + 3 < m_mbszclass.M_SYXT.list_lbv_syxt_mblb_index.Count)
+                {
+                    set_syt_pic(m_mbszclass, m_mbszclass.M_SYXT.list_lbv_syxt_mblb_index[i+3], Color_list, new PointF(343.8f, LowPlace + 345+5));
+                }
+
+
+                //set_syt_pic(m_mbszclass, m_mbszclass.M_SYXT.list_lbv_syxt_mblb_index[i], Color_list);
+                XRLine rLine = new XRLine();
+                rLine.SizeF = new SizeF(5f, 698.5f);
+                rLine.LineDirection = LineDirection.Vertical;
+                rLine.LocationF = new PointF(335f, LowPlace+2);
+                this.Detail.Controls.Add(rLine);
+
+                XRLine rLine_level = new XRLine();
+                rLine_level.SizeF = new SizeF(668f, 5f);
+                rLine_level.LineDirection = LineDirection.Horizontal;
+                rLine_level.LocationF = new PointF(10f, LowPlace + 345);
+                this.Detail.Controls.Add(rLine_level);
 
                 XRPageBreak xRPage = new XRPageBreak();
-                xRPage.LocationF = new PointF(0, LowPlace + 2);
+                xRPage.LocationF = new PointF(0, LowPlace + 850);
+                LowPlace = LowPlace + 870;
                 this.Detail.Controls.Add(xRPage);
             }
+
         }
         /// <summary>
         /// 颗粒列表
@@ -756,8 +816,25 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
 
             LowPlace = syx_Size.Height + LowPlace + 10;
         }
+        private void set_syt_pic(c_TemplateClass m_mbszclass, int index, List<Color> Color_list, PointF position)
+        {
 
 
+            XRPictureBox xRPicture = new XRPictureBox();
+
+            xRPicture.LocationF = position;
+            xRPicture.SizeF = new SizeF(321f, 330.2f);
+
+            ImageSource imageSource = new ImageSource(export_ReportTemplate.DrawATernaryPicture(index, m_mbszclass, Color_list));
+            xRPicture.ImageSource = imageSource;
+            xRPicture.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
+            xRPicture.Visible = true;
+            this.Detail.Controls.Add(xRPicture);
+
+
+            //LowPlace = syx_Size.Height + LowPlace ;
+        }
+
         private void set_syt_pic_legend(List<Color> Color_list)
         {
             XRPictureBox xRPicture_legend = new XRPictureBox();