change format of report

Bin/x64/Debug/Config/ProData/ReportTemplateConfig.xml

@@ -1,17 +1,18 @@
 <XmlConfig>
   <M_SY>
-    <str_tb_ZBT>Inclusion Analysis </str_tb_ZBT>
-    <str_tb_FBT>马鞍山钢铁股份有限公司</str_tb_FBT>
+    <str_tb_ZBT>清洁度分析报告</str_tb_ZBT>
+    <str_tb_FBT>XXX公司</str_tb_FBT>
     <str_tb_YPBH>0001</str_tb_YPBH>
-    <str_tb_CKBZ>GB/T30834-2014</str_tb_CKBZ>
+    <str_tb_CKBZ>
+    </str_tb_CKBZ>
     <b_ck_ypsm>True</b_ck_ypsm>
     <b_ck_jggk>True</b_ck_jggk>
   </M_SY>
   <M_YMYJ>
-    <str_tb_ymwb>夹杂物分析报告</str_tb_ymwb>
+    <str_tb_ymwb>清洁度分析报告</str_tb_ymwb>
     <str_tb_KHH>Copi0000123012</str_tb_KHH>
     <b_ck_ym>True</b_ck_ym>
-    <str_tb_yjwb>夹杂物分析报告</str_tb_yjwb>
+    <str_tb_yjwb>清洁度分析报告</str_tb_yjwb>
   </M_YMYJ>
   <M_KLFXJG>
     <b_ck_klcc_xsmk>True</b_ck_klcc_xsmk>
@@ -51,7 +52,7 @@
     <b_ck_syxt_xsmk>True</b_ck_syxt_xsmk>
     <index_cb_syxt_jsfs>0</index_cb_syxt_jsfs>
     <index_cb_syxt_klfw>0</index_cb_syxt_klfw>
-    <str_cb_syxt_mhxssl>2</str_cb_syxt_mhxssl>
+    <str_cb_syxt_mhxssl>3</str_cb_syxt_mhxssl>
     <list_lbv_syxt_mblb>
       <MB0>MgO.CaO.Al2O3</MB0>
       <MB1>CaO.S.Al2O3</MB1>

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

@@ -435,7 +435,7 @@
 	  <Control name="groupBox1" text="HeaderSettings" />
 	  <Control name="label8" text="HeaderText" />
 	  <Control name="tabPage3" text="AnalysisResults" />
-	  <Control name="groupBox3" text="InclusionClassificationChart" />
+	  <Control name="groupBox3" text="ParticlesClassificationChart" />
 	  <Control name="label18" text="DisplayTheModule" />
 	  <Control name="label13" text="ParticleRange" />
 	  <Control name="label19" text="DisplayGraphics" />
@@ -804,9 +804,9 @@
 	  <Control name="sscaptionname27" text="Particle Composition" />
 	  <Control name="sscaptionname29" text="Size Distribution" />
 	  <Control name="sscaptionname30" text="Average Composition" />
-          <Control name="m_reportname1" text="Classification of Common Inclusions" />
+          <Control name="m_reportname1" text="Classification of Common Particles" />
 	  <Control name="m_str_axisy1" text="ParticleNumber" />
-	  <Control name="str_operatonmodule1" text="Classification Chart of Common Inclusions" />
+	  <Control name="str_operatonmodule1" text="Classification Chart of Common Particles" />
 	  <Control name="m_reportname2" text="ParticleComposition" />
 	  <Control name="m_str_axisy2" text="ParticleNumber" />
 	  <Control name="str_operatonmodule2" text="ParticleCompositionMap" />
@@ -829,7 +829,7 @@
 	  <Control name="AllParticles" text="AllParticles" />
 	  <Control name="SelectParticles" text="SelectParticles" />
 	  <Control name="DataSourceType" text="DataSourceType" />
-	  <Control name="InclusionAreaRatio" text="InclusionAreaRatio" />
+	  <Control name="InclusionAreaRatio" text="ParticleAreaRatio" />
     </Controls>
  </Form>
   <Form>
@@ -955,7 +955,7 @@
 	  <Control name="label13" text="Dimension" />
 	  <Control name="label12" text="Accuracy" />
 	  <Control name="label11" text="Drawing" />
-	  <Control name="label10" text="Inclusions" />
+	  <Control name="label10" text="Particles" />
 	  <Control name="label9" text="Number of terminated frames" />
 	  <Control name="label8" text="Termination time (seconds)" />
 	  <Control name="label7" text="Termination mode" />
@@ -1244,9 +1244,9 @@
  <Form>
     <Name>SampleGrid</Name>
     <Controls>
-      <Control name="m_reportname1" text="Classification of Common Inclusions" />
+      <Control name="m_reportname1" text="Classification of Common Particles" />
 	  <Control name="m_str_axisy1" text="ParticleNumber" />
-	  <Control name="str_operatonmodule1" text="Classification Chart of Common Inclusions" />
+	  <Control name="str_operatonmodule1" text="Classification Chart of Common Particles" />
 	  <Control name="m_reportname2" text="ParticleComposition" />
 	  <Control name="m_str_axisy2" text="ParticleNumber" />
 	  <Control name="str_operatonmodule2" text="ParticleCompositionMap" />
@@ -1381,7 +1381,7 @@
 	  <Control name="label2" text="MinGray" />
 	  <Control name="label4" text="Representative" />
 	  <Control name="label1" text="AspectRatio" />
-	  <Control name="groupBox4" text="InclusionName" />
+	  <Control name="groupBox4" text="ParticleName" />
 	  <Control name="btndel" text="Delete" />
 	  <Control name="groupBox5" text="ElementalInfo" />
 	  <Control name="btnRuleAdd" text="RuleAdd+" />
@@ -1400,36 +1400,36 @@
 	  <Control name="str3" text="Max" />
 	  <Control name="str4" text="Upd" />
 	  <Control name="str5" text="Del" />
-	  <Control name="str6" text="InclusionNumber" />
-	  <Control name="str7" text="InclusionName" />
+	  <Control name="str6" text="ParticleId" />
+	  <Control name="str7" text="ParticleName" />
 	  <Control name="str8" text="Name" />
 	  <Control name="str9" text="Representative" />
 	  <Control name="str10" text="Parameters" />
 	  <Control name="str11" text="MinGray" />
 	  <Control name="str12" text="MaxGray" />
 	  <Control name="str13" text="ElementNumber" />
-	  <Control name="str14" text="InclusionNumber" />
+	  <Control name="str14" text="ParticleId" />
 	  <Control name="str15" text="ElementName" />
 	  <Control name="str16" text="NumberOfAtoms" />
 	  <Control name="str17" text="Rule" />
 	  <Control name="str18" text="Min" />
 	  <Control name="str19" text="Max" />
 	  <Control name="str20" text="Please enter the category name you want to add" />
-	  <Control name="str21" text="Please select the inclusions to be removed" />
-	  <Control name="str22" text="Do you want to remove inclusions?" />
+	  <Control name="str21" text="Please select the Particle to be removed" />
+	  <Control name="str22" text="Do you want to remove Particle?" />
 	  <Control name="str23" text="The minimum value of gray scale interval cannot be greater than the maximum value" />
 	  <Control name="str24" text="Input error" />
 	  <Control name="str25" text="ClassificationNumber" />
 	  <Control name="str26" text="Standard library for particle analysis, failed to save element list" />
-	  <Control name="str27" text="Standard database for particle analysis failed to save inclusion list" />
+	  <Control name="str27" text="Standard database for particle analysis failed to save particle list" />
 	  <Control name="str28" text="Failure of Standard Library for Particle Analysis" />
 	  <Control name="str29" text="Please enter the standard library name" />
-	  <Control name="str30" text="Please enter inclusion rules" />
+	  <Control name="str30" text="Please enter Classification rules" />
 	  <Control name="str31" text="Please enter the library name first." />
 	  <Control name="str32" text="Do you want to quit?" />
 	  <Control name="str33" text="SignOut" />
-	  <Control name="str34" text="Please select the corresponding inclusion and edit it again!" />
-	  <Control name="str35" text="Please select inclusions before adding element rules!" />
+	  <Control name="str34" text="Please select the corresponding Particle and edit it again!" />
+	  <Control name="str35" text="Please select particles before adding element rules!" />
 	  <Control name="str36" text="Do you want to delete all information?" />
     </Controls>
  </Form>
@@ -1453,7 +1453,7 @@
 	  <Control name="str9" text="The element name you filled in does not exist. Please fill it in again." />
 	  <Control name="str10" text="The input element already exists. Please re-enter it." />
 	  <Control name="str11" text="ElementNumber" />
-	  <Control name="str12" text="InclusionNumber" />
+	  <Control name="str12" text="ParticleId" />
 	  <Control name="str13" text="ElementName" />
 	  <Control name="str14" text="AtomsNum" />
 	  <Control name="str15" text="Rule" />
@@ -1475,7 +1475,7 @@
 	  <Control name="str2" text="Symbol" />
 	  <Control name="str3" text="ElementName" />
 	  <Control name="str4" text="ChineseName" />
-	  <Control name="str5" text="Inclusion ID" />
+	  <Control name="str5" text="Particle ID" />
 	  <Control name="str6" text="Start" />
 	  <Control name="str7" text="End" />
 	  <Control name="str8" text=" AtomsNumber" />

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

@@ -431,7 +431,7 @@
 	  <Control name="groupBox1" text="页眉设置" />
 	  <Control name="label8" text="页眉文本" />
 	  <Control name="tabPage3" text="颗粒分析结果>>" />
-	  <Control name="groupBox3" text="夹杂物分类图" />
+	  <Control name="groupBox3" text="颗粒分类图" />
 	  <Control name="label18" text="显示该模块" />
 	  <Control name="label13" text="颗粒范围" />
 	  <Control name="label19" text="显示图形" />
@@ -800,9 +800,9 @@
 	  <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="str_operatonmodule1" text="常用颗粒分类图" />
 	  <Control name="m_reportname2" text="颗粒成份" />
 	  <Control name="m_str_axisy2" text="颗粒数" />
 	  <Control name="str_operatonmodule2" text="颗粒成份图" />
@@ -821,11 +821,11 @@
 	  <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="InclusionAreaRatio" text="颗粒面积比" />
     </Controls>
  </Form>
  <Form>
@@ -952,7 +952,7 @@
 	  <Control name="label13" text="扫描图尺寸" />
 	  <Control name="label12" text="扫描图精度" />
 	  <Control name="label11" text="取图方式" />
-	  <Control name="label10" text="终止夹杂物数" />
+	  <Control name="label10" text="终止颗粒数" />
 	  <Control name="label9" text="终止帧图数" />
 	  <Control name="label8" text="终止时间(秒)" />
 	  <Control name="label7" text="测量终止方式" />
@@ -1239,9 +1239,9 @@
   <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="str_operatonmodule1" text="常用颗粒分类图" />
 	  <Control name="m_reportname2" text="颗粒成份" />
 	  <Control name="m_str_axisy2" text="颗粒数" />
 	  <Control name="str_operatonmodule2" text="颗粒成份图" />
@@ -1373,7 +1373,7 @@
 	  <Control name="label2" text="灰度最小" />
 	  <Control name="label4" text="代表色" />
 	  <Control name="label1" text="形态参数(长宽比)" />
-	  <Control name="groupBox4" text="夹杂物名称" />
+	  <Control name="groupBox4" text="颗粒名称" />
 	  <Control name="btndel" text="删除" />
 	  <Control name="groupBox5" text="元素信息" />
 	  <Control name="btnRuleAdd" text="从手动编辑添加+" />
@@ -1392,36 +1392,36 @@
 	  <Control name="str3" text="最大" />
 	  <Control name="str4" text="修改" />
 	  <Control name="str5" text="删除" />
-	  <Control name="str6" text="夹杂物编号" />
-	  <Control name="str7" text="夹杂物名称" />
-	  <Control name="str8" text="夹杂物名" />
+	  <Control name="str6" text="颗粒编号" />
+	  <Control name="str7" text="颗粒名称" />
+	  <Control name="str8" text="颗粒名" />
 	  <Control name="str9" text="代表色" />
 	  <Control name="str10" text="形态参数" />
 	  <Control name="str11" text="灰度最小值" />
 	  <Control name="str12" text="灰度最大值" />
 	  <Control name="str13" text="元素编号" />
-	  <Control name="str14" text="夹杂物编号" />
+	  <Control name="str14" text="颗粒编号" />
 	  <Control name="str15" text="元素名" />
 	  <Control name="str16" text="原子数" />
 	  <Control name="str17" text="规则" />
 	  <Control name="str18" text="最小" />
 	  <Control name="str19" text="最大" />
 	  <Control name="str20" text="请输入要添加的分类名称" />
-	  <Control name="str21" text="请选择要删除的夹杂物" />
-	  <Control name="str22" text="是否要删除夹杂物?" />
+	  <Control name="str21" text="请选择要删除的颗粒" />
+	  <Control name="str22" text="是否要删除颗粒?" />
 	  <Control name="str23" text="灰度区间最小值不能大于最大值" />
 	  <Control name="str24" text="输入错误" />
 	  <Control name="str25" text="分类编号" />
 	  <Control name="str26" text="颗粒分析标准库，保存元素列表失败" />
-	  <Control name="str27" text="颗粒分析标准库，保存夹杂物列表失败" />
+	  <Control name="str27" text="颗粒分析标准库，保存颗粒列表失败" />
 	  <Control name="str28" text="颗粒分析标准库失败" />
 	  <Control name="str29" text="请输入标准库名" />
-	  <Control name="str30" text="请输入夹杂物规则" />
+	  <Control name="str30" text="请输入分类规则" />
 	  <Control name="str31" text="请先输入库名" />
 	  <Control name="str32" text="是否要退出?" />
 	  <Control name="str33" text="退出" />
-	  <Control name="str34" text="请选择对应的夹杂物再进行编辑!" />
-	  <Control name="str35" text="请先选择夹杂物后再添加元素规则!" />
+	  <Control name="str34" text="请选择对应的颗粒再进行编辑!" />
+	  <Control name="str35" text="请先选择颗粒后再添加元素规则!" />
 	  <Control name="str36" text="是否要删除全部信息?" />
     </Controls>
  </Form>
@@ -1445,7 +1445,7 @@
 	  <Control name="str9" text="填写的元素名不存在请重新填写" />
 	  <Control name="str10" text="输入的元素已经存在，请重新输入" />
 	  <Control name="str11" text="元素编号" />
-	  <Control name="str12" text="夹杂物编号" />
+	  <Control name="str12" text="颗粒编号" />
 	  <Control name="str13" text="元素名" />
 	  <Control name="str14" text="原子数" />
 	  <Control name="str15" text="规则" />
@@ -1467,7 +1467,7 @@
 	  <Control name="str2" text="符号" />
 	  <Control name="str3" text="元素名" />
 	  <Control name="str4" text="中文名" />
-	  <Control name="str5" text="夹杂物ID" />
+	  <Control name="str5" text="颗粒ID" />
 	  <Control name="str6" text="起" />
 	  <Control name="str7" text="止" />
 	  <Control name="str8" text="原子数" />

OTSIncAMeasureApp/0-OTSModel/Measure/3-MeasureFlow/CSmplMeasure.cs

@@ -422,6 +422,7 @@ namespace OTSModelSharp
         // move SEM to the point
         bool MoveSEMToPoint(System.Drawing.Point a_poi)
         {
+            //add
             // get SEM controller 
             var pSEMController = m_SemHardwareMgr;
           
@@ -455,6 +456,7 @@ namespace OTSModelSharp
                 log.Error("MoveSEMToPoint: failed to call MoveSEMToPoint method.");
                 return false;
             }
+            //add
             return true;
         }
         // Acquire a BSE image

OTSIncAReportApp/1-UI/OTSDisplaySourceGridData/OTSSampleReportInfo/OTSSampleReportInfo.cs

@@ -57,12 +57,7 @@ namespace OTSIncAReportApp.OTSSampleReportInfo
         PARTICALE_COMP = 2,
         //ELEMENT_COMP = 3,
         PARTICALE_SIZE_DISTRIBUTION = 3,
-        AVE_ELEMENT_COMP = 4,
-        GB_Method1 = 5,
-        GB_Method2 = 6,
-        ASTM = 7,
-        DIN = 8
-
+        AVE_ELEMENT_COMP = 4
     }
     public enum CALCULATE_CHART_TYPE
     {
@@ -70,8 +65,8 @@ namespace OTSIncAReportApp.OTSSampleReportInfo
         COMMON_FIVE = 0,
         PARTICALE_COMP = 1,
         PARTICALE_SIZE_DISTRIBUTION = 2,
-        TRIO_CHART = 3,
-        INCLUSION_AREA_RATIO = 4
+        //TRIO_CHART = 3,
+        INCLUSION_AREA_RATIO = 3
     }
     /// <summary>
     /// 显示计算方法的类型

OTSIncAReportApp/1-UI/OTSDisplaySourceGridData/frmReportConditionChoose.cs

@@ -105,16 +105,12 @@ namespace OTSIncAReportApp
             string granularComponent= resTable["sscaptionname27"].ToString();//颗粒成分
             string particleSizeDistribution= resTable["sscaptionname29"].ToString();//颗粒尺寸分布
             string averageElementComposition= resTable["sscaptionname30"].ToString();//平均元素成分
-            string ternaryPhaseDiagram= resTable["sscaptionname12"].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();//常用夹杂物分类
             string allParticles = resTable["allparticles"].ToString();//全部颗粒
             string selectParticles = resTable["selectparticles"].ToString();//选择颗粒
@@ -154,11 +150,11 @@ namespace OTSIncAReportApp
             //数据表类型
             List<string> list2 = new List<string>() { surveyResults, sampleMeasurementInformation, granularComponent, particleSizeDistribution, averageElementComposition };
             //string[] aa = m_ReportApp.Text.Split('-');
-            List<string> listStd = new List<string>() { chineseStandard1, chineseStandard2, americanStandard, germanStandard };
-            list2.AddRange(listStd);
+            //List<string> listStd = new List<string>() { chineseStandard1, chineseStandard2, americanStandard, germanStandard };
+            //list2.AddRange(listStd);
             AddGridData(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);
             // chart condition items
-            List<string> list22 = new List<string>() { commonClassification, granularComponent, particleSizeDistribution, ternaryPhaseDiagram , InclusionAreaRatio };
+            List<string> list22 = new List<string>() { commonClassification, granularComponent, particleSizeDistribution, InclusionAreaRatio };
             AddGridData(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);
             //三元相图模板
             List<string> trio_listname = m_rstDataMgr.GetTriTemplateNameList();
@@ -464,25 +460,25 @@ namespace OTSIncAReportApp
 
 
                 }
-                else if((int)sampleData3.itemVal == (int)CALCULATE_CHART_TYPE.TRIO_CHART)
-                {
-                    //三元相图模板
+                //else if((int)sampleData3.itemVal == (int)CALCULATE_CHART_TYPE.TRIO_CHART)
+                //{
+                //    //三元相图模板
 
-                    var sampleData15 = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.TRIO_CHART_TYPE];
-                    list.Add(sampleData15);
+                //    var sampleData15 = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.TRIO_CHART_TYPE];
+                //    list.Add(sampleData15);
 
-                    //粒级表
+                //    //粒级表
 
-                    var sampleData_partsizefile = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.GRAIN_SIZE_CLASS_TABLE];
-                    m_ReportApp.m_rstDataMgr.m_RptConfigFile.PartSizeFile = sampleData_partsizefile.itemDisplayVal.ToString();
-                    list.Add(sampleData_partsizefile);
+                //    var sampleData_partsizefile = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.GRAIN_SIZE_CLASS_TABLE];
+                //    m_ReportApp.m_rstDataMgr.m_RptConfigFile.PartSizeFile = sampleData_partsizefile.itemDisplayVal.ToString();
+                //    list.Add(sampleData_partsizefile);
 
-                    //尺寸计算方法
+                //    //尺寸计算方法
 
 
-                    var sampleData5 = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.SIZE_CAL_METHOD_TYPE];
-                    list.Add(sampleData5);
-                }
+                //    var sampleData5 = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.SIZE_CAL_METHOD_TYPE];
+                //    list.Add(sampleData5);
+                //}
 
                
             }
@@ -678,95 +674,7 @@ namespace OTSIncAReportApp
                             m_ReportApp.im_ElementCompositionAvgGrid.Dock = DockStyle.Fill;
                             m_ReportApp.m_TablesWindow.Controls.Add(m_ReportApp.im_ElementCompositionAvgGrid);
                             m_ReportApp.m_TablesWindow.Activate();
-                            break;
-                        case CALCULATE_TABLE_TYPE.GB_Method1:
-                            //国标一
-                            string resultfile = m_rstDataMgr.ResultFilesList[m_rstDataMgr.GetWorkingResult()].FilePath + "\\"
-                                + m_rstDataMgr.ResultFilesList[m_rstDataMgr.GetWorkingResult()].FileName;
-
-                            m_ReportApp.m_rstDataMgr.m_ReportMgr.AddASmplMsrResultMgr(resultfile);
-
-                            OTSCLRINTERFACE.CPropParamClr clr_prop = m_ReportApp.m_rstDataMgr.m_ReportMgr.GetPropertyParamTable();
-                            clr_prop.SetDataSourceId(0);//
-                            clr_prop.SetType((int)DisplayPicutureType.AnalyzeDataTable);//table
-                            clr_prop.SetCalTableType((int)CALCULATE_TABLE_TYPE.GB_Method1);//国标1                    
-
-                            List<OTSCLRINTERFACE.CGridDataClr> listGriddataclr = m_ReportApp.m_rstDataMgr.m_ReportMgr.GridDataTransfer(clr_prop);//
-
-                            m_ReportApp.m_TablesWindow.Controls.Clear();
-                            m_ReportApp.im_ChineseStandardABCDDS = new ChineseStandardABCDDS(m_ReportApp.m_rstDataMgr.m_ReportMgr, listGriddataclr);
-
-                            m_ReportApp.im_ChineseStandardABCDDS.Dock = DockStyle.Fill;
-                            m_ReportApp.m_TablesWindow.Controls.Add(m_ReportApp.im_ChineseStandardABCDDS);
-                            m_ReportApp.m_TablesWindow.Activate();
-
-
-                            //OpenOTSINcAreportTemplateAPP(m_RstProp.m_ReportApp.m_DataMgrFun.resultFilesList[m_RstProp.m_ReportApp.m_DataMgrFun.WorkingResult].FilePath+"\\"
-                            //    + m_RstProp.m_ReportApp.m_DataMgrFun.resultFilesList[m_RstProp.m_ReportApp.m_DataMgrFun.WorkingResult].FileName, "GB1");
-                            break;
-                        case CALCULATE_TABLE_TYPE.GB_Method2:
-                            //国标二
-                            string resultfile2 = m_rstDataMgr.ResultFilesList[m_rstDataMgr.GetWorkingResult()].FilePath + "\\"
-                                 + m_rstDataMgr.ResultFilesList[m_rstDataMgr.GetWorkingResult()].FileName;
-
-                            m_ReportApp.m_rstDataMgr.m_ReportMgr.AddASmplMsrResultMgr(resultfile2);
-
-                            OTSCLRINTERFACE.CPropParamClr clr_prop2 = m_ReportApp.m_rstDataMgr.m_ReportMgr.GetPropertyParamTable();
-                            clr_prop2.SetDataSourceId(0);//
-                            clr_prop2.SetType((int)DisplayPicutureType.AnalyzeDataTable);//table
-                            clr_prop2.SetCalTableType((int)CALCULATE_TABLE_TYPE.GB_Method2);//国标2  
-                            List<OTSCLRINTERFACE.CGridDataClr> listGriddataclr2 = m_ReportApp.m_rstDataMgr.m_ReportMgr.GridDataTransfer(clr_prop2);//
-
-                            m_ReportApp.m_TablesWindow.Controls.Clear();
-                            m_ReportApp.im_NationalStandardMethodTwo = new NationalStandardMethodTwo(m_ReportApp.m_rstDataMgr.m_ReportMgr, listGriddataclr2);
-                            m_ReportApp.im_NationalStandardMethodTwo.Dock = DockStyle.Fill;
-                            m_ReportApp.m_TablesWindow.Controls.Add(m_ReportApp.im_NationalStandardMethodTwo);
-                            m_ReportApp.m_TablesWindow.Activate();
-                            //OpenOTSINcAreportTemplateAPP(m_RstProp.m_ReportApp.m_DataMgrFun.resultFilesList[m_RstProp.m_ReportApp.m_DataMgrFun.WorkingResult].FilePath + "\\"
-                            //    + m_RstProp.m_ReportApp.m_DataMgrFun.resultFilesList[m_RstProp.m_ReportApp.m_DataMgrFun.WorkingResult].FileName, "GB2");
-                            break;
-                        case CALCULATE_TABLE_TYPE.ASTM:
-                            //美标
-                            string resultfile3 = m_rstDataMgr.ResultFilesList[m_rstDataMgr.GetWorkingResult()].FilePath + "\\"
-                                + m_rstDataMgr.ResultFilesList[m_rstDataMgr.GetWorkingResult()].FileName;
-
-                            m_ReportApp.m_rstDataMgr.m_ReportMgr.AddASmplMsrResultMgr(resultfile3);
-
-                            OTSCLRINTERFACE.CPropParamClr clr_prop3 = m_ReportApp.m_rstDataMgr.m_ReportMgr.GetPropertyParamTable();
-                            clr_prop3.SetDataSourceId(0);//
-                            clr_prop3.SetType((int)DisplayPicutureType.AnalyzeDataTable);//table
-                            clr_prop3.SetCalTableType((int)CALCULATE_TABLE_TYPE.ASTM);
-                            List<OTSCLRINTERFACE.CGridDataClr> listGriddataclr3 = m_ReportApp.m_rstDataMgr.m_ReportMgr.GridDataTransfer(clr_prop3);
-
-                            m_ReportApp.m_TablesWindow.Controls.Clear();
-                            m_ReportApp.im_ASTMStandardABCDDS = new ASTMStandardABCDDS(m_ReportApp.m_rstDataMgr.m_ReportMgr, listGriddataclr3);
-                            m_ReportApp.im_ASTMStandardABCDDS.Dock = DockStyle.Fill;
-                            m_ReportApp.m_TablesWindow.Controls.Add(m_ReportApp.im_ASTMStandardABCDDS);
-                            m_ReportApp.m_TablesWindow.Activate();
-                            //OpenOTSINcAreportTemplateAPP(m_RstProp.m_ReportApp.m_DataMgrFun.resultFilesList[m_RstProp.m_ReportApp.m_DataMgrFun.WorkingResult].FilePath + "\\"
-                            //    + m_RstProp.m_ReportApp.m_DataMgrFun.resultFilesList[m_RstProp.m_ReportApp.m_DataMgrFun.WorkingResult].FileName, "ASTM");
-                            break;
-                        case CALCULATE_TABLE_TYPE.DIN:
-                            //德标
-                            string resultfile4 = m_rstDataMgr.ResultFilesList[m_rstDataMgr.GetWorkingResult()].FilePath + "\\"
-                               + m_rstDataMgr.ResultFilesList[m_rstDataMgr.GetWorkingResult()].FileName;
-
-                            m_ReportApp.m_rstDataMgr.m_ReportMgr.AddASmplMsrResultMgr(resultfile4);
-
-                            OTSCLRINTERFACE.CPropParamClr clr_prop4 = m_ReportApp.m_rstDataMgr.m_ReportMgr.GetPropertyParamTable();
-                            clr_prop4.SetDataSourceId(0);//
-                            clr_prop4.SetType((int)DisplayPicutureType.AnalyzeDataTable);//table
-                            clr_prop4.SetCalTableType((int)CALCULATE_TABLE_TYPE.DIN);
-                            List<OTSCLRINTERFACE.CGridDataClr> listGriddataclr4 = m_ReportApp.m_rstDataMgr.m_ReportMgr.GridDataTransfer(clr_prop4);
-
-                            m_ReportApp.m_TablesWindow.Controls.Clear();
-                            m_ReportApp.im_DINStandardABCDDS = new DINStandardABCDDS(m_ReportApp.m_rstDataMgr.m_ReportMgr, listGriddataclr4);
-                            m_ReportApp.im_DINStandardABCDDS.Dock = DockStyle.Fill;
-                            m_ReportApp.m_TablesWindow.Controls.Add(m_ReportApp.im_DINStandardABCDDS);
-                            m_ReportApp.m_TablesWindow.Activate();
-                            //OpenOTSINcAreportTemplateAPP(m_RstProp.m_ReportApp.m_DataMgrFun.resultFilesList[m_RstProp.m_ReportApp.m_DataMgrFun.WorkingResult].FilePath + "\\"
-                            //    + m_RstProp.m_ReportApp.m_DataMgrFun.resultFilesList[m_RstProp.m_ReportApp.m_DataMgrFun.WorkingResult].FileName, "DIN");
-                            break;
+                            break;                        
                     }
 
                     #endregion 第二页选项窗体，分析数据表
@@ -824,21 +732,21 @@ namespace OTSIncAReportApp
                             m_ReportApp.m_ChartsWindow.Controls.Add(m_ReportApp.im_EChart_ParticlesComposition);
                             m_ReportApp.m_ChartsWindow.Activate();
                             break;
-                        case CALCULATE_CHART_TYPE.TRIO_CHART:
+                        //case CALCULATE_CHART_TYPE.TRIO_CHART:
 
-                            //idx = m_RstProp. m_ReportApp.m_DataMgrFun.GetPropIndexByPropItemName(m_RstProp. SourceGridData.ConditionItemList, OTSIncAReportApp.OTSSampleReportInfo.OTS_REPORT_PROP_GRID_ITEMS.TRIO_CHART_TYPE);
-                            //string TrioChartType = prop.ConditionItemList[idx].itemVal.ToString();
-                            //List<string> nameList = prop.ConditionItemList[idx].comboDownList;
-                            int index = prop.GetComboDownListIndexByItemName(OTS_REPORT_PROP_GRID_ITEMS.TRIO_CHART_TYPE);
+                        //    //idx = m_RstProp. m_ReportApp.m_DataMgrFun.GetPropIndexByPropItemName(m_RstProp. SourceGridData.ConditionItemList, OTSIncAReportApp.OTSSampleReportInfo.OTS_REPORT_PROP_GRID_ITEMS.TRIO_CHART_TYPE);
+                        //    //string TrioChartType = prop.ConditionItemList[idx].itemVal.ToString();
+                        //    //List<string> nameList = prop.ConditionItemList[idx].comboDownList;
+                        //    int index = prop.GetComboDownListIndexByItemName(OTS_REPORT_PROP_GRID_ITEMS.TRIO_CHART_TYPE);
 
-                            str_operatonmodule = resTable["str_operatonmodule5"].ToString();
+                        //    str_operatonmodule = resTable["str_operatonmodule5"].ToString();
 
-                            m_ReportApp.im_EChart_Trianglediagram = new Control_ECharts.EChart_Trianglediagram(m_ReportApp);
-                            m_ReportApp.im_EChart_Trianglediagram.Template = "";
-                            m_ReportApp.im_EChart_Trianglediagram.Dock = DockStyle.Fill;
-                            m_ReportApp.m_ChartsWindow.Controls.Add(m_ReportApp.im_EChart_Trianglediagram);
-                            m_ReportApp.m_ChartsWindow.Activate();
-                            break;
+                        //    m_ReportApp.im_EChart_Trianglediagram = new Control_ECharts.EChart_Trianglediagram(m_ReportApp);
+                        //    m_ReportApp.im_EChart_Trianglediagram.Template = "";
+                        //    m_ReportApp.im_EChart_Trianglediagram.Dock = DockStyle.Fill;
+                        //    m_ReportApp.m_ChartsWindow.Controls.Add(m_ReportApp.im_EChart_Trianglediagram);
+                        //    m_ReportApp.m_ChartsWindow.Activate();
+                        //    break;
 
                         case CALCULATE_CHART_TYPE.INCLUSION_AREA_RATIO:
                             m_reportname = "夹杂物面积比";

OTSIncAReportApp/1-UI/OTSTemplateDesigner/OTSReport_TemplateDesignerRM.Designer.cs

@@ -430,7 +430,7 @@
             // button3
             // 
             this.button3.Location = new System.Drawing.Point(269, 64);
-            this.button3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.button3.Margin = new System.Windows.Forms.Padding(4);
             this.button3.Name = "button3";
             this.button3.Size = new System.Drawing.Size(73, 29);
             this.button3.TabIndex = 60;
@@ -442,7 +442,7 @@
             // 
             this.comboBox_PeriodicTable.FormattingEnabled = true;
             this.comboBox_PeriodicTable.Location = new System.Drawing.Point(21, 116);
-            this.comboBox_PeriodicTable.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.comboBox_PeriodicTable.Margin = new System.Windows.Forms.Padding(4);
             this.comboBox_PeriodicTable.Name = "comboBox_PeriodicTable";
             this.comboBox_PeriodicTable.Size = new System.Drawing.Size(187, 23);
             this.comboBox_PeriodicTable.TabIndex = 59;
@@ -499,7 +499,7 @@
             this.groupBox7.Controls.Add(this.label38);
             this.groupBox7.Controls.Add(this.label33);
             this.groupBox7.Controls.Add(this.label42);
-            this.groupBox7.Location = new System.Drawing.Point(4, 948);
+            this.groupBox7.Location = new System.Drawing.Point(1567, 152);
             this.groupBox7.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.groupBox7.Name = "groupBox7";
             this.groupBox7.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
@@ -507,6 +507,7 @@
             this.groupBox7.TabIndex = 7;
             this.groupBox7.TabStop = false;
             this.groupBox7.Text = "三元相图";
+            this.groupBox7.Visible = false;
             // 
             // lbv_syxt_mblb
             // 
@@ -574,7 +575,7 @@
             // label33
             // 
             this.label33.AutoSize = true;
-            this.label33.Location = new System.Drawing.Point(21, 222);
+            this.label33.Location = new System.Drawing.Point(18, 220);
             this.label33.Name = "label33";
             this.label33.Size = new System.Drawing.Size(127, 15);
             this.label33.TabIndex = 41;
@@ -599,7 +600,7 @@
             this.groupBox8.Controls.Add(this.label31);
             this.groupBox8.Controls.Add(this.label30);
             this.groupBox8.Controls.Add(this.label34);
-            this.groupBox8.Location = new System.Drawing.Point(4, 1541);
+            this.groupBox8.Location = new System.Drawing.Point(3, 940);
             this.groupBox8.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.groupBox8.Name = "groupBox8";
             this.groupBox8.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
@@ -717,7 +718,7 @@
             this.panel2.Controls.Add(this.pictureBox2);
             this.panel2.Controls.Add(this.pictureBox1);
             this.panel2.Location = new System.Drawing.Point(16, 15);
-            this.panel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.panel2.Margin = new System.Windows.Forms.Padding(4);
             this.panel2.Name = "panel2";
             this.panel2.Size = new System.Drawing.Size(928, 882);
             this.panel2.TabIndex = 73;
@@ -790,7 +791,7 @@
             // 
             this.pictureBox8.Image = global::OTSIncAReportApp.Properties.Resources.颗粒列表;
             this.pictureBox8.Location = new System.Drawing.Point(4, 7161);
-            this.pictureBox8.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.pictureBox8.Margin = new System.Windows.Forms.Padding(4);
             this.pictureBox8.Name = "pictureBox8";
             this.pictureBox8.Size = new System.Drawing.Size(897, 1192);
             this.pictureBox8.TabIndex = 8;
@@ -800,7 +801,7 @@
             // 
             this.pictureBox6.Image = global::OTSIncAReportApp.Properties.Resources.三元相图;
             this.pictureBox6.Location = new System.Drawing.Point(4, 5961);
-            this.pictureBox6.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.pictureBox6.Margin = new System.Windows.Forms.Padding(4);
             this.pictureBox6.Name = "pictureBox6";
             this.pictureBox6.Size = new System.Drawing.Size(897, 1192);
             this.pictureBox6.TabIndex = 6;
@@ -810,7 +811,7 @@
             // 
             this.pictureBox5.Image = global::OTSIncAReportApp.Properties.Resources.元素成分图;
             this.pictureBox5.Location = new System.Drawing.Point(4, 4768);
-            this.pictureBox5.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.pictureBox5.Margin = new System.Windows.Forms.Padding(4);
             this.pictureBox5.Name = "pictureBox5";
             this.pictureBox5.Size = new System.Drawing.Size(897, 1192);
             this.pictureBox5.TabIndex = 5;
@@ -820,7 +821,7 @@
             // 
             this.pictureBox4.Image = global::OTSIncAReportApp.Properties.Resources.元素分析表;
             this.pictureBox4.Location = new System.Drawing.Point(4, 3575);
-            this.pictureBox4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.pictureBox4.Margin = new System.Windows.Forms.Padding(4);
             this.pictureBox4.Name = "pictureBox4";
             this.pictureBox4.Size = new System.Drawing.Size(897, 1192);
             this.pictureBox4.TabIndex = 4;
@@ -830,7 +831,7 @@
             // 
             this.pictureBox3.Image = global::OTSIncAReportApp.Properties.Resources.颗粒成分图;
             this.pictureBox3.Location = new System.Drawing.Point(4, 2384);
-            this.pictureBox3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.pictureBox3.Margin = new System.Windows.Forms.Padding(4);
             this.pictureBox3.Name = "pictureBox3";
             this.pictureBox3.Size = new System.Drawing.Size(897, 1192);
             this.pictureBox3.TabIndex = 3;
@@ -840,7 +841,7 @@
             // 
             this.pictureBox2.Image = global::OTSIncAReportApp.Properties.Resources.颗粒尺寸分析结果;
             this.pictureBox2.Location = new System.Drawing.Point(4, 1191);
-            this.pictureBox2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.pictureBox2.Margin = new System.Windows.Forms.Padding(4);
             this.pictureBox2.Name = "pictureBox2";
             this.pictureBox2.Size = new System.Drawing.Size(897, 1192);
             this.pictureBox2.TabIndex = 2;
@@ -850,7 +851,7 @@
             // 
             this.pictureBox1.Image = global::OTSIncAReportApp.Properties.Resources.报表首页加样品说明;
             this.pictureBox1.Location = new System.Drawing.Point(4, 4);
-            this.pictureBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.pictureBox1.Margin = new System.Windows.Forms.Padding(4);
             this.pictureBox1.Name = "pictureBox1";
             this.pictureBox1.Size = new System.Drawing.Size(897, 1192);
             this.pictureBox1.TabIndex = 1;
@@ -859,16 +860,15 @@
             // panel3
             // 
             this.panel3.AutoScroll = true;
-            this.panel3.Controls.Add(this.groupBox7);
             this.panel3.Controls.Add(this.groupBox8);
             this.panel3.Controls.Add(this.groupBox6);
             this.panel3.Controls.Add(this.groupBox9);
             this.panel3.Controls.Add(this.groupBox4);
             this.panel3.Controls.Add(this.groupBox1);
             this.panel3.Location = new System.Drawing.Point(952, 92);
-            this.panel3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.panel3.Margin = new System.Windows.Forms.Padding(4);
             this.panel3.Name = "panel3";
-            this.panel3.Size = new System.Drawing.Size(399, 818);
+            this.panel3.Size = new System.Drawing.Size(383, 805);
             this.panel3.TabIndex = 74;
             // 
             // groupBox9
@@ -886,9 +886,9 @@
             this.groupBox9.Controls.Add(this.label1);
             this.groupBox9.Controls.Add(this.label3);
             this.groupBox9.Location = new System.Drawing.Point(4, 4);
-            this.groupBox9.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.groupBox9.Margin = new System.Windows.Forms.Padding(4);
             this.groupBox9.Name = "groupBox9";
-            this.groupBox9.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.groupBox9.Padding = new System.Windows.Forms.Padding(4);
             this.groupBox9.Size = new System.Drawing.Size(357, 319);
             this.groupBox9.TabIndex = 1;
             this.groupBox9.TabStop = false;
@@ -910,7 +910,8 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1383, 939);
+            this.ClientSize = new System.Drawing.Size(1348, 939);
+            this.Controls.Add(this.groupBox7);
             this.Controls.Add(this.button6);
             this.Controls.Add(this.button1);
             this.Controls.Add(this.label39);

OTSIncAReportApp/1-UI/frmReportApp.Designer.cs

@@ -57,7 +57,6 @@
             this.dpbExport = new System.Windows.Forms.RibbonOrbMenuItem();
             this.dpbCopy = new System.Windows.Forms.RibbonOrbMenuItem();
             this.dpbCopyAll = new System.Windows.Forms.RibbonOrbMenuItem();
-            this.ribbonOrbMenuItem_Extremum = new System.Windows.Forms.RibbonOrbMenuItem();
             this.ribbonOrbOptionButton1 = new System.Windows.Forms.RibbonOrbOptionButton();
             this.ribbonOrbRecentItem1 = new System.Windows.Forms.RibbonOrbRecentItem();
             this.ribbonTab1 = new System.Windows.Forms.RibbonTab();
@@ -186,7 +185,7 @@
             // 
             this.ribbon1.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.ribbon1.Location = new System.Drawing.Point(0, 0);
-            this.ribbon1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.ribbon1.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
             this.ribbon1.Minimized = false;
             this.ribbon1.Name = "ribbon1";
             // 
@@ -198,11 +197,10 @@
             this.ribbon1.OrbDropDown.MenuItems.Add(this.dpbExport);
             this.ribbon1.OrbDropDown.MenuItems.Add(this.dpbCopy);
             this.ribbon1.OrbDropDown.MenuItems.Add(this.dpbCopyAll);
-            this.ribbon1.OrbDropDown.MenuItems.Add(this.ribbonOrbMenuItem_Extremum);
             this.ribbon1.OrbDropDown.Name = "";
             this.ribbon1.OrbDropDown.OptionItems.Add(this.ribbonOrbOptionButton1);
             this.ribbon1.OrbDropDown.RecentItems.Add(this.ribbonOrbRecentItem1);
-            this.ribbon1.OrbDropDown.Size = new System.Drawing.Size(527, 292);
+            this.ribbon1.OrbDropDown.Size = new System.Drawing.Size(527, 248);
             this.ribbon1.OrbDropDown.TabIndex = 0;
             this.ribbon1.OrbImage = global::OTSIncAReportApp.Properties.Resources.logo_40;
             // 
@@ -215,7 +213,7 @@
             this.ribbon1.QuickAcessToolbar.ToolTip = null;
             this.ribbon1.QuickAcessToolbar.ToolTipImage = null;
             this.ribbon1.QuickAcessToolbar.ToolTipTitle = null;
-            this.ribbon1.Size = new System.Drawing.Size(1914, 130);
+            this.ribbon1.Size = new System.Drawing.Size(1701, 130);
             this.ribbon1.TabIndex = 0;
             this.ribbon1.Tabs.Add(this.ribbonTab1);
             this.ribbon1.Tabs.Add(this.rbMenu);
@@ -282,21 +280,6 @@
             this.dpbCopyAll.ToolTipTitle = null;
             this.dpbCopyAll.Click += new System.EventHandler(this.ribbonOrbMenuItem8_Click);
             // 
-            // ribbonOrbMenuItem_Extremum
-            // 
-            this.ribbonOrbMenuItem_Extremum.AltKey = null;
-            this.ribbonOrbMenuItem_Extremum.DropDownArrowDirection = System.Windows.Forms.RibbonArrowDirection.Left;
-            this.ribbonOrbMenuItem_Extremum.DropDownArrowSize = new System.Drawing.Size(5, 3);
-            this.ribbonOrbMenuItem_Extremum.Image = global::OTSIncAReportApp.Properties.Resources.Mouse;
-            this.ribbonOrbMenuItem_Extremum.SmallImage = global::OTSIncAReportApp.Properties.Resources.Mouse;
-            this.ribbonOrbMenuItem_Extremum.Style = System.Windows.Forms.RibbonButtonStyle.Normal;
-            this.ribbonOrbMenuItem_Extremum.Tag = null;
-            this.ribbonOrbMenuItem_Extremum.Text = "极值分析法";
-            this.ribbonOrbMenuItem_Extremum.ToolTip = null;
-            this.ribbonOrbMenuItem_Extremum.ToolTipImage = null;
-            this.ribbonOrbMenuItem_Extremum.ToolTipTitle = null;
-            this.ribbonOrbMenuItem_Extremum.Click += new System.EventHandler(this.ribbonOrbMenuItem_Extremum_Click);
-            // 
             // ribbonOrbOptionButton1
             // 
             this.ribbonOrbOptionButton1.AltKey = null;
@@ -569,11 +552,11 @@
             this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.RSGrayVal,
             this.mouseMatter});
-            this.statusStrip1.Location = new System.Drawing.Point(0, 1003);
+            this.statusStrip1.Location = new System.Drawing.Point(0, 835);
             this.statusStrip1.Name = "statusStrip1";
-            this.statusStrip1.Padding = new System.Windows.Forms.Padding(14, 0, 2, 0);
+            this.statusStrip1.Padding = new System.Windows.Forms.Padding(12, 0, 2, 0);
             this.statusStrip1.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
-            this.statusStrip1.Size = new System.Drawing.Size(1914, 35);
+            this.statusStrip1.Size = new System.Drawing.Size(1701, 30);
             this.statusStrip1.TabIndex = 4;
             this.statusStrip1.Text = "statusStrip1";
             // 
@@ -581,14 +564,14 @@
             // 
             this.RSGrayVal.BorderSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.Right;
             this.RSGrayVal.Name = "RSGrayVal";
-            this.RSGrayVal.Size = new System.Drawing.Size(68, 28);
+            this.RSGrayVal.Size = new System.Drawing.Size(58, 24);
             this.RSGrayVal.Text = "灰度值";
             // 
             // mouseMatter
             // 
             this.mouseMatter.BorderSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.Right;
             this.mouseMatter.Name = "mouseMatter";
-            this.mouseMatter.Size = new System.Drawing.Size(122, 28);
+            this.mouseMatter.Size = new System.Drawing.Size(103, 24);
             this.mouseMatter.Text = "鼠标点的物质";
             // 
             // DockWindowPanel
@@ -597,8 +580,9 @@
             this.DockWindowPanel.Dock = System.Windows.Forms.DockStyle.Fill;
             this.DockWindowPanel.DockBackColor = System.Drawing.SystemColors.Control;
             this.DockWindowPanel.Location = new System.Drawing.Point(0, 130);
+            this.DockWindowPanel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.DockWindowPanel.Name = "DockWindowPanel";
-            this.DockWindowPanel.Size = new System.Drawing.Size(1914, 873);
+            this.DockWindowPanel.Size = new System.Drawing.Size(1701, 705);
             dockPanelGradient1.EndColor = System.Drawing.SystemColors.ControlLight;
             dockPanelGradient1.StartColor = System.Drawing.SystemColors.ControlLight;
             autoHideStripSkin1.DockStripGradient = dockPanelGradient1;
@@ -689,15 +673,15 @@
             // 
             // frmReportApp
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1914, 1038);
+            this.ClientSize = new System.Drawing.Size(1701, 865);
             this.Controls.Add(this.DockWindowPanel);
             this.Controls.Add(this.statusStrip1);
             this.Controls.Add(this.ribbon1);
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.IsMdiContainer = true;
-            this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
             this.Name = "frmReportApp";
             this.Text = "报告程序";
             this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
@@ -757,7 +741,6 @@
         public System.Windows.Forms.RibbonOrbMenuItem dpbUnDo;
         public System.Windows.Forms.RibbonOrbMenuItem dpbReDo;
         private System.Windows.Forms.ToolTip toolTip1;
-        public System.Windows.Forms.RibbonOrbMenuItem ribbonOrbMenuItem_Extremum;
         private System.Windows.Forms.RibbonPanel ribbonPanelOthers;
         public System.Windows.Forms.RibbonButton ribbonButton3;
         public System.Windows.Forms.RibbonButton rbHelp;

OTSIncAReportApp/1-UI/frmReportApp.cs

@@ -249,7 +249,6 @@ namespace OTSIncAReportApp
             dpbCopy.Tag = "dpbCopy";
             dpbCopyAll.Tag = "dpbCopyAll";
             ribbonOrbOptionButton1.Tag = "ribbonOrbOptionButton1";
-            ribbonOrbMenuItem_Extremum.Tag = "ribbonOrbMenuItem_Extremum";
         }
 
         /// <summary>
@@ -1087,14 +1086,14 @@ namespace OTSIncAReportApp
                         //    im_ParticalesSizeDistributionChart.CopyToBitmap();
                         //}
                     }
-                    if (DisType == (int)CALCULATE_CHART_TYPE.TRIO_CHART)
-                    {
-                        //if (im_Trianglediagram != null)
-                        //{
-                        //    //三角图
-                        //    im_Trianglediagram.CopyToBitmap();
-                        //}
-                    }
+                    //if (DisType == (int)CALCULATE_CHART_TYPE.TRIO_CHART)
+                    //{
+                    //    //if (im_Trianglediagram != null)
+                    //    //{
+                    //    //    //三角图
+                    //    //    im_Trianglediagram.CopyToBitmap();
+                    //    //}
+                    //}
                     break;
                 default:
                     break;
@@ -1192,14 +1191,14 @@ namespace OTSIncAReportApp
                         //    im_ParticalesSizeDistributionChart.CopyToBitmap();
                         //}
                     }
-                    if (DisType == (int)CALCULATE_CHART_TYPE.TRIO_CHART)
-                    {
-                        //if (im_Trianglediagram != null)
-                        //{
-                        //    //三角图
-                        //    im_Trianglediagram.CopyToBitmap();
-                        //}
-                    }
+                    //if (DisType == (int)CALCULATE_CHART_TYPE.TRIO_CHART)
+                    //{
+                    //    //if (im_Trianglediagram != null)
+                    //    //{
+                    //    //    //三角图
+                    //    //    im_Trianglediagram.CopyToBitmap();
+                    //    //}
+                    //}
                     break;
                 default:
                     break;

OTSSysMgrApp/OTSSystemManagerForms.cs

@@ -56,17 +56,17 @@ namespace OTSSysMgrApp
             }
             //国际化
             lan = new OTSSysMgrTools.Language(this);
-            table = lan.GetNameTable(this.Name);
-             message1 = table["message1"].ToString();
-             message2 = table["message2"].ToString();
-             message3 = table["message3"].ToString();
-             message4 = table["message4"].ToString();
-             message5 = table["message5"].ToString();
-             message6 = table["message6"].ToString();
-             message7 = table["message7"].ToString();
-             message8 = table["message8"].ToString();
-             message9 = table["message9"].ToString();
-            message10 = table["message10"].ToString();
+            //table = lan.GetNameTable(this.Name);
+            // message1 = table["message1"].ToString();
+            // message2 = table["message2"].ToString();
+            // message3 = table["message3"].ToString();
+            // message4 = table["message4"].ToString();
+            // message5 = table["message5"].ToString();
+            // message6 = table["message6"].ToString();
+            // message7 = table["message7"].ToString();
+            // message8 = table["message8"].ToString();
+            // message9 = table["message9"].ToString();
+            //message10 = table["message10"].ToString();
 
             rdb_ch.Checked = true;
         }