更改报告程序中英文

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

@@ -181,6 +181,22 @@
 	  <Control name="frmReportApp" text="ReportApp" />
 	  <Control name="ribbonOrbMenuItem_Extremum" text="Extremum analysis" />
 	  <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" />
+    </Controls>
+ </Form>
+  <Form>
+    <Name>frmPartSizeEditorNew</Name>
+    <Controls>
+      <Control name="frmPartSizeEditorNew" text="Granular file editor" />
+	  <Control name="label3" text="route" />
+	  <Control name="label1" text="ParticleSizeName" />
+	  <Control name="label2" text="ParticleSizeValue" />
+	  <Control name="button4" text="Save as"/>
+	  <Control name="button1" text="Save" />
+	  <Control name="button2" text="determine" />
+	  <Control name="button3" text="close" />  
     </Controls>
  </Form>
  <Form>
@@ -244,14 +260,11 @@
  <Form>
     <Name>Triangulation_List</Name>
     <Controls>
-      <Control name="Triangulation_List" text="三元相图模板列表" />
-	  <Control name="button1" text="添  加" />
-	  <Control name="button3" text="保  存" />
-	  <Control name="button2" text="返  回" />
-	  <Control name="str1" text="序号" />
-	  <Control name="str2" text="模板名称" />
-	  <Control name="str3" text="修改" />
-	  <Control name="str4" text="删除" />
+      <Control name="Triangulation_List" text="Ternary phase diagram template list" />
+	  <Control name="button1" text="add" />
+	
+	  <Control name="button2" text="close" />
+	
     </Controls>
  </Form>
  <Form>
@@ -758,6 +771,16 @@
 	  <Control name="str_operatonmodule5" text="Three phase diagram" />
 	  <Control name="str1" text="Parameter" />
 	  <Control name="str2" text="ConventionalParameters" />
+	  <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="ParticleSizeTable" text="Particle size table"/>
+	  <Control name="ChineseStandard1" text="GB1"/>
+	  <Control name="ChineseStandard2" text="GB2"/>
+	  <Control name="AmericanStandard" text="American Standard"/>
+	  <Control name="GermanStandard" text="German standard"/>
+	  <Control name="CommonClassification" text="Common classification"/>
     </Controls>
  </Form>
   <Form>

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

@@ -181,8 +181,25 @@
 	  <Control name="frmReportApp" text="报告程序" />
 	  <Control name="ribbonOrbMenuItem_Extremum" text="极值分析法 " />
 	  <Control name="message1" text="现已经有打开的测量结果文件新建项目后将不保存，是否确定新建？" />
+	  <Control name="AnalysisDiagram" text="分析图" />
+	  <Control name="AnalysisDataSheet" text="分析数据表" />
+	  <Control name="AnalysisDataChart" text="分析数据图" />
     </Controls>
  </Form>
+   <Form>
+    <Name>frmPartSizeEditorNew</Name>
+    <Controls>
+      <Control name="frmPartSizeEditorNew" text="粒级文件编辑器" />
+	  <Control name="label3" text="路径" />
+	  <Control name="label1" text="粒级名" />
+	  <Control name="label2" text="粒级值" />
+	  <Control name="button4" text="另存"/>
+	  <Control name="button1" text="保存" />
+	  <Control name="button2" text="确定" />
+	  <Control name="button3" text="返回" />	  
+    </Controls>
+ </Form>
+ 
  <Form>
  <Name>frmMeasureRstMgr</Name>
     <Controls>
@@ -241,12 +258,9 @@
     <Controls>
       <Control name="Triangulation_List" text="三元相图模板列表" />
 	  <Control name="button1" text="添  加" />
-	  <Control name="button3" text="保  存" />
+
 	  <Control name="button2" text="返  回" />
-	  <Control name="str1" text="序号" />
-	  <Control name="str2" text="模板名称" />
-	  <Control name="str3" text="修改" />
-	  <Control name="str4" text="删除" />
+	 
     </Controls>
  </Form>
 <Form>
@@ -753,6 +767,16 @@
 	  <Control name="str_operatonmodule5" text="三元相图" />
 	  <Control name="str1" text="参数" />
 	  <Control name="str2" text="常规参数" />
+	  <Control name="BSEOriginal" text="BSE原图" />
+	  <Control name="ClassifiedDisplay" text="分类显示" />
+	  <Control name="OriginalSplicing" text="原图拼接" />
+	  <Control name="OriginalDistribution" text="原图颗粒分布" />
+	  <Control name="ParticleSizeTable" text="粒级表" />
+	  <Control name="ChineseStandard1" text="国标方法一" />
+	  <Control name="ChineseStandard2" text="国标方法二" />
+	  <Control name="AmericanStandard" text="美标" />
+	  <Control name="GermanStandard" text="德标" />
+	  <Control name="CommonClassification" text="常用夹杂物分类" />
     </Controls>
  </Form>
  <Form>

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

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

OTSIncAReportApp/1-UI/OTSDisplaySourceGridData/frmReportConditionChoose.cs

@@ -106,6 +106,17 @@ namespace OTSIncAReportApp
             string ParticleSizeDistribution= resTable["sscaptionname29"].ToString();//颗粒尺寸分布
             string AverageElementComposition= resTable["sscaptionname30"].ToString();//平均元素成分
             string TernaryPhaseDiagram= resTable["sscaptionname12"].ToString();//三元相图
+
+            string BSEOriginal = resTable["bseoriginal"].ToString();//BSE原图
+            string ClassifiedDisplay = resTable["classifieddisplay"].ToString();//分类显示
+            string OriginalSplicing = resTable["originalsplicing"].ToString();//原图拼接
+            string OriginalDistribution = resTable["originaldistribution"].ToString();//原图颗粒分布
+            string ParticleSizeTable = resTable["particlesizetable"].ToString();//粒级表
+            string ChineseStandard1 = resTable["chinesestandard1"].ToString();//国标方法一
+            string ChineseStandard2 = resTable["chinesestandard2"].ToString();//国标方法二
+            string AmericanStandard = resTable["americanstandard"].ToString();//美标
+            string GermanStandard = resTable["germanstandard"].ToString();//德标
+            string CommonClassification = resTable["commonclassification"].ToString();//常用夹杂物分类
             #endregion
 
 
@@ -119,12 +130,12 @@ namespace OTSIncAReportApp
             List<string> list1 = new List<string>() { DistributionMap, ArrangementDiagram };
             ConditionItem sampleData2 = SetGeidData(OTS_REPORT_PROP_GRID_ITEMS.IMAGE_DISPLAY_TYPE, GraphicDisplayMode, OTS_ITEM_TYPES.COMBO,false, "image display mode", list1[0], list1, IMAGE_DISPLAY_TYPE.DISTRIBUTION);
             m_CurrentConditions.Add(OTS_REPORT_PROP_GRID_ITEMS.IMAGE_DISPLAY_TYPE,sampleData2);
-            ConditionItem sampleData1 = SetGeidData(OTS_REPORT_PROP_GRID_ITEMS.IMAGE_TYPE, ParticleDisplayMode, OTS_ITEM_TYPES.COMBO, false, "distribution image Type", "BSE原图", new List<string>() { "BSE原图", "分类显示", "原图拼接", "原图颗粒分布" }, IMAGE_TYPE.BSE);
+            ConditionItem sampleData1 = SetGeidData(OTS_REPORT_PROP_GRID_ITEMS.IMAGE_TYPE, ParticleDisplayMode, OTS_ITEM_TYPES.COMBO, false, "distribution image Type", BSEOriginal, new List<string>() { BSEOriginal, ClassifiedDisplay, OriginalSplicing, OriginalDistribution }, IMAGE_TYPE.BSE);
             m_CurrentConditions.Add(OTS_REPORT_PROP_GRID_ITEMS.IMAGE_TYPE,sampleData1);
 
             //粒级表
             List<string> list_partsizelist = m_DataMgr.GetPartSizeFileList();//从系统默认的路径中查找出所有的粒级表文件
-            ConditionItem sampleData_partsizefile = SetGeidData(OTS_REPORT_PROP_GRID_ITEMS.GRAIN_SIZE_CLASS_TABLE, "粒级表", OTS_ITEM_TYPES.COMBO, false, "Particle Table", list_partsizelist[0], list_partsizelist, 0);
+            ConditionItem sampleData_partsizefile = SetGeidData(OTS_REPORT_PROP_GRID_ITEMS.GRAIN_SIZE_CLASS_TABLE, ParticleSizeTable, OTS_ITEM_TYPES.COMBO, false, "Particle Table", list_partsizelist[0], list_partsizelist, 0);
             m_CurrentConditions.Add(OTS_REPORT_PROP_GRID_ITEMS.GRAIN_SIZE_CLASS_TABLE,sampleData_partsizefile);
 
             //粒级
@@ -157,14 +168,14 @@ namespace OTSIncAReportApp
             string sSCaptionName10 = resTable["sscaptionname10"].ToString();
             List<string> list2 = new List<string>() { SurveyResults, SampleMeasurementInformation, granularComponent, ElementComposition, ParticleSizeDistribution, AverageElementComposition };
             string[] aa = m_ReportApp.Text.Split('-');
-            List<string> listStd = new List<string>() { "国标一", "国标二", "美标", "德标" };
+            List<string> listStd = new List<string>() { ChineseStandard1, ChineseStandard2, AmericanStandard, GermanStandard };
             list2.AddRange(listStd);
             ConditionItem sampleData3 = SetGeidData(OTS_REPORT_PROP_GRID_ITEMS.CALCULATE_TABLE_TYPE, DataTableType, OTS_ITEM_TYPES.COMBO, false, "Data table type", list2[0], list2, CALCULATE_TABLE_TYPE.MEASURE_INFO);
             m_CurrentConditions.Add(OTS_REPORT_PROP_GRID_ITEMS.CALCULATE_TABLE_TYPE,sampleData3);
 
             // chart condition items
            
-            List<string> list22 = new List<string>() { "常用夹杂物分类", granularComponent, ElementComposition, ParticleSizeDistribution, TernaryPhaseDiagram };
+            List<string> list22 = new List<string>() { CommonClassification, granularComponent, ElementComposition, ParticleSizeDistribution, TernaryPhaseDiagram };
             ConditionItem sampleData22 = SetGeidData(OTS_REPORT_PROP_GRID_ITEMS.CALCULATE_CHART_TYPE, DataTableType, OTS_ITEM_TYPES.COMBO, false, "Data graph type", list22[0], list22, CALCULATE_CHART_TYPE.COMMON_FIVE);
             m_CurrentConditions.Add(OTS_REPORT_PROP_GRID_ITEMS.CALCULATE_CHART_TYPE, sampleData22);
 
@@ -275,6 +286,12 @@ namespace OTSIncAReportApp
         /// <returns></returns>SampleData1
         private List<ConditionItem> GetSourceGridData(DisplayPicutureType tbindex)
         {
+
+            string BSEOriginal = resTable["bseoriginal"].ToString();//BSE原图
+            string ClassifiedDisplay = resTable["classifieddisplay"].ToString();//分类显示
+            string OriginalSplicing = resTable["originalsplicing"].ToString();//原图拼接
+            string OriginalDistribution = resTable["originaldistribution"].ToString();//原图颗粒分布
+
             List<ConditionItem> list = new List<ConditionItem>();
             ConditionItem sampleData;
             if (tbindex == DisplayPicutureType.AnalyzeImg)//分布图页
@@ -295,7 +312,7 @@ namespace OTSIncAReportApp
 
                 if ((int)m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.IMAGE_DISPLAY_TYPE].itemVal == (int)IMAGE_DISPLAY_TYPE.DISTRIBUTION)
                 {
-                    sampleData.comboDownList = new List<string>() { "BSE原图", "分类显示", "原图拼接", "原图颗粒分布" };//bse,颗粒分类图
+                    sampleData.comboDownList = new List<string>() { BSEOriginal, ClassifiedDisplay, OriginalSplicing, OriginalDistribution };//bse,颗粒分类图
                     list.Add(sampleData);
 
                     //粒级表
@@ -330,7 +347,7 @@ namespace OTSIncAReportApp
                 }
                 else 
                 {
-                    sampleData.comboDownList = new List<string>() { "BSE原图", "分类显示"};//bse,颗粒分类图
+                    sampleData.comboDownList = new List<string>() { BSEOriginal, ClassifiedDisplay };//bse,颗粒分类图
                     list.Add(sampleData);
                     //排列图类别
 

OTSIncAReportApp/1-UI/OTSMgrInfo/Triangulation_List.cs

@@ -1,5 +1,7 @@
 using OTSIncAReportApp.DataOperation.DataAccess;
+using OTSIncAReportApp.SysMgrTools;
 using System;
+using System.Collections;
 using System.Data;
 using System.Windows.Forms;
 
@@ -12,7 +14,7 @@ namespace OTSIncAReportApp.OTSMgrInfo
         private DataTable m_dt_moban = null;//模板列表
         private DataTable m_dt_item_element = null;//各项下包含的元素信息
         private frmReportApp m_frmReportApp;//全局对象主窗体对象
-
+        Hashtable table;
         private const string m_TriFilePath = "\\Config\\ProData\\";
         private const string m_TriFilename = "DefaultTriTemplateFile.tpf";
         #endregion
@@ -27,6 +29,10 @@ namespace OTSIncAReportApp.OTSMgrInfo
         {
             m_frmReportApp = in_ReportApp;
             InitializeComponent();
+            #region 国际化语言
+            Language lan = new Language(this);
+            table = lan.GetNameTable(this.Name);
+            #endregion
         }
 
 

OTSIncAReportApp/1-UI/OTSMgrInfo/frmPartSizeEditorNew.Designer.cs

@@ -31,6 +31,8 @@
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmPartSizeEditorNew));
             this.Gview_LJ = new System.Windows.Forms.DataGridView();
+            this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
+            this.newFileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.tb_ljm = new System.Windows.Forms.TextBox();
             this.tb_ljz = new System.Windows.Forms.TextBox();
             this.label1 = new System.Windows.Forms.Label();
@@ -41,8 +43,6 @@
             this.button4 = new System.Windows.Forms.Button();
             this.tb_lj = new System.Windows.Forms.TextBox();
             this.label3 = new System.Windows.Forms.Label();
-            this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
-            this.newFileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             ((System.ComponentModel.ISupportInitialize)(this.Gview_LJ)).BeginInit();
             this.contextMenuStrip1.SuspendLayout();
             this.SuspendLayout();
@@ -57,36 +57,51 @@
             this.Gview_LJ.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.Gview_LJ.ContextMenuStrip = this.contextMenuStrip1;
             this.Gview_LJ.Location = new System.Drawing.Point(8, 8);
-            this.Gview_LJ.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.Gview_LJ.Margin = new System.Windows.Forms.Padding(2);
             this.Gview_LJ.MultiSelect = false;
             this.Gview_LJ.Name = "Gview_LJ";
             this.Gview_LJ.ReadOnly = true;
             this.Gview_LJ.RowHeadersVisible = false;
             this.Gview_LJ.RowTemplate.Height = 30;
-            this.Gview_LJ.Size = new System.Drawing.Size(381, 174);
+            this.Gview_LJ.Size = new System.Drawing.Size(415, 174);
             this.Gview_LJ.TabIndex = 11;
             this.Gview_LJ.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.Gview_LJ_CellClick);
             // 
+            // contextMenuStrip1
+            // 
+            this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.newFileToolStripMenuItem});
+            this.contextMenuStrip1.Name = "contextMenuStrip1";
+            this.contextMenuStrip1.Size = new System.Drawing.Size(122, 26);
+            // 
+            // newFileToolStripMenuItem
+            // 
+            this.newFileToolStripMenuItem.Name = "newFileToolStripMenuItem";
+            this.newFileToolStripMenuItem.Size = new System.Drawing.Size(121, 22);
+            this.newFileToolStripMenuItem.Text = "NewFile";
+            this.newFileToolStripMenuItem.Click += new System.EventHandler(this.newFileToolStripMenuItem_Click);
+            // 
             // tb_ljm
             // 
-            this.tb_ljm.Location = new System.Drawing.Point(59, 218);
-            this.tb_ljm.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.tb_ljm.Location = new System.Drawing.Point(118, 220);
+            this.tb_ljm.Margin = new System.Windows.Forms.Padding(2);
             this.tb_ljm.Name = "tb_ljm";
-            this.tb_ljm.Size = new System.Drawing.Size(329, 21);
+            this.tb_ljm.Size = new System.Drawing.Size(305, 21);
             this.tb_ljm.TabIndex = 12;
             // 
             // tb_ljz
             // 
-            this.tb_ljz.Location = new System.Drawing.Point(59, 249);
-            this.tb_ljz.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.tb_ljz.Location = new System.Drawing.Point(118, 251);
+            this.tb_ljz.Margin = new System.Windows.Forms.Padding(2);
             this.tb_ljz.Name = "tb_ljz";
-            this.tb_ljz.Size = new System.Drawing.Size(329, 21);
+            this.tb_ljz.Size = new System.Drawing.Size(305, 21);
             this.tb_ljz.TabIndex = 12;
             // 
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(10, 223);
+            this.label1.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
+            this.label1.Location = new System.Drawing.Point(11, 223);
             this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(41, 12);
@@ -96,7 +111,8 @@
             // label2
             // 
             this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(10, 254);
+            this.label2.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
+            this.label2.Location = new System.Drawing.Point(11, 254);
             this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(41, 12);
@@ -105,8 +121,8 @@
             // 
             // button1
             // 
-            this.button1.Location = new System.Drawing.Point(122, 281);
-            this.button1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.button1.Location = new System.Drawing.Point(136, 289);
+            this.button1.Margin = new System.Windows.Forms.Padding(2);
             this.button1.Name = "button1";
             this.button1.Size = new System.Drawing.Size(73, 25);
             this.button1.TabIndex = 14;
@@ -116,8 +132,8 @@
             // 
             // button2
             // 
-            this.button2.Location = new System.Drawing.Point(218, 281);
-            this.button2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.button2.Location = new System.Drawing.Point(232, 289);
+            this.button2.Margin = new System.Windows.Forms.Padding(2);
             this.button2.Name = "button2";
             this.button2.Size = new System.Drawing.Size(73, 25);
             this.button2.TabIndex = 14;
@@ -127,8 +143,8 @@
             // 
             // button3
             // 
-            this.button3.Location = new System.Drawing.Point(314, 281);
-            this.button3.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.button3.Location = new System.Drawing.Point(328, 289);
+            this.button3.Margin = new System.Windows.Forms.Padding(2);
             this.button3.Name = "button3";
             this.button3.Size = new System.Drawing.Size(73, 25);
             this.button3.TabIndex = 14;
@@ -138,8 +154,8 @@
             // 
             // button4
             // 
-            this.button4.Location = new System.Drawing.Point(19, 281);
-            this.button4.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.button4.Location = new System.Drawing.Point(33, 289);
+            this.button4.Margin = new System.Windows.Forms.Padding(2);
             this.button4.Name = "button4";
             this.button4.Size = new System.Drawing.Size(73, 25);
             this.button4.TabIndex = 14;
@@ -149,42 +165,29 @@
             // 
             // tb_lj
             // 
-            this.tb_lj.Location = new System.Drawing.Point(59, 188);
-            this.tb_lj.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.tb_lj.Location = new System.Drawing.Point(118, 190);
+            this.tb_lj.Margin = new System.Windows.Forms.Padding(2);
             this.tb_lj.Name = "tb_lj";
             this.tb_lj.ReadOnly = true;
-            this.tb_lj.Size = new System.Drawing.Size(329, 21);
+            this.tb_lj.Size = new System.Drawing.Size(305, 21);
             this.tb_lj.TabIndex = 12;
             // 
             // label3
             // 
             this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(10, 193);
+            this.label3.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
+            this.label3.Location = new System.Drawing.Point(11, 193);
             this.label3.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(41, 12);
             this.label3.TabIndex = 13;
             this.label3.Text = "路  径";
             // 
-            // contextMenuStrip1
-            // 
-            this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.newFileToolStripMenuItem});
-            this.contextMenuStrip1.Name = "contextMenuStrip1";
-            this.contextMenuStrip1.Size = new System.Drawing.Size(181, 48);
-            // 
-            // newFileToolStripMenuItem
-            // 
-            this.newFileToolStripMenuItem.Name = "newFileToolStripMenuItem";
-            this.newFileToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
-            this.newFileToolStripMenuItem.Text = "NewFile";
-            this.newFileToolStripMenuItem.Click += new System.EventHandler(this.newFileToolStripMenuItem_Click);
-            // 
             // frmPartSizeEditorNew
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(399, 325);
+            this.ClientSize = new System.Drawing.Size(434, 325);
             this.Controls.Add(this.button3);
             this.Controls.Add(this.button2);
             this.Controls.Add(this.button4);
@@ -197,11 +200,11 @@
             this.Controls.Add(this.tb_ljm);
             this.Controls.Add(this.Gview_LJ);
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-            this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.Margin = new System.Windows.Forms.Padding(2);
             this.MaximizeBox = false;
-            this.MaximumSize = new System.Drawing.Size(415, 364);
+            this.MaximumSize = new System.Drawing.Size(450, 364);
             this.MinimizeBox = false;
-            this.MinimumSize = new System.Drawing.Size(415, 364);
+            this.MinimumSize = new System.Drawing.Size(450, 364);
             this.Name = "frmPartSizeEditorNew";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
             this.Text = "粒级文件编辑器";

OTSIncAReportApp/1-UI/OTSMgrInfo/frmPartSizeEditorNew.cs

@@ -1,6 +1,8 @@
 using OTSIncAReportApp.Controls;
 using OTSIncAReportApp.OTSMgrInfo;
+using OTSIncAReportApp.SysMgrTools;
 using System;
+using System.Collections;
 using System.Data;
 using System.IO;
 using System.Text.RegularExpressions;
@@ -21,7 +23,7 @@ namespace OTSIncAReportApp
         //变量
         public DataTable m_dt_partsize = new DataTable(); //粒级
 
-
+        Hashtable table;
         string mPartSizeFilePath = "";
 
         string str_selectID = "-1";
@@ -51,6 +53,11 @@ namespace OTSIncAReportApp
             m_dt_partsize.Columns.Add("FileName");
             m_dt_partsize.Columns.Add("Name");
             m_dt_partsize.Columns.Add("Value");
+
+            #region 国际化语言
+            Language lan = new Language(this);
+            table = lan.GetNameTable(this.Name);
+            #endregion
         }
 
         private void frmPartSizeEditorNew_Load(object sender, EventArgs e)
@@ -116,7 +123,7 @@ namespace OTSIncAReportApp
         {
             if (tb_ljm.Text == "")
             {
-                MessageBox.Show("输入的粒级名错误，请重新输入", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                MessageBox.Show("The entered particle size name is wrong, please re-enter", "Tips", MessageBoxButtons.OK, MessageBoxIcon.Information);
                 tb_ljm.Focus();
                 return false;
             }
@@ -125,7 +132,7 @@ namespace OTSIncAReportApp
             //粒级值判断
             if (tb_ljz.Text == "")
             {
-                MessageBox.Show(tipstr, "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                MessageBox.Show(tipstr, "Tips", MessageBoxButtons.OK, MessageBoxIcon.Information);
                 tb_ljz.Focus();
                 return false;
             }
@@ -135,7 +142,7 @@ namespace OTSIncAReportApp
             Regex rg = new Regex(pat);
             if (false == rg.Match(tb_ljz.Text).Success)
             {
-                MessageBox.Show(tipstr, "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                MessageBox.Show(tipstr, "Tips", MessageBoxButtons.OK, MessageBoxIcon.Information);
                 tb_ljz.Focus();
                 return false;
             }
@@ -151,7 +158,7 @@ namespace OTSIncAReportApp
 
                 if (false == rg.Match(lsstr).Success)
                 {
-                    MessageBox.Show(tipstr, "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    MessageBox.Show(tipstr, "Tips", MessageBoxButtons.OK, MessageBoxIcon.Information);
                     tb_ljz.Focus();
                     return false;
                 }
@@ -167,7 +174,7 @@ namespace OTSIncAReportApp
             }
             catch
             {
-                MessageBox.Show(tipstr, "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                MessageBox.Show(tipstr, "Tips", MessageBoxButtons.OK, MessageBoxIcon.Information);
                 tb_ljz.Focus();
                 return false;
             }
@@ -213,10 +220,10 @@ namespace OTSIncAReportApp
             {
                 int index = Gview_LJ.Rows.Add();
                 Gview_LJ.Rows[index].Cells["ID"].Value = m_dt_partsize.Rows[i]["ID"].ToString();
-                Gview_LJ.Rows[index].Cells["文件路径"].Value = m_dt_partsize.Rows[i]["FilePath"].ToString();
-                Gview_LJ.Rows[index].Cells["文件名"].Value = m_dt_partsize.Rows[i]["FileName"].ToString();
-                Gview_LJ.Rows[index].Cells["粒级名"].Value = m_dt_partsize.Rows[i]["Name"].ToString();
-                Gview_LJ.Rows[index].Cells["粒级值"].Value = m_dt_partsize.Rows[i]["Value"].ToString();
+                Gview_LJ.Rows[index].Cells["FilePath"].Value = m_dt_partsize.Rows[i]["FilePath"].ToString();
+                Gview_LJ.Rows[index].Cells["FileName"].Value = m_dt_partsize.Rows[i]["FileName"].ToString();
+                Gview_LJ.Rows[index].Cells["ParticleSizeName"].Value = m_dt_partsize.Rows[i]["Name"].ToString();
+                Gview_LJ.Rows[index].Cells["ParticleSizeValue"].Value = m_dt_partsize.Rows[i]["Value"].ToString();
             }
 
         }
@@ -251,13 +258,13 @@ namespace OTSIncAReportApp
 
             //设置数据列
             Gview_LJ.Columns.Add("ID", "ID");
-            Gview_LJ.Columns.Add("文件路径", "文件路径");
-            Gview_LJ.Columns.Add("文件名", "文件名");
-            Gview_LJ.Columns.Add("粒级名", "粒级名");
-            Gview_LJ.Columns.Add("粒级值", "粒级值");
+            Gview_LJ.Columns.Add("FilePath", "FilePath");
+            Gview_LJ.Columns.Add("FileName", "FileName");
+            Gview_LJ.Columns.Add("ParticleSizeName", "ParticleSizeName");
+            Gview_LJ.Columns.Add("ParticleSizeValue", "ParticleSizeValue");
 
             //增加linkButton，删除按钮
-            string str5 = "删除";
+            string str5 = "delete";
             DataGridViewLinkColumn dlink = new DataGridViewLinkColumn();
             dlink.Text = str5;//添加的这列的显示文字，即每行最后一列显示的文字。
             dlink.Name = "delLink";
@@ -271,9 +278,9 @@ namespace OTSIncAReportApp
             Gview_LJ.Columns[1].Width = 0;
             Gview_LJ.Columns[1].Visible = false;
             Gview_LJ.Columns[2].Width = 100;
-            Gview_LJ.Columns[3].Width = 100;
-            Gview_LJ.Columns[4].Width = 200;
-            Gview_LJ.Columns[5].Width = 35;
+            Gview_LJ.Columns[3].Width = 150;
+            Gview_LJ.Columns[4].Width = 250;
+            Gview_LJ.Columns[5].Width = 60;
 
             //禁止排序
             Gview_LJ.Columns[0].SortMode = DataGridViewColumnSortMode.NotSortable;
@@ -317,12 +324,12 @@ namespace OTSIncAReportApp
 
                 if (Gview_LJ.Columns[e.ColumnIndex].Name == "delLink")
                 {
-                    if (MessageBox.Show("确定是否删除该粒级文件？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
+                    if (MessageBox.Show("Are you sure to delete the granularity file？", "Tips", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
                     {
                         //删除，删除文件
                         File.Delete(tb_lj.Text);
 
-                        MessageBox.Show("删除成功！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                        MessageBox.Show("Delete succeeded！", "Tips", MessageBoxButtons.OK, MessageBoxIcon.Information);
 
                         //重新加载绑定GridView
                         BindGridView();
@@ -341,7 +348,7 @@ namespace OTSIncAReportApp
             //保存,同时保存到文件
             if (str_selectID == "-1")
             {
-                MessageBox.Show("请选择并编辑后再进行保存！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                MessageBox.Show("Please select and edit before saving！", "Tips", MessageBoxButtons.OK, MessageBoxIcon.Information);
                 return;
             }
 
@@ -355,7 +362,7 @@ namespace OTSIncAReportApp
             xmlutil.SetAttribute("Name", tb_ljm.Text.Trim(), "XMLData");
             xmlutil.SetAttribute("Sizes", tb_ljz.Text.Trim(), "XMLData");
 
-            MessageBox.Show("保存成功！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
+            MessageBox.Show("Saved successfully！", "Tips", MessageBoxButtons.OK, MessageBoxIcon.Information);
 
             //再重新绑定显示
             BindGridView();
@@ -377,8 +384,8 @@ namespace OTSIncAReportApp
             SaveFileDialog savePath = new SaveFileDialog();
             savePath.RestoreDirectory = true;
             savePath.InitialDirectory = mPartSizeFilePath;
-            savePath.Title = "保存文件";
-            savePath.Filter = "psf文件(*.psf)|*.psf";
+            savePath.Title = "Save file";
+            savePath.Filter = "psf File(*.psf)|*.psf";
             savePath.RestoreDirectory = false;
 
             if (savePath.ShowDialog() == DialogResult.OK)

OTSIncAReportApp/1-UI/frmReportApp.cs

@@ -160,6 +160,7 @@ namespace OTSIncAReportApp
 
 
         #region 窗体初始化及构造函数
+        
         /// <summary>
         /// 窗体构造函数
         /// </summary>
@@ -197,6 +198,7 @@ namespace OTSIncAReportApp
             #region 国际化语言
             Language lan = new Language(this);
             table = lan.GetNameTable(this.Name);
+            
             #endregion
         }
         /// <summary>
@@ -836,15 +838,16 @@ namespace OTSIncAReportApp
             string text = "";
             if (iType == DisplayPicutureType.AnalyzeImg)
             {
-                text = "分析图";
+                
+                text = table["analysisdiagram"].ToString(); ;
             }
             else if (iType == DisplayPicutureType.AnalyzeDataTable)
             {
-                text = "分析数据表";
+                text = table["analysisdatasheet"].ToString();
             }
             else if (iType == DisplayPicutureType.AnalyzeDataChart)
             {
-                text = "分析数据图";
+                text = table["analysisdatachart"].ToString();
             }
 
             WorkWindow.Text = text;