CXS 4 anni fa
parent
commit
6b88c097d0

+ 2 - 78
XMLData/AppResource_ZH.xml

@@ -1364,6 +1364,8 @@
  <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>
@@ -1394,82 +1396,4 @@
 	  <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>

+ 3 - 3
XMLData/ResourceForCpp/ResourceForCpp-EN.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <XMLData FileMark="1037" Switch="false" Version="1.1.1">
     <collection RegName="keyvaluepair">
          <collection RegName="ResGrp" grpKey="0" text="Common" description="">
@@ -677,8 +677,8 @@
 		<member itemKey="12540" itemName="" itemText="Circle"/>
 		<member itemKey="12541" itemName="" itemText="Rectangle"/>	
 
-        <member itemKey="12542" itemName="" itemText="ProfessionalMode"/>
-		<member itemKey="12543" itemName="" itemText="NormalMode"/>
+        <member itemKey="12542" itemName="" itemText="Professional"/> 
+        <member itemKey="12543" itemName="" itemText="Plain"/> 
         <member itemKey="12544" itemName="" itemText="space"/> 
         <member itemKey="12545" itemName="" itemText="space"/> 
         <member itemKey="12546" itemName="" itemText="space"/> 

+ 1 - 1
XMLData/ResourceForCpp/ResourceForCpp-ZH.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <XMLData FileMark="1037" Switch="false" Version="1.1.1">
     <collection RegName="keyvaluepair">
 	  <collection RegName="ResGrp" grpKey="0" text="常规参数" description="">