报告程序中英文补全

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

@@ -164,6 +164,12 @@
 	  <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>
@@ -341,78 +347,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 +521,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>
@@ -865,6 +917,14 @@
 	  <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>

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/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));