修改 清洁度 小颗粒分类 中未识别类型没有写入的bug

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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="GenParam" DefaultArea="100" DefaultSampleName="Sample" DefaultShape="0" MeasParamFileFolderName=".\Config\ProData\" MeasSwitch="true" PartSTDLibFolderName=".\Config\SysData\" PropertyDisplayMode="0" StdLibFileName="OTSCleanlinessSTD2" StdLibTypeIndex="0" SteelTechnology="0" UseSysSTD="true" />
   <Member RegName="ImageProcParam" m_autoBGRemoveType="0" m_BGRemoveType="0">
     <Member RegName="BGGray" end="255" start="150" />
     <Member RegName="IncArea" end="100" start="5" />

OTSCPP/OTSClassifyEngine/CurveCompareEngine.cpp

@@ -73,6 +73,7 @@ bool CurveCompareEngine::Classify(COTSParticlePtr particle, CPosXrayPtr xray)
 	}else
 	{
 		particle->SetType(OTS_PARTICLE_TYPE::NOT_IDENTIFIED);
+		particle->TypeName("Not Identified");
 	}
 
 	return true;

OTSIncAMeasureApp/0-OTSModel/Measure/GetParamData/COTSMsrPrjResultData.cs

@@ -1220,15 +1220,6 @@ namespace OTSModelSharp
                 //int FindFileData = 0;
                 // int file = FindFirstFile(a_strFolderName, FindFileData);
                 string path = a_strFolderName;
-                if((int)m_nPackId== 1)
-                {
-                    path += "Cleanliness\\";
-                }
-                else if((int)m_nPackId == 0)
-                {
-                    path += "IncA\\";
-                }
-
                 List<string> lineStringList = new List<string>();//存储所有读取到的文件
                 DirectoryInfo[] dateDirArr = new DirectoryInfo(path).GetDirectories(); //取指定路径下的所有目录
 

OTSIncAMeasureApp/7-OTSProgMgrInfo/ProgMgrInfoForm.cs

@@ -99,15 +99,8 @@ namespace OTSMeasureApp
             IDC_COMBO_STDSelect.Items.Clear();
 
             string STDLibFolderName = m_cgenparam.GetPartSTDLibFolderName();
-            if (m_cotsprogmgrparamfile.GetSysType() == "IncA")
-            {
-                STDLibFolderName += "IncA\\";
-            }
-            else
-            {
-                STDLibFolderName += "Cleanliness\\";
-            }
-            //string[] files = System.IO.Directory.GetFiles(STDLibFolderName, "*.db");
+            
+            string[] files = System.IO.Directory.GetFiles(STDLibFolderName, "*.db");
             System.IO.DirectoryInfo folder = new System.IO.DirectoryInfo(STDLibFolderName);
             foreach (System.IO.FileInfo file in folder.GetFiles("*.db"))
             {
@@ -994,16 +987,7 @@ namespace OTSMeasureApp
             {
                 if (IDC_COMBO_STDSelect.Text != "NoSTDDB")
                 {
-                    string Currentpath = "\\Config\\SysData\\";
-                    if (m_cotsprogmgrparamfile.GetSysType() == "IncA")
-                    {
-                        Currentpath += "IncA\\";
-                    }
-                    else
-                    {
-                        Currentpath += "Cleanliness\\";
-                    }
-                    Process p = System.Diagnostics.Process.Start(".\\OTSPartA_STDEditor.exe", Application.StartupPath + Currentpath + IDC_COMBO_STDSelect.Text + ".db");
+                    Process p = System.Diagnostics.Process.Start(".\\OTSPartA_STDEditor.exe", Application.StartupPath + "\\Config\\SysData\\" + IDC_COMBO_STDSelect.Text+".db");
                     p.WaitForExit();
                 }
                 else

OTSIncAMeasureApp/OTSIncAMeasureAppForm.cs

@@ -240,21 +240,6 @@ namespace OTSMeasureApp
 
         }
 
-        private void rbSTDEdit_Click(object sender, EventArgs e)
-        {
-
-
-            try
-            {
-                System.Diagnostics.Process p = System.Diagnostics.Process.Start(".\\OTSPartA_STDEditor.exe", Application.StartupPath + "\\Config\\SysData\\" + "CurveSTDData.db");
-                p.WaitForExit();
-            }
-            catch (Exception ex)
-            {
-                log.Error("OTSPartA_STDEditor:" + ex.ToString());
-            }
-        }
-
         // sNewWorkSampleName:  新工作样品名
         public void Rev_SoluWindowReqSwitchWSample_Event(string sNewWorkSampleName)
         {
@@ -1146,16 +1131,7 @@ namespace OTSMeasureApp
         {
             OpenFileDialog openFileDialog = new OpenFileDialog();
             openFileDialog.Filter = "(*.db)|*.db";
-            string Currentpath = "\\Config\\SysData\\";
-            if (m_ProjParam.m_DefaultParam.m_nPackId.ToString() == "IncA")
-            {
-                Currentpath += "IncA\\";
-            }
-            else
-            {
-                Currentpath += "Cleanliness\\";
-            }
-            openFileDialog.InitialDirectory = Application.StartupPath + Currentpath;
+            openFileDialog.InitialDirectory = Application.StartupPath + "\\Config\\SysData\\";
             openFileDialog.RestoreDirectory = true;
             openFileDialog.FilterIndex = 1;
             if (openFileDialog.ShowDialog() == DialogResult.OK)