|
@@ -183,12 +183,26 @@ namespace OTSModelSharp
|
|
|
// get x-ray list (analysis) by particle features
|
|
|
uint nXRayAQTime = (uint)pXRayParam.GetMidAnalyAQTime();
|
|
|
var nFastXrayAQTime =(uint) pXRayParam.GetFastXrayTime();
|
|
|
- var quantifyMinSize = pXRayParam.GetQuantifyMinSize();
|
|
|
+ var quantifyMinSize = pXRayParam.GetFeatureModeMinSize();
|
|
|
|
|
|
+ var listXray = listXrayAnalysisparts.OrderByDescending(x => x.GetActualArea()).ToList();
|
|
|
+ var listXray1 = new List<COTSParticleClr>();
|
|
|
+
|
|
|
+ if (listXray.Count > pXRayParam.GetXrayLimit())
|
|
|
+ {
|
|
|
+ for (var i = 0; i < pXRayParam.GetXrayLimit(); i++)
|
|
|
+ {
|
|
|
+
|
|
|
+ listXray1.Add(listXray[i]);
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
List<COTSParticleClr> smallparts = new List<COTSParticleClr>();
|
|
|
List<COTSParticleClr> bigparts = new List<COTSParticleClr>();
|
|
|
|
|
|
- foreach (var p in listXrayAnalysisparts)
|
|
|
+
|
|
|
+
|
|
|
+ foreach (var p in listXray1)
|
|
|
{
|
|
|
double diameter = Math.Sqrt(p.GetActualArea() / 3.14159) * 2;
|
|
|
if (diameter >= quantifyMinSize)
|