modify some conflicts

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

@@ -101,7 +101,7 @@ namespace OTSIncAReportGraph.Controls
         //标尺的大小记录
         public float m_f_ruler_size = 100;
         
-        public double m_pixelSize = 4.5f;
+        public float m_pixelSize = 4.5f;
    
         //国际化存储信息
         System.Collections.Hashtable table;
@@ -1094,7 +1094,7 @@ namespace OTSIncAReportGraph.Controls
                                 }
                                 else
                                 {
-                                    if (!m_ReportFun.GetSplitPartFun(pointList[0], pointList[1], m_pixelSize))
+                                    if (!imageDisHelper.GetSplitPartFun(pointList[0], pointList[1], m_pixelSize))
                                     {
                                         MessageBox.Show(table["str13"].ToString());
                                     }

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

@@ -160,17 +160,6 @@
             this.tbx_Type.TabIndex = 34;
             this.tbx_Type.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             // 
-            // btn_ReMeasure
-            // 
-            this.btn_ReMeasure.Location = new System.Drawing.Point(1078, 10);
-            this.btn_ReMeasure.Name = "btn_ReMeasure";
-            this.btn_ReMeasure.Size = new System.Drawing.Size(80, 23);
-            this.btn_ReMeasure.TabIndex = 33;
-            this.btn_ReMeasure.Text = "二次采集";
-            this.btn_ReMeasure.UseVisualStyleBackColor = true;
-            this.btn_ReMeasure.Visible = false;
-            this.btn_ReMeasure.Click += new System.EventHandler(this.btn_ReMeasure_Click);
-            // 
             // btn_Sel
             // 
             this.btn_Sel.Location = new System.Drawing.Point(809, 8);

OTSIncAReportApp/1-UI/frmReMeasure.cs

@@ -13,6 +13,7 @@ using System.Windows.Forms;
 using OTSIncAReportGrids.OTSIncAReportGridsFuncation;
 using System.Threading;
 using static OTSDataType.otsdataconst;
+using OTSPeriodicTable;
 using OpenCvSharp;
 using Point = System.Drawing.Point;
 using OTSIncAReportGraph.Controls;
@@ -27,6 +28,7 @@ using OTSIncAReportApp.DataOperation.DataAccess;
 using OTSModelSharp.DTLBase;
 using OTSRptPeriodicTable;
 using ExportToExcel;
+using ComboBoxItem = OTSMeasureApp.ComboBoxItem;
 
 namespace OTSIncAReportApp
 {
@@ -58,6 +60,7 @@ namespace OTSIncAReportApp
         //国际化
         Language lan;
         Hashtable table;
+        public static string ReportMgrParamFile = "\\Config\\SysData\\OTSReportMgrParam.rpf"; //报告对应使用的参数文件名
 
         private delegate void DelSetPro(string txt, RichTextBox richTextBox);//设置进度条进度的委托方法
 
@@ -252,7 +255,7 @@ namespace OTSIncAReportApp
             string startFun = ((Dictionary<string, object>)((Dictionary<string, object>)((Dictionary<string, object>)ReportFun.resultFile.ResultInfo["Sample"])["Members"])["MsrParams"])["SysType"].ToString();
             //从报告xml文件中加载,显示计算列，显示元素信息
             string str_DefaultComputedColName = "";
-            DataSet ds = OTSIncAReportApp.DataOperation.DataAccess.XMLoperate.GetXmlData(Application.StartupPath + m_ReportApp.m_OTSReportMgrParamFile, "XMLData");
+            DataSet ds = OTSIncAReportApp.DataOperation.DataAccess.XMLoperate.GetXmlData(Application.StartupPath + ReportMgrParamFile, "XMLData");
             DataTable dt = ds.Tables["Member"];
             foreach (DataRow element in dt.Rows)
             {
@@ -584,17 +587,17 @@ namespace OTSIncAReportApp
                 ShowElementInfo ls_sei = new ShowElementInfo();
                 ls_sei.ElementName = particle.ElementList[i].Name;
                 ls_sei.Percentage = particle.ElementList[i].Percentage;
-                ls_sei.dKF = Convert.ToDouble(CListPeriodic.GetPeriodicByYsm(CListPeriodic.GetListPeriodic(), ls_sei.ElementName).SX1);
-                double de_sx2 = 0;
-                if (CListPeriodic.GetPeriodicByYsm(CListPeriodic.GetListPeriodic(), ls_sei.ElementName).SX2 == "" || CListPeriodic.GetPeriodicByYsm(CListPeriodic.GetListPeriodic(), ls_sei.ElementName).SX2 == "-")
+                ls_sei.dKF = Convert.ToDouble(CListPeriodic.GetPeriodicByEleName(ls_sei.ElementName).K_Peak);
+                double de_K_Peak = 0;
+                if (CListPeriodic.GetPeriodicByEleName(ls_sei.ElementName).K_Peak == "" || CListPeriodic.GetPeriodicByEleName(ls_sei.ElementName).K_Peak == "-")
                 {
-                    de_sx2 = 0;
+                    de_K_Peak = 0;
                 }
                 else
                 {
-                    de_sx2 = Convert.ToDouble(CListPeriodic.GetPeriodicByYsm(CListPeriodic.GetListPeriodic(), ls_sei.ElementName).SX2);
+                    de_K_Peak = Convert.ToDouble(CListPeriodic.GetPeriodicByEleName(ls_sei.ElementName).K_Peak);
                 }
-                ls_sei.dLF = de_sx2;
+                ls_sei.dLF = de_K_Peak;
                 list_showelementinfo.Add(ls_sei);
             }