修改夹杂物字样

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

@@ -830,6 +830,7 @@
 	  <Control name="SelectParticles" text="SelectParticles" />
 	  <Control name="DataSourceType" text="DataSourceType" />
 	  <Control name="InclusionAreaRatio" text="ParticleAreaRatio" />
+	  <Control name="IncaArea scale" text="ParticleAreaRatio" />
     </Controls>
  </Form>
   <Form>

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

@@ -585,7 +585,7 @@
 	  <Control name="partcletype6" text="不含分析元素的颗粒" />
       <Control name="partcletype7" text="非夹杂物颗粒SiC" />
 	  <Control name="partcletype8" text="非夹杂物颗粒FeO" />
-	  <Control name="partcletype9" text="未识别颗粒/非夹杂物" />
+	  <Control name="partcletype9" text="未识别颗粒" />
 	  <Control name="partcletype10" text="分析颗粒" />
     </Controls>
  </Form>
@@ -690,7 +690,7 @@
 	  <Control name="partcletype6" text="不含分析元素的颗粒" />
       <Control name="partcletype7" text="非夹杂物颗粒SiC" />
 	  <Control name="partcletype8" text="非夹杂物颗粒FeO" />
-	  <Control name="partcletype9" text="未识别颗粒/非夹杂物" />
+	  <Control name="partcletype9" text="未识别颗粒" />
     </Controls>
  </Form>
  <Form>
@@ -718,7 +718,7 @@
 	  <Control name="partcletype6" text="不含分析元素的颗粒" />
       <Control name="partcletype7" text="非夹杂物颗粒SiC" />
 	  <Control name="partcletype8" text="非夹杂物颗粒FeO" />
-	  <Control name="partcletype9" text="未识别颗粒/非夹杂物" />
+	  <Control name="partcletype9" text="未识别颗粒" />
 	  <Control name="str20" text="尖晶石" />
 	  <Control name="str21" text="氧化物" />
 	  <Control name="str22" text="硫氧化物" />
@@ -744,7 +744,7 @@
 	  <Control name="partcletype6" text="不含分析元素的颗粒" />
       <Control name="partcletype7" text="非夹杂物颗粒SiC" />
 	  <Control name="partcletype8" text="非夹杂物颗粒FeO" />
-	  <Control name="partcletype9" text="未识别颗粒/非夹杂物" />
+	  <Control name="partcletype9" text="未识别颗粒" />
     </Controls>
  </Form>
  <Form>
@@ -800,7 +800,7 @@
 	  <Control name="sscaptionname27" text="颗粒成分" />
 	  <Control name="sscaptionname29" text="颗粒尺寸分布" />
 	  <Control name="sscaptionname30" text="平均元素成分" />
-          <Control name="m_reportname1" text="常用颗粒分类" />
+          <Control name="m_reportname1" text="颗粒分组" />
 	  <Control name="m_str_axisy1" text="颗粒数" />
 	  <Control name="str_operatonmodule1" text="常用颗粒分类图" />
 	  <Control name="m_reportname2" text="颗粒成份" />
@@ -821,11 +821,12 @@
 	  <Control name="ChineseStandard2" text="国标方法二" />
 	  <Control name="AmericanStandard" text="美标" />
 	  <Control name="GermanStandard" text="德标" />
-	  <Control name="CommonClassification" text="常用颗粒分类" />
+	  <Control name="CommonClassification" text="颗粒分组" />
 	  <Control name="AllParticles" text="全部颗粒" />
 	  <Control name="SelectParticles" text="选择颗粒" />
 	  <Control name="DataSourceType" text="数据源类型" />
 	  <Control name="InclusionAreaRatio" text="颗粒面积比" />
+	  <Control name="IncaAreascale" text="颗粒面积比" />
     </Controls>
  </Form>
  <Form>
@@ -875,7 +876,7 @@
 	  <Control name="str8" text="灰度#" />
 	  <Control name="str9" text="移动SEM到当前位置" />
 	  <Control name="str10" text="移动SEM到颗粒视域位置" />
-          <Control name="partcletype9" text="未识别颗粒/非夹杂物" />
+          <Control name="partcletype9" text="未识别颗粒" />
 	  <Control name="partcletype10" text="分析颗粒" />
     </Controls>
  </Form>
@@ -1232,7 +1233,7 @@
   <Form>
     <Name>SampleGrid</Name>
     <Controls>
-      <Control name="m_reportname1" text="常用颗粒分类" />
+      <Control name="m_reportname1" text="颗粒分组" />
 	  <Control name="m_str_axisy1" text="颗粒数" />
 	  <Control name="str_operatonmodule1" text="常用颗粒分类图" />
 	  <Control name="m_reportname2" text="颗粒成份" />
@@ -1280,7 +1281,7 @@
 	  <Control name="partcletype6" text="不含分析元素的颗粒" />
       <Control name="partcletype7" text="非夹杂物颗粒SiC" />
 	  <Control name="partcletype8" text="非夹杂物颗粒FeO" />
-	  <Control name="partcletype9" text="未识别颗粒/非夹杂物" />
+	  <Control name="partcletype9" text="未识别颗粒" />
     </Controls>
  </Form>
  <Form>
@@ -1325,7 +1326,7 @@
 	  <Control name="partcletype6" text="不含分析元素的颗粒" />
       <Control name="partcletype7" text="非夹杂物颗粒SiC" />
 	  <Control name="partcletype8" text="非夹杂物颗粒FeO" />
-	  <Control name="partcletype9" text="未识别颗粒/非夹杂物" /> 
+	  <Control name="partcletype9" text="未识别颗粒" /> 
 	  <Control name="str21" text="面积μm²" />
 	  <Control name="str22" text="等效圆直径μm" />
 	  <Control name="str23" text="最长直径μm" />
@@ -1354,7 +1355,7 @@
 	  <Control name="str8" text="不进行x-ray分析的颗粒" />
 	  <Control name="str9" text="非夹杂物颗粒SiC" />
 	  <Control name="str10" text="非夹杂物颗粒FeO" />
-	  <Control name="str11" text="未识别颗粒/非夹杂物" />
+	  <Control name="str11" text="未识别颗粒" />
     </Controls>
  </Form>
   <!-- OTSPeriodicTable -->

OTSIncAReportApp/1-UI/Control_Graph/Controls/Control_DrawDistrbutionImageAndBSE.cs

@@ -1920,19 +1920,17 @@ namespace OTSIncAReportGraph.Controls
         private void GetPic(PaintEventArgs args)
         {
 
-                    foreach (var f in m_list_allDfield)
-                    {
+            foreach (var f in m_list_allDfield)
+            {
 
-                        var curfldrec = f.Current_Rect;
-                        if (curfldrec.Left > -1000 && curfldrec.Right <this.Width + 1000 && curfldrec.Top > -1000 && curfldrec.Bottom < this.Height + 1000)
-                        {
+                var curfldrec = f.Current_Rect;
+                if (curfldrec.Left > -1000 && curfldrec.Right < this.Width + 1000 && curfldrec.Top > -1000 && curfldrec.Bottom < this.Height + 1000)
+                {
 
+                    args.Graphics.DrawImage(f.OriginalImage, f.Current_Rect.X, f.Current_Rect.Y, f.Current_Rect.Width, f.Current_Rect.Height);
+                }
+            }
 
-                     
-                            args.Graphics.DrawImage(f.OriginalImage, f.Current_Rect.X, f.Current_Rect.Y, f.Current_Rect.Width, f.Current_Rect.Height);
-                        }
-                    }
-          
         }
 
         

OTSIncAReportApp/1-UI/OTSDisplaySourceGridData/frmReportConditionChoose.cs

@@ -754,7 +754,7 @@ namespace OTSIncAReportApp
                             break;
 
                         case CALCULATE_CHART_TYPE.INCLUSION_AREA_RATIO:
-                            m_reportname = "夹杂物面积比";
+                            m_reportname = resTable["incaareascale"].ToString();
                             m_str_AxisY = "平方微米";
 
                             m_ReportApp.im_EChart_ParticlesComposition = new Control_ECharts.EChart_ParticlesComposition(m_ReportApp, "InclusionareaRatio");