Browse Source

Fix bug - The measurement program loads the saved measurement file system interface showing the corresponding startup mode

CXS 3 years ago
parent
commit
654b6537bf

+ 1 - 1
OTSIncAMeasureApp/0-OTSModel/Measure/GetBSEPic/CSmplMeasure.cs

@@ -299,7 +299,7 @@ namespace OTSModelSharp
 
             return true;
         }
-
+        
         public  void SetWorkingFolder(String a_strWorkingFolder)
         {
             // add "\\" at the string end if it is not "\\"

+ 9 - 1
OTSIncAMeasureApp/0-OTSModel/Measure/GetParamData/COTSMsrPrjResultData.cs

@@ -146,6 +146,7 @@ namespace OTSModelSharp
             doc.Load(strPathName);
             XmlNode root = doc.SelectSingleNode("XMLData");
             Serialize(false, doc, root);
+
             //设置测量项目文件路径
             m_strPathName = strPathName;
             //-------------
@@ -1604,7 +1605,14 @@ namespace OTSModelSharp
                 {
                     m_listSamples.Add(xsamples.getItem(i));
                 }
-
+                if(xSystype.value()== "IncA")
+                {
+                    m_nPackId = otsdataconst.OTS_SysType_ID.IncA;
+                }
+                else 
+                {
+                    m_nPackId = otsdataconst.OTS_SysType_ID.CleanlinessA;
+                }
             }
 
         }

+ 9 - 1
OTSIncAMeasureApp/OTSIncAMeasureAppForm.cs

@@ -548,7 +548,15 @@ namespace OTSMeasureApp
             if (SMInfo.sSampleSoluName != "")
             {
                 string str = table[this.Name.ToLower()].ToString();
-                this.Text = str + "-" + SMInfo.sSampleSoluName;
+                //this.Text = str + "-" + SMInfo.sSampleSoluName;
+                if (m_ProjParam.m_ResultData.m_nPackId.ToString() == "IncA")
+                {
+                    this.Text = str + " -- Inclusion Analysis System";
+                }
+                else if (m_ProjParam.m_ResultData.m_nPackId.ToString() == "CleanlinessA")
+                {
+                    this.Text = str + " -- Cleanliness Analysis System";
+                }
             }
             if ("" == sWSampleName)
             {