fix the bug of big small particle

Bin/x64/OTSOx50_30.wse

@@ -4083,19 +4083,19 @@ item: Set Variable
 end
 item: Create Shortcut
   Source=%MAINDIR%\OTSMeasureApp.exe
-  Destination=%CSTARTUPDIR%\OTSMeasureApp.lnk
+  Destination=%CGROUPDIR%\%CGROUP_SAVE%\OTSMeasureApp.lnk
   Working Directory=%MAINDIR%
   Icon Number=0
 end
 item: Create Shortcut
   Source=%MAINDIR%\OTSSysMgrApp.exe
-  Destination=%CSTARTUPDIR%\OTSSysMgrApp.lnk
+  Destination=%CGROUPDIR%\%CGROUP_SAVE%\OTSSysMgrApp.lnk
   Working Directory=%MAINDIR%
   Icon Number=0
 end
 item: Create Shortcut
   Source=%MAINDIR%\OTSIncAReportApp.exe
-  Destination=%CSTARTUPDIR%\OTSIncAReportApp.lnk
+  Destination=%CGROUPDIR%\%CGROUP_SAVE%\OTSIncAReportApp.lnk
   Working Directory=%MAINDIR%
   Icon Number=0
 end
@@ -4120,19 +4120,19 @@ end
 item: Else Statement
 end
 item: Add ProgMan Icon
-  Group=StartUp
+  Group=%GROUP%
   Icon Name=OTSSysMgrApp
   Command Line=%MAINDIR%\OTSSysMgrApp.exe
   Default Directory=%MAINDIR%
 end
 item: Add ProgMan Icon
-  Group=StartUp
+  Group=%GROUP%
   Icon Name=OTSMeasureApp
   Command Line=%MAINDIR%\OTSMeasureApp.exe
   Default Directory=%MAINDIR%
 end
 item: Add ProgMan Icon
-  Group=StartUp
+  Group=%GROUP%
   Icon Name=OTSIncAReportApp
   Command Line=%MAINDIR%\OTSIncAReportApp.exe
   Default Directory=%MAINDIR%

Bin/x64/OTSOx61_30.wse

@@ -4173,19 +4173,19 @@ item: Set Variable
 end
 item: Create Shortcut
   Source=%MAINDIR%\OTSMeasureApp.exe
-  Destination=%STARTUPDIR%\OTSMeasureApp.lnk
+  Destination=%GROUP%\OTSMeasureApp.lnk
   Working Directory=%MAINDIR%
   Icon Number=0
 end
 item: Create Shortcut
   Source=%MAINDIR%\OTSSysMgrApp.exe
-  Destination=%STARTUPDIR%\OTSSysMgrApp.lnk
+  Destination=%GROUP%\OTSSysMgrApp.lnk
   Working Directory=%MAINDIR%
   Icon Number=0
 end
 item: Create Shortcut
   Source=%MAINDIR%\OTSIncAReportApp.exe
-  Destination=%STARTUPDIR%\OTSIncAReportApp.lnk
+  Destination=%GROUP%\OTSIncAReportApp.lnk
   Working Directory=%MAINDIR%
   Icon Number=0
 end
@@ -4210,21 +4210,21 @@ end
 item: Else Statement
 end
 item: Add ProgMan Icon
-  Group=StartUp
+  Group=%GROUP%
   Icon Name=OTSSysMgrApp
   Command Line=%MAINDIR%\OTSSysMgrApp.exe
   Default Directory=%MAINDIR%
   Flags=01000000
 end
 item: Add ProgMan Icon
-  Group=StartUp
+  Group=%GROUP%
   Icon Name=OTSMeasureApp
   Command Line=%MAINDIR%\OTSMeasureApp.exe
   Default Directory=%MAINDIR%
   Flags=01000000
 end
 item: Add ProgMan Icon
-  Group=StartUp
+  Group=%GROUP%
   Icon Name=OTSIncAReportApp
   Command Line=%MAINDIR%\OTSIncAReportApp.exe
   Default Directory=%MAINDIR%

OTSIncAMeasureApp/0-OTSModel/OTSDataType/COTSXRayParam.cs

@@ -38,7 +38,7 @@ namespace OTSDataType
         private bool m_nUsingXray;
         private bool m_UseFilter;
        
-        private int m_nFastXrayTime;
+        //private int m_nFastXrayTime;
         private int m_XrayLimit;
 
         void Init()
@@ -50,7 +50,7 @@ namespace OTSDataType
 
             m_nMidAnalyAQTime = DEFAULE_XRAY_ANALY_MID_TIME;
             m_nQutantifyMinSize = DEFAULE_XRAY_QUANTIFY_MINSIZE;
-            m_nFastXrayTime = DEFAULE_FASTXRAYTIME;
+            //m_nFastXrayTime = DEFAULE_FASTXRAYTIME;
             m_XrayLimit = Default_Xray_Limit;
             m_nQutantifyMinSize = DEFAULE_XRAY_QUANTIFY_MINSIZE;
             m_nSmallPartXrayTime = DEFAULE_FASTXRAYTIME;
@@ -114,11 +114,11 @@ namespace OTSDataType
         {
             m_nQutantifyMinSize = a_nQuantifyMinSize;
         }
-        public int GetFastXrayTime() { return m_nFastXrayTime; }
-        public void SetFastXrayTime(int a_nFastXrayTime)
-        {
-            m_nFastXrayTime = a_nFastXrayTime;
-        }
+        //public int GetFastXrayTime() { return m_nFastXrayTime; }
+        //public void SetFastXrayTime(int a_nFastXrayTime)
+        //{
+        //    m_nFastXrayTime = a_nFastXrayTime;
+        //}
 
         public int GetMidAnalyAQTime() { return m_nMidAnalyAQTime; }
         public void SetMidAnalyAQTime(int a_nMidAnalyAQTime) { m_nMidAnalyAQTime = a_nMidAnalyAQTime; }

OTSIncAMeasureApp/1-OTSMeasure/Measure/3-MeasureFlow/CSmplMeasure.cs

@@ -964,15 +964,18 @@ namespace OTSModelSharp
 
                 if (bigparts.Count > 0)
                 {
-                    log.Info("Begin to collect xraydata:" + bigparts.Count + " on " + workmode.ToString());
                     nXRayAQTime = (uint)pXRayParam.GetMidAnalyAQTime();
+                    log.Info("Begin to collect xraydata:" + bigparts.Count +"(" +nXRayAQTime.ToString()+") on " + workmode.ToString());
+                    
                     m_EDSController.GetXRayByParts(bigparts, nXRayAQTime, true);
 
                 }
                 if (smallparts.Count > 0)
                 {
-                    log.Info("Begin to collect xraydata:" + smallparts.Count + " on " + workmode.ToString());
-                    nXRayAQTime = (uint)pXRayParam.GetFastXrayTime();
+                    nXRayAQTime = (uint)pXRayParam.GetSmallPartXrayTime();
+
+                    log.Info("Begin to collect xraydata:" + smallparts.Count + "(" + nXRayAQTime.ToString() + ") on " + workmode.ToString());
+                   
                     m_EDSController.GetXRayByParts(smallparts, nXRayAQTime, true);
 
                 }
@@ -993,7 +996,7 @@ namespace OTSModelSharp
                 if (smallparts.Count > 0)
                 {
                     log.Info("Begin to collect xraydata:" + smallparts.Count + " on " + OTS_X_RAY_SCAN_MODE.PointMode.ToString());
-                    nXRayAQTime = (uint)pXRayParam.GetFastXrayTime();
+                    nXRayAQTime = (uint)pXRayParam.GetSmallPartXrayTime();
                     m_EDSController.GetXRayByParts(smallparts, nXRayAQTime, true);
 
                 }