Merge branch 'OTSRelease3_0' of http://36.129.163.148:30080/gogsadmin/OTS into OTSRelease3_0

OTSIncAReportApp/1-UI/Control_Graph/Controls/Control_DrawDistrbutionImageAndBSE.cs

@@ -1960,7 +1960,7 @@ namespace OTSIncAReportGraph.Controls
             Invalidate();
         }
 
-        private bool DeleteParticlesFromLibrary(int in_clr_tagid, int in_clr_fieldid)
+        public bool DeleteParticlesFromLibrary(int in_clr_tagid, int in_clr_fieldid)
         {
             bool DoesItExist = false;
             for (int i = 1; i < 201; i++)

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

@@ -1888,6 +1888,8 @@ namespace OTSIncAReportGrids
 
                 //插入表头
                 row = sheet.CreateRow(1);//从第15行添加一行
+                IDrawing patriarch;
+                patriarch = sheet.CreateDrawingPatriarch();
                 row.Height = 30 * 20;
                 for (int i_cell = 0; i_cell < dgV_ParticlesDevidePage.Columns.Count; i_cell++)
                 {
@@ -1897,7 +1899,7 @@ namespace OTSIncAReportGrids
                     cell.SetCellValue(dgV_ParticlesDevidePage.Columns[i_cell].HeaderText);
                 }
 
-                IDrawing patriarch;
+               
                 IClientAnchor anchor;
                 int pictureIdx;
                 Bitmap bp;
@@ -1918,7 +1920,7 @@ namespace OTSIncAReportGrids
 
                         if (i_cell == 2)
                         {
-                            if (sfd.Picture)
+                            if (sfd.IfExportPicture)
                             {
                                 //颗粒图像列
                                 bp = (Bitmap)dgV_ParticlesDevidePage.Rows[i_row].Cells[2].Value;
@@ -1929,7 +1931,7 @@ namespace OTSIncAReportGrids
                                 pictureIdx = workbook.AddPicture(bytes, PictureType.JPEG);
 
                                 //第三步，在sheet中创建画布
-                                patriarch = sheet.CreateDrawingPatriarch();
+                             
 
                                 //第四步，设置锚点，（在起始单元格的X坐标0-1023，Y的坐标0-255，在终止单元格的X坐标0-1023，Y的坐标0-255，起始单元格行数，列数，终止单元格行数，列数）
                                 anchor = patriarch.CreateAnchor(1, 1, 2, 2, i_cell, i_row + 2, i_cell + 1, i_row + 3);//终止比开始位置大1,会自动缩放到一个单元格内的
@@ -1941,12 +1943,13 @@ namespace OTSIncAReportGrids
                         else
                         {
                             //非图像列
+                            
                             cell.SetCellValue(dgV_ParticlesDevidePage[i_cell, i_row].Value.ToString());
                         }
 
                     }
                 }
-                if (sfd.SpectrumData)
+                if (sfd.IfExportSpectrumData)
                 {
                     ISheet sheet2;
                     sheet2 = workbook.CreateSheet("Peak spectrum Data");//创建工作表
@@ -1994,7 +1997,7 @@ namespace OTSIncAReportGrids
                         }
                     }
                 }
-                if (sfd.SpectrumConfirmation)
+                if (sfd.IfExportSpectrumConfirmation)
                 {
                     ISheet sheet3;
                     sheet3 = workbook.CreateSheet("Peak spectrum");
@@ -2156,7 +2159,18 @@ namespace OTSIncAReportGrids
                 {
                     dgV_ParticlesDevidePage.Rows[j].Cells[0].Value = (pageSize * (PageIndex - 1) + j + 1).ToString();
                 }
-                m_ReportApp.im_Control_DrawDistrbutionImageAndBSE.DeletesParticlesSynchronously(list_Part);
+                if (m_ReportApp.im_Control_DrawDistrbutionImageAndBSE != null)
+                {
+                    m_ReportApp.im_Control_DrawDistrbutionImageAndBSE.DeletesParticlesSynchronously(list_Part);
+                }
+                else
+                {
+                    var _Control_DrawDistrbutionImageAndBSE = new OTSIncAReportGraph.Controls.Control_DrawDistrbutionImageAndBSE(m_ReportApp);
+                    foreach (var p in list_Part)
+                    {
+                        _Control_DrawDistrbutionImageAndBSE.DeleteParticlesFromLibrary(p.ParticleId, p.FieldId);
+                    }
+                }
             }
         }
 

OTSIncAReportApp/1-UI/Control_Grids/SpectrumExportConfirmation.cs

@@ -12,42 +12,42 @@ namespace OTSIncAReportApp._1_UI.Control_Grids
 {
     public partial class SpectrumExportConfirmation : Form
     {
-        bool m_SpectrumConfirmation = false;
-        bool m_SpectrumData = false;
-        bool m_Picture = false;
+        bool m_IfExportSpectrumConfirmation = false;
+        bool m_IfExportSpectrumData = false;
+        bool m_IfExportPicture = false;
         string m_savepath = "";
-        public bool SpectrumConfirmation
+        public bool IfExportSpectrumConfirmation
         {
             get
             {
-                return m_SpectrumConfirmation;
+                return m_IfExportSpectrumConfirmation;
             }
             set
             {
-                m_SpectrumConfirmation = value;
+                m_IfExportSpectrumConfirmation = value;
             }
         }
 
-        public bool SpectrumData
+        public bool IfExportSpectrumData
         {
             get
             {
-                return m_SpectrumData;
+                return m_IfExportSpectrumData;
             }
             set
             {
-                m_SpectrumData = value;
+                m_IfExportSpectrumData = value;
             }
         }
-        public bool Picture
+        public bool IfExportPicture
         {
             get
             {
-                return m_Picture;
+                return m_IfExportPicture;
             }
             set
             {
-                m_Picture = value;
+                m_IfExportPicture = value;
             }
         }
 
@@ -89,11 +89,11 @@ namespace OTSIncAReportApp._1_UI.Control_Grids
         {
             if(cB_SpectrumConfirmation.Checked)
             {
-                m_SpectrumConfirmation = true;
+                m_IfExportSpectrumConfirmation = true;
             }
             else
             {
-                m_SpectrumConfirmation = false;
+                m_IfExportSpectrumConfirmation = false;
             }
         }
 
@@ -121,11 +121,11 @@ namespace OTSIncAReportApp._1_UI.Control_Grids
         {
             if (cB_SpectrumData.Checked)
             {
-                m_SpectrumData = true;
+                m_IfExportSpectrumData = true;
             }
             else
             {
-                m_SpectrumData = false;
+                m_IfExportSpectrumData = false;
             }
         }
 
@@ -133,11 +133,11 @@ namespace OTSIncAReportApp._1_UI.Control_Grids
         {
             if (cB_Picture.Checked)
             {
-                m_Picture = true;
+                m_IfExportPicture = true;
             }
             else
             {
-                m_Picture = false;
+                m_IfExportPicture = false;
             }
         }
     }

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

@@ -719,15 +719,15 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
         private void add_SetElementAvgGrid(List<DataTable> a_datas)
         {
             XRTable xRTable = add_ElementList();
-            setXRLabelData(xRTable.Rows[2].Cells[3], a_datas[0].Rows[0][2].ToString());
-            setXRLabelData(xRTable.Rows[2].Cells[4], a_datas[0].Rows[0][3].ToString());
-            setXRLabelData(xRTable.Rows[2].Cells[5], a_datas[0].Rows[0][4].ToString());
-            setXRLabelData(xRTable.Rows[2].Cells[6], a_datas[0].Rows[0][5].ToString());
-            setXRLabelData(xRTable.Rows[2].Cells[7], a_datas[0].Rows[0][6].ToString());
-            setXRLabelData(xRTable.Rows[2].Cells[8], a_datas[0].Rows[0][7].ToString());
-            setXRLabelData(xRTable.Rows[2].Cells[9], a_datas[0].Rows[0][8].ToString());
-            setXRLabelData(xRTable.Rows[2].Cells[10], a_datas[0].Rows[0][9].ToString());
-            setXRLabelData(xRTable.Rows[2].Cells[11], a_datas[0].Rows[0][10].ToString());
+            setXRLabelData(xRTable.Rows[2].Cells[2], a_datas[0].Rows[0][2].ToString());
+            setXRLabelData(xRTable.Rows[2].Cells[3], a_datas[0].Rows[0][3].ToString());
+            setXRLabelData(xRTable.Rows[2].Cells[4], a_datas[0].Rows[0][4].ToString());
+            setXRLabelData(xRTable.Rows[2].Cells[5], a_datas[0].Rows[0][5].ToString());
+            setXRLabelData(xRTable.Rows[2].Cells[6], a_datas[0].Rows[0][6].ToString());
+            setXRLabelData(xRTable.Rows[2].Cells[7], a_datas[0].Rows[0][7].ToString());
+            setXRLabelData(xRTable.Rows[2].Cells[8], a_datas[0].Rows[0][8].ToString());
+            setXRLabelData(xRTable.Rows[2].Cells[9], a_datas[0].Rows[0][9].ToString());
+            setXRLabelData(xRTable.Rows[2].Cells[10], a_datas[0].Rows[0][10].ToString());
 
 
 
@@ -760,7 +760,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
                         }
                     }
                 }
-                list_ElementalAnalysisData.Add(set_ElementalAnalysis(subscript.Getsubscriptstring(REORDER_data.Rows[i]["Class"].ToString()), subscript.Getsubscriptstring(REORDER_data.Rows[i]["Name"].ToString()), REORDER_data.Rows[i]["Area"].ToString(),
+                list_ElementalAnalysisData.Add(set_ElementalAnalysisS(subscript.Getsubscriptstring(REORDER_data.Rows[i]["Name"].ToString()), REORDER_data.Rows[i]["Area"].ToString(),
                    REORDER_data.Rows[i][2].ToString(), REORDER_data.Rows[i][3].ToString(), REORDER_data.Rows[i][4].ToString(), REORDER_data.Rows[i][5].ToString(), REORDER_data.Rows[i][6].ToString(),
                    REORDER_data.Rows[i][7].ToString(), REORDER_data.Rows[i][8].ToString(), REORDER_data.Rows[i][9].ToString(), REORDER_data.Rows[i][10].ToString(), REORDER_data.Rows[i][11].ToString()));
             }
@@ -821,34 +821,34 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
                 add_SetElementAvgGridS(datas);
             else
                 add_SetElementAvgGrid(datas);
-            //xrTb_ElementAnalysis.Visible = true;
+            xrTb_ElementAnalysis.Visible = true;
 
             //元素分析表————————
-            //setXRLabelData(xrTableCell30, GetlanguageData("xrCellElementArea", languageData));//元素分析表表头
-            //setXRLabelData(xrTableCell31, GetlanguageData("xrCellElementArea_details", languageData));//详情
-            //DataTable REORDER_data = REORDER(datas[2], "Name");
-            //for (int i = 0; i < REORDER_data.Rows.Count; i++)
-            //{
-            //    double quantity = 0;
-            //    for (int a = 4; a < REORDER_data.Columns.Count; a++)
-            //    {
-            //        if (REORDER_data.Rows[i][a].ToString() != "")
-            //        {
-            //            quantity = quantity + Convert.ToDouble(REORDER_data.Rows[i][a].ToString());
-            //        }
-            //    }
-            //    string str_data = "";
-            //    for (int a = 4; a < REORDER_data.Columns.Count; a++)
-            //    {
-            //        if (REORDER_data.Rows[i][a].ToString() != "")
-            //        {
-            //            str_data = str_data + REORDER_data.Columns[a].ColumnName.ToString() + "=" + elementalAnalysis.ParameterNormalization(quantity, Convert.ToDouble(REORDER_data.Rows[i][a].ToString())) + "%" + "  ";
-            //        }
-            //    }
-            //    xrTb_ElementAnalysis.Rows.Add(addElementalAnalysisRows(REORDER_data.Rows[i]["Name"].ToString(), str_data));
-            //}
-            //xrTb_ElementAnalysis.LocationF = new PointF(10f, NeueStartposition);
-            //NeueStartposition = xrTb_ElementAnalysis.LocationF.Y + xrTb_ElementAnalysis.SizeF.Height + 10;
+            setXRLabelData(xrTableCell30, GetlanguageData("xrCellElementArea", languageData));//元素分析表表头
+            setXRLabelData(xrTableCell31, GetlanguageData("xrCellElementArea_details", languageData));//详情
+            DataTable REORDER_data = REORDER(datas[2], "Name");
+            for (int i = 0; i < REORDER_data.Rows.Count; i++)
+            {
+                double quantity = 0;
+                for (int a = 4; a < REORDER_data.Columns.Count; a++)
+                {
+                    if (REORDER_data.Rows[i][a].ToString() != "")
+                    {
+                        quantity = quantity + Convert.ToDouble(REORDER_data.Rows[i][a].ToString());
+                    }
+                }
+                string str_data = "";
+                for (int a = 4; a < REORDER_data.Columns.Count; a++)
+                {
+                    if (REORDER_data.Rows[i][a].ToString() != "")
+                    {
+                        str_data = str_data + REORDER_data.Columns[a].ColumnName.ToString() + "=" + elementalAnalysis.ParameterNormalization(quantity, Convert.ToDouble(REORDER_data.Rows[i][a].ToString())) + "%" + "  ";
+                    }
+                }
+                xrTb_ElementAnalysis.Rows.Add(addElementalAnalysisRows(REORDER_data.Rows[i]["Name"].ToString(), str_data));
+            }
+            xrTb_ElementAnalysis.LocationF = new PointF(10f, NeueStartposition);
+            NeueStartposition = xrTb_ElementAnalysis.LocationF.Y + xrTb_ElementAnalysis.SizeF.Height + 10;
         }
 
         private XRTableRow addElementalAnalysisRows(string className, string data)
@@ -1404,6 +1404,27 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             });
             return oTS_DEVs;
         }
+
+        private List<ElementalAnalysisDEVData> set_ElementalAnalysisS( string subdivision, string area, string s1, string s2, string s3, string s4, string s5, string s6, string s7, string s8, string s9, string s10)
+        {
+            List<ElementalAnalysisDEVData> oTS_DEVs = new List<ElementalAnalysisDEVData>();
+            oTS_DEVs.Add(new ElementalAnalysisDEVData
+            {
+                subdivision = subdivision,
+                Area = area,
+                s1 = s1,
+                s2 = s2,
+                s3 = s3,
+                s4 = s4,
+                s5 = s5,
+                s6 = s6,
+                s7 = s7,
+                s8 = s8,
+                s9 = s9,
+                s10 = s10
+            });
+            return oTS_DEVs;
+        }
         /// <summary>
         /// 夹杂物分析表（清洁度不需要）
         /// </summary>
@@ -2279,6 +2300,23 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
         public string s9 { get; set; }
         public string s10 { get; set; }
     }
+
+    public class ElementalAnalysisDEVDataS
+    {
+        public string classify { get; set; }
+        public string subdivision { get; set; }
+        public string Area { get; set; }
+        public string s1 { get; set; }
+        public string s2 { get; set; }
+        public string s3 { get; set; }
+        public string s4 { get; set; }
+        public string s5 { get; set; }
+        public string s6 { get; set; }
+        public string s7 { get; set; }
+        public string s8 { get; set; }
+        public string s9 { get; set; }
+        public string s10 { get; set; }
+    }
     public class AreaOfInclusionDEVData
     {
         public string classify { get; set; }