|
@@ -17,6 +17,10 @@ namespace OTSMeasureApp.ServiceCenter
|
|
private string strResolution = "";
|
|
private string strResolution = "";
|
|
private int width = 0;
|
|
private int width = 0;
|
|
private int height = 0;
|
|
private int height = 0;
|
|
|
|
+ /// <summary>
|
|
|
|
+ /// fei面扫这个参数作用是达到这个数值后采集xray操作停止,而ots期望计数率是lowcount的判断标准,两者概念不同,所以此处用常数5000而非ots期望计数率
|
|
|
|
+ /// </summary>
|
|
|
|
+ const int maxCounts = 8000;
|
|
|
|
|
|
public FEIEDSController(int MaxCounts)
|
|
public FEIEDSController(int MaxCounts)
|
|
{
|
|
{
|
|
@@ -35,7 +39,7 @@ namespace OTSMeasureApp.ServiceCenter
|
|
{
|
|
{
|
|
List<Point> points = CImageHandler.FindContoursBySegment(width, height, a_listParticles[i].GetFeature().GetSegmentsList());
|
|
List<Point> points = CImageHandler.FindContoursBySegment(width, height, a_listParticles[i].GetFeature().GetSegmentsList());
|
|
|
|
|
|
- if (!ApiClass.GetXRayByPolygon(points, strResolution, a_nXRayAQTime, AnalyExpCount, a_bElementInfo, ref eleItems, ref spectrumItems))
|
|
|
|
|
|
+ if (!ApiClass.GetXRayByPolygon(points, strResolution, a_nXRayAQTime, maxCounts, a_bElementInfo, ref eleItems, ref spectrumItems))
|
|
{
|
|
{
|
|
return false;
|
|
return false;
|
|
}
|
|
}
|
|
@@ -43,7 +47,7 @@ namespace OTSMeasureApp.ServiceCenter
|
|
else
|
|
else
|
|
{
|
|
{
|
|
Rectangle rectangle = (Rectangle)a_listParticles[i].GetParticleRect();
|
|
Rectangle rectangle = (Rectangle)a_listParticles[i].GetParticleRect();
|
|
- if (!ApiClass.GetXRayByRect(rectangle, strResolution, a_nXRayAQTime, AnalyExpCount, a_bElementInfo, ref eleItems, ref spectrumItems))
|
|
|
|
|
|
+ if (!ApiClass.GetXRayByRect(rectangle, strResolution, a_nXRayAQTime, maxCounts, a_bElementInfo, ref eleItems, ref spectrumItems))
|
|
{
|
|
{
|
|
return false;
|
|
return false;
|
|
}
|
|
}
|