Browse Source

优化 导出 execl 相关 功能

cxs 11 months ago
parent
commit
18f55e03d0

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

@@ -1920,7 +1920,7 @@ namespace OTSIncAReportGrids
 
 
                         if (i_cell == 2)
                         if (i_cell == 2)
                         {
                         {
-                            if (sfd.Picture)
+                            if (sfd.IfExportPicture)
                             {
                             {
                                 //颗粒图像列
                                 //颗粒图像列
                                 bp = (Bitmap)dgV_ParticlesDevidePage.Rows[i_row].Cells[2].Value;
                                 bp = (Bitmap)dgV_ParticlesDevidePage.Rows[i_row].Cells[2].Value;
@@ -1949,7 +1949,7 @@ namespace OTSIncAReportGrids
 
 
                     }
                     }
                 }
                 }
-                if (sfd.SpectrumData)
+                if (sfd.IfExportSpectrumData)
                 {
                 {
                     ISheet sheet2;
                     ISheet sheet2;
                     sheet2 = workbook.CreateSheet("Peak spectrum Data");//创建工作表
                     sheet2 = workbook.CreateSheet("Peak spectrum Data");//创建工作表
@@ -1997,7 +1997,7 @@ namespace OTSIncAReportGrids
                         }
                         }
                     }
                     }
                 }
                 }
-                if (sfd.SpectrumConfirmation)
+                if (sfd.IfExportSpectrumConfirmation)
                 {
                 {
                     ISheet sheet3;
                     ISheet sheet3;
                     sheet3 = workbook.CreateSheet("Peak spectrum");
                     sheet3 = workbook.CreateSheet("Peak spectrum");

+ 18 - 18
OTSIncAReportApp/1-UI/Control_Grids/SpectrumExportConfirmation.cs

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