Merge branch 'dev' of http://172.16.3.77:10080/gaoshipeng/OTS2_0 into dev

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,27 @@
  <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>
+    <Name>Triangulation_Edit</Name>
+    <Controls>
+      <Control name="Triangulation_Edit" text="Ternary phase diagram template editing" />
+    </Controls>
+ </Form>
+  <Form>
+    <Name>frmSampleImage</Name>
+    <Controls>
+      <Control name="GeneralParameters" text="General parameters" />
+    </Controls>
+ </Form>
+  <Form>
+    <Name>frmTables</Name>
+    <Controls>
+      <Control name="GeneralParameters" text="General parameters" />
     </Controls>
  </Form>
  <Form>
@@ -287,6 +316,13 @@
 	  <Control name="label6" text="TemplateFolder" />
 	  <Control name="groupBox8" text="TemplateFile" />
 	  <Control name="frmReportSysConfig" text="ProgramManagement" />
+	  <Control name="cb_PERP" text="Orthogonal diameter" />
+	  <Control name="cb_PERI" text="Perimeter" />
+	  <Control name="cb_INSCR" text="Inscribed circle diameter" />
+	  <Control name="cb_MEAN" text="Average diameter of inscribed circle" />
+	  <Control name="cb_ELONG" text="Expansion length" />
+	  <Control name="cb_ASPECT_ELONG" text="Expanded aspect ratio" />
+	  <Control name="cb_Orientation" text="Orientation angle" />
     </Controls>
  </Form>
  <Form>
@@ -334,6 +370,69 @@
 	  <Control name="label4" text="DataSource" />
 	   <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="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="RictBox2" text="no files found" />
+	  <Control name="RictBox3" text=", was 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="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="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="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="RictBox44" text="The report template has been opened. Please close it first!" />
+	  <Control name="RictBox45" text="Tips" />
     </Controls>
  </Form>
 <Form>
@@ -423,6 +522,22 @@
 	  <Control name="label37" text="CalculationMethod" />
 	  <Control name="button6" text="Save" />
 	  <Control name="OTSReport_TemplateDesignerRM" text="Report preview information settings" />
+	  
+	  <Control name="report1" text="Pie chart" />
+	  <Control name="report2" text="Circle graph" />
+	  <Control name="report3" text="Column chart" />
+	  <Control name="report4" text="Linear graph" />
+	  <Control name="report5" text="Stacking diagram" />
+	  
+	  <Control name="report10" text="Ternary phase diagram template selection requires 2 integral multiples, please re select!" />
+	  <Control name="report11" text="Ternary phase diagram template selection requires 3 integral multiples, please re select!" />
+	  <Control name="report12" text="Tips" />
+	  
+	  <Control name="groupBox9" text="Home page setting information" />
+	  <Control name="label39" text="Template settings" />
+	  <Control name="label38" text="Particle size table information" />
+	  <Control name="label12" text="Particle size table information" />
+	  <Control name="label15" text="Particle size table information" />
     </Controls>
  </Form>
  <Form>
@@ -654,6 +769,11 @@
       <Control name="partcletype7" text="NOT_IDENTIFIED_SIC" />
 	  <Control name="partcletype8" text="NOT_IDENTIFIED_FEO" />
 	  <Control name="partcletype9" text="NOT_IDENTIFIED" />
+	  <Control name="str20" text="spinel" />
+	  <Control name="str21" text="oxide" />
+	  <Control name="str22" text="SulfurOxide" />
+	  <Control name="str23" text="nitrides" />
+	  <Control name="str24" text="sulfide" />
     </Controls>
  </Form>
   <Form>
@@ -758,6 +878,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>
@@ -778,6 +908,14 @@
 	  <Control name="str8" text="Copy Image" />
 	  <Control name="str9" text="Move SEM to current position" />
 	  <Control name="str10" text="Move SEM to particle view position" />
+	  
+	  <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"/>
     </Controls>
  </Form>
  <Form>
@@ -1237,12 +1375,8 @@
       <Control name="partcletype7" text="NOT_IDENTIFIED_SIC" />
 	  <Control name="partcletype8" text="NOT_IDENTIFIED_FEO" />
 	  <Control name="partcletype9" text="NOT_IDENTIFIED" />
-	  <Control name="label_Condition" text="Query Conditions:" />
-	  <Control name="label_Area" text="Area" />
-	  <Control name="label_Dmax" text="Dmax" />
-	  <Control name="label_ParticleName" text="ParticleName" />
-	  <Control name="btn_Sel" text="Query" />
-	  <Control name="label_order" text="SortingMode:" />
+	  
+	 
 	  
 	  <Control name="str21" text="Areaμm²" />
 	  <Control name="str22" text="Equivalent circle diameterμm" />

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,25 @@
     <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>
+    <Name>Triangulation_Edit</Name>
+    <Controls>
+      <Control name="Triangulation_Edit" text="三元相图模板编辑" />
+    </Controls>
+ </Form>
+  <Form>
+    <Name>frmSampleImage</Name>
+    <Controls>
+      <Control name="GeneralParameters" text="常规参数" />
+    </Controls>
+ </Form>
+  <Form>
+    <Name>frmTables</Name>
+    <Controls>
+      <Control name="GeneralParameters" text="常规参数" />
     </Controls>
  </Form>
 <Form>
@@ -282,6 +312,13 @@
 	  <Control name="label6" text="文件夹" />
 	  <Control name="groupBox8" text="报告导出模板设置" />
 	  <Control name="frmReportSysConfig" text="程序管理" />
+	  <Control name="cb_PERP" text="正交直径um" />
+	  <Control name="cb_PERI" text="周长um" />
+	  <Control name="cb_INSCR" text="内接圆直径um" />
+	  <Control name="cb_MEAN" text="内接圆平均直径" />
+	  <Control name="cb_ELONG" text="展开长度um" />
+	  <Control name="cb_ASPECT_ELONG" text="展开长宽比" />
+	  <Control name="cb_Orientation" text="朝向角度°" />
     </Controls>
  </Form>
 <Form>
@@ -328,7 +365,70 @@
 	  <Control name="btn_TempDes" text="编辑模板" />
 	  <Control name="label4" text="数 据 源" />
 	  <Control name="btn_preview" text="打开报表" />
-	  <Control name="OTSReport_Export" text="报告程序输出界面" />
+	  <Control name="OTSReport_Export" text="报告程序输`界面" />
+	  
+	  <Control name="MessageBox1" text="正在导出报告，请稍候!" />
+	  <Control name="MessageBox2" text="请稍候" />
+	  <Control name="MessageBox3" text="报告已打开，请先关闭！" />
+	  <Control name="MessageBox4" text="提示" />
+	  <Control name="MessageBox5" text="[Yes]直接打开报表，[No]重新生成报表，[Cancal]取消操作" />
+	  <Control name="MessageBox6" text="报表已有生成数据,请选择操作" />
+	  <Control name="MessageBox7" text="报表模板数据库文件已存在，直接打开" />
+	  <Control name="RictBox1" text="开始执行导出操作" />
+	  <Control name="RictBox2" text="未找到文件" />
+	  <Control name="RictBox3" text="，是否未导出？" />
+	  <Control name="RictBox4" text="已获取模板中设置内容为:" />
+	  
+	  <Control name="RictBox5" text="加载测量结果信息表模块中...." />
+	  <Control name="RictBox6" text="加载:测量结果信息表" />
+	  <Control name="RictBox7" text="等待" />
+	  <Control name="RictBox8" text="加载测量结果信息表模块完成" />
+	  <Control name="RictBox9" text="加载颗粒列表模块中...." />
+	  <Control name="RictBox10" text="加载:颗粒列表" />
+	  <Control name="RictBox11" text="测量结果信息表" />
+	  <Control name="RictBox12" text="加载:" />
+	  <Control name="RictBox13" text="颗粒列表" />
+	  <Control name="RictBox14" text="加载颗粒列表模块完成" />
+	  
+	  <Control name="RictBox15" text="加载平均元素含量表模块中...." />
+	  <Control name="RictBox16" text="加载:平均元素含量表" />
+	  <Control name="RictBox17" text="加载平均元素含量表模块完成" />
+	  <Control name="RictBox18" text="平均元素含量表" />
+	  
+	  <Control name="RictBox19" text="加载颗粒尺寸表模块中...." />
+	  <Control name="RictBox20" text="加载:颗粒尺寸表" />
+	  <Control name="RictBox21" text="加载颗粒尺寸表模块完成" />
+	  <Control name="RictBox22" text="颗粒尺寸表" />
+	  
+	  <Control name="RictBox23" text="加载颗粒成份图模块中...." />
+	  <Control name="RictBox24" text="加载:颗粒成份图" />
+	  <Control name="RictBox25" text="加载颗粒成份图模块完成" />
+	  <Control name="RictBox26" text="颗粒成份图" />
+	  
+	  <Control name="RictBox27" text="加载元素成份图模块中...." />
+	  <Control name="RictBox28" text="加载:元素成份图" />
+	  <Control name="RictBox29" text="加载元素成份图模块完成" />
+	  <Control name="RictBox30" text="元素成份图" />
+	  
+	  <Control name="RictBox31" text="加载三元相图模块中...." />
+	  <Control name="RictBox32" text="加载:三元相图" />
+	  <Control name="RictBox33" text="加载三元相图模块完成" />
+	  <Control name="RictBox34" text="三元相图" />
+	  
+	  <Control name="RictBox35" text="生成模板临时数据库文件...." />
+	  <Control name="RictBox36" text="加载:生成模板临时数据库文件" />
+	  <Control name="RictBox37" text="模板临时数据库文件完成" />
+	  <Control name="RictBox38" text="生成模板临时数据库文件" />
+	  
+	  <Control name="RictBox39" text="正在导入到报告模板中，已经完成:" />
+	  <Control name="RictBox40" text="无" />
+	  
+	  <Control name="RictBox41" text="导出了:" />
+	  <Control name="RictBox42" text="表" />
+	  <Control name="RictBox43" text="导出完成!" />
+	  
+	  <Control name="RictBox44" text="报告模板已打开，请先关闭！" />
+	  <Control name="RictBox45" text="提示" />
     </Controls>
  </Form>
 <Form>
@@ -418,6 +518,22 @@
 	  <Control name="label37" text="计算方式" />
 	  <Control name="button6" text="保存" />
 	  <Control name="OTSReport_TemplateDesignerRM" text="报告预览信息设置" />
+	  
+	  <Control name="report1" text="饼图" />
+	  <Control name="report2" text="圈图" />
+	  <Control name="report3" text="柱形图" />
+	  <Control name="report4" text="线状图" />
+	  <Control name="report5" text="堆叠图" />
+	  
+	  <Control name="report10" text="三元相图模板选择项需2整倍数，请重新选择！" />
+	  <Control name="report11" text="三元相图模板选择项需3整倍数，请重新选择！" />
+	  <Control name="report12" text="提示" />
+	  
+	  <Control name="groupBox9" text="首页设置信息" />
+	  <Control name="label39" text="模板设置" />
+	  <Control name="label38" text="粒级表信息" />
+	  <Control name="label12" text="粒级表信息" />
+	  <Control name="label15" text="粒级表信息" />
     </Controls>
  </Form>
  <Form>
@@ -649,6 +765,11 @@
       <Control name="partcletype7" text="非夹杂物颗粒SiC" />
 	  <Control name="partcletype8" text="非夹杂物颗粒FeO" />
 	  <Control name="partcletype9" text="未识别颗粒" />
+	  <Control name="str20" text="尖晶石" />
+	  <Control name="str21" text="氧化物" />
+	  <Control name="str22" text="硫氧化物" />
+	  <Control name="str23" text="氮化物" />
+	  <Control name="str24" text="硫化物" />
     </Controls>
  </Form>
  <Form>
@@ -753,6 +874,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>
@@ -773,6 +904,15 @@
 	  <Control name="str8" text="复制当前屏幕图像" />
 	  <Control name="str9" text="移动SEM到当前位置" />
 	  <Control name="str10" text="移动SEM到颗粒视域位置" />
+	  
+	  <Control name="MouseMove1" text="颗粒SEM位置:" />
+	  <Control name="MouseMove2" text="灰度#" />
+	  
+	   <Control name="BSEOriginal" text="BSE原图" />
+	  <Control name="ClassifiedDisplay" text="分类显示" />
+	  <Control name="OriginalSplicing" text="原图拼接" />
+	  <Control name="OriginalDistribution" text="原图颗粒分布" />
+	  
     </Controls>
  </Form>
  <Form>

OTSIncAReportApp/1-UI/Control_ECharts/EChart_ParticlesComposition.cs

@@ -19,6 +19,7 @@ namespace OTSIncAReportApp.Control_ECharts
     /// </summary>
     public partial class EChart_ParticlesComposition : UserControl
     {
+        Hashtable table;
 
         #region 图表相关变量
         //y轴名称
@@ -51,13 +52,13 @@ namespace OTSIncAReportApp.Control_ECharts
             m_conditionChoose = ReportApp.m_conditionChoose;
             m_DataMgr = ReportApp.m_rstDataMgr;
             InitializeComponent();
-
+            //国际化
+            Language lan = new Language();
+            table = lan.GetNameTable("CompositionDistributionGrid");
         }
         private void EChart_ParticlesComposition_Load(object sender, EventArgs e)
         {
-            //国际化
-            Language lan = new Language();
-            Hashtable table = lan.GetNameTable("CompositionDistributionGrid");
+            
 
             NameList = new List<string>() { table["partcletype0"].ToString(), table["partcletype1"].ToString(), table["partcletype2"].ToString(), table["partcletype4"].ToString(), table["partcletype6"].ToString(), table["partcletype7"].ToString(), table["partcletype8"].ToString(), table["partcletype9"].ToString() };
 
@@ -105,6 +106,11 @@ namespace OTSIncAReportApp.Control_ECharts
         #region 获取单数据源
         private Chartdate GetCommonlyUsedClassifyData(string path)
         {
+            string spinel = table["str20"].ToString();
+            string oxide = table["str21"].ToString();
+            string SulfurOxide = table["str22"].ToString();
+            string nitrides = table["str23"].ToString();
+            string sulfide = table["str24"].ToString();
             DataOperation.DataAccess.ParticleData particledata = new DataOperation.DataAccess.ParticleData(path);
             //创建新的图形数据源
             Chartdate chart = new Chartdate();
@@ -133,11 +139,11 @@ namespace OTSIncAReportApp.Control_ECharts
 
             //设置标签名称
             List<string> listName = new List<string>();
-            listName.Add("尖晶石");
-            listName.Add("氧化物");
-            listName.Add("硫氧化物");
-            listName.Add("氮化物");
-            listName.Add("硫化物");
+            listName.Add(spinel);
+            listName.Add(oxide);
+            listName.Add(SulfurOxide);
+            listName.Add(nitrides);
+            listName.Add(sulfide);
             chart.ListName = listName;
 
             //设置数据
@@ -150,31 +156,31 @@ namespace OTSIncAReportApp.Control_ECharts
                     Item item_SPINEL = new Item()
                     {
                         value = decimal.Round(decimal.Parse(dt.Rows[k]["SPINEL"].ToString()), 2).ToString(),
-                        name = "尖晶石"
+                        name = spinel
                     };
                     listData.Add(item_SPINEL);
                     Item item_OXIDE = new Item()
                     {
                         value = decimal.Round(decimal.Parse(dt.Rows[k]["OXIDE"].ToString()), 2).ToString(),
-                        name = "氧化物"
+                        name = oxide
                     };
                     listData.Add(item_OXIDE);
                     Item item_SULFIDE_OXIDE = new Item()
                     {
                         value = decimal.Round(decimal.Parse(dt.Rows[k]["SULFIDE_OXIDE"].ToString()), 2).ToString(),
-                        name = "硫氧化物"
+                        name = SulfurOxide
                     };
                     listData.Add(item_SULFIDE_OXIDE);
                     Item item_NITRIDE = new Item()
                     {
                         value = decimal.Round(decimal.Parse(dt.Rows[k]["NITRIDE"].ToString()), 2).ToString(),
-                        name = "氮化物"
+                        name = nitrides
                     };
                     listData.Add(item_NITRIDE);
                     Item item_SULFIDE = new Item()
                     {
                         value = decimal.Round(decimal.Parse(dt.Rows[k]["SULFIDE"].ToString()), 2).ToString(),
-                        name = "硫化物"
+                        name = sulfide
                     };
                     listData.Add(item_SULFIDE);
                 }

OTSIncAReportApp/1-UI/Control_ECharts/EChart_Trianglediagram.cs

@@ -70,6 +70,8 @@ namespace OTSIncAReportApp.Control_ECharts
             m_old_list_string_sizelevel = new List<string>();
             Template = Templates;
             m_ReportApp = ReportApp;
+            m_condition = ReportApp.m_conditionChoose;
+            m_DataMgr = ReportApp.m_rstDataMgr;
 
             InitializeComponent();
         }
@@ -105,7 +107,7 @@ namespace OTSIncAReportApp.Control_ECharts
             //将所有的测量结果名添加到list中
             m_list_string_samplename.Clear();
 
-            string sou = m_condition.m_SourceGridData.GetPropItemValueByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE).ToString();
+            string sou = m_condition.m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE].itemDisplayVal.ToString();
             if (sou.Contains("+"))
             {
                 if (m_ReportApp.more)

OTSIncAReportApp/1-UI/Control_Grids/ParticlesGridDevidePage.cs

@@ -1500,7 +1500,7 @@ namespace OTSIncAReportGrids
         {
             //将所有的数据导出到EXCEL中
             SaveFileDialog sfd = new SaveFileDialog();
-            sfd.Filter = "Excel文件（*.xls）|*.xls";
+            sfd.Filter = "Excel File（*.xls）|*.xls";
             //设置默认文件类型显示顺序
             sfd.FilterIndex = 1;
 
@@ -1601,7 +1601,7 @@ namespace OTSIncAReportGrids
                 workbook.Write(file);
                 file.Close();
 
-                MessageBox.Show("导出完成!");
+                MessageBox.Show("Export complete!");
 
                 //导出完成后，打开Excel文件
                 if (File.Exists(sfd.FileName))

OTSIncAReportApp/1-UI/OTSDisplaySourceGridData/OTSSourceGrid.cs

@@ -100,7 +100,7 @@ namespace OTSIncAReportApp.OTSDataMgrFunction
         /// <summary>
         /// 通用参数组的标题名
         /// </summary>
-        public String m_Display_Mode_Name = "参数";
+        public String m_Display_Mode_Name = "parameter";
 
         /// <summary>
         /// 通用参数组的GRID行数

OTSIncAReportApp/1-UI/OTSDisplaySourceGridData/frmReportConditionChoose.cs

@@ -62,10 +62,64 @@ namespace OTSIncAReportApp
             #endregion
         }
         #endregion
+
+        private ConditionItem SetGeidData(OTS_REPORT_PROP_GRID_ITEMS ID,string name, OTS_ITEM_TYPES ValType,bool ReadOnly,string DescriptionInfo,object DisplayVal,List<string> DownList,object itemVal)
+        {
+            ConditionItem sampleData = new ConditionItem();
+            sampleData.iItemId = ID;
+            sampleData.sSCaptionName = name;
+            sampleData.iItemValType = ValType;
+            sampleData.bReadOnly = ReadOnly;
+            sampleData.sDescriptionInfo = DescriptionInfo;
+            sampleData.itemDisplayVal = DisplayVal;
+            sampleData.comboDownList = DownList;
+            if(itemVal!=null)
+                sampleData.itemVal = itemVal;
+            return sampleData;
+        }
         public void SetDefaultConditionValue()
         {
             m_CurrentConditions.Clear();
             //image condition items.
+            #region 从xml文档中读取的数据信息
+            string ResultData = resTable["sscaptionname1"].ToString();//测量结果数据
+            string GraphicDisplayMode = resTable["sscaptionname3"].ToString();//测量图显示方式
+            string DistributionMap = resTable["sscaptionname14"].ToString();//颗粒分布图
+            string ArrangementDiagram = resTable["sscaptionname15"].ToString();//颗粒排列图
+            string ParticleDisplayMode = resTable["sscaptionname2"].ToString();//颗粒显示方式
+            string ParticleClassDiagram = resTable["sscaptionname13"].ToString();//颗粒分类图
+            string whole = resTable["sscaptionname16"].ToString();//全部
+            string AnalyticalParticle = resTable["sscaptionname17"].ToString();//分析颗粒
+            string custom = resTable["sscaptionname18"].ToString();//自定义
+            string ParticleSize = resTable["sscaptionname5"].ToString();//粒级
+            string MinimumParticle = resTable["sscaptionname6"].ToString();//最小颗粒
+            string MaximumParticle = resTable["sscaptionname7"].ToString();//最大颗粒
+            string ArrangementMode = resTable["sscaptionname22"].ToString();//排列方式
+            string SortByType = resTable["sscaptionname20"].ToString();//按类型排列
+            string ArrangeBySize = resTable["sscaptionname21"].ToString();//按尺寸排列
+            string DimensionCalculationMethod = resTable["sscaptionname8"].ToString();//尺寸计算法
+            string DataTableType = resTable["sscaptionname10"].ToString();//数据表类型
+            string SurveyResults = resTable["sscaptionname25"].ToString();//测量结果概况
+            string SampleMeasurementInformation = resTable["sscaptionname26"].ToString(); //样品测量信息
+            string granularComponent= resTable["sscaptionname27"].ToString();//颗粒成分
+            string ElementComposition= resTable["sscaptionname28"].ToString();//元素成分
+            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
+
+
             //测量结果数据源
             List<string> list_source_str = m_rstDataMgr.GetSampleListName();
             string sSCaptionName1 = resTable["sscaptionname1"].ToString();
@@ -94,110 +148,36 @@ namespace OTSIncAReportApp
             m_CurrentConditions.Add(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE, sampleDatatype);
             //测量图类别 分布图 or 排列图
 
-            string sSCaptionName3 = resTable["sscaptionname3"].ToString();
-            string sscaptionname14 = resTable["sscaptionname14"].ToString();
-            string sscaptionname15 = resTable["sscaptionname15"].ToString();
-            List<string> list1 = new List<string>() { sscaptionname14, sscaptionname15 };
-            ConditionItem sampleData2 = new ConditionItem();
-            sampleData2.iItemId = OTS_REPORT_PROP_GRID_ITEMS.IMAGE_DISPLAY_TYPE;
-            sampleData2.sSCaptionName = sSCaptionName3;
-            sampleData2.iItemValType = OTS_ITEM_TYPES.COMBO;
-            sampleData2.bReadOnly = false;
-            sampleData2.sDescriptionInfo = "image display mode";
-            sampleData2.itemDisplayVal = list1[0];
-            sampleData2.itemVal = IMAGE_DISPLAY_TYPE.DISTRIBUTION;
-            sampleData2.comboDownList = list1;
+            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);
-
-
-            string sSCaptionName2 = resTable["sscaptionname2"].ToString();
-            string sSCaptionName13 = resTable["sscaptionname13"].ToString();
-            ConditionItem sampleData1 = new ConditionItem();
-            sampleData1.iItemId = OTS_REPORT_PROP_GRID_ITEMS.IMAGE_TYPE;
-            sampleData1.sSCaptionName = sSCaptionName2;//测量图类型
-            sampleData1.iItemValType = OTS_ITEM_TYPES.COMBO;
-            sampleData1.bReadOnly = false;
-            sampleData1.sDescriptionInfo = "distribution image Type";
-            sampleData1.itemDisplayVal = "BSE原图";
-            sampleData1.itemVal = IMAGE_TYPE.BSE;
-            sampleData1.comboDownList = new List<string>() { "BSE原图", "分类显示", "Original", "原图颗粒分布" };//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);
 
-
-
-
             //粒级表
-            string sSCaptionName_partsizefile = "粒级表";
             List<string> list_partsizelist = m_rstDataMgr.GetPartSizeFileList();//从系统默认的路径中查找出所有的粒级表文件
-            ConditionItem sampleData_partsizefile = new ConditionItem();
-            sampleData_partsizefile.iItemId = OTS_REPORT_PROP_GRID_ITEMS.GRAIN_SIZE_CLASS_TABLE;
-            sampleData_partsizefile.sSCaptionName = sSCaptionName_partsizefile;
-            sampleData_partsizefile.iItemValType = OTS_ITEM_TYPES.COMBO;
-            sampleData_partsizefile.bReadOnly = false;
-            sampleData_partsizefile.sDescriptionInfo = "Particle Table";
-            sampleData_partsizefile.itemDisplayVal = list_partsizelist[0];
-            sampleData_partsizefile.itemVal = 0;
-            sampleData_partsizefile.comboDownList = list_partsizelist;
+            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);
 
             //粒级
-            string sscaptionname16 = resTable["sscaptionname16"].ToString();
-            string sscaptionname17 = resTable["sscaptionname17"].ToString();
-            string sscaptionname18 = resTable["sscaptionname18"].ToString();
-            ConditionItem sampleData4 = new ConditionItem();
             List<string> sizeList = new List<string>();
             sizeList = m_rstDataMgr.GetPartSizeList();//获取粒级后额外增加全部，自定义，选项
-            sizeList.Insert(0, sscaptionname16);//全部
-            sizeList.Insert(1, sscaptionname18);//自定义
-
-            string sSCaptionName5 = resTable["sscaptionname5"].ToString();
-            sampleData4.iItemId = OTS_REPORT_PROP_GRID_ITEMS.GRAIN_SIZE_CLASS;
-            sampleData4.sSCaptionName = sSCaptionName5;
-            sampleData4.iItemValType = OTS_ITEM_TYPES.COMBO;
-            sampleData4.bReadOnly = false;
-            sampleData4.sDescriptionInfo = "Grain Size";
-            sampleData4.itemDisplayVal = sscaptionname16;
-            sampleData4.comboDownList = sizeList;
-            sampleData4.itemVal = 0;
+            sizeList.Insert(0, whole);//全部
+            sizeList.Insert(1, custom);//自定义
+            ConditionItem sampleData4 = SetGeidData(OTS_REPORT_PROP_GRID_ITEMS.GRAIN_SIZE_CLASS, ParticleSize, OTS_ITEM_TYPES.COMBO, false, "Grain Size", sizeList[0], sizeList, 0);
             m_CurrentConditions.Add(OTS_REPORT_PROP_GRID_ITEMS.GRAIN_SIZE_CLASS,sampleData4);
 
             //自定义最小
-            string sSCaptionName6 = resTable["sscaptionname6"].ToString();
-            ConditionItem sampleData41 = new ConditionItem();
-            sampleData41.iItemId = OTS_REPORT_PROP_GRID_ITEMS.GRAIN_SIZE_MIN;
-            sampleData41.sSCaptionName = sSCaptionName6;
-            sampleData41.iItemValType = OTS_ITEM_TYPES.DOUBLE;
-            sampleData41.bReadOnly = false;
-            sampleData41.sDescriptionInfo = "Smallest Particle";
-            sampleData41.itemDisplayVal = "0";
+            ConditionItem sampleData41 = SetGeidData(OTS_REPORT_PROP_GRID_ITEMS.GRAIN_SIZE_MIN, MinimumParticle, OTS_ITEM_TYPES.DOUBLE, false, "Smallest Particle", "0", new List<string> { }, null);
             m_CurrentConditions.Add(OTS_REPORT_PROP_GRID_ITEMS.GRAIN_SIZE_MIN,sampleData41);
 
             //自定义最大
-            string sSCaptionName7 = resTable["sscaptionname7"].ToString();
-            ConditionItem sampleData42 = new ConditionItem();
-            sampleData42.iItemId = OTS_REPORT_PROP_GRID_ITEMS.GRAIN_SIZE_MAX;
-            sampleData42.sSCaptionName = sSCaptionName7;
-            sampleData42.iItemValType = OTS_ITEM_TYPES.DOUBLE;
-            sampleData42.bReadOnly = false;
-            sampleData42.sDescriptionInfo = "Maximum Particle";
-            sampleData42.itemDisplayVal = "0";
+            ConditionItem sampleData42 = SetGeidData(OTS_REPORT_PROP_GRID_ITEMS.GRAIN_SIZE_MAX, MaximumParticle, OTS_ITEM_TYPES.DOUBLE, false, "Maximum Particle", "0", new List<string> { }, null);
             m_CurrentConditions.Add(OTS_REPORT_PROP_GRID_ITEMS.GRAIN_SIZE_MAX,sampleData42);
 
             //排列图显示类别
-            string sSCaptionName22 = resTable["sscaptionname22"].ToString();
-            //string sSCaptionName19 = resTable["sscaptionname19"].ToString();
-            string sSCaptionName20 = resTable["sscaptionname20"].ToString();
-            string sSCaptionName21 = resTable["sscaptionname21"].ToString();
-            List<string> list3 = new List<string>() { sSCaptionName20, sSCaptionName21 };
-            ConditionItem sampleData6 = new ConditionItem();
-            sampleData6.iItemId = OTS_REPORT_PROP_GRID_ITEMS.IMAGEGRID_DIS_TYPE;
-            sampleData6.sSCaptionName = sSCaptionName22;
-            sampleData6.iItemValType = OTS_ITEM_TYPES.COMBO;
-            sampleData6.bReadOnly = false;
-            sampleData6.sDescriptionInfo = "Measured Data";
-            sampleData6.itemDisplayVal = list3[0];
-            sampleData6.itemVal = IMAGEGRID_DIS_TYPE.CLASSIFY_TYPE;
-            sampleData6.comboDownList = list3;
+            List<string> list3 = new List<string>() { SortByType, ArrangeBySize };
+            ConditionItem sampleData6 = SetGeidData(OTS_REPORT_PROP_GRID_ITEMS.IMAGEGRID_DIS_TYPE, ArrangementMode, OTS_ITEM_TYPES.COMBO, false, "Measured Data", list3[0], list3, IMAGEGRID_DIS_TYPE.CLASSIFY_TYPE);
             m_CurrentConditions.Add(OTS_REPORT_PROP_GRID_ITEMS.IMAGEGRID_DIS_TYPE,sampleData6);
 
             //计算方式
@@ -213,51 +193,25 @@ namespace OTSIncAReportApp
             sampleData5.comboDownList = m_rstDataMgr.GetSizeCalMethodTypeList();
             m_CurrentConditions.Add(OTS_REPORT_PROP_GRID_ITEMS.SIZE_CAL_METHOD_TYPE,sampleData5);
 
-
             // grid condition items
             //数据表类型
             string sSCaptionName10 = resTable["sscaptionname10"].ToString();
-            List<string> list2 = new List<string>() { resTable["sscaptionname25"].ToString(), resTable["sscaptionname26"].ToString(), resTable["sscaptionname27"].ToString(), resTable["sscaptionname28"].ToString(), resTable["sscaptionname29"].ToString(), resTable["sscaptionname30"].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 = new ConditionItem();
-            sampleData3.iItemId = OTS_REPORT_PROP_GRID_ITEMS.CALCULATE_TABLE_TYPE;
-            sampleData3.sSCaptionName = sSCaptionName10;
-            sampleData3.iItemValType = OTS_ITEM_TYPES.COMBO;
-            sampleData3.bReadOnly = false;
-            sampleData3.sDescriptionInfo = "Data table type";
-            sampleData3.itemDisplayVal = list2[0];
-            sampleData3.itemVal = CALCULATE_TABLE_TYPE.MEASURE_INFO;
-            sampleData3.comboDownList = list2;
+            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>() { "常用夹杂物分类", resTable["sscaptionname27"].ToString(), resTable["sscaptionname28"].ToString(), resTable["sscaptionname29"].ToString(), resTable["sscaptionname12"].ToString() };
-            ConditionItem sampleData22 = new ConditionItem();
-            sampleData22.iItemId = OTS_REPORT_PROP_GRID_ITEMS.CALCULATE_CHART_TYPE;
-            sampleData22.sSCaptionName = sSCaptionName10;
-            sampleData22.iItemValType = OTS_ITEM_TYPES.COMBO;
-            sampleData22.bReadOnly = false;
-            sampleData22.sDescriptionInfo = "Data graph type";
-            sampleData22.itemDisplayVal = list22[0];
-            sampleData22.itemVal = CALCULATE_CHART_TYPE.COMMON_FIVE;
-            sampleData22.comboDownList = list22;
+            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);
 
             //三元相图模板
-            string sSCaptionName12 = resTable["sscaptionname12"].ToString();
-            ConditionItem sampleData15 = new ConditionItem();
             List<string> trio_listname = m_rstDataMgr.GetTriTemplateNameList();
-            sampleData15.iItemId = OTS_REPORT_PROP_GRID_ITEMS.TRIO_CHART_TYPE;
-            sampleData15.sSCaptionName = sSCaptionName12;
-            sampleData15.iItemValType = OTS_ITEM_TYPES.COMBO;
-            sampleData15.bReadOnly = false;
-            sampleData15.sDescriptionInfo = "Ternary phase diagram";
-            sampleData15.itemDisplayVal = trio_listname.First();
-            sampleData15.comboDownList = trio_listname;
+            ConditionItem sampleData15 = SetGeidData(OTS_REPORT_PROP_GRID_ITEMS.TRIO_CHART_TYPE, TernaryPhaseDiagram, OTS_ITEM_TYPES.COMBO, false, "Ternary phase diagram", trio_listname.First(), trio_listname, null);
             m_CurrentConditions.Add(OTS_REPORT_PROP_GRID_ITEMS.TRIO_CHART_TYPE,sampleData15);
             //颗粒分类ID
             string stdIdcaption = "ClassifyId";
@@ -373,6 +327,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)//分布图页
@@ -393,7 +353,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);
 
                     //粒级表
@@ -446,7 +406,7 @@ namespace OTSIncAReportApp
                 }
                 else 
                 {
-                    sampleData.comboDownList = new List<string>() { "BSE原图", "分类显示"};//bse,颗粒分类图
+                    sampleData.comboDownList = new List<string>() { BSEOriginal, ClassifiedDisplay };//bse,颗粒分类图
                     list.Add(sampleData);
                     //排列图类别
 
@@ -459,8 +419,6 @@ namespace OTSIncAReportApp
                         var sampleData_partsizefile = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.GRAIN_SIZE_CLASS_TABLE];
                         list.Add(sampleData_partsizefile);
 
-             
-
 
 
                         //尺寸计算方式
@@ -470,12 +428,6 @@ namespace OTSIncAReportApp
                     }
                 }
                 
-               
-
-
-
-
-              
             }
             else if (tbindex == DisplayPicutureType.AnalyzeDataTable)//Grid表格页
             {

OTSIncAReportApp/1-UI/OTSMgrInfo/Triangulation_Edit.cs

@@ -116,11 +116,11 @@ namespace OTSIncAReportApp.OTSMgrInfo
                 bool ret = DataOperation.DataAccess.XMLoperate.UpdateByAttribute(pathe, AttributeName, Value);
                 if (ret)
                 {
-                    MessageBox.Show("保存成功！");
+                    MessageBox.Show("Saved successfully！");
                 }
                 else
                 {
-                    MessageBox.Show("保存失败！");
+                    MessageBox.Show("Save failed！");
                 }
             }
             else
@@ -131,15 +131,15 @@ namespace OTSIncAReportApp.OTSMgrInfo
                 int ret = DataOperation.DataAccess.XMLoperate.InsertAttribute(pathe, AttributeName, Value, "Member");
                 if (ret == -1)
                 {
-                    MessageBox.Show(TemplateName + "模板已经存在，不可重复添加！");
+                    MessageBox.Show(TemplateName + "The template already exists and cannot be added repeatedly！");
                 }
                 else if (ret == 0)
                 {
-                    MessageBox.Show("保存失败！");
+                    MessageBox.Show("Save failed！");
                 }
                 else
                 {
-                    MessageBox.Show("保存成功！");
+                    MessageBox.Show("Saved successfully！");
                 }
             }
 

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
         }
 
 
@@ -98,7 +104,7 @@ namespace OTSIncAReportApp.OTSMgrInfo
             {
                 //先删除，dt表中的记录，然后再删除clr对应底层中的数据
 
-                if (MessageBox.Show("确定是否要删除该三元相图模板选项？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
+                if (MessageBox.Show("Are you sure you want to delete the ternary phase diagram template option？", "Tips", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
                 {
                     if (str_mobanid != "")
                     {
@@ -107,11 +113,11 @@ namespace OTSIncAReportApp.OTSMgrInfo
                         int ret = XMLoperate.DeleteByAttribute(pathe, "TemplateId", str_mobanid);
                         if (ret == 1)
                         {
-                            MessageBox.Show("删除成功！");
+                            MessageBox.Show("Delete succeeded！");
                         }
                         else
                         {
-                            MessageBox.Show("保存失败！");
+                            MessageBox.Show("Save failed！");
                         }
                     }
 

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,16 +123,16 @@ 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;
             }
 
-            string tipstr = "粒级值输入错误，请输入粒级的阶段，中间使用“,”号进行分隔，例如：\r\n “1,5,10,15,20,30,40,50” \r\n或可带有小数,例如: \r\n “0.5,1.0,2.22,5.55,8.55,10.33,15,30,40” \r\n如果出现错误，请详细检查输入的格式是否正确，\r\n符号“,”与“.”的输入法是否为英文，及是否半角格式。";
+            string tipstr = "The input of particle size value is wrong. Please enter the phase of particle size, separated by “,” in the middle, for example: \r\n “1,5,10,15,20,30,40,50” \r\nor can it contain decimal points, for example:\r\n “0.5,1.0,2.22,5.55,8.55,10.33,15,30,40” \r\n IF there is an error, please check whether the input format is correct, and whether the input methods of symbols “,” and “.” are in English, And whether half width format.";
             //粒级值判断
             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/OTSMgrInfo/frmReportSysConfig.Designer.cs

@@ -132,7 +132,7 @@ namespace OTSIncAReprotCharts
             this.comboBox6.FormattingEnabled = true;
             this.comboBox6.Location = new System.Drawing.Point(88, 128);
             this.comboBox6.Name = "comboBox6";
-            this.comboBox6.Size = new System.Drawing.Size(227, 26);
+            this.comboBox6.Size = new System.Drawing.Size(227, 20);
             this.comboBox6.TabIndex = 1;
             // 
             // comboBox5
@@ -140,7 +140,7 @@ namespace OTSIncAReprotCharts
             this.comboBox5.FormattingEnabled = true;
             this.comboBox5.Location = new System.Drawing.Point(88, 174);
             this.comboBox5.Name = "comboBox5";
-            this.comboBox5.Size = new System.Drawing.Size(227, 26);
+            this.comboBox5.Size = new System.Drawing.Size(227, 20);
             this.comboBox5.TabIndex = 1;
             // 
             // comboBox4
@@ -148,14 +148,14 @@ namespace OTSIncAReprotCharts
             this.comboBox4.FormattingEnabled = true;
             this.comboBox4.Location = new System.Drawing.Point(88, 223);
             this.comboBox4.Name = "comboBox4";
-            this.comboBox4.Size = new System.Drawing.Size(227, 26);
+            this.comboBox4.Size = new System.Drawing.Size(227, 20);
             this.comboBox4.TabIndex = 1;
             // 
             // textBox9
             // 
             this.textBox9.Location = new System.Drawing.Point(88, 81);
             this.textBox9.Name = "textBox9";
-            this.textBox9.Size = new System.Drawing.Size(227, 28);
+            this.textBox9.Size = new System.Drawing.Size(227, 21);
             this.textBox9.TabIndex = 1;
             // 
             // button18
@@ -199,18 +199,21 @@ namespace OTSIncAReprotCharts
             this.groupBox3.Controls.Add(this.btn_PartSize);
             this.groupBox3.Controls.Add(this.tb_PartiSizeFileFolder);
             this.groupBox3.Controls.Add(this.label4);
-            this.groupBox3.Location = new System.Drawing.Point(12, 12);
+            this.groupBox3.Location = new System.Drawing.Point(8, 8);
+            this.groupBox3.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.groupBox3.Name = "groupBox3";
-            this.groupBox3.Size = new System.Drawing.Size(752, 64);
+            this.groupBox3.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.groupBox3.Size = new System.Drawing.Size(501, 43);
             this.groupBox3.TabIndex = 0;
             this.groupBox3.TabStop = false;
             this.groupBox3.Text = "粒级设置";
             // 
             // btn_PartSize
             // 
-            this.btn_PartSize.Location = new System.Drawing.Point(694, 26);
+            this.btn_PartSize.Location = new System.Drawing.Point(463, 17);
+            this.btn_PartSize.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.btn_PartSize.Name = "btn_PartSize";
-            this.btn_PartSize.Size = new System.Drawing.Size(50, 28);
+            this.btn_PartSize.Size = new System.Drawing.Size(33, 19);
             this.btn_PartSize.TabIndex = 4;
             this.btn_PartSize.Text = "...";
             this.btn_PartSize.UseVisualStyleBackColor = true;
@@ -219,41 +222,46 @@ namespace OTSIncAReprotCharts
             // tb_PartiSizeFileFolder
             // 
             this.tb_PartiSizeFileFolder.Enabled = false;
-            this.tb_PartiSizeFileFolder.Location = new System.Drawing.Point(188, 26);
+            this.tb_PartiSizeFileFolder.Location = new System.Drawing.Point(125, 17);
+            this.tb_PartiSizeFileFolder.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.tb_PartiSizeFileFolder.Name = "tb_PartiSizeFileFolder";
-            this.tb_PartiSizeFileFolder.Size = new System.Drawing.Size(502, 28);
+            this.tb_PartiSizeFileFolder.Size = new System.Drawing.Size(336, 21);
             this.tb_PartiSizeFileFolder.TabIndex = 3;
             // 
             // label4
             // 
             this.label4.AutoSize = true;
-            this.label4.Location = new System.Drawing.Point(15, 32);
+            this.label4.Location = new System.Drawing.Point(10, 21);
+            this.label4.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(62, 18);
+            this.label4.Size = new System.Drawing.Size(41, 12);
             this.label4.TabIndex = 2;
             this.label4.Text = "文件夹";
             // 
             // tb_sjtmbwj
             // 
             this.tb_sjtmbwj.Enabled = false;
-            this.tb_sjtmbwj.Location = new System.Drawing.Point(188, 56);
+            this.tb_sjtmbwj.Location = new System.Drawing.Point(125, 37);
+            this.tb_sjtmbwj.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.tb_sjtmbwj.Name = "tb_sjtmbwj";
-            this.tb_sjtmbwj.Size = new System.Drawing.Size(500, 28);
+            this.tb_sjtmbwj.Size = new System.Drawing.Size(335, 21);
             this.tb_sjtmbwj.TabIndex = 3;
             // 
             // tb_sjtmb
             // 
             this.tb_sjtmb.Enabled = false;
-            this.tb_sjtmb.Location = new System.Drawing.Point(188, 21);
+            this.tb_sjtmb.Location = new System.Drawing.Point(125, 14);
+            this.tb_sjtmb.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.tb_sjtmb.Name = "tb_sjtmb";
-            this.tb_sjtmb.Size = new System.Drawing.Size(558, 28);
+            this.tb_sjtmb.Size = new System.Drawing.Size(373, 21);
             this.tb_sjtmb.TabIndex = 3;
             // 
             // btn_ybcsqx
             // 
-            this.btn_ybcsqx.Location = new System.Drawing.Point(666, 478);
+            this.btn_ybcsqx.Location = new System.Drawing.Point(444, 319);
+            this.btn_ybcsqx.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.btn_ybcsqx.Name = "btn_ybcsqx";
-            this.btn_ybcsqx.Size = new System.Drawing.Size(100, 33);
+            this.btn_ybcsqx.Size = new System.Drawing.Size(67, 22);
             this.btn_ybcsqx.TabIndex = 76;
             this.btn_ybcsqx.Text = "取  消";
             this.btn_ybcsqx.UseVisualStyleBackColor = true;
@@ -261,9 +269,10 @@ namespace OTSIncAReprotCharts
             // 
             // btn_ybcsbc
             // 
-            this.btn_ybcsbc.Location = new System.Drawing.Point(527, 478);
+            this.btn_ybcsbc.Location = new System.Drawing.Point(351, 319);
+            this.btn_ybcsbc.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.btn_ybcsbc.Name = "btn_ybcsbc";
-            this.btn_ybcsbc.Size = new System.Drawing.Size(100, 33);
+            this.btn_ybcsbc.Size = new System.Drawing.Size(67, 22);
             this.btn_ybcsbc.TabIndex = 77;
             this.btn_ybcsbc.Text = "确   定";
             this.btn_ybcsbc.UseVisualStyleBackColor = true;
@@ -271,9 +280,10 @@ namespace OTSIncAReprotCharts
             // 
             // btn_sjtmbwj
             // 
-            this.btn_sjtmbwj.Location = new System.Drawing.Point(694, 56);
+            this.btn_sjtmbwj.Location = new System.Drawing.Point(463, 37);
+            this.btn_sjtmbwj.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.btn_sjtmbwj.Name = "btn_sjtmbwj";
-            this.btn_sjtmbwj.Size = new System.Drawing.Size(50, 28);
+            this.btn_sjtmbwj.Size = new System.Drawing.Size(33, 19);
             this.btn_sjtmbwj.TabIndex = 4;
             this.btn_sjtmbwj.Text = "...";
             this.btn_sjtmbwj.UseVisualStyleBackColor = true;
@@ -282,18 +292,20 @@ namespace OTSIncAReprotCharts
             // label17
             // 
             this.label17.AutoSize = true;
-            this.label17.Location = new System.Drawing.Point(15, 62);
+            this.label17.Location = new System.Drawing.Point(10, 41);
+            this.label17.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label17.Name = "label17";
-            this.label17.Size = new System.Drawing.Size(44, 18);
+            this.label17.Size = new System.Drawing.Size(29, 12);
             this.label17.TabIndex = 2;
             this.label17.Text = "文件";
             // 
             // label5
             // 
             this.label5.AutoSize = true;
-            this.label5.Location = new System.Drawing.Point(15, 28);
+            this.label5.Location = new System.Drawing.Point(10, 19);
+            this.label5.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(62, 18);
+            this.label5.Size = new System.Drawing.Size(41, 12);
             this.label5.TabIndex = 2;
             this.label5.Text = "文件夹";
             // 
@@ -304,27 +316,31 @@ namespace OTSIncAReprotCharts
             this.groupBox6.Controls.Add(this.tb_sjtmbwj);
             this.groupBox6.Controls.Add(this.btn_sjtmbwj);
             this.groupBox6.Controls.Add(this.label17);
-            this.groupBox6.Location = new System.Drawing.Point(12, 82);
+            this.groupBox6.Location = new System.Drawing.Point(8, 55);
+            this.groupBox6.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.groupBox6.Name = "groupBox6";
-            this.groupBox6.Size = new System.Drawing.Size(752, 98);
+            this.groupBox6.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.groupBox6.Size = new System.Drawing.Size(501, 65);
             this.groupBox6.TabIndex = 1;
             this.groupBox6.TabStop = false;
             this.groupBox6.Text = "三元相图模板设置";
             // 
             // tb_blyz
             // 
-            this.tb_blyz.Location = new System.Drawing.Point(188, 21);
+            this.tb_blyz.Location = new System.Drawing.Point(125, 14);
+            this.tb_blyz.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.tb_blyz.Name = "tb_blyz";
-            this.tb_blyz.Size = new System.Drawing.Size(560, 28);
+            this.tb_blyz.Size = new System.Drawing.Size(375, 21);
             this.tb_blyz.TabIndex = 1;
             this.tb_blyz.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.tb_blyz_KeyPress);
             // 
             // label22
             // 
             this.label22.AutoSize = true;
-            this.label22.Location = new System.Drawing.Point(15, 32);
+            this.label22.Location = new System.Drawing.Point(10, 21);
+            this.label22.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label22.Name = "label22";
-            this.label22.Size = new System.Drawing.Size(80, 18);
+            this.label22.Size = new System.Drawing.Size(53, 12);
             this.label22.TabIndex = 0;
             this.label22.Text = "比例因子";
             // 
@@ -354,9 +370,11 @@ namespace OTSIncAReprotCharts
             this.groupBox2.Controls.Add(this.btn_xsys);
             this.groupBox2.Controls.Add(this.tb_blyz);
             this.groupBox2.Controls.Add(this.label22);
-            this.groupBox2.Location = new System.Drawing.Point(12, 186);
+            this.groupBox2.Location = new System.Drawing.Point(8, 124);
+            this.groupBox2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.groupBox2.Name = "groupBox2";
-            this.groupBox2.Size = new System.Drawing.Size(754, 285);
+            this.groupBox2.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.groupBox2.Size = new System.Drawing.Size(503, 190);
             this.groupBox2.TabIndex = 85;
             this.groupBox2.TabStop = false;
             this.groupBox2.Text = "显示信息设置";
@@ -364,9 +382,10 @@ namespace OTSIncAReprotCharts
             // cb_ELONG
             // 
             this.cb_ELONG.AutoSize = true;
-            this.cb_ELONG.Location = new System.Drawing.Point(382, 209);
+            this.cb_ELONG.Location = new System.Drawing.Point(324, 89);
+            this.cb_ELONG.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.cb_ELONG.Name = "cb_ELONG";
-            this.cb_ELONG.Size = new System.Drawing.Size(124, 22);
+            this.cb_ELONG.Size = new System.Drawing.Size(84, 16);
             this.cb_ELONG.TabIndex = 103;
             this.cb_ELONG.Text = "展开长度um";
             this.cb_ELONG.UseVisualStyleBackColor = true;
@@ -374,9 +393,10 @@ namespace OTSIncAReprotCharts
             // cb_PERI
             // 
             this.cb_PERI.AutoSize = true;
-            this.cb_PERI.Location = new System.Drawing.Point(382, 171);
+            this.cb_PERI.Location = new System.Drawing.Point(185, 114);
+            this.cb_PERI.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.cb_PERI.Name = "cb_PERI";
-            this.cb_PERI.Size = new System.Drawing.Size(88, 22);
+            this.cb_PERI.Size = new System.Drawing.Size(60, 16);
             this.cb_PERI.TabIndex = 101;
             this.cb_PERI.Text = "周长um";
             this.cb_PERI.UseVisualStyleBackColor = true;
@@ -384,9 +404,10 @@ namespace OTSIncAReprotCharts
             // cb_EquivalentCircleDiameter
             // 
             this.cb_EquivalentCircleDiameter.AutoSize = true;
-            this.cb_EquivalentCircleDiameter.Location = new System.Drawing.Point(382, 134);
+            this.cb_EquivalentCircleDiameter.Location = new System.Drawing.Point(85, 139);
+            this.cb_EquivalentCircleDiameter.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.cb_EquivalentCircleDiameter.Name = "cb_EquivalentCircleDiameter";
-            this.cb_EquivalentCircleDiameter.Size = new System.Drawing.Size(142, 22);
+            this.cb_EquivalentCircleDiameter.Size = new System.Drawing.Size(96, 16);
             this.cb_EquivalentCircleDiameter.TabIndex = 100;
             this.cb_EquivalentCircleDiameter.Text = "等效圆直径um";
             this.cb_EquivalentCircleDiameter.UseVisualStyleBackColor = true;
@@ -394,9 +415,10 @@ namespace OTSIncAReprotCharts
             // cb_ASPECT_ELONG
             // 
             this.cb_ASPECT_ELONG.AutoSize = true;
-            this.cb_ASPECT_ELONG.Location = new System.Drawing.Point(589, 209);
+            this.cb_ASPECT_ELONG.Location = new System.Drawing.Point(326, 137);
+            this.cb_ASPECT_ELONG.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.cb_ASPECT_ELONG.Name = "cb_ASPECT_ELONG";
-            this.cb_ASPECT_ELONG.Size = new System.Drawing.Size(124, 22);
+            this.cb_ASPECT_ELONG.Size = new System.Drawing.Size(84, 16);
             this.cb_ASPECT_ELONG.TabIndex = 99;
             this.cb_ASPECT_ELONG.Text = "展开长宽比";
             this.cb_ASPECT_ELONG.UseVisualStyleBackColor = true;
@@ -404,9 +426,10 @@ namespace OTSIncAReprotCharts
             // cb_Orientation
             // 
             this.cb_Orientation.AutoSize = true;
-            this.cb_Orientation.Location = new System.Drawing.Point(189, 248);
+            this.cb_Orientation.Location = new System.Drawing.Point(185, 139);
+            this.cb_Orientation.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.cb_Orientation.Name = "cb_Orientation";
-            this.cb_Orientation.Size = new System.Drawing.Size(124, 22);
+            this.cb_Orientation.Size = new System.Drawing.Size(84, 16);
             this.cb_Orientation.TabIndex = 98;
             this.cb_Orientation.Text = "朝向角度°";
             this.cb_Orientation.UseVisualStyleBackColor = true;
@@ -414,9 +437,10 @@ namespace OTSIncAReprotCharts
             // cb_MEAN
             // 
             this.cb_MEAN.AutoSize = true;
-            this.cb_MEAN.Location = new System.Drawing.Point(189, 209);
+            this.cb_MEAN.Location = new System.Drawing.Point(85, 170);
+            this.cb_MEAN.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.cb_MEAN.Name = "cb_MEAN";
-            this.cb_MEAN.Size = new System.Drawing.Size(160, 22);
+            this.cb_MEAN.Size = new System.Drawing.Size(108, 16);
             this.cb_MEAN.TabIndex = 97;
             this.cb_MEAN.Text = "内接圆平均直径";
             this.cb_MEAN.UseVisualStyleBackColor = true;
@@ -424,9 +448,10 @@ namespace OTSIncAReprotCharts
             // cb_INSCR
             // 
             this.cb_INSCR.AutoSize = true;
-            this.cb_INSCR.Location = new System.Drawing.Point(589, 171);
+            this.cb_INSCR.Location = new System.Drawing.Point(326, 112);
+            this.cb_INSCR.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.cb_INSCR.Name = "cb_INSCR";
-            this.cb_INSCR.Size = new System.Drawing.Size(142, 22);
+            this.cb_INSCR.Size = new System.Drawing.Size(96, 16);
             this.cb_INSCR.TabIndex = 96;
             this.cb_INSCR.Text = "内接圆直径um";
             this.cb_INSCR.UseVisualStyleBackColor = true;
@@ -434,9 +459,10 @@ namespace OTSIncAReprotCharts
             // cb_PERP
             // 
             this.cb_PERP.AutoSize = true;
-            this.cb_PERP.Location = new System.Drawing.Point(189, 171);
+            this.cb_PERP.Location = new System.Drawing.Point(324, 64);
+            this.cb_PERP.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.cb_PERP.Name = "cb_PERP";
-            this.cb_PERP.Size = new System.Drawing.Size(124, 22);
+            this.cb_PERP.Size = new System.Drawing.Size(84, 16);
             this.cb_PERP.TabIndex = 102;
             this.cb_PERP.Text = "正交直径um";
             this.cb_PERP.UseVisualStyleBackColor = true;
@@ -444,9 +470,10 @@ namespace OTSIncAReprotCharts
             // cb_FerretDiameter
             // 
             this.cb_FerretDiameter.AutoSize = true;
-            this.cb_FerretDiameter.Location = new System.Drawing.Point(589, 134);
+            this.cb_FerretDiameter.Location = new System.Drawing.Point(185, 89);
+            this.cb_FerretDiameter.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.cb_FerretDiameter.Name = "cb_FerretDiameter";
-            this.cb_FerretDiameter.Size = new System.Drawing.Size(142, 22);
+            this.cb_FerretDiameter.Size = new System.Drawing.Size(96, 16);
             this.cb_FerretDiameter.TabIndex = 95;
             this.cb_FerretDiameter.Text = "费雷特直径um";
             this.cb_FerretDiameter.UseVisualStyleBackColor = true;
@@ -454,9 +481,10 @@ namespace OTSIncAReprotCharts
             // cb_DiameterRatio
             // 
             this.cb_DiameterRatio.AutoSize = true;
-            this.cb_DiameterRatio.Location = new System.Drawing.Point(189, 134);
+            this.cb_DiameterRatio.Location = new System.Drawing.Point(85, 89);
+            this.cb_DiameterRatio.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.cb_DiameterRatio.Name = "cb_DiameterRatio";
-            this.cb_DiameterRatio.Size = new System.Drawing.Size(124, 22);
+            this.cb_DiameterRatio.Size = new System.Drawing.Size(84, 16);
             this.cb_DiameterRatio.TabIndex = 94;
             this.cb_DiameterRatio.Text = "长短直径比";
             this.cb_DiameterRatio.UseVisualStyleBackColor = true;
@@ -464,9 +492,10 @@ namespace OTSIncAReprotCharts
             // cb_MinDiameter
             // 
             this.cb_MinDiameter.AutoSize = true;
-            this.cb_MinDiameter.Location = new System.Drawing.Point(589, 99);
+            this.cb_MinDiameter.Location = new System.Drawing.Point(185, 66);
+            this.cb_MinDiameter.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.cb_MinDiameter.Name = "cb_MinDiameter";
-            this.cb_MinDiameter.Size = new System.Drawing.Size(124, 22);
+            this.cb_MinDiameter.Size = new System.Drawing.Size(84, 16);
             this.cb_MinDiameter.TabIndex = 93;
             this.cb_MinDiameter.Text = "最短直径um";
             this.cb_MinDiameter.UseVisualStyleBackColor = true;
@@ -474,9 +503,10 @@ namespace OTSIncAReprotCharts
             // cb_MaxDiameter
             // 
             this.cb_MaxDiameter.AutoSize = true;
-            this.cb_MaxDiameter.Location = new System.Drawing.Point(382, 99);
+            this.cb_MaxDiameter.Location = new System.Drawing.Point(85, 114);
+            this.cb_MaxDiameter.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.cb_MaxDiameter.Name = "cb_MaxDiameter";
-            this.cb_MaxDiameter.Size = new System.Drawing.Size(124, 22);
+            this.cb_MaxDiameter.Size = new System.Drawing.Size(84, 16);
             this.cb_MaxDiameter.TabIndex = 92;
             this.cb_MaxDiameter.Text = "最长直径um";
             this.cb_MaxDiameter.UseVisualStyleBackColor = true;
@@ -484,43 +514,48 @@ namespace OTSIncAReprotCharts
             // cb_Area
             // 
             this.cb_Area.AutoSize = true;
-            this.cb_Area.Location = new System.Drawing.Point(189, 99);
+            this.cb_Area.Location = new System.Drawing.Point(85, 66);
+            this.cb_Area.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.cb_Area.Name = "cb_Area";
-            this.cb_Area.Size = new System.Drawing.Size(97, 22);
+            this.cb_Area.Size = new System.Drawing.Size(66, 16);
             this.cb_Area.TabIndex = 91;
             this.cb_Area.Text = "面积um²";
             this.cb_Area.UseVisualStyleBackColor = true;
             // 
             // tb_xsys
             // 
-            this.tb_xsys.Location = new System.Drawing.Point(189, 57);
+            this.tb_xsys.Location = new System.Drawing.Point(125, 40);
+            this.tb_xsys.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.tb_xsys.Name = "tb_xsys";
-            this.tb_xsys.Size = new System.Drawing.Size(502, 28);
+            this.tb_xsys.Size = new System.Drawing.Size(336, 21);
             this.tb_xsys.TabIndex = 89;
             // 
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(16, 65);
+            this.label1.Location = new System.Drawing.Point(11, 43);
+            this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(80, 18);
+            this.label1.Size = new System.Drawing.Size(53, 12);
             this.label1.TabIndex = 87;
             this.label1.Text = "显示元素";
             // 
             // label2
             // 
             this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(16, 99);
+            this.label2.Location = new System.Drawing.Point(11, 66);
+            this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(80, 18);
+            this.label2.Size = new System.Drawing.Size(53, 12);
             this.label2.TabIndex = 88;
             this.label2.Text = "显示类型";
             // 
             // btn_xsys
             // 
-            this.btn_xsys.Location = new System.Drawing.Point(699, 57);
+            this.btn_xsys.Location = new System.Drawing.Point(466, 38);
+            this.btn_xsys.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.btn_xsys.Name = "btn_xsys";
-            this.btn_xsys.Size = new System.Drawing.Size(50, 28);
+            this.btn_xsys.Size = new System.Drawing.Size(33, 19);
             this.btn_xsys.TabIndex = 90;
             this.btn_xsys.Text = "...";
             this.btn_xsys.UseVisualStyleBackColor = true;
@@ -528,9 +563,9 @@ namespace OTSIncAReprotCharts
             // 
             // frmReportSysConfig
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(782, 522);
+            this.ClientSize = new System.Drawing.Size(521, 348);
             this.Controls.Add(this.groupBox2);
             this.Controls.Add(this.groupBox6);
             this.Controls.Add(this.groupBox3);
@@ -538,6 +573,7 @@ namespace OTSIncAReprotCharts
             this.Controls.Add(this.btn_ybcsbc);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+            this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.MaximizeBox = false;
             this.MinimizeBox = false;
             this.Name = "frmReportSysConfig";

OTSIncAReportApp/1-UI/OTSTemplateDesigner/Export_ReportTemplate.cs

@@ -529,7 +529,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
                     }
 
                     //total,不为空行，和不能是总计行
-                    if (dr2["SName"].ToString() != "" && dr2["SName"].ToString().IndexOf("个数") < 0)
+                    if (dr2["SName"].ToString() != "" && dr2["SName"].ToString().IndexOf("number") < 0)
                     {
                         dr2["total"] = "0"; //求合
                         double d_total = 0;

OTSIncAReportApp/1-UI/OTSTemplateDesigner/OTSReport_Export.cs

@@ -28,7 +28,7 @@ namespace OTSIncAReportApp
         public string m_strDBpath = "";                                 //报表模板数据库文件
         public string m_strDBpathGB = "";                               //报告国标导出
         public string m_strDBpath_ParticleList = "";                    //报表模板，颗粒列表数据库文件
-
+        System.Collections.Hashtable table;
         public frmReportApp m_ReportApp = null;                         //报告项目总进程对象
         public string m_export_type = "Excel";                          //导出文件的格式类型Excel,Word,Pdf
 
@@ -502,6 +502,7 @@ namespace OTSIncAReportApp
 
             #region 国际化语言
             Language lan = new Language(this);
+            table = lan.GetNameTable(this.Name);
             #endregion
 
         }
@@ -704,126 +705,8 @@ namespace OTSIncAReportApp
                 }
             }
         }
-        /// <summary>
-        /// 初始化模板条件编辑界面默认的值
-        /// </summary>
-        private void InitMBSZClass()
-        {
-            m_mbszclass = new MBSZClass();
-            //首页
-            m_mbszclass.M_SY.str_tb_ZBT = "夹杂物分析报告";
-            m_mbszclass.M_SY.str_tb_FBT = "XXX有限公司";
-            m_mbszclass.M_SY.str_tb_YPBH = "A009412030003";
-            m_mbszclass.M_SY.str_tb_CKBZ = "GB/T30834-2014";
-            m_mbszclass.M_SY.b_ck_ypsm = true;
-            m_mbszclass.M_SY.b_ck_jggk = true;
-
-            //页眉页脚
-            m_mbszclass.M_YMYJ.str_tb_ymwb = "夹杂物分析报告";
-            m_mbszclass.M_YMYJ.str_tb_KHH = "Copi0000123012";
-            m_mbszclass.M_YMYJ.b_ck_ym = true;
-            m_mbszclass.M_YMYJ.str_tb_yjwb = "OTS-IncA Report System";
-
-            //颗粒分析结果
-            m_mbszclass.M_KLFXJG.b_ck_klcc_xsmk = true;
-            //计算方式
-            m_mbszclass.M_KLFXJG.index_cb_klcc_jsfs = 0;
-            //粒级表
-            m_mbszclass.M_KLFXJG.index_cb_klcc_ljb = 0;
-            //颗粒范围
-            m_mbszclass.M_KLFXJG.index_cb_klcc_klfw = 0;
-
-            m_mbszclass.M_KLFXJG.b_cb_jzwfl_xsmk = true;
-            //选择图像
-            m_mbszclass.M_KLFXJG.index_cb_jzwfl_xstx = 2;//柱状图
-            //计算方式
-            m_mbszclass.M_KLFXJG.index_cb_jzwfl_jsfs = 0;
-            //粒级表
-            m_mbszclass.M_KLFXJG.index_cb_jzwfl_ljb = 0;
-            //颗粒范围
-            m_mbszclass.M_KLFXJG.index_cb_jzwfl_klfw = 0;
-
-            //元素分析结果
-            m_mbszclass.M_YSFXJG.b_ck_ysfx_xsmk = true;
-            //计算方式
-            m_mbszclass.M_YSFXJG.index_cb_yxfx_jsfs = 0;
-            //颗粒范围
-            m_mbszclass.M_YSFXJG.index_cb_ysfx_klfw = 0;
-            m_mbszclass.M_YSFXJG.str_tb_ysfx_xsys = "O,Al,Mg,Ca,Ti,Si,S,Mn,N";//显示元素
-            m_mbszclass.M_YSFXJG.list_str_tb_ysfx_xsys.Add("O");
-            m_mbszclass.M_YSFXJG.list_str_tb_ysfx_xsys.Add("Al");
-            m_mbszclass.M_YSFXJG.list_str_tb_ysfx_xsys.Add("Mg");
-            m_mbszclass.M_YSFXJG.list_str_tb_ysfx_xsys.Add("Ca");
-            m_mbszclass.M_YSFXJG.list_str_tb_ysfx_xsys.Add("Ti");
-            m_mbszclass.M_YSFXJG.list_str_tb_ysfx_xsys.Add("Si");
-            m_mbszclass.M_YSFXJG.list_str_tb_ysfx_xsys.Add("S");
-            m_mbszclass.M_YSFXJG.list_str_tb_ysfx_xsys.Add("Mn");
-            m_mbszclass.M_YSFXJG.list_str_tb_ysfx_xsys.Add("N");
-
-            m_mbszclass.M_YSFXJG.b_ck_yscf_xsmk = true;
-            //显示图形
-            m_mbszclass.M_YSFXJG.index_cb_yscf_xstx = 1;//圈图
-            //计算方式
-            m_mbszclass.M_YSFXJG.index_cb_yscf_jsfs = 0;
-            //颗粒范围
-            m_mbszclass.M_YSFXJG.index_cb_yscf_klfw = 0;
-            m_mbszclass.M_YSFXJG.str_tb_yscf_ysxx = "O,Al,Mg,Ca,Ti,Si,S,Mn,N";//显示元素
-            m_mbszclass.M_YSFXJG.list_str_tb_yscf_ysxx.Add("O");
-            m_mbszclass.M_YSFXJG.list_str_tb_yscf_ysxx.Add("Al");
-            m_mbszclass.M_YSFXJG.list_str_tb_yscf_ysxx.Add("Mg");
-            m_mbszclass.M_YSFXJG.list_str_tb_yscf_ysxx.Add("Ca");
-            m_mbszclass.M_YSFXJG.list_str_tb_yscf_ysxx.Add("Ti");
-            m_mbszclass.M_YSFXJG.list_str_tb_yscf_ysxx.Add("Si");
-            m_mbszclass.M_YSFXJG.list_str_tb_yscf_ysxx.Add("S");
-            m_mbszclass.M_YSFXJG.list_str_tb_yscf_ysxx.Add("Mn");
-            m_mbszclass.M_YSFXJG.list_str_tb_yscf_ysxx.Add("N");
-
-            //三元相图
-            m_mbszclass.M_SYXT.b_ck_syxt_xsmk = true;
-            //计算方式
-            m_mbszclass.M_SYXT.index_cb_syxt_jsfs = 0;
-            //颗粒范围
-            m_mbszclass.M_SYXT.index_cb_syxt_klfw = 0;
-            m_mbszclass.M_SYXT.str_cb_syxt_mhxssl = "2";//每行显示数量
-
-            //获取勾选的项
-            m_mbszclass.M_SYXT.list_lbv_syxt_mblb.Add("MgO.CaO.Al2O3");
-            m_mbszclass.M_SYXT.list_lbv_syxt_mblb.Add("CaO.S.Al2O3");
-            m_mbszclass.M_SYXT.list_lbv_syxt_mblb.Add("CaO.SiO2.Al2O3");
-            m_mbszclass.M_SYXT.list_lbv_syxt_mblb.Add("MnO.S.Al2O3");
-            m_mbszclass.M_SYXT.list_lbv_syxt_mblb.Add("CaO.TiN.Al2O3");
-            m_mbszclass.M_SYXT.list_lbv_syxt_mblb.Add("CaO.AlN.Al2O3");
-
-            m_mbszclass.M_SYXT.list_lbv_syxt_mblb_index.Add(0);
-            m_mbszclass.M_SYXT.list_lbv_syxt_mblb_index.Add(1);
-            m_mbszclass.M_SYXT.list_lbv_syxt_mblb_index.Add(2);
-            m_mbszclass.M_SYXT.list_lbv_syxt_mblb_index.Add(3);
-            m_mbszclass.M_SYXT.list_lbv_syxt_mblb_index.Add(4);
-            m_mbszclass.M_SYXT.list_lbv_syxt_mblb_index.Add(5);
-
-            //颗粒列表信息
-            m_mbszclass.M_KLLBXX.b_ck_kllb_xsmk = true;
-            //计算方式
-            m_mbszclass.M_KLLBXX.index_cb_kllb_jsfs = 0;
-            //颗粒范围
-            m_mbszclass.M_KLLBXX.index_cb_kllb_klfw = 0;
-
-            m_mbszclass.M_KLLBXX.int_tb_kllb_ylsx = 20;//数量上限
-            m_mbszclass.M_KLLBXX.str_tb_kllb_sxys = "O,Al,Mg,Ca,Ti,Si,S,Mn,N";//显示元素
-            m_mbszclass.M_KLLBXX.list_str_tb_lllb_sxys.Add("O");
-            m_mbszclass.M_KLLBXX.list_str_tb_lllb_sxys.Add("Al");
-            m_mbszclass.M_KLLBXX.list_str_tb_lllb_sxys.Add("Mg");
-            m_mbszclass.M_KLLBXX.list_str_tb_lllb_sxys.Add("Ca");
-            m_mbszclass.M_KLLBXX.list_str_tb_lllb_sxys.Add("Ti");
-            m_mbszclass.M_KLLBXX.list_str_tb_lllb_sxys.Add("Si");
-            m_mbszclass.M_KLLBXX.list_str_tb_lllb_sxys.Add("S");
-            m_mbszclass.M_KLLBXX.list_str_tb_lllb_sxys.Add("Mn");
-            m_mbszclass.M_KLLBXX.list_str_tb_lllb_sxys.Add("N");
-            m_mbszclass.M_KLLBXX.b_ck_kllb_ystx = true;//原始图像
-            m_mbszclass.M_KLLBXX.b_ck_kllb_fdtx = true;//放大图像
-            m_mbszclass.M_KLLBXX.b_ck_kllb_npxx = true;//能谱图像
-
-        }
+ 
+     
 
         /// <summary>
         /// 加载报告模板选择项，数据源选项
@@ -1199,7 +1082,7 @@ namespace OTSIncAReportApp
             if (backgroundWorker2.IsBusy == true)
             {
                 //导出线程正在工作中，不让退出该界面
-                MessageBox.Show("正在导出报告，请稍候!", "请稍候", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                MessageBox.Show(table["messagebox1"].ToString(), table["messagebox2"].ToString(), MessageBoxButtons.OK, MessageBoxIcon.Information);
                 //然后取消关闭窗体的事件
                 e.Cancel = true;
             }
@@ -1215,7 +1098,7 @@ namespace OTSIncAReportApp
             {
                 if (proc.ProcessName == "OTSIncAReportTemplate")
                 {
-                    DialogResult dr = MessageBox.Show("报告已打开，请先关闭！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                    DialogResult dr = MessageBox.Show(table["messagebox3"].ToString(), table["messagebox4"].ToString(), MessageBoxButtons.OK, MessageBoxIcon.Warning);
                     if (dr == DialogResult.OK)
                     {
                         return;
@@ -1226,11 +1109,11 @@ namespace OTSIncAReportApp
             //判断该测量结果文件目录中是否已经有数据库文件，有的话，直接打开，没有则进行导出数据库然后再打开
             if (File.Exists(m_strDBpath))
             {
-                DialogResult dr = MessageBox.Show("[Yes]直接打开报表，[No]重新生成报表，[Cancal]取消操作", "报表已有生成数据,请选择操作", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question);
+                DialogResult dr = MessageBox.Show(table["messagebox5"].ToString(), table["messagebox6"].ToString(), MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question);
 
                 if (dr == DialogResult.Yes)
                 {
-                    WriteRictBox("报表模板数据库文件已存在，直接打开-----------");
+                    WriteRictBox(table["messagebox7"].ToString());
                     //存在则直接打开报表
                     OpenOTSINcAreportTemplateAPP();
                     return;
@@ -1250,7 +1133,7 @@ namespace OTSIncAReportApp
             //重新导出报表数据
             m_ReportApp.m_ChartsWindow.Activate();
 
-            WriteRictBox("开始执行导出操作-----------");
+            WriteRictBox(table["rictbox1"].ToString());
             progressBar1.Value = 0;
 
             //预览
@@ -1271,7 +1154,7 @@ namespace OTSIncAReportApp
             }
             else
             {
-                WriteRictBox("未找到文件" + tb_lj.Text.Trim() + "，是否未导出？");
+                WriteRictBox(table["rictbox2"].ToString() + tb_lj.Text.Trim() + table["rictbox3"].ToString());
             }
         }
 
@@ -1735,7 +1618,7 @@ namespace OTSIncAReportApp
             #region //获取模板设置的导出的内容-------------------------------------------------
 
             //获取报告模板设置内容
-            worker.ReportProgress(0, "已获取模板中设置内容为:-------------------");
+            worker.ReportProgress(0, table["rictbox4"].ToString());
             System.Threading.Thread.Sleep(1);
             //更新进度
             worker.ReportProgress(5);
@@ -1749,126 +1632,126 @@ namespace OTSIncAReportApp
             i_zz = 80 / 9;
 
             //首先将测量结果信息表导出,在表头------------------------------------------------
-            worker.ReportProgress(0, "加载测量结果信息表模块中....");
-            worker.ReportProgress(0, "加载:测量结果信息表");
+            worker.ReportProgress(0, table["rictbox5"].ToString());
+            worker.ReportProgress(0, table["rictbox6"].ToString());
             //更新进度条
             processvalue = processvalue + 1;
             worker.ReportProgress(processvalue);
             lock (m_thread_flag)
-                m_thread_flag = "等待";
-            while (m_thread_flag == "等待")
+                m_thread_flag = table["rictbox7"].ToString();
+            while (m_thread_flag == table["rictbox7"].ToString())
             {
                 System.Threading.Thread.Sleep(500);
             }
-            worker.ReportProgress(0, "加载测量结果信息表模块完成");
+            worker.ReportProgress(0, table["rictbox8"].ToString());
             //-------------------------------------------------------------------------
 
             //调用输出，颗粒列表----------------------------------------
-            worker.ReportProgress(0, "加载颗粒列表模块中....");
-            worker.ReportProgress(0, "加载:颗粒列表");
+            worker.ReportProgress(0, table["rictbox9"].ToString());
+            worker.ReportProgress(0, table["rictbox10"].ToString());
             //更新进度条
             processvalue = processvalue + i_zz;
             worker.ReportProgress(processvalue);
             lock (m_thread_flag)
-                m_thread_flag = "等待";
-            while (m_thread_flag == "等待")
+                m_thread_flag = table["rictbox7"].ToString();
+            while (m_thread_flag == table["rictbox7"].ToString())
             {
                 System.Threading.Thread.Sleep(500);
             }
-            worker.ReportProgress(0, "加载颗粒列表模块完成");
+            worker.ReportProgress(0, table["rictbox14"].ToString());
 
 
 
             //调用输出，平均元素含量表---------------------------------------
-            worker.ReportProgress(0, "加载平均元素含量表模块中....");
-            worker.ReportProgress(0, "加载:平均元素含量表");
+            worker.ReportProgress(0, table["rictbox15"].ToString());
+            worker.ReportProgress(0, table["rictbox16"].ToString());
             //更新进度条
             processvalue = processvalue + i_zz;
             worker.ReportProgress(processvalue);
             lock (m_thread_flag)
-                m_thread_flag = "等待";
-            while (m_thread_flag == "等待")
+                m_thread_flag = table["rictbox7"].ToString();
+            while (m_thread_flag == table["rictbox7"].ToString())
             {
                 System.Threading.Thread.Sleep(500);
             }
-            worker.ReportProgress(0, "加载平均元素含量表模块完成");
+            worker.ReportProgress(0, table["rictbox17"].ToString());
 
 
 
             //调用输出，颗粒尺寸表--------------------------------------
-            worker.ReportProgress(0, "加载颗粒尺寸表模块中....");
-            worker.ReportProgress(0, "加载:颗粒尺寸表");
+            worker.ReportProgress(0, table["rictbox19"].ToString());
+            worker.ReportProgress(0, table["rictbox20"].ToString());
             //更新进度条
             processvalue = processvalue + i_zz;
             worker.ReportProgress(processvalue);
             lock (m_thread_flag)
-                m_thread_flag = "等待";
-            while (m_thread_flag == "等待")
+                m_thread_flag = table["rictbox7"].ToString();
+            while (m_thread_flag == table["rictbox7"].ToString())
             {
                 System.Threading.Thread.Sleep(500);
             }
-            worker.ReportProgress(0, "加载颗粒尺寸表模块完成");
+            worker.ReportProgress(0, table["rictbox21"].ToString());
 
 
 
 
             //调用,颗粒成份图------------------------------------------------
-            worker.ReportProgress(0, "加载颗粒成份图模块中....");
-            worker.ReportProgress(0, "加载:颗粒成份图");
+            worker.ReportProgress(0, table["rictbox23"].ToString());
+            worker.ReportProgress(0, table["rictbox24"].ToString());
             //更新进度条
             processvalue = processvalue + i_zz;
             worker.ReportProgress(processvalue);
             lock (m_thread_flag)
-                m_thread_flag = "等待";
-            while (m_thread_flag == "等待")
+                m_thread_flag = table["rictbox7"].ToString();
+            while (m_thread_flag == table["rictbox7"].ToString())
             {
                 System.Threading.Thread.Sleep(500);
             }
-            worker.ReportProgress(0, "加载颗粒成份图模块完成");
+            worker.ReportProgress(0, table["rictbox25"].ToString());
 
             //调用,元素成份图---------------------------------------------
-            worker.ReportProgress(0, "加载元素成份图模块中....");
-            worker.ReportProgress(0, "加载:元素成份图");
+            worker.ReportProgress(0, table["rictbox27"].ToString());
+            worker.ReportProgress(0, table["rictbox28"].ToString());
             //更新进度条
             processvalue = processvalue + i_zz;
             worker.ReportProgress(processvalue);
             lock (m_thread_flag)
-                m_thread_flag = "等待";
-            while (m_thread_flag == "等待")
+                m_thread_flag = table["rictbox7"].ToString();
+            while (m_thread_flag == table["rictbox7"].ToString())
             {
                 System.Threading.Thread.Sleep(500);
             }
-            worker.ReportProgress(0, "加载元素成份图模块完成");
+            worker.ReportProgress(0, table["rictbox29"].ToString());
 
 
             //调用,三元相图----------------------------------------------
-            worker.ReportProgress(0, "加载三元相图模块中....");
-            worker.ReportProgress(0, "加载:三元相图");
+            worker.ReportProgress(0, table["rictbox31"].ToString());
+            worker.ReportProgress(0, table["rictbox32"].ToString());
             //更新进度条
             processvalue = processvalue + i_zz;
             worker.ReportProgress(processvalue);
             lock (m_thread_flag)
-                m_thread_flag = "等待";
-            while (m_thread_flag == "等待")
+                m_thread_flag = table["rictbox7"].ToString();
+            while (m_thread_flag == table["rictbox7"].ToString())
             {
                 System.Threading.Thread.Sleep(500);
             }
-            worker.ReportProgress(0, "加载三元相图模块完成");
+            worker.ReportProgress(0, table["rictbox33"].ToString());
 
 
             //生成，模板临时数据库文件----------------------------------------------
-            worker.ReportProgress(0, "生成模板临时数据库文件....");
-            worker.ReportProgress(0, "加载:生成模板临时数据库文件");
+            worker.ReportProgress(0, table["rictbox35"].ToString());
+            worker.ReportProgress(0, table["rictbox36"].ToString());
             //更新进度条
             processvalue = processvalue + i_zz;
             worker.ReportProgress(processvalue);
             lock (m_thread_flag)
-                m_thread_flag = "等待";
-            while (m_thread_flag == "等待")
+                m_thread_flag = table["rictbox7"].ToString();
+            while (m_thread_flag == table["rictbox7"].ToString())
             {
                 System.Threading.Thread.Sleep(500);
             }
-            worker.ReportProgress(0, "模板临时数据库文件完成");
+            worker.ReportProgress(0, table["rictbox37"].ToString());
 
             #endregion 依将循环调用各功能模块结束-------------------------------------------------------
         }
@@ -1887,6 +1770,7 @@ namespace OTSIncAReportApp
 
         private void backgroundWorker2_ProgressChanged(object sender, ProgressChangedEventArgs e)
         {
+            string strNill = table["rictbox40"].ToString();
             BackgroundWorker worker = sender as BackgroundWorker;
           
             //更新进度条的进度
@@ -1896,79 +1780,79 @@ namespace OTSIncAReportApp
                 WriteRictBox((string)e.UserState);
                 
              string s=  AnalyticGraphics(m_mbszclass.M_KLFXJG.index_cb_jzwfl_xstx);
-                if (ls_str.IndexOf("加载:") > -1)
+                if (ls_str.IndexOf(table["rictbox12"].ToString()) > -1)
                 {
-                    if (ls_str.IndexOf("测量结果信息表") > -1)
+                    if (ls_str.IndexOf(table["rictbox11"].ToString()) > -1)
                     {
                         m_export_reporttemplate.InsertReportTemplateTable_ResultGrid();
                         lock (m_thread_flag)
-                            m_thread_flag = "无";
+                            m_thread_flag = strNill;
                     }
-                    if (ls_str.IndexOf("颗粒列表") > -1)
+                    if (ls_str.IndexOf(table["rictbox13"].ToString()) > -1)
                     {
                         m_export_reporttemplate.InsertReportTemplateTable_ParticlesGridDevidePage();
                         lock (m_thread_flag)
-                            m_thread_flag = "无";
+                            m_thread_flag = strNill;
                     }
 
-                    if (ls_str.IndexOf("平均元素含量表") > -1)
+                    if (ls_str.IndexOf(table["rictbox18"].ToString()) > -1)
                     {
                         m_export_reporttemplate.InsertReportTemplateTable_ElementCompositionAvgGrid();
                         lock (m_thread_flag)
-                            m_thread_flag = "无";
+                            m_thread_flag = strNill;
                     }
 
-                    if (ls_str.IndexOf("颗粒尺寸表") > -1)
+                    if (ls_str.IndexOf(table["rictbox22"].ToString()) > -1)
                     {
                         m_export_reporttemplate.InsertReportTemplateTable_ParticleSizeGrid();
                         lock (m_thread_flag)
-                            m_thread_flag = "无";
+                            m_thread_flag = strNill;
                     }
 
-                    if (ls_str.IndexOf("颗粒成份图") > -1)
+                    if (ls_str.IndexOf(table["rictbox26"].ToString()) > -1)
                     {
                         m_export_reporttemplate.InsertReportTemplateChart_ParticlesCompositionChart(AnalyticGraphics(m_mbszclass.M_KLFXJG.index_cb_jzwfl_xstx));
                         lock (m_thread_flag)
-                            m_thread_flag = "无";
+                            m_thread_flag = strNill;
                     }
-                    if (ls_str.IndexOf("元素成份图") > -1)
+                    if (ls_str.IndexOf(table["rictbox30"].ToString()) > -1)
                     {
                         m_export_reporttemplate.InsertReportTemplateChart_ElementCompositionChart(AnalyticGraphics(m_mbszclass.M_YSFXJG.index_cb_yscf_xstx));
                         lock (m_thread_flag)
-                            m_thread_flag = "无";
+                            m_thread_flag = strNill;
                     }
 
-                    if (ls_str.IndexOf("三元相图") > -1)
+                    if (ls_str.IndexOf(table["rictbox34"].ToString()) > -1)
                     {
                         m_export_reporttemplate.InsertReportTemplateChart_Trianglediagram();
                         lock (m_thread_flag)
-                            m_thread_flag = "无";
+                            m_thread_flag = strNill;
                     }
 
-                    if (ls_str.IndexOf("模板临时数据库文件") > -1)
+                    if (ls_str.IndexOf(table["rictbox38"].ToString()) > -1)
                     {
                         //导出到数据库文件中
                         SaveReportTemplateDBFile();
 
                         lock (m_thread_flag)
-                            m_thread_flag = "无";
+                            m_thread_flag = strNill;
                     }
                 }
             }
             else
             {
                 progressBar1.Value = e.ProgressPercentage;
-                WriteRictBox("正在导入到报告模板中，已经完成:" + e.ProgressPercentage.ToString() + "%");
+                WriteRictBox(table["rictbox39"].ToString() + e.ProgressPercentage.ToString() + "%");
             }
         }
 
         private void backgroundWorker2_RunWorkerCompleted(object sender, RunWorkerCompletedEventArgs e)
         {
-            WriteRictBox("导出了:" + m_export_reporttemplate.m_list_dt.Count.ToString() + "表", Color.Red);
+            WriteRictBox(table["rictbox41"].ToString() + m_export_reporttemplate.m_list_dt.Count.ToString() + table["rictbox42"].ToString(), Color.Red);
 
             //处理结束后,再将button的状态更新回去
             progressBar1.Value = 100;
-            WriteRictBox("-----------------导出完成!--------------------", Color.Red);
+            WriteRictBox("-----------------"+ table["rictbox43"].ToString() + "--------------------", Color.Red);
             MemoryManagementClass.FlushMemory();
 
 
@@ -1987,7 +1871,7 @@ namespace OTSIncAReportApp
             string path = string.Empty;
 
             OpenFileDialog Load = new OpenFileDialog();
-            Load.Filter = "PXML文件|*.xml";
+            Load.Filter = "XML File|*.xml";
             Load.InitialDirectory = @System.Windows.Forms.Application.StartupPath + "\\Config\\ProData";
             if (Load.ShowDialog() == DialogResult.OK)
                 path = Load.FileName;//赋值目录
@@ -2120,7 +2004,7 @@ namespace OTSIncAReportApp
             {
                 if (proc.ProcessName == "OTSIncAReportTemplate")
                 {
-                    DialogResult dr = MessageBox.Show("报告模板已打开，请先关闭！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                    DialogResult dr = MessageBox.Show(table["rictbox44"].ToString(), table["rictbox45"].ToString(), MessageBoxButtons.OK, MessageBoxIcon.Warning);
                     if (dr == DialogResult.OK)
                     {
                         return;

OTSIncAReportApp/1-UI/OTSTemplateDesigner/OTSReport_TemplateDesignerRM.cs

@@ -11,7 +11,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
     {
         #region 全局变量
         public OTSReport_Export m_OTSReport_Export;
-
+        System.Collections.Hashtable table;
         #endregion
 
         #region 构造函数及窗体加载
@@ -24,6 +24,10 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
         {
             InitializeComponent();
             m_OTSReport_Export = in_otsreport_export;
+            #region 国际化语言
+            Language lan = new Language(this);
+            table = lan.GetNameTable(this.Name);
+            #endregion
         }
 
         private void OTSReport_TemplateDesignerRM_Load(object sender, EventArgs e)
@@ -56,11 +60,11 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
 
             #region 夹杂物分类图
             //显示图形
-            cb_jzwfl_xstx.Items.Add("饼图");
-            cb_jzwfl_xstx.Items.Add("圈图");
-            cb_jzwfl_xstx.Items.Add("柱形图");
-            cb_jzwfl_xstx.Items.Add("线状图");
-            cb_jzwfl_xstx.Items.Add("堆叠图");
+            cb_jzwfl_xstx.Items.Add(table["report1"].ToString());
+            cb_jzwfl_xstx.Items.Add(table["report2"].ToString());
+            cb_jzwfl_xstx.Items.Add(table["report3"].ToString());
+            cb_jzwfl_xstx.Items.Add(table["report4"].ToString());
+            cb_jzwfl_xstx.Items.Add(table["report5"].ToString());
             cb_jzwfl_xstx.SelectedIndex = 0;
             //计算方式
             //BindComboBox(DisplayPicutureType.AnalyzeDataChart, cb_jzwfl_jsfs, OTS_RETORT_PROP_GRID_ITEMS.CALCULATE_CHART_TYPE, (int)CALCULATE_CHART_TYPE.TRIO_CHART, OTS_RETORT_PROP_GRID_ITEMS.SIZE_CAL_METHOD_TYPE);
@@ -84,11 +88,11 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
 
             #region 元素成份图
             //显示图形
-            cb_yscf_xstx.Items.Add("饼图");
-            cb_yscf_xstx.Items.Add("圈图");
-            cb_yscf_xstx.Items.Add("柱形图");
-            cb_yscf_xstx.Items.Add("线状图");
-            cb_yscf_xstx.Items.Add("堆叠图");
+            cb_yscf_xstx.Items.Add(table["report1"].ToString());
+            cb_yscf_xstx.Items.Add(table["report2"].ToString());
+            cb_yscf_xstx.Items.Add(table["report3"].ToString());
+            cb_yscf_xstx.Items.Add(table["report4"].ToString());
+            cb_yscf_xstx.Items.Add(table["report5"].ToString());
             cb_yscf_xstx.SelectedIndex = 0;
             //计算方式
             //BindComboBox(DisplayPicutureType.AnalyzeDataChart, cb_yscf_jsfs, OTS_RETORT_PROP_GRID_ITEMS.CALCULATE_CHART_TYPE, (int)CALCULATE_CHART_TYPE.TRIO_CHART, OTS_RETORT_PROP_GRID_ITEMS.SIZE_CAL_METHOD_TYPE);
@@ -152,7 +156,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
                 if (selectnumber % 2 != 0)
                 {
                     //选择的不是2的整倍数,请重新选择
-                    MessageBox.Show("三元相图模板选择项需2整倍数，请重新选择！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    MessageBox.Show(table["report10"].ToString(), table["report12"].ToString(), MessageBoxButtons.OK, MessageBoxIcon.Information);
                     return false;
                 }
             }
@@ -162,7 +166,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
                 if (selectnumber % 3 != 0)
                 {
                     //选择的不是2的整倍数,请重新选择
-                    MessageBox.Show("三元相图模板选择项需3整倍数，请重新选择！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    MessageBox.Show(table["report11"].ToString(), table["report12"].ToString(), MessageBoxButtons.OK, MessageBoxIcon.Information);
                     return false;
                 }
             }
@@ -214,7 +218,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
         {
             string path = string.Empty;
             SaveFileDialog save = new SaveFileDialog();
-            save.Filter = "XML文件|*.xml";
+            save.Filter = "XML File|*.xml";
             save.InitialDirectory = @System.Windows.Forms.Application.StartupPath + "\\Config\\ProData";
             if (save.ShowDialog() != DialogResult.OK)
             {

OTSIncAReportApp/1-UI/frmMeasureRstMgr.cs

@@ -284,9 +284,39 @@ namespace OTSIncAReportApp
         public void AddSampleResult(string str_path)
         {
             
+            //if (m_DataMgr.AddDataResult(str_path))
+            //{
+             
+            //    return;
+            //}
+
+            //加载测量结果文件
+            //Dictionary<string, object> suggestions = DataOperation.DataAccess.XMLoperate.GetXMLAllInfo(str_path);
+
+
+            //string name = System.IO.Path.GetFileName(str_path);
+            //int workingid = (this.m_ReportApp.ResultFileId++);
+            //string path = System.IO.Path.GetDirectoryName(str_path);
+            //if (m_DataMgr.resultFilesList.Find(s => s.FileName == name) != null)
+            //{
+            //    MessageBox.Show("The file with the same name has been loaded, please select again！");
+            //    return;
+            //}
+
+            //DataOperation.Model.ResultFile result = new DataOperation.Model.ResultFile()
+            //{
+            //    FileId = workingid.ToString(),
+            //    FileName = name,
+            //    FilePath = path,
+            //    ResultInfo = suggestions
+            //};
+            //this.m_DataMgr.resultFilesList.Add(result);
+            //int index = m_DataMgr.resultFilesList.IndexOf(result);
             if (m_DataMgr.AddDataResult(str_path))
             {
-             
+                //ReportCondition SMeasureInfo = new ReportCondition();
+                //this.m_DataMgr.WorkingResult = index;
+
                 m_ConditionChoose.SetDefaultConditionValue();
                 m_ConditionChoose.GetWorkingPictureConditionVal();
                 m_ReportApp.m_RstWindow.Show(m_ReportApp.DockWindowPanel);

OTSIncAReportApp/1-UI/frmReportApp.cs

@@ -192,6 +192,7 @@ namespace OTSIncAReportApp
 
 
         #region 窗体初始化及构造函数
+        
         /// <summary>
         /// 窗体构造函数
         /// </summary>
@@ -202,7 +203,6 @@ namespace OTSIncAReportApp
 
             //初始化Ribbon类，操作Ribbon按钮的可用或者不可用
             m_RibbonFun = new OTSRibbonFun(this);
-
             //和DataMgr进行数据交互类
             m_rstDataMgr = new ResultDataMgr(this);
             //配置文件管理窗体
@@ -211,8 +211,6 @@ namespace OTSIncAReportApp
             m_conditionChoose = new frmReportConditionChoose(this);
             //树窗口
             m_RstWindow = new frmMeasureRstMgr(this);
-  
-
             //分布图，排列图窗体
             m_SImageWindow = new frmSampleImage(this);
             //chart图表窗体
@@ -220,15 +218,12 @@ namespace OTSIncAReportApp
             //grid表格窗体
             m_TablesWindow = new frmTables(this);
 
-
-
-            
-
             SetTag();
 
             #region 国际化语言
             Language lan = new Language(this);
             table = lan.GetNameTable(this.Name);
+            
             #endregion
         }
         /// <summary>
@@ -253,7 +248,6 @@ namespace OTSIncAReportApp
             ribbonOrbMenuItem_Extremum.Tag = "ribbonOrbMenuItem_Extremum";
         }
 
-
         /// <summary>
         /// 窗体构造函数,可接收多个测量结果文件
         /// </summary>
@@ -264,16 +258,23 @@ namespace OTSIncAReportApp
             
             InitializeComponent();
             log = NLog.LogManager.GetCurrentClassLogger();
+
           
 
-           
+            //初始化Ribbon类，操作Ribbon按钮的可用或者不可用
+            m_RibbonFun = new OTSRibbonFun(this);
+            //和DataMgr进行数据交互类
+            m_rstDataMgr = new ResultDataMgr(this);//必须放在new frmReportSysConfig(this)前
+            //配置文件管理窗体
+            m_ReportSysConfigForm = new frmReportSysConfig(this);
+            //属性窗口
+            m_conditionChoose = new frmReportConditionChoose(this);
             //树窗口
             m_RstWindow = new frmMeasureRstMgr(this);
             //属性窗口
             m_conditionChoose = new frmReportConditionChoose(this);
 
-            //初始化图形组件中返回的颗粒列表对象
-            //SetSelectedParticles(new List<DataOperation.Model.Particle>());
+          
 
 
             //分布图，排列图窗体
@@ -282,17 +283,14 @@ namespace OTSIncAReportApp
             m_ChartsWindow = new frmCharts(this);
             //grid表格窗体
             m_TablesWindow = new frmTables(this);
+          
 
-            //初始化Ribbon类，操作Ribbon按钮的可用或者不可用
-            m_RibbonFun = new OTSRibbonFun(this);
-
-            //和DataMgr进行数据交互类
-            m_rstDataMgr = new ResultDataMgr(this);//必须放在new frmReportSysConfig(this)前
-            //配置文件管理窗体
-            m_ReportSysConfigForm = new frmReportSysConfig(this);
-
+            
+            
+            
+            
+            
             SetTag();
-
             #region 国际化语言
             Language lan = new Language(this);
             table = lan.GetNameTable(this.Name);
@@ -413,7 +411,7 @@ namespace OTSIncAReportApp
         {
             string path = "";
             OpenFileDialog fileDialog = new OpenFileDialog();
-            fileDialog.Filter = "文本文件|*.rst";
+            fileDialog.Filter = "text File|*.rst";
             fileDialog.RestoreDirectory = true; 
             if (fileDialog.ShowDialog() == DialogResult.OK)
                 path = System.IO.Path.GetFullPath(fileDialog.FileName);
@@ -863,15 +861,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;
@@ -956,7 +955,7 @@ namespace OTSIncAReportApp
         public int ShowSaveInfoMsgBox()
         {
             //是否保存修改信息,保存样品信息提示
-            int iRev = (int)MessageBox.Show("是否保存修改信息", "信息提示", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Warning);
+            int iRev = (int)MessageBox.Show("Save modification information", "Tips", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Warning);
             if (iRev == (int)DialogResult.Yes)
             {
                 return (int)MessageBoxRev.DIALOG_YES;

OTSIncAReportApp/1-UI/frmSampleImage.cs

@@ -1,7 +1,9 @@
 using OTS.WinFormsUI.Docking;
 using OTSIncAReportApp.OTSDataMgrFunction;
 using OTSIncAReportApp.OTSSampleReportInfo;
+using OTSIncAReportApp.SysMgrTools;
 using System;
+using System.Collections;
 
 namespace OTSIncAReportApp
 {
@@ -12,6 +14,7 @@ namespace OTSIncAReportApp
     {
         #region 变量定义
         private frmReportApp m_ReportApp = null;
+        Hashtable table;
         #endregion
 
         #region 构造函数
@@ -19,6 +22,10 @@ namespace OTSIncAReportApp
         {
             InitializeComponent();
             m_ReportApp = ReportApp;
+            #region 国际化语言
+            Language lan = new Language(this);
+            table = lan.GetNameTable(this.Name);
+            #endregion
         }
         #endregion
 
@@ -27,7 +34,7 @@ namespace OTSIncAReportApp
         {
             OTSSourceGrid m_SampleImage = m_ReportApp.m_conditionChoose.m_ConditionGrid;
             m_SampleImage.InitGrid();
-            m_SampleImage.InitGroupTitle(0, "常规参数");
+            m_SampleImage.InitGroupTitle(0, table["generalparameters"].ToString());
 
 
             m_SampleImage.SetPictureType(DisplayPicutureType.AnalyzeImg);

OTSIncAReportApp/1-UI/frmTables.cs

@@ -1,7 +1,9 @@
 using OTS.WinFormsUI.Docking;
 using OTSIncAReportApp.OTSDataMgrFunction;
 using OTSIncAReportApp.OTSSampleReportInfo;
+using OTSIncAReportApp.SysMgrTools;
 using System;
+using System.Collections;
 
 namespace OTSIncAReportApp
 {
@@ -12,6 +14,7 @@ namespace OTSIncAReportApp
     {
         #region 变量定义
         private frmReportApp m_ReportApp = null;
+        Hashtable table;
         #endregion
 
         #region 构造函数
@@ -19,6 +22,10 @@ namespace OTSIncAReportApp
         {
             InitializeComponent();
             m_ReportApp = ReportApp;
+            #region 国际化语言
+            Language lan = new Language(this);
+            table = lan.GetNameTable(this.Name);
+            #endregion
         }
         #endregion
 
@@ -28,7 +35,7 @@ namespace OTSIncAReportApp
             OTSSourceGrid m_SampleGrid = m_ReportApp.m_conditionChoose.m_ConditionGrid;
 
             m_SampleGrid.InitGrid();
-            m_SampleGrid.InitGroupTitle(0, "常规参数");
+            m_SampleGrid.InitGroupTitle(0, table["generalparameters"].ToString());
 
             m_SampleGrid.SetPictureType(DisplayPicutureType.AnalyzeDataTable);
             m_ReportApp.m_conditionChoose.DisCurrentPicProperty();//先添加属性