fix the bug of displaying quantifyminsize parameter in the measure app.

OTSIncAMeasureApp/0-OTSModel/Measure/2-OTSCleanliness/SmplMeasureCleanliness.cs

@@ -213,37 +213,45 @@ namespace OTSModelSharp
 
 
             var pStatus = m_Sample.GetMsrStatus();
-           
-         
-            //// particle x-ray analysis
-            ////=============================================
-            curFldData.CreateXrayList(bigparts); // big particle using the full xray strategy.
-
 
-            curFldData.CreateXrayList(smallparts); //small particle using the fast xray strategy
-            var workmode = pXRayParam.GetScanMode();
-            // get x-ray list (analysis) by particle features
-            if (workmode == OTS_X_RAY_SCAN_MODE.FeatureMode)
+            if (bigparts.Count > 0)
             {
-                nXRayAQTime = (uint)pXRayParam.GetMidAnalyAQTime();
-                m_EDSHardwareMgr.GetXRayByFeatures(bigparts, nXRayAQTime, true);
 
+                //// particle x-ray analysis
+                ////=============================================
+                curFldData.CreateXrayList(bigparts); // big particle using the full xray strategy.
+
+
+                curFldData.CreateXrayList(smallparts); //small particle using the fast xray strategy
+                var workmode = pXRayParam.GetScanMode();
+                // get x-ray list (analysis) by particle features
+                if (workmode == OTS_X_RAY_SCAN_MODE.FeatureMode)
+                {
+                    nXRayAQTime = (uint)pXRayParam.GetMidAnalyAQTime();
+                    m_EDSHardwareMgr.GetXRayByFeatures(bigparts, nXRayAQTime, true);
+
+                }
+                else
+                {
+                    nXRayAQTime = (uint)pXRayParam.GetMidAnalyAQTime();
+                    m_EDSHardwareMgr.GetXRayByPoints(bigparts, nXRayAQTime, true);
+                }
             }
-            else 
+
+
+
+
+            if (smallparts.Count > 0)
             {
-                nXRayAQTime = (uint)pXRayParam.GetMidAnalyAQTime();
-                m_EDSHardwareMgr.GetXRayByPoints(bigparts, nXRayAQTime, true);
-            }
-            
-  
-         
+                nXRayAQTime = (uint)pXRayParam.GetFastXrayTime();
 
+                // get x-ray list (analysis) by points
+                m_EDSHardwareMgr.GetXRayByPoints(smallparts, nXRayAQTime, true);
 
+            }
 
-            nXRayAQTime = (uint)pXRayParam.GetFastXrayTime();
 
-            // get x-ray list (analysis) by points
-            m_EDSHardwareMgr.GetXRayByPoints(smallparts, nXRayAQTime, true);
+           
      
             return ;
         }

OTSIncAMeasureApp/0-OTSModel/OTSDataType/COTSSample.cs

@@ -1581,7 +1581,7 @@ namespace OTSDataType
 
                             poPropItem = new CPropItem();
                             nItemId = OTS_SAMPLE_PROP_GRID_ITEMS.XRAY_QUANTIFY_MINSIZE;
-                            poPropItem.SetSmplParameter(modelResource, nItemId, OTS_ITEM_TYPES.INT, false, bShow);
+                            poPropItem.SetSmplParameter(modelResource, nItemId, OTS_ITEM_TYPES.DOUBLE, false, bShow);
                             a_listPropItems.Add(poPropItem);
 
                             // analysis 

OTSIncAMeasureApp/2-OTSMeasureParamManage/MeasureParam.cd

@@ -27,7 +27,7 @@
       <Compartment Name="Methods" Collapsed="true" />
     </Compartments>
     <TypeIdentifier>
-      <HashCode>AAihQAAEJBFAk0Ao4SAGLADAOLCQgEARiAoEAggkAlI=</HashCode>
+      <HashCode>AAihQAAEJBFCk0Ao4SEGLADBOLCQgEAViAoEAggkAlI=</HashCode>
       <FileName>2-OTSMeasureParamManage\COTSMeasureParam.cs</FileName>
     </TypeIdentifier>
     <ShowAsAssociation>
@@ -43,14 +43,14 @@
     <Position X="2" Y="2.25" Width="2.5" />
     <TypeIdentifier>
       <HashCode>ABCAgKMgAIIAgACGQEggBIAACCHFMAAAAAgCAAMABAA=</HashCode>
-      <FileName>0-OTSModel\Measure\GetParamData\OTSDefaultParam.cs</FileName>
+      <FileName>0-OTSModel\Measure\ParamData\OTSDefaultParam.cs</FileName>
     </TypeIdentifier>
   </Class>
   <Class Name="OTSModelSharp.CStageParam" Collapsed="true">
     <Position X="1.75" Y="3.5" Width="1.5" />
     <TypeIdentifier>
-      <HashCode>AAAIgIACARAgAACDAAoABAABhCCAICgAQgAmBSIAQAo=</HashCode>
-      <FileName>0-OTSModel\Measure\GetParamData\StageParam.cs</FileName>
+      <HashCode>AAAIgKAAARAgAACDAAoABAABhCCAICgAQgAmBSIAQAI=</HashCode>
+      <FileName>0-OTSModel\Measure\ParamData\StageParam.cs</FileName>
     </TypeIdentifier>
   </Class>
   <Class Name="OTSDataType.COTSSample" Collapsed="true">
@@ -70,12 +70,14 @@
         <Point X="15" Y="3.625" />
         <Point X="14.625" Y="3.625" />
         <Point X="14.625" Y="4.888" />
+        <Point X="11.615" Y="4.888" Type="JumpStart" />
+        <Point X="11.448" Y="4.888" Type="JumpEnd" />
         <Point X="10.75" Y="4.888" />
       </Path>
     </AssociationLine>
     <TypeIdentifier>
       <HashCode>IIQggICCQZAEZADnBDIAKkZAyCSAqCAEIjAqT0IQAIg=</HashCode>
-      <FileName>0-OTSModel\Measure\GetParamData\COTSMsrPrjResultData.cs</FileName>
+      <FileName>0-OTSModel\Measure\ParamData\COTSMsrPrjResultData.cs</FileName>
     </TypeIdentifier>
     <ShowAsAssociation>
       <Field Name="m_GenParam" />
@@ -84,40 +86,8 @@
       <Field Name="m_listSamples" />
     </ShowAsCollectionAssociation>
   </Class>
-  <Class Name="OTSModelSharp.CMsrThread" Collapsed="true">
-    <Position X="10" Y="7" Width="3.5" />
-    <Compartments>
-      <Compartment Name="Methods" Collapsed="true" />
-    </Compartments>
-    <AssociationLine Name="m_pProjData" Type="OTSModelSharp.COTSMsrPrjResultData" FixedFromPoint="true" FixedToPoint="true">
-      <Path>
-        <Point X="12.203" Y="7" />
-        <Point X="12.203" Y="6.625" />
-        <Point X="15.812" Y="6.625" />
-        <Point X="15.812" Y="3.798" />
-      </Path>
-    </AssociationLine>
-    <TypeIdentifier>
-      <HashCode>AAxQEAAAAQIAAAAQFQAEAABAAABBAAAQAAAGSCAgAAA=</HashCode>
-      <FileName>0-OTSModel\Measure\GetBSEPic\CMsrThread.cs</FileName>
-    </TypeIdentifier>
-    <ShowAsAssociation>
-      <Field Name="m_pProjData" />
-    </ShowAsAssociation>
-    <ShowAsCollectionAssociation>
-      <Field Name="m_listMeasurableSamples" />
-    </ShowAsCollectionAssociation>
-  </Class>
   <Class Name="OTSMeasureApp.OTSIncAMeasureAppForm" Collapsed="true">
     <Position X="2.5" Y="7.5" Width="2.75" />
-    <AssociationLine Name="m_ProjParam" Type="OTSMeasureApp.COTSMeasureParam" FixedFromPoint="true" FixedToPoint="true">
-      <Path>
-        <Point X="2.969" Y="7.5" />
-        <Point X="2.969" Y="4.379" />
-        <Point X="6.75" Y="4.379" />
-        <Point X="6.75" Y="4.004" />
-      </Path>
-    </AssociationLine>
     <AssociationLine Name="m_ProjData" Type="OTSModelSharp.COTSMsrPrjResultData" FixedFromPoint="true" FixedToPoint="true">
       <Path>
         <Point X="5.25" Y="7.839" />
@@ -126,7 +96,7 @@
       </Path>
     </AssociationLine>
     <TypeIdentifier>
-      <HashCode>cIGadXIZ6PAprA5ZYEORKjqrDAIBCHgbVGsAIk6B4qk=</HashCode>
+      <HashCode>cIGadXIZ6PANrQ5bYEOxLjq7DEARCnybVGsEIl+D4rk=</HashCode>
       <FileName>OTSIncAMeasureAppForm.cs</FileName>
     </TypeIdentifier>
     <ShowAsAssociation>
@@ -138,24 +108,21 @@
   <Class Name="OTSMeasureApp.CMeasureThreadWrapper" Collapsed="true">
     <Position X="6" Y="6.25" Width="3.25" />
     <TypeIdentifier>
-      <HashCode>FAgIAwAhIQIAAACQAAAEKI0hQBAAAAAACABgYAIACgA=</HashCode>
+      <HashCode>FAgIAwAhIQIAAACQBAAEKI0hQBAAAAAACQBgYAQACgA=</HashCode>
       <FileName>1-OTSMeasure\CMeasureThreadWrapper.cs</FileName>
     </TypeIdentifier>
-    <ShowAsAssociation>
-      <Field Name="m_MsrThread" />
-    </ShowAsAssociation>
   </Class>
   <Class Name="OTSModelSharp.COTSGeneralParam" Collapsed="true">
     <Position X="14.75" Y="1.75" Width="2.75" />
     <TypeIdentifier>
       <HashCode>MAAAgEQEQhIAbYBCiAQQBIQmyGxAKAikJADGECAAAQA=</HashCode>
-      <FileName>0-OTSModel\Measure\GetParamData\OTSGeneralParam.cs</FileName>
+      <FileName>0-OTSModel\Measure\ParamData\OTSGeneralParam.cs</FileName>
     </TypeIdentifier>
   </Class>
   <Class Name="OTSDataType.CSampleParam" Collapsed="true">
     <Position X="10.75" Y="3.5" Width="1.5" />
     <TypeIdentifier>
-      <HashCode>CACQAAAAAgAABABAgAKAAAwACCAFIAQgAEACAgAARAA=</HashCode>
+      <HashCode>CACQAAAAAgAABABAgAKgAAwACCCFIAQgAEACAgIARAA=</HashCode>
       <FileName>0-OTSModel\OTSDataType\CSampleParam.cs</FileName>
     </TypeIdentifier>
   </Class>