删除元素成分图

OTSCPP/OTSRptCalculate/Model/PropParam.h

@@ -75,11 +75,10 @@ namespace OTSMODEL {
 		MIN = 0,
 		COMMON_FIVE = 0,
 		PARTICALE_COMP = 1,
-		ELEMENT_COMP = 2,
-		PARTICALE_SIZE_DISTRIBUTION = 3,
-		TRIO_CHART = 4,
+		PARTICALE_SIZE_DISTRIBUTION = 2,
+		TRIO_CHART = 3,
 
-		MAX = 4
+		MAX = 3
 	}CALCULATE_CHART_TYPE;
 
 	typedef enum class __declspec(dllexport) PARTICLE_TYPE

OTSIncAReportApp/1-UI/OTSDisplaySourceGridData/OTSSampleReportInfo/OTSSampleReportInfo.cs

@@ -69,13 +69,9 @@ namespace OTSIncAReportApp.OTSSampleReportInfo
         INVALID = -1,
         COMMON_FIVE = 0,
         PARTICALE_COMP = 1,
-        ELEMENT_COMP = 2,
-        PARTICALE_SIZE_DISTRIBUTION = 3,
-        TRIO_CHART = 4,
-        INCLUSION_AREA_RATIO=5,
-
-
-
+        PARTICALE_SIZE_DISTRIBUTION = 2,
+        TRIO_CHART = 3,
+        INCLUSION_AREA_RATIO = 4
     }
     /// <summary>
     /// 显示计算方法的类型

OTSIncAReportApp/1-UI/OTSTemplateDesigner/OTSReport_Export.cs

@@ -1901,7 +1901,7 @@ namespace OTSIncAReportApp
                     }
                     if (ls_str.IndexOf(table["rictbox30"].ToString()) > -1)
                     {
-                        m_export_reporttemplate.InsertReportTemplateChart_ElementCompositionChart(AnalyticGraphics(m_mbszclass.M_YSFXJG.index_cb_yscf_xstx));
+                     //   m_export_reporttemplate.InsertReportTemplateChart_ElementCompositionChart(AnalyticGraphics(m_mbszclass.M_YSFXJG.index_cb_yscf_xstx));
                         lock (m_thread_flag)
                             m_thread_flag = strNill;
                     }

OTSIncAReportApp/1-UI/OTSTemplateDesigner/OTSReport_TemplateDesignerRM.cs

@@ -97,22 +97,6 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             //BindComboBox(cb_ysfx_klfw, OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE);
             #endregion
 
-            #region 元素成份图
-            //显示图形
-            cb_yscf_xstx.Items.Add(table["report1"].ToString());
-            cb_yscf_xstx.Items.Add(table["report2"].ToString());
-            cb_yscf_xstx.Items.Add(table["report3"].ToString());
-            cb_yscf_xstx.Items.Add(table["report4"].ToString());
-            cb_yscf_xstx.Items.Add(table["report5"].ToString());
-            cb_yscf_xstx.SelectedIndex = 0;
-            //计算方式
-            //BindComboBox(DisplayPicutureType.AnalyzeDataChart, cb_yscf_jsfs, OTS_RETORT_PROP_GRID_ITEMS.CALCULATE_CHART_TYPE, (int)CALCULATE_CHART_TYPE.TRIO_CHART, OTS_RETORT_PROP_GRID_ITEMS.SIZE_CAL_METHOD_TYPE);
-            //BindComboBox(cb_yscf_jsfs, OTS_REPORT_PROP_GRID_ITEMS.SIZE_CAL_METHOD_TYPE);
-            //颗粒范围
-            //BindComboBox(DisplayPicutureType.AnalyzeDataTable, cb_yscf_klfw, OTS_RETORT_PROP_GRID_ITEMS.CALCULATE_TABLE_TYPE, (int)CALCULATE_TABLE_TYPE.PARTICALE_GENE_INFO, OTS_RETORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE);
-            //BindComboBox(cb_yscf_klfw, OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE);
-            #endregion
-
             #region 三元相图
             //计算方式
             //BindComboBox(DisplayPicutureType.AnalyzeDataChart, cb_syxt_jsfs, OTS_RETORT_PROP_GRID_ITEMS.CALCULATE_CHART_TYPE, (int)CALCULATE_CHART_TYPE.TRIO_CHART, OTS_RETORT_PROP_GRID_ITEMS.SIZE_CAL_METHOD_TYPE);
@@ -597,15 +581,6 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             //m_OTSReport_Export.m_mbszclass.M_YSFXJG.index_cb_ysfx_klfw = cb_ysfx_klfw.SelectedIndex;
             m_OTSReport_Export.m_mbszclass.M_YSFXJG.str_tb_ysfx_xsys = tb_ysfx_xsys.Text;//显示元素
 
-            m_OTSReport_Export.m_mbszclass.M_YSFXJG.b_ck_yscf_xsmk = ck_yscf_xsmk.Checked;
-            m_OTSReport_Export.m_mbszclass.M_YSFXJG.str_cb_yscf_xstx = cb_yscf_xstx.Text;//显示图形
-            m_OTSReport_Export.m_mbszclass.M_YSFXJG.index_cb_yscf_xstx = cb_yscf_xstx.SelectedIndex;
-            //m_OTSReport_Export.m_mbszclass.M_YSFXJG.str_cb_yscf_jsfs = cb_yscf_jsfs.Text;//计算方式
-            //m_OTSReport_Export.m_mbszclass.M_YSFXJG.index_cb_yscf_jsfs = cb_yscf_jsfs.SelectedIndex;
-            //m_OTSReport_Export.m_mbszclass.M_YSFXJG.str_cb_yscf_klfw = cb_yscf_klfw.Text;//颗粒范围
-            //m_OTSReport_Export.m_mbszclass.M_YSFXJG.index_cb_yscf_klfw = cb_yscf_klfw.SelectedIndex;
-            //m_OTSReport_Export.m_mbszclass.M_YSFXJG.str_tb_yscf_ysxx = tb_yscf_ysxx.Text;//显示元素
-
             //三元相图
             m_OTSReport_Export.m_mbszclass.M_SYXT.b_ck_syxt_xsmk = ck_syxt_xsmk.Checked;
             //m_OTSReport_Export.m_mbszclass.M_SYXT.str_cb_syxt_jsfs = cb_syxt_jsfs.Text;//计算方式
@@ -698,15 +673,6 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             //cb_ysfx_klfw.SelectedIndex = m_OTSReport_Export.m_mbszclass.M_YSFXJG.index_cb_ysfx_klfw;
             tb_ysfx_xsys.Text = m_OTSReport_Export.m_mbszclass.M_YSFXJG.str_tb_ysfx_xsys;//显示元素
 
-            ck_yscf_xsmk.Checked = m_OTSReport_Export.m_mbszclass.M_YSFXJG.b_ck_yscf_xsmk;
-            //cb_yscf_xstx.Text = m_OTSReport_Export.m_mbszclass.M_YSFXJG.str_cb_yscf_xstx;//显示图形
-            cb_yscf_xstx.SelectedIndex = m_OTSReport_Export.m_mbszclass.M_YSFXJG.index_cb_yscf_xstx;
-            //cb_yscf_jsfs.Text = m_OTSReport_Export.m_mbszclass.M_YSFXJG.str_cb_yscf_jsfs;//计算方式
-            //cb_yscf_jsfs.SelectedIndex = m_OTSReport_Export.m_mbszclass.M_YSFXJG.index_cb_yscf_jsfs;
-            //cb_yscf_klfw.Text = m_OTSReport_Export.m_mbszclass.M_YSFXJG.str_cb_yscf_klfw;//颗粒范围
-            //cb_yscf_klfw.SelectedIndex = m_OTSReport_Export.m_mbszclass.M_YSFXJG.index_cb_yscf_klfw;
-            //tb_yscf_ysxx.Text = m_OTSReport_Export.m_mbszclass.M_YSFXJG.str_tb_yscf_ysxx;//显示元素
-
             //三元相图
             ck_syxt_xsmk.Checked = m_OTSReport_Export.m_mbszclass.M_SYXT.b_ck_syxt_xsmk;
             //cb_syxt_jsfs.Text = m_OTSReport_Export.m_mbszclass.M_SYXT.str_cb_syxt_jsfs;//计算方式
@@ -909,19 +875,19 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
                 }
                 else if (i == 5)
                 {
-                    if (ck_yscf_xsmk.Checked)
-                    {
-                        pictureBox5.Visible = true;
-                        top = top + 950;
-                        pictures[i - 1].Top = top;
-                        pictures[i - 1].Left = left;
-                        pictures[i - 1].Width = 673;
-                        pictures[i - 1].Height = 954;
-                    }
-                    else
-                    {
-                        pictureBox5.Visible = false;
-                    }
+                    //if (ck_yscf_xsmk.Checked)
+                    //{
+                    //    pictureBox5.Visible = true;
+                    //    top = top + 950;
+                    //    pictures[i - 1].Top = top;
+                    //    pictures[i - 1].Left = left;
+                    //    pictures[i - 1].Width = 673;
+                    //    pictures[i - 1].Height = 954;
+                    //}
+                    //else
+                    //{
+                    //    pictureBox5.Visible = false;
+                    //}
                 }
                 else if (i == 6)
                 {
@@ -1075,20 +1041,6 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             LocationPicture();
         }
 
-        private void ck_yscf_xsmk_CheckedChanged(object sender, EventArgs e)
-        {
-            if (ck_yscf_xsmk.Checked)
-            {
-                pictureBox5.Visible = true;
-                this.pictureBox5.Image = Properties.Resources.元素成分图;
-            }
-            else
-            {
-                pictureBox5.Visible = false;
-            }
-            LocationPicture();
-        }
-
         private void ck_syxt_xsmk_CheckedChanged(object sender, EventArgs e)
         {
             if (ck_syxt_xsmk.Checked)

OTSIncAReportApp/1-UI/frmReportApp.cs

@@ -1079,14 +1079,6 @@ namespace OTSIncAReportApp
                         //    im_ParticalesCompositionChart.CopyToBitmap();
                         //}
                     }
-                    if (DisType == (int)CALCULATE_CHART_TYPE.ELEMENT_COMP)
-                    {
-                        //if (im_ElementCompositionChart != null)
-                        //{
-                        //    //元素成份图
-                        //    im_ElementCompositionChart.CopyToBitmap();
-                        //}
-                    }
                     if (DisType == (int)CALCULATE_CHART_TYPE.PARTICALE_SIZE_DISTRIBUTION)
                     {
                         //if (im_ParticalesSizeDistributionChart != null)
@@ -1192,14 +1184,6 @@ namespace OTSIncAReportApp
                         //    im_ParticalesCompositionChart.CopyToBitmap();
                         //}
                     }
-                    if (DisType == (int)CALCULATE_CHART_TYPE.ELEMENT_COMP)
-                    {
-                        //if (im_ElementCompositionChart != null)
-                        //{
-                        //    //元素成份图
-                        //    im_ElementCompositionChart.CopyToBitmap();
-                        //}
-                    }
                     if (DisType == (int)CALCULATE_CHART_TYPE.PARTICALE_SIZE_DISTRIBUTION)
                     {
                         //if (im_ParticalesSizeDistributionChart != null)