修改 根据系统启动模式 添加国标

Bin/x64/Debug/Config/SysData/OTSProgMgrParam.pmf

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<XMLData RunMode="ProfessionalMode" SysType="IncA">
+<XMLData RunMode="ProfessionalMode" SysType="CleanlinessA">
   <Member RegName="GenParam" DefaultArea="100" DefaultSampleName="Sample" DefaultShape="0" MeasParamFileFolderName=".\Config\ProData\" MeasSwitch="true" PartSTDLibFolderName=".\Config\SysData\" PropertyDisplayMode="0" StdLibFileName="Baohuzha" StdLibTypeIndex="0" SteelTechnology="0" UseSysSTD="true" />
   <Member RegName="ImageProcParam" m_autoBGRemoveType="0" m_BGRemoveType="0">
     <Member RegName="BGGray" end="255" start="150" />

OTSIncAReportApp/FunctionClass/OTSDataMgrFunction/DataMgrFun.cs

@@ -359,7 +359,13 @@ namespace OTSIncAReportApp.OTSDataMgrFunction
 
                 //数据表类型
                 string sSCaptionName10 = table["sscaptionname10"].ToString();
-                List<string> list2 = new List<string>() { table["sscaptionname25"].ToString(), table["sscaptionname26"].ToString(), table["sscaptionname27"].ToString(), table["sscaptionname28"].ToString(), table["sscaptionname29"].ToString(), table["sscaptionname30"].ToString(), "国标一", "国标二", "美标", "德标" };
+                List<string> list2 = new List<string>() { table["sscaptionname25"].ToString(), table["sscaptionname26"].ToString(), table["sscaptionname27"].ToString(), table["sscaptionname28"].ToString(), table["sscaptionname29"].ToString(), table["sscaptionname30"].ToString()};
+                string[] aa = m_ReportApp.Text.Split('-');
+                if(aa[aa.Count()-1]== " Inclusion Analysis System")
+                {
+                    List<string> listStd = new List<string>() {"国标一", "国标二", "美标", "德标" };
+                    list2.AddRange(listStd);
+                }
                 SampleData sampleData3 = new SampleData();
                 sampleData3.iItemId = OTS_REPORT_PROP_GRID_ITEMS.CALCULATE_TABLE_TYPE;
                 sampleData3.sSCaptionName = sSCaptionName10;

OTSIncAReportApp/frmMeasureRstMgr.cs

@@ -320,6 +320,17 @@ namespace OTSIncAReportApp
                 return;
             }
 
+            //添加启动系统界面显示
+            string SystemMode = ((Dictionary<string, object>)((Dictionary<string, object>)((Dictionary<string, object>)suggestions["Sample"])["Members"])["MsrParams"])["SysType"].ToString();
+            if (SystemMode == "IncA")
+            {
+                m_ReportApp.Text = m_ReportApp.Text.Split(' ')[0] + " -- Inclusion Analysis System";
+            }
+            else if (SystemMode == "CleanlinessA")
+            {
+                m_ReportApp.Text = m_ReportApp.Text.Split(' ')[0] + " -- Cleanliness Analysis System";
+            }
+
             DataOperation.Model.ResultFile result = new DataOperation.Model.ResultFile()
             {
                 FileId = workingid.ToString(),
@@ -367,16 +378,7 @@ namespace OTSIncAReportApp
 
                 m_ReportApp.m_PropWindow.DisProperyWindow(SMeasureInfo);//刷新
             }
-            //添加启动系统界面显示
-            string SystemMode = ((Dictionary<string, object>)((Dictionary<string, object>)((Dictionary<string, object>)suggestions["Sample"])["Members"])["MsrParams"])["SysType"].ToString();
-            if(SystemMode=="IncA")
-            {
-                m_ReportApp.Text = m_ReportApp.Text.Split(' ')[0] + " -- Inclusion Analysis System";
-            }
-            else if (SystemMode == "CleanlinessA")
-            {
-                m_ReportApp.Text = m_ReportApp.Text.Split(' ')[0] + " -- Cleanliness Analysis System";
-            }
+            
             
         }