|
@@ -16,41 +16,24 @@ namespace OTSDataType
|
|
// search x-ray low counts cut off
|
|
// search x-ray low counts cut off
|
|
const int DEFAULE_XRAY_LOW_COUNT = 800;
|
|
const int DEFAULE_XRAY_LOW_COUNT = 800;
|
|
|
|
|
|
- // search x-ray speed
|
|
|
|
- //const OTS_IMAGE_SCANSPEED_OPTIONS DEFAULE_SEARCH_XRAY_SPEED = OTS_IMAGE_SCANSPEED_OPTIONS.meddium;
|
|
|
|
-
|
|
|
|
- // analysis x-ray speed
|
|
|
|
- //const OTS_IMAGE_SCANSPEED_OPTIONS DEFAULE_ANALYSIS_XRAY_SPEED = OTS_IMAGE_SCANSPEED_OPTIONS.meddium;
|
|
|
|
-
|
|
|
|
- // x-ray expect counts
|
|
|
|
- //const int DEFAULE_XRAY_EXP_COUNT = 4500;
|
|
|
|
-
|
|
|
|
- // x-ray speed search
|
|
|
|
- //const int DEFAULE_XRAY_SEARCH_MID_TIME = 20;
|
|
|
|
-
|
|
|
|
|
|
+
|
|
// x-ray speed analysis
|
|
// x-ray speed analysis
|
|
const int DEFAULE_XRAY_ANALY_MID_TIME = 1000;
|
|
const int DEFAULE_XRAY_ANALY_MID_TIME = 1000;
|
|
|
|
|
|
- //const double DEFAULE_XRAY_QUANTIFY_MINSIZE = 50;
|
|
|
|
-
|
|
|
|
- //const int DEFAULE_FASTXRAYTIME = 100;
|
|
|
|
|
|
+
|
|
const int Default_Xray_Limit = 50;
|
|
const int Default_Xray_Limit = 50;
|
|
private OTS_X_RAY_SCAN_MODE m_nScanMode;
|
|
private OTS_X_RAY_SCAN_MODE m_nScanMode;
|
|
|
|
|
|
|
|
|
|
private int m_nAnalyLowestCount;
|
|
private int m_nAnalyLowestCount;
|
|
- //private int m_nMidSearchAQTime;
|
|
|
|
|
|
+
|
|
private int m_nMidAnalyAQTime;
|
|
private int m_nMidAnalyAQTime;
|
|
- //private double m_nQutantifyMinSize;
|
|
|
|
- //private int m_nFastXrayTime;
|
|
|
|
|
|
+
|
|
|
|
|
|
private bool m_nUsingXray;
|
|
private bool m_nUsingXray;
|
|
private bool m_UseFilter;
|
|
private bool m_UseFilter;
|
|
|
|
|
|
private int m_XrayLimit;
|
|
private int m_XrayLimit;
|
|
- //private double m_xrayStep;
|
|
|
|
-
|
|
|
|
- //public double XrayStep { get => m_xrayStep; set => m_xrayStep = value; }
|
|
|
|
|
|
|
|
void Init()
|
|
void Init()
|
|
{
|
|
{
|
|
@@ -58,12 +41,11 @@ namespace OTSDataType
|
|
|
|
|
|
|
|
|
|
m_nAnalyLowestCount = DEFAULE_XRAY_LOW_COUNT;
|
|
m_nAnalyLowestCount = DEFAULE_XRAY_LOW_COUNT;
|
|
- //m_nMidSearchAQTime = DEFAULE_XRAY_SEARCH_MID_TIME;
|
|
|
|
|
|
+
|
|
m_nMidAnalyAQTime = DEFAULE_XRAY_ANALY_MID_TIME;
|
|
m_nMidAnalyAQTime = DEFAULE_XRAY_ANALY_MID_TIME;
|
|
- //m_nQutantifyMinSize = DEFAULE_XRAY_QUANTIFY_MINSIZE;
|
|
|
|
- //m_nFastXrayTime = DEFAULE_FASTXRAYTIME;
|
|
|
|
|
|
+
|
|
m_XrayLimit = Default_Xray_Limit;
|
|
m_XrayLimit = Default_Xray_Limit;
|
|
- //m_xrayStep = 0;
|
|
|
|
|
|
+
|
|
}
|
|
}
|
|
public COTSXRayParam()
|
|
public COTSXRayParam()
|
|
{
|
|
{
|
|
@@ -76,17 +58,15 @@ namespace OTSDataType
|
|
// copy data over
|
|
// copy data over
|
|
m_nScanMode = a_oSource.m_nScanMode;
|
|
m_nScanMode = a_oSource.m_nScanMode;
|
|
|
|
|
|
- //m_nAnalySpeed = a_oSource.m_nAnalySpeed;
|
|
|
|
m_nAnalyLowestCount = a_oSource.m_nAnalyLowestCount;
|
|
m_nAnalyLowestCount = a_oSource.m_nAnalyLowestCount;
|
|
- //m_nMidSearchAQTime = a_oSource.m_nMidSearchAQTime;
|
|
|
|
|
|
+
|
|
m_nMidAnalyAQTime = a_oSource.m_nMidAnalyAQTime;
|
|
m_nMidAnalyAQTime = a_oSource.m_nMidAnalyAQTime;
|
|
- //m_nQutantifyMinSize = a_oSource.m_nQutantifyMinSize;
|
|
|
|
- //m_nFastXrayTime = a_oSource.m_nFastXrayTime;
|
|
|
|
|
|
+
|
|
|
|
|
|
m_nUsingXray = a_oSource.m_nUsingXray;
|
|
m_nUsingXray = a_oSource.m_nUsingXray;
|
|
m_UseFilter = a_oSource.m_UseFilter;
|
|
m_UseFilter = a_oSource.m_UseFilter;
|
|
m_XrayLimit = a_oSource.m_XrayLimit;
|
|
m_XrayLimit = a_oSource.m_XrayLimit;
|
|
- //m_xrayStep = a_oSource.m_xrayStep;
|
|
|
|
|
|
+
|
|
}
|
|
}
|
|
// copy constructor
|
|
// copy constructor
|
|
public COTSXRayParam(COTSXRayParam a_oSource)
|
|
public COTSXRayParam(COTSXRayParam a_oSource)
|
|
@@ -98,14 +78,11 @@ namespace OTSDataType
|
|
{
|
|
{
|
|
// return test result
|
|
// return test result
|
|
return m_nScanMode == a_oSource.m_nScanMode &&
|
|
return m_nScanMode == a_oSource.m_nScanMode &&
|
|
-
|
|
|
|
- //m_nAnalySpeed == a_oSource.m_nAnalySpeed &&
|
|
|
|
|
|
+
|
|
m_nAnalyLowestCount == a_oSource.m_nAnalyLowestCount &&
|
|
m_nAnalyLowestCount == a_oSource.m_nAnalyLowestCount &&
|
|
- //m_nMidSearchAQTime == a_oSource.m_nMidSearchAQTime &&
|
|
|
|
|
|
+
|
|
m_nMidAnalyAQTime == a_oSource.m_nMidAnalyAQTime &&
|
|
m_nMidAnalyAQTime == a_oSource.m_nMidAnalyAQTime &&
|
|
- //m_nQutantifyMinSize == a_oSource.m_nQutantifyMinSize &&
|
|
|
|
- //m_nFastXrayTime == a_oSource.m_nFastXrayTime &&
|
|
|
|
-
|
|
|
|
|
|
+
|
|
m_nUsingXray == a_oSource.m_nUsingXray &&
|
|
m_nUsingXray == a_oSource.m_nUsingXray &&
|
|
m_UseFilter == a_oSource.m_UseFilter;
|
|
m_UseFilter == a_oSource.m_UseFilter;
|
|
}
|
|
}
|
|
@@ -122,26 +99,12 @@ namespace OTSDataType
|
|
public int GetAnalyExpCount() { return m_nAnalyLowestCount; }
|
|
public int GetAnalyExpCount() { return m_nAnalyLowestCount; }
|
|
public void SetAnalyExpCount(int a_nVal) { m_nAnalyLowestCount = a_nVal; }
|
|
public void SetAnalyExpCount(int a_nVal) { m_nAnalyLowestCount = a_nVal; }
|
|
|
|
|
|
- //public int GetMidSearchAQTime() { return m_nMidSearchAQTime; }
|
|
|
|
- //public void SetMidSearchAQTime(int a_nMidSearchAQTime) { m_nMidSearchAQTime = a_nMidSearchAQTime; }
|
|
|
|
-
|
|
|
|
-
|
|
|
|
|
|
|
|
public int GetMidAnalyAQTime() { return m_nMidAnalyAQTime; }
|
|
public int GetMidAnalyAQTime() { return m_nMidAnalyAQTime; }
|
|
public void SetMidAnalyAQTime(int a_nMidAnalyAQTime) { m_nMidAnalyAQTime = a_nMidAnalyAQTime; }
|
|
public void SetMidAnalyAQTime(int a_nMidAnalyAQTime) { m_nMidAnalyAQTime = a_nMidAnalyAQTime; }
|
|
|
|
|
|
|
|
|
|
|
|
|
|
- //public double GetFeatureModeMinSize() { return m_nQutantifyMinSize; }
|
|
|
|
- //public void SetQuantifyMinSize(double a_nQuantifyMinSize)
|
|
|
|
- //{
|
|
|
|
- // m_nQutantifyMinSize = a_nQuantifyMinSize;
|
|
|
|
- //}
|
|
|
|
- //public int GetFastXrayTime() { return m_nFastXrayTime; }
|
|
|
|
- //public void SetFastXrayTime(int a_nFastXrayTime)
|
|
|
|
- //{
|
|
|
|
- // m_nFastXrayTime = a_nFastXrayTime;
|
|
|
|
- //}
|
|
|
|
public int GetXrayLimit() { return m_XrayLimit; }
|
|
public int GetXrayLimit() { return m_XrayLimit; }
|
|
public void SetXrayLimit(int a_xrayLimit)
|
|
public void SetXrayLimit(int a_xrayLimit)
|
|
{
|
|
{
|
|
@@ -178,7 +141,7 @@ namespace OTSDataType
|
|
|
|
|
|
xInt xXrayLimit = new xInt();
|
|
xInt xXrayLimit = new xInt();
|
|
//xDouble xXrayStep = new xDouble();
|
|
//xDouble xXrayStep = new xDouble();
|
|
- xBool xZeroElementProcess = new xBool();
|
|
|
|
|
|
+ //xBool xZeroElementProcess = new xBool();
|
|
|
|
|
|
Slo slo = new Slo();
|
|
Slo slo = new Slo();
|
|
|
|
|
|
@@ -200,7 +163,7 @@ namespace OTSDataType
|
|
|
|
|
|
//slo.Register("XrayStep", xXrayStep);
|
|
//slo.Register("XrayStep", xXrayStep);
|
|
|
|
|
|
- slo.Register("ZeroElementProcess", xZeroElementProcess);
|
|
|
|
|
|
+ //slo.Register("ZeroElementProcess", xZeroElementProcess);
|
|
|
|
|
|
|
|
|
|
if (isStoring)
|
|
if (isStoring)
|