合并资源文件,报告部份

XMLData/AppResource_ZH.xml

@@ -141,7 +141,7 @@
 	  <Control name="str2" text="连接" />
      </Controls>
   </Form>
-  <!-- OTSIncAReportApp -->
+ <!-- OTSIncAReportApp -->
 <Form>
    <Name>frmReportApp</Name>
     <Controls>
@@ -796,7 +796,6 @@
 	  <Control name="rbOpenFile" text="打开" />
 	  <Control name="rbSaveFile" text="保存" />
 	  <Control name="rvSaveAsFile" text="另存为" />
-	  <Control name="rbSTDEditor" text="标准库编辑器" />
 	  <Control name="rbExitApp" text="退出" />
 	  <Control name="rbSelectDlg" text="程序管理" />
 	  <Control name="rbTabHome" text="基本功能" />
@@ -809,6 +808,7 @@
 	  <Control name="rbMeasureRectangle" text="矩形" />
 	  <Control name="ribCircle" text="圆形" />
 	  <Control name="ribRectangle" text="矩形" />
+	  <Control name="ribPolygon" text="多边形" />
 	  <Control name="rbPanelFunction" text="测量控制" />
 	  <Control name="rbStart" text="开始" />
 	  <Control name="rbStop" text="停止" />
@@ -830,6 +830,9 @@
 	  <Control name="m_MeasureStauWindowName" text="测量状态" />
 	  <Control name="m_MeasureRetWindowName" text="测量结果" />
 	  <Control name="m_NoWindowName" text="未知工作窗口" />
+	  <Control name="rbSTDEdit" text="编辑标准库" />
+	  <Control name="rbReClassify" text="重新分类" />
+	  <Control name="language" text="ZH" />
 	  <Control name="message1" text="无OTSIncA有效通行证!" />
 	  <Control name="message2" text="当前文件已修改是否保存？" />
 	  <Control name="message3" text="错误日志" />
@@ -879,7 +882,7 @@
 	  <Control name="label23" text="最小" />
 	  <Control name="label20" text="颗粒尺寸范围" />
 	  <Control name="groupBox6" text="X-ray参数" />
-	  <Control name="label17" text="时间" />
+	  <Control name="label17" text="使用系统库开关" />
 	  <Control name="label30" text="搜索X-ray最低计数" />
 	  <Control name="label29" text="搜索X-ray精度" />
 	  <Control name="label32" text="分析X-ray扫描时间" />
@@ -889,8 +892,6 @@
 	  <Control name="lbArea" text="测量区域面积/mm2" />
 	  <Control name="btnok" text="确  定" />
 	  <Control name="btncancel" text="取  消" />
-	  <Control name="groupBox9" text="标准库选择" />
-	  <Control name="label43" text="标准库选择：" />
 	  <Control name="label44" text="是否使用X-ray" />
 	  <Control name="ProgMgrInfoForm" text="程序管理" />
 	  <Control name="message1" text="样品台信息不能为空" />
@@ -935,7 +936,7 @@
 	  <Control name="message40" text="请输入0-255之间的整数" />
 	  <Control name="message41" text="请输入正确的数值格式" />
 	  <Control name="message42" text="请输入正确的数值格式" />
-	  <Control name="message43" text="请输入不小于40的数值" />
+	  <Control name="message43" text="请输入正确的数值格式" />
 	  <Control name="message44" text="输入的数值过大!" />
 	  <Control name="message45" text="输入的数值过大" />
 	  <Control name="message46" text="输入的数值过大" />
@@ -947,12 +948,7 @@
 	  <Control name="message52" text="输入的数值过小" />
 	  <Control name="message53" text="请输入正确的数值范围" />
 	  <Control name="message54" text="保存样品台时失败!" />
-	  <Control name="message55" text="请输入正确的数值格式!" />
-	  <Control name="message56" text="输入的数值过大!" />
-	  <Control name="message57" text="输入的数值过大!" />
-	  <Control name="message58" text="输入的数值过大!" />
-	  <Control name="message59" text="请输入正确的数值格式!" />
-	  <Control name="message60" text="请输入正确的数值格式!" />
+	  <Control name="message55" text="所选为空库，无法编辑!" />
 	  <Control name="message61" text="是否使用X-ray项不能为空" />
     </Controls>
  </Form>
@@ -1039,6 +1035,7 @@
     <Name>OTSMeasureStatusWindow</Name>
     <Controls>
       <Control name="SampleParaLock" text="获取BSE图" />
+	  <Control name="ViewStripMenuItem" text="设置BSE图可视化灰度范围" />
 	  <Control name="ChangeDiffImageShow" text="切换至BSE图" />
 	  <Control name="ToolStripMenuItem" text="BSE去背景图" />
 	  <Control name="grayToolStripMenuItem" text="显示BSE灰度曲线图" />
@@ -1065,6 +1062,13 @@
 	  <Control name="message17" text="原子数" />
 	  <Control name="message18" text="质量百分比" />
 	  <Control name="message19" text="摩尔比" />
+	  
+	  <Control name="message20" text="获取图像错误AcquireBSEImage_Click:" />
+	  <Control name="message21" text="删除单点采集信息与显示标尺信息:" />
+	  <Control name="message22" text="数据小于2！" />
+	  <Control name="message23" text="错误" />
+	  <Control name="message24" text="获取SEM当前位置:" />
+	  
     </Controls>
  </Form>
  <Form>
@@ -1104,12 +1108,12 @@
       <Control name="m_reportname1" text="常用夹杂物分类" />
 	  <Control name="m_str_axisy1" text="颗粒数" />
 	  <Control name="str_operatonmodule1" text="常用夹杂物分类图" />
-	  <Control name="m_reportname2" text="颗粒成分" />
+	  <Control name="m_reportname2" text="颗粒成份" />
 	  <Control name="m_str_axisy2" text="颗粒数" />
-	  <Control name="str_operatonmodule2" text="颗粒成分图" />
-	  <Control name="m_reportname3" text="元素成分" />
+	  <Control name="str_operatonmodule2" text="颗粒成份图" />
+	  <Control name="m_reportname3" text="元素成份" />
 	  <Control name="m_str_axisy3" text="元素含量" />
-	  <Control name="str_operatonmodule3" text="元素成分图" />
+	  <Control name="str_operatonmodule3" text="元素成份图" />
 	  <Control name="m_reportname4" text="颗粒尺寸分布" />
 	  <Control name="m_str_axisy4" text="颗粒数" />
 	  <Control name="str_operatonmodule4" text="颗粒尺寸分布图" />
@@ -1359,9 +1363,18 @@
  <Form>
     <Name>OTSMeasureOutputNlog</Name>
     <Controls>
-      <Control name="OTSMeasureOutputNlog" text="log输出" />
-	  <Control name="label1" text="log输出类型：" />
 	  <Control name="button_clear" text="清屏" />
+	  <Control name="button_stop" text="停止" />
+    </Controls>
+ </Form>
+ <Form>
+    <Name>ToolWindow</Name>
+    <Controls>
+      <Control name="ToolWindow" text="设置BSE图可视化灰度范围" />
+	  <Control name="groupBox1" text="设置参数" />
+	  <Control name="label1" text="灰度范围" />
+	  <Control name="btnYes" text="确认" />
+	  <Control name="btnCancel" text="取消" />
     </Controls>
  </Form>
  <Form>
@@ -1372,4 +1385,90 @@
 	  <Control name="str3" text="K0指数" />
     </Controls>
  </Form>
+ <Form>
+    <Name>frmParticleClassification</Name>
+    <Controls>
+      <Control name="frmParticleClassification" text="设置颗粒分类" />
+	  <Control name="label1" text="选择类型" />
+	  <Control name="button1" text="确  定" />
+    </Controls>
+ </Form>
+ <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="删除" />
+    </Controls>
+ </Form>
+ <Form>
+    <Name>OTSReport_TemplateDesignerRM</Name>
+    <Controls>
+      <Control name="OTSReport_TemplateDesignerRM" text="报告预览信息设置" />
+	  <Control name="label39" text="模板设置" />
+	  <Control name="button6" text="保存" />
+	  <Control name="button1" text="另存" />
+	  <Control name="groupBox9" text="首页设置信息" />
+	  <Control name="groupBox1" text="页眉页脚设置" />
+	  <Control name="groupBox4" text="颗粒尺寸分析结果" />
+	  <Control name="groupBox3" text="夹杂物分类图" />
+	  <Control name="groupBox6" text="元素分析表" />
+	  <Control name="groupBox5" text="元素成分图" />
+	  <Control name="groupBox7" text="三元相图" />
+	  <Control name="groupBox8" text="颗粒列表" />
+	  
+	  <Control name="label3" text="主标题" />
+	  <Control name="label5" text="副标题" />
+	  <Control name="label1" text="样品编号" />
+	  <Control name="label4" text="参考标准" />
+	  <Control name="label7" text="显示结果概况" />
+	  
+	  <Control name="label8" text="页眉文本" />
+	  <Control name="label10" text="页脚文本" />
+	  <Control name="label2" text="客户号" />
+	  
+	  <Control name="label17" text="显示该模块" />
+	  <Control name="label14" text="计算方式" />
+	  <Control name="label15" text="粒级表信息" />
+	  <Control name="label16" text="颗粒范围" />
+	  
+	  <Control name="label18" text="显示该模块" />
+	  <Control name="label19" text="显示图形" />
+	  <Control name="label11" text="计算方式" />
+	  <Control name="label12" text="粒级表信息" />
+	  <Control name="label13" text="颗粒范围" />
+	  
+	  <Control name="label25" text="显示该模块" />
+	  <Control name="label28" text="计算方式" />
+	  <Control name="label26" text="颗粒范围" />
+	  <Control name="label27" text="显示元素" />
+	  
+	  <Control name="label20" text="显示该模块" />
+	  <Control name="label22" text="显示图形" />
+	  <Control name="label23" text="计算方式" />
+	  <Control name="label21" text="颗粒范围" />
+	  <Control name="label24" text="元素信息" />
+	  
+	   <Control name="label40" text="显示该模块" />
+	  <Control name="label44" text="计算方式" />
+	  <Control name="label41" text="颗粒范围" />
+	  <Control name="label38" text="粒级表信息" />
+	  <Control name="label42" text="每行显示数量" />
+	  <Control name="label33" text="三元相图模板列表" />
+	  
+	  <Control name="label34" text="显示该模块" />
+	  <Control name="label37" text="计算方式" />
+	  <Control name="label35" text="颗粒范围" />
+	  <Control name="label29" text="数量上限" />
+	  <Control name="label36" text="显示元素" />
+	  <Control name="label30" text="原始图像" />
+	  <Control name="label31" text="放大图像" />
+	  <Control name="label32" text="能谱信息" />
+    </Controls>
+ </Form>
 </Resource>