Merge branch 'Release2.7' of http://36.129.163.148:30080/gogsadmin/OTS into Release2.7

Bin/x64/Debug/Resources/XMLData/AppResource_EN.xml

@@ -137,6 +137,7 @@
       <Control name="ribbonOrbOptionButton1" text="Management" />
       <Control name="ribbonTab1" text="BasicFunction" />
       <Control name="ribbonPanel3" text="File" />
+	  <Control name="ribbonPanelOthers" text="Others" />
       <Control name="rbSelTool" text="Matching" />
       <Control name="rbAllImage" text="FullMatching" />
 	  <Control name="rbWidthImage" text="WidthMatching" />
@@ -158,12 +159,19 @@
 	  <Control name="RSGrayVal" text="GrayValue" />
 	  <Control name="mouseMatter" text="MouseMatter" />
 	  <Control name="ribbonOrbMenuItem5" text="Copy" />
-	
+	  <Control name="rbHelp" text="Help" />
 	  <Control name="ribbonOrbMenuItem_Extremum" text="Extremum analysis" />
+	  <Control name="ribbonOrbMenuItem_InclusionsTraceability" text="Tracing of foreign inclusions" />
 	  <Control name="message1" text="Now there are open measurement results files which will not be saved after new projects are built. Are you sure to build a new one?" />
 	  <Control name="AnalysisDiagram" text="Analysis diagram" />
 	  <Control name="AnalysisDataSheet" text="Analysis data sheet" />
 	  <Control name="AnalysisDataChart" text="Analysis data chart" />
+	  
+	  <Control name="ribbonPanelOthers" text="Other" />
+	  <Control name="rbHelp" text="Help" />
+	  
+	  <Control name="ribbonOrbMenuItem_InclusionsTraceability" text="Traceability of foreign inclusions" />
+	    
     </Controls>
  </Form>
   <Form>
@@ -303,6 +311,10 @@
 	  <Control name="cb_ELONG" text="Expansion length" />
 	  <Control name="cb_ASPECT_ELONG" text="Expanded aspect ratio" />
 	  <Control name="cb_Orientation" text="Orientation angle" />
+	  <Control name="cb_FiledCoordinate" text="FiledCoordinate" />
+	  <Control name="cB_Density" text="Density" />
+	  <Control name="cB_Electrical_conductivity" text="Electrical_conductivity" />
+	  <Control name="cB_Hardness" text="Hardness" />
     </Controls>
  </Form>
  <Form>
@@ -341,78 +353,102 @@
  <Form>
     <Name>OTSReport_Export</Name>
     <Controls>
-      <Control name="label2" text="CurrentProgress" />
+       <Control name="label2" text="CurrentProgress" />
 	  <Control name="label3" text="SelectTemplate" />
 	  <Control name="btn_export" text="Export" />
 	  <Control name="btn_exit" text="SignOut" />
 	  <Control name="label1" text="SavePath" />
 	  <Control name="btn_TempDes" text="EditTemplate" />
 	  <Control name="label4" text="DataSource" />
-	   <Control name="btn_preview" text="OpenReport" />
+	  <Control name="btn_preview" text="OpenReport" />
 	  <Control name="OTSReport_Export" text="ReportingProgramOutput" />
 	  
 	  <Control name="MessageBox1" text="Exporting report, please wait!" />
 	  <Control name="MessageBox2" text="Later" />
 	  <Control name="MessageBox3" text="The report has been opened, please close it first!" />
 	  <Control name="MessageBox4" text="Tips" />
-	  <Control name="MessageBox5" text="[yes] directly open the report, [no] regenerate the report, [canonical] cancel the operation" />
+	  <Control name="MessageBox5" text="[Yes] Open the report directly, [No] Regenerate the report, [Cancel] Cancel the operation" />
 	  <Control name="MessageBox6" text="The report has generated data, please select an operation" />
-	  <Control name="MessageBox7" text="Report template database file already exists, open it directly" />
-	  <Control name="RictBox1" text="Start export operation" />
+	  <Control name="MessageBox7" text="The report template database file already exists. Open it directly" />
+	  <Control name="RictBox1" text="Start the export operation" />
 	  <Control name="RictBox2" text="no files found" />
-	  <Control name="RictBox3" text=", was it not exported?" />
+	  <Control name="RictBox3" text=", Is it not exported?" />
 	  <Control name="RictBox4" text="The settings in the obtained template are:" />
 	  
-	  <Control name="RictBox5" text="Load the measurement result information table module" />
-	  <Control name="RictBox6" text="Loading: measurement result information table" />
+	  
 	  <Control name="RictBox7" text="wait for" />
-	  <Control name="RictBox8" text="Loading the measurement result information table module is completed" />
-	  <Control name="RictBox9" text="Load granule list module..." />
-	  <Control name="RictBox10" text="Loading: Particle List" />
-	  <Control name="RictBox11" text="measurement result information table" />
+	 
+	 
 	  <Control name="RictBox12" text="Loading:" />
-	  <Control name="RictBox13" text="Particle List" />
-	  <Control name="RictBox14" text="Loading granule list module complete" />
+	
 	  
-	  <Control name="RictBox15" text="Load Average Element Content Table module..." />
-	  <Control name="RictBox16" text="Loading: Average Element Content Table" />
-	  <Control name="RictBox17" text="Loading Average Element Content Table Module Completed" />
-	  <Control name="RictBox18" text="Average Element Content Table" />
+	 
 	  
-	  <Control name="RictBox19" text="Loading in the particle size table module...." />
-	  <Control name="RictBox20" text="Loading: particle size table" />
-	  <Control name="RictBox21" text="Loading the particle size table module is complete" />
-	  <Control name="RictBox22" text="particle size table" />
+	  <Control name="RictBox35" text="Generate template temporary database file...." />
+	  <Control name="RictBox36" text="Loading:Generate template temporary database file" />
+	  <Control name="RictBox37" text="Template temporary database file completed" />
+	  <Control name="RictBox38" text="Generate template temporary database file" />
 	  
-	  <Control name="RictBox23" text="Loading Particle Composition Diagram Module...." />
-	  <Control name="RictBox24" text="Loading: Particle composition diagram" />
-	  <Control name="RictBox25" text="Loading Particle Composition Diagram Module Completed" />
-	  <Control name="RictBox26" text="Particle composition diagram" />
+	  <Control name="RictBox39" text="Importing into report template, completed:" />
+	  <Control name="RictBox40" text="NULL" />
 	  
-	  <Control name="RictBox27" text="Loading Element Component Diagram Module...." />
-	  <Control name="RictBox28" text="Loading: Elemental composition diagram" />
-	  <Control name="RictBox29" text="Loading Element Component Diagram Module Completed" />
-	  <Control name="RictBox30" text="Elemental composition diagram" />
+	  <Control name="RictBox41" text="Exported:" />
+	  <Control name="RictBox42" text="surface" />
+	  <Control name="RictBox43" text="Export completed!" />
 	  
-	  <Control name="RictBox31" text="Loading a ternary phase diagram module...." />
-	  <Control name="RictBox32" text="Loading: Ternary Phase Diagram" />
-	  <Control name="RictBox33" text="Loading ternary phase diagram module complete" />
-	  <Control name="RictBox34" text="Ternary Phase Diagram" />
 	  
-	  <Control name="RictBox35" text="Generate Template Template Database File...." />
-	  <Control name="RictBox36" text="Loading: Generate Template Template Database File" />
-	  <Control name="RictBox37" text="Template Temporary Database File Completion" />
-	  <Control name="RictBox38" text="Generate Template Template Database File" />
 	  
-	  <Control name="RictBox39" text="Importing into report template, completed" />
-	  <Control name="RictBox40" text="Null" />
 	  
-	  <Control name="RictBox41" text="Exported:" />
-	  <Control name="RictBox42" text="surface" />
-	  <Control name="RictBox43" text="Export complete!" />
+	  <Control name="Result_information_ing" text="Load the measurement result information table module...." />
+	  <Control name="Load_result_information" text="Loading:Measurement result information table" />
+	  <Control name="Result_information" text="Measurement result information table" />
+	  <Control name="Loading_result_information_completed" text="Loading the measurement result information table module is completed" />
+	  
+	  <Control name="Dimensional_analysis_table_ing" text="Load the particle size analysis table module...." />
+	  <Control name="Loading_dimension_analysis_table" text="Loading:Particle size analysis table" />
+	  <Control name="Dimensional_analysis_table" text="Particle size analysis table" />
+	  <Control name="Loading_dimension_analysis_table_completed" text="Loading particle size analysis table module completed" />
+	  
+	  <Control name="Element_analysis_table_ing" text="Load the element analysis table module...." />
+	  <Control name="Load_element_analysis_table" text="Loading:Element Analysis Table" />
+	  <Control name="Element_analysis_table" text="Element Analysis Table" />
+	  <Control name="Loading_element_analysis_table_completed" text="Loading element analysis table module completed" />
+	  
+	  <Control name="inca_area_ratio_table_ing" text="Loading inclusion area ratio table module...." />
+	  <Control name="Load_inca_area_ratio_table" text="Loading:Inclusion area ratio table" />
+	  <Control name="inca_area_ratio_table" text="Inclusion area ratio table" />
+	  <Control name="Loading_inca_area_ratio_table_completed" text="Loading inclusion area ratio table module completed" />
+	  
+	  <Control name="inca_area_ratio_diagram_ing" text="Loading inclusion area ratio diagram module...." />
+	  <Control name="Load_inca_area_ratio_diagram" text="Loading:Inclusion area ratio diagram" />
+	  <Control name="inca_area_ratio_diagram" text="Inclusion area ratio diagram" />
+	  <Control name="Loading_inca_area_ratio_diagram_completed" text="Loading inclusion area ratio diagram module completed" />
+	  
+	  <Control name="ternary_graph_ing" text="Loading the ternary diagram module...." />
+	  <Control name="Load_ternary_graph" text="Loading:Ternary graph" />
+	   <Control name="ternary_graph" text="Ternary graph" />
+	  <Control name="Loading_ternary_graph_completed" text="Loading ternary diagram module completed" />
+	  
+	  <Control name="Particle_list_ing" text="Load the particle list module...." />
+	  <Control name="Load_particle_list" text="Loading:Particle list" />
+	  <Control name="particle_list" text="Particle list" />
+	  <Control name="Loading_particle_list_completed" text="Loading particle list module completed" />
+	  
+	  <Control name="Particle_list_frame_diagram_ing" text="Load the grain frame diagram list module...." />
+	  <Control name="Load_particle_list_frame_diagram" text="Loading:Grain Frame Chart List" />
+	  <Control name="particle_list_frame_diagram" text="Grain Frame Chart List" />
+	  <Control name="Loading_Particle_list_frame_diagram_completed" text="Loading grain frame list module completed" />
+	  
+	  
+	  
+	  <Control name="button7" text="GBExport" />
+	  
+	  
+	  
+	  
+	 
+	  
 	  
-	  <Control name="RictBox44" text="The report template has been opened. Please close it first!" />
-	  <Control name="RictBox45" text="Tips" />
     </Controls>
  </Form>
  <Form>
@@ -491,6 +527,28 @@
 	  <Control name="label38" text="Particle size table information" />
 	  <Control name="label12" text="Particle size table information" />
 	  <Control name="label15" text="Particle size table information" />
+	  
+	  <Control name="label111" text="AdditionalFrameDiagram" />
+	  <Control name="groupBox_px" text="MaximumSortTable" />
+	  <Control name="ParticleList_1" text="Parameter 1" />
+	  <Control name="ParticleList_2" text="Parameter 2" />
+	  <Control name="ParticleList_3" text="Parameter 3" />
+	  <Control name="groupBox_zt" text="Frame Chart" />
+	  <Control name="ParticleList_4" text="Parameter 4" />
+	  <Control name="ParticleList_5" text="Parameter 5" />
+	  <Control name="groupBox211" text="InclusionRatioTable" />
+	  
+	  <Control name="label1211" text="Display the module" />
+	  <Control name="label1311" text="Show additional graphics" />
+	  <Control name="groupBZ" text="Remarks" />
+	  
+	  
+	  
+	  <Control name="label11111" text="Remove element information" />
+	  <Control name="label_delete_Class" text="Remove classification" />
+	  <Control name="button5" text="Selection" />
+	  
+	  
     </Controls>
  </Form>
  <Form>
@@ -860,11 +918,18 @@
 	  
 	  <Control name="MouseMove1" text="Particle SEM location:" />
 	  <Control name="MouseMove2" text="Grayscale#" />
-	  
 	  <Control name="BSEOriginal" text="BSE original"/>
 	  <Control name="ClassifiedDisplay" text="Classified display"/>
 	  <Control name="OriginalSplicing" text="Original splicing"/>
 	  <Control name="OriginalDistribution" text="Original distribution"/>
+	  
+	  
+	  
+	  <Control name="ExportoriginalspliceToolStripMenuItem" text="Duplicate Rendering"/>
+	  
+	  <Control name="ToolStripMenuItem" text="Partitioning particles"/>
+	  <Control name="ImportSTDDb" text="Import Standard Library"/>
+	  
     </Controls>
  </Form>
  <Form>

Bin/x64/Debug/Resources/XMLData/AppResource_ZH.xml

@@ -137,6 +137,7 @@
       <Control name="ribbonOrbOptionButton1" text="程序管理" />
       <Control name="ribbonTab1" text="基本功能" />
       <Control name="ribbonPanel3" text="文件" />
+	  <Control name="ribbonPanelOthers" text="其它" />
       <Control name="rbSelTool" text="显示图匹配" />
       <Control name="rbAllImage" text="全图匹配" />
 	  <Control name="rbWidthImage" text="宽度匹配" />
@@ -158,8 +159,9 @@
 	  <Control name="RSGrayVal" text="灰度值" />
 	  <Control name="mouseMatter" text="鼠标点的物质" />
 	  <Control name="ribbonOrbMenuItem5" text="复制" />
-	
+	  <Control name="rbHelp" text="帮助" />
 	  <Control name="ribbonOrbMenuItem_Extremum" text="极值分析法 " />
+	  <Control name="ribbonOrbMenuItem_InclusionsTraceability" text="外来夹杂物溯源 " />
 	  <Control name="message1" text="现已经有打开的测量结果文件新建项目后将不保存，是否确定新建？" />
 	  <Control name="AnalysisDiagram" text="分析图" />
 	  <Control name="AnalysisDataSheet" text="分析数据表" />

Bin/x64/Debug/Resources/XMLData/LanguageDefine.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" standalone="yes"?>
 <Language>
-  <DefaultLanguage>EN</DefaultLanguage>
+  <DefaultLanguage>ZH</DefaultLanguage>
 </Language>

Bin/x64/Debug/Resources/XMLData/ResourceForSTDManage-EN.xml

@@ -17,6 +17,8 @@
       <Control name="rbRecover" text="ResetToFactorySettings"/>
       <Control name="rbBackup" text="SaveAs"/>
       <Control name="rbSave" text="Save"/>
+	  <Control name="ribbon_ConvertOreDatabaseToOtsDatabase" text="Ore database is converted to ots database tool"/>
+	  <Control name="rbMatchescorrespondingelement" text="Search element information from the Amics mineral database"/>
       <Control name="language" text="EN" />
 	  <Control name="message1" text="Save successful！" />
 	  <Control name="message2" text="Save failed！"/>

Bin/x64/Debug/Resources/XMLData/ResourceForSTDManage-ZH.xml

@@ -17,6 +17,8 @@
       <Control name="rbRecover" text="恢复至原厂数据"/>
       <Control name="rbBackup" text="另存为"/>
       <Control name="rbSave" text="保存"/>
+	  <Control name="ribbon_ConvertOreDatabaseToOtsDatabase" text="矿石数据库转换为ots数据库工具"/>
+	  <Control name="rbMatchescorrespondingelement" text="从Amics矿物数据库中搜索标准条目的元素信息并移植到新库"/>
 	  <Control name="language" text="ZH" />
 	  <Control name="message1" text="保存成功！"/>
 	  <Control name="message2" text="保存失败！"/>

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

@@ -35,7 +35,7 @@
             this.toolStripMenuItem_copyimage = new System.Windows.Forms.ToolStripMenuItem();
             this.ExportoriginalspliceToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.ToolStripMenuItemDelete_Particle = new System.Windows.Forms.ToolStripMenuItem();
-            this.分割颗粒ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.ImportSTDDb = new System.Windows.Forms.ToolStripMenuItem();
             this.CMenuStrip.SuspendLayout();
             this.SuspendLayout();
@@ -49,7 +49,7 @@
             this.toolStripMenuItem_copyimage,
             this.ExportoriginalspliceToolStripMenuItem,
             this.ToolStripMenuItemDelete_Particle,
-            this.分割颗粒ToolStripMenuItem,
+            this.ToolStripMenuItem,
             this.ImportSTDDb});
             this.CMenuStrip.Name = "contextMenuStrip1";
             this.CMenuStrip.Size = new System.Drawing.Size(219, 236);
@@ -93,12 +93,12 @@
             this.ToolStripMenuItemDelete_Particle.Text = "Delete particles";
             this.ToolStripMenuItemDelete_Particle.Click += new System.EventHandler(this.ToolStripMenuItemDelete_Particle_Click);
             // 
-            // 分割颗粒ToolStripMenuItem
+            // ToolStripMenuItem
             // 
-            this.分割颗粒ToolStripMenuItem.Name = "分割颗粒ToolStripMenuItem";
-            this.分割颗粒ToolStripMenuItem.Size = new System.Drawing.Size(218, 30);
-            this.分割颗粒ToolStripMenuItem.Text = "分割颗粒";
-            this.分割颗粒ToolStripMenuItem.Click += new System.EventHandler(this.分割颗粒ToolStripMenuItem_Click);
+            this.ToolStripMenuItem.Name = "ToolStripMenuItem";
+            this.ToolStripMenuItem.Size = new System.Drawing.Size(218, 30);
+            this.ToolStripMenuItem.Text = "分割颗粒";
+            this.ToolStripMenuItem.Click += new System.EventHandler(this.分割颗粒ToolStripMenuItem_Click);
             // 
             // ImportSTDDb
             // 
@@ -131,7 +131,7 @@
         private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem_copyimage;
         private System.Windows.Forms.ToolStripMenuItem ExportoriginalspliceToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItemDelete_Particle;
-        private System.Windows.Forms.ToolStripMenuItem 分割颗粒ToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem ImportSTDDb;
     }
 }

OTSIncAReportApp/1-UI/OTSTemplateDesigner/Export_ReportTemplate.cs

@@ -1160,7 +1160,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
         /// <param name="a_mi">总数</param>
         /// <param name="m">传参</param>
         /// <returns></returns>
-        private string ParameterNormalization(double a_mi,double m)
+        public string ParameterNormalization(double a_mi,double m)
         {
             double ColVal = Convert.ToDouble(m / a_mi * 100);
             if (ColVal == 0)

OTSIncAReportApp/1-UI/OTSTemplateDesigner/OTSReport_TemplateDesignerRM.Designer.cs

@@ -76,6 +76,8 @@
             this.label33 = new System.Windows.Forms.Label();
             this.label42 = new System.Windows.Forms.Label();
             this.groupBox8 = new System.Windows.Forms.GroupBox();
+            this.label_delete_Class = new System.Windows.Forms.Label();
+            this.delete_Class = new System.Windows.Forms.TextBox();
             this.label11111 = new System.Windows.Forms.Label();
             this.button5 = new System.Windows.Forms.Button();
             this.tb_RemoveElements = new System.Windows.Forms.TextBox();
@@ -121,8 +123,6 @@
             this.groupBox9 = new System.Windows.Forms.GroupBox();
             this.label39 = new System.Windows.Forms.Label();
             this.cb_ParticleRange = new System.Windows.Forms.ComboBox();
-            this.delete_Class = new System.Windows.Forms.TextBox();
-            this.label_delete_Class = new System.Windows.Forms.Label();
             this.groupBox1.SuspendLayout();
             this.groupBox4.SuspendLayout();
             this.groupBox6.SuspendLayout();
@@ -662,6 +662,22 @@
             this.groupBox8.TabStop = false;
             this.groupBox8.Text = "颗粒列表";
             // 
+            // label_delete_Class
+            // 
+            this.label_delete_Class.AutoSize = true;
+            this.label_delete_Class.Location = new System.Drawing.Point(12, 440);
+            this.label_delete_Class.Name = "label_delete_Class";
+            this.label_delete_Class.Size = new System.Drawing.Size(101, 12);
+            this.label_delete_Class.TabIndex = 63;
+            this.label_delete_Class.Text = "去除指定物质分类";
+            // 
+            // delete_Class
+            // 
+            this.delete_Class.Location = new System.Drawing.Point(11, 464);
+            this.delete_Class.Name = "delete_Class";
+            this.delete_Class.Size = new System.Drawing.Size(181, 21);
+            this.delete_Class.TabIndex = 62;
+            // 
             // label11111
             // 
             this.label11111.AutoSize = true;
@@ -673,9 +689,9 @@
             // 
             // button5
             // 
-            this.button5.Location = new System.Drawing.Point(202, 403);
+            this.button5.Location = new System.Drawing.Point(181, 403);
             this.button5.Name = "button5";
-            this.button5.Size = new System.Drawing.Size(55, 23);
+            this.button5.Size = new System.Drawing.Size(76, 23);
             this.button5.TabIndex = 60;
             this.button5.Text = "选取";
             this.button5.UseVisualStyleBackColor = true;
@@ -687,7 +703,7 @@
             this.tb_RemoveElements.Margin = new System.Windows.Forms.Padding(2);
             this.tb_RemoveElements.Name = "tb_RemoveElements";
             this.tb_RemoveElements.ReadOnly = true;
-            this.tb_RemoveElements.Size = new System.Drawing.Size(181, 21);
+            this.tb_RemoveElements.Size = new System.Drawing.Size(168, 21);
             this.tb_RemoveElements.TabIndex = 59;
             // 
             // ck_kllb_fjzt
@@ -1138,22 +1154,6 @@
             this.cb_ParticleRange.Size = new System.Drawing.Size(121, 20);
             this.cb_ParticleRange.TabIndex = 76;
             // 
-            // delete_Class
-            // 
-            this.delete_Class.Location = new System.Drawing.Point(11, 464);
-            this.delete_Class.Name = "delete_Class";
-            this.delete_Class.Size = new System.Drawing.Size(181, 21);
-            this.delete_Class.TabIndex = 62;
-            // 
-            // label_delete_Class
-            // 
-            this.label_delete_Class.AutoSize = true;
-            this.label_delete_Class.Location = new System.Drawing.Point(12, 440);
-            this.label_delete_Class.Name = "label_delete_Class";
-            this.label_delete_Class.Size = new System.Drawing.Size(101, 12);
-            this.label_delete_Class.TabIndex = 63;
-            this.label_delete_Class.Text = "去除指定物质分类";
-            // 
             // OTSReport_TemplateDesignerRM
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);

OTSIncAReportApp/1-UI/frmReportApp.cs

@@ -260,12 +260,12 @@ namespace OTSIncAReportApp
             ribbonPanel2.Tag = "ribbonPanel2";
             rbSelTool.Tag = "rbSelTool";
             rbChoiceTools.Tag = "rbChoiceTools";
-
+            ribbonPanelOthers.Tag = "ribbonPanelOthers";
             ribbonTab1.Tag = "ribbonTab1";
             rbMenu.Tag = "rbMenu";
 
             dpbOpen.Tag = "dpbOpen";
-
+            ribbonOrbMenuItem_Extremum.Tag = "ribbonOrbMenuItem_Extremum";
             dpbExport.Tag = "dpbExport";
             ribbonOrbOptionButton1.Tag = "ribbonOrbOptionButton1";
             ribbonOrbMenuItem_InclusionsTraceability.Tag = "ribbonOrbMenuItem_InclusionsTraceability";
@@ -363,7 +363,14 @@ namespace OTSIncAReportApp
                 }
             }
            
-
+            if(Language.ReadDefaultLanguage()=="EN")
+            {
+                rbHelp.Enabled = false;
+            }
+            else
+            {
+                rbHelp.Enabled = true;
+            }
             
 
         }

OTSIncAReportApp/ReportTemplate/OTS_DEVReport.cs

@@ -344,9 +344,25 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             //ElementSubscript subscript = new ElementSubscript();
             for (int i = 0; i < dt2.Rows.Count; i++)
             {
-                list_ElementalAnalysisData.Add(set_ElementalAnalysis(subscript.Getsubscriptstring(dt2.Rows[i]["Class"].ToString()) , subscript.Getsubscriptstring(dt2.Rows[i]["Name"].ToString()), dt2.Rows[i]["Area"].ToString(),
-                    dt2.Rows[i][2].ToString(), dt2.Rows[i][3].ToString(), dt2.Rows[i][4].ToString(), dt2.Rows[i][5].ToString(), dt2.Rows[i][6].ToString(),
-                    dt2.Rows[i][7].ToString(), dt2.Rows[i][8].ToString(), dt2.Rows[i][9].ToString(), dt2.Rows[i][10].ToString(), dt2.Rows[i][11].ToString()));
+                double quantity = 0;
+                for (int a=2;a<12;a++)
+                {
+                    if (dt2.Rows[i][a].ToString()!="")
+                    {
+                        quantity = quantity + Convert.ToDouble(dt2.Rows[i][a].ToString());
+                    }
+                }
+
+                list_ElementalAnalysisData.Add(set_ElementalAnalysis(subscript.Getsubscriptstring(dt2.Rows[i]["Class"].ToString()), subscript.Getsubscriptstring(dt2.Rows[i]["Name"].ToString()), dt2.Rows[i]["Area"].ToString(),
+                   dt2.Rows[i][2].ToString(), dt2.Rows[i][3].ToString(), dt2.Rows[i][4].ToString(), dt2.Rows[i][5].ToString(), dt2.Rows[i][6].ToString(),
+                   dt2.Rows[i][7].ToString(), dt2.Rows[i][8].ToString(), dt2.Rows[i][9].ToString(), dt2.Rows[i][10].ToString(), dt2.Rows[i][11].ToString()));
+
+                //list_ElementalAnalysisData.Add(set_ElementalAnalysis(subscript.Getsubscriptstring(dt2.Rows[i]["Class"].ToString()) , subscript.Getsubscriptstring(dt2.Rows[i]["Name"].ToString()), dt2.Rows[i]["Area"].ToString(),
+                //    export_ReportTemplate.ParameterNormalization(quantity,Convert.ToDouble(dt2.Rows[i][2].ToString())) , export_ReportTemplate.ParameterNormalization(quantity, Convert.ToDouble(dt2.Rows[i][3].ToString())),
+                //    export_ReportTemplate.ParameterNormalization(quantity, Convert.ToDouble(dt2.Rows[i][4].ToString())), export_ReportTemplate.ParameterNormalization(quantity, Convert.ToDouble(dt2.Rows[i][5].ToString())),
+                //    export_ReportTemplate.ParameterNormalization(quantity, Convert.ToDouble(dt2.Rows[i][6].ToString())), export_ReportTemplate.ParameterNormalization(quantity,Convert.ToDouble(dt2.Rows[i][7].ToString())),
+                //    export_ReportTemplate.ParameterNormalization(quantity,Convert.ToDouble(dt2.Rows[i][8].ToString())), export_ReportTemplate.ParameterNormalization(quantity, Convert.ToDouble(dt2.Rows[i][9].ToString())),
+                //    export_ReportTemplate.ParameterNormalization(quantity,Convert.ToDouble(dt2.Rows[i][10].ToString())), export_ReportTemplate.ParameterNormalization(quantity,Convert.ToDouble(dt2.Rows[i][11].ToString()))));
             }
             for (int i = 0; i < dt2.Rows.Count; i++)
             {
@@ -409,12 +425,23 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             xrPageBreak6.Visible = true;
             for (int i=0;i< allElement_dt.Rows.Count;i++)
             {
-                string str_data = "";
+                double quantity = 0;
+                for (int a = 4; a < allElement_dt.Columns.Count; a++)
+                {
+                    if(allElement_dt.Rows[i][a].ToString()!="")
+                    {
+                        quantity = quantity + Convert.ToDouble(allElement_dt.Rows[i][a].ToString());
+
+                    }
+                }
+
+
+                    string str_data = "";
                 for (int a=4;a< allElement_dt.Columns.Count;a++)
                 {
                     if (allElement_dt.Rows[i][a].ToString()!="")
                     {
-                        str_data = str_data + allElement_dt.Columns[a].ColumnName.ToString() + "=" + allElement_dt.Rows[i][a].ToString() + "%"+"  ";
+                        str_data = str_data + allElement_dt.Columns[a].ColumnName.ToString() + "=" + export_ReportTemplate.ParameterNormalization(quantity, Convert.ToDouble(allElement_dt.Rows[i][a].ToString())) + "%" + "  ";
                     }
                 }
                 xrTb_ElementAnalysis.Rows.Add(addElementalAnalysisRows(allElement_dt.Rows[i]["Name"].ToString(), str_data));

OTSPartA_STDEditor/App.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
     </startup>
 </configuration>

OTSPartA_STDEditor/EDSController.cs

@@ -0,0 +1,167 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using System.Xml;
+using FEIApiControl;
+using OTSCLRINTERFACE;
+
+namespace OTSPartA_STDEditor
+{
+    class EDSController
+    {
+        private COTSControlFunExport eds;
+        static EDSController edsctrl = null;
+        public static APIClass ApiClass = null;
+        private static bool isFEI = false;
+
+        private EDSController()
+        {
+            if (isFEI)
+            {
+                ApiClass = new APIClass();
+                Connect();
+            }
+            else
+            {
+                eds = OTSCLRINTERFACE.COTSControlFunExport.GetControllerInstance();
+            }
+        }
+
+        public static EDSController GetEDSController()
+        {
+            if (GetXMLInformations("EDSName") == "FEI")
+            {
+                isFEI = true;
+            }
+            if (edsctrl == null)
+            {
+                edsctrl = new EDSController();
+            }
+            return edsctrl;
+        }
+
+        public bool Connect()
+        {
+            if (isFEI)
+            {
+                string FEIIP =GetXMLInformations("FEIIP");
+                string FEIPORT = GetXMLInformations("FEIPORT");
+                if (FEIIP == "" || FEIPORT == "")
+                {
+                    MessageBox.Show("FEI电镜端口配置为空！");
+                    return false;
+                }
+
+                if (ApiClass.isConnect())
+                {
+                    return true;
+                }
+
+                return ApiClass.Connect(FEIIP, FEIPORT);
+            }
+            else
+            {
+                if (!eds.Init())
+                {
+                    return false;
+                }
+                if (eds.IsConnected())
+                {
+                    return true;
+                }
+
+                return eds.ConncetSem();
+            }
+        }
+
+        /// <summary>
+        /// 获取XML节点参数
+        /// </summary>
+        /// <param name="Name">节点参数名称</param>
+        /// <returns>节点参数</returns>
+        public static string GetXMLInformations(string Name)
+        {
+            try
+            {
+                string xmlFilePath = "Config/ProData/HardwareConfig.xml";
+
+                string value = string.Empty;
+                XmlDocument doc = new XmlDocument();
+
+                doc.Load(xmlFilePath);    //加载Xml文件  
+
+                XmlElement root = doc.DocumentElement;   //获取根节点  
+
+                XmlNodeList mainNodes = root.GetElementsByTagName("Member"); //获取子节点集合  
+
+                foreach (XmlNode node in mainNodes)
+                {
+                    //获取Name属性值
+                    string name = ((XmlElement)node).GetAttribute("RegName");
+                    if (name.Equals(Name))
+                    {
+                        value = ((XmlElement)node).GetAttribute("Value");
+                        break;
+                    }
+                }
+                return value;
+            }
+            catch (Exception)
+            {
+                return "";
+            }
+        }
+
+        public bool Init()
+        {
+            if (isFEI)
+            {
+                return ApiClass.isConnect();
+            }
+            else
+            {
+                bool m_init = eds.EDSInit();
+                return m_init;
+            }
+        }
+
+        public bool CollectSpectrum(uint a_nXRayAQTime, ref uint[] a_XrayData)
+        {
+            if (isFEI)
+            {
+                Dictionary<string, double> eleItems = new Dictionary<string, double>();
+
+                return ApiClass.AcquireSpectrum(false, ref eleItems, ref a_XrayData);
+            }
+            else
+            {
+                if (!eds.IsConnected())
+                {
+                    return false;
+                }
+
+                return eds.CollectSpectrum(a_nXRayAQTime, ref a_XrayData);
+            }
+        }
+
+        public bool DisConnect()
+        {
+            if (isFEI)
+            {
+                return ApiClass.DisConnect();
+            }
+            else
+            {
+                if (eds.IsConnected())
+                {
+                    return eds.DisconnectSem();
+                }
+
+                return true;
+            }
+        }
+    }
+}

OTSPartA_STDEditor/Form_ConstantsEditor2.Designer.cs

@@ -59,6 +59,7 @@
             this.ribbon_GroupNameMaintenance = new System.Windows.Forms.RibbonOrbMenuItem();
             this.ribbon_BulkImport = new System.Windows.Forms.RibbonOrbMenuItem();
             this.ribbon_ConvertOreDatabaseToOtsDatabase = new System.Windows.Forms.RibbonOrbMenuItem();
+            this.rbMatchescorrespondingelement = new System.Windows.Forms.RibbonOrbMenuItem();
             this.ribbonSeparator3 = new System.Windows.Forms.RibbonSeparator();
             this.ribbon_Exit = new System.Windows.Forms.RibbonOrbMenuItem();
             this.ribbonTab2 = new System.Windows.Forms.RibbonTab();
@@ -182,10 +183,11 @@
             this.ribbon1.OrbDropDown.MenuItems.Add(this.ribbon_GroupNameMaintenance);
             this.ribbon1.OrbDropDown.MenuItems.Add(this.ribbon_BulkImport);
             this.ribbon1.OrbDropDown.MenuItems.Add(this.ribbon_ConvertOreDatabaseToOtsDatabase);
+            this.ribbon1.OrbDropDown.MenuItems.Add(this.rbMatchescorrespondingelement);
             this.ribbon1.OrbDropDown.MenuItems.Add(this.ribbonSeparator3);
             this.ribbon1.OrbDropDown.MenuItems.Add(this.ribbon_Exit);
             this.ribbon1.OrbDropDown.Name = "";
-            this.ribbon1.OrbDropDown.Size = new System.Drawing.Size(527, 383);
+            this.ribbon1.OrbDropDown.Size = new System.Drawing.Size(527, 427);
             this.ribbon1.OrbDropDown.TabIndex = 0;
             this.ribbon1.OrbImage = global::OTSPartA_STDEditor.Properties.Resources.公司图标;
             // 
@@ -299,6 +301,21 @@
             this.ribbon_ConvertOreDatabaseToOtsDatabase.ToolTipTitle = null;
             this.ribbon_ConvertOreDatabaseToOtsDatabase.Click += new System.EventHandler(this.ribbon_ConvertOreDatabaseToOtsDatabase_Click);
             // 
+            // rbMatchescorrespondingelement
+            // 
+            this.rbMatchescorrespondingelement.AltKey = null;
+            this.rbMatchescorrespondingelement.DropDownArrowDirection = System.Windows.Forms.RibbonArrowDirection.Left;
+            this.rbMatchescorrespondingelement.DropDownArrowSize = new System.Drawing.Size(5, 3);
+            this.rbMatchescorrespondingelement.Image = global::OTSPartA_STDEditor.Properties.Resources.Ruler161;
+            this.rbMatchescorrespondingelement.SmallImage = global::OTSPartA_STDEditor.Properties.Resources.Ruler161;
+            this.rbMatchescorrespondingelement.Style = System.Windows.Forms.RibbonButtonStyle.Normal;
+            this.rbMatchescorrespondingelement.Tag = "rbMatchescorrespondingelement";
+            this.rbMatchescorrespondingelement.Text = "从Amics矿物数据库中搜索标准条目的元素信息并移植到新库";
+            this.rbMatchescorrespondingelement.ToolTip = null;
+            this.rbMatchescorrespondingelement.ToolTipImage = null;
+            this.rbMatchescorrespondingelement.ToolTipTitle = null;
+            this.rbMatchescorrespondingelement.Click += new System.EventHandler(this.rbMatchescorrespondingelement_Click);
+            // 
             // ribbonSeparator3
             // 
             this.ribbonSeparator3.AltKey = null;
@@ -675,5 +692,6 @@
         private System.Windows.Forms.RibbonOrbMenuItem ribbon_ConvertOreDatabaseToOtsDatabase;
         private System.Windows.Forms.RibbonSeparator ribbonSeparator3;
         private System.Windows.Forms.RibbonOrbMenuItem ribbon_Exit;
+        private System.Windows.Forms.RibbonOrbMenuItem rbMatchescorrespondingelement;
     }
 }

OTSPartA_STDEditor/Form_ConstantsEditor2.cs

@@ -1611,5 +1611,72 @@ namespace OTSPartA_STDEditor
                 return;
             }
         }
+
+        private void rbMatchescorrespondingelement_Click(object sender, EventArgs e)
+        {
+            DataTable OreDatabasedt = new DataTable();
+            OpenFileDialog openFileDialog = new OpenFileDialog();
+            openFileDialog.Title = "Please select the database you want to math:";
+            openFileDialog.Filter = "(*.db)|*.db";
+            openFileDialog.RestoreDirectory = true;
+            openFileDialog.FilterIndex = 1;
+            if (openFileDialog.ShowDialog() == DialogResult.OK)
+            {
+                try
+                {
+                    string OreDatabaseAddress = openFileDialog.FileName;
+                    System.Data.SQLite.SQLiteConnection m_OreDatabaseConnection = new System.Data.SQLite.SQLiteConnection("data source='" + OreDatabaseAddress + "'");
+                    m_OreDatabaseConnection.Open();
+                    System.Data.SQLite.SQLiteDataAdapter m_OreDatabasedataAdapter = new System.Data.SQLite.SQLiteDataAdapter("select * from MineralElements", m_OreDatabaseConnection);
+                    DataSet OreDatabaseds = new DataSet();
+                    m_OreDatabasedataAdapter.Fill(OreDatabaseds);
+                    OreDatabasedt = OreDatabaseds.Tables[0];
+
+                    System.Data.SQLite.SQLiteConnection m_OtsDatabaseConnection = new System.Data.SQLite.SQLiteConnection("data source='" + STDDBAddress + "'");
+                    m_OtsDatabaseConnection.Open();
+                    System.Data.SQLite.SQLiteCommand OtsDatabaseCommand = m_OtsDatabaseConnection.CreateCommand();
+                    OtsDatabaseCommand.CommandText = "CREATE TABLE MineralElements (mineralID INTEGER,elementID INTEGER,elementPercentage FLOAT)";
+                    OtsDatabaseCommand.ExecuteNonQuery();
+                    System.Data.Common.DbTransaction trans = m_OtsDatabaseConnection.BeginTransaction();
+
+                    System.Data.SQLite.SQLiteDataAdapter m_OtsDatabasedataAdapter = new System.Data.SQLite.SQLiteDataAdapter("select id from STDMinerals", m_OtsDatabaseConnection);
+                    DataSet OtsDatabaseds = new DataSet();
+                    m_OtsDatabasedataAdapter.Fill(OtsDatabaseds);
+                    var OtsDatabasedt = OtsDatabaseds.Tables[0];
+
+                    List<int> IdG = new List<int>();
+                    foreach (DataRow item in OtsDatabasedt.Rows)
+                    {
+                        IdG.Add(int.Parse(item["id"].ToString()) - 10);
+                    }
+
+
+                    int n = 0;
+                    foreach (DataRow item in OreDatabasedt.Rows)
+                    {
+                        if (!int.TryParse(item["mineralID"].ToString(), out n))
+                        { continue; }
+
+                        if (IdG.Contains(n))
+                        {
+                            OtsDatabaseCommand.CommandText = "insert into MineralElements (mineralID,elementID,elementPercentage) values (@mineralID,@elementID,@elementPercentage)";
+                            OtsDatabaseCommand.Parameters.Add("mineralID", DbType.Int32).Value = (n+10);
+                            OtsDatabaseCommand.Parameters.Add("elementID", DbType.Int32).Value = item["elementID"];
+                            OtsDatabaseCommand.Parameters.Add("elementPercentage", DbType.Double).Value = item["elementPercentage"];
+                            OtsDatabaseCommand.ExecuteNonQuery();
+                        }
+                    }
+                    trans.Commit();
+                }
+                catch (Exception ex)
+                {
+                    MessageBox.Show(ex.ToString());
+                }
+            }
+            else
+            {
+                return;
+            }
+        }
     }
 }

OTSPartA_STDEditor/ImportStandardLibraryTypeSelection.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
@@ -13,6 +14,8 @@ namespace OTSPartA_STDEditor
     public partial class ImportStandardLibraryTypeSelection : Form
     {
         string m_selectevent = "";
+        Language lan;
+        Hashtable table;
         public string SelectEvent
         {
             set { m_selectevent = value; }
@@ -22,6 +25,8 @@ namespace OTSPartA_STDEditor
         public ImportStandardLibraryTypeSelection()
         {
             InitializeComponent();
+            lan = new Language(this);
+            table = lan.GetNameTable(this.Name);
         }
 
         private void bn_xray_Click(object sender, EventArgs e)

OTSPartA_STDEditor/OTSPartA_STDEditor.csproj

@@ -8,7 +8,7 @@
     <OutputType>WinExe</OutputType>
     <RootNamespace>OTSPartA_STDEditor</RootNamespace>
     <AssemblyName>OTSPartA_STDEditor</AssemblyName>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Deterministic>true</Deterministic>
@@ -113,6 +113,10 @@
     <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="FEIApiControl, Version=1.0.0.1, Culture=neutral, processorArchitecture=AMD64">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\OpenDll\FEIAPI\FEIApiControl.dll</HintPath>
+    </Reference>
     <Reference Include="OTS.WinFormsUI.Docking, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\OpenDll\WordApiDll\OTS.WinFormsUI.Docking.dll</HintPath>
@@ -154,6 +158,7 @@
       <DependentUpon>Attributes.cs</DependentUpon>
     </Compile>
     <Compile Include="CommonClass\SqlLiteClass.cs" />
+    <Compile Include="EDSController.cs" />
     <Compile Include="FormForWaiting.cs">
       <SubType>Form</SubType>
     </Compile>

OTSPartA_STDEditor/STDEditor.cs

@@ -26,7 +26,7 @@ namespace OTSPartA_STDEditor
         //数据库操作对象
         public SqlLiteClass m_sc = null;
         // 电镜设置对象
-        COTSControlFunExport m_cfun = null;
+        EDSController m_EDSHardwareMgr = null;
         //Xray图谱用户控件
         UXrayControl XrayControl = null;
         //全局Xray 用于存储当前选择行的Xray信息
@@ -483,7 +483,7 @@ namespace OTSPartA_STDEditor
         }
 
 
-        #region 采集Xray 按钮事件
+        //采集Xray 按钮事件
         private void btnCollectXray_Click(object sender, EventArgs e)
         {
             m_SubMidWindow.m_MainForm.IsModified = true;
@@ -508,6 +508,7 @@ namespace OTSPartA_STDEditor
             }
             //显示Xray
             xrayByteData = IntArrToByteArr(GetCollectXray(strTime));
+            m_EDSHardwareMgr.DisConnect();
             int color = Convert.ToInt32(ParseRGB(colorHx16toRGB(m_SubMidWindow.m_MainForm.STDDictionary[STDId].Color)).ToString());
             //根据树节点修改对应的Xray信息
             UpdateSTDXray(STDId, xrayByteData);
@@ -519,39 +520,25 @@ namespace OTSPartA_STDEditor
         /// <returns></returns>
         protected uint[] GetCollectXray(string strTime)
         {
-            try
+            //控制类对象初始化
+            if (null == m_EDSHardwareMgr)
             {
-                if (null == m_cfun)
-                {
-                    m_cfun = COTSControlFunExport.GetControllerInstance();
-                }
-                if (ConnectionSem(connectionEnumType.EDSOnlyPointXRay))
-                {
-                    if (EDSInit())
-                    {
-                        int iSize = 2000;
-                        uint[] iXrayData = new uint[iSize];
-                        //采集XRay数据
-                        if (m_cfun.CollectSpectrum(uint.Parse(strTime), ref iXrayData))
-                        {
-                            return iXrayData;
-                        }
-                    }
-                }
-                return null;
+                m_EDSHardwareMgr = EDSController.GetEDSController();
             }
-            catch /*(Exception ex)*/
+
+            //1.连接电镜
+            if (m_EDSHardwareMgr.Connect())
             {
-                return null;
+                int iSize = 2000;
+                uint[] iXrayData = new uint[iSize];
+                //采集XRay数据
+                if (m_EDSHardwareMgr.CollectSpectrum(uint.Parse(strTime), ref iXrayData))
+                {
+                    return iXrayData;
+                }
             }
-            finally
-            {
-                //EDS过程结束
-                //m_cfun.EDSFinishedInstance();
 
-                //关闭连接
-                DisConnectSem(connectionEnumType.EDSOnlyPointXRay);
-            }
+            return null;
         }
         private void btnReadXray_Click(object sender, EventArgs e)
         {
@@ -691,93 +678,7 @@ namespace OTSPartA_STDEditor
         }
         #endregion
 
-        #region 连接与关闭设备
-        public bool ConnectionSem(connectionEnumType connectionType)
-        {
-            //获取连接电镜类型
-            string connTypeStr = GetConnectionType(connectionType);
-            //连接电镜标识
-            bool bDisConnResult = false;
-            //判断连接状态
-            if (!m_bConnectionState)
-            {
-                //连接电镜设置
-                bDisConnResult = m_cfun.ConncetSem();
-            }
-            if (bDisConnResult)
-            {
-                m_bConnectionState = true;
-            }
-            else
-            {
-                m_bConnectionState = false;
-            }
-            return bDisConnResult;
-        }
-
-        public bool DisConnectSem(connectionEnumType disConnectType)
-        {
-            //获取关闭电镜类型
-            string connTypeStr = GetConnectionType(disConnectType);
-            bool bDisConnResult = false;
-            if (m_bConnectionState)
-            {
-                bDisConnResult = m_cfun.DisconnectSem();
-            }
-            if (bDisConnResult)
-            {
-                m_bConnectionState = false;
-            }
-            else
-            {
-                m_bConnectionState = true;
-            }
-            return bDisConnResult;
-        }
-
-        private string GetConnectionType(connectionEnumType connectionType)
-        {
-            string connString = string.Empty;
-            switch (connectionType)
-            {
-                //设置单点采集文字内容
-                case connectionEnumType.EDSOnlyPointXRay:
-                    connString = "OnlyPointXRay";
-                    break;
-                //设置多点采集文字内容
-                case connectionEnumType.EDSMultiPointXRay:
-                    connString = "MultiPointXRay";
-                    break;
-                //设置面采集文字内容
-                case connectionEnumType.EDSAreaXRay:
-                    connString = "AreaXRay";
-                    break;
-                //设置图片
-                case connectionEnumType.ScanImage:
-                    connString = "Image";
-                    break;
-                default: break;
-            }
-            return connString;
-        }
-
-        /// <summary>
-        /// EDS初始化
-        /// </summary>
-        public bool EDSInit()
-        {
-            bool bResult = false;
-            //线程调用 加载
-            bResult = m_cfun.EDSInit();
-            return bResult;
-        }
-        public enum connectionEnumType
-        {
-            EDSOnlyPointXRay = 0,
-            EDSMultiPointXRay = 1,
-            EDSAreaXRay = 2,
-            ScanImage = 3
-        }
+        #region Xray 与 STDDB数据操作
         /// <summary>
         /// 标准Xray状态
         /// </summary>
@@ -787,7 +688,6 @@ namespace OTSPartA_STDEditor
             Modify = 1,
             Delete = 2
         }
-        #endregion
 
         /// <summary>
         /// 记录修改后的标准中的Xray信息
@@ -811,9 +711,7 @@ namespace OTSPartA_STDEditor
             public byte[] XrayData { get => xrayData; set => xrayData = value; }
             public int InfoState { get => infoState; set => infoState = value; }
         }
-        #endregion
 
-        #region Xray 与 STDDB数据操作
         /// <summary>
         /// 绑定数据库中已存在的Xray信息
         /// </summary>