瀏覽代碼

处理清洁度启动报错的bug

cxs 11 月之前
父節點
當前提交
edb2b6e9ce

+ 1 - 1
Bin/x64/Debug/Config/SysData/OTSProgMgrParam.pmf

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<XMLData RunMode="ProfessionalMode" SysType="CleannessA">
+<XMLData RunMode="ProfessionalMode" SysType="IncA">
   <Member RegName="GenParam" DefaultArea="100" DefaultSampleName="Sample" DefaultShape="0" MeasParamFileFolderName=".\Config\ProData\" MeasSwitch="true" PartSTDLibFolderName=".\Config\SysData\" PropertyDisplayMode="0" StdLibFileName="NoSTDDB" SteelTechnology="0" UseSysSTD="true" />
   <Member RegName="ImageProcParam" AutoBGRemoveType="0:MIDDLE" BGRemoveType="1:MANUAL" OverlapParam="0" ParticleSelectionCondition="">
     <Member RegName="BGGray" end="255" start="80" />

+ 1 - 1
Bin/x64/Debug/Config/SysData/OTSReportMgrParam.rpf

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<XMLData systype="CleannessA">
+<XMLData systype="IncA">
   <Member RegName="Scale" strValue="1000" />
   <Member RegName="DefaultComputedColName" strValue="Area,EquivalentCircleDiameter,MaxDiameter,MinDiameter,DiameterRatio,FerretDiameter,PERP,PERI,INSCR,MEAN,ELONG,ASPECT_ELONG,Orientation" />
   <Member RegName="ElementsColName" strValue="C,O,Al,Fe,F,Ti,Na,Mn,Mg" />

+ 14 - 16
OTSIncAMeasureApp/OTSIncAMeasureAppForm.cs

@@ -275,24 +275,22 @@ namespace OTSMeasureApp
         }
         private void DoSplash()
         {
-            
-                string path = @".\Config\SysData\OTSProgMgrParam.pmf";
-                XmlDocument xmlDocument = new XmlDocument();
-                xmlDocument.Load(path);
-                XmlNode node = xmlDocument.SelectSingleNode("XMLData");
-                XmlElement xe = (XmlElement)node;
-                string str = xe.GetAttribute("SysType");
-                if (str == "IncA")
-                {
-                 sp = new OTSSplashScreen_IncA();
+            string path = @".\Config\SysData\OTSProgMgrParam.pmf";
+            XmlDocument xmlDocument = new XmlDocument();
+            xmlDocument.Load(path);
+            XmlNode node = xmlDocument.SelectSingleNode("XMLData");
+            XmlElement xe = (XmlElement)node;
+            string str = xe.GetAttribute("SysType");
+            if (str == "IncA")
+            {
+                sp = new OTSSplashScreen_IncA();
                 sp.ShowDialog();
-                }
-                else if (str == "CleannessA")
-                {
-                 sp = new OTSSplashScreen_Cleanness();
+            }
+            else if (str == "TCCleannessA" || str == "BatteryCleannessA")
+            {
+                sp = new OTSSplashScreen_Cleanness();
                 sp.ShowDialog();
-                }
-            
+            }
         }
 
         private void rbReport_Click(object sender, EventArgs e)